posix IPv6: BSD platforms us netinet6/in6.h

nanomsg · Dec 22, 2024 · ec709cc · ec709cc
1 parent ebcd44e
commit ec709cc
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 0 deletions.
diff --git a/src/platform/posix/CMakeLists.txt b/src/platform/posix/CMakeLists.txt
@@ -71,6 +71,7 @@ if (NNG_PLATFORM_POSIX)
     nng_check_sym(atomic_flag_test_and_set stdatomic.h NNG_HAVE_STDATOMIC)
     nng_check_sym(socketpair sys/socket.h NNG_HAVE_SOCKETPAIR)
     nng_check_sym(AF_INET6 netinet/in.h NNG_HAVE_INET6)
+    nng_check_sym(AF_INET6 netinet6/in6.h NNG_HAVE_INET6_BSD)
     nng_check_sym(timespec_get time.h NNG_HAVE_TIMESPEC_GET)
     nng_check_sym(getentropy sys/random.h NNG_HAVE_SYS_RANDOM)
 

diff --git a/src/platform/posix/posix_resolv_gai.c b/src/platform/posix/posix_resolv_gai.c
@@ -37,8 +37,13 @@
 #endif
 
 #ifndef NNG_HAVE_INET6
+#ifdef HAVE_NNG_HAVE_INET6_BSD
+#define NNG_HAVE_INET6
+#include <netinet6/in6.h>
+#else
 #undef NNG_ENABLE_IPV6
 #endif
+#endif
 
 static nni_mtx  resolv_mtx  = NNI_MTX_INITIALIZER;
 static nni_cv   resolv_cv   = NNI_CV_INITIALIZER(&resolv_mtx);

diff --git a/src/platform/posix/posix_sockaddr.c b/src/platform/posix/posix_sockaddr.c
@@ -23,8 +23,13 @@
 #include <sys/un.h>
 
 #ifndef NNG_HAVE_INET6
+#ifdef HAVE_NNG_HAVE_INET6_BSD
+#define NNG_HAVE_INET6
+#include <netinet6/in6.h>
+#else
 #undef NNG_ENABLE_IPV6
 #endif
+#endif
 
 size_t
 nni_posix_nn2sockaddr(void *sa, const nni_sockaddr *na)

diff --git a/src/platform/posix/posix_tcpdial.c b/src/platform/posix/posix_tcpdial.c
@@ -24,8 +24,13 @@
 #include "posix_tcp.h"
 
 #ifndef NNG_HAVE_INET6
+#ifdef HAVE_NNG_HAVE_INET6_BSD
+#define NNG_HAVE_INET6
+#include <netinet6/in6.h>
+#else
 #undef NNG_ENABLE_IPV6
 #endif
+#endif
 
 // Dialer stuff.
 int

diff --git a/src/platform/posix/posix_tcplisten.c b/src/platform/posix/posix_tcplisten.c
@@ -28,8 +28,13 @@
 #endif
 
 #ifndef NNG_HAVE_INET6
+#ifdef HAVE_NNG_HAVE_INET6_BSD
+#define NNG_HAVE_INET6
+#include <netinet6/in6.h>
+#else
 #undef NNG_ENABLE_IPV6
 #endif
+#endif
 
 #include "posix_tcp.h"
 

diff --git a/src/platform/posix/posix_udp.c b/src/platform/posix/posix_udp.c
@@ -32,8 +32,13 @@
 #endif
 
 #ifndef NNG_HAVE_INET6
+#ifdef HAVE_NNG_HAVE_INET6_BSD
+#define NNG_HAVE_INET6
+#include <netinet6/in6.h>
+#else
 #undef NNG_ENABLE_IPV6
 #endif
+#endif
 
 // Linux has IPV6_ADD_MEMBERSHIP and IPV6_DROP_MEMBERSHIP
 #ifndef IPV6_JOIN_GROUP