improve to check ifaddrs for linux

tboox · Jan 24, 2024 · cb91a14 · cb91a14
1 parent cf97d35
commit cb91a14
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/src/tbox/platform/ifaddrs.c b/src/tbox/platform/ifaddrs.c
@@ -72,12 +72,12 @@ static tb_ifaddrs_interface_ref_t tb_ifaddrs_interface_find(tb_iterator_ref_t it
 #ifdef TB_CONFIG_OS_WINDOWS
 #   include "windows/ifaddrs.c"
 #elif defined(TB_CONFIG_POSIX_HAVE_GETIFADDRS) && !defined(TB_CONFIG_OS_WEB)
-#   if defined(TB_CONFIG_OS_LINUX) || defined(TB_CONFIG_OS_ANDROID)
+#   if defined(TB_CONFIG_LINUX_HAVE_IFADDRS) || defined(TB_CONFIG_OS_ANDROID)
 #       include "linux/ifaddrs.c"
 #   else
 #       include "posix/ifaddrs.c"
 #   endif
-#elif defined(TB_CONFIG_OS_LINUX) || defined(TB_CONFIG_OS_ANDROID)
+#elif defined(TB_CONFIG_LINUX_HAVE_IFADDRS) || defined(TB_CONFIG_OS_ANDROID)
 #   include "linux/ifaddrs2.c"
 #else
 tb_ifaddrs_ref_t tb_ifaddrs_init()

diff --git a/src/tbox/tbox.config.h.in b/src/tbox/tbox.config.h.in
@@ -232,6 +232,7 @@ ${define TB_CONFIG_SYSTEMV_HAVE_SEMTIMEDOP}
 
 // linux functions
 ${define TB_CONFIG_LINUX_HAVE_INOTIFY_INIT}
+${define TB_CONFIG_LINUX_HAVE_IFADDRS}
 
 // valgrind functions
 ${define TB_CONFIG_VALGRIND_HAVE_VALGRIND_STACK_REGISTER}

diff --git a/src/xmake.sh b/src/xmake.sh
@@ -279,6 +279,9 @@ check_interfaces() {
 
     # add the interfaces for linux
     check_module_cfuncs "linux" "sys/inotify.h" "inotify_init"
+    check_module_csnippets "linux_ifaddrs" "TB_CONFIG_LINUX_HAVE_IFADDRS" \
+        "#include <linux/if.h>\n
+         #include <linux/netlink.h>"
 
     # add the interfaces for sigsetjmp
     check_module_csnippets "libc_sigsetjmp" "TB_CONFIG_LIBC_HAVE_SIGSETJMP" \

diff --git a/xmake/check_interfaces.lua b/xmake/check_interfaces.lua
@@ -270,6 +270,7 @@ function _check_interfaces(target)
     -- add the interfaces for linux
     if target:is_plat("linux", "android") then
         _check_module_cfuncs(target, "linux", {"sys/inotify.h"}, "inotify_init")
+        _check_keyword_csnippet(target, "linux_ifaddrs", "TB_CONFIG_LINUX_HAVE_IFADDRS", "#include <linux/if.h>\n#include <linux/netlink.h>")
     end
 
     -- add the interfaces for valgrind