From: "cron2 (Code Review)" Date: Mon, 28 Jul 2025 08:10:20 +0000 References: Reply-To: gert@...1296..., 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="HDD0hRGBf78="; 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 --HDD0hRGBf78= 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/+/1117?usp=3Demail to review the following change. Change subject: multi.c get rid of #ifdef surrounding DCO float notificatio= ns ...................................................................... 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/1 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: 1 Gerrit-Owner: cron2 Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: flichtenheld Gerrit-MessageType: newchange --HDD0hRGBf78= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld, plaisthos.

cron2 would like plaisthos and flichtenheld to review t= his change.

V= iew Change

multi.c get rid of #ifdef surrounding DCO float notification=
s

With commit b66b80b2a all three platforms with DCO support have DC= O float
notifications now, so the #ifdef inside multi_process_incoming_d= co() is
no longer needed.

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

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/17=
/1117/1
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 @@
{
proce= ss_incoming_del_peer(m, mi, dco);
}
-#if defined(TARGET_LINUX) || defined= (TARGET_WIN32) || defined(TARGET_FREEBSD)

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(TAR= GET_LINUX) || defined(TARGET_WIN32) */
else if (dc= o->dco_message_type =3D=3D OVPN_CMD_SWAP_KEYS)
= {
tls_session_soft_reset(mi->context.c2.tls= _multi);

To view, visit change 1117. To uns= ubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6977d23b5289eba5db436608e05= 00216e0e689ec
Gerrit-Change-Number: 1117
Gerrit-PatchSet: 1
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: newchange
--HDD0hRGBf78=--