From: "cron2 (Code Review)" Date: Sun, 19 Apr 2026 16:22:35 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <7c4f73e3d55035c0e1946e7edc821a442424cb80-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="OPHlNE2bZQQ="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: dns: Change arguments to setenv_dns_option to avoid sign-compare warning List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: plaisthos , openvpn-devel --OPHlNE2bZQQ= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/15= 58?usp=3Demail ) Change subject: dns: Change arguments to setenv_dns_option to avoid sign-co= mpare warning ...................................................................... dns: Change arguments to setenv_dns_option to avoid sign-compare warning The change is a bit big to fix just one compare warning, but that is due to the highly interdependent code. Change-Id: Ibfcc350c772227cfc0f2244fa2b1625dcb7e6fb5 Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1558 Message-Id: <20260407094643.28090-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg36= 531.html Signed-off-by: Gert Doering --- M src/openvpn/dns.c 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/src/openvpn/dns.c b/src/openvpn/dns.c index a42d032..ce23f1f 100644 --- a/src/openvpn/dns.c +++ b/src/openvpn/dns.c @@ -476,20 +476,15 @@ send_msg_iservice(o->msg_channel, &nrpt, sizeof(nrpt), &ack, "DNS"); } -#else /* ifdef _WIN32 */ - -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif +#else /* ifdef _WIN32 */ static void -setenv_dns_option(struct env_set *es, const char *format, int i, int j, co= nst char *value) +setenv_dns_option(struct env_set *es, const char *format, size_t i, size_t= j, const char *value) { char name[64]; bool name_ok =3D false; - if (j < 0) + if (j =3D=3D 0) { name_ok =3D checked_snprintf(name, sizeof(name), format, i); } @@ -512,11 +507,11 @@ struct gc_arena gc =3D gc_new(); const struct dns_server *s; const struct dns_domain *d; - int i, j; + size_t i, j; for (i =3D 1, d =3D o->search_domains; d !=3D NULL; i++, d =3D d->next) { - setenv_dns_option(es, "dns_search_domain_%d", i, -1, d->name); + setenv_dns_option(es, "dns_search_domain_%zu", i, 0, d->name); } for (i =3D 1, s =3D o->servers; s !=3D NULL; i++, s =3D s->next) @@ -525,17 +520,17 @@ { if (s->addr[j].family =3D=3D AF_INET) { - setenv_dns_option(es, "dns_server_%d_address_%d", i, j + 1, + setenv_dns_option(es, "dns_server_%zu_address_%zu", i, j += 1, print_in_addr_t(s->addr[j].in.a4.s_addr,= IA_NET_ORDER, &gc)); } else { - setenv_dns_option(es, "dns_server_%d_address_%d", i, j + 1, + setenv_dns_option(es, "dns_server_%zu_address_%zu", i, j += 1, print_in6_addr(s->addr[j].in.a6, 0, &gc)= ); } if (s->addr[j].port) { - setenv_dns_option(es, "dns_server_%d_port_%d", i, j + 1, + setenv_dns_option(es, "dns_server_%zu_port_%zu", i, j + 1, print_in_port_t(s->addr[j].port, &gc)); } } @@ -544,32 +539,28 @@ { for (j =3D 1, d =3D s->domains; d !=3D NULL; j++, d =3D d->nex= t) { - setenv_dns_option(es, "dns_server_%d_resolve_domain_%d", i= , j, d->name); + setenv_dns_option(es, "dns_server_%zu_resolve_domain_%zu",= i, j, d->name); } } if (s->dnssec) { - setenv_dns_option(es, "dns_server_%d_dnssec", i, -1, dnssec_va= lue(s->dnssec)); + setenv_dns_option(es, "dns_server_%zu_dnssec", i, 0, dnssec_va= lue(s->dnssec)); } if (s->transport) { - setenv_dns_option(es, "dns_server_%d_transport", i, -1, transp= ort_value(s->transport)); + setenv_dns_option(es, "dns_server_%zu_transport", i, 0, transp= ort_value(s->transport)); } if (s->sni) { - setenv_dns_option(es, "dns_server_%d_sni", i, -1, s->sni); + setenv_dns_option(es, "dns_server_%zu_sni", i, 0, s->sni); } } gc_free(&gc); } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - static void updown_env_set(bool up, const struct dns_options *o, const struct tuntap *= tt, struct env_set *es) { -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1558?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: Ibfcc350c772227cfc0f2244fa2b1625dcb7e6fb5 Gerrit-Change-Number: 1558 Gerrit-PatchSet: 8 Gerrit-Owner: flichtenheld Gerrit-Reviewer: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel --OPHlNE2bZQQ= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 sub= mitted this change.

View Change

dns: Change arguments to setenv_dns_option to av=
oid sign-compare warning

The change is a bit big to fix just one com= pare warning,
but that is due to the highly interdependent code.

= Change-Id: Ibfcc350c772227cfc0f2244fa2b1625dcb7e6fb5
Signed-off-by: Fran= k Lichtenheld <frank@...2641...>
Acked-by: Gert Doering <gert@...220...= ..1296...>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1558Message-Id: <20260407094643.28090-1-gert@...1296...>
URL: https:/= /www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg36531.html
= Signed-off-by: Gert Doering <gert@...1296...>
---
M src/openvpn= /dns.c
1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/openvpn/dns.c b/src/openvpn/dns.c
index= a42d032..ce23f1f 100644
--- a/src/openvpn/dns.c
= +++ b/src/openvpn/dns.c
@@ -476,20 +476,15 @@<= br> send_msg_iservice(o->msg_channel, &nrpt, sizeof(nrpt),= &ack, "DNS");
}
-#else /* ifdef _WIN32 */=
-
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push=
-#pragma GCC diagnosti= c ignored "-Wsign-compare"
-#endif
+#else /* ifdef _WIN32 */

static void<= /span>
-setenv_dns_option(stru= ct env_set *es, const char *format, int i, int j, const char *value)=
+setenv_dns_option(struct e= nv_set *es, const char *format, size_t i, size_t j, const char *value)
{
char name[64];
boo= l name_ok =3D false;

- if (j < 0)
+ if (j =3D=3D 0)
{
= name_ok =3D checked_snprintf(name, sizeof(name), format, i);=
}
@@ -512,11 +507,11 @@
= struct gc_arena gc =3D gc_new();
const struct dns_ser= ver *s;
const struct dns_domain *d;
- int i, j;
+ size_t i, j;

<= span> for (i =3D 1, d =3D o->search_domains; d !=3D NULL; i++, d =3D= d->next)

{
- setenv_dns_option(es, "dns_search_domain_%d"= ;, i, -1, d->name);
- = setenv_dns_option(es, "dns_server_%d_address_%d", i, j + 1,<= /span>
+ sete= nv_dns_option(es, "dns_server_%zu_address_%zu", i, j + 1,<= br> print_in_addr_t(s->addr[j].i= n.a4.s_addr, IA_NET_ORDER, &gc));
}=
else
{
- setenv_dns_option(es, = "dns_server_%d_address_%d", i, j + 1,
+ setenv_dns_option(es, "dns= _server_%zu_address_%zu", i, j + 1,
= print_in6_addr(s->addr[j].in.a6, 0, &gc)); }
if (s->addr[j].port)=
{
- setenv_dns_option(es, "dns_server_%d_port_%d= ", i, j + 1,
+ = setenv_dns_option(es, "dns_server_%zu_port_%zu", i,= j + 1,
print_in_port_t(= s->addr[j].port, &gc));
}
}

@@ -544,32 +539,28 @@
= {
for (j =3D 1, d =3D s->domains; d !=3D = NULL; j++, d =3D d->next)
{
- setenv_dns_option(es,= "dns_server_%d_resolve_domain_%d", i, j, d->name);

= + setenv_dns_opt= ion(es, "dns_server_%zu_resolve_domain_%zu", i, j, d->name);
}
}
<= /span>
if (s->dnssec)
{
- setenv_dns_opti= on(es, "dns_server_%d_dnssec", i, -1, dnssec_value(s->dnssec))= ;
+ setenv= _dns_option(es, "dns_server_%zu_dnssec", i, 0, dnssec_value(s->= ;dnssec));
}

= if (s->transport)
{
- setenv_dns_option(es, "dns= _server_%d_transport", i, -1, transport_value(s->transport));
+ setenv_dns_op= tion(es, "dns_server_%zu_transport", i, 0, transport_value(s->= transport));
}
if (s->= sni)
{
- setenv_dns_option(es, "dns_server_%d_sni", = i, -1, s->sni);
+ = setenv_dns_option(es, "dns_server_%zu_sni", i, 0, s-&g= t;sni);
}
}
=
gc_free(&gc);
}
=
-#if defined(__GNUC__= ) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-<= br> static void
updown_env_set(bool up, const struct= dns_options *o, const struct tuntap *tt, struct env_set *es)
{


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

Gerrit-MessageType: merged
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ibfcc350c772227cfc0f2244fa2b= 1625dcb7e6fb5
Gerrit-Change-Number: 1558
Gerrit-PatchSet: 8
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>
= --OPHlNE2bZQQ=--