From 796ad2c55951635382e48ea5b71d13bbb83ebfb1 Mon Sep 17 00:00:00 2001 From: Kristof Provost Date: Tue, 29 Jul 2025 11:39:07 +0200 Subject: [PATCH] dco-freebsd: always enable float notification support If the kernel doesn't support it we'll simply never get the notification. In other words, there's no downside to always enabling this, so let's do that. Signed-off-by: Kristof Provost Message-Id: <20250729093907.37849-1-kprovost@netgate.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32402.html Acked-by: Gert Doering Signed-off-by: Gert Doering --- configure.ac | 9 --------- src/openvpn/dco_freebsd.c | 4 ---- 2 files changed, 13 deletions(-) diff --git a/configure.ac b/configure.ac index 50697b8ec..66cb79b15 100644 --- a/configure.ac +++ b/configure.ac @@ -848,15 +848,6 @@ if test "$enable_dco" != "no"; then else AC_MSG_ERROR([DCO support can't be enabled]) fi - else - AC_CHECK_DECLS( - [OVPN_NOTIF_FLOAT], - [AC_DEFINE([ENABLE_DCO_FLOAT_FREEBSD], [1], [We have DCO float notifications on FreeBSD])], - , - [[ - #include - ]] - ) fi ;; *-mingw*) diff --git a/src/openvpn/dco_freebsd.c b/src/openvpn/dco_freebsd.c index 8add41af8..a1c1fbfec 100644 --- a/src/openvpn/dco_freebsd.c +++ b/src/openvpn/dco_freebsd.c @@ -72,7 +72,6 @@ sockaddr_to_nvlist(const struct sockaddr *sa) return (nvl); } -#ifdef ENABLE_DCO_FLOAT_FREEBSD static bool nvlist_to_sockaddr(const nvlist_t *nvl, struct sockaddr_storage *ss) { @@ -127,7 +126,6 @@ nvlist_to_sockaddr(const nvlist_t *nvl, struct sockaddr_storage *ss) return (true); } -#endif /* ifdef ENABLE_DCO_FLOAT_FREEBSD */ int dco_new_peer(dco_context_t *dco, unsigned int peerid, int sd, @@ -630,7 +628,6 @@ dco_do_read(dco_context_t *dco) dco->dco_message_type = OVPN_CMD_SWAP_KEYS; break; -#ifdef ENABLE_DCO_FLOAT_FREEBSD case OVPN_NOTIF_FLOAT: { const nvlist_t *address; @@ -649,7 +646,6 @@ dco_do_read(dco_context_t *dco) dco->dco_message_type = OVPN_CMD_FLOAT_PEER; break; } -#endif default: msg(M_WARN, "Unknown kernel notification %d", type); -- 2.47.3