From patchwork Fri Nov 8 06:37:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 888 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director10.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id 6CdBCcGoxV2IPgAAIUCqbw for ; Fri, 08 Nov 2019 12:41:21 -0500 Received: from proxy10.mail.ord1d.rsapps.net ([172.30.191.6]) by director10.mail.ord1d.rsapps.net with LMTP id +MIECcGoxV3YGQAApN4f7A ; Fri, 08 Nov 2019 12:41:21 -0500 Received: from smtp2.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy10.mail.ord1d.rsapps.net with LMTP id gDqhCMGoxV1KUQAAfSg8FQ ; Fri, 08 Nov 2019 12:41:21 -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.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: f876d4e8-024e-11ea-9038-842b2b4e7063-1-1 Received: from [216.105.38.7] ([216.105.38.7:39498] helo=lists.sourceforge.net) by smtp2.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id FB/35-19500-FB8A5CD5; Fri, 08 Nov 2019 12:41:19 -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 1iT8F3-0004mm-Ee; Fri, 08 Nov 2019 17:40:13 +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 1iT8F2-0004md-UG for openvpn-devel@lists.sourceforge.net; Fri, 08 Nov 2019 17:40:12 +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=B/Cuo2q03MjEEb40Mrpb7BEL86JhPrtv9brExgoIes0=; b=Nicx7otdte5AC34AqFlncGXWzE Yj83hnl798zqx7eViTkPToKxgK56TysMG8ulRuOLUB8m+fuo/uJ4FTG50ETXEPuuZitsDvfv4p6Se G84ccADfWlzzsNsz6GPcK1JmyF3UiMulM5Ut0yvauszaux1O8auEIIRrOhGsm6MFycNw=; 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=B/Cuo2q03MjEEb40Mrpb7BEL86JhPrtv9brExgoIes0=; b=lWE5kPNajXyz1brtfMVG5aAFvN R674AHjIj/6YPXF5UDkJbICAQBZAzs325Af4XgtnjSrJ4dLw3CCXZ27LMKFaQOyDmI2jEbon8AtRs efVzGbggBF8qK8ax0PUIMyTfOAynZXO36/ilfX9u0rvvv7Z5itLl3vDUQR4gRzMuT97Q=; Received: from mail-wm1-f44.google.com ([209.85.128.44]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1iT8F1-005WVy-FR for openvpn-devel@lists.sourceforge.net; Fri, 08 Nov 2019 17:40:12 +0000 Received: by mail-wm1-f44.google.com with SMTP id x4so7012079wmi.3 for ; Fri, 08 Nov 2019 09:40:11 -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=B/Cuo2q03MjEEb40Mrpb7BEL86JhPrtv9brExgoIes0=; b=snuQxty2F8Cn80MV2LCSi0z68lCiJeN90tuRu3cT4e/cURuom81wnjaS+wHJkTOG53 HHiyipVIPM55yWxshm6xVPBC4FIWR9NIcEirxxekJ6JZOqclmfG+JbrdaOvShTKN63PV tiaS0RKp46AfEFreJNigf9U29YOuKyempmxRes2fEOvQb7cTtRrHWfI+u9ZRCOjLYy8X Tpu23WbXSZttwPnxxaEkpBOGdJecJ3Rfv1Wus/1A6/nhr0X/3C11V6gEMtRYhq+NLy8k E0DddSNXN5waeEvnqDcI29ORMTD+uJ9dP0mLDQmpjWoPiCKjIWUsAYMgULQAfGAyJALE AghA== 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=B/Cuo2q03MjEEb40Mrpb7BEL86JhPrtv9brExgoIes0=; b=dpq52IgcejcnPTlBt+lgBJx1O2A1Wo7RgtohP9Evt1a7lvWDnoagUjDYIQgkbkmUbw p7H5cBLotcrlxyPYjN3m29YqQPo66xJol94zLKqu94NH4KxX9NdMPYghKCU4rBq/6b4S fibsMw3n2ffgEK1a6C1dE3EwvkYQ2Wox4TCCi9hhGwNPAeas4jTfe2arKYWpCHPsCI0c LhoRcLokzDjxwNSxSIH7VZ2guDcii/D+6IlMQT0Y2YgCVFQnKUQuRADi8qZWrPUYcpmB Dz8EeF7lTfvwk4fheX8teeBclGVgSLm1RzG1Kh6HMoJsYLuXtJJ7wa7kaMTrlD5B9R13 fp6Q== X-Gm-Message-State: APjAAAVwJBR5m3iyB6PEqrI78lycaB1orwnhN+r7wi1JfLOfUXRinS6R nqRFUZR2E2kPrZj9qXijGCMo7+rz1sznfwE0 X-Google-Smtp-Source: APXvYqzwjxOmB7FU3Pon+Ds0KDCxwafmdDkrzffqZl9p3Vyma4KVHYe4L2+twjYHC+lBLY+PmoxAmA== X-Received: by 2002:a1c:ca:: with SMTP id 193mr9139583wma.103.1573234804403; Fri, 08 Nov 2019 09:40:04 -0800 (PST) Received: from stipakov.fi (stipakov.fi. [128.199.52.117]) by smtp.gmail.com with ESMTPSA id v8sm10054942wra.79.2019.11.08.09.40.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Nov 2019 09:40:03 -0800 (PST) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Fri, 8 Nov 2019 19:37:35 +0200 Message-Id: <1573234655-905-1-git-send-email-lstipakov@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (lstipakov[at]gmail.com) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.44 listed in list.dnswl.org] 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.128.44 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: 1iT8F1-005WVy-FR Subject: [Openvpn-devel] [PATCH v3] 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 Acked-by: Steffan Karger --- v3: - added man page - removed unneccesary assignment - make method static - removed unneeded _WIN32 define v2: - rebased on top of latest master doc/openvpn.8 | 8 ++++++++ src/openvpn/init.c | 4 ++++ src/openvpn/options.c | 46 ++++++++++++++++++++++++++++++++++++++++++++-- src/openvpn/options.h | 1 + src/openvpn/tun.h | 1 + 5 files changed, 58 insertions(+), 2 deletions(-) diff --git a/doc/openvpn.8 b/doc/openvpn.8 index 11daa92..8a7e70f 100644 --- a/doc/openvpn.8 +++ b/doc/openvpn.8 @@ -6147,6 +6147,14 @@ Note that pushing unknown options from server does not trigger fatal errors. .\"********************************************************* .TP +.B \-\-windows\-driver +Specifies which tun driver to use. Values are +.B tap-windows6 +(default) and +.B wintun. +This is Windows-only option. +.\"********************************************************* +.TP .B \-\-dhcp\-renew Ask Windows to renew the TAP adapter lease on startup. This option is normally unnecessary, as Windows automatically diff --git a/src/openvpn/init.c b/src/openvpn/init.c index ae7bd63..0bdb0a9 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); diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 1838a69..a70a822 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -747,9 +747,10 @@ 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" -#ifdef _WIN32 + "--windows-driver : Which tun driver to use?\n" + " tap-windows6 (default)\n" + " wintun\n" "--block-outside-dns : Block DNS on other network adapters to prevent DNS leaks\n" -#endif "Windows Standalone Options:\n" "\n" "--show-adapters : Show all TAP-Windows adapters.\n" @@ -851,6 +852,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 +2996,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 +4047,33 @@ foreign_option(struct options *o, char *argv[], int len, struct env_set *es) } } +#ifdef _WIN32 +/** + * Parses --windows-driver config option + * + * @param str value of --windows-driver option + * @param msglevel msglevel to report parsing error + * @return bool true if --windows-driver is wintun, false otherwise + */ +static 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 +5316,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 */