From: "cron2 (Code Review)" Date: Thu, 15 Jan 2026 10:10:17 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="az1nOw1Fw+U="; 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: flichtenheld Cc: plaisthos , openvpn-devel --az1nOw1Fw+U= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/14= 72?usp=3Demail ) 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 Acked-by: Gert Doering Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1472 Message-Id: <20260115091124.23360-1-gert@...1296...> URL: https://sourceforge.net/p/openvpn/mailman/message/59283657/ Signed-off-by: Gert Doering --- M src/openvpn/forward.c 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c index 39ac3b3..5004e35 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); } =20 -#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: merged Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I701f9e0a96a7b43f278f8e6089e9156feab772c8 Gerrit-Change-Number: 1472 Gerrit-PatchSet: 2 Gerrit-Owner: flichtenheld Gerrit-Reviewer: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel --az1nOw1Fw+U= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 sub= mitted this change.

View Change

forward: Avoid conversion warning in ipv6_send_i=
cmp_unreachable

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

While here remove a unused gc arena in ne= ighbouring
code.

Change-Id: I701f9e0a96a7b43f278f8e6089e9156feab7= 72c8
Signed-off-by: Frank Lichtenheld <frank@...2641...>
Acked-= by: Gert Doering <gert@...1296...>
Gerrit URL: https://gerrit.open= vpn.net/c/openvpn/+/1472
Message-Id: <20260115091124.23360-1-gert@...493...= 1296...>
URL: https://sourceforge.net/p/openvpn/mailman/message/59283= 657/
Signed-off-by: Gert Doering <gert@...1296...>
---
M src= /openvpn/forward.c
1 file changed, 5 insertions(+), 16 deletions(-)
<= br>
diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c
index 39ac3b3..5004e35 100644
--- a/src/openvpn/forward.= c
+++ b/src/openvpn/forward.c
@@ -1352,11 += 1352,6 @@
check_status(c->c2.buf.len, "read fr= om TUN/TAP", NULL, c->c1.tuntap);
}

-#if defined(__GNUC= __) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"-#endif
-
/**
* Drop= s UDP packets which OS decided to route via tun.
*=
@@ -1483,8 +1478,6 @@
void
proc= ess_incoming_tun(struct context *c, struct link_socket *out_sock) {
- struct g= c_arena gc =3D gc_new();
- gc_free(&gc); }

/**
@@ -1593,= 7 +1585,7 @@
icmp6out.icmp6_type =3D OPENVPN_ICMP6_DES= TINATION_UNREACHABLE;
icmp6out.icmp6_code =3D OPENVPN_= ICMP6_DU_NOROUTE;

- int icmpheader_len =3D sizeof(struct openvpn_ipv6hdr) + s= izeof(struct openvpn_icmp6hdr);
+ const int icmpheader_len =3D sizeof(struct openvpn_ipv6hdr)= + sizeof(struct openvpn_icmp6hdr);
int totalheader_le= n =3D icmpheader_len;

if (TUNNEL_TYP= E(c->c1.tuntap) =3D=3D DEV_TYPE_TAP)
@@ -1606,10 +1598,1= 1 @@
* frame should be <=3D 1280 and have as much = as possible of the original
* packet
= */
- int max_p= ayload_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 mi= n_int(MAX_ICMPV6LEN, c->c2.frame.tun_mtu - icmpheader_len);
+ const int payload_len =3D mi= n_int(max_payload_size, BLEN(&inputipbuf));
+ const uint16_t icmp_len =3D (uint16_t)(size= of(struct openvpn_icmp6hdr) + payload_len);

- pip6out.payload_len =3D htons(s= izeof(struct openvpn_icmp6hdr) + payload_len);
+ pip6out.payload_len =3D htons(icmp_len);


/* Construct the packet as outgoing pac= ket 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 *buf, struct link_socket *sock)
=

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

Gerrit-MessageType: merged
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I701f9e0a96a7b43f278f8e6089e= 9156feab772c8
Gerrit-Change-Number: 1472
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
= --az1nOw1Fw+U=--