ares_inet_ntop.3: s/socklen_t/ares_socklen_t

[platform/upstream/c-ares.git] / ahost.c

diff --git a/ahost.c b/ahost.c
index f27b1c4..fd6e50d 100644 (file)
--- a/ahost.c
+++ b/ahost.c
@@ -1,5 +1,6 @@
 /* Copyright 1998 by the Massachusetts Institute of Technology.
  *
+ *
  * Permission to use, copy, modify, and distribute this
  * software and its documentation for any purpose and without
  * fee is hereby granted, provided that the above copyright
@@ -13,47 +14,91 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
-#include <sys/types.h>
+#include "ares_setup.h"
 
-#ifdef WIN32
-#else
-#include <sys/time.h>
-#include <sys/socket.h>
+#if !defined(WIN32) || defined(WATT32)
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#include <unistd.h>
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
 #include "ares.h"
 #include "ares_dns.h"
+#include "ares_getopt.h"
+#include "ares_ipv6.h"
+#include "ares_nowarn.h"
+
+#ifndef HAVE_STRDUP
+#  include "ares_strdup.h"
+#  define strdup(ptr) ares_strdup(ptr)
+#endif
 
-#ifndef INADDR_NONE
-#define INADDR_NONE 0xffffffff
+#ifndef HAVE_STRCASECMP
+#  include "ares_strcasecmp.h"
+#  define strcasecmp(p1,p2) ares_strcasecmp(p1,p2)
 #endif
 
-static void callback(void *arg, int status, struct hostent *host);
+#ifndef HAVE_STRNCASECMP
+#  include "ares_strcasecmp.h"
+#  define strncasecmp(p1,p2,n) ares_strncasecmp(p1,p2,n)
+#endif
+
+static void callback(void *arg, int status, int timeouts, struct hostent *host);
 static void usage(void);
 
 int main(int argc, char **argv)
 {
   ares_channel channel;
-  int status, nfds;
+  int status, nfds, c, addr_family = AF_INET;
   fd_set read_fds, write_fds;
   struct timeval *tvp, tv;
-  struct in_addr addr;
+  struct in_addr addr4;
+  struct ares_in6_addr addr6;
 
-#ifdef WIN32
-  WORD wVersionRequested = MAKEWORD(1,1);
+#ifdef USE_WINSOCK
+  WORD wVersionRequested = MAKEWORD(USE_WINSOCK,USE_WINSOCK);
   WSADATA wsaData;
   WSAStartup(wVersionRequested, &wsaData);
 #endif
 
-  if (argc <= 1)
+  status = ares_library_init(ARES_LIB_INIT_ALL);
+  if (status != ARES_SUCCESS)
+    {
+      fprintf(stderr, "ares_library_init: %s\n", ares_strerror(status));
+      return 1;
+    }
+
+  while ((c = ares_getopt(argc,argv,"dt:h")) != -1)
+    {
+      switch (c)
+        {
+        case 'd':
+#ifdef WATT32
+          dbug_init();
+#endif
+          break;
+        case 't':
+          if (!strcasecmp(optarg,"a"))
+            addr_family = AF_INET;
+          else if (!strcasecmp(optarg,"aaaa"))
+            addr_family = AF_INET6;
+          else
+            usage();
+          break;
+        case 'h':
+        default:
+          usage();
+          break;
+        }
+    }
+
+  argc -= optind;
+  argv += optind;
+  if (argc < 1)
     usage();
 
   status = ares_init(&channel);
@@ -64,20 +109,26 @@ int main(int argc, char **argv)
     }
 
   /* Initiate the queries, one per command-line argument. */
-  for (argv++; *argv; argv++)
+  for ( ; *argv; argv++)
     {
-      addr.s_addr = inet_addr(*argv);
-      if (addr.s_addr == INADDR_NONE)
-        ares_gethostbyname(channel, *argv, AF_INET, callback, *argv);
-      else
+      if (ares_inet_pton(AF_INET, *argv, &addr4) == 1)
         {
-          ares_gethostbyaddr(channel, &addr, sizeof(addr), AF_INET, callback,
+          ares_gethostbyaddr(channel, &addr4, sizeof(addr4), AF_INET, callback,
                              *argv);
         }
+      else if (ares_inet_pton(AF_INET6, *argv, &addr6) == 1)
+        {
+          ares_gethostbyaddr(channel, &addr6, sizeof(addr6), AF_INET6, callback,
+                             *argv);
+        }
+      else
+        {
+          ares_gethostbyname(channel, *argv, addr_family, callback, *argv);
+        }
     }
 
   /* Wait for all queries to complete. */
-  while (1)
+  for (;;)
     {
       FD_ZERO(&read_fds);
       FD_ZERO(&write_fds);
@@ -90,14 +141,22 @@ int main(int argc, char **argv)
     }
 
   ares_destroy(channel);
+
+  ares_library_cleanup();
+
+#ifdef USE_WINSOCK
+  WSACleanup();
+#endif
+
   return 0;
 }
 
-static void callback(void *arg, int status, struct hostent *host)
+static void callback(void *arg, int status, int timeouts, struct hostent *host)
 {
-  struct in_addr addr;
   char **p;
 
+  (void)timeouts;
+
   if (status != ARES_SUCCESS)
     {
       fprintf(stderr, "%s: %s\n", (char *) arg, ares_strerror(status));
@@ -106,13 +165,26 @@ static void callback(void *arg, int status, struct hostent *host)
 
   for (p = host->h_addr_list; *p; p++)
     {
-      memcpy(&addr, *p, sizeof(struct in_addr));
-      printf("%-32s\t%s\n", host->h_name, inet_ntoa(addr));
+      char addr_buf[46] = "??";
+
+      ares_inet_ntop(host->h_addrtype, *p, addr_buf, sizeof(addr_buf));
+      printf("%-32s\t%s", host->h_name, addr_buf);
+#if 0
+      if (host->h_aliases[0])
+        {
+           int i;
+
+           printf (", Aliases: ");
+           for (i = 0; host->h_aliases[i]; i++)
+               printf("%s ", host->h_aliases[i]);
+        }
+#endif
+      puts("");
     }
 }
 
 static void usage(void)
 {
-  fprintf(stderr, "usage: ahost {host|addr} ...\n");
+  fprintf(stderr, "usage: ahost [-t {a|aaaa}] {host|addr} ...\n");
   exit(1);
 }