From: "its_Giaan (Code Review)" Date: Fri, 28 Mar 2025 15:26:29 +0000 References: Reply-To: gianmarco@...2726..., 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="mqzXtyhCFjg="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: Fix FreeBSD-DCO and Multisocket interaction List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos , flichtenheld Cc: openvpn-devel --mqzXtyhCFjg= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld, plaisthos. Hello plaisthos, flichtenheld, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/925?usp=3Demail to review the following change. Change subject: Fix FreeBSD-DCO and Multisocket interaction ...................................................................... Fix FreeBSD-DCO and Multisocket interaction FreeBSD-DCO does not support TCP as transport protocol so in order to be able to use DCO in a multi-socket environment we need to check the local_list entries and disable DCO if any of the listening socket is TCP. While at it, removed some dead code left from Multisocket polishing. Github: #710 Change-Id: I9b6359076a61ae2bbb8e5cea00e33969cb5f92cf Signed-off-by: Gianmarco De Gregori --- M src/openvpn/dco.c M src/openvpn/options.c M src/openvpn/options.h 3 files changed, 9 insertions(+), 22 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/25/925/1 diff --git a/src/openvpn/dco.c b/src/openvpn/dco.c index d00958d..7ad9cb3 100644 --- a/src/openvpn/dco.c +++ b/src/openvpn/dco.c @@ -260,10 +260,16 @@ } #if defined(TARGET_FREEBSD) - if (!proto_is_udp(ce->proto)) + if (ce->local_list) { - msg(msglevel, "NOTE: TCP transport disables data channel offload o= n FreeBSD."); - return false; + for (int i =3D 0; i < ce->local_list->len; i++) + { + if (!proto_is_dgram(ce->local_list->array[i]->proto)) + { + msg(msglevel, "NOTE: TCP transport disables data channel o= ffload on FreeBSD."); + return false; + } + } } #endif diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 99dd60a..6605a42 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -9577,20 +9577,3 @@ return false; } - -bool -has_tcp_in_local_list(const struct options *options) -{ - if (options->ce.local_list) - { - for (int i =3D 0; i < options->ce.local_list->len; i++) - { - if (!proto_is_dgram(options->ce.local_list->array[i]->proto)) - { - return true; - } - } - } - - return false; -} diff --git a/src/openvpn/options.h b/src/openvpn/options.h index fa617c8..8d1ef6c 100644 --- a/src/openvpn/options.h +++ b/src/openvpn/options.h @@ -921,8 +921,6 @@ bool has_udp_in_local_list(const struct options *options); -bool has_tcp_in_local_list(const struct options *options); - /** * Returns whether the current configuration has dco enabled. */ -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/925?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I9b6359076a61ae2bbb8e5cea00e33969cb5f92cf Gerrit-Change-Number: 925 Gerrit-PatchSet: 1 Gerrit-Owner: its_Giaan Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: flichtenheld Gerrit-MessageType: newchange --mqzXtyhCFjg= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld, plaisthos.

its_Giaan would like plaisthos and flichtenheld to review this change.

Vi= ew Change

Fix FreeBSD-DCO and Multisocket interaction

FreeBSD-DC= O does not support TCP as transport
protocol so in order to be able to u= se DCO in a
multi-socket environment we need to check
the local_list = entries and disable DCO
if any of the listening socket is TCP.

Wh= ile at it, removed some dead code left
from Multisocket polishing.
Github: #710

Change-Id: I9b6359076a61ae2bbb8e5cea00e33969cb5f92cf<= br>Signed-off-by: Gianmarco De Gregori <gianmarco@...2726...>
---<= br>M src/openvpn/dco.c
M src/openvpn/options.c
M src/openvpn/options.= h
3 files changed, 9 insertions(+), 22 deletions(-)

git pull s=
sh://gerrit.openvpn.net:29418/openvpn refs/changes/25/925/1
diff --=
git a/src/openvpn/dco.c b/src/openvpn/dco.c
index d00958d..= 7ad9cb3 100644
--- a/src/openvpn/dco.c
+++ = b/src/openvpn/dco.c
@@ -260,10 +260,16 @@
= }

#if defined(TARGET_FREEBSD)=
- if (!proto_is_udp(ce->= ;proto))
+ if (ce-= >local_list)
{
- msg(msglevel, "NOTE: TCP transport disables d= ata channel offload on FreeBSD.");
- return false;
+ for (int i =3D 0; i < ce->local_list->= len; i++)
+ {<= /span>
+ if (!pro= to_is_dgram(ce->local_list->array[i]->proto))
+ {
+ msg(msglevel, "NOTE: TCP = transport disables data channel offload on FreeBSD.");
+ return false;
+ }
<= span style=3D"color: hsl(120, 100%, 40%);">+ }

= }
#endif

diff --git a/sr= c/openvpn/options.c b/src/openvpn/options.c
index 99dd60a..= 6605a42 100644
--- a/src/openvpn/options.c
= +++ b/src/openvpn/options.c
@@ -9577,20 +9577,3 @@
return false;
}
<= span style=3D"color: hsl(0, 100%, 40%);">-
-bool
-has_tcp_in_local_list(const struct options *options)
-{
- if (options->ce.local_list)
- {
- for (int i =3D 0; i < options->ce.local_list->= len; i++)
- {
- if (!proto_i= s_dgram(options->ce.local_list->array[i]->proto))
- {
- return true;
- }
- }
- }
-=
- return false;
-}
diff --= git a/src/openvpn/options.h b/src/openvpn/options.h
index f= a617c8..8d1ef6c 100644
--- a/src/openvpn/options.h+++ b/src/openvpn/options.h
@@ -921,8 +921,6 @@

bool has_udp_in_local_list(const struct opt= ions *options);

-bool has_tcp_in_local_list(const struct options *options);
-
/**
* Returns whether the current configuration has dco enabled.<= /span>
*/

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

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9b6359076a61ae2bbb8e5cea00e= 33969cb5f92cf
Gerrit-Change-Number: 925
Gerrit-PatchSet: 1
Gerrit-Owner: its_Giaan <gianmarco@...2786...= ..>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-MessageType: newchange
--mqzXtyhCFjg=--