From: "cron2 (Code Review)" Date: Sat, 11 Apr 2026 14:41:34 +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-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="uBg1X++22qA="; 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 , flichtenheld , mandree Cc: openvpn-devel --uBg1X++22qA= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has uploaded a new patch set (#7) to the change originally created by= plaisthos. ( http://gerrit.openvpn.net/c/openvpn/+/1550?usp=3Demail ) The following approvals got outdated and were removed: Code-Review+1 by mandree, Code-Review+2 by ordex 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(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/50/1550/7 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: newpatchset 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 --uBg1X++22qA= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 upl= oaded patch set #7 to the change originally created by plaisthos.<= /p>

Vi= ew Change

The following approvals got outdated and were removed: Code-Review+1 by mandree, Code-Review+2 by ordex

Try to em=
phasise the transition from old ovpn-dco to new ovpn module

This tri= es to ensure that the difference between the old and new module
is clear= er.

Also removed a duplicate section about --disable-dco from the ma= nual page.

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

Change-Id: Iff9f6811f= df553f59f2afee0072d7bf90133d328
Signed-off-by: Arne Schwabe <arne@...493...= 1227...>
Acked-by: Antonio Quartulli <antonio@...2726...>
Ge= rrit URL: https://gerrit.openvpn.net/c/openvpn/+/1550
Message-Id: <20= 260411090625.18343-1-gert@...1296...>
URL: https://www.mail-archive.c= om/openvpn-devel@lists.sourceforge.net/msg36573.html
Signed-off-by: Gert= Doering <gert@...1296...>
---
M Changes.rst
M configure.ac<= br>M doc/man-sections/advanced-options.rst
M doc/man-sections/generic-op= tions.rst
M src/openvpn/dco.c
M src/openvpn/dco_linux.c
6 files ch= anged, 18 insertions(+), 20 deletions(-)

git pul=
l ssh://gerrit.openvpn.net:29418/openvpn refs/changes/50/1550/7
dif=
f --git a/Changes.rst b/Changes.rst
index 36af4e7..1f992b2 = 100644
--- a/Changes.rst
+++ b/Changes.rst<= /span>
@@ -54,11 +54,12 @@
are not readable f= or ``NT SERVICE\OpenVPNService``.

Suppor= t for new version of Linux DCO module
- OpenVPN DCO module is moving upstream and being merged = into the
- main Linu= x 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 availabl= e. Please
- see the = release announcements for futher information.
+ The OpenVPN DCO module has been merged into t= he 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/O= penVPN/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 se= tups.
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 da= ta 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
<= span> ;;

*-*-freebsd*)
diff --git a/d= oc/man-sections/advanced-options.rst b/doc/man-sections/advanced-options.rs= t
index 73ca44a..3eff3085 100644
--- a/doc/= man-sections/advanced-options.rst
+++ b/doc/man-sections/ad= vanced-options.rst
@@ -103,7 +103,9 @@

Data channel offload currently requires data-ciphers to on= ly contain
AEAD ciphers (AES-GCM and Chacha20-Poly1305) = and Linux with the
- o= vpn-dco module.
+ ov= pn module. The ovpn module has been integrated into the Linux kernel=
+ since 6.16 or is availab= le as backport from
+= https://github.com/OpenVPN/ovpn-backports.

Note that some options have no effect or cannot be used when DCO mod= e

is enabled.
diff --git a/doc/man-secti= ons/generic-options.rst b/doc/man-sections/generic-options.rst
index 415b81f..6815dc2 100644

--- a/doc/man-sections/ge= neric-options.rst
+++ b/doc/man-sections/generic-options.rs= t
@@ -176,15 +176,6 @@
on console) and `= `--auth-nocache`` will fail as soon as key
renegotiation= (and reauthentication) occurs.

---disabl= e-dco
- Disable "= data channel offload" (DCO).
-
- On Linu= x 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 nee= ds to allow clients
- = older than version 2.4 to connect.
-
--disable-occ
**DEPRECATE= D** Disable "options consistency check" (OCC) in configurations
that do not use TLS.
diff --git a/src/ope= nvpn/dco.c b/src/openvpn/dco.c
index 26b8645..f5b7081 10064= 4
--- 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-&g= t;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 da= ta 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 b87842= 8..4c896f6 100644
--- a/src/openvpn/dco_linux.c
<= span>+++ 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 unloaded?", prefix);
+ msg(M_INFO, "%s: netlink reports object not foun= d, ovpn kernel module unloaded?", prefix);
= break;

default:
@@ -1249,7 +1249,10 @@

{
if (resolv= e_ovpn_netlink_id(D_DCO_DEBUG) < 0)
{
- msg(msglevel, "Note: K= ernel support for ovpn-dco missing, disabling data channel offload.");=

+ msg(msgleve= l, "Note: Kernel support for ovpn interfaces missing, "+ "d= isabling data channel offload. Use Linux 6.16.0 or "
+ "newer wit= h ovpn support or use ovpn-backports for "
+ "interface support.&= quot;);
return false;
}


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

Gerrit-MessageType: newpatchset
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>
= --uBg1X++22qA=--