Use IPv4 and v6 only when suitable interfaces are configured

Only on systems supporting AI_ADDRCONFIG.

diff --git a/src/client/host.c b/src/client/host.c
index 68df7e21f8d43c71efdfcc105dede145687916d4..6687f71ab4aa9c028b295f613de902438f4d6f9a 100644 (file)
--- a/src/client/host.c
+++ b/src/client/host.c
@@ -52,6 +52,11 @@
 #endif
 #include "misc.h"
 
+/* Portability cruft, should become unnecessary eventually */
+#ifndef AI_ADDRCONFIG
+#define AI_ADDRCONFIG 0
+#endif
+
 #ifdef HAVE_GETADDRINFO
 /*
  * Inspired by example code from W. Richard Stevens: UNIX Network
@@ -65,6 +70,7 @@ tcp_connect(char *host, char *serv)
     struct addrinfo hints, *res, *ressave;
 
     memset(&hints, 0, sizeof(struct addrinfo));
+    hints.ai_flags = AI_ADDRCONFIG;
     hints.ai_family = AF_UNSPEC;
     hints.ai_socktype = SOCK_STREAM;
 

diff --git a/src/lib/gen/tcp_listen.c b/src/lib/gen/tcp_listen.c
index 29c227d3a5040697e6891294cdab2f321ca67c83..fa494c40d2c41ddaa9a0caa136d9f9b864d8d3e0 100644 (file)
--- a/src/lib/gen/tcp_listen.c
+++ b/src/lib/gen/tcp_listen.c
@@ -46,6 +46,11 @@
 #include <unistd.h>
 #include "prototypes.h"
 
+/* Portability cruft, should become unnecessary eventually */
+#ifndef AI_ADDRCONFIG
+#define AI_ADDRCONFIG 0
+#endif
+
 static void cant_listen(char *, char *, const char *);
 
 int
@@ -62,7 +67,7 @@ tcp_listen(char *host, char *serv, size_t *addrlenp)
     struct addrinfo hints, *res, *ressave;
 
     memset(&hints, 0, sizeof(struct addrinfo));
-    hints.ai_flags = AI_PASSIVE;
+    hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG;
     hints.ai_family = AF_UNSPEC;
     hints.ai_socktype = SOCK_STREAM;