Merge branch 'maint'

erlang · Jul 23, 2024 · 64fcd87 · 64fcd87
2 parents 9ff030b + 2d11368
commit 64fcd87
Show file tree

Hide file tree

Showing 17 changed files with 1,687 additions and 315 deletions.
diff --git a/erts/config.h.in b/erts/config.h.in
@@ -93,6 +93,9 @@
 /* Socket address dl length */
 #undef ESOCK_SDL_LEN
 
+/* Interface hwaddr supported */
+#undef ESOCK_USE_ENADDR
+
 /* Use extended error info */
 #undef ESOCK_USE_EXTENDED_ERROR_INFO
 

diff --git a/erts/configure b/erts/configure
@@ -16659,6 +16659,23 @@ printf "%s\n" "#define ESOCK_USE_HWADDR /**/" >>confdefs.h
 fi
 
 
+ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_enaddr" "ac_cv_member_struct_ifreq_ifr_enaddr" "#ifdef __WIN32__
+	 #else
+	 #include <net/if.h>
+	 #endif
+
+"
+if test "x$ac_cv_member_struct_ifreq_ifr_enaddr" = xyes
+then :
+
+printf "%s\n" "#define HAVE_STRUCT_IFREQ_IFR_ENADDR 1" >>confdefs.h
+
+
+printf "%s\n" "#define ESOCK_USE_ENADDR /**/" >>confdefs.h
+
+fi
+
+
 ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_ifindex" "ac_cv_member_struct_ifreq_ifr_ifindex" "#ifdef __WIN32__
 	 #else
 	 #include <net/if.h>

diff --git a/erts/configure.ac b/erts/configure.ac
@@ -1446,6 +1446,15 @@ AC_CHECK_MEMBERS([struct ifreq.ifr_hwaddr],
 	 #endif
 	])
 
+AC_CHECK_MEMBERS([struct ifreq.ifr_enaddr],
+        [AC_DEFINE(ESOCK_USE_ENADDR, [], [Interface hwaddr supported])],
+	[],
+	[#ifdef __WIN32__
+	 #else
+	 #include <net/if.h>
+	 #endif
+	])
+
 AC_CHECK_MEMBERS([struct ifreq.ifr_ifindex],
         [AC_DEFINE(ESOCK_USE_IFINDEX, [], [Interface ifindex supported])],
 	[],