From: "plaisthos (Code Review)" Date: Thu, 19 Mar 2026 14:19:11 +0000 In-Reply-To: References: Reply-To: arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="svtuJ3mNpMY="; 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: flichtenheld Cc: openvpn-devel --svtuJ3mNpMY= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld. Hello flichtenheld,=20 I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/1550?usp=3Demail to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review-1 by flichtenheld 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 --- 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, 16 insertions(+), 18 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/50/1550/4 diff --git a/Changes.rst b/Changes.rst index 36af4e7..9c80ee8 100644 --- a/Changes.rst +++ b/Changes.rst @@ -55,10 +55,11 @@ 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. + main Linux kernel in 6.16. For this process some API changes were requ= ired. 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. + ``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 e1115e4..e50c578 100644 --- a/doc/man-sections/advanced-options.rst +++ b/doc/man-sections/advanced-options.rst @@ -102,7 +102,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 is integrated into the Linux kernel + since 6.16 or 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 f46dfec..81e375d 100644 --- a/doc/man-sections/generic-options.rst +++ b/doc/man-sections/generic-options.rst @@ -178,15 +178,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 b92fa43..e7caff6 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: @@ -1248,7 +1248,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: 4 Gerrit-Owner: plaisthos Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel Gerrit-Attention: flichtenheld --svtuJ3mNpMY= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is cur= rently required from: flichtenheld.

plaisthos uploaded patch set #4 to this change.

<= a href=3D"http://gerrit.openvpn.net/c/openvpn/+/1550?usp=3Demail">View Chan= ge

The following approvals got outdated and were removed: Code-Review-1 by flichtenheld

Try to emphasise the transit=
ion from old ovpn-dco to new ovpn module

This tries to ensure that t= he difference between the old and new module
is clearer.

Also rem= oved a duplicate section about --disable-dco from the manual page.

T= his also changes one instance of ovpn-dco to ovpn that is probably a bugwhen reusing a tun device.

Change-Id: Iff9f6811fdf553f59f2afee0072d= 7bf90133d328
Signed-off-by: Arne Schwabe <arne@...1227...>
---<= br>M Changes.rst
M configure.ac
M doc/man-sections/advanced-options.r= st
M doc/man-sections/generic-options.rst
M src/openvpn/dco.c
M sr= c/openvpn/dco_linux.c
6 files changed, 16 insertions(+), 18 deletions(-)=

git pull ssh://gerrit.openvpn.net:29418/openvpn=
 refs/changes/50/1550/4
diff --git a/Changes.rst b/Changes.rst
index 36af4e7..9c80ee8 100644
--- a/Changes.rst=
+++ b/Changes.rst
@@ -55,10 +55,11 @@

Support for new version of Linux DCO module<= /span>
OpenVPN DCO module is moving upstream and being merged= into the
- main Lin= ux kernel. For this process some API changes were required.
+ main Linux kernel in 6.16. 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 o= lder kernels are available. Please
- see the release announcements for futher information.
+ ``ovpn``. Out-of-tre= e builds for older kernels are available from
+ https://github.com/OpenVPN/ovpn-backports. Pl= ease
+ see the rel= ease announcements for further information.

Support for server mode in win-dco driver

On Windo= ws the win-dco driver can now be used in server setups.
dif= f --git a/configure.ac b/configure.ac
index ecef2b9..1fd44f= 3 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) supp= ort for Linux])
fi
;;
*-*-freebsd*)

diff --git a/doc/man-sections/advanced-= options.rst b/doc/man-sections/advanced-options.rst
index e= 1115e4..e50c578 100644
--- a/doc/man-sections/advanced-opti= ons.rst
+++ b/doc/man-sections/advanced-options.rst<= br>@@ -102,7 +102,9 @@

Data chan= nel offload currently requires data-ciphers to only contain
AEAD ciphers (AES-GCM and Chacha20-Poly1305) and Linux with the
<= br>- ovpn-dco module.
= + ovpn module. The ovpn module= is integrated into the Linux kernel
+ since 6.16 or available as backport from
+ https://github.com/OpenVPN/ovpn-b= ackports.

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-s= ections/generic-options.rst
index f46dfec..81e375d 100644
--- a/doc/man-sections/generic-options.rst
+= ++ b/doc/man-sections/generic-options.rst
@@ -178,15 +178,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 devic= e driver, but rather rely on the
- legacy tun module.
-
- You may w= ant to use this option if your server needs to allow clients
- older than version 2.4 to connect.=

-
--d= isable-occ
**DEPRECATED** Disable "options consiste= ncy check" (OCC) in configurations
that do not use = TLS.
diff --git a/src/openvpn/dco.c b/src/openvpn/dco.c
index 26b8645..f5b7081 100644
--- a/src/openvp= n/dco.c
+++ b/src/openvpn/dco.c
@@ -376,9 += 376,10 @@
* don't need to have the net_ctx pe= rcolate all the way here
*/
= int ret =3D net_iface_type(NULL, o->dev, iftype);
- if ((ret =3D=3D 0) && (s= trcmp(iftype, "ovpn-dco") !=3D 0))
+ if ((ret =3D=3D 0) && (strcmp(ifty= pe, "ovpn") !=3D 0))
{
- msg(msglevel, "Interfa= ce %s exists and is non-DCO. Disabling data channel offload",+ msg(msglevel, &q= uot;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/openv= pn/dco_linux.c
index b92fa43..e7caff6 100644
--- a/src/openvpn/dco_linux.c

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

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 found, ovpn kernel module unloaded?&= quot;, prefix);
break;

default:
@@ -1248,7 +1248,10 @@<= br> {
if (resolve_ovpn_netlink_id(D_DCO_DEBUG) &= lt; 0)
{
- msg(msglevel, "Note: Kernel support for ovpn-dco missi= ng, disabling data channel offload.");
+ msg(msglevel, "Note: Kernel support fo= r ovpn interfaces missing, "
+ "disabling data channel offload. U= se Linux 6.16.0 or "
+ "newer with ovpn support or use ovpn-backp= orts for "
+ = "interface support.");
= return false;
}


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

Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Iff9f6811fdf553f59f2afee0072= d7bf90133d328
Gerrit-Change-Number: 1550
Gerrit-PatchSet: 4
Gerrit-Owner: plaisthos <arne-openvpn@...1711...= 27...>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
= --svtuJ3mNpMY=--