From b672c4ce7f8cfbb8a0c3e8f10cea5a58fdd19073 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Tue, 27 Jan 2015 20:45:51 +0800
Subject: [PATCH] Fix an issue on Android

http://androidxref.com/5.0.0_r2/xref/bionic/libc/include/netdb.h#164
http://androidxref.com/5.0.0_r2/xref/bionic/libc/dns/net/getaddrinfo.c#627
---
 src/server.c   |  2 +-
 src/udprelay.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/server.c b/src/server.c
index 376d90b1..64e772bb 100644
--- a/src/server.c
+++ b/src/server.c
@@ -171,7 +171,7 @@ int create_and_bind(const char *host, const char *port)
     memset(&hints, 0, sizeof(struct addrinfo));
     hints.ai_family = AF_UNSPEC;                                        /* Return IPv4 and IPv6 choices */
     hints.ai_socktype = SOCK_STREAM;                                    /* We want a TCP socket */
-    hints.ai_flags = AI_ALL | AI_V4MAPPED | AI_PASSIVE | AI_ADDRCONFIG; /* For wildcard IP address */
+    hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG; /* For wildcard IP address */
     hints.ai_protocol = IPPROTO_TCP;
 
     s = getaddrinfo(host, port, &hints, &result);
diff --git a/src/udprelay.c b/src/udprelay.c
index 98763b82..33cfe64f 100644
--- a/src/udprelay.c
+++ b/src/udprelay.c
@@ -319,9 +319,9 @@ int create_server_socket(const char *host, const char *port)
     memset(&hints, 0, sizeof(struct addrinfo));
     hints.ai_family = AF_UNSPEC;    /* Return IPv4 and IPv6 choices */
     hints.ai_socktype = SOCK_DGRAM; /* We want a UDP socket */
-    hints.ai_flags = AI_ALL | AI_V4MAPPED | AI_PASSIVE | AI_ADDRCONFIG; /* For wildcard IP address */
+    hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG; /* For wildcard IP address */
     hints.ai_protocol = IPPROTO_UDP;
-	
+
     s = getaddrinfo(host, port, &hints, &result);
     if (s != 0) {
         LOGE("[udp] getaddrinfo: %s", gai_strerror(s));
@@ -349,7 +349,7 @@ int create_server_socket(const char *host, const char *port)
             ipv4v6bindall = ipv4v6bindall->ai_next; /* Get next address info, if any */
         }
     }
-	
+
     for (/*rp = result*/; rp != NULL; rp = rp->ai_next) {
         server_sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
         if (server_sock == -1) {
@@ -357,7 +357,7 @@ int create_server_socket(const char *host, const char *port)
         }
 
         int opt = 1;
-		
+
         if (rp->ai_family == AF_INET6) {
             int ipv6only = 0;
             if (host) {
@@ -365,7 +365,7 @@ int create_server_socket(const char *host, const char *port)
             }
             setsockopt(server_sock, IPPROTO_IPV6, IPV6_V6ONLY, &ipv6only, sizeof(ipv6only));
         }
-		
+
         setsockopt(server_sock, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt));
 #ifdef SO_NOSIGPIPE
         set_nosigpipe(server_sock);