handling replies continuously from server

[oweals/gnunet.git] / src / util / test_resolver_api.c

diff --git a/src/util/test_resolver_api.c b/src/util/test_resolver_api.c
index 8058fa28715251f556d9e17b7f603076a33488af..4a3a20375b529f471579f0ba17e9c4f234e74dea 100644 (file)
--- a/src/util/test_resolver_api.c
+++ b/src/util/test_resolver_api.c
@@ -32,7 +32,7 @@
 
 #define VERBOSE GNUNET_NO
 
-/** 
+/**
  * Using DNS root servers to check gnunet's resolver service
  * a.root-servers.net <-> 198.41.0.4 is a fix 1:1 mapping that should not change over years
  * For more information have a look at IANA's website http://www.root-servers.org/
@@ -64,18 +64,14 @@ check_localhost_num (void *cls, const char *hostname)
     return;
   if (0 == strcmp (hostname, "127.0.0.1"))
   {
-#if DEBUG_RESOLVER
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Received correct hostname `%s'.\n", hostname);
-#endif
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received correct hostname `%s'.\n",
+                hostname);
     (*ok) &= ~4;
   }
   else
   {
-#if DEBUG_RESOLVER
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Received invalid hostname `%s'.\n", hostname);
-#endif
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Received invalid hostname `%s'.\n",
+                hostname);
     GNUNET_break (0);
   }
 }
@@ -90,10 +86,8 @@ check_localhost (void *cls, const char *hostname)
     return;
   if (0 == strcmp (hostname, "localhost"))
   {
-#if DEBUG_RESOLVER
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Received correct hostname `%s'.\n", hostname);
-#endif
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received correct hostname `%s'.\n",
+                hostname);
     (*ok) &= ~2;
   }
   else
@@ -115,16 +109,15 @@ check_127 (void *cls, const struct sockaddr *sa, socklen_t salen)
   GNUNET_assert (sizeof (struct sockaddr_in) == salen);
   if (sai->sin_addr.s_addr == htonl (INADDR_LOOPBACK))
   {
-#if DEBUG_RESOLVER
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received correct address.\n");
-#endif
     (*ok) &= ~1;
   }
   else
   {
-#if DEBUG_RESOLVER
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received incorrect address.\n");
-#endif
+    char buf[INET_ADDRSTRLEN];
+
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Received incorrect address`%s'.\n",
+               inet_ntop (AF_INET, &sai->sin_addr, buf, sizeof (buf)));
     GNUNET_break (0);
   }
 }
@@ -139,20 +132,18 @@ check_local_fqdn (void *cls, const char *gnunet_fqdn)
 
   if (0 != gethostname (hostname, sizeof (hostname) - 1))
   {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR |
-                         GNUNET_ERROR_TYPE_BULK, "gethostname");
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                         "gethostname");
     return;
   }
-#if DEBUG_RESOLVER
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              _("Resolving our FQDN `%s'\n"), hostname);
-#endif
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Resolving our FQDN `%s'\n"),
+              hostname);
   host = gethostbyname (hostname);
   if (NULL == host)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("Could not resolve our FQDN : %s %u\n"),
-                hstrerror (h_errno), h_errno);
+                _("Could not resolve our FQDN: %s %u\n"), hstrerror (h_errno),
+                h_errno);
     return;
   }
 
@@ -181,18 +172,14 @@ check_rootserver_ip (void *cls, const struct sockaddr *sa, socklen_t salen)
 
   if (0 == strcmp (inet_ntoa (sai->sin_addr), ROOTSERVER_IP))
   {
-#if DEBUG_RESOLVER
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Received correct rootserver ip address.\n");
-#endif
     (*ok) &= ~1;
   }
   else
   {
-#if DEBUG_RESOLVER
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Received incorrect rootserver ip address.\n");
-#endif
     GNUNET_break (0);
   }
 }
@@ -207,25 +194,21 @@ check_rootserver_name (void *cls, const char *hostname)
 
   if (0 == strcmp (hostname, ROOTSERVER_NAME))
   {
-#if DEBUG_RESOLVER
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Received correct rootserver hostname `%s'.\n", hostname);
-#endif
     (*ok) &= ~2;
   }
   else
   {
-#if DEBUG_RESOLVER
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Received invalid rootserver hostname `%s'.\n", hostname);
-#endif
     GNUNET_break (0);
   }
 }
 
 static void
-run (void *cls, char *const *args,
-     const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
+run (void *cls, char *const *args, const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   int *ok = cls;
   struct sockaddr_in sa;
@@ -259,13 +242,11 @@ run (void *cls, char *const *args,
   if (rootserver == NULL)
   {
     /* Error: resolving ip addresses does not work */
-#if DEBUG_RESOLVER
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 _("gethostbyname() could not lookup IP address: %s\n"),
                 hstrerror (h_errno));
-#endif
-    fprintf (stderr,
-             "System seems to be off-line, will not run all DNS tests\n");
+    FPRINTF (stderr,
+             "%s", "System seems to be off-line, will not run all DNS tests\n");
     *ok = 0;                    /* mark test as passing anyway */
     return;
   }
@@ -275,28 +256,22 @@ run (void *cls, char *const *args,
     count_ips++;
   if (count_ips > 1)
   {
-#if DEBUG_RESOLVER
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "IP received range for root name server, but a root name server has only 1 IP\n");
-#endif
     GNUNET_break (0);
   }
 
   /* Comparing to resolved address to the address the root name server should have */
-  if (strcmp (inet_ntoa (*(struct in_addr *) rootserver->h_addr_list[0]),
-              ROOTSERVER_IP) != 0)
+  if (strcmp
+      (inet_ntoa (*(struct in_addr *) rootserver->h_addr_list[0]),
+       ROOTSERVER_IP) != 0)
   {
-#if DEBUG_RESOLVER
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "IP received and IP for root name server differ\n");
-#endif
     GNUNET_break (0);
   }
-#if DEBUG_RESOLVER
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "System's own forward name resolution is working\n");
-#endif
-
   /* Resolve the same using GNUNET */
   GNUNET_RESOLVER_ip_get (ROOTSERVER_NAME, AF_INET, timeout,
                           &check_rootserver_ip, cls);
@@ -311,42 +286,33 @@ run (void *cls, char *const *args,
   rootserver->h_name = "";
   if (1 != inet_pton (AF_INET, ROOTSERVER_IP, &rootserver_addr))
   {
-#if DEBUG_RESOLVER
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Could not transform root name server IP address\n");
-#endif
     GNUNET_break (0);
   }
 
-  rootserver
-      = gethostbyaddr (&rootserver_addr, sizeof (rootserver_addr), AF_INET);
+  rootserver =
+      gethostbyaddr (&rootserver_addr, sizeof (rootserver_addr), AF_INET);
   if (rootserver == NULL)
   {
     /* Error: resolving IP addresses does not work */
-#if DEBUG_RESOLVER
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 _("gethostbyaddr() could not lookup hostname: %s\n"),
                 hstrerror (h_errno));
-#endif
     GNUNET_break (0);
   }
   else
   {
     if (0 != strcmp (rootserver->h_name, ROOTSERVER_NAME))
     {
-#if DEBUG_RESOLVER
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "Received hostname and hostname for root name server differ\n");
-#endif
       GNUNET_break (0);
     }
   }
 
-#if DEBUG_RESOLVER
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "System's own reverse name resolution is working\n");
-#endif
-
   /* Resolve the same using GNUNET */
   memset (&sa, 0, sizeof (sa));
   sa.sin_family = AF_INET;
@@ -401,7 +367,7 @@ check ()
   pfx = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_BINDIR);
   GNUNET_asprintf (&fn, "%s%cgnunet-service-resolver", pfx, DIR_SEPARATOR);
   GNUNET_free (pfx);
-  proc = GNUNET_OS_start_process (NULL, NULL, fn, "gnunet-service-resolver",
+  proc = GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, fn, "gnunet-service-resolver",
 #if VERBOSE
                                   "-L", "DEBUG",
 #endif
@@ -418,10 +384,10 @@ check ()
     ok = 1;
   }
   GNUNET_OS_process_wait (proc);
-  GNUNET_OS_process_close (proc);
+  GNUNET_OS_process_destroy (proc);
   proc = NULL;
   if (ok != 0)
-    fprintf (stderr, "Missed some resolutions: %u\n", ok);
+    FPRINTF (stderr, "Missed some resolutions: %u\n", ok);
   return ok;
 }