From: "cron2 (Code Review)" Date: Mon, 1 Sep 2025 15:49:23 +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="4pVATLcqq+M="; 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: flichtenheld Cc: plaisthos , openvpn-devel --4pVATLcqq+M= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/11= 05?usp=3Demail ) 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 Acked-by: Arne Schwabe Message-Id: <20250826184904.22057-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32= 687.html Signed-off-by: Gert Doering --- M src/openvpn/init.c M src/openvpn/manage.h M src/openvpn/options.h 3 files changed, 41 insertions(+), 41 deletions(-) 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) -#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 */ -#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: 11 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-MessageType: merged --4pVATLcqq+M= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 submitted this change.

View Change

manage: Make sure various management flags ar=
e treated as unsigned

The variables that hold them are already unsig= ned, make sure
the flags are as well to avoid spurious conversion warnin= gs.

Change-Id: I0937165c5efa95136bd951345a076e33e396f26a
Signed-o= ff-by: Frank Lichtenheld <frank@...2641...>
Acked-by: Arne Schwabe= <arne-openvpn@...1227...>
Message-Id: <20250826184904.22057-1-= gert@...1296...>
URL: https://www.mail-archive.com/openvpn-devel@...1514...= s.sourceforge.net/msg32687.html
Signed-off-by: Gert Doering <gert@...493...= 1296...>
---
M src/openvpn/init.c
M src/openvpn/manage.h
M s= rc/openvpn/options.h
3 files changed, 41 insertions(+), 41 deletions(-)<= br>
diff --git a/src/openvpn/init.c b/src/openvpn/init.c
ind= ex 9dd3b96..39ea8e4 100644
--- a/src/openvpn/init.c<= br>+++ 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_ACCE= PT;
diff --git a/src/openvpn/manage.h b/src/openvpn/manage.= h
index b8892c8..e9e1f95 100644
--- a/src/o= penvpn/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)<= /span>
-#define MF_FORGET_DISC= ONNECT (1 << 4)
-#define MF_CONNECT_AS_CLIENT (1 << 5)
-#define MF_CLIENT_AUTH (1 <&l= t; 6)
-/* #define MF_CL= IENT_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_U= P_DOWN (1 << 12)
-#define MF_QUERY_REMOTE (1 << 13)-#define MF_QUERY_PROXY = (1 << 14)
-#de= fine MF_EXTERNAL_CERT (1 << 15)
-#define MF_EXTERNAL_KEY_PSSPAD (1 << 16)<= /span>
-#define MF_EXTERNAL_KE= Y_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_DISC= ONNECT (1u << 4)
+#define MF_CONNECT_AS_CLIENT (1u << 5)
+#define MF_CLIENT_AUTH (1u= << 6)
+/* #def= ine 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 (1= u << 15)
+#defi= ne MF_EXTERNAL_KEY_PSSPAD (1u << 16)
+#define MF_EXTERNAL_KEY_DIGEST (1u << 17= )


#ifdef ENABLE_MANAGE= MENT
@@ -64,9 +64,9 @@
{
= unsigned long cid;

-#define DAF_CONNECTION_ESTABLISHED (1 << 0)=
-#define DAF_CONNECTION_CLOSE= D (1 << 1)
-= #define DAF_INITIAL_AUTH (1 << 2)
+#define DAF_CONNECTION_ESTABLISHED (1u <&l= t; 0)
+#define DAF_CO= NNECTION_CLOSED (1u << 1)
+#define DAF_INITIAL_AUTH (1u << 2)<= br> unsigned int flags;

un= signed int mda_key_id_counter;
@@ -117,23 +117,23 @@=
union log_entry_union u;
};

-#define LOG_PRINT_L= OG_PREFIX (1 << 0)
-#define LOG_PRINT_ECHO_PREFIX (1 << 1)
-#define LOG_PRINT_STATE_PREFIX (1 << 2)<= /span>
+#define LOG_PRINT_LO= G_PREFIX (1u << 0)
+#define LOG_PRINT_ECHO_PREFIX (1u << 1)
+#define LOG_PRINT_STATE_PREFIX (1u <&l= t; 2)

-#define LOG_PRINT_INT_DATE (1 << 3)
-#define LOG_PRINT_MSG_FLAGS (1 << 4)-#define LOG_PRINT_STATE (1 = << 5)
-#define LO= G_PRINT_LOCAL_IP (1 << 6)
+#define LOG_PRINT_INT_DATE (1u << 3)
+#define LOG_PRINT_MSG_FLAGS (1u <&l= t; 4)
+#define LOG_PR= INT_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)<= /span>

-#def= ine LOG_PRINT_INTVAL (1 << 9)
+#define LOG_PRINT_INTVAL (1u << 9)
<= /span>
-#define LOG_PRINT_REMO= TE_IP (1 << 10)
+#define LOG_PRINT_REMOTE_IP (1u << 10)

= -#define LOG_ECHO_TO_LOG (1 <&= lt; 11)
+#define LOG_= ECHO_TO_LOG (1u << 11)

const char = *log_entry_print(const struct log_entry *e, unsigned int flags, struct gc_a= rena *gc);

@@ -175,7 +175,7 @@
= {
void *arg;

-#define MCF_SERVER (1 << 0) /* i= s OpenVPN being run as a server? */
+#define MCF_SERVER (1u << 0) /* is OpenVPN being run = as a server? */
unsigned int flags;
<= /span>
void (*status)(void *arg, const int version, struct st= atus_output *so);
@@ -253,9 +253,9 @@
= int client_gid;

/* flags for handling th= e 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 <&= lt; 0)
+#define MANSI= G_MAP_USR1_TO_HUP (1u << 1)
+#define MANSIG_MAP_USR1_TO_TERM (1u << 2)
unsigned int mansig;

};
<= br>diff --git a/src/openvpn/options.h b/src/openvpn/options.h<= br>index 44f3fc9..bb2c052 100644
--- a/src/openvpn/op= tions.h
+++ b/src/openvpn/options.h
@@ -147= ,14 +147,14 @@
int explicit_exit_notification; /* Expl= icitly tell peer when we are exiting via OCC_EXIT or
= [RESTART] message */

-#define CE_DISABLED = (1 << 0)
-#define CE_MAN_QUERY_PROXY (1 << 1)
+#define CE_DISABLED (1u &l= t;< 0)
+#define CE= _MAN_QUERY_PROXY (1u << 1)
#define CE_MAN_QU= ERY_REMOTE_UNDEF 0
#define CE_MAN_QUERY_REMOTE_QUERY 1
#define CE_MAN_QUERY_REMOTE_ACCEPT 2
#defi= ne CE_MAN_QUERY_REMOTE_MOD 3
#define CE_MAN_QUERY_REMOT= E_SKIP 4
-#define CE_= MAN_QUERY_REMOTE_MASK (0x07)
+#define CE_MAN_QUERY_REMOTE_MASK (0x07u)
#def= ine CE_MAN_QUERY_REMOTE_SHIFT (2)
unsigned int flags;=


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

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I0937165c5efa95136bd951345a0= 76e33e396f26a
Gerrit-Change-Number: 1105
Gerrit-PatchSet: 11
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: merged
--4pVATLcqq+M=--