From patchwork Tue Dec 7 06:02:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 2143 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.31.255.6]) by backend41.mail.ord1d.rsapps.net with LMTP id cI/AMEyUr2GdXQAAqwncew (envelope-from ) for ; Tue, 07 Dec 2021 12:05:16 -0500 Received: from proxy11.mail.iad3b.rsapps.net ([172.31.255.6]) by director12.mail.ord1d.rsapps.net with LMTP id mLefJEyUr2HAVAAAIasKDg (envelope-from ) for ; Tue, 07 Dec 2021 12:05:16 -0500 Received: from smtp13.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy11.mail.iad3b.rsapps.net with LMTPS id yAQHDk2Ur2E3cAAARNREpw (envelope-from ) for ; Tue, 07 Dec 2021 12:05:17 -0500 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: smtp13.gate.iad3b.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=rfc2549.org X-Suspicious-Flag: YES X-Classification-ID: 8dbcb518-577f-11ec-be6b-5254001dfc40-1-1 Received: from [216.105.38.7] ([216.105.38.7:47020] helo=lists.sourceforge.net) by smtp13.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 68/81-27804-DC39FA16; Tue, 07 Dec 2021 12:03:09 -0500 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 1mudrH-0003R6-Cb; Tue, 07 Dec 2021 17:02:28 +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 1mudrE-0003P2-3e for openvpn-devel@lists.sourceforge.net; Tue, 07 Dec 2021 17:02: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: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=p7X/k+chKRvtCc7OGA7tiI6k36CZH6YosalvXpq8wEE=; b=bPybVQt2cvpg2Gz0UV5JlDI/TD KvAt7HLi4+5dCeyoIjhnH3DKOVSO+Tm6GMmi+omjCllRWA+qe5jtoMEN8+9uNW3JaRRYEAt3NgXxH kVEJCC2xkDs414XldIIOECzE/w579TDmKgmeuN5afcqE2kDt8/LVA5Zc/7KIyj5WCbkk=; 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=p7X/k+chKRvtCc7OGA7tiI6k36CZH6YosalvXpq8wEE=; b=L1+OUmPuriqJJ2O+o7mESdwAiS OAFGhaTtTQytUcJEMApHBD9LUUNpUAq937pz0uGXNA9JYIVqveNHGlXyOx0Zf3QsTSPd4egxZkX6+ ba3UXZ81WMFEY4x8hUxGncHImMjPmCYZ1zXmPQ+Em+yipFGFl89BjjjUhT37+qsUlygk=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) id 1mudrD-0006Mw-Mv for openvpn-devel@lists.sourceforge.net; Tue, 07 Dec 2021 17:02:25 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.94.2 (FreeBSD)) (envelope-from ) id 1mudr2-000IeM-I6 for openvpn-devel@lists.sourceforge.net; Tue, 07 Dec 2021 18:02:12 +0100 Received: (nullmailer pid 3275933 invoked by uid 10006); Tue, 07 Dec 2021 17:02:12 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Tue, 7 Dec 2021 18:02:06 +0100 Message-Id: <20211207170211.3275837-17-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211207170211.3275837-1-arne@rfc2549.org> References: <20211207170211.3275837-1-arne@rfc2549.org> 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: The link mtu is no longer used and calculating a compatibility link MTU just for scripts makes little sense as well. Replace the parameter instead with a fixed paramter 0. Signed-off-by: Arne Schwabe --- Changes.rst | 2 ++ src/openvpn/init.c | 16 +++ 2 files changed, 5 insertions(+), 13 deletions(-) Content analysis details: (0.3 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record X-Headers-End: 1mudrD-0006Mw-Mv Subject: [Openvpn-devel] [PATCH 16/21] Remove link_mtu parameter when running up/down scripts 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 The link mtu is no longer used and calculating a compatibility link MTU just for scripts makes little sense as well. Replace the parameter instead with a fixed paramter 0. Signed-off-by: Arne Schwabe --- Changes.rst | 2 ++ src/openvpn/init.c | 16 +++------------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/Changes.rst b/Changes.rst index c673196fa..3ae994022 100644 --- a/Changes.rst +++ b/Changes.rst @@ -129,6 +129,8 @@ User-visible Changes - CHACHA20-POLY1305 is included in the default of ``--data-ciphers`` when available. - Option ``--prng`` is ignored as we rely on the SSL library random number generator. - Option ``--nobind`` is default when ``--client`` or ``--pull`` is used in the configuration +- :code:`link_mtu` parameter is removed from environment or replaced with 0 when scripts are + called with parameters. This parameter is unreliable and no longer internally calculated. Overview of changes in 2.5 ========================== diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 4f08e560a..72ffbfdfc 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -113,7 +113,6 @@ run_up_down(const char *command, #endif const char *dev_type, int tun_mtu, - int link_mtu, const char *ifconfig_local, const char *ifconfig_remote, const char *context, @@ -129,7 +128,6 @@ run_up_down(const char *command, } setenv_str(es, "script_context", context); setenv_int(es, "tun_mtu", tun_mtu); - setenv_int(es, "link_mtu", link_mtu); setenv_str(es, "dev", arg); if (dev_type) { @@ -157,11 +155,8 @@ run_up_down(const char *command, struct argv argv = argv_new(); ASSERT(arg); argv_printf(&argv, - "%s %d %d %s %s %s", - arg, - tun_mtu, link_mtu, - ifconfig_local, ifconfig_remote, - context); + "%s %d 0 %s %s %s", + arg, tun_mtu, ifconfig_local, ifconfig_remote, context); if (plugin_call(plugins, plugin_type, &argv, NULL, es) != OPENVPN_PLUGIN_FUNC_SUCCESS) { @@ -177,7 +172,7 @@ run_up_down(const char *command, ASSERT(arg); setenv_str(es, "script_type", script_type); argv_parse_cmd(&argv, command); - argv_printf_cat(&argv, "%s %d %d %s %s %s", arg, tun_mtu, link_mtu, + argv_printf_cat(&argv, "%s %d 0 %s %s %s", arg, tun_mtu, ifconfig_local, ifconfig_remote, context); argv_msg(M_INFO, &argv); openvpn_run_script(&argv, es, S_FATAL, "--up/--down"); @@ -1784,7 +1779,6 @@ do_open_tun(struct context *c) #endif dev_type_string(c->options.dev, c->options.dev_type), TUN_MTU_SIZE(&c->c2.frame), - EXPANDED_SIZE(&c->c2.frame), print_in_addr_t(c->c1.tuntap->local, IA_EMPTY_IF_UNDEF, &gc), print_in_addr_t(c->c1.tuntap->remote_netmask, IA_EMPTY_IF_UNDEF, &gc), "init", @@ -1834,7 +1828,6 @@ else #endif dev_type_string(c->options.dev, c->options.dev_type), TUN_MTU_SIZE(&c->c2.frame), - EXPANDED_SIZE(&c->c2.frame), print_in_addr_t(c->c1.tuntap->local, IA_EMPTY_IF_UNDEF, &gc), print_in_addr_t(c->c1.tuntap->remote_netmask, IA_EMPTY_IF_UNDEF, &gc), "restart", @@ -1914,7 +1907,6 @@ do_close_tun(struct context *c, bool force) #endif NULL, TUN_MTU_SIZE(&c->c2.frame), - EXPANDED_SIZE(&c->c2.frame), print_in_addr_t(local, IA_EMPTY_IF_UNDEF, &gc), print_in_addr_t(remote_netmask, IA_EMPTY_IF_UNDEF, &gc), "init", @@ -1945,7 +1937,6 @@ do_close_tun(struct context *c, bool force) #endif NULL, TUN_MTU_SIZE(&c->c2.frame), - EXPANDED_SIZE(&c->c2.frame), print_in_addr_t(local, IA_EMPTY_IF_UNDEF, &gc), print_in_addr_t(remote_netmask, IA_EMPTY_IF_UNDEF, &gc), "init", @@ -1984,7 +1975,6 @@ do_close_tun(struct context *c, bool force) #endif NULL, TUN_MTU_SIZE(&c->c2.frame), - EXPANDED_SIZE(&c->c2.frame), print_in_addr_t(local, IA_EMPTY_IF_UNDEF, &gc), print_in_addr_t(remote_netmask, IA_EMPTY_IF_UNDEF, &gc), "restart",