@@ -848,6 +848,15 @@ 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 <net/if_ovpn.h>

+					]]

+				)

 			fi

 			;;

 		*-mingw*)

@@ -72,6 +72,63 @@ 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)

+{

+    if (!nvlist_exists_number(nvl, "af"))

+    {

+        return (false);

+    }

+    if (!nvlist_exists_binary(nvl, "address"))

+    {

+        return (false);

+    }

+    if (!nvlist_exists_number(nvl, "port"))

+    {

+        return (false);

+    }

+

+    ss->ss_family = nvlist_get_number(nvl, "af");

+

+    switch (ss->ss_family)

+    {

+        case AF_INET:

+        {

+            struct sockaddr_in *in = (struct sockaddr_in *)ss;

+            const void *data;

+            size_t len;

+

+            in->sin_len = sizeof(*in);

+            data = nvlist_get_binary(nvl, "address", &len);

+            assert(len == sizeof(in->sin_addr));

+            memcpy(&in->sin_addr, data, sizeof(in->sin_addr));

+            in->sin_port = nvlist_get_number(nvl, "port");

+            break;

+        }

+

+        case AF_INET6:

+        {

+            struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)ss;

+            const void *data;

+            size_t len;

+

+            in6->sin6_len = sizeof(*in6);

+            data = nvlist_get_binary(nvl, "address", &len);

+            assert(len == sizeof(in6->sin6_addr));

+            memcpy(&in6->sin6_addr, data, sizeof(in6->sin6_addr));

+            in6->sin6_port = nvlist_get_number(nvl, "port");

+            break;

+        }

+

+        default:

+            return (false);

+    }

+

+    return (true);

+}

+#endif /* ifdef ENABLE_DCO_FLOAT_FREEBSD */

+

 int

 dco_new_peer(dco_context_t *dco, unsigned int peerid, int sd,

              struct sockaddr *localaddr, struct sockaddr *remoteaddr,

@@ -573,6 +630,27 @@ 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;

+

+            if (!nvlist_exists_nvlist(nvl, "address"))

+            {

+                msg(M_WARN, "Float notification without address");

+                break;

+            }

+

+            address = nvlist_get_nvlist(nvl, "address");

+            if (!nvlist_to_sockaddr(address, &dco->dco_float_peer_ss))

+            {

+                msg(M_WARN, "Failed to parse float notification");

+                break;

+            }

+            dco->dco_message_type = OVPN_CMD_FLOAT_PEER;

+            break;

+        }

+#endif

+

         default:

             msg(M_WARN, "Unknown kernel notification %d", type);

             break;

@@ -36,6 +36,7 @@ enum ovpn_message_type_t {

     OVPN_CMD_DEL_PEER,

     OVPN_CMD_PACKET,

     OVPN_CMD_SWAP_KEYS,

+    OVPN_CMD_FLOAT_PEER,

 };

 enum ovpn_del_reason_t {

@@ -55,6 +56,7 @@ typedef struct dco_context {

     int dco_message_type;

     int dco_message_peer_id;

     int dco_del_peer_reason;

+    struct sockaddr_storage dco_float_peer_ss;

     uint64_t dco_read_bytes;

     uint64_t dco_write_bytes;

@@ -3409,7 +3409,7 @@ multi_process_incoming_dco(struct multi_context *m)

         {

             process_incoming_del_peer(m, mi, dco);

         }

-#if defined(TARGET_LINUX) || defined(TARGET_WIN32)

+#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]);

@@ -37,6 +37,7 @@

 enum ovpn_notif_type {

     OVPN_NOTIF_DEL_PEER,

     OVPN_NOTIF_ROTATE_KEY,

+    OVPN_NOTIF_FLOAT,

 };

 enum ovpn_del_reason {