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 55963774835d7d49ad119e0d78dbb6803a9332e3..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,7 +27,7 @@
 #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.
@@ -84,7 +84,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   socklen_t salen;
   struct sockaddr_in v4;
   struct sockaddr_in6 v6;
-  
+
   if (args[0] == NULL)
     return;
   if (! reverse)
@@ -92,7 +92,7 @@ run (void *cls, char *const *args, const char *cfgfile,
     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;
@@ -120,7 +120,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   }
   if (NULL == sa)
   {
-    fprintf (stderr, 
+    fprintf (stderr,
             "`%s' is not a valid IP: %s\n",
             args[0],
             strerror (errno));
@@ -133,8 +133,9 @@ run (void *cls, char *const *args, const char *cfgfile,
                                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
@@ -149,14 +150,17 @@ main (int argc, char *const *argv)
       0, &GNUNET_GETOPT_set_one, &reverse },
     GNUNET_GETOPT_OPTION_END
   };
+  int ret;
 
   if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
     return 2;
 
-  return (GNUNET_OK ==
-          GNUNET_PROGRAM_run (argc, argv, "gnunet-resolver [hostname]",
-                              gettext_noop ("Use build-in GNUnet stub resolver"),
-                              options, &run, NULL)) ? 0 : 1;
+  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 */