Remove some obsolete references to --windows-driver

The option doesn't exist anymore so don't point
people to it.

But add it to the list of unsupported options.

Change-Id: I78c6f335c635e97bb41d26ed8908a978d7b49387
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1426
Message-Id: <20251210074904.27067-1-gert@greenie.muc.de>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg34970.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>

diff --git a/doc/man-sections/unsupported-options.rst b/doc/man-sections/unsupported-options.rst
index e8e76eb8d7dc36ee0ce0cb495444416b569c377e..821ac07be2983121e4e778ce77b9a3df09de697a 100644 (file)
--- a/doc/man-sections/unsupported-options.rst
+++ b/doc/man-sections/unsupported-options.rst
@@ -49,3 +49,8 @@ longer supported
 --opt-verify
   Removed in OpenVPN 2.7.  This option does not make sense anymore as option
   strings may not match due to the introduction of parameters negotiation.
+
+--windows-driver
+  Removed in OpenVPN 2.7. OpenVPN will always use ovpn-dco as the default
+  driver on Windows. It will fall back to tap-windows6 if options are used
+  that are incompatible with ovpn-dco.

diff --git a/doc/man-sections/vpn-network-options.rst b/doc/man-sections/vpn-network-options.rst
index 2a06ef61262449d339e75c9be3033f528ec89952..33ebedb5ef22b8fec0d97a28984d7322d9268987 100644 (file)
--- a/doc/man-sections/vpn-network-options.rst
+++ b/doc/man-sections/vpn-network-options.rst
@@ -89,7 +89,7 @@ routing.
 
   On Windows, only the names :code:`tun` and :code:`tap` are supported.
   Selection among multiple installed drivers or driver instances is done
-  with ``--dev-node`` and ``--windows-driver``.
+  with ``--dev-node``.
 
 --dev-node node
   This is a highly system dependent option to influence tun/tap driver

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index a3fc19d6c790584381a563599a445f00739589d5..1be105bca74d633eda9f334ef813ce4cf054fbcb 100644 (file)
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -3905,16 +3905,7 @@ options_postprocess_mutate(struct options *o, struct env_set *es)
     }
     else
     {
-        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;
-        }
-        else if (o->windows_driver == WINDOWS_DRIVER_UNSPECIFIED)
-        {
-            o->windows_driver = WINDOWS_DRIVER_TAP_WINDOWS6;
-        }
+        o->windows_driver = WINDOWS_DRIVER_TAP_WINDOWS6;
     }
 #else  /* _WIN32 */
     if (dco_enabled(o) && o->dev_node)

diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c
index 02992854fbe59e54a0775139315877198f4af83a..72360338d187b6f7623126911f81a4cdf16f3ffb 100644 (file)
--- a/src/openvpn/tun.c
+++ b/src/openvpn/tun.c
@@ -5826,7 +5826,7 @@ tun_open_device(struct tuntap *tt, const char *dev_node, const char **device_gui
         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.",
+                "Adapter '%s' is using %s driver, %s expected.",
                 dev_node, print_tun_backend_driver(windows_driver),
                 print_tun_backend_driver(tt->backend_driver));
         }