From: "flichtenheld (Code Review)" Date: Mon, 16 Mar 2026 11:56:47 +0000 In-Reply-To: References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, gert@...1296... Message-ID: <1e2bf2288616cbd85fc66625bc502d6598b8c2ac-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="73YPn9vSuGU="; 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 --73YPn9vSuGU= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: cron2, flichtenheld, plaisthos. Hello cron2, plaisthos, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/1558?usp=3Demail to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review-1 by cron2 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/4 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: newpatchset Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Ibfcc350c772227cfc0f2244fa2b1625dcb7e6fb5 Gerrit-Change-Number: 1558 Gerrit-PatchSet: 4 Gerrit-Owner: flichtenheld Gerrit-Reviewer: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: cron2 Gerrit-Attention: flichtenheld --73YPn9vSuGU= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is cur= rently required from: cron2, flichtenheld, plaisthos.

flichtenheld uploaded patch set #4 to this change.

<= p>View C= hange

The following approvals got outdated and were removed: Code-Review-1 by cron2

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 <frank@...2641...>
---
M src/openvpn= /dns.c
1 file changed, 12 insertions(+), 21 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/58= /1558/4
diff --git a/src/openvpn/dns.c b/src/openvpn/dns.cindex 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 _WI= N32 */
-
-#if defined(__GNUC__) || defined(__c= lang__)
-#pragma GCC di= agnostic push
-#pragma = GCC diagnostic ignored "-Wsign-compare"
-#endif
+#else /* ifdef _WIN32 */

= static void
-setenv_dn= s_option(struct env_set *es, const char *format, int i, int j, const char *= value)
+setenv_dns_op= tion(struct env_set *es, const char *format, size_t i, size_t j, const char= *value)
{
char name[64];
<= span> bool name_ok =3D false;

- if (j < 0)
+ if (j =3D=3D 0)
{
name_ok =3D checked_snprintf(name, sizeof(name), for= mat, 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;
<= span style=3D"color: hsl(120, 100%, 40%);">+ size_t i, j;


for (i =3D 1, d =3D o->search_domains; d !=3D N= ULL; 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);
}
<= br> for (i =3D 1, s =3D o->servers; s !=3D NULL; i++, s =3D s-= >next)
@@ -525,17 +520,17 @@
{<= /span>
if (s->addr[j].family =3D=3D AF_INET)
{
- setenv_dns_option(es, "dns_server_%d_address_%d&qu= ot;, 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_optio= n(es, "dns_server_%zu_address_%zu", i, j + 1,

= print_in6_addr(s->addr[j].in.a6, 0, &= ;gc));
}
if (s-&g= t;addr[j].port)
{
- setenv_dns_option(es, "dns_se= rver_%d_port_%d", i, j + 1,
+ setenv_dns_option(es, "dns_server_%zu_por= t_%zu", i, j + 1,
p= rint_in_port_t(s->addr[j].port, &gc));
= }
}
@@ -544,32 +539,28 @@ {
for (j =3D 1, d =3D s->d= omains; d !=3D NULL; j++, d =3D d->next)
{<= /span>
- setenv= _dns_option(es, "dns_server_%d_resolve_domain_%d", i, j, d->na= me);
+ = 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_value= (s->dnssec));
+ = setenv_dns_option(es, "dns_server_%zu_dnssec", i, 0, dns= sec_value(s->dnssec));
}

if (s->transport)
{=
- setenv_dns_optio= n(es, "dns_server_%d_transport", i, -1, transport_value(s->tra= nsport));
+ = setenv_dns_option(es, "dns_server_%zu_transport", i, 0, transpo= rt_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&qu= ot;, i, 0, s->sni);
}
}

gc_free(&gc);
}

-#if d= efined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
static void
updown_env_set(bool u= p, const struct dns_options *o, const struct tuntap *tt, struct env_set *es= )
{

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

Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ibfcc350c772227cfc0f2244fa2b= 1625dcb7e6fb5
Gerrit-Change-Number: 1558
Gerrit-PatchSet: 4
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>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: cron2 <gert@...1296...>= ;
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
= --73YPn9vSuGU=--