From patchwork Tue Apr 7 09:46:37 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4878 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:d1c6:b0:83c:d90d:321 with SMTP id ly6csp1903061mab; Tue, 7 Apr 2026 02:47:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWFnv94KKMod0hm/gy9bDIX5Z7Kzrny4Q6QG9yeTsREoFH/XkMW6AdTGp3rGbc5MLNjh/6oBHwfkYk=@openvpn.net X-Received: by 2002:a05:6870:a0a1:b0:41b:f7f5:e887 with SMTP id 586e51a60fabf-4230ffdec0amr8809955fac.24.1775555232010; Tue, 07 Apr 2026 02:47:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1775555232; cv=none; d=google.com; s=arc-20240605; b=YS8fowHLRJxMHKUcVNN8kIFfM4YS6Fgz144TzzY7TfCGgKa2OOtfwTKk1SyDaSQ+mv 24b4aC9Bxcy2gO6PwMRJH7cBUVUBAa61JkP5vrGkfmPZPL+jyqKWkga+8P+DS8kSl+QY NQA/ILfYrN5WugL4E7c9hlvxNtzY5iXHcSrxL1Vx5lx8CuUv1C9SLbcmevnB+uryheZd I0mhD3CBNoSx95P6fWpxYWGLbuX9AxPkmNuwAWFdVPuG2Uww2+7LXimebB8aOEDtYkOS Vv4l8rxv+wQQ9cGbTBXSY01SqvTLrFTSBAV/ypEtT0dZPGIx+ow9GzBJhJltDaXofHGU yldg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature:dkim-signature; bh=oXd9wRNYWLntQ+upbk4wMd1db7FHnnR/BHuLV4JrBhQ=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=bBm959xJg5egpT6tZhcX9huiZC2P232QNbwnkwRJtM46P/ds6vnqczR5kDJOTM7YIb H0MSmP+Af9/qF9oA9j3w3maIGpI9IjlxKQsGF5JCwaTKom8EYeJeMHUVmgZ2xQ3mNx7s wH6h3XICFCBrnbn5jdJAmi+S9EAeXcvGqtNN+fkOyMHbwr7ku95uAHaTx8uB4QYfbGGX T4qIpoHXYpXEEhmPrCIKtjGJzKG3G9blFWUppyVRuyo7+bwKK2CCW4K5NHx/yS10JfyU w//WXbk3yqLgxnSyixndp/tcR2OwwePwE/GP6B+/eWAgl/dDirqB5odJT8ehhM3RBa3O uBxQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=SIPntENX; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=fssZGvhr; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=MugeQ3iF; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 586e51a60fabf-422eb428437si16101086fac.257.2026.04.07.02.47.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Apr 2026 02:47:11 -0700 (PDT) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=SIPntENX; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=fssZGvhr; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=MugeQ3iF; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Subject:MIME-Version:References:In-Reply-To:Message-ID:Date:To:From:Sender: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=oXd9wRNYWLntQ+upbk4wMd1db7FHnnR/BHuLV4JrBhQ=; b=SIPntENXqS62I9n4cziOfnIyU1 s+fxD6TvwMJw1gZqu90sovnqRuKKewsDbXVrG5aSVuAPSird3aMQmKL3Lu51cjvPwvc34tg8C1XCH x1Xs2nW0WSw9DeimbJBskNsRBg5Z/rKKayvfiGK4E+UappDQnSF25BuLL//FVcM/sAiQ=; Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1wA31V-00028w-3O; Tue, 07 Apr 2026 09:47:05 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1wA31N-00028P-6g for openvpn-devel@lists.sourceforge.net; Tue, 07 Apr 2026 09:46:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=o+Xa4FQyZRTHQRXuf7prV+yXx2BEy4QuQDm6mpsfC+Y=; b=fssZGvhrYakeH5UGLdKPshm5iv YMTT5Ye/QIlnVCgokjgykV9UNAqEDB0X9H9c+HU2R3Q3wbzrtkjwD6o3yBVAlCYrHE2s81FP/dcBO em7f98Kg3JuOc9G4BFVGez04bxDequQqbChfzltXnME/POsFoyGcTRbxyixtaQ+jvbYY=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=o+Xa4FQyZRTHQRXuf7prV+yXx2BEy4QuQDm6mpsfC+Y=; b=MugeQ3iFFsMPYzx3+XDI0t1geL /K9b+EI/gT1IL36bIWLJiwQQaL0UJyni2VCOUXKdUz4Y4p9JmEwS3BzXimmSgJNEe45Tup0nAA4Sj 8Mc1KeGlX2wTOb8oSPcyqSRU5H5E9H8V93k6eD7lNlB5LXfy5Dx0SBlCUIQwEwbxFJl0=; Received: from [193.149.48.129] (helo=blue.greenie.muc.de) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1wA31L-0002Sb-Mu for openvpn-devel@lists.sourceforge.net; Tue, 07 Apr 2026 09:46:57 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.18.1/8.18.1) with ESMTP id 6379khkG028103 for ; Tue, 7 Apr 2026 11:46:43 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.18.1/8.18.1/Submit) id 6379khCN028102 for openvpn-devel@lists.sourceforge.net; Tue, 7 Apr 2026 11:46:43 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Tue, 7 Apr 2026 11:46:37 +0200 Message-ID: <20260407094643.28090-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.52.0 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "sfi-spamd-1.hosts.colo.sdot.me", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Frank Lichtenheld 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/open [...] Content analysis details: (1.3 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS X-Headers-End: 1wA31L-0002Sb-Mu Subject: [Openvpn-devel] [PATCH v7] dns: Change arguments to setenv_dns_option to avoid sign-compare warning X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1859475169969365686?= X-GMAIL-MSGID: =?utf-8?q?1861804603174520563?= From: Frank Lichtenheld 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 --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1558 This mail reflects revision 7 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering 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, const 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 = false; - if (j < 0) + if (j == 0) { name_ok = checked_snprintf(name, sizeof(name), format, i); } @@ -512,11 +507,11 @@ struct gc_arena gc = gc_new(); const struct dns_server *s; const struct dns_domain *d; - int i, j; + size_t i, j; for (i = 1, d = o->search_domains; d != NULL; i++, d = 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 = 1, s = o->servers; s != NULL; i++, s = s->next) @@ -525,17 +520,17 @@ { if (s->addr[j].family == 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 = 1, d = s->domains; d != NULL; j++, d = d->next) { - 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_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_option(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->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) {