From: "flichtenheld (Code Review)" Date: Tue, 5 Aug 2025 16:00:20 +0000 In-Reply-To: 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="xhFh6VNGwJ0="; 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 --xhFh6VNGwJ0= 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 reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/1105?usp=3Demail to look at the new patch set (#4). 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/4 diff --git a/src/openvpn/manage.h b/src/openvpn/manage.h index 083caf5..911e15b 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 38e67c8..5ee6e93 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: 4 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-MessageType: newpatchset --xhFh6VNGwJ0= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: plaisthos.

flichtenheld uploaded patch set #4 to this change.

<= p>View C= hange

manage: Make sure various management flags are treated as unsigne=
d

The variables that hold them are already unsigned, make sure
th= e flags are as well to avoid spurious conversion warnings.

Change-Id= : I0937165c5efa95136bd951345a076e33e396f26a
Signed-off-by: Frank Lichten= held <frank@...2641...>
---
M src/openvpn/manage.h
M src/ope= nvpn/options.h
2 files changed, 40 insertions(+), 40 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/05/1105/4<=
/pre>
-#define MF_SERVER                 (1 << 0)
-#define MF_QUERY_PASSWORDS (1 <= ;< 1)
-#define MF_HO= LD (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)
-#defi= ne 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 <&l= t; 14)
-#define MF_EXTE= RNAL_CERT (1 << 15)
-#define MF_EXTERNAL_KEY_PSSPAD (1 << 16)
-#define MF_EXTERNAL_KEY_DIGEST = (1 << 17)
+#def= ine 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)
+#def= ine MF_CONNECT_AS_CLIENT (1u << 5)
+#define MF_CLIENT_AUTH (1u << 6)=
+/* #define MF_CLIEN= T_PF (1u << 7) *REMOVED FEATURE* */
+#define MF_UNIX_SOCK (1u &l= t;< 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)
+#defin= e 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 l= ong cid;

-#define DAF_CONNECTION_ESTABLISHED (1 << 0)
-#define DAF_CONNECTION_CLOSED (1 <= < 1)
-#define DAF_IN= ITIAL_AUTH (1 << 2)
+#define DAF_CONNECTION_ESTABLISHED (1u << 0)+#define DAF_CONNECTION_CLOSE= D (1u << 1)
-#define LOG_PRINT_LOG_PREFIX (1= << 0)
-#define L= OG_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)<= /span>
-#define LOG_PRINT_LOCA= L_IP (1 << 6)
= +#define LOG_PRINT_INT_DATE (1u << 3)
+#define LOG_PRINT_MSG_FLAGS (1u << 4)=
+#define LOG_PRINT_STATE = (1u << 5)
+#d= efine LOG_PRINT_LOCAL_IP (1u << 6)

-#define LOG_PRINT_CRLF (1 << = 7)

-#define LOG_FATAL_N= OTIFY (1 << 8)
= +#define LOG_PRINT_CRLF (1u << 7)
+#define LOG_FATAL_NOTIFY (1u << 8)

-#define LOG_PRIN= T_INTVAL (1 << 9)
+#define LOG_PRINT_INTVAL (1u << 9)

-#define LOG_PRINT_REMOTE_IP (1 <= ;< 10)
+#define LO= G_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);<= /span>

@@ -175,7 +175,7 @@
{

void *arg;

-#define MCF_SERVER (1 << 0) /* is OpenVPN b= eing 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 status_output= *so);
@@ -253,9 +253,9 @@
int client_= gid;

/* flags for handling the managemen= t interface "signal" command */
-#define MANSIG_IGNORE_USR1_HUP (1 << 0)-#define MANSIG_MAP_USR1_TO_HUP= (1 << 1)
-#defi= ne MANSIG_MAP_USR1_TO_TERM (1 << 2)
+#define MANSIG_IGNORE_USR1_HUP (1u << 0)
+#define MANSIG_MAP_USR1_T= O_HUP (1u << 1)
-#define CE_DISABLED (= 1 << 0)
-#define = CE_MAN_QUERY_PROXY (1 << 1)
+#define CE_DISABLED (1u << 0)

+#define CE_MAN_QUERY_P= ROXY (1u << 1)
#define CE_MAN_QUERY_REMOTE_U= NDEF 0
#define CE_MAN_QUERY_REMOTE_QUERY 1
#define CE_MAN_QUERY_REMOTE_ACCEPT 2
#define CE_MAN_QU= ERY_REMOTE_MOD 3
#define CE_MAN_QUERY_REMOTE_SKIP 4
-#define CE_MAN_QUERY_RE= MOTE_MASK (0x07)
+#= define CE_MAN_QUERY_REMOTE_MASK (0x07u)
#define CE_MAN_Q= UERY_REMOTE_SHIFT (2)
unsigned int flags;
<= span>


To view, visit change 1105. To unsub= scribe, 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: 4
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: newpatchset
--xhFh6VNGwJ0=--