From: "cron2 (Code Review)" Date: Mon, 28 Jul 2025 08:12:40 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <0e16f44919f5a92723d8fbd08643be3691c01418-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="+zEVt10TkJI="; charset=UTF-8 Subject: [Openvpn-devel] [XS] Change in openvpn[master]: multi.c: get rid of #ifdef surrounding DCO float notifications List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos , flichtenheld Cc: openvpn-devel --+zEVt10TkJI= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld, plaisthos. Hello flichtenheld, plaisthos, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/1117?usp=3Demail to look at the new patch set (#2). Change subject: multi.c: get rid of #ifdef surrounding DCO float notificati= ons ...................................................................... multi.c: get rid of #ifdef surrounding DCO float notifications With commit b66b80b2a all three platforms with DCO support have DCO float notifications now, so the #ifdef inside multi_process_incoming_dco() is no longer needed. Change-Id: I6977d23b5289eba5db436608e0500216e0e689ec Signed-off-by: Gert Doering --- M src/openvpn/multi.c 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/17/1117/2 diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 49f5320..3a25a70 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -3409,7 +3409,6 @@ { process_incoming_del_peer(m, mi, dco); } -#if defined(TARGET_LINUX) || defined(TARGET_WIN32) || defined(TARGET_FREEB= SD) else if (dco->dco_message_type =3D=3D OVPN_CMD_FLOAT_PEER) { ASSERT(mi->context.c2.link_sockets[0]); @@ -3419,7 +3418,6 @@ multi_process_float(m, mi, mi->context.c2.link_sockets[0]); CLEAR(dco->dco_float_peer_ss); } -#endif /* if defined(TARGET_LINUX) || defined(TARGET_WIN32) */ else if (dco->dco_message_type =3D=3D OVPN_CMD_SWAP_KEYS) { tls_session_soft_reset(mi->context.c2.tls_multi); -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1117?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: I6977d23b5289eba5db436608e0500216e0e689ec Gerrit-Change-Number: 1117 Gerrit-PatchSet: 2 Gerrit-Owner: cron2 Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: flichtenheld Gerrit-MessageType: newpatchset --+zEVt10TkJI= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld, plaisthos.

cron2 uploaded patch set #2 to this change.

View Change

multi.c: get rid of #ifdef surrounding DCO float notifications

Wi= th commit b66b80b2a all three platforms with DCO support have DCO float
= notifications now, so the #ifdef inside multi_process_incoming_dco() is
= no longer needed.

Change-Id: I6977d23b5289eba5db436608e0500216e0e689= ec
Signed-off-by: Gert Doering <gert@...1296...>
---
M src/o= penvpn/multi.c
1 file changed, 0 insertions(+), 2 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/17/1117/2
<=
span>diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
index 49f5320..3a25a70 100644
--- a/src/openvpn/multi.c
+++ b/src/openvpn/multi.c
@@ -3409,7 +3409,6 = @@
{
process_incoming= _del_peer(m, mi, dco);
}
-#if defined(TARGET_LINUX) || defined(TARGET_WIN= 32) || defined(TARGET_FREEBSD)
else if (dco->dc= o_message_type =3D=3D OVPN_CMD_FLOAT_PEER)
{

ASSERT(mi->context.c2.link_sockets[0]);@@ -3419,7 +3418,6 @@
multi_process_fl= oat(m, mi, mi->context.c2.link_sockets[0]);
= CLEAR(dco->dco_float_peer_ss);
}
-#endif /* if defined(TARGET_LINUX) = || defined(TARGET_WIN32) */
else if (dco->dco_m= essage_type =3D=3D OVPN_CMD_SWAP_KEYS)
{ tls_session_soft_reset(mi->context.c2.tls_multi);

To view, visit change 1117. To unsubscribe, o= r for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6977d23b5289eba5db436608e05= 00216e0e689ec
Gerrit-Change-Number: 1117
Gerrit-PatchSet: 2
Gerrit-Owner: 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: flichtenheld <frank@...2375...= 41...>
Gerrit-MessageType: newpatchset
--+zEVt10TkJI=--