From: "flichtenheld (Code Review)" Date: Tue, 20 Jan 2026 14:10:56 +0000 References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: <373655878fd451a628da65fc9981bd5d54488c71-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="9UKE0naOlhQ="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: route: Fix conversion warnings on BSDs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos Cc: openvpn-devel --9UKE0naOlhQ= 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/+/1481?usp=3Demail to review the following change. Change subject: route: Fix conversion warnings on BSDs ...................................................................... route: Fix conversion warnings on BSDs Mostly just use better types. And in some places remove overloading of variables with nicer C11 code. Change-Id: Idbb5c0fff759a2e645a8b4f62266509e32e3a44e Signed-off-by: Frank Lichtenheld --- M src/openvpn/route.c 1 file changed, 33 insertions(+), 50 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/81/1481/3 diff --git a/src/openvpn/route.c b/src/openvpn/route.c index d90c84b..93f61a1 100644 --- a/src/openvpn/route.c +++ b/src/openvpn/route.c @@ -1762,11 +1762,6 @@ return (status !=3D RTA_ERROR); } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wconversion" -#endif - void route_ipv6_clear_host_bits(struct route_ipv6 *r6) { @@ -1833,7 +1828,7 @@ if (r6->iface !=3D NULL && gateway_needed && IN6_IS_ADDR_LINKLOCAL(&r6->gateway)) /* fe80::...%intf */ { - int len =3D strlen(gateway) + 1 + strlen(r6->iface) + 1; + size_t len =3D strlen(gateway) + 1 + strlen(r6->iface) + 1; char *tmp =3D gc_malloc(len, true, &gc); snprintf(tmp, len, "%s%%%s", gateway, r6->iface); gateway =3D tmp; @@ -2253,7 +2248,7 @@ if (r6->iface !=3D NULL && gateway_needed && IN6_IS_ADDR_LINKLOCAL(&r6->gateway)) /* fe80::...%intf */ { - int len =3D strlen(gateway) + 1 + strlen(r6->iface) + 1; + size_t len =3D strlen(gateway) + 1 + strlen(r6->iface) + 1; char *tmp =3D gc_malloc(len, true, &gc); snprintf(tmp, len, "%s%%%s", gateway, r6->iface); gateway =3D tmp; @@ -2374,10 +2369,6 @@ net_ctx_reset(ctx); } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - /* * The --redirect-gateway option requires OS-specific code below * to get the current default gateway. @@ -3354,19 +3345,19 @@ #define NEXTADDR(w, u) \ if (rtm_addrs & (w)) \ { \ - l =3D sizeof(u); \ + size_t l =3D sizeof(u); \ memmove(cp, &(u), l); \ cp +=3D ROUNDUP(l); \ } #define ADVANCE(x, n) (x +=3D ROUNDUP(sizeof(struct sockaddr_in))) #else /* if defined(TARGET_SOLARIS) */ -#define NEXTADDR(w, u) \ - if (rtm_addrs & (w)) \ - { \ - l =3D ((struct sockaddr *)&(u))->sa_len; \ - memmove(cp, &(u), l); \ - cp +=3D ROUNDUP(l); \ +#define NEXTADDR(w, u) \ + if (rtm_addrs & (w)) \ + { \ + size_t l =3D ((struct sockaddr *)&(u))->sa_len; \ + memmove(cp, &(u), l); \ + cp +=3D ROUNDUP(l); \ } #define ADVANCE(x, n) (x +=3D ROUNDUP((n)->sa_len)) @@ -3374,19 +3365,13 @@ #define max(a, b) ((a) > (b) ? (a) : (b)) -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wconversion" -#endif - void get_default_gateway(struct route_gateway_info *rgi, in_addr_t dest, openvp= n_net_ctx_t *ctx) { struct gc_arena gc =3D gc_new(); struct rtmsg m_rtmsg; int sockfd =3D -1; - int seq, l, pid, rtm_addrs; - unsigned int i; + int rtm_addrs; struct sockaddr so_dst, so_mask; char *cp =3D m_rtmsg.m_space; struct sockaddr *gate =3D NULL, *ifp =3D NULL, *sa; @@ -3397,8 +3382,8 @@ CLEAR(*rgi); /* setup data to send to routing socket */ - pid =3D getpid(); - seq =3D 0; + const int pid =3D getpid(); + int seq =3D 0; #ifdef TARGET_OPENBSD rtm_addrs =3D RTA_DST | RTA_NETMASK; /* Kernel refuses RTA_IFP */ #else @@ -3415,7 +3400,7 @@ rtm.rtm_version =3D RTM_VERSION; rtm.rtm_seq =3D ++seq; #ifdef TARGET_OPENBSD - rtm.rtm_tableid =3D getrtable(); + rtm.rtm_tableid =3D (u_short)getrtable(); #endif rtm.rtm_addrs =3D rtm_addrs; @@ -3430,7 +3415,8 @@ NEXTADDR(RTA_DST, so_dst); NEXTADDR(RTA_NETMASK, so_mask); - rtm.rtm_msglen =3D l =3D cp - (char *)&m_rtmsg; + /* sizeof(struct rt_msghdr) + padding */ + rtm.rtm_msglen =3D (u_short)(cp - (char *)&m_rtmsg); /* transact with routing socket */ sockfd =3D socket(PF_ROUTE, SOCK_RAW, 0); @@ -3439,24 +3425,25 @@ msg(M_WARN, "GDG: socket #1 failed"); goto done; } - if (write(sockfd, (char *)&m_rtmsg, l) < 0) + if (write(sockfd, (char *)&m_rtmsg, rtm.rtm_msglen) < 0) { msg(M_WARN | M_ERRNO, "GDG: problem writing to routing socket"); goto done; } + ssize_t ret; do { - l =3D read(sockfd, (char *)&m_rtmsg, sizeof(m_rtmsg)); - } while (l > 0 && (rtm.rtm_seq !=3D seq || rtm.rtm_pid !=3D pid)); + ret =3D read(sockfd, (char *)&m_rtmsg, sizeof(m_rtmsg)); + } while (ret > 0 && (rtm.rtm_seq !=3D seq || rtm.rtm_pid !=3D pid)); close(sockfd); sockfd =3D -1; /* extract return data from routing socket */ rtm_aux =3D &rtm; - cp =3D ((char *)(rtm_aux + 1)); + cp =3D (char *)(rtm_aux + 1); if (rtm_aux->rtm_addrs) { - for (i =3D 1; i; i <<=3D 1) + for (unsigned int i =3D 1; i; i <<=3D 1) { if (i & rtm_aux->rtm_addrs) { @@ -3604,8 +3591,7 @@ { struct rtmsg m_rtmsg; int sockfd =3D -1; - int seq, l, pid, rtm_addrs; - unsigned int i; + int rtm_addrs; struct sockaddr_in6 so_dst, so_mask; char *cp =3D m_rtmsg.m_space; struct sockaddr *gate =3D NULL, *ifp =3D NULL, *sa; @@ -3614,8 +3600,8 @@ CLEAR(*rgi6); /* setup data to send to routing socket */ - pid =3D getpid(); - seq =3D 0; + const int pid =3D getpid(); + int seq =3D 0; #ifdef TARGET_OPENBSD rtm_addrs =3D RTA_DST | RTA_NETMASK; /* Kernel refuses RTA_IFP */ #else @@ -3632,7 +3618,7 @@ rtm.rtm_version =3D RTM_VERSION; rtm.rtm_seq =3D ++seq; #ifdef TARGET_OPENBSD - rtm.rtm_tableid =3D getrtable(); + rtm.rtm_tableid =3D (u_short)getrtable(); #endif so_dst.sin6_family =3D AF_INET6; @@ -3656,7 +3642,8 @@ NEXTADDR(RTA_DST, so_dst); NEXTADDR(RTA_NETMASK, so_mask); - rtm.rtm_msglen =3D l =3D cp - (char *)&m_rtmsg; + /* sizeof(struct rt_msghdr) + padding */ + rtm.rtm_msglen =3D (u_short)(cp - (char *)&m_rtmsg); /* transact with routing socket */ sockfd =3D socket(PF_ROUTE, SOCK_RAW, 0); @@ -3665,26 +3652,26 @@ msg(M_WARN, "GDG6: socket #1 failed"); goto done; } - if (write(sockfd, (char *)&m_rtmsg, l) < 0) + if (write(sockfd, (char *)&m_rtmsg, rtm.rtm_msglen) < 0) { msg(M_WARN | M_ERRNO, "GDG6: problem writing to routing socket"); goto done; } - + ssize_t ret; do { - l =3D read(sockfd, (char *)&m_rtmsg, sizeof(m_rtmsg)); - } while (l > 0 && (rtm.rtm_seq !=3D seq || rtm.rtm_pid !=3D pid)); + ret =3D read(sockfd, (char *)&m_rtmsg, sizeof(m_rtmsg)); + } while (ret > 0 && (rtm.rtm_seq !=3D seq || rtm.rtm_pid !=3D pid)); close(sockfd); sockfd =3D -1; /* extract return data from routing socket */ rtm_aux =3D &rtm; - cp =3D ((char *)(rtm_aux + 1)); + cp =3D (char *)(rtm_aux + 1); if (rtm_aux->rtm_addrs) { - for (i =3D 1; i; i <<=3D 1) + for (unsigned int i =3D 1; i; i <<=3D 1) { if (i & rtm_aux->rtm_addrs) { @@ -3752,10 +3739,6 @@ } } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - #undef max #elif defined(TARGET_HAIKU) -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1481?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings?usp=3Demail Gerrit-MessageType: newchange Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Idbb5c0fff759a2e645a8b4f62266509e32e3a44e Gerrit-Change-Number: 1481 Gerrit-PatchSet: 3 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos --9UKE0naOlhQ= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is cur= rently required from: plaisthos.

flichtenheld would like plaisthos to review this change.

V= iew Change

route: Fix conversion warnings on BSDs
<= br>Mostly just use better types. And in
some places remove overloading o= f
variables with nicer C11 code.

Change-Id: Idbb5c0fff759a2e645a8= b4f62266509e32e3a44e
Signed-off-by: Frank Lichtenheld <frank@...2724...= ..>
---
M src/openvpn/route.c
1 file changed, 33 insertions(+),= 50 deletions(-)

git pull ssh://gerrit.openvpn.n=
et:29418/openvpn refs/changes/81/1481/3
diff --git a/src/openvpn/ro=
ute.c b/src/openvpn/route.c
index d90c84b..93f61a1 100644
--- a/src/openvpn/route.c
+++ b/src/openvpn/= route.c
@@ -1762,11 +1762,6 @@
return = (status !=3D RTA_ERROR);
}

-#if defined(__GNUC__) || defined(__= clang__)

-#pragma GCC d= iagnostic push
-#pragma= GCC diagnostic ignored "-Wconversion"
-#endif
-
void
route_ipv6_clear_host_b= its(struct route_ipv6 *r6)
{
@@ -1833,7 +1= 828,7 @@
if (r6->iface !=3D NULL && gateway= _needed
&& IN6_IS_ADDR_LINKLOCAL(&r6-&= gt;gateway)) /* fe80::...%intf */
{
- int len =3D strlen(gateway) + 1 = + strlen(r6->iface) + 1;
+ size_t len =3D strlen(gateway) + 1 + strlen(r6->iface) += 1;
char *tmp =3D gc_malloc(len, true, &gc);
snprintf(tmp, len, "%s%%%s", gateway, r6-= >iface);
gateway =3D tmp;
@@ -2= 253,7 +2248,7 @@
if (r6->iface !=3D NULL &&= gateway_needed
&& IN6_IS_ADDR_LINKLOCAL(&= amp;r6->gateway)) /* fe80::...%intf */
{
= - int len =3D strlen(gatew= ay) + 1 + strlen(r6->iface) + 1;
+ size_t len =3D strlen(gateway) + 1 + strlen(r6->= iface) + 1;
char *tmp =3D gc_malloc(len, true, &am= p;gc);
snprintf(tmp, len, "%s%%%s", gate= way, r6->iface);
gateway =3D tmp;
@@ -2374,10 +2369,6 @@

net_ctx_reset(ctx); }

-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
/*
* The --redirect-= gateway option requires OS-specific code below
* to get t= he current default gateway.
@@ -3354,19 +3345,19 @@<= br> #define NEXTADDR(w, u) \
if (rtm_addr= s & (w)) \
{ \=
- l =3D sizeof(u); = \
+ size_t= l =3D sizeof(u); \
memmove(cp, &(u), l); \
cp +=3D ROUNDUP(l); \
}

#define ADVANCE(x, n) (x +=3D ROUNDUP(sizeo= f(struct sockaddr_in)))
#else /* if defined(TARGET_SOLARIS= ) */
-#define NEXTADDR(= w, u) \
- if (rtm_addrs & (w)) \
- { = \

- = l =3D ((struct sockaddr *)&(u))->sa_len; \
- memmove(cp, &(u), l); = \
- cp +=3D= ROUNDUP(l); \
+#define NEXTADDR(w, u) \
+ if (rtm_addrs &= (w)) \
+ { \
+ size_t l =3D (= (struct sockaddr *)&(u))->sa_len; \
+ memmove(cp, &(u), l); = \
+ cp += =3D ROUNDUP(l); \
}=

#define ADVANCE(x, n) (x +=3D ROUNDUP((n)->= sa_len))
@@ -3374,19 +3365,13 @@
#define max(a, b) ((a) > (b) ? (a) : (b))

-#if defined(__GNUC__) || = defined(__clang__)
-#pr= agma GCC diagnostic push
-#endif
-
void
get_default_g= ateway(struct route_gateway_info *rgi, in_addr_t dest, openvpn_net_ctx_t *c= tx)
{
struct gc_arena gc =3D gc_new()= ;
struct rtmsg m_rtmsg;
int sockf= d =3D -1;
- int seq,= l, pid, rtm_addrs;
- = unsigned int i;
+ = int rtm_addrs;
struct sockaddr so_dst, so_mask;
char *cp =3D m_rtmsg.m_space;
struct = sockaddr *gate =3D NULL, *ifp =3D NULL, *sa;
@@ -3397,8 +33= 82,8 @@
CLEAR(*rgi);

/* setup data to send to routing socket */

- pid =3D getpid();
- seq =3D 0;
+ const int pid =3D getpid();
+ int seq =3D 0;
#ifde= f TARGET_OPENBSD
rtm_addrs =3D RTA_DST | RTA_NETMASK; = /* Kernel refuses RTA_IFP */
#else
@@ -341= 5,7 +3400,7 @@
rtm.rtm_version =3D RTM_VERSION;=
rtm.rtm_seq =3D ++seq;
#ifdef TARGET_OPENBS= D
- rtm.rtm_tableid = =3D getrtable();
+ = rtm.rtm_tableid =3D (u_short)getrtable();
#endif rtm.rtm_addrs =3D rtm_addrs;

@@ -3430,7 +3415,8 @@

NEXTADDR(RTA_DST, so_dst);
NEXTADDR(RTA_NETMASK, so_mask);
- rtm.rtm_msglen =3D l =3D c= p - (char *)&m_rtmsg;
+ /* sizeof(struct rt_msghdr) + padding */
+ rtm.rtm_msglen =3D (u_short)(cp - (char = *)&m_rtmsg);

/* transact with ro= uting socket */
sockfd =3D socket(PF_ROUTE, SOCK_RAW, = 0);
@@ -3439,24 +3425,25 @@
msg(M_= WARN, "GDG: socket #1 failed");
goto don= e;
}
- if (write(sockfd, (char *)&m_rtmsg, l) < 0)
+ if (write(sockfd, (char *)&m= _rtmsg, rtm.rtm_msglen) < 0)
{
= msg(M_WARN | M_ERRNO, "GDG: problem writing to routing socket&quo= t;);
goto done;
}
<= span style=3D"color: hsl(120, 100%, 40%);">+ ssize_t ret;

do

{
- l =3D read(sockfd, (char *)&m_rtmsg, sizeof(m_rtmsg)= );
- } while (l >= 0 && (rtm.rtm_seq !=3D seq || rtm.rtm_pid !=3D pid));
+ ret =3D read(sockfd, (ch= ar *)&m_rtmsg, sizeof(m_rtmsg));

+ } while (ret > 0 && (rtm.rtm_seq !=3D seq |= | rtm.rtm_pid !=3D pid));
close(sockfd);
sockfd =3D -1;


/* extract re= turn data from routing socket */
rtm_aux =3D &rtm;=
- cp =3D ((char *)(= rtm_aux + 1));
+ c= p =3D (char *)(rtm_aux + 1);
if (rtm_aux->rtm_addrs= )
{
+ for (unsigned int i =3D 1; i; i <<= =3D 1)
{
if (i & = rtm_aux->rtm_addrs)
{
@@ -3= 604,8 +3591,7 @@
{
struct rtmsg m_rtm= sg;
int sockfd =3D -1;
- int seq, l, pid, rtm_addrs;
- unsigned int i;
+ int rtm_addrs;
s= truct sockaddr_in6 so_dst, so_mask;
char *cp =3D m_rtm= sg.m_space;
struct sockaddr *gate =3D NULL, *ifp =3D N= ULL, *sa;
@@ -3614,8 +3600,8 @@
CLEAR(= *rgi6);

/* setup data to send to rou= ting socket */
- pid= =3D getpid();
- seq= =3D 0;
+ const in= t pid =3D getpid();
+= int seq =3D 0;
#ifdef TARGET_OPENBSD
= rtm_addrs =3D RTA_DST | RTA_NETMASK; /* Kernel refuses RTA_IFP */
#else
@@ -3632,7 +3618,7 @@
= rtm.rtm_version =3D RTM_VERSION;
rtm.rtm_seq =3D ++s= eq;
#ifdef TARGET_OPENBSD
- rtm.rtm_tableid =3D getrtable();
+ rtm.rtm_tableid =3D (u_short)getr= table();
#endif

so_= dst.sin6_family =3D AF_INET6;
@@ -3656,7 +3642,8 @@<= br> NEXTADDR(RTA_DST, so_dst);
NEXTADDR(RTA_= NETMASK, so_mask);

- rtm.rtm_msglen =3D l =3D cp - (char *)&m_rtmsg;
+ /* sizeof(struct rt_= msghdr) + padding */
= + rtm.rtm_msglen =3D (u_short)(cp - (char *)&m_rtmsg);

/* transact with routing socket */
sockfd =3D socket(PF_ROUTE, SOCK_RAW, 0);

@@ -3665,2= 6 +3652,26 @@
msg(M_WARN, "GDG6: socket #1 fa= iled");
goto done;
}
- if (write(sockfd, (ch= ar *)&m_rtmsg, l) < 0)
+ if (write(sockfd, (char *)&m_rtmsg, rtm.rtm_msglen) < = 0)
{
msg(M_WARN | M_ERRNO, &q= uot;GDG6: problem writing to routing socket");
= goto done;
}
-
+ s= size_t ret;
do
{
- l =3D read(sockfd, (char *)&am= p;m_rtmsg, sizeof(m_rtmsg));
- } while (l > 0 && (rtm.rtm_seq !=3D seq || rtm.rtm_pi= d !=3D pid));
+ = ret =3D read(sockfd, (char *)&m_rtmsg, sizeof(m_rtmsg));
+ } while (ret > 0 &&am= p; (rtm.rtm_seq !=3D seq || rtm.rtm_pid !=3D pid));


close(sockfd);
sockfd =3D -1;
/* extract return data from routing socket *= /
rtm_aux =3D &rtm;
- cp =3D ((char *)(rtm_aux + 1));
+ cp =3D (char *)(rtm_aux + 1);
if (rtm_aux->rtm_addrs)
{=
- for (i =3D 1; i; i &= lt;<=3D 1)
+ = for (unsigned int i =3D 1; i; i <<=3D 1)
{=
if (i & rtm_aux->rtm_addrs)
= {
@@ -3752,10 +3739,6 @@
}

}

-#if defined(__GNUC__) || defined(__clang__)-#pragma GCC diagnostic pop
-#endif
-
#undef max
<= span>

#elif defined(TARGET_HAIKU)
=

To view, visit change 1481. To unsubscribe, or for help writing ma= il filters, visit settings.

Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Idbb5c0fff759a2e645a8b4f6226= 6509e32e3a44e
Gerrit-Change-Number: 1481
Gerrit-PatchSet: 3
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...>
= --9UKE0naOlhQ=--