Link libgnunetblockgroup to libgnunetblock

[oweals/gnunet.git] / src / util / gnunet-resolver.c

diff --git a/src/util/gnunet-resolver.c b/src/util/gnunet-resolver.c
index 01def2c9ebf27d067e0e7c650e3fa5176c652cc0..e84a2332fb3d8d1f140f736840c8cc318a5a672c 100644 (file)
--- a/src/util/gnunet-resolver.c
+++ b/src/util/gnunet-resolver.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2010 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2010 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -27,21 +27,44 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_resolver_service.h"
 
-#define GET_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
+#define GET_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+
+/**
+ * Flag for reverse lookup.
+ */
+static int reverse;
+
+
+/**
+ * Prints each hostname obtained from DNS.
+ *
+ * @param cls closure (unused)
+ * @param hostname one of the names for the host, NULL
+ *        on the last call to the callback
+ */
+static void
+print_hostname (void *cls,
+               const char *hostname)
+{
+  if (NULL == hostname)
+    return;
+  FPRINTF (stdout, "%s\n", hostname);
+}
+
 
 /**
  * Callback function to display address.
+ *
+ * @param cls closure (unused)
+ * @param addr one of the addresses of the host, NULL for the last address
+ * @param addrlen length of the address
  */
 static void
-printer (void *cls,
-        const struct sockaddr * addr,
-        socklen_t addrlen)
+print_sockaddr (void *cls, const struct sockaddr *addr, socklen_t addrlen)
 {
-  if (addr == NULL)
+  if (NULL == addr)
     return;
-  FPRINTF (stdout,
-           "%s\n",
-           GNUNET_a2s (addr, addrlen));
+  FPRINTF (stdout, "%s\n", GNUNET_a2s (addr, addrlen));
 }
 
 
@@ -54,22 +77,65 @@ printer (void *cls,
  * @param cfg configuration
  */
 static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile,
+run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
+  const struct sockaddr *sa;
+  socklen_t salen;
+  struct sockaddr_in v4;
+  struct sockaddr_in6 v6;
+
   if (args[0] == NULL)
     return;
-  GNUNET_RESOLVER_ip_get (args[0],
-                         AF_UNSPEC,
-                         GET_TIMEOUT,
-                         &printer,
-                         NULL);
+  if (! reverse)
+  {
+    GNUNET_RESOLVER_ip_get (args[0], AF_UNSPEC, GET_TIMEOUT, &print_sockaddr, NULL);
+    return;
+  }
+
+  sa = NULL;
+  memset (&v4, 0, sizeof (v4));
+  v4.sin_family = AF_INET;
+#if HAVE_SOCKADDR_IN_SIN_LEN
+  v4.sin_len = sizeof (v4);
+#endif
+  if (1 == inet_pton (AF_INET,
+                     args[0],
+                     &v4.sin_addr))
+  {
+    sa = (struct sockaddr *) &v4;
+    salen = sizeof (v4);
+  }
+  memset (&v6, 0, sizeof (v6));
+  v6.sin6_family = AF_INET6;
+#if HAVE_SOCKADDR_IN_SIN_LEN
+  v6.sin6_len = sizeof (v6);
+#endif
+  if (1 == inet_pton (AF_INET6,
+                     args[0],
+                     &v6.sin6_addr))
+  {
+    sa = (struct sockaddr *) &v6;
+    salen = sizeof (v6);
+  }
+  if (NULL == sa)
+  {
+    fprintf (stderr,
+            "`%s' is not a valid IP: %s\n",
+            args[0],
+            strerror (errno));
+    return;
+  }
+  GNUNET_RESOLVER_hostname_get (sa, salen,
+                               GNUNET_YES,
+                               GET_TIMEOUT,
+                               &print_hostname,
+                               NULL);
 }
 
+
 /**
- * The main function to obtain statistics in GNUnet.
+ * The main function to access GNUnet's DNS resolver.
  *
  * @param argc number of arguments from the command line
  * @param argv command line arguments
@@ -79,23 +145,22 @@ int
 main (int argc, char *const *argv)
 {
   static const struct GNUNET_GETOPT_CommandLineOption options[] = {
+    { 'r', "reverse", NULL,
+      gettext_noop ("perform a reverse lookup"),
+      0, &GNUNET_GETOPT_set_one, &reverse },
     GNUNET_GETOPT_OPTION_END
   };
-  GNUNET_PROGRAM_run (argc,
-                     argv,
-                     "gnunet-resolver [hostname]",
-                     gettext_noop
-                     ("Test GNUnet DNS resolver code."),
-                     options, &run, NULL);
-  fprintf (stderr, "again...\n");
-
-  return (GNUNET_OK ==
-          GNUNET_PROGRAM_run (argc,
-                              argv,
-                              "gnunet-resolver [hostname]",
-                              gettext_noop
-                              ("Test GNUnet DNS resolver code."),
-                              options, &run, NULL)) ? 0 : 1;
+  int ret;
+
+  if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
+    return 2;
+
+  ret = (GNUNET_OK ==
+        GNUNET_PROGRAM_run (argc, argv, "gnunet-resolver [hostname]",
+                            gettext_noop ("Use build-in GNUnet stub resolver"),
+                            options, &run, NULL)) ? 0 : 1;
+  GNUNET_free ((void*) argv);
+  return ret;
 }
 
 /* end of gnunet-resolver.c */