From 84d7d744e21844ca2e0ddcd92cc94446887c0626 Mon Sep 17 00:00:00 2001 From: ANR2ME Date: Tue, 6 Apr 2021 04:00:55 +0700 Subject: [PATCH 1/4] Added warning log for testing purpose on GetIPList function --- Common/Net/Resolve.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Common/Net/Resolve.cpp b/Common/Net/Resolve.cpp index 37fde61481..0a0fda0525 100644 --- a/Common/Net/Resolve.cpp +++ b/Common/Net/Resolve.cpp @@ -107,6 +107,7 @@ void DNSResolveFree(addrinfo *res) bool GetIPList(std::vector &IP4s) { char ipstr[INET6_ADDRSTRLEN]; // We use IPv6 length since it's longer than IPv4 #if defined(getifaddrs) // On Android: Requires __ANDROID_API__ >= 24 + WARN_LOG(SCENET, "GetIPList from defined(getifaddrs)"); struct ifaddrs* ifAddrStruct = NULL; struct ifaddrs* ifa = NULL; @@ -134,6 +135,7 @@ bool GetIPList(std::vector &IP4s) { return true; } #elif defined(SIOCGIFCONF) // Better detection on Linux/UNIX/MacOS/some Android + WARN_LOG(SCENET, "GetIPList from defined(SIOCGIFCONF)"); #include static struct ifreq ifreqs[32]; struct ifconf ifconf; @@ -166,6 +168,7 @@ bool GetIPList(std::vector &IP4s) { close(sd); return true; #else // Fallback to POSIX/Cross-platform way but may not works well on Linux (ie. only shows 127.0.0.1) + WARN_LOG(SCENET, "GetIPList from Fallback"); struct addrinfo hints, * res, * p; memset(&hints, 0, sizeof hints); hints.ai_family = AF_UNSPEC; // AF_INET or AF_INET6 to force version From ce32d14a844d49a36db314d0855a3a34121c919b Mon Sep 17 00:00:00 2001 From: ANR2ME Date: Wed, 7 Apr 2021 03:09:20 +0700 Subject: [PATCH 2/4] Added additional includes for GetIPList to work on Linux/Unix --- Common/Net/Resolve.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Common/Net/Resolve.cpp b/Common/Net/Resolve.cpp index 0a0fda0525..8edb249acf 100644 --- a/Common/Net/Resolve.cpp +++ b/Common/Net/Resolve.cpp @@ -17,10 +17,13 @@ #undef min #undef max #else +#include +#include +#include #include #include #include -#include +#include #include #endif @@ -136,7 +139,6 @@ bool GetIPList(std::vector &IP4s) { } #elif defined(SIOCGIFCONF) // Better detection on Linux/UNIX/MacOS/some Android WARN_LOG(SCENET, "GetIPList from defined(SIOCGIFCONF)"); -#include static struct ifreq ifreqs[32]; struct ifconf ifconf; memset(&ifconf, 0, sizeof(ifconf)); From 81616f84a39f81c7ef6981cff7e132e3954a3d09 Mon Sep 17 00:00:00 2001 From: ANR2ME Date: Mon, 12 Apr 2021 18:39:02 +0700 Subject: [PATCH 3/4] Changing warning log to info log on GetIPList --- Common/Net/Resolve.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Common/Net/Resolve.cpp b/Common/Net/Resolve.cpp index 8edb249acf..88092748d0 100644 --- a/Common/Net/Resolve.cpp +++ b/Common/Net/Resolve.cpp @@ -110,7 +110,7 @@ void DNSResolveFree(addrinfo *res) bool GetIPList(std::vector &IP4s) { char ipstr[INET6_ADDRSTRLEN]; // We use IPv6 length since it's longer than IPv4 #if defined(getifaddrs) // On Android: Requires __ANDROID_API__ >= 24 - WARN_LOG(SCENET, "GetIPList from defined(getifaddrs)"); + INFO_LOG(SCENET, "GetIPList from getifaddrs"); struct ifaddrs* ifAddrStruct = NULL; struct ifaddrs* ifa = NULL; @@ -138,7 +138,7 @@ bool GetIPList(std::vector &IP4s) { return true; } #elif defined(SIOCGIFCONF) // Better detection on Linux/UNIX/MacOS/some Android - WARN_LOG(SCENET, "GetIPList from defined(SIOCGIFCONF)"); + INFO_LOG(SCENET, "GetIPList from SIOCGIFCONF"); static struct ifreq ifreqs[32]; struct ifconf ifconf; memset(&ifconf, 0, sizeof(ifconf)); @@ -170,7 +170,7 @@ bool GetIPList(std::vector &IP4s) { close(sd); return true; #else // Fallback to POSIX/Cross-platform way but may not works well on Linux (ie. only shows 127.0.0.1) - WARN_LOG(SCENET, "GetIPList from Fallback"); + INFO_LOG(SCENET, "GetIPList from Fallback"); struct addrinfo hints, * res, * p; memset(&hints, 0, sizeof hints); hints.ai_family = AF_UNSPEC; // AF_INET or AF_INET6 to force version From 0fd1b65a78fa0b803eb9c5ec8245848d21e99177 Mon Sep 17 00:00:00 2001 From: ANR2ME Date: Mon, 12 Apr 2021 18:39:53 +0700 Subject: [PATCH 4/4] An attempt to detects getifaddrs availability properly --- Common/Net/Resolve.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/Net/Resolve.cpp b/Common/Net/Resolve.cpp index 88092748d0..f0c633de67 100644 --- a/Common/Net/Resolve.cpp +++ b/Common/Net/Resolve.cpp @@ -109,7 +109,7 @@ void DNSResolveFree(addrinfo *res) bool GetIPList(std::vector &IP4s) { char ipstr[INET6_ADDRSTRLEN]; // We use IPv6 length since it's longer than IPv4 -#if defined(getifaddrs) // On Android: Requires __ANDROID_API__ >= 24 +#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3) || (__ANDROID_API__ >= 24) // getifaddrs first appeared in glibc 2.3, On Android officially supported since __ANDROID_API__ >= 24 INFO_LOG(SCENET, "GetIPList from getifaddrs"); struct ifaddrs* ifAddrStruct = NULL; struct ifaddrs* ifa = NULL;