From: "ordex (Code Review)"
Date: Wed, 23 Jul 2025 21:55:04 +0000
In-Reply-To:
References:
Reply-To: antonio@...2726..., arne-openvpn@...1227...,
openvpn-devel@lists.sourceforge.net, frank@...2641...,
gert@...1296...
Message-ID:
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Disposition: inline
Content-Type: multipart/alternative; boundary="SZDyMtYU9qI="; charset=UTF-8
Subject: [Openvpn-devel] [M] Change in openvpn[master]: dco_linux: fix async
message reception
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
Cc: plaisthos , flichtenheld , openvpn-devel
--SZDyMtYU9qI=
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: cron2, flichtenheld, plaisthos.
ordex has posted comments on this change. ( http://gerrit.openvpn.net/c/ope=
nvpn/+/1100?usp=3Demail )
Change subject: dco_linux: fix async message reception
......................................................................
Patch Set 4:
(6 comments)
File src/openvpn/dco_linux.c:
http://gerrit.openvpn.net/c/openvpn/+/1100/comment/b17821a3_854b55f6 :
PS4, Line 170: * Send a prepared netlink message and registers cb as callb=
ack if non-null.
> this comment needs changing, though... [=E2=80=A6]
Acknowledged
http://gerrit.openvpn.net/c/openvpn/+/1100/comment/6d73e782_65951dfb :
PS4, Line 903: msg(M_WARN, "%s: no peer-id provided in reply", __fu=
nc__);
> maybe change the "reply" to "whatever this message type is", similar to t=
he other "no peer-id provid [=E2=80=A6]
the difference is that here we print the function name, so the context is o=
bvious. In the other messages we only have the "ovpn-dco" prefix (because t=
hat code was all embedded in ovpn_handle_msg() before this patch).
I think it makes sense to follow your suggestion, but I will also switch to=
the "ovpn-dco:" prefix
http://gerrit.openvpn.net/c/openvpn/+/1100/comment/69bbc8ae_718dd631 :
PS4, Line 938: msg(M_WARN, "%s: no peer-id provided in reply", __fu=
nc__);
> as well
Acknowledged
http://gerrit.openvpn.net/c/openvpn/+/1100/comment/c0bbb1b8_731eaf6c :
PS4, Line 951: struct multi_instance *mi =3D dco->c->multi->instanc=
es[peer_id];
> how can we ever end here?
check_timeout() for --inactive. In that code path we sadly check each peer =
one by one and thus we call PEER_GET on each specific peer one by one.
http://gerrit.openvpn.net/c/openvpn/+/1100/comment/25f2c886_37016329 :
PS4, Line 1182: if (nlh->nlmsg_flags & NLM_F_MULTI)
> I'm not sure I understand this. [=E2=80=A6]
hehe!
Check: https://elixir.bootlin.com/linux/v6.16-rc6/source/include/uapi/linux=
/netlink.h#L63
This flag means this message is part of a set of messages, together forming=
the actual reply.
We get this kind of reply when we issue a PEER_GET with no specific peer-id.
Which is what the P2MP code does to fetch the stats.
P2P will never call this because it always query its one specific peer.
http://gerrit.openvpn.net/c/openvpn/+/1100/comment/131162e2_128a7d4a :
PS4, Line 1189: }
> I do wonder if this `if()` shouldn't just look at p->mode? Since `multi`=
does not want to deal with [=E2=80=A6]
as mentioned above, MODE_MP may still need to call ovpn_handle_peer()
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1100?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: I23ad79e14844aefde9ece34dadef0b75ff267201
Gerrit-Change-Number: 1100
Gerrit-PatchSet: 4
Gerrit-Owner: ordex
Gerrit-Reviewer: cron2
Gerrit-Reviewer: flichtenheld
Gerrit-Reviewer: plaisthos
Gerrit-CC: openvpn-devel
Gerrit-Attention: plaisthos
Gerrit-Attention: cron2
Gerrit-Attention: flichtenheld
Gerrit-Comment-Date: Wed, 23 Jul 2025 21:55:04 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: cron2
Gerrit-MessageType: comment
--SZDyMtYU9qI=
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: cron2, flichtenheld, plaisthos. <=
/p>
View =
Change
6 comments:
File src/openvpn/dco_linux.c:
<=
ul style=3D"list-style: none; padding: 0;">Patch Set #4, Line 170=
: * Send a prepared ne=
tlink message and registers cb as callback if non-null.
this comment needs changing, though... [=E2=80=A6]
Acknowledged
=
Patch Set #4, Line 903: msg(M_WARN, "%s: no peer-id provided in reply"=
, __func__);
maybe change the "reply" to &q=
uot;whatever this message type is", similar to the other "no peer=
-id provid [=E2=80=A6]
the difference is that here we print the function na=
me, so the context is obvious. In the other messages we only have the "=
;ovpn-dco" prefix (because that code was all embedded in ovpn_handle_m=
sg() before this patch).
I think it makes sense to follow your suggestion, but I will al=
so switch to the "ovpn-dco:" prefix
Patch Set #=
4, Line 938: ms=
g(M_WARN, "%s: no peer-id provided in reply", __func__);=
p>
as well
Acknowledged
Patch Set #4, Line 951=
: struct multi_=
instance *mi =3D dco->c->multi->instances[peer_id];
<=
blockquote style=3D"border-left: 1px solid #aaa; margin: 10px 0; padding: 0=
10px;">how can we ever end here?
check_timeout() for --inactive. In that c=
ode path we sadly check each peer one by one and thus we call PEER_GET on e=
ach specific peer one by one.
Patch Set #4, Line 1182: if (nlh->n=
lmsg_flags & NLM_F_MULTI)
I'm not sure I unde=
rstand this. [=E2=80=A6]
hehe!
Check: https://elixir.bootlin.com/linux/v=
6.16-rc6/source/include/uapi/linux/netlink.h#L63
This flag means this message is part of=
a set of messages, together forming the actual reply.
We get this kind =
of reply when we issue a PEER_GET with no specific peer-id.
Which is wha=
t the P2MP code does to fetch the stats.
P2P will never call this because it always quer=
y its one specific peer.
Patch Set #4, Line 1189: }
I do wonder if this `if()` shouldn't just look at p->mode? Si=
nce `multi` does not want to deal with [=E2=80=A6]
as mentioned above, MODE=
_MP may still need to call ovpn_handle_peer()
To =
view, visit change 1100. To unsubscribe, or for help writing mail filters, visi=
t settings.
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I23ad79e14844aefde9ece34dade=
f0b75ff267201
Gerrit-Change-Number: 1100
Gerrit-PatchSet: 4
Gerrit-Owner: ordex <antonio@...2726...>=
Gerrit-Reviewer: cron2 <gert@...1296...>=
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: cron2 <gert@...1296...>=
;
Gerrit-Attention: flichtenheld <frank@...2375...=
41...>
Gerrit-Comment-Date: Wed, 23 Jul 2025 21:55:04=
+0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: cron2 <gert@...1296...=
>
Gerrit-MessageType: comment
--SZDyMtYU9qI=--