Skip to content

Commit 2ab3e87

Browse files
flichtenheldcron2
authored andcommitted
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 <[email protected]> Acked-by: Gert Doering <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1426 Message-Id: <[email protected]> URL: https://www.mail-archive.com/[email protected]/msg34970.html Signed-off-by: Gert Doering <[email protected]>
1 parent c97aa55 commit 2ab3e87

File tree

4 files changed

+8
-12
lines changed

4 files changed

+8
-12
lines changed

doc/man-sections/unsupported-options.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,8 @@ longer supported
4949
--opt-verify
5050
Removed in OpenVPN 2.7. This option does not make sense anymore as option
5151
strings may not match due to the introduction of parameters negotiation.
52+
53+
--windows-driver
54+
Removed in OpenVPN 2.7. OpenVPN will always use ovpn-dco as the default
55+
driver on Windows. It will fall back to tap-windows6 if options are used
56+
that are incompatible with ovpn-dco.

doc/man-sections/vpn-network-options.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ routing.
8989

9090
On Windows, only the names :code:`tun` and :code:`tap` are supported.
9191
Selection among multiple installed drivers or driver instances is done
92-
with ``--dev-node`` and ``--windows-driver``.
92+
with ``--dev-node``.
9393

9494
--dev-node node
9595
This is a highly system dependent option to influence tun/tap driver

src/openvpn/options.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3905,16 +3905,7 @@ options_postprocess_mutate(struct options *o, struct env_set *es)
39053905
}
39063906
else
39073907
{
3908-
if (o->windows_driver == DRIVER_DCO)
3909-
{
3910-
msg(M_WARN,
3911-
"Option --windows-driver ovpn-dco is ignored because Data Channel Offload is disabled");
3912-
o->windows_driver = WINDOWS_DRIVER_TAP_WINDOWS6;
3913-
}
3914-
else if (o->windows_driver == WINDOWS_DRIVER_UNSPECIFIED)
3915-
{
3916-
o->windows_driver = WINDOWS_DRIVER_TAP_WINDOWS6;
3917-
}
3908+
o->windows_driver = WINDOWS_DRIVER_TAP_WINDOWS6;
39183909
}
39193910
#else /* _WIN32 */
39203911
if (dco_enabled(o) && o->dev_node)

src/openvpn/tun.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5826,7 +5826,7 @@ tun_open_device(struct tuntap *tt, const char *dev_node, const char **device_gui
58265826
if (tt->backend_driver != windows_driver)
58275827
{
58285828
msg(M_FATAL,
5829-
"Adapter '%s' is using %s driver, %s expected. If you want to use this device, adjust --windows-driver.",
5829+
"Adapter '%s' is using %s driver, %s expected.",
58305830
dev_node, print_tun_backend_driver(windows_driver),
58315831
print_tun_backend_driver(tt->backend_driver));
58325832
}

0 commit comments

Comments
 (0)