-svn ignore

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

diff --git a/src/arm/test_arm_api.c b/src/arm/test_arm_api.c
index 6ec95f4a0b1747c51bdb6d7fc818c42a30132e7f..086cfc25850da8376167d5111b7d2c0293d3a1f0 100644 (file)
--- a/src/arm/test_arm_api.c
+++ b/src/arm/test_arm_api.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
+     (C) 2009, 2011 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -34,12 +34,10 @@
 
 #define START_ARM GNUNET_YES
 
-#define START_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 500)
+#define START_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 1500)
 
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
 
-static struct GNUNET_SCHEDULER_Handle *sched;
-
 static const struct GNUNET_CONFIGURATION_Handle *cfg;
 
 static struct GNUNET_ARM_Handle *arm;
@@ -47,18 +45,20 @@ static struct GNUNET_ARM_Handle *arm;
 static int ok = 1;
 
 static void
-arm_stopped (void *cls, int success)
+arm_stopped (void *cls,  enum GNUNET_ARM_ProcessStatus success)
 {
-  if (success != GNUNET_NO)        
+  GNUNET_break (success == GNUNET_ARM_PROCESS_DOWN);
+  if (success != GNUNET_ARM_PROCESS_DOWN)
     ok = 3;
   else if (ok == 1)
     ok = 0;
 }
 
+
 static void
-arm_notify_stop (void *cls, int success)
+arm_notify_stop (void *cls, enum GNUNET_ARM_ProcessStatus success)
 {
-  GNUNET_assert (success == GNUNET_NO);
+  GNUNET_break (success == GNUNET_ARM_PROCESS_DOWN);
 #if START_ARM
   GNUNET_ARM_stop_service (arm, "arm", TIMEOUT, &arm_stopped, NULL);
 #endif
@@ -75,18 +75,19 @@ dns_notify (void *cls, const struct sockaddr *addr, socklen_t addrlen)
          GNUNET_break (0);
          ok = 2;
        }
-      GNUNET_ARM_stop_service (arm, "resolver", TIMEOUT, &arm_notify_stop, NULL);
+      GNUNET_ARM_stop_service (arm, "resolver", TIMEOUT, &arm_notify_stop,
+                              NULL);
       return;
     }
-  GNUNET_assert (addr != NULL);
+  GNUNET_break (addr != NULL);
   ok = 0;
 }
 
 
 static void
-resolver_notify (void *cls, int success)
+resolver_notify (void *cls, enum GNUNET_ARM_ProcessStatus success)
 {
-  if (success != GNUNET_YES)
+  if (success != GNUNET_ARM_PROCESS_STARTING)
     {
       GNUNET_break (0);
       ok = 2;
@@ -95,16 +96,14 @@ resolver_notify (void *cls, int success)
 #endif
       return;
     }
-  GNUNET_RESOLVER_ip_get (sched,
-                          cfg,
-                          "localhost", AF_INET, TIMEOUT, &dns_notify, NULL);
+  GNUNET_RESOLVER_ip_get ("localhost", AF_INET, TIMEOUT, &dns_notify, NULL);
 }
 
 
 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);
       ok = 2;
@@ -112,20 +111,17 @@ arm_notify (void *cls, int success)
       GNUNET_ARM_stop_service (arm, "arm", TIMEOUT, &arm_stopped, NULL);
 #endif
     }
-  GNUNET_ARM_start_service (arm, "resolver", START_TIMEOUT, &resolver_notify, NULL);
+  GNUNET_ARM_start_service (arm, "resolver", START_TIMEOUT, &resolver_notify,
+                           NULL);
 }
 
 
 static void
-task (void *cls,
-      struct GNUNET_SCHEDULER_Handle *s,
-      char *const *args,
-      const char *cfgfile,
+task (void *cls, char *const *args, const char *cfgfile,
       const struct GNUNET_CONFIGURATION_Handle *c)
 {
   cfg = c;
-  sched = s;
-  arm = GNUNET_ARM_connect (cfg, sched, NULL);
+  arm = GNUNET_ARM_connect (cfg, NULL);
 #if START_ARM
   GNUNET_ARM_start_service (arm, "arm", START_TIMEOUT, &arm_notify, NULL);
 #else
@@ -150,10 +146,9 @@ check ()
     GNUNET_GETOPT_OPTION_END
   };
   GNUNET_assert (GNUNET_OK ==
-                 GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
-                                     argv,
-                                     "test-arm-api",
-                                     "nohelp", options, &task, NULL));
+                GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
+                                    argv, "test-arm-api", "nohelp", options,
+                                    &task, NULL));
   return ok;
 }
 
@@ -165,11 +160,11 @@ main (int argc, char *argv[])
 
   GNUNET_log_setup ("test-arm-api",
 #if VERBOSE
-                    "DEBUG",
+                   "DEBUG",
 #else
-                    "WARNING",
+                   "WARNING",
 #endif
-                    NULL);
+                   NULL);
   ret = check ();
 
   return ret;