From patchwork Wed Jul 15 01:31:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 1246 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director11.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id KM9sBYfpDl/GYAAAIUCqbw for ; Wed, 15 Jul 2020 07:33:27 -0400 Received: from proxy17.mail.ord1d.rsapps.net ([172.30.191.6]) by director11.mail.ord1d.rsapps.net with LMTP id yC1LBYfpDl+qZQAAvGGmqA ; Wed, 15 Jul 2020 07:33:27 -0400 Received: from smtp33.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy17.mail.ord1d.rsapps.net with LMTP id MKkDBYfpDl8WPQAAWC7mWg ; Wed, 15 Jul 2020 07:33:27 -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: smtp33.gate.ord1d.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=greenie.muc.de X-Suspicious-Flag: YES X-Classification-ID: ff8772ce-c68e-11ea-a572-525400041ef2-1-1 Received: from [216.105.38.7] ([216.105.38.7:53260] helo=lists.sourceforge.net) by smtp33.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id E8/26-19885-689EE0F5; Wed, 15 Jul 2020 07:33:26 -0400 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1jvfdb-0003Yq-0X; Wed, 15 Jul 2020 11:31:47 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jvfdW-0003YZ-FC for openvpn-devel@lists.sourceforge.net; Wed, 15 Jul 2020 11:31:42 +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: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:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=zBHh24E49XnOr7+IN5mjr7/n7el8xa6urA0RX9f2F30=; b=XtRXpfAOkIJ+EUYPccKdojtDbM JRsZRodmli9sx24HoxK0+F3MeHxmn8tjFgxUppH1pbNVJRR/f2A3LxE7NhA79UCIQ7+7lo88YIELM PISj9yCVG+6bmlwVt6qEhoqYihybzP3xivC05MTmlpP4S9Mzx9abXaQ6w132A6rRHaw0=; 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: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:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=zBHh24E49XnOr7+IN5mjr7/n7el8xa6urA0RX9f2F30=; b=h wqjmG75zhujk5+5rB70ogtAcc7GfxZpjHiyUjH0k2y5/pBbfIhN1XYaFBs4itvGEgWI+RdPEbSgP6 nGMk3sKd/ya7z0IRApdONWWpa992WzSzvzOs0m3BxSUGSsKSCXz3wz6d+m8SBkwAxhxybDEXtjFtX hkweeyRE9Am1jxwo=; Received: from vmail1.greenie.net ([195.30.8.66]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1jvfdS-004Oxt-Tz for openvpn-devel@lists.sourceforge.net; Wed, 15 Jul 2020 11:31:40 +0000 Received: from gentoo.ov.greenie.net (gentoo.ov.greenie.net [IPv6:2001:608:0:814:0:0:f000:11]) by vmail1.greenie.net (8.15.2/8.12.11) with SMTP id 06FBVWkS042472 for ; Wed, 15 Jul 2020 13:31:32 +0200 (CEST) Received: (nullmailer pid 22800 invoked by uid 1000); Wed, 15 Jul 2020 11:31:32 -0000 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Wed, 15 Jul 2020 13:31:32 +0200 Message-Id: <20200715113132.22754-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (vmail1.greenie.net [IPv6:2001:608:1:995a:20c:29ff:feb8:10eb]); Wed, 15 Jul 2020 13:31:32 +0200 (CEST) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: muc.de] 0.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Headers-End: 1jvfdS-004Oxt-Tz Subject: [Openvpn-devel] [PATCH] Fix environment variables for p2mp-assigned IPv6 addresses. 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 commit a8f8b926718 introduces $ENV{ifconfig_pool_local_ip6} and $ENV{ifconfig_pool_remote_ip6}, but instead of properly setting them, the code overwrites the IPv4 variables, $ENV{ifconfig_pool_remote} and $ENV{ifconfig_pool_local}. Trivial fix. Signed-off-by: Gert Doering Acked-By: Arne Schwabe --- src/openvpn/multi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index fe8fcd50..01da8c73 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -1624,11 +1624,11 @@ multi_set_virtual_addr_env(struct multi_instance *mi) if (mi->context.c2.push_ifconfig_ipv6_defined) { setenv_in6_addr(mi->context.c2.es, - "ifconfig_pool_remote", + "ifconfig_pool_remote_ip6", &mi->context.c2.push_ifconfig_ipv6_local, SA_SET_IF_NONZERO); setenv_in6_addr(mi->context.c2.es, - "ifconfig_pool_local", + "ifconfig_pool_local_ip6", &mi->context.c2.push_ifconfig_ipv6_remote, SA_SET_IF_NONZERO); setenv_int(mi->context.c2.es,