From patchwork Thu Sep 12 14:24:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 3828 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:24eb:b0:5b9:581e:f939 with SMTP id o11csp808162man; Thu, 12 Sep 2024 07:24:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUcSHtfV+Dln51glr+u1T+7ETK6cXz6Ud7+wsUM3kSge13yh3Eyd2rZXgfrDnLOxBESLc8524y0Uzc=@openvpn.net X-Google-Smtp-Source: AGHT+IGj+Xmfv/OMyxIvqAeuHEwtFaahesmYv7+K0s/vklH/AyvQeRp7fYBjOEoDn08SLS+RWKRl X-Received: by 2002:a05:6870:612b:b0:278:5a4:10cc with SMTP id 586e51a60fabf-27c3f253a60mr2470513fac.3.1726151082774; Thu, 12 Sep 2024 07:24:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726151082; cv=none; d=google.com; s=arc-20240605; b=AxDb78IMmBpo3LPAi3afHCDJUjV/8ahcNlDYRa2wIj/G9whihIuSRvf0p0Pnkyau+x R+7pOw+k1HIuaCweCkH833lrUlHmsAXqwyPUlmqlJMJUTvqujfeZrd5W7VUpG3GZxV6D r99P83BjOEQcXNEPzZHdG2jEUPkAGZK1JzNJZtBOAmU9I51rxAOZPxwDPkThJoooPCJn XRksdtpwkzpZmM4n0/ECw/btwgyXXt/Utlsua2qSQnHc4+r5ew+pcMyURp2ACORln1H1 FL0JvWn+7khdPnHDc91nqdeGHikjc80U/E6p3xBIPGS8uY01nKAPReXPM5pZtLBQ1FXC PGnA== 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; bh=EBlqSUyG/lzW4KnfVoRrteqaLCb3h6HoV19mOzdaWM4=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=TfEucnta6fZ9V+rUda/pgyX3LC/7HziReClRbbk0Eur5OKXEJ8mNYXRWthinK9vZu3 Ggon8TPPuKcsp5/HAhW6BgAOuNGiCYweTE4w33XysNAYLhxyOYX/UQ1J90O//E8PLfS6 xe/PEVV0PPotaTJiV/9/haDYclv+9XLpsW4FK7LOrnHfD/qGU4aNdZPyNDjWHnynFLbX GfynCFE5NNdWOQhwmQZvzg7No5nCIZihBet9DZVbvLSPbS0er6ZzMJX+uU6wgnj7TtLP X6OBVXRFuIeM2xYU2/krSUnjycuv3Wex/xcw8iSfXM4XPgP39wKeoKXo88XIdrSLMvuX oBnw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b="HCf/rIJs"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=YTBCbfMj; 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-27ba3ede7cesi5900053fac.115.2024.09.12.07.24.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Sep 2024 07:24:42 -0700 (PDT) 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="HCf/rIJs"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=YTBCbfMj; 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 [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 1sokkK-0001Vz-6K; Thu, 12 Sep 2024 14:24:32 +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 1sokkI-0001Vs-DR for openvpn-devel@lists.sourceforge.net; Thu, 12 Sep 2024 14:24:30 +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=n8c6D2ulVuFqVhGaggA9TDQxpsIpr8gPo7WKGItXqTc=; b=HCf/rIJsPgiKvUTuHLYgoihfK8 QRdgaTP/rZbQKptxjmhvSuu79AcdM1n8FKH4VAkyydVnqyCFTFVthTjMagXYqyok2SjDw12Bso3aP PJJpcifR4qBahAqWBrcNNavh1WyI6k+CQmYYDxJhuTvK2/5g0Qmb737RX3saHXj6ZfU8=; 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=n8c6D2ulVuFqVhGaggA9TDQxpsIpr8gPo7WKGItXqTc=; b=YTBCbfMjJlOt9tqmCHXV2FiuMI 1faDqixfQtMBI54gE20yf5MoTi5nayHEcFL67hTPVyo2jTfzriHXvOMBlwhQGaPiqfZwtSTOt12Vg cEzuKnlqwxR+RUSPtpZCpYhCju5Gu/Pc+qwbXY5tj2eTqSCQ2qOs0CTZucNzrJtBkeVg=; Received: from dhcp-174.greenie.muc.de ([193.149.48.174] 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 1sokkH-0003BK-5M for openvpn-devel@lists.sourceforge.net; Thu, 12 Sep 2024 14:24:30 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.17.1.9/8.17.1.9) with ESMTP id 48CEOMc9000713 for ; Thu, 12 Sep 2024 16:24:22 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.17.1.9/8.17.1.9/Submit) id 48CEOM7S000712 for openvpn-devel@lists.sourceforge.net; Thu, 12 Sep 2024 16:24:22 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Thu, 12 Sep 2024 16:24:21 +0200 Message-ID: <20240912142421.703-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.44.2 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-2.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: From: Marco Baffo Removed superfluous calls to 'add_route_ipv6' for adding ipv6 routes after tun opening in OpenBSD, NetBSD and Darwin. Change-Id: I235891212b15277349810913c9c1763da5c48587 Signed-off-by: Marco Baffo Acked-by: Gert Doering --- Content analysis details: (-0.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-Headers-End: 1sokkH-0003BK-5M Subject: [Openvpn-devel] [PATCH v3] tun: removed unnecessary route installations 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?1809719762214720498?= X-GMAIL-MSGID: =?utf-8?q?1810000597502773259?= From: Marco Baffo Removed superfluous calls to 'add_route_ipv6' for adding ipv6 routes after tun opening in OpenBSD, NetBSD and Darwin. Change-Id: I235891212b15277349810913c9c1763da5c48587 Signed-off-by: Marco Baffo Acked-by: Gert Doering --- 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/+/731 This mail reflects revision 3 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 739e008..82c5c00 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -1008,8 +1008,7 @@ #endif /* ifdef _WIN32 */ } -#if defined(_WIN32) \ - || defined(TARGET_DARWIN) || defined(TARGET_NETBSD) || defined(TARGET_OPENBSD) +#if defined(_WIN32) /* some of the platforms will auto-add a "network route" pointing * to the interface on "ifconfig tunX 2001:db8::1/64", others need @@ -1200,11 +1199,6 @@ "FreeBSD BSD 'ifconfig inet6 -ifdisabled' failed"); #endif -#if defined(TARGET_OPENBSD) || defined(TARGET_NETBSD) \ - || defined(TARGET_DARWIN) - /* and, hooray, we explicitly need to add a route... */ - add_route_connected_v6_net(tt, es); -#endif #elif defined(TARGET_AIX) argv_printf(&argv, "%s %s inet6 %s/%d mtu %d up", IFCONFIG_PATH, ifname, ifconfig_ipv6_local, tt->netbits_ipv6, tun_mtu);