From: "flichtenheld (Code Review)" Date: Fri, 6 Mar 2026 11:57:08 +0000 References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: <4eb3fdc8ac32ae0b86aa76448645f05aabff8952-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="x/uqM64Huvg="; 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: plaisthos Cc: openvpn-devel --x/uqM64Huvg= 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/+/1558?usp=3Demail to review the following change. 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 --- M src/openvpn/dns.c 1 file changed, 12 insertions(+), 21 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/58/1558/1 diff --git a/src/openvpn/dns.c b/src/openvpn/dns.c index a42d032..4388829 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) { 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_%d", = 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: newchange Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Ibfcc350c772227cfc0f2244fa2b1625dcb7e6fb5 Gerrit-Change-Number: 1558 Gerrit-PatchSet: 1 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos --x/uqM64Huvg= 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

dns: Change arguments to setenv_dns_option =
to avoid sign-compare warning

The change is a bit big to fix just on= e compare warning,
but that is due to the highly interdependent code.
Change-Id: Ibfcc350c772227cfc0f2244fa2b1625dcb7e6fb5
Signed-off-by:= Frank Lichtenheld <frank@...2641...>
---
M src/openvpn/dns.c1 file changed, 12 insertions(+), 21 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/58/1558/1<=
/pre>
-#else /* ifdef _WIN32 */
-
-#if defined(__GNUC__) || defined(__clang__)=
-#pragma GCC diagnosti= c push
-#pragma GCC dia= gnostic ignored "-Wsign-compare"
-#endif
+#else /* ifdef _WIN32 */

static= void
-setenv_dns_optio= n(struct env_set *es, const char *format, int i, int j, const char *value)<= /span>
+setenv_dns_option(st= ruct 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)
{
= name_ok =3D checked_snprintf(name, sizeof(name), format, i); }
@@ -512,11 +507,11 @@
s= truct gc_arena gc =3D gc_new();
const struct dns_serve= r *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-&= gt;name);
}

for= (i =3D 1, s =3D o->servers; s !=3D NULL; i++, s =3D s->next)<= br>@@ -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, &q= uot;dns_server_%d_address_%d", i, j + 1,
+ setenv_dns_option(es, "dns_s= erver_%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&q= uot;, 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 NU= LL; j++, d =3D d->next)
{
- setenv_dns_option(es, &= quot;dns_server_%d_resolve_domain_%d", i, j, d->name);
+ setenv_dns_optio= n(es, "dns_server_%zu_resolve_domain_%d", i, j, d->name);
}
}

if (s->dnssec)
{- setenv_dns_option(= es, "dns_server_%d_dnssec", i, -1, dnssec_value(s->dnssec));
+ setenv_dn= s_option(es, "dns_server_%zu_dnssec", i, 0, dnssec_value(s->dn= ssec));
}

= if (s->transport)
{
- setenv_dns_option(es, "dns_se= rver_%d_transport", i, -1, transport_value(s->transport));+ setenv_dns_optio= n(es, "dns_server_%zu_transport", i, 0, transport_value(s->tra= nsport));
}
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->s= ni);
}
}

gc_free(&gc);
}

-#if defined(__GNUC__) |= | defined(__clang__)
-#= pragma GCC diagnostic pop
-#endif
-
= static void
updown_env_set(bool up, const struct dn= s_options *o, const struct tuntap *tt, struct env_set *es)
= {

To view, visit change 1558. To unsubscri= be, or for help writing mail filters, visit settings.

Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ibfcc350c772227cfc0f2244fa2b= 1625dcb7e6fb5
Gerrit-Change-Number: 1558
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...>
= --x/uqM64Huvg=--