From c543cf464e97866e20345feb46c82752fedc9d71 Mon Sep 17 00:00:00 2001 From: Lev Stipakov Date: Thu, 18 May 2023 14:00:58 +0300 Subject: [PATCH] dco-win: support for --dev-node With --dev-node on Windows, one can specify GUID of the adapter openvpn should use. Those can be listed with: C:\Program Files\OpenVPN\bin>openvpn.exe --show-adapters While on it, remove "TAP-WIN32 / Wintun" from --show-adapters output. Github: Fixes OpenVPN/openvpn#336 Change-Id: I57de4d3c069465fb730bb635bfdbdf360fc8c475 Signed-off-by: Lev Stipakov Acked-by: Gert Doering Message-Id: <20230518110058.1382-1-lstipakov@gmail.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26702.html Signed-off-by: Gert Doering --- src/openvpn/options.c | 4 ++-- src/openvpn/tun.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index fa435c1d8..e4c596b89 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -3771,14 +3771,14 @@ options_postprocess_mutate(struct options *o, struct env_set *es) o->windows_driver = WINDOWS_DRIVER_TAP_WINDOWS6; } } -#endif - +#else /* _WIN32 */ if (dco_enabled(o) && o->dev_node) { msg(M_WARN, "Note: ignoring --dev-node as it has no effect when using " "data channel offload"); o->dev_node = NULL; } +#endif /* _WIN32 */ /* this depends on o->windows_driver, which is set above */ options_postprocess_mutate_invariant(o); diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index df10dbd2f..4ef390ad5 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -4200,7 +4200,7 @@ show_tap_win_adapters(int msglev, int warnlev) const struct tap_reg *tap_reg = get_tap_reg(&gc); const struct panel_reg *panel_reg = get_panel_reg(&gc); - msg(msglev, "Available TAP-WIN32 / Wintun adapters [name, GUID, driver]:"); + msg(msglev, "Available adapters [name, GUID, driver]:"); /* loop through each TAP-Windows adapter registry entry */ for (tr = tap_reg; tr != NULL; tr = tr->next) -- 2.47.2