From: Frank Lichtenheld <[email protected]> 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 <[email protected]> Acked-by: Gert Doering <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1426 --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1426 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering <[email protected]> diff --git a/doc/man-sections/unsupported-options.rst b/doc/man-sections/unsupported-options.rst index e8e76eb..821ac07 100644 --- a/doc/man-sections/unsupported-options.rst +++ b/doc/man-sections/unsupported-options.rst @@ -49,3 +49,8 @@ --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 2a06ef6..33ebedb 100644 --- a/doc/man-sections/vpn-network-options.rst +++ b/doc/man-sections/vpn-network-options.rst @@ -89,7 +89,7 @@ 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 a3fc19d..1be105b 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -3905,16 +3905,7 @@ } 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 7c61dcf..a7c5ebb 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -6061,7 +6061,7 @@ 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)); } _______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
