Avoid test segfault on x86_64 due to lack of inet_ntop declaration.

[pspp] / tests / test-getaddrinfo.c

diff --git a/tests/test-getaddrinfo.c b/tests/test-getaddrinfo.c
index adf29e4d6516d64d161026c98fa3561905b2caf6..8d487cb5bf48c90492710bee2c7ef01e4a2d9511 100644 (file)
--- a/tests/test-getaddrinfo.c
+++ b/tests/test-getaddrinfo.c
@@ -1,9 +1,37 @@
-#include "config.h"
+/* Test the getaddrinfo module.
+
+   Copyright (C) 2006-2008 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Simon Josefsson.  */
+
+#include <config.h>
 #include "getaddrinfo.h"
-#include "inet_ntop.h"
+#include <arpa/inet.h>
 #include <stdio.h>
 #include <string.h>
 
+/* BeOS does not have AF_UNSPEC.  */
+#ifndef AF_UNSPEC
+# define AF_UNSPEC 0
+#endif
+
+#ifndef EAI_SERVICE
+# define EAI_SERVICE 0
+#endif
+
 int simple (char *host, char *service)
 {
   char buf[BUFSIZ];
@@ -13,16 +41,34 @@ int simple (char *host, char *service)
 
   printf ("Finding %s service %s...\n", host, service);
 
+  /* This initializes "hints" but does not use it.  Is there a reason
+     for this?  If so, please fix this comment.  */
   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));
 
   if (res != 0)
-    return 1;
+    {
+      /* IRIX reports EAI_NONAME for "https".  Don't fail the test
+        merely because of this.  */
+      if (res == EAI_NONAME)
+       return 0;
+      /* Solaris reports EAI_SERVICE for "http" and "https".  Don't
+         fail the test merely because of this.  */
+      if (res == EAI_SERVICE)
+       return 0;
+      /* AIX reports EAI_NODATA for "https".  Don't fail the test
+        merely because of this.  */
+      if (res == EAI_NODATA)
+       return 0;
+
+      return 1;
+    }
 
   for (ai = ai0; ai; ai = ai->ai_next)
     {
@@ -30,7 +76,7 @@ int simple (char *host, char *service)
       printf ("\tfamily %x\n", ai->ai_family);
       printf ("\tsocktype %x\n", ai->ai_socktype);
       printf ("\tprotocol %x\n", ai->ai_protocol);
-      printf ("\taddrlen %d: ", ai->ai_addrlen);
+      printf ("\taddrlen %ld: ", (unsigned long) ai->ai_addrlen);
       printf ("\tFound %s\n",
              inet_ntop (ai->ai_family,
                         &((struct sockaddr_in *)
@@ -38,6 +84,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 +111,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)