From: "cron2 (Code Review)" Date: Sun, 12 Apr 2026 15:13:38 +0000 In-Reply-To: References: Reply-To: gert@...1296..., 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="MGjm9Kv5/Zk="; 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: flichtenheld , plaisthos Cc: openvpn-devel --MGjm9Kv5/Zk= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: cron2, flichtenheld, plaisthos. cron2 has uploaded a new patch set (#2) to the change originally created by= flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1564?usp=3Demail ) The following approvals got outdated and were removed: Code-Review+2 by cron2 The change is no longer submittable: Code-Review and checks~ChecksSubmitRul= e are unsatisfied now. 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 Acked-by: Gert Doering Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1564 Message-Id: <20260407112434.5588-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg36= 535.html Signed-off-by: Gert Doering --- 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/2 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 4c896f6..40746bd 100644 --- a/src/openvpn/dco_linux.c +++ b/src/openvpn/dco_linux.c @@ -859,11 +859,6 @@ } } =20 -#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[]) { @@ -890,7 +885,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; } @@ -919,10 +914,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; } -#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]; - 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 c7a91ab..fe210ee 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 */ } -#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 935bda1..3ed08d4 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 b8d0f5a..70af6d2 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -1428,7 +1428,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); @@ -7378,7 +7378,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 422820c..a111cf8 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: newpatchset Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I8d6b7bc1b7744dc6d57aaed3231b8901275752f2 Gerrit-Change-Number: 1564 Gerrit-PatchSet: 2 Gerrit-Owner: flichtenheld Gerrit-Reviewer: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: cron2 Gerrit-Attention: flichtenheld --MGjm9Kv5/Zk= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is cur= rently required from: cron2, flichtenheld, plaisthos.

cron2 uploaded patch set #2 to the change originally cr= eated by flichtenheld.

View Change

The following approvals got outd= ated and were removed: Code-Review+2 by cron2

The change is no longer submittable: Code-Revi= ew and checks~ChecksSubmitRule are unsatisfied now.

Change=
 type of max_clients to uint32_t

peer_id is mostly this already (exc= ept in DCO
context for some reason), and max_peerid was
defined as ui= nt32_t as well. So changing max_clients
to uint32_t avoids many -Wsign-c= ompare 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 Lichtenhe= ld <frank@...2641...>
Acked-by: Gert Doering <gert@...1296...&g= t;
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1564
Message-Id= : <20260407112434.5588-1-gert@...1296...>
URL: https://www.mail-ar= chive.com/openvpn-devel@lists.sourceforge.net/msg36535.html
Signed-off-b= y: Gert Doering <gert@...1296...>
---
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.ne=
t:29418/openvpn refs/changes/64/1564/2
diff --git a/src/openvpn/dco=
_freebsd.c b/src/openvpn/dco_freebsd.c
index a1e373d..718cd= 8b 100644
--- a/src/openvpn/dco_freebsd.c
+= ++ b/src/openvpn/dco_freebsd.c
@@ -559,11 +559,6 @@<= br> return ret;
}

-#if defined(__GNUC__) || defined(_= _clang__)
-#pragma GCC = diagnostic push
-#pragm= a GCC diagnostic ignored "-Wsign-compare"
-#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_bytes, mi->context.c2.d= co_write_bytes);
}

-#if defined(__GNUC__) || defined(__clang__)=
-#pragma GCC diagnosti= c pop
-#endif-
int dco_read_and_process(dco_context_t *dco)
{<= br>diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c
index 4c896f6..40746bd 100644
--- a/src/openvp= n/dco_linux.c
+++ b/src/openvpn/dco_linux.c
@@ -859,11 +859,6 @@

}
}
<= span>
-#if defined(__G= NUC__) || 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[])
{
@@ -890,7 +885,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;
}@@ -919,10 +914,6 @@
return NL_OK;
}


-#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/d= co_win.c
+++ b/src/openvpn/dco_win.c
@@ -73= 9,11 +739,6 @@
return 0;
}
=
-#if defined(__= GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wsign-compare"
-#endif
-
int
d= co_get_peer_stats_multi(dco_context_t *dco, const bool raise_sigusr1_on_err= )
{
@@ -838,9 +833,9 @@
= {
OVPN_PEER_STATS *stat =3D &peer_stats[i];=

- = if (stat->PeerId >=3D dco->c->multi->max_clients)
+ if (stat->Peer= Id >=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-&= gt;c->multi->max_clients);
continue;
}
@@ -871,10 +866,6 @@
return ret;

}

-#if defined(__GNUC__) || defined(__clang_= _)
-#pragma GCC diagnos= tic pop
-#endif<= br>-
int<= br> dco_get_peer_stats_fallback(struct context *c, const bool raise_s= igusr1_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/m= udp.c
@@ -180,11 +180,6 @@
return fals= e;
}

-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
<= br>-#pragma GCC diagnostic ignore= d "-Wsign-compare"
-#endif
-<= br> /*
* Get a client instance based on real addres= s. If
* the instance doesn't exist, create it while<= /span>
@@ -217,7 +212,7 @@
uint32_t p= eer_id =3D ((uint32_t)ptr[1] << 16) | ((uint32_t)ptr[2] << 8) |= ((uint32_t)ptr[3]);
peer_id_disabled =3D (pee= r_id =3D=3D MAX_PEER_ID);

- if (!peer_id_disabled && (peer_id= < m->max_clients) && (m->instances[peer_id]))
<= span style=3D"color: hsl(120, 100%, 40%);">+ if (!peer_id_disabl= ed && (peer_id < m->max_clients) && m->instances[p= eer_id])

{
/*= Floating on TCP will never be possible, so ensure we only 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 c7a91ab..fe210ee 100644
--- a/src/op= envpn/multi.c
+++ b/src/openvpn/multi.c
@@ = -695,11 +695,6 @@
}
}

-#if defined(__GNUC_= _) || defined(__clang__)
-#pragma GCC diagnostic ignored "-Wsign-compare"-#endif
-
/*
* Cr= eate 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 defin= ed, 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 */
}
=
-#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_PEE= R_ID);

+ for (uint32_t i =3D 0; i < m->= ;max_clients; ++i)
{
if (!m-&= gt;instances[i])
{
@@ -4117,10 +41= 03,6 @@
}
}
<= br>-#if defined(__GNUC__) || defi= ned(__clang__)
-#pragma= GCC diagnostic pop
-#e= ndif
-
= /**
* @brief Determines the earliest wakeup interval bas= ed on periodic operations.
*
diff --git a= /src/openvpn/multi.h b/src/openvpn/multi.h
index 935bda1..3= ed08d4 100644
--- a/src/openvpn/multi.h
+++= b/src/openvpn/multi.h
@@ -182,7 +182,7 @@
= struct multi_reap *reaper;
struct mroute_addr loc= al;
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.cindex b8d0f5a..70af6d2 100644
--- a/src/openvpn/opt= ions.c
+++ b/src/openvpn/options.c
@@ -1428= ,7 +1428,7 @@
SHOW_INT(cf_per);
S= HOW_INT(cf_initial_max);
SHOW_INT(cf_initial_per);
- SHOW_INT(max_clients)= ;
+ SHOW_UINT(max_= clients);
SHOW_INT(max_routes_per_client);
<= span> SHOW_STR(auth_user_pass_verify_script);

SHOW= _BOOL(auth_user_pass_verify_script_via_file);
@@ -7378,7 +7= 378,7 @@
else if (streq(p[0], "max-clients")= && p[1] && !p[2])
{
= VERIFY_PERMISSION(OPT_P_GENERAL);
- if (!atoi_constrained(p[1], &options->ma= x_clients, p[0], 1, MAX_PEER_ID, msglevel))
+ if (!atoi_constrained(p[1], (int *)&opt= ions->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 422820c..a111cf8 100644
--- a/src/o= penvpn/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;
in= t max_routes_per_client;
int stale_routes_check_interv= al;
int stale_routes_ageing_time;

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

Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I8d6b7bc1b7744dc6d57aaed3231= b8901275752f2
Gerrit-Change-Number: 1564
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: cron2 <gert@...1296...>= ;
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
= --MGjm9Kv5/Zk=--