On 23 Mar 2023, at 4:27, Antonio Quartulli wrote:
> When retrieving the multi_instance of a specific peer,
> there is no need to peform a linear search across the
> whole m->hash list. We can directly access the needed
> object via m->instances[peer-id] in constant time (and
> just one line of code).
>
> Adapt the dco-freebsd code to do so.
>
> Cc: Kristof Provost <[email protected]>
> Change-Id: I8d8af6f872146604a9710edf443db65df48ac3cb
> Signed-off-by: Antonio Quartulli <[email protected]>
> ---
> NOTE: not tested because I have no FreeBSD environment
>
> Changes from v1:
> * added boundary check on peer-id
>
> Changes from v2:
> * use one check only instead of two
> ---
> src/openvpn/dco_freebsd.c | 23 +++++++----------------
> 1 file changed, 7 insertions(+), 16 deletions(-)
>
> diff --git a/src/openvpn/dco_freebsd.c b/src/openvpn/dco_freebsd.c
> index 225b3cf8..54ec16ff 100644
> --- a/src/openvpn/dco_freebsd.c
> +++ b/src/openvpn/dco_freebsd.c
> @@ -674,27 +674,18 @@ dco_event_set(dco_context_t *dco, struct event_set *es,
> void *arg)
> static void
> dco_update_peer_stat(struct multi_context *m, uint32_t peerid, const
> nvlist_t *nvl)
‘peerid’ here
> {
> - struct hash_element *he;
> - struct hash_iterator hi;
>
> - hash_iterator_init(m->hash, &hi);
> -
> - while ((he = hash_iterator_next(&hi)))
> + if (peer_id >= m->max_clients || !m->instances[peer_id])
But ‘peer_id’ everywhere else.
So that needs to be fixed, because this version doesn’t build.
Other than that I’m happy with this change.
Best regards,
Kristof
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
