From patchwork Thu Nov 7 06:45:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 880 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 uGfAFQ5ZxF32RAAAIUCqbw for ; Thu, 07 Nov 2019 12:49:02 -0500 Received: from proxy17.mail.ord1d.rsapps.net ([172.30.191.6]) by director11.mail.ord1d.rsapps.net with LMTP id wMNrFQ5ZxF1HAwAAvGGmqA ; Thu, 07 Nov 2019 12:49:02 -0500 Received: from smtp2.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy17.mail.ord1d.rsapps.net with LMTP id QAAZFQ5ZxF1ZJwAAWC7mWg ; Thu, 07 Nov 2019 12:49:02 -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: smtp2.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: e1f1816e-0186-11ea-b391-5254004a0287-1-1 Received: from [216.105.38.7] ([216.105.38.7:37044] helo=lists.sourceforge.net) by smtp2.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id B2/56-22588-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 1iSlsz-0002HE-BG; Thu, 07 Nov 2019 17:47:57 +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 1iSlsy-0002H1-Ab for openvpn-devel@lists.sourceforge.net; Thu, 07 Nov 2019 17:47:56 +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=ZJ4yeQ+2FRFIUABCraY9vanM7bmB7GogargXA3gD4kU=; b=jAfpCoKuCmJB90VdCUA2PqON5M ArY2UqFfU58ApvxTgwVhgw75lwv919av+t615vSsbuwOpQjKf3UB1x3o8ccE6nwtHJciJ4RZWlO5U 13YOvGm8e5zYlSXuDymR31mnpMWcAnu17GWpxGCoz4rzHW2jtZqJ9FmKgiLC64f4HX6g=; 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=ZJ4yeQ+2FRFIUABCraY9vanM7bmB7GogargXA3gD4kU=; b=TWDIsieAmPw9rOqo0HCBW6ZEYP 86oFl4O91r9wpioQhzBc9OGPU03OzXB6F00/cWjZWTzPDxh0tlr5xZ1d/LOmgQC8MOr4qROWHeTwB XIhPwWmbGguMsA6Hy02uUsV6EKJyXqLVvT5TtXIcaII62ucK+F+szEy8ILCQ9Fh92r/Q=; Received: from mail-wm1-f67.google.com ([209.85.128.67]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1iSlsw-005Cnx-BT for openvpn-devel@lists.sourceforge.net; Thu, 07 Nov 2019 17:47:55 +0000 Received: by mail-wm1-f67.google.com with SMTP id b11so3421794wmb.5 for ; Thu, 07 Nov 2019 09:47:54 -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=ZJ4yeQ+2FRFIUABCraY9vanM7bmB7GogargXA3gD4kU=; b=qH4pr1Mdu/Ctz8XuV9ElITI8ntSyXHQSNlsmp4d1eD+ARhrGjTRMmKEoTMKOkW0tb4 e8ubV5aRUCRAiMebbC5mPaK0cQSRGMyH5xUr9VWOXxf8QaNxxbI3z9nv2tZJp3nF6Xg/ oSt4V5K3oOImFTIkma3LKiNYP0zrz5HnVRimwMLjjvgUbt+AGcTH9Sj0M45W/T0jhHRG za3MI0QjXlHfTmHdqZXpP+OL4quFJwZ8LEgh2Ti/8lTWNsZKEKsKP4O2VEEDug9n2Rd6 QSY7Dh0Jtbna1KYXH5NSlsqF3HP8ecOMNr5I2SmgLjzxpHdeyHClsVCvGigeJvABRPWO MLrg== 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=ZJ4yeQ+2FRFIUABCraY9vanM7bmB7GogargXA3gD4kU=; b=Rg5g9FG/sH7ASrrvbFaeluVpjHbxrNYZiHSyHaXTwGiafsLt0nIlLLivJ88ryCb20l A4THuHif9aIM7FzmM24fu9pMg8+cwZQXLSsX91t8zV4c2KSXRfg5o+ZieTio4xvzNPlU Yp+Nl1NMZJjn8jvslSRybxOUqlbjd+XQl3KGyQv1LnnPw2rPZUnJnI1UjVc8HmRnLOiE u5NlEyTM4d1ScMPZJKxpFKkh0aa30CYx7j1PHYsykeHD6nDCI7kpmzHmxG7ad9H/G11t nVA7lMYQn+/wjFX4B83/LzlckFLqRQEwTQRHbDn/IrkmbeOy87fGOldhuRxB7GDw+EQl TZlw== X-Gm-Message-State: APjAAAUxCnTIL17msbyS5j9N7kTLS2SlF00czUaErfoGvSqDLPFl9+OW CkapJInZZxBUdiM9+pw4onNJlLx+o+ZrGQ== X-Google-Smtp-Source: APXvYqxr1n8FC7goEMEFSM8Zi0BwAuwxa35/k2CI+R2Tv1bkEWZghSi7/DnBQMEKnkCzsWxqkDjMlg== X-Received: by 2002:a05:600c:230d:: with SMTP id 13mr3760262wmo.159.1573148867216; Thu, 07 Nov 2019 09:47:47 -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.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Nov 2019 09:47:46 -0800 (PST) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Thu, 7 Nov 2019 19:45:24 +0200 Message-Id: <1573148729-27339-3-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 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.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.67 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.67 listed in wl.mailspike.net] -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: 1iSlsw-005Cnx-BT Subject: [Openvpn-devel] [PATCH v2 2/7] wintun: add --windows-driver config option 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 This allows to specify which tun driver openvpn should use, tap-windows6 (default) or wintun. Note than wintun support will be added in follow-up patches. Signed-off-by: Lev Stipakov --- src/openvpn/init.c | 7 +++++++ src/openvpn/options.c | 37 +++++++++++++++++++++++++++++++++++++ src/openvpn/options.h | 1 + src/openvpn/tun.h | 1 + 4 files changed, 46 insertions(+) diff --git a/src/openvpn/init.c b/src/openvpn/init.c index ae7bd63..c6d4953 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -1733,6 +1733,10 @@ do_init_tun(struct context *c) c->c2.es, &c->net_ctx); +#ifdef _WIN32 + c->c1.tuntap->wintun = c->options.wintun; +#endif + init_tun_post(c->c1.tuntap, &c->c2.frame, &c->options.tuntap_options); @@ -1775,6 +1779,9 @@ do_open_tun(struct context *c) /* store (hide) interactive service handle in tuntap_options */ c->c1.tuntap->options.msg_channel = c->options.msg_channel; msg(D_ROUTE, "interactive service msg_channel=%u", (unsigned int) c->options.msg_channel); + + c->c1.tuntap->wintun = c->options.wintun; + #endif /* allocate route list structure */ diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 1838a69..5c5033e 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -747,6 +747,9 @@ static const char usage_message[] = " optional parameter controls the initial state of ex.\n" "--show-net-up : Show " PACKAGE_NAME "'s view of routing table and net adapter list\n" " after TAP adapter is up and routes have been added.\n" + "--windows-driver : Which tun driver to use?\n" + " tap-windows6 (default)\n" + " wintun\n" #ifdef _WIN32 "--block-outside-dns : Block DNS on other network adapters to prevent DNS leaks\n" #endif @@ -851,6 +854,7 @@ init_options(struct options *o, const bool init_gc) o->tuntap_options.dhcp_masq_offset = 0; /* use network address as internal DHCP server address */ o->route_method = ROUTE_METHOD_ADAPTIVE; o->block_outside_dns = false; + o->wintun = false; #endif o->vlan_accept = VLAN_ONLY_UNTAGGED_OR_PRIORITY; o->vlan_pvid = 1; @@ -2994,6 +2998,12 @@ options_postprocess_mutate_invariant(struct options *options) options->ifconfig_noexec = false; } + /* for wintun kernel doesn't send DHCP requests, so use ipapi to set IP address and netmask */ + if (options->wintun) + { + options->tuntap_options.ip_win32_type = IPW32_SET_IPAPI; + } + remap_redirect_gateway_flags(options); #endif @@ -4039,6 +4049,26 @@ foreign_option(struct options *o, char *argv[], int len, struct env_set *es) } } +#ifdef _WIN32 +bool +parse_windows_driver(const char *str, const int msglevel) +{ + if (streq(str, "tap-windows6")) + { + return false; + } + else if (streq(str, "wintun")) + { + return true; + } + else + { + msg(msglevel, "--windows-driver must be tap-windows6 or wintun"); + return false; + } +} +#endif + /* * parse/print topology coding */ @@ -5281,6 +5311,13 @@ add_option(struct options *options, VERIFY_PERMISSION(OPT_P_GENERAL); options->dev_type = p[1]; } +#ifdef _WIN32 + else if (streq(p[0], "windows-driver") && p[1] && !p[2]) + { + VERIFY_PERMISSION(OPT_P_GENERAL); + options->wintun = parse_windows_driver(p[1], M_FATAL); + } +#endif else if (streq(p[0], "dev-node") && p[1] && !p[2]) { VERIFY_PERMISSION(OPT_P_GENERAL); diff --git a/src/openvpn/options.h b/src/openvpn/options.h index ff7a5bb..0a24e5e 100644 --- a/src/openvpn/options.h +++ b/src/openvpn/options.h @@ -632,6 +632,7 @@ struct options bool show_net_up; int route_method; bool block_outside_dns; + bool wintun; #endif bool use_peer_id; diff --git a/src/openvpn/tun.h b/src/openvpn/tun.h index 5a0a933..df935f6 100644 --- a/src/openvpn/tun.h +++ b/src/openvpn/tun.h @@ -175,6 +175,7 @@ struct tuntap * ~0 if undefined */ DWORD adapter_index; + bool wintun; /* true if wintun is used instead of tap-windows6 */ int standby_iter; #else /* ifdef _WIN32 */ int fd; /* file descriptor for TUN/TAP dev */