From: "its_Giaan (Code Review)" Date: Tue, 21 Apr 2026 15:20:20 +0000 In-Reply-To: References: Reply-To: gianmarco@...2726..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, antonio@...2726... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="E27Zu2wWkLg="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: Multisocket: use event engine rwflags for UDP I/O List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos Cc: openvpn-devel --E27Zu2wWkLg= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: its_Giaan, ordex, plaisthos. Hello ordex, plaisthos, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/1635?usp=3Demail to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review-1 by ordex Change subject: Multisocket: use event engine rwflags for UDP I/O ...................................................................... Multisocket: use event engine rwflags for UDP I/O udp_flags does not guarantee correct association with the socket being processed. Use the rwflags returned by the event engine together with the event to ensure proper per-socket I/O handling. Remove udp_flags entirely. This change is based on an investigation triggered by a report from Joshua Rogers using ZeroPath. Change-Id: I6b303805a3688b6f6363140c76853a58badecd8f Signed-off-by: Gianmarco De Gregori --- M src/openvpn/forward.c M src/openvpn/mudp.c M src/openvpn/mudp.h M src/openvpn/multi_io.c M src/openvpn/multi_io.h 5 files changed, 5 insertions(+), 10 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/35/1635/2 diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c index 27cfd36..3937942 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -2153,7 +2153,6 @@ unsigned int out_socket; multi_io_process_flags(c, multi_io->es, flags, &out_socket, NULL); - multi_io->udp_flags =3D (out_socket << SOCKET_SHIFT); } /* diff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.c index 432c79a..beec57a 100644 --- a/src/openvpn/mudp.c +++ b/src/openvpn/mudp.c @@ -336,18 +336,17 @@ * Process a UDP socket event. */ void -multi_process_io_udp(struct multi_context *m, struct link_socket *sock) +multi_process_io_udp(struct multi_context *m, struct link_socket *sock, un= signed int rwflags) { - const unsigned int status =3D m->multi_io->udp_flags; const unsigned int mpp_flags =3D (MPP_PRE_SELECT | MPP_CLOSE_ON_SIGNAL= ); /* UDP port ready to accept write */ - if (status & SOCKET_WRITE) + if (rwflags & SOCKET_WRITE) { multi_process_outgoing_link(m, mpp_flags); } /* Incoming data on UDP port */ - else if (status & SOCKET_READ) + else if (rwflags & SOCKET_READ) { read_incoming_link(&m->top, sock); if (!IS_SIG(&m->top)) @@ -355,8 +354,6 @@ multi_process_incoming_link(m, NULL, mpp_flags, sock); } } - - m->multi_io->udp_flags =3D ES_ERROR; } /* diff --git a/src/openvpn/mudp.h b/src/openvpn/mudp.h index 005ee10..1417651 100644 --- a/src/openvpn/mudp.h +++ b/src/openvpn/mudp.h @@ -32,7 +32,7 @@ unsigned int p2mp_iow_flags(const struct multi_context *m); -void multi_process_io_udp(struct multi_context *m, struct link_socket *soc= k); +void multi_process_io_udp(struct multi_context *m, struct link_socket *soc= k, unsigned int rwflags); /*************************************************************************= */ /** * Get, and if necessary create, the multi_instance associated with a diff --git a/src/openvpn/multi_io.c b/src/openvpn/multi_io.c index e6f4e9c..f9af800 100644 --- a/src/openvpn/multi_io.c +++ b/src/openvpn/multi_io.c @@ -457,7 +457,7 @@ } else { - multi_process_io_udp(m, ev_arg->u.sock); + multi_process_io_udp(m, ev_arg->u.sock, e->rwflags= ); mi =3D m->pending; } /* monitor and/or handle events that are diff --git a/src/openvpn/multi_io.h b/src/openvpn/multi_io.h index 6b2f59a..d6734bd 100644 --- a/src/openvpn/multi_io.h +++ b/src/openvpn/multi_io.h @@ -55,7 +55,6 @@ int n_esr; int maxevents; unsigned int tun_rwflags; - unsigned int udp_flags; #ifdef ENABLE_MANAGEMENT unsigned int management_persist_flags; #endif -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1635?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: I6b303805a3688b6f6363140c76853a58badecd8f Gerrit-Change-Number: 1635 Gerrit-PatchSet: 2 Gerrit-Owner: its_Giaan Gerrit-Reviewer: ordex Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: its_Giaan Gerrit-Attention: ordex --E27Zu2wWkLg= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is cur= rently required from: its_Giaan, ordex, plaisthos.

its_Giaan uploaded patch set #2 to this change.

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

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

Multisocket: use event engine rwfla=
gs for UDP I/O

udp_flags does not guarantee correct association with= the socket being
processed. Use the rwflags returned by the event engin= e together with the
event to ensure proper per-socket I/O handling.
<= br>Remove udp_flags entirely.

This change is based on an investigati= on triggered by a report from
Joshua Rogers using ZeroPath.

Chang= e-Id: I6b303805a3688b6f6363140c76853a58badecd8f
Signed-off-by: Gianmarco= De Gregori <gianmarco@...2726...>
---
M src/openvpn/forward.c<= br>M src/openvpn/mudp.c
M src/openvpn/mudp.h
M src/openvpn/multi_io.c=
M src/openvpn/multi_io.h
5 files changed, 5 insertions(+), 10 deleti= ons(-)

git pull ssh://gerrit.openvpn.net:29418/o=
penvpn refs/changes/35/1635/2
diff --git a/src/openvpn/forward.c b/=
src/openvpn/forward.c
index 27cfd36..3937942 100644<= br>--- a/src/openvpn/forward.c
+++ b/src/openvpn/forw= ard.c
@@ -2153,7 +2153,6 @@
unsigned i= nt out_socket;

multi_io_process_flag= s(c, multi_io->es, flags, &out_socket, NULL);
- multi_io->udp_flags =3D (out_socket = << SOCKET_SHIFT);
}

/*
diff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.c<= /span>
index 432c79a..beec57a 100644
--- a/src/ope= nvpn/mudp.c
+++ b/src/openvpn/mudp.c
@@ -33= 6,18 +336,17 @@
* Process a UDP socket event.
<= span> */

void
-multi_process_io_udp(struct multi_context *m, struct link_socket = *sock)
+multi_process= _io_udp(struct multi_context *m, struct link_socket *sock, unsigned int rwf= lags)
{
- if (st= atus & SOCKET_WRITE)
+ if (rwflags & SOCKET_WRITE)
{
<= span> multi_process_outgoing_link(m, mpp_flags);
= }
/* Incoming data on UDP port */
- else if (status & SOCKET_READ)<= /span>
+ else if (rwflags= & SOCKET_READ)
{
read_in= coming_link(&m->top, sock);
if (!IS_SIG(&am= p;m->top))
@@ -355,8 +354,6 @@
= multi_process_incoming_link(m, NULL, mpp_flags, sock);
= }
}
-
- m->= ;multi_io->udp_flags =3D ES_ERROR;
}
<= /span>
/*
diff --git a/src/openvpn/mudp.h b/src/o= penvpn/mudp.h
index 005ee10..1417651 100644
--- a/src/openvpn/mudp.h

+++ b/src/openvpn/mudp.h@@ -32,7 +32,7 @@

unsigned int p= 2mp_iow_flags(const struct multi_context *m);

<= span style=3D"color: hsl(0, 100%, 40%);">-void multi_process_io_udp(struct = multi_context *m, struct link_socket *sock);

+void multi_process_io_udp(struct multi_context *m,= struct link_socket *sock, unsigned int rwflags);
/*******= *******************************************************************/=
/**
* Get, and if necessary create, the multi_= instance associated with a
diff --git a/src/openvpn/multi_i= o.c b/src/openvpn/multi_io.c
index e6f4e9c..f9af800 100644<= /span>
--- a/src/openvpn/multi_io.c
+++ b/src/open= vpn/multi_io.c
@@ -457,7 +457,7 @@
= }
else
= {
- = multi_process_io_udp(m, ev_arg->u.sock);+ mult= i_process_io_udp(m, ev_arg->u.sock, e->rwflags);
= mi =3D m->pending;
= }
/* monitor and/or handle events= that are
diff --git a/src/openvpn/multi_io.h b/src/openvpn= /multi_io.h
index 6b2f59a..d6734bd 100644
-= -- a/src/openvpn/multi_io.h
+++ b/src/openvpn/multi_io.h
@@ -55,7 +55,6 @@
int n_esr;
<= span> int maxevents;

unsigned int tun_rwflags;
- unsigned int udp_flag= s;
#ifdef ENABLE_MANAGEMENT
unsigned = int management_persist_flags;
#endif

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

=
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6b303805a3688b6f6363140c768= 53a58badecd8f
Gerrit-Change-Number: 1635
Gerrit-PatchSet: 2
Gerrit-Owner: its_Giaan <gianmarco@...2786...= ..>
Gerrit-Reviewer: ordex <antonio@...2726...&= gt;
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: its_Giaan <gianmarco@...1665...= 726...>
Gerrit-Attention: ordex <antonio@...2726...= >
= --E27Zu2wWkLg=--