From: "flichtenheld (Code Review)" Date: Tue, 13 Jan 2026 16:59:54 +0000 References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: <62d772e54ed3a99a613231217fe8de0f7369270a-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="wCwtLC9g670="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: forward: Avoid conversion warning in ipv6_send_icmp_unreachable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos Cc: openvpn-devel --wCwtLC9g670= 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/+/1472?usp=3Demail to review the following change. Change subject: forward: Avoid conversion warning in ipv6_send_icmp_unreach= able ...................................................................... forward: Avoid conversion warning in ipv6_send_icmp_unreachable Since all values are limited by MAX_ICMPV6LEN we can just cast to uint16_t. While here remove a unused gc arena in neighbouring code. Change-Id: I701f9e0a96a7b43f278f8e6089e9156feab772c8 Signed-off-by: Frank Lichtenheld --- M src/openvpn/forward.c 1 file changed, 5 insertions(+), 16 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/72/1472/1 diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c index d208c21..3730cd5 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -1352,11 +1352,6 @@ check_status(c->c2.buf.len, "read from TUN/TAP", NULL, c->c1.tuntap); } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wconversion" -#endif - /** * Drops UDP packets which OS decided to route via tun. * @@ -1483,8 +1478,6 @@ void process_incoming_tun(struct context *c, struct link_socket *out_sock) { - struct gc_arena gc =3D gc_new(); - if (c->c2.buf.len > 0) { c->c2.tun_read_bytes +=3D c->c2.buf.len; @@ -1528,7 +1521,6 @@ { buf_reset(&c->c2.to_link); } - gc_free(&gc); } /** @@ -1593,7 +1585,7 @@ icmp6out.icmp6_type =3D OPENVPN_ICMP6_DESTINATION_UNREACHABLE; icmp6out.icmp6_code =3D OPENVPN_ICMP6_DU_NOROUTE; - int icmpheader_len =3D sizeof(struct openvpn_ipv6hdr) + sizeof(struct = openvpn_icmp6hdr); + const int icmpheader_len =3D sizeof(struct openvpn_ipv6hdr) + sizeof(s= truct openvpn_icmp6hdr); int totalheader_len =3D icmpheader_len; if (TUNNEL_TYPE(c->c1.tuntap) =3D=3D DEV_TYPE_TAP) @@ -1606,10 +1598,11 @@ * frame should be <=3D 1280 and have as much as possible of the origi= nal * packet */ - int max_payload_size =3D min_int(MAX_ICMPV6LEN, c->c2.frame.tun_mtu - = icmpheader_len); - int payload_len =3D min_int(max_payload_size, BLEN(&inputipbuf)); + const int max_payload_size =3D min_int(MAX_ICMPV6LEN, c->c2.frame.tun_= mtu - icmpheader_len); + const int payload_len =3D min_int(max_payload_size, BLEN(&inputipbuf)); + const uint16_t icmp_len =3D (uint16_t)(sizeof(struct openvpn_icmp6hdr)= + payload_len); - pip6out.payload_len =3D htons(sizeof(struct openvpn_icmp6hdr) + payloa= d_len); + pip6out.payload_len =3D htons(icmp_len); /* Construct the packet as outgoing packet back to the client */ struct buffer *outbuf; @@ -1665,10 +1658,6 @@ #undef MAX_ICMPV6LEN } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - void process_ip_header(struct context *c, unsigned int flags, struct buffer *bu= f, struct link_socket *sock) -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1472?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: I701f9e0a96a7b43f278f8e6089e9156feab772c8 Gerrit-Change-Number: 1472 Gerrit-PatchSet: 1 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos --wCwtLC9g670= 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

forward: Avoid conversion warning in ipv6_s=
end_icmp_unreachable

Since all values are limited by MAX_ICMPV6LEN w= e can
just cast to uint16_t.

While here remove a unused gc arena = in neighbouring
code.

Change-Id: I701f9e0a96a7b43f278f8e6089e9156= feab772c8
Signed-off-by: Frank Lichtenheld <frank@...2641...>
-= --
M src/openvpn/forward.c
1 file changed, 5 insertions(+), 16 deleti= ons(-)

git pull ssh://gerrit.openvpn.net:29418/o=
penvpn refs/changes/72/1472/1
diff --git a/src/openvpn/forward.c b/=
src/openvpn/forward.c
index d208c21..3730cd5 100644<= br>--- a/src/openvpn/forward.c
+++ b/src/openvpn/forw= ard.c
@@ -1352,11 +1352,6 @@
check_sta= tus(c->c2.buf.len, "read from TUN/TAP", NULL, c->c1.tuntap)= ;
}

-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push-#pragma GCC diagnostic ignored= "-Wconversion"
-#endif
-
= /**
* Drops UDP packets which OS decided to route = via tun.
*
@@ -1483,8 +1478,6 @@ void
process_incoming_tun(struct context *c, stru= ct link_socket *out_sock)
{
- struct gc_arena gc =3D gc_new();
-
if (c->c2.bu= f.len > 0)
{
c->c2.tun_= read_bytes +=3D c->c2.buf.len;
@@ -1528,7 +1521,6 @@
{
buf_reset(&c->c2.to_lin= k);
}
- gc_free(&gc);
}

<= span> /**

@@ -1593,7 +1585,7 @@
icmp6o= ut.icmp6_type =3D OPENVPN_ICMP6_DESTINATION_UNREACHABLE;
= icmp6out.icmp6_code =3D OPENVPN_ICMP6_DU_NOROUTE;

- int icmpheader_len =3D= sizeof(struct openvpn_ipv6hdr) + sizeof(struct openvpn_icmp6hdr);+ const int icmpheader_len= =3D sizeof(struct openvpn_ipv6hdr) + sizeof(struct openvpn_icmp6hdr);
int totalheader_len =3D icmpheader_len;
<= /span>
if (TUNNEL_TYPE(c->c1.tuntap) =3D=3D DEV_TYPE_TAP)<= /span>
@@ -1606,10 +1598,11 @@
* frame shoul= d be <=3D 1280 and have as much as possible of the original
* packet

*/
- int max_payload_size =3D min_int(MAX_ICMPV6LEN, c= ->c2.frame.tun_mtu - icmpheader_len);
- int payload_len =3D min_int(max_payload_size, BLEN(&= amp;inputipbuf));
+ = const int max_payload_size =3D min_int(MAX_ICMPV6LEN, c->c2.frame.tun_= mtu - icmpheader_len);
+ const ui= nt16_t icmp_len =3D (uint16_t)(sizeof(struct openvpn_icmp6hdr) + payload_le= n);

-= pip6out.payload_len =3D htons(sizeof(struct openvpn_icmp6hdr) + payload= _len);
+ pip6out.p= ayload_len =3D htons(icmp_len);

/* C= onstruct the packet as outgoing packet back to the client */
struct buffer *outbuf;

@@ -1665,10 +1658,6 @@=
#undef MAX_ICMPV6LEN
}
=
-#if defined(__GNUC__) || def= ined(__clang__)
-#pragm= a GCC diagnostic pop
-#= endif
-
void

process_ip_header(struct context *c, unsigned int f= lags, struct buffer *buf,
struct link_so= cket *sock)

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

Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I701f9e0a96a7b43f278f8e6089e= 9156feab772c8
Gerrit-Change-Number: 1472
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...>
= --wCwtLC9g670=--