From patchwork Mon Mar 14 02:13:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 2339 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director9.mail.ord1d.rsapps.net ([172.27.255.8]) by backend41.mail.ord1d.rsapps.net with LMTP id fAdxG64/L2JNVAAAqwncew (envelope-from ) for ; Mon, 14 Mar 2022 09:14:22 -0400 Received: from proxy14.mail.iad3a.rsapps.net ([172.27.255.8]) by director9.mail.ord1d.rsapps.net with LMTP id 8CDOL64/L2KxdAAAalYnBA (envelope-from ) for ; Mon, 14 Mar 2022 09:14:22 -0400 Received: from smtp11.gate.iad3a ([172.27.255.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy14.mail.iad3a.rsapps.net with LMTPS id EACiL7Y/L2IxAwAA1+b4IQ (envelope-from ) for ; Mon, 14 Mar 2022 09:14:30 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp11.gate.iad3a.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dmarc=none (p=nil; dis=none) header.from=unstable.cc X-Suspicious-Flag: YES X-Classification-ID: a938e9d2-a398-11ec-b578-5254005eb44a-1-1 Received: from [216.105.38.7] ([216.105.38.7:40488] helo=lists.sourceforge.net) by smtp11.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 58/AD-19034-DAF3F226; Mon, 14 Mar 2022 09:14:21 -0400 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.94.2) (envelope-from ) id 1nTkVs-0000yY-Bx; Mon, 14 Mar 2022 13:13:26 +0000 Received: from [172.30.20.202] (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.94.2) (envelope-from ) id 1nTkVr-0000yL-BU for openvpn-devel@lists.sourceforge.net; Mon, 14 Mar 2022 13:13:25 +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:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=KpnKP5YNckW8OEJca+4Z5f8+rJTeon8kf4YC2cXsS/I=; b=AD2uoi+IjW0DrM4bQarHqQdgQL ZFKqP5OmYGYESUfylIvcJYE7NK6XCmU26s0hI20gUx7fMOF/+pHUMyT7tGgxnEXpd53aTmd+tKqu6 9P1YISrXu0RKpAVKaXnopKhUKQmvnIYyoTFAHbflkbVtfF+ZzPekKxhcaehWgpF2zaYw=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From :Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=KpnKP5YNckW8OEJca+4Z5f8+rJTeon8kf4YC2cXsS/I=; b=W aQX2FR4UFJ2vO09eQeenIfd6A4MNYoUGxRgZkfvElMUSog95uoBcp9q9ph4Jn4SlOCXqWZN/h5vv4 M1jFrueLjWa1lYPs2eSwAbgGyjR+mgkXg8A5PMAOvUzh6GEqW5HD49EWFjmfC8+NWwtSEKSTWyHCN h8hpbAenvAjUBJX0=; Received: from s2.neomailbox.net ([5.148.176.60]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.94.2) id 1nTkVn-00FOLw-Q2 for openvpn-devel@lists.sourceforge.net; Mon, 14 Mar 2022 13:13:25 +0000 From: Antonio Quartulli To: openvpn-devel@lists.sourceforge.net Date: Mon, 14 Mar 2022 14:13:56 +0100 Message-Id: <20220314131356.11577-1-a@unstable.cc> MIME-Version: 1.0 X-Spam-Report: Spam detection software, running on the system "util-spamd-1.v13.lw.sourceforge.com", 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: netmask is simply used to reflect the value of p[2], therefore it can be dropped and p[2] can directly be used instead. Reported-by: Gert Doering Signed-off-by: Antonio Quartulli --- src/openvpn/options.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) Content analysis details: (0.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1nTkVn-00FOLw-Q2 Subject: [Openvpn-devel] [PATCH] options: drop useless netmask variable 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: , Cc: Gert Doering , Antonio Quartulli Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox netmask is simply used to reflect the value of p[2], therefore it can be dropped and p[2] can directly be used instead. Reported-by: Gert Doering Signed-off-by: Antonio Quartulli Acked-by: Gert Doering --- src/openvpn/options.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 7ce0ba61..7d7b8dc1 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -7282,14 +7282,8 @@ add_option(struct options *options, } else if (streq(p[0], "iroute") && p[1] && !p[3]) { - const char *netmask = NULL; - VERIFY_PERMISSION(OPT_P_INSTANCE); - if (p[2]) - { - netmask = p[2]; - } - option_iroute(options, p[1], netmask, msglevel); + option_iroute(options, p[1], p[2], msglevel); } else if (streq(p[0], "iroute-ipv6") && p[1] && !p[2]) {