X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Ftest_resolver_api.c;h=ea18629f42f90debbf156738a93472cf2b825ba7;hb=27520ef39b732562a6c4ffa8640b44250ad72a4a;hp=4e248aa725edeb6dbc29b30c2ba5aa702a1b4d80;hpb=a5d0694571db763efd0787a680168492f325b2e6;p=oweals%2Fgnunet.git

diff --git a/src/util/test_resolver_api.c b/src/util/test_resolver_api.c
index 4e248aa72..ea18629f4 100644
--- a/src/util/test_resolver_api.c
+++ b/src/util/test_resolver_api.c
@@ -22,15 +22,10 @@
  * @brief testcase for resolver_api.c
  */
 #include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_getopt_lib.h"
-#include "gnunet_os_lib.h"
-#include "gnunet_program_lib.h"
-#include "gnunet_scheduler_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_resolver_service.h"
 #include "resolver.h"
 
-#define VERBOSE GNUNET_EXTRA_LOGGING
 
 /**
  * Using DNS root servers to check gnunet's resolver service
@@ -40,12 +35,13 @@
 #define ROOTSERVER_NAME "a.root-servers.net"
 #define ROOTSERVER_IP 	"198.41.0.4"
 
+
 static void
 check_hostname (void *cls, const struct sockaddr *sa, socklen_t salen)
 {
   int *ok = cls;
 
-  if (salen == 0)
+  if (0 == salen)
   {
     (*ok) &= ~8;
     return;
@@ -64,18 +60,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
     (*ok) &= ~4;
   }
   else
   {
-#if DEBUG_RESOLVER
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received invalid hostname `%s'.\n",
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Received invalid hostname `%s'.\n",
                 hostname);
-#endif
     GNUNET_break (0);
   }
 }
@@ -86,14 +78,12 @@ check_localhost (void *cls, const char *hostname)
 {
   int *ok = cls;
 
-  if (hostname == NULL)
+  if (NULL == hostname)
     return;
   if (0 == strcmp (hostname, "localhost"))
   {
-#if DEBUG_RESOLVER
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received correct hostname `%s'.\n",
                 hostname);
-#endif
     (*ok) &= ~2;
   }
   else
@@ -104,31 +94,32 @@ check_localhost (void *cls, const char *hostname)
   }
 }
 
+
 static void
 check_127 (void *cls, const struct sockaddr *sa, socklen_t salen)
 {
   int *ok = cls;
   const struct sockaddr_in *sai = (const struct sockaddr_in *) sa;
 
-  if (sa == NULL)
+  if (NULL == sa)
     return;
   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);
   }
 }
 
+
 static void
 check_local_fqdn (void *cls, const char *gnunet_fqdn)
 {
@@ -143,15 +134,13 @@ check_local_fqdn (void *cls, const char *gnunet_fqdn)
                          "gethostname");
     return;
   }
-#if DEBUG_RESOLVER
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Resolving our FQDN `%s'\n"),
               hostname);
-#endif
   host = gethostbyname (hostname);
   if (NULL == host)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("Could not resolve our FQDN : %s %u\n"), hstrerror (h_errno),
+                _("Could not resolve our FQDN: %s %u\n"), hstrerror (h_errno),
                 h_errno);
     return;
   }
@@ -168,61 +157,54 @@ check_local_fqdn (void *cls, const char *gnunet_fqdn)
 }
 
 
-
 static void
 check_rootserver_ip (void *cls, const struct sockaddr *sa, socklen_t salen)
 {
   int *ok = cls;
   const struct sockaddr_in *sai = (const struct sockaddr_in *) sa;
 
-  if (sa == NULL)
+  if (NULL == sa)
     return;
   GNUNET_assert (sizeof (struct sockaddr_in) == 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);
   }
 }
 
+
 static void
 check_rootserver_name (void *cls, const char *hostname)
 {
   int *ok = cls;
 
-  if (hostname == NULL)
+  if (NULL == hostname)
     return;
 
   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)
@@ -259,13 +241,11 @@ run (void *cls, char *const *args, const char *cfgfile,
   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,10 +255,8 @@ run (void *cls, char *const *args, const char *cfgfile,
     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);
   }
 
@@ -287,17 +265,12 @@ run (void *cls, char *const *args, const char *cfgfile,
       (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);
@@ -312,10 +285,8 @@ run (void *cls, char *const *args, const char *cfgfile,
   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);
   }
 
@@ -324,30 +295,23 @@ run (void *cls, char *const *args, const char *cfgfile,
   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;
@@ -382,36 +346,33 @@ run (void *cls, char *const *args, const char *cfgfile,
 
 }
 
-static int
-check ()
+
+int
+main (int argc, char *argv[])
 {
   int ok = 1 + 2 + 4 + 8;
   char *fn;
-  char *pfx;
   struct GNUNET_OS_Process *proc;
-
-  char *const argv[] =
-      { "test-resolver-api", "-c", "test_resolver_api_data.conf",
-#if VERBOSE
-    "-L", "DEBUG",
-#endif
-    NULL
+  char *const argvx[] = { 
+    "test-resolver-api", "-c", "test_resolver_api_data.conf", NULL
   };
   struct GNUNET_GETOPT_CommandLineOption options[] =
       { GNUNET_GETOPT_OPTION_END };
-  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",
-#if VERBOSE
-                                  "-L", "DEBUG",
-#endif
+
+  GNUNET_log_setup ("test-resolver-api",
+                    "WARNING",
+                    NULL);
+  fn = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
+  proc = GNUNET_OS_start_process (GNUNET_YES, 
+				  GNUNET_OS_INHERIT_STD_OUT_AND_ERR, 
+				  NULL, NULL, fn, 
+				  "gnunet-service-resolver",
                                   "-c", "test_resolver_api_data.conf", NULL);
   GNUNET_assert (NULL != proc);
   GNUNET_free (fn);
   GNUNET_assert (GNUNET_OK ==
-                 GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
-                                     argv, "test-resolver-api", "nohelp",
+                 GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1,
+                                     argvx, "test-resolver-api", "nohelp",
                                      options, &run, &ok));
   if (0 != GNUNET_OS_process_kill (proc, SIGTERM))
   {
@@ -419,28 +380,12 @@ 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);
+  if (0 != ok)
+    FPRINTF (stderr, "Missed some resolutions: %u\n", ok);
   return ok;
 }
 
-int
-main (int argc, char *argv[])
-{
-  int ret;
-
-  GNUNET_log_setup ("test-resolver-api",
-#if VERBOSE
-                    "DEBUG",
-#else
-                    "WARNING",
-#endif
-                    NULL);
-  ret = check ();
-
-  return ret;
-}
 
 /* end of test_resolver_api.c */