From: "its_Giaan (Code Review)" Date: Thu, 10 Apr 2025 12:29:31 +0000 In-Reply-To: References: Reply-To: gianmarco@...2726..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641..., lstipakov@...277... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="pHt/4is0/0Q="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: Fix dco_win and multisocket interaction List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos , flichtenheld , stipa Cc: openvpn-devel --pHt/4is0/0Q= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: its_Giaan, plaisthos. Hello flichtenheld, plaisthos, stipa, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/935?usp=3Demail to look at the new patch set (#4). Change subject: Fix dco_win and multisocket interaction ...................................................................... Fix dco_win and multisocket interaction The recent introduction of the multisocket support did not account for some Windows-specific DCO paths. This patch restores correct behavior on Windows. Key changes: - Add WIN32 guards around DCO-specifc code. - Disable wait_signal() when running in server mode, as it conflicts with the event engine since Windows handles signals as I/Os. - Ensure correct socket handling for TCP vs UDP. Github: #720 Change-Id: I719b1aa2d2f4d63dc9c18d8e313fba339e3e4b0c Signed-off-by: Gianmarco De Gregori --- M src/openvpn/forward.c M src/openvpn/mtcp.c M src/openvpn/multi_io.c 3 files changed, 13 insertions(+), 7 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/35/935/4 diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c index af1d008..0b8b262 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -2072,7 +2072,7 @@ /* * Calculate the flags based on the provided 'flags' argument. */ - if (flags & IOW_WAIT_SIGNAL) + if ((c->options.mode !=3D MODE_SERVER) && (flags & IOW_WAIT_SIGNAL)) { wait_signal(es, (void *)err_shift); } diff --git a/src/openvpn/mtcp.c b/src/openvpn/mtcp.c index 1d62ea6..86c5160 100644 --- a/src/openvpn/mtcp.c +++ b/src/openvpn/mtcp.c @@ -181,7 +181,8 @@ if (mi) { - if (defer || mbuf_defined(mi->tcp_link_out_deferred)) + if ((defer && !proto_is_dgram(mi->context.c2.link_sockets[0]->info= .proto)) + || mbuf_defined(mi->tcp_link_out_deferred)) { /* save to queue */ struct buffer *buf =3D &mi->context.c2.to_link; diff --git a/src/openvpn/multi_io.c b/src/openvpn/multi_io.c index f1751ff..f4ca4df 100644 --- a/src/openvpn/multi_io.c +++ b/src/openvpn/multi_io.c @@ -176,10 +176,13 @@ int status, i; unsigned int *persistent =3D &m->multi_io->tun_rwflags; - for (i =3D 0; i < m->top.c1.link_sockets_num; i++) + if (!tuntap_is_dco_win(m->top.c1.tuntap)) { - socket_set_listen_persistent(m->top.c2.link_sockets[i], m->multi_i= o->es, - &m->top.c2.link_sockets[i]->ev_arg); + for (i =3D 0; i < m->top.c1.link_sockets_num; i++) + { + socket_set_listen_persistent(m->top.c2.link_sockets[i], m->mul= ti_io->es, + &m->top.c2.link_sockets[i]->ev_ar= g); + } } if (has_udp_in_local_list(&m->top.options)) @@ -202,7 +205,8 @@ } #endif tun_set(m->top.c1.tuntap, m->multi_io->es, EVENT_READ, MULTI_IO_TUN, p= ersistent); -#if defined(TARGET_LINUX) || defined(TARGET_FREEBSD) +#if defined(ENABLE_DCO) \ + && (defined(TARGET_LINUX) || defined(TARGET_FREEBSD) || defined(TARGET= _WIN32)) dco_event_set(&m->top.c1.tuntap->dco, m->multi_io->es, MULTI_IO_DCO); #endif @@ -535,7 +539,8 @@ multi_io_action(m, mi, TA_INITIAL, false); } } -#if defined(ENABLE_DCO) && (defined(TARGET_LINUX) || defined(TARGET_FREEBS= D)) +#if defined(ENABLE_DCO) \ + && (defined(TARGET_LINUX) || defined(TARGET_FREEBSD) || define= d(TARGET_WIN32)) /* incoming data on DCO? */ else if (e->arg =3D=3D MULTI_IO_DCO) { -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/935?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: I719b1aa2d2f4d63dc9c18d8e313fba339e3e4b0c Gerrit-Change-Number: 935 Gerrit-PatchSet: 4 Gerrit-Owner: its_Giaan Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-Reviewer: stipa Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: its_Giaan Gerrit-MessageType: newpatchset --pHt/4is0/0Q= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: its_Giaan, plaisthos.

its_Giaan uploaded patch set #4 to this change.

<= a href=3D"http://gerrit.openvpn.net/c/openvpn/+/935?usp=3Demail">View Chang= e

Fix dco_win and multisocket interaction

The recent introductio= n of the multisocket support
did not account for some Windows-specific D= CO paths.
This patch restores correct behavior on Windows.

Key ch= anges:

- Add WIN32 guards around DCO-specifc code.
- Disable wa= it_signal() when running in
server mode, as it conflicts with the
= event engine since Windows handles
signals as I/Os.
- Ensure c= orrect socket handling for TCP
vs UDP.

Github: #720

Cha= nge-Id: I719b1aa2d2f4d63dc9c18d8e313fba339e3e4b0c
Signed-off-by: Gianmar= co De Gregori <gianmarco@...2726...>
---
M src/openvpn/forward.= c
M src/openvpn/mtcp.c
M src/openvpn/multi_io.c
3 files changed, 1= 3 insertions(+), 7 deletions(-)

git pull ssh://gerrit.openvpn.net=
:29418/openvpn refs/changes/35/935/4
diff --git a/src/openvpn/forwa=
rd.c b/src/openvpn/forward.c
index af1d008..0b8b262 100644<= /span>
--- a/src/openvpn/forward.c
+++ b/src/openv= pn/forward.c
@@ -2072,7 +2072,7 @@
/*<= /span>
* Calculate the flags based on the provided 'flag= s' argument.
*/
- if (flags & IOW_WAIT_SIGNAL)
+ if ((c->options.mode !=3D MODE_= SERVER) && (flags & IOW_WAIT_SIGNAL))
{
wait_signal(es, (void *)err_shift);
= }
diff --git a/src/openvpn/mtcp.c b/src/openvpn/mtcp.c=
index 1d62ea6..86c5160 100644
--- a/src/op= envpn/mtcp.c
+++ b/src/openvpn/mtcp.c
@@ -1= 81,7 +181,8 @@

if (mi)
{

- if (= defer || mbuf_defined(mi->tcp_link_out_deferred))
+ if ((defer && !proto_is_d= gram(mi->context.c2.link_sockets[0]->info.proto))
+ || mbuf_defined(mi->tcp_= link_out_deferred))
{
= /* save to queue */
struct buffer *buf =3D &a= mp;mi->context.c2.to_link;
diff --git a/src/openvpn/mult= i_io.c b/src/openvpn/multi_io.c
index f1751ff..f4ca4df 1006= 44
--- a/src/openvpn/multi_io.c
+++ b/src/o= penvpn/multi_io.c
@@ -176,10 +176,13 @@
= int status, i;
unsigned int *persistent =3D &m-&= gt;multi_io->tun_rwflags;

- for (i =3D 0; i < m->top.c1.link_sockets= _num; i++)
+ if (!= tuntap_is_dco_win(m->top.c1.tuntap))
{
- socket_set_listen_persiste= nt(m->top.c2.link_sockets[i], m->multi_io->es,

- &= ;m->top.c2.link_sockets[i]->ev_arg);
+ for (i =3D 0; i < m->top.c1.link_socke= ts_num; i++)
+ = {
+ socke= t_set_listen_persistent(m->top.c2.link_sockets[i], m->multi_io->es= ,
+ = &m->top.c2.link_sockets[i]->ev_arg);
+ }
}


if (has_udp_in_local_list(&a= mp;m->top.options))
@@ -202,7 +205,8 @@
= }
#endif
tun_set(m->top.c1.tu= ntap, m->multi_io->es, EVENT_READ, MULTI_IO_TUN, persistent);<= br>-#if defined(TARGET_LINUX) || = defined(TARGET_FREEBSD)
+#if defined(ENABLE_DCO) \
+ && (defined(TARGET_LINUX) || defined(TARGET_FREEBSD) = || defined(TARGET_WIN32))
dco_event_set(&m->top= .c1.tuntap->dco, m->multi_io->es, MULTI_IO_DCO);
= #endif

@@ -535,7 +539,8 @@
multi_io_action(m, mi, TA_INITIAL, false);
}
}
-#if defined(ENABLE_DCO) && (defi= ned(TARGET_LINUX) || defined(TARGET_FREEBSD))
+#if defined(ENABLE_DCO) \
+ && (defined(TARGET_LI= NUX) || defined(TARGET_FREEBSD) || defined(TARGET_WIN32))
= /* incoming data on DCO? */
else i= f (e->arg =3D=3D MULTI_IO_DCO)
{
=

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

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I719b1aa2d2f4d63dc9c18d8e313= fba339e3e4b0c
Gerrit-Change-Number: 935
Gerrit-PatchSet: 4
Gerrit-Owner: its_Giaan <gianmarco@...2786...= ..>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-Reviewer: stipa <lstipakov@...277...= >
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: its_Giaan <gianmarco@...1665...= 726...>
Gerrit-MessageType: newpatchset
--pHt/4is0/0Q=--