Menu
▾
▴
openvpn-devel
|
From: cron2 (C. Review) <ge...@op...> - 2025-07-28 08:10:28
|
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=email
to review the following change.
Change subject: multi.c get rid of #ifdef surrounding DCO float notifications
......................................................................
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 <ge...@gr...>
---
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_FREEBSD)
else if (dco->dco_message_type == 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 == OVPN_CMD_SWAP_KEYS)
{
tls_session_soft_reset(mi->context.c2.tls_multi);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1117?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6977d23b5289eba5db436608e0500216e0e689ec
Gerrit-Change-Number: 1117
Gerrit-PatchSet: 1
Gerrit-Owner: cron2 <ge...@gr...>
Gerrit-Reviewer: flichtenheld <fr...@li...>
Gerrit-Reviewer: plaisthos <arn...@rf...>
Gerrit-CC: openvpn-devel <ope...@li...>
Gerrit-Attention: plaisthos <arn...@rf...>
Gerrit-Attention: flichtenheld <fr...@li...>
Gerrit-MessageType: newchange
|
|
From: cron2 (C. Review) <ge...@op...> - 2025-07-28 08:12:54
|
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=email
to look at the new patch set (#2).
Change subject: multi.c: get rid of #ifdef surrounding DCO float notifications
......................................................................
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 <ge...@gr...>
---
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_FREEBSD)
else if (dco->dco_message_type == 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 == OVPN_CMD_SWAP_KEYS)
{
tls_session_soft_reset(mi->context.c2.tls_multi);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1117?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6977d23b5289eba5db436608e0500216e0e689ec
Gerrit-Change-Number: 1117
Gerrit-PatchSet: 2
Gerrit-Owner: cron2 <ge...@gr...>
Gerrit-Reviewer: flichtenheld <fr...@li...>
Gerrit-Reviewer: plaisthos <arn...@rf...>
Gerrit-CC: openvpn-devel <ope...@li...>
Gerrit-Attention: plaisthos <arn...@rf...>
Gerrit-Attention: flichtenheld <fr...@li...>
Gerrit-MessageType: newpatchset
|
|
From: cron2 (C. Review) <ge...@op...> - 2025-07-28 08:25:43
|
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=email
to look at the new patch set (#3).
Change subject: mudp.c, multi.c, multi_io.c: get rid of "all three DCO platforms" #ifdefs
......................................................................
mudp.c, multi.c, multi_io.c: get rid of "all three DCO platforms" #ifdefs
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.
Also, the whole notification block (process_incoming_del_peer() and
multi_process_incoming_dco()) was surrounded by an
#ifdef ENABLE_DCO "and all 3 platforms"
which is also not making sense anymore (if we add a fourth DCO platform,
we need to aim for having "all notifications from day 1", at least having
the stubs and defines).
Last not least, the event stuff in mudp.c and multi_io.c had grown the
same construct - and we'll need events for any future DCO platform, too.
So, fix those #ifdef as well, while at it.
Change-Id: I6977d23b5289eba5db436608e0500216e0e689ec
Signed-off-by: Gert Doering <ge...@gr...>
---
M src/openvpn/mudp.c
M src/openvpn/multi.c
M src/openvpn/multi_io.c
3 files changed, 5 insertions(+), 11 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/17/1117/3
diff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.c
index ee8446a..118c954 100644
--- a/src/openvpn/mudp.c
+++ b/src/openvpn/mudp.c
@@ -412,8 +412,7 @@
multi_process_file_closed(m, mpp_flags);
}
#endif
-#if defined(ENABLE_DCO) \
- && (defined(TARGET_LINUX) || defined(TARGET_FREEBSD) || defined(TARGET_WIN32))
+#if defined(ENABLE_DCO)
else if (status & DCO_READ)
{
if (!IS_SIG(&m->top))
diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
index 49f5320..b2d2b6c 100644
--- a/src/openvpn/multi.c
+++ b/src/openvpn/multi.c
@@ -3337,8 +3337,7 @@
}
#endif
-#if defined(ENABLE_DCO) \
- && (defined(TARGET_LINUX) || defined(TARGET_FREEBSD) || defined(TARGET_WIN32))
+#if defined(ENABLE_DCO)
static void
process_incoming_del_peer(struct multi_context *m, struct multi_instance *mi,
dco_context_t *dco)
@@ -3409,7 +3408,6 @@
{
process_incoming_del_peer(m, mi, dco);
}
-#if defined(TARGET_LINUX) || defined(TARGET_WIN32) || defined(TARGET_FREEBSD)
else if (dco->dco_message_type == OVPN_CMD_FLOAT_PEER)
{
ASSERT(mi->context.c2.link_sockets[0]);
@@ -3419,7 +3417,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 == OVPN_CMD_SWAP_KEYS)
{
tls_session_soft_reset(mi->context.c2.tls_multi);
@@ -3452,7 +3449,7 @@
dco->dco_write_bytes = 0;
return ret > 0;
}
-#endif /* if defined(ENABLE_DCO) && defined(TARGET_LINUX) */
+#endif /* if defined(ENABLE_DCO) */
/*
* Process packets in the TCP/UDP socket -> TUN/TAP interface direction,
diff --git a/src/openvpn/multi_io.c b/src/openvpn/multi_io.c
index 4854f4b..102ee2f 100644
--- a/src/openvpn/multi_io.c
+++ b/src/openvpn/multi_io.c
@@ -191,8 +191,7 @@
}
tun_set(m->top.c1.tuntap, m->multi_io->es, EVENT_READ, MULTI_IO_TUN, persistent);
-#if defined(ENABLE_DCO) \
- && (defined(TARGET_LINUX) || defined(TARGET_FREEBSD) || defined(TARGET_WIN32))
+#if defined(ENABLE_DCO)
dco_event_set(&m->top.c1.tuntap->dco, m->multi_io->es, MULTI_IO_DCO);
#endif
@@ -526,8 +525,7 @@
multi_io_action(m, mi, TA_INITIAL, false);
}
}
-#if defined(ENABLE_DCO) \
- && (defined(TARGET_LINUX) || defined(TARGET_FREEBSD) || defined(TARGET_WIN32))
+#if defined(ENABLE_DCO)
/* incoming data on DCO? */
else if (e->arg == MULTI_IO_DCO)
{
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1117?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6977d23b5289eba5db436608e0500216e0e689ec
Gerrit-Change-Number: 1117
Gerrit-PatchSet: 3
Gerrit-Owner: cron2 <ge...@gr...>
Gerrit-Reviewer: flichtenheld <fr...@li...>
Gerrit-Reviewer: plaisthos <arn...@rf...>
Gerrit-CC: openvpn-devel <ope...@li...>
Gerrit-Attention: plaisthos <arn...@rf...>
Gerrit-Attention: flichtenheld <fr...@li...>
Gerrit-MessageType: newpatchset
|
|
From: ordex (C. Review) <ge...@op...> - 2025-07-28 08:38:27
|
Attention is currently required from: cron2, flichtenheld, plaisthos. ordex has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/1117?usp=email ) Change subject: mudp.c, multi.c, multi_io.c: get rid of "all three DCO platforms" #ifdefs ...................................................................... Patch Set 3: Code-Review+2 (1 comment) Patchset: PS3: it makes sense! thanks for cleaning this up. I started at the code and compiled tested it. Now this opens up more clean up options....i.e. moving the ugly defined(ENABLE_DCO) checks somewhere else. but that's for another day. -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1117?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I6977d23b5289eba5db436608e0500216e0e689ec Gerrit-Change-Number: 1117 Gerrit-PatchSet: 3 Gerrit-Owner: cron2 <ge...@gr...> Gerrit-Reviewer: flichtenheld <fr...@li...> Gerrit-Reviewer: ordex <an...@ma...> Gerrit-Reviewer: plaisthos <arn...@rf...> Gerrit-CC: openvpn-devel <ope...@li...> Gerrit-Attention: plaisthos <arn...@rf...> Gerrit-Attention: cron2 <ge...@gr...> Gerrit-Attention: flichtenheld <fr...@li...> Gerrit-Comment-Date: Mon, 28 Jul 2025 08:38:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment |
|
[Openvpn-devel] [PATCH v3] mudp.c, multi.c,
multi_io.c: get rid of "all three DCO platforms" #ifdefs
From: Gert D. <ge...@gr...> - 2025-07-28 08:43:04
|
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. Also, the whole notification block (process_incoming_del_peer() and multi_process_incoming_dco()) was surrounded by an #ifdef ENABLE_DCO "and all 3 platforms" which is also not making sense anymore (if we add a fourth DCO platform, we need to aim for having "all notifications from day 1", at least having the stubs and defines). Last not least, the event stuff in mudp.c and multi_io.c had grown the same construct - and we'll need events for any future DCO platform, too. So, fix those #ifdef as well, while at it. Change-Id: I6977d23b5289eba5db436608e0500216e0e689ec Signed-off-by: Gert Doering <ge...@gr...> Acked-by: Antonio Quartulli <an...@ma...> --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1117 This mail reflects revision 3 of this Change. Acked-by according to Gerrit (reflected above): Antonio Quartulli <an...@ma...> diff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.c index ee8446a..118c954 100644 --- a/src/openvpn/mudp.c +++ b/src/openvpn/mudp.c @@ -412,8 +412,7 @@ multi_process_file_closed(m, mpp_flags); } #endif -#if defined(ENABLE_DCO) \ - && (defined(TARGET_LINUX) || defined(TARGET_FREEBSD) || defined(TARGET_WIN32)) +#if defined(ENABLE_DCO) else if (status & DCO_READ) { if (!IS_SIG(&m->top)) diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 49f5320..b2d2b6c 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -3337,8 +3337,7 @@ } #endif -#if defined(ENABLE_DCO) \ - && (defined(TARGET_LINUX) || defined(TARGET_FREEBSD) || defined(TARGET_WIN32)) +#if defined(ENABLE_DCO) static void process_incoming_del_peer(struct multi_context *m, struct multi_instance *mi, dco_context_t *dco) @@ -3409,7 +3408,6 @@ { process_incoming_del_peer(m, mi, dco); } -#if defined(TARGET_LINUX) || defined(TARGET_WIN32) || defined(TARGET_FREEBSD) else if (dco->dco_message_type == OVPN_CMD_FLOAT_PEER) { ASSERT(mi->context.c2.link_sockets[0]); @@ -3419,7 +3417,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 == OVPN_CMD_SWAP_KEYS) { tls_session_soft_reset(mi->context.c2.tls_multi); @@ -3452,7 +3449,7 @@ dco->dco_write_bytes = 0; return ret > 0; } -#endif /* if defined(ENABLE_DCO) && defined(TARGET_LINUX) */ +#endif /* if defined(ENABLE_DCO) */ /* * Process packets in the TCP/UDP socket -> TUN/TAP interface direction, diff --git a/src/openvpn/multi_io.c b/src/openvpn/multi_io.c index 4854f4b..102ee2f 100644 --- a/src/openvpn/multi_io.c +++ b/src/openvpn/multi_io.c @@ -191,8 +191,7 @@ } tun_set(m->top.c1.tuntap, m->multi_io->es, EVENT_READ, MULTI_IO_TUN, persistent); -#if defined(ENABLE_DCO) \ - && (defined(TARGET_LINUX) || defined(TARGET_FREEBSD) || defined(TARGET_WIN32)) +#if defined(ENABLE_DCO) dco_event_set(&m->top.c1.tuntap->dco, m->multi_io->es, MULTI_IO_DCO); #endif @@ -526,8 +525,7 @@ multi_io_action(m, mi, TA_INITIAL, false); } } -#if defined(ENABLE_DCO) \ - && (defined(TARGET_LINUX) || defined(TARGET_FREEBSD) || defined(TARGET_WIN32)) +#if defined(ENABLE_DCO) /* incoming data on DCO? */ else if (e->arg == MULTI_IO_DCO) { |
|
From: Gert D. <ge...@gr...> - 2025-07-28 10:35:54
|
Just for reference: we saw quite a few build errors in BB, but these are
due to "fedora 42 on arm 64" (only!) being different about <stdint.h>,
which is addressed in gerrit #1118. Unrelated to any recent patch.
Patch has been applied to the master branch.
commit 6d0e38370b62488374a09336652ab415776955fc
Author: Gert Doering
Date: Mon Jul 28 10:42:49 2025 +0200
mudp.c, multi.c, multi_io.c: get rid of 'all three DCO platforms' #ifdefs
Signed-off-by: Gert Doering <ge...@gr...>
Acked-by: Antonio Quartulli <an...@ma...>
Message-Id: <202...@gr...>
URL: https://www.mail-archive.com/ope...@li.../msg32377.html
Signed-off-by: Gert Doering <ge...@gr...>
--
kind regards,
Gert Doering
|
|
From: cron2 (C. Review) <ge...@op...> - 2025-07-28 10:35:56
|
Hello flichtenheld, ordex, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1117?usp=email
to look at the new patch set (#4).
The following approvals got outdated and were removed:
Code-Review+2 by ordex
Change subject: mudp.c, multi.c, multi_io.c: get rid of 'all three DCO platforms' #ifdefs
......................................................................
mudp.c, multi.c, multi_io.c: get rid of 'all three DCO platforms' #ifdefs
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.
Also, the whole notification block (process_incoming_del_peer() and
multi_process_incoming_dco()) was surrounded by an
#ifdef ENABLE_DCO "and all 3 platforms"
which is also not making sense anymore (if we add a fourth DCO platform,
we need to aim for having "all notifications from day 1", at least having
the stubs and defines).
Last not least, the event stuff in mudp.c and multi_io.c had grown the
same construct - and we'll need events for any future DCO platform, too.
So, fix those #ifdef as well, while at it.
Change-Id: I6977d23b5289eba5db436608e0500216e0e689ec
Signed-off-by: Gert Doering <ge...@gr...>
Acked-by: Antonio Quartulli <an...@ma...>
Message-Id: <202...@gr...>
URL: https://www.mail-archive.com/ope...@li.../msg32377.html
Signed-off-by: Gert Doering <ge...@gr...>
---
M src/openvpn/mudp.c
M src/openvpn/multi.c
M src/openvpn/multi_io.c
3 files changed, 5 insertions(+), 11 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/17/1117/4
diff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.c
index ee8446a..118c954 100644
--- a/src/openvpn/mudp.c
+++ b/src/openvpn/mudp.c
@@ -412,8 +412,7 @@
multi_process_file_closed(m, mpp_flags);
}
#endif
-#if defined(ENABLE_DCO) \
- && (defined(TARGET_LINUX) || defined(TARGET_FREEBSD) || defined(TARGET_WIN32))
+#if defined(ENABLE_DCO)
else if (status & DCO_READ)
{
if (!IS_SIG(&m->top))
diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
index 49f5320..b2d2b6c 100644
--- a/src/openvpn/multi.c
+++ b/src/openvpn/multi.c
@@ -3337,8 +3337,7 @@
}
#endif
-#if defined(ENABLE_DCO) \
- && (defined(TARGET_LINUX) || defined(TARGET_FREEBSD) || defined(TARGET_WIN32))
+#if defined(ENABLE_DCO)
static void
process_incoming_del_peer(struct multi_context *m, struct multi_instance *mi,
dco_context_t *dco)
@@ -3409,7 +3408,6 @@
{
process_incoming_del_peer(m, mi, dco);
}
-#if defined(TARGET_LINUX) || defined(TARGET_WIN32) || defined(TARGET_FREEBSD)
else if (dco->dco_message_type == OVPN_CMD_FLOAT_PEER)
{
ASSERT(mi->context.c2.link_sockets[0]);
@@ -3419,7 +3417,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 == OVPN_CMD_SWAP_KEYS)
{
tls_session_soft_reset(mi->context.c2.tls_multi);
@@ -3452,7 +3449,7 @@
dco->dco_write_bytes = 0;
return ret > 0;
}
-#endif /* if defined(ENABLE_DCO) && defined(TARGET_LINUX) */
+#endif /* if defined(ENABLE_DCO) */
/*
* Process packets in the TCP/UDP socket -> TUN/TAP interface direction,
diff --git a/src/openvpn/multi_io.c b/src/openvpn/multi_io.c
index 4854f4b..102ee2f 100644
--- a/src/openvpn/multi_io.c
+++ b/src/openvpn/multi_io.c
@@ -191,8 +191,7 @@
}
tun_set(m->top.c1.tuntap, m->multi_io->es, EVENT_READ, MULTI_IO_TUN, persistent);
-#if defined(ENABLE_DCO) \
- && (defined(TARGET_LINUX) || defined(TARGET_FREEBSD) || defined(TARGET_WIN32))
+#if defined(ENABLE_DCO)
dco_event_set(&m->top.c1.tuntap->dco, m->multi_io->es, MULTI_IO_DCO);
#endif
@@ -526,8 +525,7 @@
multi_io_action(m, mi, TA_INITIAL, false);
}
}
-#if defined(ENABLE_DCO) \
- && (defined(TARGET_LINUX) || defined(TARGET_FREEBSD) || defined(TARGET_WIN32))
+#if defined(ENABLE_DCO)
/* incoming data on DCO? */
else if (e->arg == MULTI_IO_DCO)
{
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1117?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6977d23b5289eba5db436608e0500216e0e689ec
Gerrit-Change-Number: 1117
Gerrit-PatchSet: 4
Gerrit-Owner: cron2 <ge...@gr...>
Gerrit-Reviewer: flichtenheld <fr...@li...>
Gerrit-Reviewer: ordex <an...@ma...>
Gerrit-Reviewer: plaisthos <arn...@rf...>
Gerrit-CC: openvpn-devel <ope...@li...>
Gerrit-MessageType: newpatchset
|
|
From: cron2 (C. Review) <ge...@op...> - 2025-07-28 10:35:55
|
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1117?usp=email ) Change subject: mudp.c, multi.c, multi_io.c: get rid of 'all three DCO platforms' #ifdefs ...................................................................... mudp.c, multi.c, multi_io.c: get rid of 'all three DCO platforms' #ifdefs 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. Also, the whole notification block (process_incoming_del_peer() and multi_process_incoming_dco()) was surrounded by an #ifdef ENABLE_DCO "and all 3 platforms" which is also not making sense anymore (if we add a fourth DCO platform, we need to aim for having "all notifications from day 1", at least having the stubs and defines). Last not least, the event stuff in mudp.c and multi_io.c had grown the same construct - and we'll need events for any future DCO platform, too. So, fix those #ifdef as well, while at it. Change-Id: I6977d23b5289eba5db436608e0500216e0e689ec Signed-off-by: Gert Doering <ge...@gr...> Acked-by: Antonio Quartulli <an...@ma...> Message-Id: <202...@gr...> URL: https://www.mail-archive.com/ope...@li.../msg32377.html Signed-off-by: Gert Doering <ge...@gr...> --- M src/openvpn/mudp.c M src/openvpn/multi.c M src/openvpn/multi_io.c 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.c index ee8446a..118c954 100644 --- a/src/openvpn/mudp.c +++ b/src/openvpn/mudp.c @@ -412,8 +412,7 @@ multi_process_file_closed(m, mpp_flags); } #endif -#if defined(ENABLE_DCO) \ - && (defined(TARGET_LINUX) || defined(TARGET_FREEBSD) || defined(TARGET_WIN32)) +#if defined(ENABLE_DCO) else if (status & DCO_READ) { if (!IS_SIG(&m->top)) diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 49f5320..b2d2b6c 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -3337,8 +3337,7 @@ } #endif -#if defined(ENABLE_DCO) \ - && (defined(TARGET_LINUX) || defined(TARGET_FREEBSD) || defined(TARGET_WIN32)) +#if defined(ENABLE_DCO) static void process_incoming_del_peer(struct multi_context *m, struct multi_instance *mi, dco_context_t *dco) @@ -3409,7 +3408,6 @@ { process_incoming_del_peer(m, mi, dco); } -#if defined(TARGET_LINUX) || defined(TARGET_WIN32) || defined(TARGET_FREEBSD) else if (dco->dco_message_type == OVPN_CMD_FLOAT_PEER) { ASSERT(mi->context.c2.link_sockets[0]); @@ -3419,7 +3417,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 == OVPN_CMD_SWAP_KEYS) { tls_session_soft_reset(mi->context.c2.tls_multi); @@ -3452,7 +3449,7 @@ dco->dco_write_bytes = 0; return ret > 0; } -#endif /* if defined(ENABLE_DCO) && defined(TARGET_LINUX) */ +#endif /* if defined(ENABLE_DCO) */ /* * Process packets in the TCP/UDP socket -> TUN/TAP interface direction, diff --git a/src/openvpn/multi_io.c b/src/openvpn/multi_io.c index 4854f4b..102ee2f 100644 --- a/src/openvpn/multi_io.c +++ b/src/openvpn/multi_io.c @@ -191,8 +191,7 @@ } tun_set(m->top.c1.tuntap, m->multi_io->es, EVENT_READ, MULTI_IO_TUN, persistent); -#if defined(ENABLE_DCO) \ - && (defined(TARGET_LINUX) || defined(TARGET_FREEBSD) || defined(TARGET_WIN32)) +#if defined(ENABLE_DCO) dco_event_set(&m->top.c1.tuntap->dco, m->multi_io->es, MULTI_IO_DCO); #endif @@ -526,8 +525,7 @@ multi_io_action(m, mi, TA_INITIAL, false); } } -#if defined(ENABLE_DCO) \ - && (defined(TARGET_LINUX) || defined(TARGET_FREEBSD) || defined(TARGET_WIN32)) +#if defined(ENABLE_DCO) /* incoming data on DCO? */ else if (e->arg == MULTI_IO_DCO) { -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1117?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I6977d23b5289eba5db436608e0500216e0e689ec Gerrit-Change-Number: 1117 Gerrit-PatchSet: 4 Gerrit-Owner: cron2 <ge...@gr...> Gerrit-Reviewer: flichtenheld <fr...@li...> Gerrit-Reviewer: ordex <an...@ma...> Gerrit-Reviewer: plaisthos <arn...@rf...> Gerrit-CC: openvpn-devel <ope...@li...> Gerrit-MessageType: merged |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X