From: "flichtenheld (Code Review)" Date: Thu, 24 Jul 2025 12:31:43 +0000 References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: <2854996f9dfd1590e1375d52e20724a9b2cad35c-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="D4bHme9u6dg="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: options: Make sure option types are treated as unsigned List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos Cc: openvpn-devel --D4bHme9u6dg= 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/+/1106?usp=3Demail to review the following change. Change subject: options: Make sure option types are treated as unsigned ...................................................................... options: Make sure option types are treated as unsigned verify_permissions already expects them to be unsigned, make sure they are to avoid spurious conversion warnings. Change-Id: I1d27cb81d32058e40147e1d6dcd12df7f6cb2b30 Signed-off-by: Frank Lichtenheld --- M src/openvpn/options.h 1 file changed, 32 insertions(+), 32 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/06/1106/1 diff --git a/src/openvpn/options.h b/src/openvpn/options.h index 137e012..4ba8e3d 100644 --- a/src/openvpn/options.h +++ b/src/openvpn/options.h @@ -728,38 +728,38 @@ /* * Option classes. */ -#define OPT_P_GENERAL (1<<0) -#define OPT_P_UP (1<<1) -#define OPT_P_ROUTE (1<<2) -#define OPT_P_DHCPDNS (1<<3) /* includes ip windows options lik= e */ -#define OPT_P_SCRIPT (1<<4) -#define OPT_P_SETENV (1<<5) -#define OPT_P_SHAPER (1<<6) -#define OPT_P_TIMER (1<<7) -#define OPT_P_PERSIST (1<<8) -#define OPT_P_PERSIST_IP (1<<9) -#define OPT_P_COMP (1<<10) /* TODO */ -#define OPT_P_MESSAGES (1<<11) -#define OPT_P_NCP (1<<12) /**< Negotiable crypto parameters */ -#define OPT_P_TLS_PARMS (1<<13) /* TODO */ -#define OPT_P_MTU (1<<14) /* TODO */ -#define OPT_P_NICE (1<<15) -#define OPT_P_PUSH (1<<16) -#define OPT_P_INSTANCE (1<<17) /**< allowed in ccd, client-connect = etc*/ -#define OPT_P_CONFIG (1<<18) -#define OPT_P_EXPLICIT_NOTIFY (1<<19) -#define OPT_P_ECHO (1<<20) -#define OPT_P_INHERIT (1<<21) -#define OPT_P_ROUTE_EXTRAS (1<<22) -#define OPT_P_PULL_MODE (1<<23) -#define OPT_P_PLUGIN (1<<24) -#define OPT_P_SOCKBUF (1<<25) -#define OPT_P_SOCKFLAGS (1<<26) -#define OPT_P_CONNECTION (1<<27) -#define OPT_P_PEER_ID (1<<28) -#define OPT_P_INLINE (1<<29) -#define OPT_P_PUSH_MTU (1<<30) -#define OPT_P_ROUTE_TABLE (1<<31) +#define OPT_P_GENERAL (1u<<0) +#define OPT_P_UP (1u<<1) +#define OPT_P_ROUTE (1u<<2) +#define OPT_P_DHCPDNS (1u<<3) /* includes ip windows options li= ke */ +#define OPT_P_SCRIPT (1u<<4) +#define OPT_P_SETENV (1u<<5) +#define OPT_P_SHAPER (1u<<6) +#define OPT_P_TIMER (1u<<7) +#define OPT_P_PERSIST (1u<<8) +#define OPT_P_PERSIST_IP (1u<<9) +#define OPT_P_COMP (1u<<10) /* TODO */ +#define OPT_P_MESSAGES (1u<<11) +#define OPT_P_NCP (1u<<12) /**< Negotiable crypto parameters */ +#define OPT_P_TLS_PARMS (1u<<13) /* TODO */ +#define OPT_P_MTU (1u<<14) /* TODO */ +#define OPT_P_NICE (1u<<15) +#define OPT_P_PUSH (1u<<16) +#define OPT_P_INSTANCE (1u<<17) /**< allowed in ccd, client-connect= etc*/ +#define OPT_P_CONFIG (1u<<18) +#define OPT_P_EXPLICIT_NOTIFY (1u<<19) +#define OPT_P_ECHO (1u<<20) +#define OPT_P_INHERIT (1u<<21) +#define OPT_P_ROUTE_EXTRAS (1u<<22) +#define OPT_P_PULL_MODE (1u<<23) +#define OPT_P_PLUGIN (1u<<24) +#define OPT_P_SOCKBUF (1u<<25) +#define OPT_P_SOCKFLAGS (1u<<26) +#define OPT_P_CONNECTION (1u<<27) +#define OPT_P_PEER_ID (1u<<28) +#define OPT_P_INLINE (1u<<29) +#define OPT_P_PUSH_MTU (1u<<30) +#define OPT_P_ROUTE_TABLE (1u<<31) #define OPT_P_DEFAULT (~(OPT_P_INSTANCE|OPT_P_PULL_MODE)) --=20 To view, visit http://gerrit.openvpn.net/c/openvpn/+/1106?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: I1d27cb81d32058e40147e1d6dcd12df7f6cb2b30 Gerrit-Change-Number: 1106 Gerrit-PatchSet: 1 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-MessageType: newchange --D4bHme9u6dg= 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

options: Make sure option types are treated as unsigned
<= br>verify_permissions already expects them to be unsigned,
make sure the= y are to avoid spurious conversion warnings.

Change-Id: I1d27cb81d32= 058e40147e1d6dcd12df7f6cb2b30
Signed-off-by: Frank Lichtenheld <frank= @...2641...>
---
M src/openvpn/options.h
1 file changed, 32 ins= ertions(+), 32 deletions(-)

git pull ssh://gerrit.openvpn.net:294=
18/openvpn refs/changes/06/1106/1
diff --git a/src/openvpn/options.=
h b/src/openvpn/options.h
index 137e012..4ba8e3d 100644
--- a/src/openvpn/options.h
+++ b/src/openvpn/= options.h
@@ -728,38 +728,38 @@
/*<= br> * Option classes.
*/
-#define OPT_P_GENERAL (1<<0)
-#define OPT_P_UP = (1<<1)
-#defi= ne OPT_P_ROUTE (1<<2)
-#define OPT_P_DHCPDNS (1<<3) /* includes i= p windows options like */
-#define OPT_P_SCRIPT (1<<4)
-#define OPT_P_SETENV (1<<5)<= br>-#define OPT_P_SHAPER = (1<<6)
-#define = OPT_P_TIMER (1<<7)
-#define OPT_P_PERSIST (1<<8)
-#define OPT_P_PERSIST_IP (1<<9= )
-#define OPT_P_COMP = (1<<10) /* TODO */
-#define OPT_P_MESSAGES (1<<11)
-#define OPT_P_NCP (1<<= 12) /**< Negotiable crypto parameters */
-#define OPT_P_TLS_PARMS (1<<13) /* TODO *= /
-#define OPT_P_MTU = (1<<14) /* TODO */
-#define OPT_P_NICE (1<<15)
-#define OPT_P_PUSH (1<<= 16)
-#define OPT_P_INST= ANCE (1<<17) /**< allowed in ccd, client-connect etc*/
-#define OPT_P_CONFIG = (1<<18)
-#def= ine OPT_P_EXPLICIT_NOTIFY (1<<19)
-#define OPT_P_ECHO (1<<20)
-#define OPT_P_INHERIT (1<= ;<21)

-#define OPT_P= _ROUTE_EXTRAS (1<<22)
-#define OPT_P_PULL_MODE (1<<23)
-#define OPT_P_PLUGIN (1<<24)=
-#define OPT_P_SOCKBUF= (1<<25)
= -#define OPT_P_SOCKFLAGS (1<<26)
-#define OPT_P_CONNECTION (1<<27)-#define OPT_P_PEER_ID = (1<<28)
-#define = OPT_P_INLINE (1<<29)
-#define OPT_P_PUSH_MTU (1<<30)
-#define OPT_P_ROUTE_TABLE (1<<= ;31)
+#define OPT_P_G= ENERAL (1u<<0)
+#define OPT_P_UP (1u<<1)
+#define OPT_P_ROUTE (1u<<= 2)
+#define OPT_P_DHC= PDNS (1u<<3) /* includes ip windows options like */=
+#define OPT_P_SCRIPT = (1u<<4)
+#d= efine OPT_P_SETENV (1u<<5)
+#define OPT_P_SHAPER (1u<<6)+#define OPT_P_TIMER = (1u<<7)
+#defi= ne OPT_P_PERSIST (1u<<8)
+#define OPT_P_PERSIST_IP (1u<<9)
+#define OPT_P_COMP (1= u<<10) /* TODO */

+#define OPT_P_MESSAGES (1u<<11)
+#define OPT_P_NCP (1u<<12) /= **< Negotiable crypto parameters */
+#define OPT_P_TLS_PARMS (1u<<13) /* TODO */<= /span>
+#define OPT_P_MTU = (1u<<14) /* TODO */
+#define OPT_P_NICE (1u<<15)
+#define OPT_P_PUSH (1u&= lt;<16)

+#define O= PT_P_INSTANCE (1u<<17) /**< allowed in ccd, client-connect = etc*/
+#define OPT_P_= CONFIG (1u<<18)
+#define OPT_P_EXPLICIT_NOTIFY (1u<<19)
+#define OPT_P_ECHO (1u<&l= t;20)
+#define OPT_P_= INHERIT (1u<<21)
+#define OPT_P_ROUTE_EXTRAS (1u<<22)
+#define OPT_P_PULL_MODE (1u<&l= t;23)
+#define OPT_P_= PLUGIN (1u<<24)
+#define OPT_P_SOCKBUF (1u<<25)
+#define OPT_P_SOCKFLAGS (1u<&l= t;26)
+#define OPT_P_= CONNECTION (1u<<27)
+#define OPT_P_PEER_ID (1u<<28)
+#define OPT_P_INLINE (1u<&l= t;29)
+#define OPT_P_= PUSH_MTU (1u<<30)
+#define OPT_P_ROUTE_TABLE (1u<<31)

#define OPT_P_DEFAULT (~(OPT_P_INSTANCE|OPT_P_PULL_MODE))=


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

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I1d27cb81d32058e40147e1d6dcd= 12df7f6cb2b30
Gerrit-Change-Number: 1106
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
--D4bHme9u6dg=--