From patchwork Tue Sep 17 02:44:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 830 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net with LMTP id uKVbMsLVgF01ZAAAIUCqbw for ; Tue, 17 Sep 2019 08:46:58 -0400 Received: from proxy6.mail.iad3b.rsapps.net ([172.31.255.6]) by director12.mail.ord1d.rsapps.net with LMTP id CEFLL8LVgF0TDAAAIasKDg ; Tue, 17 Sep 2019 08:46:58 -0400 Received: from smtp22.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy6.mail.iad3b.rsapps.net with LMTP id WDmCKMLVgF19RAAARawThA ; Tue, 17 Sep 2019 08:46:58 -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: smtp22.gate.iad3b.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: 3c0246e0-d949-11e9-8dde-52540041dff8-1-1 Received: from [216.105.38.7] ([216.105.38.7:44758] helo=lists.sourceforge.net) by smtp22.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 6A/73-28205-1C5D08D5; Tue, 17 Sep 2019 08:46:58 -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 1iACrO-0007UK-KG; Tue, 17 Sep 2019 12:45:34 +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 1iACrL-0007Rg-9i for openvpn-devel@lists.sourceforge.net; Tue, 17 Sep 2019 12:45:31 +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:To: From:Sender:Reply-To:Cc: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=mixjN+8r2Y7hRWsmY0tK9r0SdyK6pAFUhA6OyrKHL0U=; b=UcOWg7Ncp4rnMVR9x3o2U0oRrv niclt8W2HEftuYB1oKn7bV1/d6o2q+dk/DZFVFT5dmImyE3e31PPVxZlOYzW5bpaXG72MptXd3Jrc SqYGsyOWL3wt1j0qXe4fCqlxLQXQGB5zb5Zh1xSnViNmNcCprVCQQdzL7+VbtQOAS/jY=; 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:To:From:Sender:Reply-To:Cc :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=mixjN+8r2Y7hRWsmY0tK9r0SdyK6pAFUhA6OyrKHL0U=; b=afdaeJcVJD/zXt06tW7rCueNCY 5UkX7laugMxOplzcNFo99SieppiFhsktKNjWpA1YDa6mCcShG9Pjr3oi3SjJWqvNfM0ybCpiv8WgE EE7qfXWnHlb7kaXRgVimxqZuYXw04o21PSCR0+8/noLbFD6ZKesrSEZe36jqJhfv3edI=; Received: from mail-ed1-f66.google.com ([209.85.208.66]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90_1) id 1iACrC-001Fcy-0i for openvpn-devel@lists.sourceforge.net; Tue, 17 Sep 2019 12:45:25 +0000 Received: by mail-ed1-f66.google.com with SMTP id f2so3212893edw.3 for ; Tue, 17 Sep 2019 05:45:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=mixjN+8r2Y7hRWsmY0tK9r0SdyK6pAFUhA6OyrKHL0U=; b=A1UrkOnIOUWTU8/eWuJmutwNrtwwkZgWWucBnxxVGKcWGNqwhh3ZGtU8nn8428EtOV +B6QfKHaK1LhnWtDuOqGd1W2btn7qh29BXO6+SPUZYG7hSKZFesspYFLYuDKlvYzMv24 rhXm8a0ViHt2qRDhLW/muNtUFd3is0wXhcJDNh3+wd8rQU8lbkqcvQ+RfW/8QvuSvNvd v9FRjYPcQY9nzRpj/biNxmFNpsuokt2ml2uKsVqp50/kp+m4YAiNapDb2+QJs7aY3E9D /Bm6fmD8dwuu8vCbYQP8DlPyOoqhsXGm/z1+/6mOUcieiT/zK352bnnIG7hPVkwsFzo3 ZECw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=mixjN+8r2Y7hRWsmY0tK9r0SdyK6pAFUhA6OyrKHL0U=; b=PX+sX+K6UkYSTNDbv+QPTQ9Dp/Kk9aMN4lSYHc2zEpAal+WHVGOlPtkZdlwaUhb8Ho lpQEpJ/M/I7bGfTXbj9+dR0jlupMmsn9PRrU29ECwJdzCG5qkQd7AFMutxivw3H4ltMz bbVuwlTvQs39HIOfxBhtq9QKNvs013zcjek35cXy1mKsDFleXhkC5rtvINRM74yLSfBA +78fkRpGounU+zWLvDqMjSjA8lQ0YLzmD2PaCiTcKqYg2aolJFRrHNJuPS7WyGeOdZzy J4JmWdkouD0ByKEPG8LvruyX3lm9U22hsCMTtWrto9ATMap6UGT0PfISJdAtfCcxZYyM fm3w== X-Gm-Message-State: APjAAAXQNpp5r15kj1oci+Zx6V+dylCMa+z0sG61agWXhoJudt7ek7aC hBtpFXUNw+GC2T35z920l+xduWuM3L5Ozw== X-Google-Smtp-Source: APXvYqxgEWlV0l8q7Wpgd8eXEgb2cHqjqtoE4QN123iti0kAPR6k9cwuK89LOIKlw2Xth7vAYX1AJA== X-Received: by 2002:a17:906:4c4c:: with SMTP id d12mr4536797ejw.174.1568724315096; Tue, 17 Sep 2019 05:45:15 -0700 (PDT) Received: from stipakov.fi (stipakov.fi. [128.199.52.117]) by smtp.gmail.com with ESMTPSA id j8sm326585edy.44.2019.09.17.05.45.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Sep 2019 05:45:14 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Tue, 17 Sep 2019 15:44:53 +0300 Message-Id: <1568724293-5069-7-git-send-email-lstipakov@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1568724293-5069-1-git-send-email-lstipakov@gmail.com> References: <1568724293-5069-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 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.66 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.66 listed in wl.mailspike.net] 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 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: 1iACrC-001Fcy-0i Subject: [Openvpn-devel] [PATCH 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: , 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 9fe8f9c..4008203 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -6359,6 +6359,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) { @@ -6381,35 +6425,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 @@ -6431,6 +6447,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);