From patchwork Tue Nov 12 03:44:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 912 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director7.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id GFjAFYzFyl2yQwAAIUCqbw for ; Tue, 12 Nov 2019 09:45:32 -0500 Received: from proxy9.mail.ord1d.rsapps.net ([172.30.191.6]) by director7.mail.ord1d.rsapps.net with LMTP id 8JyFFYzFyl12HgAAovjBpQ ; Tue, 12 Nov 2019 09:45:32 -0500 Received: from smtp40.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy9.mail.ord1d.rsapps.net with LMTP id UIsyFYzFyl0HEwAA7h+8OQ ; Tue, 12 Nov 2019 09:45:32 -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: smtp40.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; 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: 13179ecc-055b-11ea-a793-525400b3abc9-1-1 Received: from [216.105.38.7] ([216.105.38.7:50412] helo=lists.sourceforge.net) by smtp40.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id AF/44-09709-B85CACD5; Tue, 12 Nov 2019 09:45:31 -0500 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 1iUXP3-0002Xp-Mm; Tue, 12 Nov 2019 14:44:21 +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 1iUXP2-0002XR-DR for openvpn-devel@lists.sourceforge.net; Tue, 12 Nov 2019 14:44:20 +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=02mznAmnKwtsox1GSQx33casWH0WErp8IRbk1AkaUeY=; b=Vr7rp54RyB2Iub7+H2myu+KEvD lDs5OeZl8eg/Mqf2XViyT/IMVnzo/kXMyTeNNBhlgKjfIpVJiBVaEqRSu0oTzBJqZcaS7glLG6YYI mHGgxGaAPn2G674qtf4AP05NCgW9JfsUXlkvrV7t6TXZXuRBudpUwRjzKzt3rzU9E6pA=; 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=02mznAmnKwtsox1GSQx33casWH0WErp8IRbk1AkaUeY=; b=EzuSgOLFOwYBck45DGOBSrTtjI OdmF/lPjbSOlMVkcHGXRZr6tpqAXVj73bi5aqmSEIVpTle7t2J8xgEaz0JrG6KY/bVLddwEdgQzMV bspDRE6oUWxqIcScQbcxgJGB1jXfHlaNRCyhaZgBcnC44o3nJj/nROylvexnT2n8hltw=; Received: from mail-wr1-f68.google.com ([209.85.221.68]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1iUXP1-00DMno-3o for openvpn-devel@lists.sourceforge.net; Tue, 12 Nov 2019 14:44:20 +0000 Received: by mail-wr1-f68.google.com with SMTP id e6so18881761wrw.1 for ; Tue, 12 Nov 2019 06:44:18 -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=02mznAmnKwtsox1GSQx33casWH0WErp8IRbk1AkaUeY=; b=emKGrTFyGMXs0DhkZFde0ADicr75kI0nGO0+boQkrXkASupJ7r/TNTpGegQ1w0qGM1 lAcsMlNrj26lUpNj1dvPXPC8iXazvUsmE/yuHglZuguQYKo7DnXjSsjdGxeyZQeNU2AJ KPUGDI3RadPLh+NsRpcbNpalQiIILLC4GSuKlsnjySBBBnx2Bb7S/NBuKfbr96GzjGrw kJF1LgP20sYIfkgTzS/BikqC6kP4yGrNjUTRWo2xQ5gjDGGYJq6wlvjqtb3vhP3U91DJ GHCf7d5BP9B5Q3irbjnQlTNekod3In3FSSme8ASWUTLatP1SWSmr8326onDxv7sM263W TrTg== 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=02mznAmnKwtsox1GSQx33casWH0WErp8IRbk1AkaUeY=; b=b/vffeQbX5DDjo5ufqvn97FychscKBBaCln+Jq9yFOAUgfylLoyBETu7e2l5je4DI/ eSfFHUkqMMea0tQIaY3ZL65QAmFMU/CpFPGAMVm9uyvcoNNGI5Uegi8rjHjHBKJIiGBf Y3Ecqz4P1vnM+SYE/ByxuURjrTqEvYcJBTnkI1lw55yZuXOOC2VCT3+vo7C+QQKRyk3B S5mnu4k8/atlcm2w5YiKifRb1ZBIFaRTHpwny6cHlGNexpUK0mtnEtQRuVcZtvDBqFpo T6YPeSwOmZrL6A9bMPHc72UgOYZBV5Sqb/7G7z6Rkb3El+Eg6nJlpwJbiASU6VGV4Th4 Qt2g== X-Gm-Message-State: APjAAAV7gFTGcF3O8TZD8pPxITJ6QpsVbGThw5kz3/ZJYZgWP0CEF1aF FSnxn8FtMzKD0bIYBKLGiqtWI1svw5aQEA== X-Google-Smtp-Source: APXvYqx95x2zt6xD6CKprKrw6vDOvc+Q92dV+HlEnGxwtovXQVGr0wUwm8cZuh/3E1+6UdCnMDIucA== X-Received: by 2002:adf:d18b:: with SMTP id v11mr27525711wrc.308.1573569851963; Tue, 12 Nov 2019 06:44:11 -0800 (PST) Received: from LAPTOP-4L3N7KFS.panoulu.local (nat1.panoulu.net. [185.38.2.1]) by smtp.gmail.com with ESMTPSA id a7sm21014642wrr.89.2019.11.12.06.44.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Nov 2019 06:44:11 -0800 (PST) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Tue, 12 Nov 2019 16:44:00 +0200 Message-Id: <20191112144400.1359-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <99D61A626FDA8A4B90A270669121BE10BDA4BD82@PLANJAVA.amebis.doma> References: <99D61A626FDA8A4B90A270669121BE10BDA4BD82@PLANJAVA.amebis.doma> 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 https://www.dnswl.org/, no trust [209.85.221.68 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (lstipakov[at]gmail.com) 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_MSPIKE_H2 RBL: Average reputation (+2) [209.85.221.68 listed in wl.mailspike.net] -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 X-Headers-End: 1iUXP1-00DMno-3o Subject: [Openvpn-devel] [PATCH v3 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 --- v3: - simplify convoluted "if" statement v2: - rebase on top of master src/openvpn/tun.c | 92 +++++++++++++++++++++++++++++------------------ 1 file changed, 57 insertions(+), 35 deletions(-) diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 8b16cd6a..a9036a6e 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -6388,6 +6388,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) { @@ -6410,46 +6454,24 @@ 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 - if (tt->wintun && tt->options.msg_channel) + if (tt->wintun) { - do_route_ipv4_service_tun(false, tt); - do_address_service(false, AF_INET, tt); - do_dns_service(false, AF_INET, tt); + if (tt->options.msg_channel) + { + do_route_ipv4_service_tun(false, tt); + do_address_service(false, AF_INET, tt); + do_dns_service(false, AF_INET, tt); + } + else + { + netsh_delete_address_dns(tt, false, &gc); + } } - else - if (tt->ipapi_context_defined) + else if (tt->ipapi_context_defined) { DWORD status; if ((status = DeleteIPAddress(tt->ipapi_context)) != NO_ERROR)