From patchwork Mon Sep 9 14:11:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "plaisthos (Code Review)" X-Patchwork-Id: 3812 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:6bd4:b0:5b9:581e:f939 with SMTP id c20csp1543267max; Mon, 9 Sep 2024 07:11:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUJraOxajubs4iWvGgF+PDqGleII5oCh3NxxMAssaMSEAkYGMz2QkaLN9xrYl7X/y2Thd5+0oYvRzc=@openvpn.net X-Google-Smtp-Source: AGHT+IEtrtc9J65jJroGTOO7jWytjRyj+xOskS34HKcUuJUIQnWvQfy2dvFgqwiCwYDKDOnLXV3r X-Received: by 2002:a05:6808:ec7:b0:3e0:1299:4dc with SMTP id 5614622812f47-3e029cffd44mr11391087b6e.25.1725891091526; Mon, 09 Sep 2024 07:11:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725891091; cv=none; d=google.com; s=arc-20240605; b=ipPj9qeL6Q+0DoiTZGvYAWmpYHXzJwgDI8Ge9u4FUTkLNBIhwABODra+v9AwFZFk2i hymh/oo4VHtE1E7xVo84DoR0YMiw2NgoIUZtcH+daInzcu+X9DMbQAqrL0ouRCso4oyJ wh90cb5GRsQ5/GMMQu9UwiRTVGMIw1r9Z2f7Ivtfc5w6IGTOAbGENvjsb6J2txBLWjhw FUtSmRm3NO4WztNy0VWpcrWs8NL9FRDgSES5GykvPf8Jgy0zFLKvFH2zawVQMPwLmGts A9NRv/sIakcFyFhlggTjSnnLAUocqrjmvp2/q2Eu6PbJhFh4k5Orj0ToSMg4wM8gLbu8 rLfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:cc:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:user-agent :mime-version:message-id:references:auto-submitted:to:date:from :dkim-signature:dkim-signature:dkim-signature; bh=TzBCDuhUq1cYIrBDvGLLEXgKsjYwHhbjBV8wWdm4f40=; fh=lm0MLPW7DntlrDqRECIiC9JlE1uPxhepE0URYHIf+eE=; b=E1/AYVF0ZM2iIq5jNcA+nMUnH28p2wtDOeoXXr58E6ESdGAz5OtliuhWgZlTOG2mjr Uc2cG8x3D7wLHVuvB3588w/8YZB34h+3QVUDvxBk/toE5JL0eqCQ9rTZXCxIRjMzEu9b Ho4SSqWR+D1uRyrqo3l+cM7E6NpZQTGuNplu+FK5vjXF80qmlBm1Isrtippo/tNaURXI yexn0pMZZUa9wStGY/cwC/SlGUB7R3xpGfqq45Nx3ogAPi4W0dsavRLJnEezQXYIdkVQ gLFhUVpF8AnE4y2fxHr9ICMTchD6MQuKBaztQmuPeOf8Ug7xkETQFdjVbW2ZhN6shiO9 xSCA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b="X8n/fg7P"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=GUt1+Uqp; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=UkxRuUJe; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=openvpn.net; dara=fail header.i=@openvpn.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 5614622812f47-3e03993b20fsi2301168b6e.122.2024.09.09.07.11.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Sep 2024 07:11:31 -0700 (PDT) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b="X8n/fg7P"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=GUt1+Uqp; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=UkxRuUJe; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=openvpn.net; dara=fail header.i=@openvpn.net 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.95) (envelope-from ) id 1snf71-0006dE-RS; Mon, 09 Sep 2024 14:11:27 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1snf70-0006d8-MB for openvpn-devel@lists.sourceforge.net; Mon, 09 Sep 2024 14:11:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:Content-Transfer-Encoding:MIME-Version :Message-ID:Reply-To:References:Subject:List-Unsubscribe:List-Id:Cc:To:Date: From:Sender:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help: List-Subscribe:List-Post:List-Owner:List-Archive; bh=BpqHEecITCIcNhwVYA9e9/yYdCkLztS8tz98Tj4h9NA=; b=X8n/fg7PauNtzDmbtICGMTM+60 8YYBLRxNpo3MhCQC5stgmUsYHAFpHkjnZChR3QWLHG2K+Ffv/V1822oHTEMPG0GVqiMVjCnCylZ0X mVrKr8JGvEdE4VQjsLg8KXOOwY9QO6pOzH8WpBv2k5PxN8c4zl6Ys/QVGPSUpqLMi2tk=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:Content-Transfer-Encoding:MIME-Version:Message-ID:Reply-To: References:Subject:List-Unsubscribe:List-Id:Cc:To:Date:From:Sender:Content-ID :Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To: Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help:List-Subscribe:List-Post: List-Owner:List-Archive; bh=BpqHEecITCIcNhwVYA9e9/yYdCkLztS8tz98Tj4h9NA=; b=G Ut1+UqpVo+GprAc9p3sUYmtokJPHm8rgf6E6D6Du0rGG467WdQLeEIjgfdawUVcgRKbzq0vaAppZ4 uV+N8vLglE/0opVpQAmz0zFoBFzAbXNqvBGV26FjGxDBh5wjun53xhZf3nwiA1giWC8AHt9lYUMAl N5s9NDTkUn52MKzc=; Received: from mail-wm1-f47.google.com ([209.85.128.47]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1snf6x-0002xI-N5 for openvpn-devel@lists.sourceforge.net; Mon, 09 Sep 2024 14:11:26 +0000 Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-42cba6cdf32so5400935e9.1 for ; Mon, 09 Sep 2024 07:11:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1725891077; x=1726495877; darn=lists.sourceforge.net; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from:from:to:cc :subject:date:message-id:reply-to; bh=BpqHEecITCIcNhwVYA9e9/yYdCkLztS8tz98Tj4h9NA=; b=UkxRuUJe/HsiNHvpEqfCJlICPNLVxt3c3yc4lS2/uUjKbgKbaRhIw6g6PtKW9+F2Xy xM0hX4/BAxIweLFBF0tg0SgmR+axG8WrToT7qtrsSas9ye45VEQ6g1ohIrXVyK+MTmiI To1jK76pp6wq8pH56HnwjGvuKK3mQywQWjL7e233XBH4+ALx0IL0h7hWVdrljUZEy5KO DX0cZXGI/H9Y4FE7WeH99B+304/ERDSVX7bYvC9RmehK1BfVGXv88Mtxf332agFxTKta 6UsOM/5TOq3MIjzvbvhE/A4Is4xzhczCwrLhuL6BCpJkJ7WdGdwO95yi67Mqz0sPyn6B Vf0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725891077; x=1726495877; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=BpqHEecITCIcNhwVYA9e9/yYdCkLztS8tz98Tj4h9NA=; b=U3w/vsqzQfENyaif7vlEP4R513E7qS3FXf8uL3S4rBE2HhhJPzyg0jqtkopxxrUbGX VtpdGPXjsBgx9O3zLvmOF0bu5oHWBdEcQEf7AebLap/cazCaVlokRVoYay2qn5zibnav ckzC9Qs30yf1Dwc3WGbNsDiAfAuXmPZ3IqZ7Rxl2VC+GmsiXJn6HCBffdoWB49MZTwpK YzuzolifwwAkjIdZ4z8k5+0RmVkrj9XmUnWdxqZoRzpFdU6P1wOv5nMzx2F2epg+HhmY krz+aLWKMaXX4+D/d8PBR8n71nnCzj/WxiayhW2msEJQcEY4tGtCahR04K9hrY6R+FkP CmKg== X-Gm-Message-State: AOJu0YyeUJ6sw4modZex/yYJ/X4KOhQB7s9gIi+T9r99/z00u6mOwmz8 olGlE7AyR8MrtRemns2pyHAq1eQ+F/D5aWfSYj+nsYGupMfQ5qsobmCRyHdxLfd/tlHJM0ECSAX 5 X-Received: by 2002:a05:600c:4f89:b0:42c:b80e:5e50 with SMTP id 5b1f17b1804b1-42cb80e625dmr23686125e9.0.1725891076359; Mon, 09 Sep 2024 07:11:16 -0700 (PDT) Received: from gerrit.openvpn.in (ec2-18-159-0-78.eu-central-1.compute.amazonaws.com. [18.159.0.78]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42cbc419014sm5692225e9.36.2024.09.09.07.11.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 07:11:15 -0700 (PDT) From: "plaisthos (Code Review)" X-Google-Original-From: "plaisthos (Code Review)" X-Gerrit-PatchSet: 1 Date: Mon, 9 Sep 2024 14:11:15 +0000 To: flichtenheld Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: I8c0e9f32b235cb262ca2be6aac8d520e49b30d74 X-Gerrit-Change-Number: 738 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: c3844b6a7f61645c197bc897f761c1206a7979ed References: Message-ID: <877f587c05372cfa6432710bdfcacab97017e2b3-HTML@gerrit.openvpn.net> MIME-Version: 1.0 User-Agent: Gerrit/3.8.2 X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-1.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Attention is currently required from: flichtenheld. Hello flichtenheld, I'd like you to do a code review. Please visit Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.47 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.47 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.0 WEIRD_PORT URI: Uses non-standard port number for HTTP 0.0 HTML_MESSAGE BODY: HTML included in message -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.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML X-Headers-End: 1snf6x-0002xI-N5 Subject: [Openvpn-devel] [M] Change in openvpn[master]: Move to common backend_driver type in struct tuntap 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: , Reply-To: arne-openvpn@rfc2549.org, openvpn-devel@lists.sourceforge.net, frank@lichtenheld.com Cc: openvpn-devel Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1809727977352920509?= X-GMAIL-MSGID: =?utf-8?q?1809727977352920509?= X-getmail-filter-classifier: gerrit message type newchange Attention is currently required from: flichtenheld. Hello flichtenheld, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/738?usp=email to review the following change. Change subject: Move to common backend_driver type in struct tuntap ...................................................................... Move to common backend_driver type in struct tuntap With the introduction of utun on macOS and DCO on Linux, FreeBSD and Windows, a lot of platforms have now more than one driver/backend for the tun interface but each one uses a different mechanism. Unify these approach with using a common enum that defines the driver_type. Change-Id: I8c0e9f32b235cb262ca2be6aac8d520e49b30d74 Signed-off-by: Arne Schwabe --- M src/openvpn/dco.c M src/openvpn/dco_win.c M src/openvpn/forward.c M src/openvpn/init.c M src/openvpn/options.c M src/openvpn/options.h M src/openvpn/tun.c M src/openvpn/tun.h 8 files changed, 118 insertions(+), 97 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/38/738/1 diff --git a/src/openvpn/dco.c b/src/openvpn/dco.c index 7f0d53d..0df185e 100644 --- a/src/openvpn/dco.c +++ b/src/openvpn/dco.c @@ -328,7 +328,7 @@ || (o->windows_driver == WINDOWS_DRIVER_TAP_WINDOWS6)) { msg(msglevel, "--windows-driver is set to '%s'. Disabling Data Channel Offload", - print_windows_driver(o->windows_driver)); + print_tun_backend_driver(o->windows_driver)); return false; } diff --git a/src/openvpn/dco_win.c b/src/openvpn/dco_win.c index 3ec946f..892c616 100644 --- a/src/openvpn/dco_win.c +++ b/src/openvpn/dco_win.c @@ -44,7 +44,7 @@ struct tuntap create_dco_handle(const char *devname, struct gc_arena *gc) { - struct tuntap tt = { .windows_driver = WINDOWS_DRIVER_DCO }; + struct tuntap tt = { .backend_driver = DRIVER_DCO }; const char *device_guid; tun_open_device(&tt, devname, &device_guid, gc); diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c index 40b7cc4..d6779de 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -1297,7 +1297,7 @@ c->c2.buf = c->c2.buffers->read_tun_buf; #ifdef _WIN32 - if (c->c1.tuntap->windows_driver == WINDOWS_DRIVER_WINTUN) + if (c->c1.tuntap->backend_driver == WINDOWS_DRIVER_WINTUN) { read_wintun(c->c1.tuntap, &c->c2.buf); if (c->c2.buf.len == -1) diff --git a/src/openvpn/init.c b/src/openvpn/init.c index dd56961..83cc670 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -1126,7 +1126,7 @@ msg(M_WARN, "Note: --mktun does not support DCO. Creating TUN interface."); } - options->tuntap_options.disable_dco = true; + options->disable_dco = true; } #endif @@ -1759,7 +1759,16 @@ c->c1.tuntap); #ifdef _WIN32 - c->c1.tuntap->windows_driver = c->options.windows_driver; + c->c1.tuntap->backend_driver = c->options.windows_driver; +#else + if (dco_enabled(&c->options)) + { + c->c1.tuntap->backend_driver = DRIVER_DCO; + } + else + { + c->c1.tuntap->backend_driver = DRIVER_GENERIC_TUNTAP; + } #endif init_tun_post(c->c1.tuntap, diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 649f48b..9ad4258 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -1829,7 +1829,7 @@ SHOW_STR(dev_type); SHOW_STR(dev_node); #if defined(ENABLE_DCO) - SHOW_BOOL(tuntap_options.disable_dco); + SHOW_BOOL(disable_dco); #endif SHOW_STR(lladdr); SHOW_INT(topology); @@ -2489,7 +2489,7 @@ if (options->windows_driver != WINDOWS_DRIVER_TAP_WINDOWS6) { msg(M_USAGE, "%s, which is not supported by the selected %s driver", - prefix, print_windows_driver(options->windows_driver)); + prefix, print_tun_backend_driver(options->windows_driver)); } else if (options->tuntap_options.ip_win32_type != IPW32_SET_DHCP_MASQ && options->tuntap_options.ip_win32_type != IPW32_SET_ADAPTIVE) @@ -3403,7 +3403,7 @@ /* when using wintun/ovpn-dco, kernel doesn't send DHCP requests, so don't use it */ if ((options->windows_driver == WINDOWS_DRIVER_WINTUN - || options->windows_driver == WINDOWS_DRIVER_DCO) + || options->windows_driver == DRIVER_DCO) && (options->tuntap_options.ip_win32_type == IPW32_SET_DHCP_MASQ || options->tuntap_options.ip_win32_type == IPW32_SET_ADAPTIVE)) { @@ -3777,8 +3777,8 @@ if (dco_enabled(o)) { /* check if any option should force disabling DCO */ - o->tuntap_options.disable_dco = !dco_check_option(D_DCO, o) - || !dco_check_startup_option(D_DCO, o); + o->disable_dco = !dco_check_option(D_DCO, o) + || !dco_check_startup_option(D_DCO, o); } #ifdef USE_COMP if (dco_enabled(o)) @@ -3790,11 +3790,11 @@ #ifdef _WIN32 if (dco_enabled(o)) { - o->windows_driver = WINDOWS_DRIVER_DCO; + o->windows_driver = DRIVER_DCO; } else { - if (o->windows_driver == WINDOWS_DRIVER_DCO) + if (o->windows_driver == DRIVER_DCO) { msg(M_WARN, "Option --windows-driver ovpn-dco is ignored because Data Channel Offload is disabled"); o->windows_driver = WINDOWS_DRIVER_TAP_WINDOWS6; @@ -4699,9 +4699,9 @@ * * @param str value of --windows-driver option * @param msglevel msglevel to report parsing error - * @return enum windows_driver_type driver type, WINDOWS_DRIVER_UNSPECIFIED on unknown --windows-driver value + * @return enum tun_driver_type driver type, WINDOWS_DRIVER_UNSPECIFIED on unknown --windows-driver value */ -static enum windows_driver_type +static enum tun_driver_type parse_windows_driver(const char *str, const int msglevel) { if (streq(str, "tap-windows6")) @@ -4715,7 +4715,7 @@ else if (streq(str, "ovpn-dco")) { - return WINDOWS_DRIVER_DCO; + return DRIVER_DCO; } else { @@ -6053,7 +6053,7 @@ #endif else if (streq(p[0], "disable-dco")) { - options->tuntap_options.disable_dco = true; + options->disable_dco = true; } else if (streq(p[0], "dev-node") && p[1] && !p[2]) { diff --git a/src/openvpn/options.h b/src/openvpn/options.h index f608cb8..ee39dbb 100644 --- a/src/openvpn/options.h +++ b/src/openvpn/options.h @@ -354,6 +354,9 @@ const char *ip_remote_hint; struct tuntap_options tuntap_options; + /* DCO is disabled and should not be used as backend driver for the + * tun/tap device */ + bool disable_dco; /* Misc parms */ const char *username; @@ -676,7 +679,7 @@ bool show_net_up; int route_method; bool block_outside_dns; - enum windows_driver_type windows_driver; + enum tun_driver_type windows_driver; #endif bool use_peer_id; @@ -907,7 +910,7 @@ dco_enabled(const struct options *o) { #ifdef ENABLE_DCO - return !o->tuntap_options.disable_dco; + return !o->disable_dco; #else return false; #endif /* ENABLE_DCO */ diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 739e008..e124bc0 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -55,6 +55,36 @@ #include +const char * +print_tun_backend_driver(enum tun_driver_type driver) +{ + switch (driver) + { +#ifdef WIN32 + case WINDOWS_DRIVER_TAP_WINDOWS6: + return "tap-windows6"; + + case WINDOWS_DRIVER_WINTUN: + return "wintun"; + +#else /* ifdef WIN32 */ + case DRIVER_GENERIC_TUNTAP: + return "tun/tap"; + +#endif + case DRIVER_DCO: + return "ovpn-dco"; + +#ifdef HAVE_NET_IF_UTUN_H + case DRIVER_UTUN: + return "utun"; + +#endif + default: + return "unspecified"; + } +} + #ifdef _WIN32 const static GUID GUID_DEVCLASS_NET = { 0x4d36e972L, 0xe325, 0x11ce, { 0xbf, 0xc1, 0x08, 0x00, 0x2b, 0xe1, 0x03, 0x18 } }; @@ -964,7 +994,7 @@ { tt->options = *options; #ifdef _WIN32 - if (tt->windows_driver == WINDOWS_DRIVER_DCO) + if (tt->backend_driver == DRIVER_DCO) { dco_start_tun(tt); return; @@ -974,7 +1004,7 @@ overlapped_io_init(&tt->writes, frame, TRUE); tt->adapter_index = TUN_ADAPTER_INDEX_INVALID; - if (tt->windows_driver == WINDOWS_DRIVER_WINTUN) + if (tt->backend_driver == WINDOWS_DRIVER_WINTUN) { tt->wintun_send_ring_handle = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, @@ -1863,7 +1893,7 @@ static bool tun_dco_enabled(struct tuntap *tt) { - return !tt->options.disable_dco; + return tt->backend_driver == DRIVER_DCO; } #endif @@ -3343,7 +3373,7 @@ tt->actual_name = string_alloc(utunname, NULL); msg(M_INFO, "Opened utun device %s", utunname); - tt->is_utun = true; + tt->backend_driver = DRIVER_UTUN; } #endif /* ifdef HAVE_NET_IF_UTUN_H */ @@ -3370,7 +3400,7 @@ * and dev_node is not specified */ open_darwin_utun(dev, dev_type, dev_node, tt); - if (!tt->is_utun) + if (tt->backend_driver != DRIVER_UTUN) { if (!dev_node) { @@ -3432,7 +3462,7 @@ write_tun(struct tuntap *tt, uint8_t *buf, int len) { #ifdef HAVE_NET_IF_UTUN_H - if (tt->is_utun) + if (tt->backend_driver == DRIVER_UTUN) { return write_tun_header(tt, buf, len); } @@ -3445,7 +3475,7 @@ read_tun(struct tuntap *tt, uint8_t *buf, int len) { #ifdef HAVE_NET_IF_UTUN_H - if (tt->is_utun) + if (tt->backend_driver == DRIVER_UTUN) { return read_tun_header(tt, buf, len); } @@ -3976,7 +4006,7 @@ if (status == ERROR_SUCCESS && data_type == REG_SZ) { /* Is this adapter supported? */ - enum windows_driver_type windows_driver = WINDOWS_DRIVER_UNSPECIFIED; + enum tun_driver_type windows_driver = WINDOWS_DRIVER_UNSPECIFIED; if (strcasecmp(component_id, TAP_WIN_COMPONENT_ID) == 0 || strcasecmp(component_id, "root\\" TAP_WIN_COMPONENT_ID) == 0) { @@ -3988,7 +4018,7 @@ } else if (strcasecmp(component_id, "ovpn-dco") == 0) { - windows_driver = WINDOWS_DRIVER_DCO; + windows_driver = DRIVER_DCO; } if (windows_driver != WINDOWS_DRIVER_UNSPECIFIED) @@ -4010,7 +4040,7 @@ last = reg; msg(D_TAP_WIN_DEBUG, "NetCfgInstanceId: %s, Driver: %s", - reg->guid, print_windows_driver(reg->windows_driver)); + reg->guid, print_tun_backend_driver(reg->windows_driver)); } } } @@ -4242,7 +4272,7 @@ { if (!strcmp(tr->guid, pr->guid)) { - msg(msglev, "'%s' %s %s", pr->name, tr->guid, print_windows_driver(tr->windows_driver)); + msg(msglev, "'%s' %s %s", pr->name, tr->guid, print_tun_backend_driver(tr->windows_driver)); ++links; } } @@ -4363,7 +4393,7 @@ int actual_name_size, const struct tap_reg *tap_reg_src, const struct panel_reg *panel_reg_src, - enum windows_driver_type *windows_driver, + enum tun_driver_type *windows_driver, struct gc_arena *gc) { const struct tap_reg *tap_reg = tap_reg_src; @@ -4427,7 +4457,7 @@ get_device_guid(const char *name, uint8_t *actual_name, int actual_name_size, - enum windows_driver_type *windows_driver, + enum tun_driver_type *windows_driver, const struct tap_reg *tap_reg, const struct panel_reg *panel_reg, struct gc_arena *gc) @@ -6213,7 +6243,7 @@ const DWORD index = tt->adapter_index; /* flush arp cache */ - if (tt->windows_driver == WINDOWS_DRIVER_TAP_WINDOWS6 + if (tt->backend_driver == WINDOWS_DRIVER_TAP_WINDOWS6 && index != TUN_ADAPTER_INDEX_INVALID) { DWORD status = -1; @@ -6550,8 +6580,8 @@ const char *path = NULL; char tuntap_device_path[256]; - if (tt->windows_driver == WINDOWS_DRIVER_WINTUN - || tt->windows_driver == WINDOWS_DRIVER_DCO) + if (tt->backend_driver == WINDOWS_DRIVER_WINTUN + || tt->backend_driver == DRIVER_DCO) { const struct device_instance_id_interface *dev_if; @@ -6562,7 +6592,7 @@ continue; } - if (tt->windows_driver == WINDOWS_DRIVER_DCO) + if (tt->backend_driver == DRIVER_DCO) { char *last_sep = strrchr(dev_if->device_interface, '\\'); if (!last_sep @@ -6601,11 +6631,11 @@ 0); if (tt->hand == INVALID_HANDLE_VALUE) { - msg(D_TUNTAP_INFO | M_ERRNO, "CreateFile failed on %s device: %s", print_windows_driver(tt->windows_driver), path); + msg(D_TUNTAP_INFO | M_ERRNO, "CreateFile failed on %s device: %s", print_tun_backend_driver(tt->backend_driver), path); return false; } - if (tt->windows_driver == WINDOWS_DRIVER_WINTUN) + if (tt->backend_driver == WINDOWS_DRIVER_WINTUN) { /* Wintun adapter may be considered "open" after ring buffers are successfuly registered. */ if (!wintun_register_ring_buffer(tt, device_guid)) @@ -6635,7 +6665,7 @@ */ if (dev_node) { - enum windows_driver_type windows_driver = WINDOWS_DRIVER_UNSPECIFIED; + enum tun_driver_type windows_driver = WINDOWS_DRIVER_UNSPECIFIED; /* Get the device GUID for the device specified with --dev-node. */ *device_guid = get_device_guid(dev_node, actual_buffer, sizeof(actual_buffer), &windows_driver, tap_reg, panel_reg, gc); @@ -6645,15 +6675,15 @@ msg(M_FATAL, "Adapter '%s' not found", dev_node); } - if (tt->windows_driver != windows_driver) + if (tt->backend_driver != windows_driver) { msg(M_FATAL, "Adapter '%s' is using %s driver, %s expected. If you want to use this device, adjust --windows-driver.", - dev_node, print_windows_driver(windows_driver), print_windows_driver(tt->windows_driver)); + dev_node, print_tun_backend_driver(windows_driver), print_tun_backend_driver(tt->backend_driver)); } if (!tun_try_open_device(tt, *device_guid, device_instance_id_interface)) { - msg(M_FATAL, "Failed to open %s adapter: %s", print_windows_driver(tt->windows_driver), dev_node); + msg(M_FATAL, "Failed to open %s adapter: %s", print_tun_backend_driver(tt->backend_driver), dev_node); } } else @@ -6663,7 +6693,7 @@ /* Try opening all TAP devices until we find one available */ while (true) { - enum windows_driver_type windows_driver = WINDOWS_DRIVER_UNSPECIFIED; + enum tun_driver_type windows_driver = WINDOWS_DRIVER_UNSPECIFIED; *device_guid = get_unspecified_device_guid(device_number, actual_buffer, sizeof(actual_buffer), @@ -6674,10 +6704,10 @@ if (!*device_guid) { - msg(M_FATAL, "All %s adapters on this system are currently in use or disabled.", print_windows_driver(tt->windows_driver)); + msg(M_FATAL, "All %s adapters on this system are currently in use or disabled.", print_tun_backend_driver(tt->backend_driver)); } - if (tt->windows_driver != windows_driver) + if (tt->backend_driver != windows_driver) { goto next; } @@ -6696,7 +6726,7 @@ * GUID using the registry */ tt->actual_name = string_alloc((const char *)actual_buffer, NULL); - msg(M_INFO, "%s device [%s] opened", print_windows_driver(tt->windows_driver), tt->actual_name); + msg(M_INFO, "%s device [%s] opened", print_tun_backend_driver(tt->backend_driver), tt->actual_name); tt->adapter_index = get_adapter_index(*device_guid); } @@ -6749,7 +6779,7 @@ bool dhcp_masq = false; bool dhcp_masq_post = false; - if (tt->windows_driver == WINDOWS_DRIVER_TAP_WINDOWS6) + if (tt->backend_driver == WINDOWS_DRIVER_TAP_WINDOWS6) { /* get driver version info */ tuntap_get_version_info(tt); @@ -6792,11 +6822,11 @@ openvpn_net_ctx_t *ctx) { if ((tt->options.dhcp_options & DHCP_OPTIONS_DHCP_REQUIRED) - && tt->windows_driver != WINDOWS_DRIVER_TAP_WINDOWS6) + && tt->backend_driver != WINDOWS_DRIVER_TAP_WINDOWS6) { msg(M_WARN, "Some --dhcp-option or --dns options require DHCP server," " which is not supported by the selected %s driver. They will be" - " ignored.", print_windows_driver(tt->windows_driver)); + " ignored.", print_tun_backend_driver(tt->backend_driver)); } /* dco-win already opened the device, which handle we treat as socket */ @@ -6834,7 +6864,7 @@ const char * tap_win_getinfo(const struct tuntap *tt, struct gc_arena *gc) { - if (tt->windows_driver == WINDOWS_DRIVER_TAP_WINDOWS6) + if (tt->backend_driver == WINDOWS_DRIVER_TAP_WINDOWS6) { struct buffer out = alloc_buf_gc(256, gc); DWORD len; @@ -6852,7 +6882,7 @@ void tun_show_debug(struct tuntap *tt) { - if (tt->windows_driver == WINDOWS_DRIVER_TAP_WINDOWS6) + if (tt->backend_driver == WINDOWS_DRIVER_TAP_WINDOWS6) { struct buffer out = alloc_buf(1024); DWORD len; @@ -6929,7 +6959,7 @@ void close_tun_handle(struct tuntap *tt) { - const char *adaptertype = print_windows_driver(tt->windows_driver); + const char *adaptertype = print_tun_backend_driver(tt->backend_driver); if (tt->hand) { @@ -6956,7 +6986,7 @@ tt->hand = NULL; } - if (tt->windows_driver == WINDOWS_DRIVER_WINTUN) + if (tt->backend_driver == WINDOWS_DRIVER_WINTUN) { CloseHandle(tt->rw_handle.read); CloseHandle(tt->rw_handle.write); @@ -7117,25 +7147,6 @@ return BSTR(&out); } -const char * -print_windows_driver(enum windows_driver_type windows_driver) -{ - switch (windows_driver) - { - case WINDOWS_DRIVER_TAP_WINDOWS6: - return "tap-windows6"; - - case WINDOWS_DRIVER_WINTUN: - return "wintun"; - - case WINDOWS_DRIVER_DCO: - return "ovpn-dco"; - - default: - return "unspecified"; - } -} - #else /* generic */ void diff --git a/src/openvpn/tun.h b/src/openvpn/tun.h index 33b9552..e41b616 100644 --- a/src/openvpn/tun.h +++ b/src/openvpn/tun.h @@ -42,16 +42,23 @@ #include "ring_buffer.h" #include "dco.h" -#ifdef _WIN32 -#define WINTUN_COMPONENT_ID "wintun" -#define DCO_WIN_REFERENCE_STRING "ovpn-dco" - -enum windows_driver_type { +enum tun_driver_type { +#ifdef WIN32 WINDOWS_DRIVER_UNSPECIFIED, WINDOWS_DRIVER_TAP_WINDOWS6, WINDOWS_DRIVER_WINTUN, - WINDOWS_DRIVER_DCO +#else + DRIVER_GENERIC_TUNTAP, +#endif + DRIVER_DCO, +#ifdef HAVE_NET_IF_UTUN_H + DRIVER_UTUN +#endif }; + +#ifdef _WIN32 +#define WINTUN_COMPONENT_ID "wintun" +#define DCO_WIN_REFERENCE_STRING "ovpn-dco" #endif #if defined(_WIN32) || defined(TARGET_ANDROID) @@ -70,8 +77,6 @@ /* --ip-win32 options */ bool ip_win32_defined; - bool disable_dco; - #define IPW32_SET_MANUAL 0 /* "--ip-win32 manual" */ #define IPW32_SET_NETSH 1 /* "--ip-win32 netsh" */ #define IPW32_SET_IPAPI 2 /* "--ip-win32 ipapi" */ @@ -147,20 +152,12 @@ struct tuntap_options { int txqueuelen; - bool disable_dco; -}; - -#elif defined(TARGET_FREEBSD) - -struct tuntap_options { - bool disable_dco; }; #else /* if defined(_WIN32) || defined(TARGET_ANDROID) */ struct tuntap_options { int dummy; /* not used */ - bool disable_dco; /* not used, but removes the need in #ifdefs */ }; #endif /* if defined(_WIN32) || defined(TARGET_ANDROID) */ @@ -177,6 +174,11 @@ #define TUNNEL_TOPOLOGY(tt) ((tt) ? ((tt)->topology) : TOP_UNDEF) int topology; /* one of the TOP_x values */ + /** The backend driver that used for this tun/tap device. This can be + * one of the various windows drivers, "normal" tun/tap, utun, dco, ... + */ + enum tun_driver_type backend_driver; + bool did_ifconfig_setup; bool did_ifconfig_ipv6_setup; @@ -211,7 +213,6 @@ * ~0 if undefined */ DWORD adapter_index; - enum windows_driver_type windows_driver; int standby_iter; HANDLE wintun_send_ring_handle; @@ -226,9 +227,6 @@ int ip_fd; #endif -#ifdef HAVE_NET_IF_UTUN_H - bool is_utun; -#endif /* used for printing status info only */ unsigned int rwflags_debug; @@ -249,7 +247,7 @@ static inline bool tuntap_is_wintun(struct tuntap *tt) { - return tt && tt->windows_driver == WINDOWS_DRIVER_WINTUN; + return tt && tt->backend_driver == WINDOWS_DRIVER_WINTUN; } static inline bool @@ -397,7 +395,7 @@ struct tap_reg { const char *guid; - enum windows_driver_type windows_driver; + enum tun_driver_type windows_driver; struct tap_reg *next; }; @@ -643,7 +641,7 @@ static inline int write_tun_buffered(struct tuntap *tt, struct buffer *buf) { - if (tt->windows_driver == WINDOWS_DRIVER_WINTUN) + if (tt->backend_driver == WINDOWS_DRIVER_WINTUN) { return write_wintun(tt, buf); } @@ -656,7 +654,7 @@ static inline bool tuntap_is_dco_win(struct tuntap *tt) { - return tt && tt->windows_driver == WINDOWS_DRIVER_DCO; + return tt && tt->backend_driver == DRIVER_DCO; } static inline bool @@ -666,7 +664,7 @@ } const char * -print_windows_driver(enum windows_driver_type windows_driver); +print_tun_backend_driver(enum tun_driver_type driver); #else /* ifdef _WIN32 */ @@ -744,7 +742,7 @@ } } #ifdef _WIN32 - if (tt->windows_driver == WINDOWS_DRIVER_TAP_WINDOWS6 && (rwflags & EVENT_READ)) + if (tt->backend_driver == WINDOWS_DRIVER_TAP_WINDOWS6 && (rwflags & EVENT_READ)) { tun_read_queue(tt, 0); }