From: Gert Doering Date: Fri, 13 Jan 2023 08:07:45 +0000 (+0100) Subject: Fix OVPN_DEL_PEER_REASON_TRANSPORT_DISCONNECT breakage on FreeBSD+DCO X-Git-Tag: v2.6.0~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=480ad2a84e2983e8a1b61d537cf82da5c5141853;p=thirdparty%2Fopenvpn.git Fix OVPN_DEL_PEER_REASON_TRANSPORT_DISCONNECT breakage on FreeBSD+DCO commit 67c4eebdae introduces a new peer disconnect reason (transport disconnected, aka "TCP session closed") which breaks compilation on FreeBSD - OVPN_DEL_PEER_REASON_TRANSPORT_DISCONNECT not part of the enum in freebsd_dco.h, and no kernel support for TCP anyway. This patch is an intermediate bandaid, making the offending code in multi.c "linux only" while a better solution is discussed. Signed-off-by: Gert Doering Acked-by: Antonio Quartulli Message-Id: <20230113080745.82783-1-gert@greenie.muc.de> URL: https://www.mail-archive.com/search?l=mid&q=20230113080745.82783-1-gert@greenie.muc.de Signed-off-by: Gert Doering (cherry picked from commit cf545d603ecd9fbacc6bd519efaa92d60f944287) --- diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 99123c396..f25590168 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -3244,9 +3244,12 @@ process_incoming_del_peer(struct multi_context *m, struct multi_instance *mi, reason = "ovpn-dco: transport error"; break; +#ifdef TARGET_LINUX + /* FIXME: this is linux-only today and breaks FreeBSD compilation */ case OVPN_DEL_PEER_REASON_TRANSPORT_DISCONNECT: reason = "ovpn-dco: transport disconnected"; break; +#endif case OVPN_DEL_PEER_REASON_USERSPACE: /* We assume that is ourselves. Unfortunately, sometimes these