From: Kristof Provost <k...@freebsd.org>
FreeBSD's if_ovpn will never emit this as a peer deletion reason
(because it doesn't support TCP), but this allows us to align the
defines between Linux and FreeBSD, and remove a Linux-specific case from
process_incoming_del_peer().
---
src/openvpn/dco_freebsd.h | 1 +
src/openvpn/multi.c | 3 ---
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/openvpn/dco_freebsd.h b/src/openvpn/dco_freebsd.h
index 2e35f3ac..970beca0 100644
--- a/src/openvpn/dco_freebsd.h
+++ b/src/openvpn/dco_freebsd.h
@@ -41,6 +41,7 @@ enum ovpn_del_reason_t {
OVPN_DEL_PEER_REASON_EXPIRED,
OVPN_DEL_PEER_REASON_TRANSPORT_ERROR,
OVPN_DEL_PEER_REASON_USERSPACE,
+ OVPN_DEL_PEER_REASON_TRANSPORT_DISCONNECT,
};
typedef struct dco_context {
diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
index f2559016..99123c39 100644
--- a/src/openvpn/multi.c
+++ b/src/openvpn/multi.c
@@ -3244,12 +3244,9 @@ 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
--
2.39.2
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
