patch 9.0.1692: Android not handling AI_V4MAPPED ai_flag

Problem: Android not handling AI_V4MAPPED ai_flag
Solution: don't set AI_V4MAPPED flag when on Android, since
          Android's getaddrinfo returns EAI_BADFLAGS if ai_flags
          contains it

closes: #12613

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: cions <gh.cions@gmail.com>

diff --git a/src/channel.c b/src/channel.c
index 5d45ac6d1436c828a93ecfc36d4daaa51c1b8a84..cdb956e7cfea5f6946876ddf5e73f6396e809343 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -926,7 +926,9 @@ channel_open(
     CLEAR_FIELD(hints);
     hints.ai_family = AF_UNSPEC;
     hints.ai_socktype = SOCK_STREAM;
-# if defined(AI_ADDRCONFIG) && defined(AI_V4MAPPED)
+# if defined(__ANDROID__)
+    hints.ai_flags = AI_ADDRCONFIG;
+# elif defined(AI_ADDRCONFIG) && defined(AI_V4MAPPED)
     hints.ai_flags = AI_ADDRCONFIG | AI_V4MAPPED;
 # endif
     // Set port number manually in order to prevent name resolution services

diff --git a/src/version.c b/src/version.c
index f0ec4bc2d1e59f9c3ada6c0b69e2d9de09cbc063..1c528a30a9cda72c182fdc3f6e3b232ea7cd68e3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1692,
 /**/
     1691,
 /**/