From: "flichtenheld (Code Review)" Date: Wed, 11 Mar 2026 15:10:13 +0000 References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="sN0+OhoePuA="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: Change type of max_clients to uint32_t List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos Cc: openvpn-devel --sN0+OhoePuA= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: plaisthos. Hello plaisthos, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/1564?usp=3Demail to review the following change. Change subject: Change type of max_clients to uint32_t ...................................................................... Change type of max_clients to uint32_t peer_id is mostly this already (except in DCO context for some reason), and max_peerid was defined as uint32_t as well. So changing max_clients to uint32_t avoids many -Wsign-compare warnings. While here fix limit for max_clients in options parsing. It is not allowed to be MAX_PEER_ID exactly. Change-Id: I8d6b7bc1b7744dc6d57aaed3231b8901275752f2 Signed-off-by: Frank Lichtenheld --- M src/openvpn/dco_freebsd.c M src/openvpn/dco_linux.c M src/openvpn/dco_win.c M src/openvpn/mudp.c M src/openvpn/multi.c M src/openvpn/multi.h M src/openvpn/options.c M src/openvpn/options.h 8 files changed, 10 insertions(+), 64 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/64/1564/1 diff --git a/src/openvpn/dco_freebsd.c b/src/openvpn/dco_freebsd.c index a1e373d..718cd8b 100644 --- a/src/openvpn/dco_freebsd.c +++ b/src/openvpn/dco_freebsd.c @@ -559,11 +559,6 @@ return ret; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif - static void dco_update_peer_stat(struct multi_context *m, uint32_t peerid, const nvlis= t_t *nvl) { @@ -582,10 +577,6 @@ __func__, peerid, mi->context.c2.dco_read_bytes, mi->context.c2.dc= o_write_bytes); } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - int dco_read_and_process(dco_context_t *dco) { diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c index b92fa43..37171c5 100644 --- a/src/openvpn/dco_linux.c +++ b/src/openvpn/dco_linux.c @@ -858,11 +858,6 @@ } } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif - static int ovpn_handle_peer(dco_context_t *dco, struct nlattr *attrs[]) { @@ -889,7 +884,7 @@ if (dco->ifmode =3D=3D OVPN_MODE_P2P) { c2 =3D &dco->c->c2; - if (c2->tls_multi->dco_peer_id !=3D peer_id) + if (c2->tls_multi->dco_peer_id !=3D (int)peer_id) { return NL_SKIP; } @@ -918,10 +913,6 @@ return NL_OK; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - static bool ovpn_iface_check(dco_context_t *dco, struct nlattr *attrs[]) { diff --git a/src/openvpn/dco_win.c b/src/openvpn/dco_win.c index f46c24d..2e26f2a 100644 --- a/src/openvpn/dco_win.c +++ b/src/openvpn/dco_win.c @@ -739,11 +739,6 @@ return 0; } =20 -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif - int dco_get_peer_stats_multi(dco_context_t *dco, const bool raise_sigusr1_on_e= rr) { @@ -838,9 +833,9 @@ { OVPN_PEER_STATS *stat =3D &peer_stats[i]; =20 - if (stat->PeerId >=3D dco->c->multi->max_clients) + if (stat->PeerId >=3D (int)dco->c->multi->max_clients) { - msg(M_WARN, "%s: received out of bound peer_id %u (max=3D%u)",= __func__, stat->PeerId, + msg(M_WARN, "%s: received out of bound peer_id %d (max=3D%u)",= __func__, stat->PeerId, dco->c->multi->max_clients); continue; } @@ -871,10 +866,6 @@ return ret; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - int dco_get_peer_stats_fallback(struct context *c, const bool raise_sigusr1_on= _err) { diff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.c index b359750..432c79a 100644 --- a/src/openvpn/mudp.c +++ b/src/openvpn/mudp.c @@ -180,11 +180,6 @@ return false; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif - /* * Get a client instance based on real address. If * the instance doesn't exist, create it while @@ -217,7 +212,7 @@ uint32_t peer_id =3D ((uint32_t)ptr[1] << 16) | ((uint32_t)ptr= [2] << 8) | ((uint32_t)ptr[3]); peer_id_disabled =3D (peer_id =3D=3D MAX_PEER_ID); - if (!peer_id_disabled && (peer_id < m->max_clients) && (m->ins= tances[peer_id])) + if (!peer_id_disabled && (peer_id < m->max_clients) && m->inst= ances[peer_id]) { /* Floating on TCP will never be possible, so ensure we on= ly process * UDP clients */ @@ -315,10 +310,6 @@ return mi; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - /* * Send a packet to UDP socket. */ diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index c03e821..f825bf8 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -695,11 +695,6 @@ } } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif - /* * Create a client instance object for a newly connected client. */ @@ -782,10 +777,6 @@ return NULL; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - /* * Dump tables -- triggered by SIGUSR2. * If status file is defined, write to file. @@ -3261,7 +3252,7 @@ return; } - if ((peer_id < m->max_clients) && (m->instances[peer_id])) + if (((uint32_t)peer_id < m->max_clients) && m->instances[peer_id]) { struct multi_instance *mi =3D m->instances[peer_id]; set_prefix(mi); @@ -4085,18 +4076,13 @@ #endif /* ifdef ENABLE_MANAGEMENT */ } =20 -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif - void multi_assign_peer_id(struct multi_context *m, struct multi_instance *mi) { /* max_clients must be less then max peer-id value */ ASSERT(m->max_clients < MAX_PEER_ID); - for (int i =3D 0; i < m->max_clients; ++i) + for (uint32_t i =3D 0; i < m->max_clients; ++i) { if (!m->instances[i]) { @@ -4117,10 +4103,6 @@ } } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - /** * @brief Determines the earliest wakeup interval based on periodic operat= ions. * diff --git a/src/openvpn/multi.h b/src/openvpn/multi.h index 17d850b..e0108ad 100644 --- a/src/openvpn/multi.h +++ b/src/openvpn/multi.h @@ -182,7 +182,7 @@ struct multi_reap *reaper; struct mroute_addr local; bool enable_c2c; - int max_clients; + uint32_t max_clients; int tcp_queue_limit; int status_file_version; int n_clients; /* current number of authenticated clients */ diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 8daec42..861e194 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -1431,7 +1431,7 @@ SHOW_INT(cf_per); SHOW_INT(cf_initial_max); SHOW_INT(cf_initial_per); - SHOW_INT(max_clients); + SHOW_UINT(max_clients); SHOW_INT(max_routes_per_client); SHOW_STR(auth_user_pass_verify_script); SHOW_BOOL(auth_user_pass_verify_script_via_file); @@ -7354,7 +7354,7 @@ else if (streq(p[0], "max-clients") && p[1] && !p[2]) { VERIFY_PERMISSION(OPT_P_GENERAL); - if (!atoi_constrained(p[1], &options->max_clients, p[0], 1, MAX_PE= ER_ID, msglevel)) + if (!atoi_constrained(p[1], (int *)&options->max_clients, p[0], 1,= MAX_PEER_ID - 1, msglevel)) { goto err; } diff --git a/src/openvpn/options.h b/src/openvpn/options.h index 3d8b505..a956a96 100644 --- a/src/openvpn/options.h +++ b/src/openvpn/options.h @@ -530,7 +530,7 @@ int cf_initial_max; int cf_initial_per; - int max_clients; + uint32_t max_clients; int max_routes_per_client; int stale_routes_check_interval; int stale_routes_ageing_time; -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1564?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings?usp=3Demail Gerrit-MessageType: newchange Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I8d6b7bc1b7744dc6d57aaed3231b8901275752f2 Gerrit-Change-Number: 1564 Gerrit-PatchSet: 1 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos --sN0+OhoePuA= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is cur= rently required from: plaisthos.

flichtenheld would like plaisthos to review this change.

V= iew Change

Change type of max_clients to uint32_t
<= br>peer_id is mostly this already (except in DCO
context for some reason= ), and max_peerid was
defined as uint32_t as well. So changing max_clien= ts
to uint32_t avoids many -Wsign-compare warnings.

While here fi= x limit for max_clients in options
parsing. It is not allowed to be MAX_= PEER_ID
exactly.

Change-Id: I8d6b7bc1b7744dc6d57aaed3231b89012757= 52f2
Signed-off-by: Frank Lichtenheld <frank@...2641...>
---M src/openvpn/dco_freebsd.c
M src/openvpn/dco_linux.c
M src/openvpn/= dco_win.c
M src/openvpn/mudp.c
M src/openvpn/multi.c
M src/openvpn= /multi.h
M src/openvpn/options.c
M src/openvpn/options.h
8 files c= hanged, 10 insertions(+), 64 deletions(-)

git pu=
ll ssh://gerrit.openvpn.net:29418/openvpn refs/changes/64/1564/1
di=
ff --git a/src/openvpn/dco_freebsd.c b/src/openvpn/dco_freebsd.c
= index a1e373d..718cd8b 100644
--- a/src/openvpn/dco_f= reebsd.c
+++ b/src/openvpn/dco_freebsd.c
@@= -559,11 +559,6 @@
return ret;
}

-#if defi= ned(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wsign-compare&quo= t;
-#endif
-

static void
dco_update_peer_stat(struct multi_context *m, uint32_t peerid,= const nvlist_t *nvl)
{
@@ -582,10 +577,6 = @@
__func__, peerid, mi->context.c2.dco_read_by= tes, mi->context.c2.dco_write_bytes);
}

-#if defined(__GNUC_= _) || defined(__clang__)
-#endif
-=
int
dco_read_and_process(dco_context_t *dco)
{
diff --git a/src/openvpn/dco_linux.c b/src= /openvpn/dco_linux.c
index b92fa43..37171c5 100644--- a/src/openvpn/dco_linux.c
+++ b/src/openvpn/dco= _linux.c
@@ -858,11 +858,6 @@
}=
}

-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "= -Wsign-compare"

-#= endif
-
static int
ovpn_handle_peer(dco_context_t *dco, struct n= lattr *attrs[])
{
@@ -889,7 +884,7 @@
if (dco->ifmode =3D=3D OVPN_MODE_P2P)
= {
c2 =3D &dco->c->c2;
- if (c2->tls_multi->dco= _peer_id !=3D peer_id)

-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic po= p
-#endif
-

static bool

ovpn_iface_check(dco_context_t *dco, struct nlattr *attrs[])
{
diff --git a/src/openvpn/dco_win.c b/src/o= penvpn/dco_win.c
index f46c24d..2e26f2a 100644
--- a/src/openvpn/dco_win.c

+++ b/src/openvpn/dco_win.c=
@@ -739,11 +739,6 @@
return 0;=
}

-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "= -Wsign-compare"
-#= endif
-
int
dco_get_peer_stats_multi(dco_context_t *dco, const b= ool raise_sigusr1_on_err)
{
@@ -838,9 +833= ,9 @@
{
OVPN_PEER_STATS *stat= =3D &peer_stats[i];

- if (stat->PeerId >=3D dco->c->mult= i->max_clients)
+ = if (stat->PeerId >=3D (int)dco->c->multi->max_clients= )
{
- msg(M_WARN, "%s: received out of bound peer_id %u (= max=3D%u)", __func__, stat->PeerId,
+ msg(M_WARN, "%s: received out of b= ound peer_id %d (max=3D%u)", __func__, stat->PeerId,
dco->c->multi->max_clients);
= continue;
}
@@ -871,10 = +866,6 @@
return ret;
}

-#if defined(__GNU= C__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-

int
dco_get_peer_stats_fallback(struct contex= t *c, const bool raise_sigusr1_on_err)
{
d= iff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.c
index b= 359750..432c79a 100644
--- a/src/openvpn/mudp.c
<= span>+++ b/src/openvpn/mudp.c
@@ -180,11 +180,6 @@ return false;
}

<= span style=3D"color: hsl(0, 100%, 40%);">-#if defined(__GNUC__) || defined(= __clang__)
-#pragma GCC= diagnostic push
-#prag= ma GCC diagnostic ignored "-Wsign-compare"
-#endif
-
/*
* Get a client inst= ance based on real address. If
* the instance doesn'= t exist, create it while
@@ -217,7 +212,7 @@
uint32_t peer_id =3D ((uint32_t)ptr[1] << 16) | ((uint= 32_t)ptr[2] << 8) | ((uint32_t)ptr[3]);
= peer_id_disabled =3D (peer_id =3D=3D MAX_PEER_ID);
=
- if (!peer_id_dis= abled && (peer_id < m->max_clients) && (m->instanc= es[peer_id]))
+ = if (!peer_id_disabled && (peer_id < m->max_clients) &am= p;& m->instances[peer_id])
{
= /* Floating on TCP will never be possible, so ensure= we only process
* UDP clients */<= br>@@ -315,10 +310,6 @@
return mi;
}

-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
/*
* Send a packet to UDP= socket.
*/
diff --git a/src/openvpn/mult= i.c b/src/openvpn/multi.c
index c03e821..f825bf8 100644

--- a/src/openvpn/multi.c
+++ b/src/openvpn/mu= lti.c
@@ -695,11 +695,6 @@
} }

-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wsi= gn-compare"
-#endi= f
-
/*=
* Create a client instance object for a newly connected = client.
*/
@@ -782,10 +777,6 @@ return NULL;
}

-#if defined(__GNUC__) || defined(__= clang__)
-#pragma GCC d= iagnostic pop
-#endif
-
/*
* Dump tables -- triggered by SIGUSR2.
* = If status file is defined, write to file.
@@ -3261,7 +3252,= 7 @@
return;
}

- if ((peer_id &= lt; m->max_clients) && (m->instances[peer_id]))
+ if (((uint32_t)peer_id < m= ->max_clients) && m->instances[peer_id])

= {
struct multi_instance *mi =3D m->instances[p= eer_id];
set_prefix(mi);
@@ -4085,= 18 +4076,13 @@
#endif /* ifdef ENABLE_MANAGEMENT */=
}

-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "= -Wsign-compare"
-#= endif
-
void
multi_assign_peer_id(struct multi_context *m, struc= t multi_instance *mi)
{
/* max_client= s must be less then max peer-id value */
ASSERT(m->= max_clients < MAX_PEER_ID);

- for (int i =3D 0; i < m->max_clients; = ++i)
+ for (uint32= _t i =3D 0; i < m->max_clients; ++i)
{ if (!m->instances[i])
{<= br>@@ -4117,10 +4103,6 @@
}
}

-#if d= efined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
/**
* @brief Determines the earl= iest wakeup interval based on periodic operations.
*

diff --git a/src/openvpn/multi.h b/src/openvpn/multi.hindex 17d850b..e0108ad 100644
--- a/src/openvpn/mul= ti.h
+++ b/src/openvpn/multi.h
@@ -182,7 +1= 82,7 @@
struct multi_reap *reaper;
= struct mroute_addr local;
bool enable_c2c;- int max_clients;
= + uint32_t max_clients;
int tcp_queue_limit;
int status_file_= version;
int n_clients; /* current number of authentic= ated clients */
diff --git a/src/openvpn/options.c b/src/op= envpn/options.c
index 8daec42..861e194 100644
--- a/src/openvpn/options.c

+++ b/src/openvpn/options.c<= /span>
@@ -1431,7 +1431,7 @@
SHOW_INT(cf_per)= ;
SHOW_INT(cf_initial_max);
SHOW_= INT(cf_initial_per);
- = SHOW_INT(max_clients);
+ SHOW_UINT(max_clients);
SHOW_INT(max_routes_= per_client);
SHOW_STR(auth_user_pass_verify_script);
SHOW_BOOL(auth_user_pass_verify_script_via_file);

@@ -7354,7 +7354,7 @@
else if (streq(p[0], = "max-clients") && p[1] && !p[2])
= {
VERIFY_PERMISSION(OPT_P_GENERAL);- if (!atoi_constrained(p= [1], &options->max_clients, p[0], 1, MAX_PEER_ID, msglevel))<= br>+ if (!atoi_constrain= ed(p[1], (int *)&options->max_clients, p[0], 1, MAX_PEER_ID - 1, msg= level))
{
goto err;
}
diff --git a/src/openvpn/options.= h b/src/openvpn/options.h
index 3d8b505..a956a96 100644
--- a/src/openvpn/options.h
+++ b/src/openvpn/= options.h
@@ -530,7 +530,7 @@
int cf_i= nitial_max;
int cf_initial_per;

- int max_clients;

+ uint32_t max_clients;=
int max_routes_per_client;
int s= tale_routes_check_interval;
int stale_routes_ageing_ti= me;

To view, visit change 1564. To unsubscr= ibe, or for help writing mail filters, visit settings.

Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I8d6b7bc1b7744dc6d57aaed3231= b8901275752f2
Gerrit-Change-Number: 1564
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
= --sN0+OhoePuA=--