From patchwork Thu Nov 7 06:45:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 884 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 QCPVDQ9ZxF25VgAAIUCqbw for ; Thu, 07 Nov 2019 12:49:03 -0500 Received: from proxy5.mail.ord1d.rsapps.net ([172.30.191.6]) by director11.mail.ord1d.rsapps.net with LMTP id cKh/DQ9ZxF15AwAAvGGmqA ; Thu, 07 Nov 2019 12:49:03 -0500 Received: from smtp13.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy5.mail.ord1d.rsapps.net with LMTP id aKczDQ9ZxF3cDQAA8Zzt7w ; Thu, 07 Nov 2019 12:49:03 -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.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; dkim=fail (signature verification failed) header.d=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: e2636f04-0186-11ea-94d0-525400b197d9-1-1 Received: from [216.105.38.7] ([216.105.38.7:37050] helo=lists.sourceforge.net) by smtp13.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 97/82-13012-E0954CD5; Thu, 07 Nov 2019 12:49:02 -0500 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.90_1) (envelope-from ) id 1iSlt5-0002Im-T3; Thu, 07 Nov 2019 17:48:03 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1iSlt4-0002I4-Fq for openvpn-devel@lists.sourceforge.net; Thu, 07 Nov 2019 17:48:02 +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=MlQOUr89izWSCuXFUFECqg7L104GVVGiqhO6ZCNm+64=; b=VCYMdXbtwwh/1pkw4T3rJGonUP xfd+a4z/ijSIhUjVlCErcQ8iNeT7ifjplUtzHHbsT25ElsI4dr2CRx2zGXMmZ1yU4AA/dw4iBtKam JKadBMG9YotOevrcbLAA9XywxEr0P6seKN5boZvLsmBhUNCq53hwKlxqm11KqwOF2rDM=; 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=MlQOUr89izWSCuXFUFECqg7L104GVVGiqhO6ZCNm+64=; b=Cz7c6EYkvPvRLKK+og98ebHCdK vwKLQujMpOtOc4u1Y+v1g445NPo3c4sX6pvOC42PtJEKTZ7++jO3Y+SQYnLgOcSusz3L2Dm5Mhots xcNVmGJx9kxbLB8A7rV+nV/Iu160qLfXcfZLUxB3bt4KCNAsVnqObpDEbvW4lMvJ3WmQ=; Received: from mail-wr1-f68.google.com ([209.85.221.68]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1iSlt0-005Co9-R4 for openvpn-devel@lists.sourceforge.net; Thu, 07 Nov 2019 17:48:02 +0000 Received: by mail-wr1-f68.google.com with SMTP id h3so3988693wrx.12 for ; Thu, 07 Nov 2019 09:47:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MlQOUr89izWSCuXFUFECqg7L104GVVGiqhO6ZCNm+64=; b=K+udwsYW72wH5IjEQYujLiqRPxZUUhvlWesPfza3uhZAFEFdpywClJMWyKX5kZCYSS H7qBZnIPEwoQY2u8b0UEHjxWghjE9Hv+epIr6ku5cB2e+5+7lAZ0Ac1aKjLN9g++1IV1 M5KfDEodPLNhnoj85lNOKofdel34dJ1We8T1uuL83hXbrjJahI52ONYiDTkn4ciT3FI3 x0uwdtAyjXBmXEYXmQ7a2Zmd9UtxTzVBMsqhDP0VC2uyedIPtA0LgqP3ceyLHriuwQ1M 8Bt/oaDAWQIuGFWlYlSphGlfM74f3VOEA2+qjbOwiSQYqoxBwD2Vg2TUNWnwcAt5MT4w QvrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MlQOUr89izWSCuXFUFECqg7L104GVVGiqhO6ZCNm+64=; b=GnfmB10gpjUMAu8de27TKc95vGpECE6LtP4Z35/7aC+RZZew8jEtqJNEswhEMph2vq 9uCDwF7E9Zos47NF/cp1FclfEaBiPsaVajmB4pizO1mmJSVCwGOFQUgGPZxUk4orh4QG RnOKEQzC+sfjPOlKns+2jD+e7ltcBxFzFdRgPk5mrgXTYXa/l3Kj61tc7/r2kaVHHxcf cptDZD7T76wclKMBLw7fjl8Yif4TMnKDc4RpA6CCgpIRaANY4NtQDij+0ZgLzQZhRnM/ 3tYRupFyV4g+hqs4xiz1VZBYibhFDmcTSDff7gN3gQhOAPEUnamnywHuvYfRF9yvAfid Lp8w== X-Gm-Message-State: APjAAAWzMoOF8kBYFCDABtA5yAJn0x3nMPP6tSriK4hlo9SBerei4ucB Xcyf5pyqQs0HYLDcV7Jz7gNlcpCzlMkhfw== X-Google-Smtp-Source: APXvYqymD3XIdFNr532XD83sIzcEadG1Od8hq85fjRHLmltx3IYF26CAnRjxHDfXv7933VEmgsoPxw== X-Received: by 2002:a5d:6585:: with SMTP id q5mr3937525wru.158.1573148871754; Thu, 07 Nov 2019 09:47:51 -0800 (PST) Received: from stipakov.fi (stipakov.fi. [128.199.52.117]) by smtp.gmail.com with ESMTPSA id l13sm2527752wmh.12.2019.11.07.09.47.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Nov 2019 09:47:51 -0800 (PST) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Thu, 7 Nov 2019 19:45:29 +0200 Message-Id: <1573148729-27339-8-git-send-email-lstipakov@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1573148729-27339-1-git-send-email-lstipakov@gmail.com> References: <1573148729-27339-1-git-send-email-lstipakov@gmail.com> 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: openvpn.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.221.68 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.221.68 listed in wl.mailspike.net] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (lstipakov[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1iSlt0-005Co9-R4 Subject: [Openvpn-devel] [PATCH v2 7/7] wintun: clear adapter settings on tun close 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: Lev Stipakov MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Lev Stipakov With tap-windows6 we clear adapter settings with DHCP, but since wintun doesn't do DHCP we do it with netsh. Signed-off-by: Lev Stipakov --- src/openvpn/tun.c | 79 +++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 29 deletions(-) diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index c3ea4a8..9bdd707 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -6369,6 +6369,50 @@ tun_show_debug(struct tuntap *tt) } } +static void +netsh_delete_address_dns(const struct tuntap *tt, bool ipv6, struct gc_arena *gc) +{ + const char* ifconfig_ip_local; + struct argv argv = argv_new(); + + /* "store=active" is needed in Windows 8(.1) to delete the + * address we added (pointed out by Cedric Tabary). + */ + + /* netsh interface ipvX delete address \"%s\" %s */ + if (ipv6) + { + ifconfig_ip_local = print_in6_addr(tt->local_ipv6, 0, gc); + } + else + { + ifconfig_ip_local = print_in_addr_t(tt->local, 0, gc); + } + argv_printf(&argv, + "%s%sc interface %s delete address %s %s store=active", + get_win_sys_path(), + NETSH_PATH_SUFFIX, + ipv6 ? "ipv6" : "ipv4", + tt->actual_name, + ifconfig_ip_local); + + netsh_command(&argv, 1, M_WARN); + + /* delete ipvX dns servers if any were set */ + int len = ipv6 ? tt->options.dns6_len : tt->options.dns_len; + if (len > 0) + { + argv_printf(&argv, + "%s%sc interface %s delete dns %s all", + get_win_sys_path(), + NETSH_PATH_SUFFIX, + ipv6 ? "ipv6" : "ipv4", + tt->actual_name); + netsh_command(&argv, 1, M_WARN); + } + argv_reset(&argv); +} + void close_tun(struct tuntap *tt, openvpn_net_ctx_t *ctx) { @@ -6391,35 +6435,7 @@ close_tun(struct tuntap *tt, openvpn_net_ctx_t *ctx) } else { - const char *ifconfig_ipv6_local; - struct argv argv = argv_new(); - - /* "store=active" is needed in Windows 8(.1) to delete the - * address we added (pointed out by Cedric Tabary). - */ - - /* netsh interface ipv6 delete address \"%s\" %s */ - ifconfig_ipv6_local = print_in6_addr(tt->local_ipv6, 0, &gc); - argv_printf(&argv, - "%s%sc interface ipv6 delete address %s %s store=active", - get_win_sys_path(), - NETSH_PATH_SUFFIX, - tt->actual_name, - ifconfig_ipv6_local); - - netsh_command(&argv, 1, M_WARN); - - /* delete ipv6 dns servers if any were set */ - if (tt->options.dns6_len > 0) - { - argv_printf(&argv, - "%s%sc interface ipv6 delete dns %s all", - get_win_sys_path(), - NETSH_PATH_SUFFIX, - tt->actual_name); - netsh_command(&argv, 1, M_WARN); - } - argv_reset(&argv); + netsh_delete_address_dns(tt, true, &gc); } } #if 1 @@ -6441,6 +6457,11 @@ close_tun(struct tuntap *tt, openvpn_net_ctx_t *ctx) strerror_win32(status, &gc)); } } + else + if (tt->wintun) + { + netsh_delete_address_dns(tt, false, &gc); + } #endif dhcp_release(tt);