From patchwork Thu Mar 12 16:41:25 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4818 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:2755:b0:83c:d90d:321 with SMTP id j21csp674171maq; Thu, 12 Mar 2026 09:41:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVRsSFOJGX2VkBVRGYt92lMbrmJ+TaGjprAsnveUvCFQjLD66h13Akyh3LHgBqrd9FQD+VmMf2qbbw=@openvpn.net X-Received: by 2002:a05:7022:6187:b0:11e:161:c008 with SMTP id a92af1059eb24-128f3df78bcmr96260c88.26.1773333711738; Thu, 12 Mar 2026 09:41:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1773333711; cv=none; d=google.com; s=arc-20240605; b=IERWEUUs78uMwX2cgxOvTWJ16zG0QxDxrm88FP56EAtXxqUp8MhKIgJRmRovNUcAxH jhJw0OXnJNY3SVptqq4nJz3Vef/aDpT894x969iul2vMDO8kf5bjVJXgyIeXDBiMHoVN 4ocQKUHAWhffVPOIQBoTFqFkVLs8ImM/KDRgrHK2I/jwUdb8gPx0RK9Si9B1WCw2Y6/0 TFeX0X6z5TUfAUE0F+qN2MmQmdy0aBCb5yrUIVK3s1Xa7KARz1i5QVk03Cu1CnAPNuxE hCYK35YMjRGeTC6vhp/YAcy3yldYADmNQH9mn/cAEwGhGQcSgRh6xlmypynJeROF8iDc bAJQ== 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=MqvjpIWziOHDwnn6cjDviH41gt2sb08CKkBzoB20qh8=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=Zj9stiWJqaDrUNlMCDBrDu0OiKXnbes9Dxc7/Opwmcrmnr3YnghTF+elA12Sy/E/v+ lBE8kYh+1vsneEIKfTH/wwVkEYKs6AsW3IoU1etDpJA5nOxcUOlbVysVXx9Er2dXBAEl 5wuWpDLUteIOqp+RgkuLk6oYwf39YrqjADjVUx4kK4lv97/OaMP/7IxStMEZSxCp4An6 4nMq3tzIVxNySQYfh7OW6oU6FKGdd8ufAsV27WCniO5A1TVwJKCN61LzndAhIFW+Mxvz fhUB7rVQImvYQYM/2y9R0e2eJnPNm6QdZF6vLioZk0S6gVvO6QfiGRTnUNIQ+b1P2iHu fnzQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b="EBW/Konn"; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=daBmKiUT; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=ND5HwJP7; 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 a92af1059eb24-128e7d0fea1si21007021c88.87.2026.03.12.09.41.51 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Mar 2026 09:41:51 -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="EBW/Konn"; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=daBmKiUT; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=ND5HwJP7; 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=MqvjpIWziOHDwnn6cjDviH41gt2sb08CKkBzoB20qh8=; b=EBW/KonnYAbrD1AlJRTZVWjiZf 0bdt6SmYPVKSr91wC69bGii7TECKACPfVtWuigr5/aNOCjsuFQZPZ2D47CxmeYWzLeD2woSmv4a23 Sx1d9ERLvqix+KkaNVSrodldq61OjWR0KGQBdpSmwVEJnrM3LCYxopUK/NmMwYCIaB4o=; Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1w0j6X-0004gV-UP; Thu, 12 Mar 2026 16:41:45 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1w0j6W-0004gM-JJ for openvpn-devel@lists.sourceforge.net; Thu, 12 Mar 2026 16:41:44 +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=p5TlbU+BIekR8s0qUlbVvT803eNNSkewXNNw4k5YMvo=; b=daBmKiUT7O7GViR3TUXEpMKuf9 jQhiZjIVGHwFlqH6+COJv75fOmT/z40vy5465cXhNLZ7hj423F9wJgX9QhuBykwoRlilW8asvP53j VaDyOk6gqxqOL5GHx0q4Zwecn+jl65lw5992XLScupM0DxAar2Qv+TC2A/0JDDlSO0jE=; 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=p5TlbU+BIekR8s0qUlbVvT803eNNSkewXNNw4k5YMvo=; b=ND5HwJP7aiWG8QxBHESm11Kcuh PfrQQH9W9q6Jb21lN1wXk53ivV3Ik4bUukR12tyeuhZjEoxg9RegMDcrolq61Zx9n8k5jSya2Zu6Q 3yHJmIKnalYF+Kl/0vg52bjAJoW5lWiqnLF+JXSEO5HhPorfvbzIT4eqErFgOaxCGQvs=; 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 1w0j6V-000146-Cx for openvpn-devel@lists.sourceforge.net; Thu, 12 Mar 2026 16:41:44 +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 62CGfVo9011398 for ; Thu, 12 Mar 2026 17:41:31 +0100 Received: (from gert@localhost) by blue.greenie.muc.de (8.18.1/8.18.1/Submit) id 62CGfVSx011397 for openvpn-devel@lists.sourceforge.net; Thu, 12 Mar 2026 17:41:31 +0100 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Thu, 12 Mar 2026 17:41:25 +0100 Message-ID: <20260312164131.11378-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: 1w0j6V-000146-Cx Subject: [Openvpn-devel] [PATCH v3] 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?1859475169969365686?= 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 3 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..c146d75 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_%d", 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) {