-fix double free, linker issue

[oweals/gnunet.git] / src / arm / test_gnunet_service_manager.c

diff --git a/src/arm/test_gnunet_service_manager.c b/src/arm/test_gnunet_service_manager.c
index 454fa0e9875cf49e0ddcb5041594ed656628d646..2abcc95636859e1b34ce66ae2d3e724e006b81dd 100644 (file)
--- a/src/arm/test_gnunet_service_manager.c
+++ b/src/arm/test_gnunet_service_manager.c
@@ -4,7 +4,7 @@
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -25,6 +25,7 @@
 #include "platform.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_resolver_service.h"
+#include "gnunet_os_lib.h"
 #include "gnunet_program_lib.h"
 
 /**
@@ -42,7 +43,6 @@
 
 static int ret = 1;
 
-static struct GNUNET_SCHEDULER_Handle *sched;
 
 static const struct GNUNET_CONFIGURATION_Handle *cfg;
 
@@ -51,34 +51,39 @@ static struct GNUNET_ARM_Handle *arm;
 #endif
 
 static void
-arm_stopped (void *cls, int success)
+arm_stopped (void *cls, enum GNUNET_ARM_ProcessStatus success)
 {
-  if (success != GNUNET_NO)       
+  if (success != GNUNET_ARM_PROCESS_DOWN)
     {
       GNUNET_break (0);
       ret = 4;
     }
+  else
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM stopped\n");
+    }
+#if START_ARM
   GNUNET_ARM_disconnect (arm);
   arm = NULL;
+#endif
 }
 
-static void 
-hostNameResolveCB(void *cls, 
-                 const struct sockaddr *addr, 
-                 socklen_t addrlen)
+static void
+hostNameResolveCB (void *cls, const struct sockaddr *addr, socklen_t addrlen)
 {
-  if ( (ret == 0) || (ret == 4) )
+  if ((ret == 0) || (ret == 4))
     return;
   if (NULL == addr)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
-                 "Name not resolved!\n");
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Name not resolved!\n");
 #if START_ARM
       GNUNET_ARM_stop_service (arm, "arm", TIMEOUT, &arm_stopped, NULL);
 #endif
       ret = 3;
       return;
-    }  
+    }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Resolved hostname, now stopping ARM\n");
   ret = 0;
 #if START_ARM
   GNUNET_ARM_stop_service (arm, "arm", TIMEOUT, &arm_stopped, NULL);
@@ -87,23 +92,23 @@ hostNameResolveCB(void *cls,
 
 
 static void
-arm_notify (void *cls, int success)
+arm_notify (void *cls, enum GNUNET_ARM_ProcessStatus success)
 {
-  if (success != GNUNET_YES)
+  if (success != GNUNET_ARM_PROCESS_STARTING)
     {
       GNUNET_break (0);
       ret = 1;
       return;
     }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Trying to resolve our own hostname!\n");
   /* connect to the resolver service */
-  if (NULL == GNUNET_RESOLVER_hostname_resolve (sched,
-                                               cfg, AF_UNSPEC,
-                                               TIMEOUT,
-                                               &hostNameResolveCB,
-                                               NULL))
+  if (NULL ==
+      GNUNET_RESOLVER_hostname_resolve (AF_UNSPEC, TIMEOUT,
+                                       &hostNameResolveCB, NULL))
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
-                 "Unable to resolve our own hostname!\n");
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                 "Unable initiate connection to resolver service\n");
       ret = 2;
 #if START_ARM
       GNUNET_ARM_stop_service (arm, "arm", TIMEOUT, &arm_stopped, NULL);
@@ -113,17 +118,13 @@ arm_notify (void *cls, int success)
 
 
 static void
-run(void *cls, 
-    struct GNUNET_SCHEDULER_Handle *s, 
-    char * const *args,
-    const char *cfgfile, 
-    const struct GNUNET_CONFIGURATION_Handle *c)
+run (void *cls, char *const *args, const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *c)
 {
   cfg = c;
-  sched = s;   
 #if START_ARM
-  arm = GNUNET_ARM_connect (cfg, sched, NULL);
-  GNUNET_ARM_start_service (arm, "arm", START_TIMEOUT, &arm_notify, NULL);
+  arm = GNUNET_ARM_connect (cfg, NULL);
+  GNUNET_ARM_start_service (arm, "arm", GNUNET_OS_INHERIT_STD_OUT_AND_ERR, START_TIMEOUT, &arm_notify, NULL);
 #else
   arm_notify (NULL, GNUNET_YES);
 #endif
@@ -131,7 +132,7 @@ run(void *cls,
 
 
 static void
-check()
+check ()
 {
   char *const argv[] = {
     "test-gnunet-service-manager",
@@ -146,8 +147,7 @@ check()
   };
   GNUNET_assert (GNUNET_OK ==
                 GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
-                                    argv,
-                                    "test-gnunet-service-manager",
+                                    argv, "test-gnunet-service-manager",
                                     "nohelp", options, &run, NULL));
 }
 
@@ -155,13 +155,31 @@ check()
 int
 main (int argc, char *argv[])
 {
-  GNUNET_log_setup("test-gnunet-service-manager",
+  char hostname[GNUNET_OS_get_hostname_max_length () + 1];
+
+  if (0 != gethostname (hostname, sizeof (hostname) - 1))
+    {
+      GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                          "gethostname");
+      FPRINTF (stderr,
+              "%s", "Failed to determine my own hostname, testcase not run.\n");
+      return 0;
+    }
+  if (NULL == gethostbyname (hostname))
+    {
+      FPRINTF (stderr,
+              "Failed to resolve my hostname `%s', testcase not run.\n",
+              hostname);
+      return 0;
+    }
+
+  GNUNET_log_setup ("test-gnunet-service-manager",
 #if VERBOSE
-                  "DEBUG",
+                   "DEBUG",
 #else
-                  "WARNING",
+                   "WARNING",
 #endif
-                  NULL);
-  check();
+                   NULL);
+  check ();
   return ret;
 }