From patchwork Mon Mar 6 08:07:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 3106 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:2310:b0:9f:bfa4:120f with SMTP id r16csp2258336dye; Mon, 6 Mar 2023 00:38:04 -0800 (PST) X-Google-Smtp-Source: AK7set8GZzs1RSQlEvPav8g9YeKDVahHNKWtR5smOXU6T1KyIeqgxKu1ck2hwknh6MbtKXtOw/+1 X-Received: by 2002:a17:903:187:b0:19c:dc38:3eb5 with SMTP id z7-20020a170903018700b0019cdc383eb5mr13696370plg.14.1678091883925; Mon, 06 Mar 2023 00:38:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678091883; cv=none; d=google.com; s=arc-20160816; b=Ge7JTdNHuDl5ZaWrigErD4w6lBO/F+bigFa/Jg4Px5x3LHP/INa+fRoqWZEPyOTU58 5tFdzlmrzylM8N4x6u2zHV6XWiNu9gsyZBJWY1WjH8EdjGPvUumIVIHeCKE3zw9mbDBX pkQB7lwNL170fD5qk3wLmQak0Y2PIwQnl3F8DvgbaTgMwaaEDJy0SYnwfIiWPo5aAw+u Fq5PohjwrttiAVclwq2KVnKbTw6R0A9I8OSyHGXlWwHeKMdGHicZ34asqAwsjlYO358x Gdk3d2sB/57to4VsdxGjBDMLf+tJmXqoMbUqHzkkVOpwmgeL3seDlNPkbHnrpLnZO7nL NyTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:dkim-signature; bh=Zz+httDRpQ1BmlN+6DxGH3E2eQABYqgwA7/2zY9BsfY=; b=0bVDG418bOcjvlWO3F8Y/9PjxdjBjkTnVoJ6numvMjjrNOkXOYNEnyE4o1nxDdXaik Ne2ntcbfo0zsG2t8+z3e4Us0FiQpEXJcbbHeA+9vyc8yETgYiB1Bt1qNAmm0bzGQmSZL Vve2FaFHlIpp0ePB5tg5+5ElUSirnLykwGcJMRNH/2ceilAnFbVskK3SrjMQvASLHul3 WzAfC6jfTayq32iAS0T++zIMUSq82PawCkVDkSHrYGuwNPMkypdA+HZBhBsfTFAgQRs9 D9qFmIwSTc3BDDaKxgIL0c/IKBJFPVmJIA6QWyivgRDqNgdmYjsxwCHJnSCRS9JBys5c gKYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=WXIcAODq; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Krc9Bvuw; 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 Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id x4-20020a170902ec8400b00194967b7badsi3663677plg.591.2023.03.06.00.38.03 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Mar 2023 00:38:03 -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=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=WXIcAODq; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Krc9Bvuw; 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 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 1pZ6LI-0004YY-EQ; Mon, 06 Mar 2023 08:37:12 +0000 Received: from [172.30.20.202] (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 1pZ6LF-0004YR-Mq for openvpn-devel@lists.sourceforge.net; Mon, 06 Mar 2023 08:37:09 +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=RHEfEcj98Bz8ekepnX9oosV+Wov71uE+vokSUzbqRgo=; b=WXIcAODqPctge8hsLU31MhYMes 3HoGPRSCNP8J6j7118cvHHSg5xkIrR/i47Wg64tEHQNwQaUIdJH47dsJS60ekyL6l5Jxx/iMgN/Yw KawqSg0OZ8ut9Aq2vkMoylKSOn0kLB00olyzLmKYMZ2G+SuLk43xLCd+S8DBaa5wzGVo=; 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=RHEfEcj98Bz8ekepnX9oosV+Wov71uE+vokSUzbqRgo=; b=K rc9BvuwtO92SWrqnFIdhhisv1cDsAnMXD04FO5l7BK4ThtUCxNbUbjLULdJELQRMpXkPnfXl5/7MD W9IjUYHyqWnnVSsL9bzu24lm14NM/uz3yUPeZEsLsKCPiMwFtnSIH+JUlJyOTlEsE/XIPIW+NMaeZ C+dIRGl1KBXMFKr4=; Received: from vmail1.greenie.net ([195.30.8.66]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1pZ6LC-000444-QV for openvpn-devel@lists.sourceforge.net; Mon, 06 Mar 2023 08:37:09 +0000 Received: from fbsd-tc.ov.greenie.net (fbsd-tc.ov.greenie.net [IPv6:2001:608:0:814:0:0:f000:21]) by vmail1.greenie.net (8.17.1/8.16.1) with ESMTPS id 32687iUL064029 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=FAIL) for ; Mon, 6 Mar 2023 09:07:44 +0100 (CET) Received: from fbsd-tc.ov.greenie.net (localhost [127.0.0.1]) by fbsd-tc.ov.greenie.net (8.16.1/8.16.1) with ESMTPS id 32687iUe066078 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO) for ; Mon, 6 Mar 2023 09:07:44 +0100 (CET) (envelope-from gert@fbsd-tc.ov.greenie.net) Received: (from gert@localhost) by fbsd-tc.ov.greenie.net (8.16.1/8.16.1/Submit) id 32687i8J066077 for openvpn-devel@lists.sourceforge.net; Mon, 6 Mar 2023 09:07:44 +0100 (CET) (envelope-from gert) From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Mon, 6 Mar 2023 09:07:44 +0100 Message-Id: <20230306080744.66069-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.4 (vmail1.greenie.net [IPv6:2001:608:1:995a:20c:29ff:feb8:10eb]); Mon, 06 Mar 2023 09:07:44 +0100 (CET) X-Spam-Score: -2.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: Commit 16d7f2cd4d90 tried to remove an FreeBSD 12.x ifconfig inet6 workaround based on the understanding that the upstream fix for bug 248172 went into 12.4, but that was a misread of the code - 12.4 [...] Content analysis details: (-2.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [195.30.8.66 listed in list.dnswl.org] 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: 1pZ6LC-000444-QV Subject: [Openvpn-devel] [PATCH] FreeBSD 12.x workaround for IPv6 ifconfig is needed on 12.4 as well 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?1759606874919300616?= X-GMAIL-MSGID: =?utf-8?q?1759606874919300616?= Commit 16d7f2cd4d90 tried to remove an FreeBSD 12.x ifconfig inet6 workaround based on the understanding that the upstream fix for bug 248172 went into 12.4, but that was a misread of the code - 12.4 needs the workaround as well, fixed in 13.0. Also extend comment to point to /etc/network.subr, which is the real source of the problematic code if checkyesno ipv6_activate_all_interfaces; then _ipv6_opts="-ifdisabled" elif [ "$1" != "lo0" ]; then <<<< _ipv6_opts="ifdisabled" <<<< fi Signed-off-by: Gert Doering Acked-By: Arne Schwabe --- src/openvpn/tun.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index a1414d23..ca5c3b38 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -1105,11 +1105,11 @@ do_ifconfig_ipv6(struct tuntap *tt, const char *ifname, int tun_mtu, "generic BSD ifconfig inet6 failed"); #if defined(TARGET_FREEBSD) && __FreeBSD_version >= 1200000 \ - && __FreeBSD_version < 1204000 - /* On FreeBSD 12.0-12.3, there is ipv6_activate_all_interfaces="YES" + && __FreeBSD_version < 1300000 + /* On FreeBSD 12.0-12.4, there is ipv6_activate_all_interfaces="YES" * in rc.conf, which is not set by default. If it is *not* set, * "all new interfaces that are not already up" are configured by - * devd + /etc/pccard_ether as "inet6 ifdisabled". + * devd -> /etc/pccard_ether -> /etc/network.subr as "inet6 ifdisabled". * * The "is this interface already up?" test is a non-zero time window * which we manage to hit with our ifconfig often enough to cause