On 13 Jan 2023, at 20:35, Gert Doering wrote:
On Thu, Jan 12, 2023 at 12:50:52AM +0100, Antonio Quartulli wrote:
diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
index 77dcaa60..99123c39 100644
--- a/src/openvpn/multi.c
+++ b/src/openvpn/multi.c
@@ -3244,6 +3244,10 @@ process_incoming_del_peer(struct multi_context
*m, struct multi_instance *mi,
reason = "ovpn-dco: transport error";
break;
+ case OVPN_DEL_PEER_REASON_TRANSPORT_DISCONNECT:
+ reason = "ovpn-dco: transport disconnected";
+ break;
+
We were too fast in ACKing and merging this "because rc2" - this
breaks
compilation on FreeBSD+DCO, because it only adds the necessary enum
element for Linux.
This being an enum, I can't even add an "#ifdef
...TRANSPORT_DISCONNECT"
here, and because these codes need to be synchronized between kernel
and
userland, I can't "just add it to freebsd_dco.h".
So consider me not very amused...
As a quick bandaid, I'll send a patch that adds an #ifdef TARGET_LINUX
around this clause so I can update the FreeBSD openvpn-devel port -
but
that is not a really good solution either. @kp, what would you
suggest
how to handle this on the FreeBSD side?
I’m happy to add `OVPN_DEL_PEER_REASON_TRANSPORT_DISCONNECT` to the
FreeBSD `enum ovpn_del_reason`. The FreeBSD if_ovpn code won’t ever
send it (because no TCP) but that’s not really a concern. It’ll
build and work just fine.
Going forward we should try to remember this, and coordinate additions
like this.
I’m not sure how we’d cope with supporting building on older
releases though. Not a worry just yet, because FreeBSD main is the only
version with DCO support in it, but it’ll be a problem sooner or
later.
For that I see two paths: either we change the enum (probably both
ovpn_notif_type and ovpn_del_reason) to be defines, so we can `#ifdef
OVPN_DEL_PEER_REASON_TRANSPORT_DISCONNECT`, or we keep the enums and
extend the autoconf code to check for us. That’s the sort of thing
it’s supposed to be for, after all.
Best regards,
Kristof
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
