From: "flichtenheld (Code Review)" Date: Thu, 24 Jul 2025 12:31:42 +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="/vnFBZW84zY="; 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 --/vnFBZW84zY= 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/+/1105?usp=3Demail to review the following change. 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/manage.h M src/openvpn/options.h 2 files changed, 40 insertions(+), 40 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/05/1105/1 diff --git a/src/openvpn/manage.h b/src/openvpn/manage.h index eb19a4e..e25a615 100644 --- a/src/openvpn/manage.h +++ b/src/openvpn/manage.h @@ -25,24 +25,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 @@ struct man_def_auth_context { 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; @@ -116,23 +116,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); @@ -174,7 +174,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= ); @@ -257,9 +257,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 56e85d7..137e012 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: 1 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-MessageType: newchange --/vnFBZW84zY= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: plaisthos.

flichtenheld would like plaisthos to review this change.

V= iew Change

manage: Make sure various management flags are treated as un=
signed

The variables that hold them are already unsigned, make sure<= br>the flags are as well to avoid spurious conversion warnings.

Chan= ge-Id: I0937165c5efa95136bd951345a076e33e396f26a
Signed-off-by: Frank Li= chtenheld <frank@...2641...>
---
M src/openvpn/manage.h
M sr= c/openvpn/options.h
2 files changed, 40 insertions(+), 40 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/05/11=
05/1
diff --git a/src/openvpn/manage.h b/src/openvpn/manage.h
index eb19a4e..e25a615 100644
--- a/src/openvpn/= manage.h
+++ b/src/openvpn/manage.h
@@ -25,= 24 +25,24 @@
#define MANAGE_H

= /* management_open flags */
-#define MF_SERVER (1<<0)
-#define MF_QUERY_PASSWORDS (1<<1)<= /span>
-#define MF_HOLD = (1<<2)
-#d= efine MF_SIGNAL (1<<3)
-#define MF_FORGET_DISCONNECT (1<<4)
-#define MF_CONNECT_AS_CLIENT (1<&l= t;5)

-#define MF_CLIENT= _AUTH (1<<6)
-#define MF_UNIX_SOCK = (1<<8)
-#= define MF_EXTERNAL_KEY (1<<9)
-#define MF_EXTERNAL_KEY_NOPADDING (1<<10)=
-#define MF_EXTERNAL_K= EY_PKCS1PAD (1<<11)
-#define MF_UP_DOWN (1<<12)
-#define MF_QUERY_REMOTE (1&l= t;<13)
-#define MF_Q= UERY_PROXY (1<<14)
-#define MF_EXTERNAL_CERT (1<<15)-#define MF_EXTERNAL_KEY_PSSPAD = (1<<16)
-#de= fine MF_EXTERNAL_KEY_DIGEST (1<<17)
+#define MF_SERVER (1u<<0)
+#define MF_QUERY_PASSWORD= S (1u<<1)
+#d= efine MF_HOLD (1u<<2)
+#define MF_SIGNAL (1u<<3)
<= span style=3D"color: hsl(120, 100%, 40%);">+#define MF_FORGET_DISCONNECT (1= u<<4)

+#define = MF_CONNECT_AS_CLIENT (1u<<5)
+#define MF_CLIENT_AUTH (1u<<6)
+/* #define MF_CLIENT_PF (1u&l= t;<7) *REMOVED FEATURE* */
+#define MF_UNIX_SOCK (1u<<8)
+#define MF_EXTERNAL_KEY = (1u<<9)

+#defi= ne 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)
<= span style=3D"color: hsl(120, 100%, 40%);">+#define MF_QUERY_PROXY = (1u<<14)
+= #define MF_EXTERNAL_CERT (1u<<15)
+#define MF_EXTERNAL_KEY_PSSPAD (1u<&= lt;16)
+#define MF_EX= TERNAL_KEY_DIGEST (1u<<17)


#ifdef ENABLE_MANAGEMENT
@@ -64,9 +64,9 @@<= /span>
struct man_def_auth_context {
unsigne= d long cid;

-#define DAF_CONNECTION_ESTABLISHED (1<<0)
-#define DAF_CONNECTION_CLOSED (1<= <1)
-#define DAF_INI= TIAL_AUTH (1<<2)
+#define DAF_CONNECTION_ESTABLISHED (1u<<0)
+#define DAF_CONNECTION_CLOSED = (1u<<1)

+#def= ine DAF_INITIAL_AUTH (1u<<2)
unsigned = int flags;

unsigned int mda_key_id_c= ounter;
@@ -116,23 +116,23 @@
union lo= g_entry_union u;
};

-#define LOG_PRINT_LOG_PREFIX (1<<0= )
-#define LOG_PRINT_EC= HO_PREFIX (1<<1)
-#define LOG_PRINT_STATE_PREFIX (1<<2)
+#define LOG_PRINT_LOG_PREFIX (1u<<0)
+#define LOG_PRINT_ECHO_P= REFIX (1u<<1)
= +#define LOG_PRINT_STATE_PREFIX (1u<<2)

<= span style=3D"color: hsl(0, 100%, 40%);">-#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_PRIN= T_LOCAL_IP (1u<<6)

-#define LOG_PRINT_CRLF (1<<7)=
-#define LOG_FATAL_NOTIFY = (1<<8)
+#def= ine LOG_PRINT_CRLF (1u<<7)
+#define LOG_FATAL_NOTIFY (1u<<8)
-#define LOG_P= RINT_INTVAL (1<<9)
+#define LOG_PRINT_INTVAL (1u<<9)

-#define LOG_PRINT_REMOT= E_IP (1<<10)
+#define LOG_PRINT_REMOTE_IP (1u<<10)
-#define LOG_ECHO_TO_LOG = (1<<11)
+#defin= e LOG_ECHO_TO_LOG (1u<<11)

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

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

-#define MCF_SERVER (1<&l= t;0) /* is OpenVPN being run as a server? */
+#define MCF_SERVER (1u<<0) /* is OpenVPN b= eing run as a server? */
unsigned int flags;
void (*status) (void *arg, const int version,= struct status_output *so);
@@ -257,9 +257,9 @@
<= span> int client_gid;


/* flags for h= andling the management interface "signal" command */
-#define MANSIG_IGNORE_USR1_HUP (1= <<0)

-#define MAN= SIG_MAP_USR1_TO_HUP (1<<1)
-#define MANSIG_MAP_USR1_TO_TERM (1<<2)
+#define MANSIG_IGNORE_USR1_HUP (1u<= ;<0)
+#define MANS= IG_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 56e85d7..137e012 100644
--- a/src/openvpn/optio= ns.h
+++ b/src/openvpn/options.h
@@ -147,14= +147,14 @@

int explicit_exit_notifi= cation; /* Explicitly tell peer when we are exiting via OCC_EXIT or [RESTAR= T] message */

-#define CE_DISABLED (1<<0)
-#define CE_MAN_QUERY_PROXY (1<<1)
+#define CE_DISABLED (1u<<0)<= /span>
+#define CE_MAN_QUERY= _PROXY (1u<<1)
#define CE_MAN_QUERY_REMOTE_UNDEF 0<= /span>
#define CE_MAN_QUERY_REMOTE_QUERY 1
#def= ine CE_MAN_QUERY_REMOTE_ACCEPT 2
#define CE_MAN_QUERY_REMO= TE_MOD 3
#define CE_MAN_QUERY_REMOTE_SKIP 4-#define CE_MAN_QUERY_REMOTE_MAS= K (0x07)
+#define C= E_MAN_QUERY_REMOTE_MASK (0x07u)
#define CE_MAN_QUERY_REM= OTE_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: 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...>
Gerrit-MessageType: newchange
--/vnFBZW84zY=--