From patchwork Tue Jun 12 22:12:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 367 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director8.mail.ord1d.rsapps.net ([172.28.255.1]) by backend30.mail.ord1d.rsapps.net (Dovecot) with LMTP id W/SFCuTSIFsFJAAAIUCqbw for ; Wed, 13 Jun 2018 04:16:36 -0400 Received: from director5.mail.ord1c.rsapps.net ([172.28.255.1]) by director8.mail.ord1d.rsapps.net (Dovecot) with LMTP id 03QaCuTSIFvsfwAAfY0hYg ; Wed, 13 Jun 2018 04:16:36 -0400 Received: from smtp2.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by director5.mail.ord1c.rsapps.net with LMTP id YDkgCuTSIFsNCgAAH8LYwg ; Wed, 13 Jun 2018 04:16:36 -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: smtp2.gate.ord1c.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: 151e7db4-6ee2-11e8-adb8-842b2b4e7063-1-1 Received: from [216.105.38.7] ([216.105.38.7:55316] helo=lists.sourceforge.net) by smtp2.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 92/24-19643-1E2D02B5; Wed, 13 Jun 2018 04:16:33 -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.90_1) (envelope-from ) id 1fT0wK-0002jd-8M; Wed, 13 Jun 2018 08:15:36 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1fT0wI-0002jW-Cm for openvpn-devel@lists.sourceforge.net; Wed, 13 Jun 2018 08:15:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: 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=LJTu6k3d75n+M7n6kWKcdGWX1VwHu29E9vgzXNOMboA=; b=Z3cDgT/6fWLuBsUm2gwvSOT9EE kplMgOrnayq+YaN3zmka8BzLqZ4nbjrtIqEiN+Lj2JsH40ECacHJGOmEts/8MZ7o5NblyRHJ9AW2L TiPzZmTNNQAbDL6e2d+IM+d7RsV+Ojjt5r4WGV6As6SBaGjNsTCuCJpTqzv+wDU+RBlY=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To :MIME-Version:Content-Type:Content-Transfer-Encoding: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=LJTu6k3d75n+M7n6kWKcdGWX1VwHu29E9vgzXNOMboA=; b=JahGhjTx1IFxMvyWvbXfwulcby l8wC8AhPvH/ptUDG5z553ntHsmZRrFKdpH0Osa4O7Az7iWXy8zK97CeCNJ66ccYi1+BBN/5oQv7Ap YoVYqvRnsw0poNyqZkgE2m1uNZGfG2GeDD7ueSs7wbkNHHNRJTGsgICQZrKEaJBm/pNc=; Received: from s2.neomailbox.net ([5.148.176.60]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) id 1fT0wG-006bew-V5 for openvpn-devel@lists.sourceforge.net; Wed, 13 Jun 2018 08:15:34 +0000 From: Antonio Quartulli To: openvpn-devel@lists.sourceforge.net Date: Wed, 13 Jun 2018 16:12:18 +0800 Message-Id: <20180613081218.1834-5-a@unstable.cc> In-Reply-To: <20180613081218.1834-1-a@unstable.cc> References: <20180613081218.1834-1-a@unstable.cc> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [5.148.176.60 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1fT0wG-006bew-V5 Subject: [Openvpn-devel] [PATCH 3/3] tun: get rid of tt->did_ifconfig member 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: Antonio Quartulli MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Antonio Quartulli tt->did_ifconfig is currently only read by the Linux platform, but it is currently iuselessly set also by every other system. The Linux platform does not actually even need this member and can directly rely on tt->did_ifconfig_setup. For the reasons above, remove the tt->did_ifconfig at all and use tt->did_ifconfig_setup where needed (close_tun() on Linux). Signed-off-by: Antonio Quartulli --- src/openvpn/tun.c | 12 +----------- src/openvpn/tun.h | 1 - 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 932c9d2d..36429204 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -987,7 +987,6 @@ do_ifconfig(struct tuntap *tt, argv_msg(M_INFO, &argv); openvpn_execve_check(&argv, es, S_FATAL, "Linux ip -6 addr add failed"); } - tt->did_ifconfig = true; #else /* ifdef ENABLE_IPROUTE */ if (tun) { @@ -1026,7 +1025,6 @@ do_ifconfig(struct tuntap *tt, argv_msg(M_INFO, &argv); openvpn_execve_check(&argv, es, S_FATAL, "Linux ifconfig inet6 failed"); } - tt->did_ifconfig = true; #endif /*ENABLE_IPROUTE*/ #elif defined(TARGET_ANDROID) @@ -1186,8 +1184,6 @@ do_ifconfig(struct tuntap *tt, add_route(&r, tt, 0, NULL, es); } - tt->did_ifconfig = true; - #elif defined(TARGET_OPENBSD) in_addr_t remote_end; /* for "virtual" subnet topology */ @@ -1265,7 +1261,6 @@ do_ifconfig(struct tuntap *tt, /* and, hooray, we explicitely need to add a route... */ add_route_connected_v6_net(tt, es); } - tt->did_ifconfig = true; #elif defined(TARGET_NETBSD) @@ -1327,7 +1322,6 @@ do_ifconfig(struct tuntap *tt, /* and, hooray, we explicitely need to add a route... */ add_route_connected_v6_net(tt, es); } - tt->did_ifconfig = true; #elif defined(TARGET_DARWIN) /* @@ -1384,7 +1378,6 @@ do_ifconfig(struct tuntap *tt, argv_msg(M_INFO, &argv); openvpn_execve_check(&argv, es, S_FATAL, "Mac OS X ifconfig failed"); - tt->did_ifconfig = true; /* Add a network route for the local tun interface */ if (!tun && tt->topology == TOP_SUBNET) @@ -1457,7 +1450,6 @@ do_ifconfig(struct tuntap *tt, argv_msg(M_INFO, &argv); openvpn_execve_check(&argv, es, S_FATAL, "FreeBSD ifconfig failed"); - tt->did_ifconfig = true; /* Add a network route for the local tun interface */ if (!tun && tt->topology == TOP_SUBNET) @@ -1507,7 +1499,6 @@ do_ifconfig(struct tuntap *tt, argv_msg(M_INFO, &argv); openvpn_execve_check(&argv, aix_es, S_FATAL, "AIX ifconfig failed"); - tt->did_ifconfig = true; if (do_ipv6) { @@ -1545,7 +1536,6 @@ do_ifconfig(struct tuntap *tt, break; } - tt->did_ifconfig = true; } if (do_ipv6) @@ -2104,7 +2094,7 @@ close_tun(struct tuntap *tt) { ASSERT(tt); - if (tt->type != DEV_TYPE_NULL && tt->did_ifconfig) + if (tt->type != DEV_TYPE_NULL && tt->did_ifconfig_setup) { struct argv argv = argv_new(); struct gc_arena gc = gc_new(); diff --git a/src/openvpn/tun.h b/src/openvpn/tun.h index 6c57ad0d..9495d602 100644 --- a/src/openvpn/tun.h +++ b/src/openvpn/tun.h @@ -138,7 +138,6 @@ struct tuntap bool did_ifconfig_setup; bool did_ifconfig_ipv6_setup; - bool did_ifconfig; bool persistent_if; /* if existed before, keep on program end */