From: "flichtenheld (Code Review)" Date: Fri, 16 Jan 2026 15:56:38 +0000 References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: <87f333e864b839d1635749253fd8fa0cb7ce3798-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="Dh7rodl5JZU="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: socket: Avoid conversion warning in get_addr_generic List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos Cc: openvpn-devel --Dh7rodl5JZU= 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/+/1475?usp=3Demail to review the following change. Change subject: socket: Avoid conversion warning in get_addr_generic ...................................................................... socket: Avoid conversion warning in get_addr_generic We already check earlier that bits is smaller that max_bits, so the cast is safe. While reviewing the callers, remove some unused variables. Change-Id: I5ad13bc6674b3403251cc552d1f2c0f057431817 Signed-off-by: Frank Lichtenheld --- M src/openvpn/options.c M src/openvpn/socket.c 2 files changed, 11 insertions(+), 14 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/75/1475/1 diff --git a/src/openvpn/options.c b/src/openvpn/options.c index cede758..85669e0 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -1144,10 +1144,7 @@ static bool ipv6_addr_safe_hexplusbits(const char *ipv6_prefix_spec) { - struct in6_addr t_addr; - unsigned int t_bits; - - return get_ipv6_addr(ipv6_prefix_spec, &t_addr, &t_bits, M_WARN); + return get_ipv6_addr(ipv6_prefix_spec, NULL, NULL, M_WARN); } static char * diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c index 093f822..331249d 100644 --- a/src/openvpn/socket.c +++ b/src/openvpn/socket.c @@ -72,11 +72,6 @@ } } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wconversion" -#endif - /* * Functions related to the translation of DNS names to IP addresses. */ @@ -180,7 +175,7 @@ if (netbits) { - *netbits =3D bits; + *netbits =3D (unsigned int)bits; } /* restore '/' separator, if any */ @@ -683,6 +678,11 @@ } } +#if defined(__GNUC__) || defined(__clang__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wconversion" +#endif + static void create_socket(struct link_socket *sock, struct addrinfo *addr) { @@ -738,6 +738,10 @@ bind_local(sock, addr->ai_family); } +#if defined(__GNUC__) || defined(__clang__) +#pragma GCC diagnostic pop +#endif + #ifdef TARGET_ANDROID static void protect_fd_nonlocal(int fd, const struct sockaddr *addr) @@ -861,10 +865,6 @@ gc_free(&gc); } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - static socket_descriptor_t socket_listen_accept(socket_descriptor_t sd, struct link_socket_actual *ac= t, const struct addrinfo *local, bool do_listen, -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1475?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: I5ad13bc6674b3403251cc552d1f2c0f057431817 Gerrit-Change-Number: 1475 Gerrit-PatchSet: 1 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos --Dh7rodl5JZU= 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

socket: Avoid conversion warning in get_add=
r_generic

We already check earlier that bits is smaller that
max_= bits, so the cast is safe.

While reviewing the callers, remove some = unused
variables.

Change-Id: I5ad13bc6674b3403251cc552d1f2c0f0574= 31817
Signed-off-by: Frank Lichtenheld <frank@...2641...>
---M src/openvpn/options.c
M src/openvpn/socket.c
2 files changed, 11 = insertions(+), 14 deletions(-)

git pull ssh://ge=
rrit.openvpn.net:29418/openvpn refs/changes/75/1475/1
diff --git a/=
src/openvpn/options.c b/src/openvpn/options.c
index cede758= ..85669e0 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -1144,10 +1144,7 @@=
static bool
ipv6_addr_safe_hexplusbits(const ch= ar *ipv6_prefix_spec)
{
- struct in6_addr t_addr;
- unsigned int t_bits;
-
- return get_ipv6_addr(ipv6_prefix_spec, &t_addr, &t_bits,= M_WARN);
+ return= get_ipv6_addr(ipv6_prefix_spec, NULL, NULL, M_WARN);
}

static char *
diff --git a= /src/openvpn/socket.c b/src/openvpn/socket.c
index 093f822.= .331249d 100644
--- a/src/openvpn/socket.c
= +++ b/src/openvpn/socket.c
@@ -72,11 +72,6 @@
}

}

-#if defined(__GNUC__) || defined(__clang__)=
-#pragma GCC diagnostic push<= /span>
-#pragma GCC diagnostic= ignored "-Wconversion"
-#endif
-
/*
* Functions related to the translation = of DNS names to IP addresses.
*/
@@ -180,= 7 +175,7 @@

if (netbits)
<= span> {

- *n= etbits =3D bits;
+ = *netbits =3D (unsigned int)bits;
}

/* restore '/' separator, if any */=
@@ -683,6 +678,11 @@
}
}

+#if = defined(__GNUC__) || defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversi= on"
+#endif

+
static= void
create_socket(struct link_socket *sock, struct addri= nfo *addr)
{
@@ -738,6 +738,10 @@ bind_local(sock, addr->ai_family);
}

+#if def= ined(__GNUC__) || defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
+
#ifdef TARGET_ANDROID
static = void
protect_fd_nonlocal(int fd, const struct sockaddr *ad= dr)
@@ -861,10 +865,6 @@
gc_free(&= gc);
}

-#if defined(__GNUC__) || defined(__clang__)
<= span style=3D"color: hsl(0, 100%, 40%);">-#pragma GCC diagnostic pop
=
-#endif
-
static socket_descriptor_= t
socket_listen_accept(socket_descriptor_t sd, struct link= _socket_actual *act,
const struct add= rinfo *local, bool do_listen,

To view, = visit ch= ange 1475. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I5ad13bc6674b3403251cc552d1f= 2c0f057431817
Gerrit-Change-Number: 1475
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...>
= --Dh7rodl5JZU=--