From: "cron2 (Code Review)" Date: Sun, 25 Jan 2026 17:50:50 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <40cbff0a384c6e360e5eb9f809d7225c635354bd-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="NK0o0DHBMkg="; 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: flichtenheld Cc: plaisthos , openvpn-devel --NK0o0DHBMkg= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/14= 81?usp=3Demail ) 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 Acked-by: Arne Schwabe Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1481 Message-Id: <20260122133050.117000-1-frank@...2641...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg35= 394.html Signed-off-by: Gert Doering --- M src/openvpn/route.c 1 file changed, 33 insertions(+), 50 deletions(-) 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; =20 /* 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: merged Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Idbb5c0fff759a2e645a8b4f62266509e32e3a44e Gerrit-Change-Number: 1481 Gerrit-PatchSet: 4 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel --NK0o0DHBMkg= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 sub= mitted this change.

View Change

route: Fix conversion warnings on BSDs

Mo= stly just use better types. And in
some places remove overloading of
= variables with nicer C11 code.

Change-Id: Idbb5c0fff759a2e645a8b4f62= 266509e32e3a44e
Signed-off-by: Frank Lichtenheld <frank@...2641...>= ;
Acked-by: Arne Schwabe <arne-openvpn@...1227...>
Gerrit URL: = https://gerrit.openvpn.net/c/openvpn/+/1481
Message-Id: <202601221330= 50.117000-1-frank@...2641...>
URL: https://www.mail-archive.com/openv= pn-devel@lists.sourceforge.net/msg35394.html
Signed-off-by: Gert Doering= <gert@...1296...>
---
M src/openvpn/route.c
1 file changed,= 33 insertions(+), 50 deletions(-)

diff --git a/src/openvpn/route.c b/src/openvpn/route.c
i= ndex d90c84b..93f61a1 100644
--- a/src/openvpn/route.c
+++ b/src/openvpn/route.c
@@ -1762,11 +1762,6 @= @
return (status !=3D RTA_ERROR);
}

-#if d= efined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion&qu= ot;
-#endif
<= span style=3D"color: hsl(0, 100%, 40%);">-

void
= route_ipv6_clear_host_bits(struct route_ipv6 *r6)
{=
@@ -1833,7 +1828,7 @@
if (r6->ifac= e !=3D NULL && gateway_needed
&& I= N6_IS_ADDR_LINKLOCAL(&r6->gateway)) /* fe80::...%intf */
<= span> {

- in= t 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, &q= uot;%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 *tm= p =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(__cla= ng__)
-#pragma GCC diag= nostic pop
-#endif
-
/*
* The --redirect-gateway option requires OS-specific code belo= w
* 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 ADVAN= CE(x, n) (x +=3D ROUNDUP(sizeof(struct sockaddr_in)))
#els= e /* if defined(TARGET_SOLARIS) */
-#define NEXTADDR(w, u) \
- if (rtm_addrs & (w)) = \

- = { \
- l =3D ((struct sockaddr *)&(u))->sa_l= en; \
- 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, &a= mp;(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 "-Wcon= version"
-#endif
-
void<= /span>
get_default_gateway(struct route_gateway_info *rgi, in_add= r_t dest, openvpn_net_ctx_t *ctx)
{
s= truct gc_arena gc =3D gc_new();
struct rtmsg m_rtmsg;<= /span>
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;<= /span>
@@ -3397,8 +3382,8 @@
CLEAR(*rgi);

/* setup data to send to routing socket= */
- pid =3D getpid= ();
- seq =3D 0;
+ const int pid =3D g= etpid();
+ int seq= =3D 0;
#ifdef TARGET_OPENBSD
rtm_add= rs =3D RTA_DST | RTA_NETMASK; /* Kernel refuses RTA_IFP */
= #else
@@ -3415,7 +3400,7 @@
rtm.rtm_v= ersion =3D RTM_VERSION;
rtm.rtm_seq =3D ++seq;<= br> #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 @@
N= EXTADDR(RTA_DST, so_dst);
NEXTADDR(RTA_NETMASK, so_mas= k);

-= rtm.rtm_msglen =3D l =3D cp - (char *)&m_rtmsg;
+ /* sizeof(struct rt_msghdr) + paddi= ng */
+ rtm.rtm_ms= glen =3D (u_short)(cp - (char *)&m_rtmsg);

= /* transact with routing socket */
sockfd = =3D socket(PF_ROUTE, SOCK_RAW, 0);
@@ -3439,24 +3425,25 @@<= /span>
msg(M_WARN, "GDG: socket #1 failed");
goto done;
}
- if (write(sockfd, (char *)&m_rtm= sg, l) < 0)
+ i= f (write(sockfd, (char *)&m_rtmsg, rtm.rtm_msglen) < 0)
{

msg(M_WARN | M_ERRNO, "GDG: proble= m writing to routing socket");
goto done;
}
+= ssize_t ret;
do
{
<= span style=3D"color: hsl(0, 100%, 40%);">- l =3D read(sockfd, (char = *)&m_rtmsg, sizeof(m_rtmsg));

- } while (l > 0 && (rtm.rtm_seq !=3D seq || rtm.r= tm_pid !=3D pid));
+ = ret =3D read(sockfd, (char *)&m_rtmsg, sizeof(m_rtmsg));<= br>+ } 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 */
<= span> 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 (unsign= ed 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 i= nt i;
+ int rtm_ad= drs;
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 @@<= /span>
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 TARGE= T_OPENBSD
rtm_addrs =3D RTA_DST | RTA_NETMASK; /* Kern= el refuses RTA_IFP */
#else
@@ -3632,7 +36= 18,7 @@
rtm.rtm_version =3D RTM_VERSION;
rtm.rtm_seq =3D ++seq;

#ifdef TARGET_OPENBSD
- rtm.rtm_tableid =3D get= rtable();
+ rtm.rt= m_tableid =3D (u_short)getrtable();
#endif

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

<= span style=3D"color: hsl(0, 100%, 40%);">- rtm.rtm_msglen =3D l =3D cp -= (char *)&m_rtmsg;

+ rtm.rtm_msglen =3D (u_short)(cp - (char *)&= amp;m_rtmsg);

/* transact with routi= ng socket */
sockfd =3D socket(PF_ROUTE, SOCK_RAW, 0);=
@@ -3665,26 +3652,26 @@
msg(M_WAR= N, "GDG6: socket #1 failed");
goto done;=
}
- if (write(sockfd, (char *)&m_rtmsg, l) < 0)
+ if (write(sockfd, (char *)&m_r= tmsg, 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.rt= m_seq !=3D seq || rtm.rtm_pid !=3D pid));
+ ret =3D read(sockfd, (char *)&m_rtmsg, si= zeof(m_rtmsg));
+ = } while (ret > 0 && (rtm.rtm_seq !=3D seq || rtm.rtm_pid !=3D pi= d));

close(sockfd);
= sockfd =3D -1;

/* extract retur= n 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)<= /span>
{
= - 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_H= AIKU)

To view, visit change 1481. To unsubs= cribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: merged
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Idbb5c0fff759a2e645a8b4f6226= 6509e32e3a44e
Gerrit-Change-Number: 1481
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>
= --NK0o0DHBMkg=--