From patchwork Thu Mar 5 08:49:08 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4803 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7001:a68f:b0:83c:d90d:321 with SMTP id wf15csp721904mab; Thu, 5 Mar 2026 00:49:25 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWHfES63WR+HSmPp4iDJ/EpKsU5A3DsOfwyfg+q5s+vRp52Ohs1h88AL2e8IWXdKN4vnGz3faYi6ZY=@openvpn.net X-Received: by 2002:a05:6870:1694:b0:3ec:4067:3d1e with SMTP id 586e51a60fabf-416abafb640mr3335941fac.40.1772700565316; Thu, 05 Mar 2026 00:49:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1772700565; cv=none; d=google.com; s=arc-20240605; b=J7MZbPh8eWoNt5DQwKSuWViOA7GfoTgUFEbydvSLLauPqU5v0squWPEcHWYPsg9CVJ 5JA2kJ8vyroNl9xBKVwVtCYDGS1elOWr6JpWKI1Q58eSAJDT2Hyy4pBJiqHPV9vG0/mj o/CBDrSS0BUbI+PGYyMcZu0AugGY5hEbO8Th5+UuQ7torDvdiMh1jtOsQEBiz7Hdx8A1 VQTVU55m0+KAVxLA8MdK1wJyFqLgBGGAz3PPvI71C16IWolpYNIYuRwtvaDBTilGyW/P ivl7f53TL9d8klr22C6Dyc5gHP9OfRJ1gnov2d2dbjYbOIohp3eb6+ul40BE2Hg10Cw3 ieAA== 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=l5NcpEEUb4mThCKqgFTc2rqnQZjhP36/cWVjW6S1TPw=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=ARz3gQcLY/PgPllq9Ci/kOW/JsjSlC1vRPTLwOcIQZs9jzqHwDj8nkkolcPwaREzbq 4BqtMUDyjC5RkoZQ/UARBVYaslg1InaIPA6PaIbmEIGAQdovH/47zuvCPe90lty6p2Us oXHGWC9x/wTTvozxwGf1t0sTF7ImyiVV5ClNQvub1UAlR4YO9n9HBDYLANAAv/8b8Wcs hmXbuRlDcJL+5I2RyQHewu3/MQZ6QDn2JQTys/5IoQgLZU9z36NalxQ10TRs/s35bKC6 jFGCOJLL1/7RfJQeWnRqj7Qtv/MXJW+txUdW3P9QnysYlQxLJKni6eHmN8/zmPiulvoF 7XOg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=XxuRX+eC; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=gQX49MzG; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=MtuUUPaQ; 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-4160d2d8291si15717258fac.290.2026.03.05.00.49.25 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Mar 2026 00:49:25 -0800 (PST) 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=XxuRX+eC; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=gQX49MzG; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=MtuUUPaQ; 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=l5NcpEEUb4mThCKqgFTc2rqnQZjhP36/cWVjW6S1TPw=; b=XxuRX+eCOjvkerLbju0+TTlli6 OaO+lhvHnnD2zXy1tWkDIZVh57VqakptWo8pqJA+Og5KDc4ScipXDnNdaU+Jeh08D/TKDf3llPzmp OwkB1NMbyPhiMLj4T1aqMuTwhk9fZmJ5Of8uZDYyckPG9V8b85s2XMcriQ83xFnzD2G4=; 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 1vy4OZ-0005tb-AP; Thu, 05 Mar 2026 08:49:23 +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 1vy4OX-0005tR-Lu for openvpn-devel@lists.sourceforge.net; Thu, 05 Mar 2026 08:49:21 +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=RB8dB3ngnOyyRiDqmqG/lsR740XGwzV2TxAxW8ROSLA=; b=gQX49MzG0TekU5geiVIh+wOvoD vpf/HYq3/QshL/eV0NjkqLpQzVVCo8aYisgh8mskwD3fXScLoqhRi1gxZs8bdCz3Co2oMgR2FYl7E lrQ4tg2Szn3iv32ZGUuHIDFXUM28ccDyzqEug0eExRBsPU1+ZxEre2jEuvJ6FEK2y3bE=; 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=RB8dB3ngnOyyRiDqmqG/lsR740XGwzV2TxAxW8ROSLA=; b=MtuUUPaQoe4FmhiwCtZwPNwYaM Rg/IpomWaxbZ5BffYpNG/dFkYbtEYckewYP9l5nFdRvqfd2uSBV8iu5DldyjnwuphSP+F3PVY7TBQ IIwGxw6LJpW16BJ+x15j1WX6eHLD8eI74dhQ2lZBQq0vtnE1WsFqHhNRnHMgRxkApx6w=; 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 1vy4OW-00028X-SI for openvpn-devel@lists.sourceforge.net; Thu, 05 Mar 2026 08:49:21 +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 6258nEYX001365 for ; Thu, 5 Mar 2026 09:49:14 +0100 Received: (from gert@localhost) by blue.greenie.muc.de (8.18.1/8.18.1/Submit) id 6258nEuX001364 for openvpn-devel@lists.sourceforge.net; Thu, 5 Mar 2026 09:49:14 +0100 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Thu, 5 Mar 2026 09:49:08 +0100 Message-ID: <20260305084914.1327-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 To avoid unneccesary sign-compare warnings. Change-Id: I2b2a931e13670d753aa9570efe498647ba1a4a7f 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: 1vy4OW-00028X-SI Subject: [Openvpn-devel] [PATCH v5] route: Fix type of rgi_needed variables 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?1858811268108402982?= X-GMAIL-MSGID: =?utf-8?q?1858811268108402982?= From: Frank Lichtenheld To avoid unneccesary sign-compare warnings. Change-Id: I2b2a931e13670d753aa9570efe498647ba1a4a7f Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1505 --- 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/+/1505 This mail reflects revision 5 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering diff --git a/src/openvpn/route.c b/src/openvpn/route.c index 329f3b0..b196713 100644 --- a/src/openvpn/route.c +++ b/src/openvpn/route.c @@ -570,11 +570,6 @@ } } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif - static void add_block_local_routes(struct route_list *rl) { @@ -602,15 +597,11 @@ bool block_local_needed(const struct route_list *rl) { - const int rgi_needed = (RGI_ADDR_DEFINED | RGI_NETMASK_DEFINED); + const unsigned int rgi_needed = (RGI_ADDR_DEFINED | RGI_NETMASK_DEFINED); return (rl->flags & RG_BLOCK_LOCAL) && (rl->rgi.flags & rgi_needed) == rgi_needed && (rl->spec.flags & RTSA_REMOTE_ENDPOINT) && rl->spec.remote_host_local != TLA_LOCAL; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - bool init_route_list(struct route_list *rl, const struct route_option_list *opt, const char *remote_endpoint, int default_metric, in_addr_t remote_host, @@ -1445,17 +1436,12 @@ #define LR_MATCH 1 /* route is local */ #define LR_ERROR 2 /* caller should abort adding route */ -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif - static int local_route(in_addr_t network, in_addr_t netmask, in_addr_t gateway, const struct route_gateway_info *rgi) { /* set LR_MATCH on local host routes */ - const int rgi_needed = (RGI_ADDR_DEFINED | RGI_NETMASK_DEFINED | RGI_IFACE_DEFINED); + const unsigned int rgi_needed = (RGI_ADDR_DEFINED | RGI_NETMASK_DEFINED | RGI_IFACE_DEFINED); if (rgi && (rgi->flags & rgi_needed) == rgi_needed && gateway == rgi->gateway.addr && netmask == 0xFFFFFFFF) { @@ -1479,10 +1465,6 @@ return LR_NOMATCH; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - /* Return true if the "on-link" form of the route should be used. This is when the gateway for * a route is specified as an interface rather than an address. */ #if defined(TARGET_LINUX) || defined(_WIN32) || defined(TARGET_DARWIN)