From: "plaisthos (Code Review)" Date: Wed, 11 Mar 2026 17:48:37 +0000 In-Reply-To: References: Reply-To: arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="kzrLGa8v9hQ="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: Optimise iterating over all clients by remembering highest peer id List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: openvpn-devel --kzrLGa8v9hQ= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: plaisthos. Hello flichtenheld, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/1557?usp=3Demail to look at the new patch set (#4). The change is no longer submittable: checks~ChecksSubmitRule is unsatisfied= now. Change subject: Optimise iterating over all clients by remembering highest = peer id ...................................................................... Optimise iterating over all clients by remembering highest peer id This keeps track of the highest peer id that is currently allocated to avoid iterating over the empty tail of the m->instances array. Change-Id: If797f3fe178fba3f43fb12898e5484bfb38f05c3 --- M src/openvpn/multi.c M src/openvpn/multi.h M src/openvpn/push_util.c 3 files changed, 26 insertions(+), 10 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/57/1557/4 diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 9d4ea49..c03e821 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -601,6 +601,13 @@ if (mi->context.c2.tls_multi->peer_id !=3D MAX_PEER_ID) { m->instances[mi->context.c2.tls_multi->peer_id] =3D NULL; + + /* Adjust the max_peerid as this might have been the highest + * peer id instance */ + while (m->max_peerid > 0 && m->instances[m->max_peerid] =3D=3D= NULL) + { + m->max_peerid--; + } } schedule_remove_entry(m->schedule, (struct schedule_entry *)mi); @@ -652,7 +659,7 @@ { if (m->hash) { - for (int i =3D 0; i < m->max_clients; i++) + for (uint32_t i =3D 0; i <=3D m->max_peerid; i++) { struct multi_instance *mi =3D m->instances[i]; if (mi) @@ -1326,7 +1333,7 @@ { int count =3D 0; - for (int i =3D 0; i < m->max_clients; i++) + for (uint32_t i =3D 0; i <=3D m->max_peerid; i++) { struct multi_instance *mi =3D m->instances[i]; if (mi && mi !=3D new_mi && !mi->halt) @@ -2885,7 +2892,7 @@ #endif mb =3D mbuf_alloc_buf(buf); - for (int i =3D 0; i < m->max_clients; i++) + for (uint32_t i =3D 0; i <=3D m->max_peerid; i++) { struct multi_instance *mi =3D m->instances[i]; @@ -3794,7 +3801,7 @@ multi_push_restart_schedule_exit(struct multi_context *m, bool next_server) { /* tell all clients to restart */ - for (int i =3D 0; i < m->max_clients; i++) + for (uint32_t i =3D 0; i <=3D m->max_peerid; i++) { struct multi_instance *mi =3D m->instances[i]; if (mi && !mi->halt && proto_is_dgram(mi->context.c2.link_sockets[= 0]->info.proto)) @@ -3876,7 +3883,7 @@ struct multi_context *m =3D (struct multi_context *)arg; int count =3D 0; - for (int i =3D 0; i < m->max_clients; i++) + for (uint32_t i =3D 0; i <=3D m->max_peerid; i++) { struct multi_instance *mi =3D m->instances[i]; if (mi && !mi->halt) @@ -3907,7 +3914,7 @@ maddr.proto =3D proto; if (mroute_extract_openvpn_sockaddr(&maddr, &saddr, true)) { - for (int i =3D 0; i < m->max_clients; i++) + for (uint32_t i =3D 0; i <=3D m->max_peerid; i++) { struct multi_instance *mi =3D m->instances[i]; if (mi && !mi->halt && mroute_addr_equal(&maddr, &mi->real)) @@ -4100,8 +4107,14 @@ } /* should not really end up here, since multi_create_instance returns = null - * if amount of clients exceeds max_clients */ + * if amount of clients exceeds max_clients and this method would then + * also not have been called */ ASSERT(mi->context.c2.tls_multi->peer_id < m->max_clients); + + if (mi->context.c2.tls_multi->peer_id > m->max_peerid) + { + m->max_peerid =3D mi->context.c2.tls_multi->peer_id; + } } #if defined(__GNUC__) || defined(__clang__) diff --git a/src/openvpn/multi.h b/src/openvpn/multi.h index 498409d..17d850b 100644 --- a/src/openvpn/multi.h +++ b/src/openvpn/multi.h @@ -160,9 +160,12 @@ */ struct multi_context { - struct multi_instance **instances; /**< Array of multi_instances. An i= nstance can be + struct multi_instance **instances; /**< Array of multi_instances with = the size of + * max_clients. An instance can be * accessed using peer-id as an ind= ex. */ - + uint32_t max_peerid; /**< currently highest allocated pe= erid and + * maximum allocated/valid index in + * instances */ struct hash *hash; /**< VPN tunnel instances indexed b= y real * address of the remote peer. */ struct hash *vhash; /**< VPN tunnel instances indexed by diff --git a/src/openvpn/push_util.c b/src/openvpn/push_util.c index 6456554..529cc39 100644 --- a/src/openvpn/push_util.c +++ b/src/openvpn/push_util.c @@ -317,7 +317,7 @@ int count =3D 0; - for (int i =3D 0; i < m->max_clients; i++) + for (uint32_t i =3D 0; i <=3D m->max_peerid; i++) { struct multi_instance *curr_mi =3D m->instances[i]; -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1557?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings?usp=3Demail Gerrit-MessageType: newpatchset Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: If797f3fe178fba3f43fb12898e5484bfb38f05c3 Gerrit-Change-Number: 1557 Gerrit-PatchSet: 4 Gerrit-Owner: plaisthos Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos --kzrLGa8v9hQ= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is cur= rently required from: plaisthos.

plaisthos uploaded patch set #4 to this change.

<= a href=3D"http://gerrit.openvpn.net/c/openvpn/+/1557?usp=3Demail">View Chan= ge

The change is no longer submittable: checks~ChecksSubmitRule i= s unsatisfied now.

Optimise iterating over all clients by =
remembering highest peer id

This keeps track of the highest peer id = that is currently allocated to avoid
iterating over the empty tail of th= e m->instances array.

Change-Id: If797f3fe178fba3f43fb12898e5484b= fb38f05c3
---
M src/openvpn/multi.c
M src/openvpn/multi.h
M src= /openvpn/push_util.c
3 files changed, 26 insertions(+), 10 deletions(-)<= br>
git pull ssh://gerrit.openvpn.net:29418/openvpn =
refs/changes/57/1557/4
diff --git a/src/openvpn/multi.c b/src/openv=
pn/multi.c
index 9d4ea49..c03e821 100644
--= - a/src/openvpn/multi.c
+++ b/src/openvpn/multi.c@@ -601,6 +601,13 @@
if (mi->context.c2.= tls_multi->peer_id !=3D MAX_PEER_ID)
{ m->instances[mi->context.c2.tls_multi->peer_i= d] =3D NULL;
+=
+ /* Adjust the = max_peerid as this might have been the highest
+ * peer id instance */
+ while (m->max_peer= id > 0 && m->instances[m->max_peerid] =3D=3D NULL)<= br>+ {
+ m->max_peerid-= -;
+ }

}

schedule= _remove_entry(m->schedule, (struct schedule_entry *)mi);
@@ -652,7 +659,7 @@
{
if (m->hash= )
{
+ for (uint32_t i =3D 0; i &l= t;=3D m->max_peerid; i++)
{
= struct multi_instance *mi =3D m->instances[i];
if (mi)
@@ -1326,7 +1333,7 @@
{
int count =3D 0;
=
- for (int = i =3D 0; i < m->max_clients; i++)
+ for (uint32_t i =3D 0; i <=3D m->max_= peerid; i++)
{
= struct multi_instance *mi =3D m->instances[i];
= if (mi && mi !=3D new_mi && !mi->halt)<= br>@@ -2885,7 +2892,7 @@
#endif
= mb =3D mbuf_alloc_buf(buf);

- for (int i =3D 0; i < m->max_cli= ents; i++)
+ f= or (uint32_t i =3D 0; i <=3D m->max_peerid; i++)
= {
struct multi_instance *mi =3D m->ins= tances[i];

@@ -3794,7 +3801,7 @@ multi_push_restart_schedule_exit(struct multi_context *m, bool nex= t_server)
{
/* tell all clients to re= start */
- for (int = i =3D 0; i < m->max_clients; i++)
+ for (uint32_t i =3D 0; i <=3D m->max_peerid; = i++)
{
struct multi_instance = *mi =3D m->instances[i];
if (mi && !mi-= >halt && proto_is_dgram(mi->context.c2.link_sockets[0]->in= fo.proto))
@@ -3876,7 +3883,7 @@
struc= t multi_context *m =3D (struct multi_context *)arg;
in= t count =3D 0;

- for (int i =3D 0; i < m->max_clients; i++)
<= span style=3D"color: hsl(120, 100%, 40%);">+ for (uint32_t i =3D 0; i &l= t;=3D m->max_peerid; i++)
{
= struct multi_instance *mi =3D m->instances[i];
= if (mi && !mi->halt)
@@ -3907,7 +3914,7 @@

maddr.proto =3D proto;
if (mroute_ex= tract_openvpn_sockaddr(&maddr, &saddr, true))
= {
- for (int i = =3D 0; i < m->max_clients; i++)
+ for (uint32_t i =3D 0; i <=3D m->max_peerid= ; i++)
{
struct multi= _instance *mi =3D m->instances[i];
if (mi &= amp;& !mi->halt && mroute_addr_equal(&maddr, &mi->= ;real))
@@ -4100,8 +4107,14 @@
}

/* should not really end up here, since m= ulti_create_instance returns null
- * if amount of clients exceeds max_clients */
+ * if amount of clients exce= eds max_clients and this method would then

+ * also not have been called */
= ASSERT(mi->context.c2.tls_multi->peer_id < m->max_clients)= ;
+
+ if (mi->context.c2.tls_multi-&= gt;peer_id > m->max_peerid)
+ {
+= m->max_peerid =3D mi->context.c2.tls_multi->peer_id;
+ }
}<= /span>

#if defined(__GNUC__) || defined(__clang= __)
diff --git a/src/openvpn/multi.h b/src/openvpn/multi.h<= /span>
index 498409d..17d850b 100644
--- a/src/ope= nvpn/multi.h
+++ b/src/openvpn/multi.h
@@ -= 160,9 +160,12 @@
*/
struct multi_context=
{
- = struct multi_instance **instances; /**< Array of multi_instances. An i= nstance can be
+ s= truct multi_instance **instances; /**< Array of multi_instances with the= size of
+ = * max_clients. An instance can be
= * accessed using peer-id as = an index. */
-+ uint32_t max_peerid; = /**< currently highest allocated peerid and
+ = * maximum allocated/valid index in
+ * instances */
struct hash *hash; /**< VPN tunnel in= stances indexed by real
= * address of the remote peer. */
struct hash *= vhash; /**< VPN tunnel instances indexed by
diff --git a/src/openvpn/push_util.c b/src/openvpn/push_util.c
index 6456554..529cc39 100644
--- a/src/openvpn/push= _util.c
+++ b/src/openvpn/push_util.c
@@ -3= 17,7 +317,7 @@

int count =3D 0;

- for = (int i =3D 0; i < m->max_clients; i++)
+ for (uint32_t i =3D 0; i <=3D m->max_pee= rid; i++)
{
struct multi_inst= ance *curr_mi =3D m->instances[i];


To view, visit change 1557. To unsubscribe, or for help writin= g mail filters, visit settings.

Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: If797f3fe178fba3f43fb12898e5= 484bfb38f05c3
Gerrit-Change-Number: 1557
Gerrit-PatchSet: 4
Gerrit-Owner: plaisthos <arne-openvpn@...1711...= 27...>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
= --kzrLGa8v9hQ=--