From: "flichtenheld (Code Review)" Date: Mon, 1 Sep 2025 15:09:33 +0000 In-Reply-To: References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: <1cd404225f56f29329624f7964161c06c58d45d3-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="ixDkt0oFa0Q="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: manage: Make sure various management flags are treated as unsigned List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos Cc: openvpn-devel --ixDkt0oFa0Q= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld. Hello plaisthos, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/1105?usp=3Demail to look at the new patch set (#10). The change is no longer submittable: checks~ChecksSubmitRule is unsatisfied= now. Change subject: manage: Make sure various management flags are treated as u= nsigned ...................................................................... manage: Make sure various management flags are treated as unsigned The variables that hold them are already unsigned, make sure the flags are as well to avoid spurious conversion warnings. Change-Id: I0937165c5efa95136bd951345a076e33e396f26a Signed-off-by: Frank Lichtenheld --- M src/openvpn/init.c M src/openvpn/manage.h M src/openvpn/options.h 3 files changed, 41 insertions(+), 41 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/05/1105/10 diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 9dd3b96..39ea8e4 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -370,7 +370,7 @@ && ((ce->flags >> CE_MAN_QUERY_REMOTE_SHIFT) & CE_MAN_QUERY_REMOTE= _MASK) =3D=3D CE_MAN_QUERY_REMOTE_QUERY) { - int flags =3D 0; + unsigned int flags =3D 0; if (!strcmp(p[1], "ACCEPT")) { flags =3D CE_MAN_QUERY_REMOTE_ACCEPT; diff --git a/src/openvpn/manage.h b/src/openvpn/manage.h index b8892c8..e9e1f95 100644 --- a/src/openvpn/manage.h +++ b/src/openvpn/manage.h @@ -24,24 +24,24 @@ #define MANAGE_H /* management_open flags */ -#define MF_SERVER (1 << 0) -#define MF_QUERY_PASSWORDS (1 << 1) -#define MF_HOLD (1 << 2) -#define MF_SIGNAL (1 << 3) -#define MF_FORGET_DISCONNECT (1 << 4) -#define MF_CONNECT_AS_CLIENT (1 << 5) -#define MF_CLIENT_AUTH (1 << 6) -/* #define MF_CLIENT_PF (1<<7) *REMOVED FEATURE* */ -#define MF_UNIX_SOCK (1 << 8) -#define MF_EXTERNAL_KEY (1 << 9) -#define MF_EXTERNAL_KEY_NOPADDING (1 << 10) -#define MF_EXTERNAL_KEY_PKCS1PAD (1 << 11) -#define MF_UP_DOWN (1 << 12) -#define MF_QUERY_REMOTE (1 << 13) -#define MF_QUERY_PROXY (1 << 14) -#define MF_EXTERNAL_CERT (1 << 15) -#define MF_EXTERNAL_KEY_PSSPAD (1 << 16) -#define MF_EXTERNAL_KEY_DIGEST (1 << 17) +#define MF_SERVER (1u << 0) +#define MF_QUERY_PASSWORDS (1u << 1) +#define MF_HOLD (1u << 2) +#define MF_SIGNAL (1u << 3) +#define MF_FORGET_DISCONNECT (1u << 4) +#define MF_CONNECT_AS_CLIENT (1u << 5) +#define MF_CLIENT_AUTH (1u << 6) +/* #define MF_CLIENT_PF (1u << 7) *REMOVED FEATURE* */ +#define MF_UNIX_SOCK (1u << 8) +#define MF_EXTERNAL_KEY (1u << 9) +#define MF_EXTERNAL_KEY_NOPADDING (1u << 10) +#define MF_EXTERNAL_KEY_PKCS1PAD (1u << 11) +#define MF_UP_DOWN (1u << 12) +#define MF_QUERY_REMOTE (1u << 13) +#define MF_QUERY_PROXY (1u << 14) +#define MF_EXTERNAL_CERT (1u << 15) +#define MF_EXTERNAL_KEY_PSSPAD (1u << 16) +#define MF_EXTERNAL_KEY_DIGEST (1u << 17) #ifdef ENABLE_MANAGEMENT @@ -64,9 +64,9 @@ { unsigned long cid; -#define DAF_CONNECTION_ESTABLISHED (1 << 0) -#define DAF_CONNECTION_CLOSED (1 << 1) -#define DAF_INITIAL_AUTH (1 << 2) +#define DAF_CONNECTION_ESTABLISHED (1u << 0) +#define DAF_CONNECTION_CLOSED (1u << 1) +#define DAF_INITIAL_AUTH (1u << 2) unsigned int flags; unsigned int mda_key_id_counter; @@ -117,23 +117,23 @@ union log_entry_union u; }; -#define LOG_PRINT_LOG_PREFIX (1 << 0) -#define LOG_PRINT_ECHO_PREFIX (1 << 1) -#define LOG_PRINT_STATE_PREFIX (1 << 2) +#define LOG_PRINT_LOG_PREFIX (1u << 0) +#define LOG_PRINT_ECHO_PREFIX (1u << 1) +#define LOG_PRINT_STATE_PREFIX (1u << 2) -#define LOG_PRINT_INT_DATE (1 << 3) -#define LOG_PRINT_MSG_FLAGS (1 << 4) -#define LOG_PRINT_STATE (1 << 5) -#define LOG_PRINT_LOCAL_IP (1 << 6) +#define LOG_PRINT_INT_DATE (1u << 3) +#define LOG_PRINT_MSG_FLAGS (1u << 4) +#define LOG_PRINT_STATE (1u << 5) +#define LOG_PRINT_LOCAL_IP (1u << 6) -#define LOG_PRINT_CRLF (1 << 7) -#define LOG_FATAL_NOTIFY (1 << 8) +#define LOG_PRINT_CRLF (1u << 7) +#define LOG_FATAL_NOTIFY (1u << 8) -#define LOG_PRINT_INTVAL (1 << 9) +#define LOG_PRINT_INTVAL (1u << 9) =20 -#define LOG_PRINT_REMOTE_IP (1 << 10) +#define LOG_PRINT_REMOTE_IP (1u << 10) -#define LOG_ECHO_TO_LOG (1 << 11) +#define LOG_ECHO_TO_LOG (1u << 11) const char *log_entry_print(const struct log_entry *e, unsigned int flags,= struct gc_arena *gc); @@ -175,7 +175,7 @@ { void *arg; -#define MCF_SERVER (1 << 0) /* is OpenVPN being run as a server? */ +#define MCF_SERVER (1u << 0) /* is OpenVPN being run as a server? */ unsigned int flags; void (*status)(void *arg, const int version, struct status_output *so); @@ -253,9 +253,9 @@ int client_gid; /* flags for handling the management interface "signal" command */ -#define MANSIG_IGNORE_USR1_HUP (1 << 0) -#define MANSIG_MAP_USR1_TO_HUP (1 << 1) -#define MANSIG_MAP_USR1_TO_TERM (1 << 2) +#define MANSIG_IGNORE_USR1_HUP (1u << 0) +#define MANSIG_MAP_USR1_TO_HUP (1u << 1) +#define MANSIG_MAP_USR1_TO_TERM (1u << 2) unsigned int mansig; }; diff --git a/src/openvpn/options.h b/src/openvpn/options.h index 44f3fc9..bb2c052 100644 --- a/src/openvpn/options.h +++ b/src/openvpn/options.h @@ -147,14 +147,14 @@ int explicit_exit_notification; /* Explicitly tell peer when we are ex= iting via OCC_EXIT or [RESTART] message */ =20 -#define CE_DISABLED (1 << 0) -#define CE_MAN_QUERY_PROXY (1 << 1) +#define CE_DISABLED (1u << 0) +#define CE_MAN_QUERY_PROXY (1u << 1) #define CE_MAN_QUERY_REMOTE_UNDEF 0 #define CE_MAN_QUERY_REMOTE_QUERY 1 #define CE_MAN_QUERY_REMOTE_ACCEPT 2 #define CE_MAN_QUERY_REMOTE_MOD 3 #define CE_MAN_QUERY_REMOTE_SKIP 4 -#define CE_MAN_QUERY_REMOTE_MASK (0x07) +#define CE_MAN_QUERY_REMOTE_MASK (0x07u) #define CE_MAN_QUERY_REMOTE_SHIFT (2) unsigned int flags; -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1105?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I0937165c5efa95136bd951345a076e33e396f26a Gerrit-Change-Number: 1105 Gerrit-PatchSet: 10 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: flichtenheld Gerrit-MessageType: newpatchset --ixDkt0oFa0Q= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld.

flichtenheld uploaded patch set #10 to this change.

=

View = Change

The change is no longer submittable: checks~ChecksSubmitRu= le is unsatisfied now.

manage: Make sure various management flags are treat=
ed as unsigned

The variables that hold them are already unsigned, ma= ke sure
the flags are as well to avoid spurious conversion warnings.
=
Change-Id: I0937165c5efa95136bd951345a076e33e396f26a
Signed-off-by: = Frank Lichtenheld <frank@...2641...>
---
M src/openvpn/init.cM src/openvpn/manage.h
M src/openvpn/options.h
3 files changed, 41 = insertions(+), 41 deletions(-)

git pull ssh://gerrit.openvpn.net:=
29418/openvpn refs/changes/05/1105/10
diff --git a/src/openvpn/init=
.c b/src/openvpn/init.c
index 9dd3b96..39ea8e4 100644
--- a/src/openvpn/init.c
+++ b/src/openvpn/init.= c
@@ -370,7 +370,7 @@
&& (= (ce->flags >> CE_MAN_QUERY_REMOTE_SHIFT) & CE_MAN_QUERY_REMOTE= _MASK)
=3D=3D CE_MAN_QUERY_REMOTE_QUERY)
{
- = int flags =3D 0;
+ unsigned int flags =3D 0;
if (!strcmp(= p[1], "ACCEPT"))
{
= flags =3D CE_MAN_QUERY_REMOTE_ACCEPT;
diff --git a/= src/openvpn/manage.h b/src/openvpn/manage.h
index b8892c8..= e9e1f95 100644
--- a/src/openvpn/manage.h
+= ++ b/src/openvpn/manage.h
@@ -24,24 +24,24 @@
#define MANAGE_H


/* management_open = flags */
-#define MF_SE= RVER (1 << 0)
-#define MF_QUERY_PASSWORDS (1 << 1)
-#define MF_HOLD = (1 << 2)

-#define= MF_SIGNAL (1 << 3)
-#define MF_FORGET_DISCONNECT (1 << 4)=
-#define MF_CONNECT_AS_CLIENT= (1 << 5)
-#= define MF_CLIENT_AUTH (1 << 6)
-/* #define MF_CLIENT_PF (1<<7) *REM= OVED FEATURE* */
-#defi= ne MF_UNIX_SOCK (1 << 8)
-#define MF_EXTERNAL_KEY (1 << 9)
-#define MF_EXTERNAL_KEY_NO= PADDING (1 << 10)
-#define MF_EXTERNAL_KEY_PKCS1PAD (1 << 11)
-#define MF_UP_DOWN (1 <&l= t; 12)
-#define MF_QUER= Y_REMOTE (1 << 13)
-#define MF_QUERY_PROXY (1 << 14)
-#define MF_EXTERNAL_CERT = (1 << 15)

-#defin= e MF_EXTERNAL_KEY_PSSPAD (1 << 16)
-#define MF_EXTERNAL_KEY_DIGEST (1 << 17)
+#define MF_SERVER = (1u << 0)
+#define MF_QUERY_PASSWORDS (1u << 1)
+#define MF_HOLD (1u = << 2)
+#define = MF_SIGNAL (1u << 3)
+#define MF_FORGET_DISCONNECT (1u << 4)
+#define MF_CONNECT_AS_C= LIENT (1u << 5)
+#define MF_CLIENT_AUTH (1u << 6)
+/* #define MF_CLIENT_PF (= 1u << 7) *REMOVED FEATURE* */
+#define MF_UNIX_SOCK (1u << 8)+#define MF_EXTERNAL_KEY = (1u << 9)
= +#define MF_EXTERNAL_KEY_NOPADDING (1u << 10)
+#define MF_EXTERNAL_KEY_PKCS1PAD (1u <= ;< 11)
+#define MF= _UP_DOWN (1u << 12)
+#define MF_QUERY_REMOTE (1u << 13)
+#define MF_QUERY_PROXY = (1u << 14)
+#define MF_EXTERNAL_CERT (1u << 15)
+#define MF_EXTERNAL_KEY_PSSPAD (1= u << 16)
+#defi= ne MF_EXTERNAL_KEY_DIGEST (1u << 17)

<= span>

#ifdef ENABLE_MANAGEMENT
@@ -64,9 += 64,9 @@
{
unsigned long cid;
-#define DAF_= CONNECTION_ESTABLISHED (1 << 0)
-#define DAF_CONNECTION_CLOSED (1 << 1)-#define DAF_INITIAL_AUTH = (1 << 2)
+#= define DAF_CONNECTION_ESTABLISHED (1u << 0)
+#define DAF_CONNECTION_CLOSED (1u <&l= t; 1)
+#define DAF_IN= ITIAL_AUTH (1u << 2)
unsigned int flag= s;

unsigned int mda_key_id_counter;<= /span>
@@ -117,23 +117,23 @@
union log_entry_= union u;
};

-#define LOG_PRINT_LOG_PREFIX (1 << 0)
-#define LOG_PRINT_ECHO_PRE= FIX (1 << 1)
-#d= efine LOG_PRINT_STATE_PREFIX (1 << 2)
+#define LOG_PRINT_LOG_PREFIX (1u << 0)
+#define LOG_PRINT_ECHO_P= REFIX (1u << 1)
-#define LOG_PRINT_INT_DATE (= 1 << 3)
-#define = LOG_PRINT_MSG_FLAGS (1 << 4)
-#define LOG_PRINT_STATE (1 << 5)
-#define LOG_PRINT_LOCAL_IP (1 << 6= )
+#define LOG_PRINT_= INT_DATE (1u << 3)
+#define LOG_PRINT_MSG_FLAGS (1u << 4)
+#define LOG_PRINT_STATE (1u << 5)
+#define LOG_PRINT_LOC= AL_IP (1u << 6)

-#define LOG_PRINT_CRLF (1 << 7)
-#define LOG_FATAL_NOTIFY (1 << 8= )
+#define LOG_PRINT_= CRLF (1u << 7)
-#define LOG_PRINT_INTVAL (1 <<= ; 9)
+#define LOG_PRI= NT_INTVAL (1u << 9)

-#define LOG_PRINT_REMOTE_IP (1 << 10)+#define LOG_PRINT_REMOTE_IP (= 1u << 10)

-#define LOG_ECHO_TO_LOG (1 << 11)
+#define LOG_ECHO_TO_LOG (1u << 11)<= /span>

const char *log_entry_print(const struct= log_entry *e, unsigned int flags, struct gc_arena *gc);
<= /span>
@@ -175,7 +175,7 @@
{
= void *arg;

-#define MCF_SERVER (1 << 0) /* is OpenVPN being run as a serv= er? */
+#define MCF_S= ERVER (1u << 0) /* is OpenVPN being run as a server? */
unsigned int flags;


void (*s= tatus)(void *arg, const int version, struct status_output *so);
<= span>@@ -253,9 +253,9 @@

int client_gid;

/* flags for handling the management interface "= signal" command */
-#define MANSIG_IGNORE_USR1_HUP (1 << 0)
-#define MANSIG_MAP_USR1_TO_HUP (1 << 1)
-#define MANSIG_MAP_USR1= _TO_TERM (1 << 2)
+#define MANSIG_IGNORE_USR1_HUP (1u << 0)
+#define MANSIG_MAP_USR1_TO_HUP (1u <&= lt; 1)
+#define MANSI= G_MAP_USR1_TO_TERM (1u << 2)
unsigned int mansig= ;
};

diff --git a/src/op= envpn/options.h b/src/openvpn/options.h
index 44f3fc9..bb2c= 052 100644
--- a/src/openvpn/options.h
+++ = b/src/openvpn/options.h
@@ -147,14 +147,14 @@
int explicit_exit_notification; /* Explicitly tell peer when we are= exiting via OCC_EXIT or

= [RESTART] message */

-#define CE_DISABLED (1 << 0)
-#define CE_MAN_QUERY_PRO= XY (1 << 1)
+#define CE_DISABLED (1u << 0)
+#define CE_MAN_QUERY_PROXY (1u= << 1)
#define CE_MAN_QUERY_REMOTE_UNDEF 0 #define CE_MAN_QUERY_REMOTE_QUERY 1
#define CE_M= AN_QUERY_REMOTE_ACCEPT 2
#define CE_MAN_QUERY_REMOTE_MOD = 3
#define CE_MAN_QUERY_REMOTE_SKIP 4
-#define CE_MAN_QUERY_REMOTE_MASK (0x0= 7)
+#define CE_MAN_QU= ERY_REMOTE_MASK (0x07u)
#define CE_MAN_QUERY_REMOTE_SHIF= T (2)
unsigned int flags;

To view, visit change 1105. To unsubscribe, or for h= elp writing mail filters, visit settings.

=
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I0937165c5efa95136bd951345a0= 76e33e396f26a
Gerrit-Change-Number: 1105
Gerrit-PatchSet: 10
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-MessageType: newpatchset
--ixDkt0oFa0Q=--