Fix brought over from gettext.

[gnulib.git] / tests / test-getaddrinfo.c

diff --git a/tests/test-getaddrinfo.c b/tests/test-getaddrinfo.c
index adf29e4..43c349a 100644 (file)
--- a/tests/test-getaddrinfo.c
+++ b/tests/test-getaddrinfo.c
@@ -15,9 +15,9 @@ int simple (char *host, char *service)
 
   memset (&hints, 0, sizeof (hints));
   hints.ai_flags = AI_CANONNAME;
-  hints.ai_family = AF_INET;
+  hints.ai_family = AF_UNSPEC;
   hints.ai_socktype = SOCK_STREAM;
-  res = getaddrinfo (host, 0, 0, &ai0);
+  res = getaddrinfo (host, service, 0, &ai0);
 
   printf ("res %d: %s\n", res, gai_strerror (res));
 
@@ -38,6 +38,23 @@ int simple (char *host, char *service)
                         buf, sizeof (buf) - 1));
       if (ai->ai_canonname)
        printf ("\tFound %s...\n", ai->ai_canonname);
+
+      {
+       char ipbuf[BUFSIZ];
+       char portbuf[BUFSIZ];
+
+       res = getnameinfo (ai->ai_addr, ai->ai_addrlen,
+                          ipbuf, sizeof (ipbuf) - 1,
+                          portbuf, sizeof (portbuf) - 1,
+                          NI_NUMERICHOST|NI_NUMERICSERV);
+       printf ("\t\tgetnameinfo %d: %s\n", res, gai_strerror (res));
+       if (res == 0)
+         {
+           printf ("\t\tip %s\n", ipbuf);
+           printf ("\t\tport %s\n", portbuf);
+         }
+      }
+
     }
 
   freeaddrinfo (ai0);
@@ -48,14 +65,33 @@ int simple (char *host, char *service)
 #define HOST1 "www.gnu.org"
 #define SERV1 "http"
 #define HOST2 "www.ibm.com"
-#define SERV2 "http"
-#define HOST3 "ibm.org"
+#define SERV2 "https"
+#define HOST3 "microsoft.com"
 #define SERV3 "http"
 #define HOST4 "google.org"
-#define SERV4 "http"
+#define SERV4 "ldap"
 
 int main (void)
 {
+#if _WIN32
+  {
+    WORD requested;
+    WSADATA data;
+    int err;
+
+    requested = MAKEWORD (1, 1);
+    err = WSAStartup (requested, &data);
+    if (err != 0)
+      return 1;
+
+    if (data.wVersion < requested)
+      {
+       WSACleanup ();
+       return 2;
+      }
+  }
+#endif
+
   return simple (HOST1, SERV1)
     + simple (HOST2, SERV2)
     + simple (HOST3, SERV3)