From: "cron2 (Code Review)" Date: Sat, 11 Apr 2026 14:41:38 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., matthias.andree@...68..., openvpn-devel@lists.sourceforge.net, frank@...2641..., antonio@...2726... Message-ID: <7f349a087e6b1f380103ab362764fd2b51e9e0b1-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="bgjn0FEq1dM="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: Try to emphasise the transition from old ovpn-dco to new ovpn module List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos Cc: mandree , flichtenheld , openvpn-devel --bgjn0FEq1dM= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/15= 50?usp=3Demail ) Change subject: Try to emphasise the transition from old ovpn-dco to new ov= pn module ...................................................................... Try to emphasise the transition from old ovpn-dco to new ovpn module This tries to ensure that the difference between the old and new module is clearer. Also removed a duplicate section about --disable-dco from the manual page. This also changes one instance of ovpn-dco to ovpn that is probably a bug when reusing a tun device. Change-Id: Iff9f6811fdf553f59f2afee0072d7bf90133d328 Signed-off-by: Arne Schwabe Acked-by: Antonio Quartulli Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1550 Message-Id: <20260411090625.18343-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg36= 573.html Signed-off-by: Gert Doering --- M Changes.rst M configure.ac M doc/man-sections/advanced-options.rst M doc/man-sections/generic-options.rst M src/openvpn/dco.c M src/openvpn/dco_linux.c 6 files changed, 18 insertions(+), 20 deletions(-) diff --git a/Changes.rst b/Changes.rst index 36af4e7..1f992b2 100644 --- a/Changes.rst +++ b/Changes.rst @@ -54,11 +54,12 @@ are not readable for ``NT SERVICE\OpenVPNService``. Support for new version of Linux DCO module - OpenVPN DCO module is moving upstream and being merged into the - main Linux kernel. For this process some API changes were required. - OpenVPN 2.7 will only support the new API. The new module is called - ``ovpn``. Out-of-tree builds for older kernels are available. Please - see the release announcements for futher information. + The OpenVPN DCO module has been merged into the Linux kernel as of + 6.16. This required some API changes and OpenVPN 2.7 only supports + the new API. The new module is called ``ovpn``. Out-of-tree builds + for older kernels are available from + https://github.com/OpenVPN/ovpn-backports. Please + see the release announcements for further information. Support for server mode in win-dco driver On Windows the win-dco driver can now be used in server setups. diff --git a/configure.ac b/configure.ac index ecef2b9..1fd44f3 100644 --- a/configure.ac +++ b/configure.ac @@ -731,7 +731,7 @@ OPTIONAL_LIBNL_GENL_LIBS=3D"${LIBNL_GENL_LIBS}" AC_DEFINE(ENABLE_DCO, 1, [Enable shared data channel offload]) - AC_MSG_NOTICE([Enabled ovpn-dco support for Linux]) + AC_MSG_NOTICE([Enabled ovpn-dco (via ovpn kernel module) support for L= inux]) fi ;; *-*-freebsd*) diff --git a/doc/man-sections/advanced-options.rst b/doc/man-sections/advan= ced-options.rst index 73ca44a..3eff3085 100644 --- a/doc/man-sections/advanced-options.rst +++ b/doc/man-sections/advanced-options.rst @@ -103,7 +103,9 @@ Data channel offload currently requires data-ciphers to only contain AEAD ciphers (AES-GCM and Chacha20-Poly1305) and Linux with the - ovpn-dco module. + ovpn module. The ovpn module has been integrated into the Linux kernel + since 6.16 or is available as backport from + https://github.com/OpenVPN/ovpn-backports. Note that some options have no effect or cannot be used when DCO mode is enabled. diff --git a/doc/man-sections/generic-options.rst b/doc/man-sections/generi= c-options.rst index 415b81f..6815dc2 100644 --- a/doc/man-sections/generic-options.rst +++ b/doc/man-sections/generic-options.rst @@ -176,15 +176,6 @@ on console) and ``--auth-nocache`` will fail as soon as key renegotiation (and reauthentication) occurs. ---disable-dco - Disable "data channel offload" (DCO). - - On Linux don't use the ovpn-dco device driver, but rather rely on the - legacy tun module. - - You may want to use this option if your server needs to allow clients - older than version 2.4 to connect. - --disable-occ **DEPRECATED** Disable "options consistency check" (OCC) in configuratio= ns that do not use TLS. diff --git a/src/openvpn/dco.c b/src/openvpn/dco.c index 26b8645..f5b7081 100644 --- a/src/openvpn/dco.c +++ b/src/openvpn/dco.c @@ -376,9 +376,10 @@ * don't need to have the net_ctx percolate all the way here */ int ret =3D net_iface_type(NULL, o->dev, iftype); - if ((ret =3D=3D 0) && (strcmp(iftype, "ovpn-dco") !=3D 0)) + if ((ret =3D=3D 0) && (strcmp(iftype, "ovpn") !=3D 0)) { - msg(msglevel, "Interface %s exists and is non-DCO. Disabling d= ata channel offload", + msg(msglevel, "Interface %s exists and is not using the " + "ovpn DCO driver. Disabling data channel offload= ", o->dev); return false; } diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c index b878428..4c896f6 100644 --- a/src/openvpn/dco_linux.c +++ b/src/openvpn/dco_linux.c @@ -159,7 +159,7 @@ break; case -NLE_OBJ_NOTFOUND: - msg(M_INFO, "%s: netlink reports object not found, ovpn-dco un= loaded?", prefix); + msg(M_INFO, "%s: netlink reports object not found, ovpn kernel= module unloaded?", prefix); break; default: @@ -1249,7 +1249,10 @@ { if (resolve_ovpn_netlink_id(D_DCO_DEBUG) < 0) { - msg(msglevel, "Note: Kernel support for ovpn-dco missing, disablin= g data channel offload."); + msg(msglevel, "Note: Kernel support for ovpn interfaces missing, " + "disabling data channel offload. Use Linux 6.16.0 or= " + "newer with ovpn support or use ovpn-backports for " + "interface support."); return false; } -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1550?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings?usp=3Demail Gerrit-MessageType: merged Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Iff9f6811fdf553f59f2afee0072d7bf90133d328 Gerrit-Change-Number: 1550 Gerrit-PatchSet: 7 Gerrit-Owner: plaisthos Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: mandree Gerrit-Reviewer: ordex Gerrit-CC: openvpn-devel --bgjn0FEq1dM= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 sub= mitted this change.

View Change

Try to emphasise the transition from old ovpn-dc=
o to new ovpn module

This tries to ensure that the difference betwee= n the old and new module
is clearer.

Also removed a duplicate sec= tion about --disable-dco from the manual page.

This also changes one= instance of ovpn-dco to ovpn that is probably a bug
when reusing a tun = device.

Change-Id: Iff9f6811fdf553f59f2afee0072d7bf90133d328
Sign= ed-off-by: Arne Schwabe <arne@...1227...>
Acked-by: Antonio Quartu= lli <antonio@...2726...>
Gerrit URL: https://gerrit.openvpn.net/c/= openvpn/+/1550
Message-Id: <20260411090625.18343-1-gert@...1296...>= ;
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/= msg36573.html
Signed-off-by: Gert Doering <gert@...1296...>
---=
M Changes.rst
M configure.ac
M doc/man-sections/advanced-options.= rst
M doc/man-sections/generic-options.rst
M src/openvpn/dco.c
M s= rc/openvpn/dco_linux.c
6 files changed, 18 insertions(+), 20 deletions(-= )

diff --git a/Changes.rst b/Changes.rst
index 36af4e7..1f= 992b2 100644
--- a/Changes.rst
+++ b/Change= s.rst
@@ -54,11 +54,12 @@
are not read= able for ``NT SERVICE\OpenVPNService``.

= Support for new version of Linux DCO module
- OpenVPN DCO module is moving upstream and being m= erged into the
- mai= n Linux kernel. For this process some API changes were required.
= - OpenVPN 2.7 will only suppor= t the new API. The new module is called
- ``ovpn``. Out-of-tree builds for older kernels are av= ailable. Please
- se= e the release announcements for futher information.
+ The OpenVPN DCO module has been merge= d into the Linux kernel as of
+ 6.16. This required some API changes and OpenVPN 2.7 only su= pports
+ the new A= PI. The new module is called ``ovpn``. Out-of-tree builds
+ for older kernels are available f= rom
+ https://gith= ub.com/OpenVPN/ovpn-backports. Please
+ see the release announcements for further information= .

Support for server mode in win-dco dri= ver
On Windows the win-dco driver can now be used in s= erver setups.
diff --git a/configure.ac b/configure.ac
index ecef2b9..1fd44f3 100644
--- a/configure.a= c
+++ b/configure.ac
@@ -731,7 +731,7 @@
OPTIONAL_LIBNL_GENL_LIBS=3D"${LIBNL_GENL_LIBS}"= ;

AC_DEFINE(ENABLE_DCO, 1, [Enable s= hared data channel offload])
- AC_MSG_NOTICE([Enabled ovpn-dco support for Linux])
+ AC_MSG_NOTICE([Enabled ovpn-= dco (via ovpn kernel module) support for Linux])

fi

;;
*-*-freebsd*)
diff -= -git a/doc/man-sections/advanced-options.rst b/doc/man-sections/advanced-op= tions.rst
index 73ca44a..3eff3085 100644
--= - a/doc/man-sections/advanced-options.rst
+++ b/doc/man-sec= tions/advanced-options.rst
@@ -103,7 +103,9 @@

Data channel offload currently requires data-ciphe= rs to only contain
AEAD ciphers (AES-GCM and Chacha20-Po= ly1305) and Linux with the
- ovpn-dco module.
+ ovpn module. The ovpn module has been integrated into the Linux kerne= l
+ since 6.16 or is= available as backport from
+ https://github.com/OpenVPN/ovpn-backports.

Note that some options have no effect or cannot be used when= DCO mode
is enabled.
diff --git a/doc/m= an-sections/generic-options.rst b/doc/man-sections/generic-options.rst
index 415b81f..6815dc2 100644
--- a/doc/man-sec= tions/generic-options.rst
+++ b/doc/man-sections/generic-op= tions.rst
@@ -176,15 +176,6 @@
on consol= e) and ``--auth-nocache`` will fail as soon as key
reneg= otiation (and reauthentication) occurs.

-= --disable-dco
- Disabl= e "data channel offload" (DCO).
-
- = On Linux don't use the ovpn-dco device driver, but rather rely on the<= /span>
- legacy tun module.
-
- You may want to use this option if your s= erver needs to allow clients
- older than version 2.4 to connect.
-
--disable-occ
**= DEPRECATED** Disable "options consistency check" (OCC) in configu= rations
that do not use TLS.
diff --git = a/src/openvpn/dco.c b/src/openvpn/dco.c
index 26b8645..f5b7= 081 100644
--- a/src/openvpn/dco.c
+++ b/sr= c/openvpn/dco.c
@@ -376,9 +376,10 @@
= * don't need to have the net_ctx percolate all the way here<= br> */
int ret =3D net_iface_type(N= ULL, o->dev, iftype);
+ = if ((ret =3D=3D 0) && (strcmp(iftype, "ovpn") !=3D 0))
{
- msg(msglevel, "Interface %s exists and is non-DCO. Dis= abling data channel offload",
+ msg(msglevel, "Interface %s exists and is n= ot using the "
+= "ovpn DCO driver. Disabling data channel off= load",
o->dev);
= return false;
}
diff --= git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c
ind= ex b878428..4c896f6 100644
--- a/src/openvpn/dco_linux.c

+++ b/src/openvpn/dco_linux.c
@@ -159,7 +159,= 7 @@
break;

= case -NLE_OBJ_NOTFOUND:
- msg(M_INFO, "%s: netlink reports object not fou= nd, ovpn-dco unloaded?", prefix);
+ msg(M_INFO, "%s: netlink reports object= not found, ovpn kernel module unloaded?", prefix);
= break;

default:
@@ -1249,7 +1249,10 @@
{
i= f (resolve_ovpn_netlink_id(D_DCO_DEBUG) < 0)
{
- msg(msglevel, &quo= t;Note: Kernel support for ovpn-dco missing, disabling data channel offload= .");
+ ms= g(msglevel, "Note: Kernel support for ovpn interfaces missing, "<= /span>
+ = "disabling data channel offload. Use Linux 6.16.0 or "+ "= newer with ovpn support or use ovpn-backports for "
+ "interface = support.");
return false;
= }


To view, visit change 155= 0. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: merged
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Iff9f6811fdf553f59f2afee0072= d7bf90133d328
Gerrit-Change-Number: 1550
Gerrit-PatchSet: 7
Gerrit-Owner: plaisthos <arne-openvpn@...1711...= 27...>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: mandree <matthias.andree@...220...= ..68...>
Gerrit-Reviewer: ordex <antonio@...2726...&= gt;
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
= --bgjn0FEq1dM=--