X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-getaddrinfo.c;h=bfdb9cf0e85cd1af517e6bb6613f322e9c4170b8;hb=cfb3906f210bec09f48f5d48511b72064153311a;hp=9f42fff2b53acc3adfb806a3dd57e86bb256424b;hpb=a84c1ea219cfec541ccd2cb9ce33a69f9c5559c2;p=gnulib.git

diff --git a/tests/test-getaddrinfo.c b/tests/test-getaddrinfo.c
index 9f42fff2b..bfdb9cf0e 100644
--- a/tests/test-getaddrinfo.c
+++ b/tests/test-getaddrinfo.c
@@ -1,11 +1,11 @@
 /* Test the getaddrinfo module.
 
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006-2008 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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 2, or (at your option)
-   any later version.
+   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
@@ -13,17 +13,35 @@
    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, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Simon Josefsson.  */
 
-#include "config.h"
+#include <config.h>
 #include "getaddrinfo.h"
-#include "inet_ntop.h"
+#include <arpa/inet.h>
+#include <netinet/in.h>
 #include <stdio.h>
 #include <string.h>
 
+/* Whether to print debugging messages.  */
+#define ENABLE_DEBUGGING 0
+
+#if ENABLE_DEBUGGING
+# define dbgprintf printf
+#else
+# define dbgprintf if (0) printf
+#endif
+
+/* 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];
@@ -31,33 +49,51 @@ int simple (char *host, char *service)
   struct addrinfo *ai0, *ai;
   int res;
 
-  printf ("Finding %s service %s...\n", host, service);
+  dbgprintf ("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_UNSPEC;
   hints.ai_socktype = SOCK_STREAM;
+
   res = getaddrinfo (host, service, 0, &ai0);
 
-  printf ("res %d: %s\n", res, gai_strerror (res));
+  dbgprintf ("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)
     {
-      printf ("\tflags %x\n", ai->ai_flags);
-      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 ("\tFound %s\n",
-	      inet_ntop (ai->ai_family,
-			 &((struct sockaddr_in *)
-			  ai->ai_addr)->sin_addr,
-			 buf, sizeof (buf) - 1));
+      dbgprintf ("\tflags %x\n", ai->ai_flags);
+      dbgprintf ("\tfamily %x\n", ai->ai_family);
+      dbgprintf ("\tsocktype %x\n", ai->ai_socktype);
+      dbgprintf ("\tprotocol %x\n", ai->ai_protocol);
+      dbgprintf ("\taddrlen %ld: ", (unsigned long) ai->ai_addrlen);
+      dbgprintf ("\tFound %s\n",
+		 inet_ntop (ai->ai_family,
+			    &((struct sockaddr_in *)
+			      ai->ai_addr)->sin_addr,
+			    buf, sizeof (buf) - 1));
       if (ai->ai_canonname)
-	printf ("\tFound %s...\n", ai->ai_canonname);
+	dbgprintf ("\tFound %s...\n", ai->ai_canonname);
 
       {
 	char ipbuf[BUFSIZ];
@@ -67,11 +103,11 @@ int simple (char *host, char *service)
 			   ipbuf, sizeof (ipbuf) - 1,
 			   portbuf, sizeof (portbuf) - 1,
 			   NI_NUMERICHOST|NI_NUMERICSERV);
-	printf ("\t\tgetnameinfo %d: %s\n", res, gai_strerror (res));
+	dbgprintf ("\t\tgetnameinfo %d: %s\n", res, gai_strerror (res));
 	if (res == 0)
 	  {
-	    printf ("\t\tip %s\n", ipbuf);
-	    printf ("\t\tport %s\n", portbuf);
+	    dbgprintf ("\t\tip %s\n", ipbuf);
+	    dbgprintf ("\t\tport %s\n", portbuf);
 	  }
       }