From: "its_Giaan (Code Review)" Date: Wed, 9 Apr 2025 07:04:15 +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="4ZwvbtI0oJw="; 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 Cc: openvpn-devel --4ZwvbtI0oJw= 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/+/935?usp=3Demail to review the following change. Change subject: Fix dco_win and multisocket interaction ...................................................................... Fix dco_win and multisocket interaction Change-Id: I719b1aa2d2f4d63dc9c18d8e313fba339e3e4b0c Signed-off-by: Gianmarco De Gregori --- M src/openvpn/multi_io.c 1 file changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/35/935/1 diff --git a/src/openvpn/multi_io.c b/src/openvpn/multi_io.c index f1751ff..f2f40b0 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,7 @@ } #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(TARGET_LINUX) || defined(TARGET_FREEBSD) || defined(TARGET_WIN= 32) dco_event_set(&m->top.c1.tuntap->dco, m->multi_io->es, MULTI_IO_DCO); #endif @@ -535,7 +538,7 @@ 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_FREEBS= D) || defined(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: 1 Gerrit-Owner: its_Giaan Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: flichtenheld Gerrit-MessageType: newchange --4ZwvbtI0oJw= 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 dco_win and multisocket interaction

Change-Id: I71= 9b1aa2d2f4d63dc9c18d8e313fba339e3e4b0c
Signed-off-by: Gianmarco De Grego= ri <gianmarco@...2726...>
---
M src/openvpn/multi_io.c
1 fil= e changed, 8 insertions(+), 5 deletions(-)

git pull ssh://gerrit.=
openvpn.net:29418/openvpn refs/changes/35/935/1
diff --git a/src/op=
envpn/multi_io.c b/src/openvpn/multi_io.c
index f1751ff..f2= f40b0 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++)
- socket_set_lis= ten_persistent(m->top.c2.link_sockets[i], m->multi_io->es,<= br>- = &m->top.c2.link_sockets[i]->ev_arg);
+ for (i =3D 0; i < m->top.c= 1.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= _arg);
+ }
}

if (has_udp_in_l= ocal_list(&m->top.options))
@@ -202,7 +205,7 @@
}
#endif
tun_set(m-&= gt;top.c1.tuntap, m->multi_io->es, EVENT_READ, MULTI_IO_TUN, persiste= nt);
-#if defined(TARGE= T_LINUX) || defined(TARGET_FREEBSD)
+#if defined(TARGET_LINUX) || defined(TARGET_FREEBSD) || def= ined(TARGET_WIN32)
dco_event_set(&m->top.c1.tun= tap->dco, m->multi_io->es, MULTI_IO_DCO);
#endif<= /span>

@@ -535,7 +538,7 @@
= multi_io_action(m, mi, TA_INITIAL, false);
= }
}
-#if defined(ENABLE_DCO) && (defined(TAR= GET_LINUX) || defined(TARGET_FREEBSD))
+#if defined(ENABLE_DCO) && (defined(TARGET_LINUX= ) || defined(TARGET_FREEBSD) || defined(TARGET_WIN32))
= /* incoming data on DCO? */
else if (= e->arg =3D=3D MULTI_IO_DCO)
{

To view, visit change 935. To unsubscribe, or for help wr= iting mail filters, visit se= ttings.

<= div itemscope itemprop=3D"action" itemtype=3D"http://schema.org/ViewAction"= >
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I719b1aa2d2f4d63dc9c18d8e313= fba339e3e4b0c
Gerrit-Change-Number: 935
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
--4ZwvbtI0oJw=--