Add missing include

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

diff --git a/src/arm/test_gnunet_service_arm.c b/src/arm/test_gnunet_service_arm.c
index 50f01e9327a8d9626a29940ac2d98d9b0d97f362..60feb9c19cccdcafa6158ccc89096d04dc26f13d 100644 (file)
--- a/src/arm/test_gnunet_service_arm.c
+++ b/src/arm/test_gnunet_service_arm.c
@@ -18,7 +18,7 @@
      Boston, MA 02111-1307, USA.
 */
 /**
- * @file arm/test_gnunet_service_arm.c 
+ * @file arm/test_gnunet_service_arm.c
  * @brief testcase for gnunet-service-arm.c; tests ARM by making it start the resolver
  * @author Safey
  * @author Christian Grothoff
@@ -53,29 +53,37 @@ trigger_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   arm = NULL;
 }
 
+
 static void
-arm_stop_cb (void *cls, struct GNUNET_ARM_Handle *h, enum GNUNET_ARM_RequestStatus status, const char *servicename, enum GNUNET_ARM_Result result)
+arm_stop_cb (void *cls,
+            enum GNUNET_ARM_RequestStatus status,
+            const char *servicename,
+            enum GNUNET_ARM_Result result)
 {
   GNUNET_break (status == GNUNET_ARM_REQUEST_SENT_OK);
-  GNUNET_break (result == GNUNET_ARM_RESULT_STOPPING);
-  if (result != GNUNET_ARM_RESULT_STOPPING)
+  GNUNET_break (result == GNUNET_ARM_RESULT_STOPPED);
+  if (result != GNUNET_ARM_RESULT_STOPPED)
     ret = 4;
   GNUNET_SCHEDULER_add_now (trigger_disconnect, NULL);
 }
 
+
 static void
-service_list (void *cls, struct GNUNET_ARM_Handle *arm,
-    enum GNUNET_ARM_RequestStatus rs,
-    unsigned int count, const char *const*list)
+service_list (void *cls,
+             enum GNUNET_ARM_RequestStatus rs,
+             unsigned int count, const char *const*list)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%u services are are currently running\n", count);
-  GNUNET_assert (count == 1);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "%u services are are currently running\n",
+             count);
+  GNUNET_break (count == 1);
   GNUNET_break (0 == strcasecmp (list[0], "resolver (gnunet-service-resolver)"));
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got service list, now stopping arm\n");
   ret = 0;
   GNUNET_ARM_request_service_stop (arm, "arm", TIMEOUT, arm_stop_cb, NULL);
 }
 
+
 static void
 hostNameResolveCB (void *cls, const struct sockaddr *addr, socklen_t addrlen)
 {
@@ -97,8 +105,12 @@ hostNameResolveCB (void *cls, const struct sockaddr *addr, socklen_t addrlen)
   }
 }
 
+
 static void
-arm_start_cb (void *cls, struct GNUNET_ARM_Handle *h, enum GNUNET_ARM_RequestStatus status, const char *servicename, enum GNUNET_ARM_Result result)
+arm_start_cb (void *cls,
+             enum GNUNET_ARM_RequestStatus status,
+             const char *servicename,
+             enum GNUNET_ARM_Result result)
 {
   GNUNET_break (status == GNUNET_ARM_REQUEST_SENT_OK);
   GNUNET_break (result == GNUNET_ARM_RESULT_STARTING);
@@ -115,6 +127,7 @@ arm_start_cb (void *cls, struct GNUNET_ARM_Handle *h, enum GNUNET_ARM_RequestSta
   }
 }
 
+
 static void
 run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *c)
@@ -134,8 +147,7 @@ run (void *cls, char *const *args, const char *cfgfile,
     else
       GNUNET_free (armconfig);
   }
-  arm = GNUNET_ARM_alloc (c);
-  GNUNET_ARM_connect (arm, NULL, NULL);
+  arm = GNUNET_ARM_connect (c, NULL, NULL);
   GNUNET_ARM_request_service_start (arm, "arm",
       GNUNET_OS_INHERIT_STD_OUT_AND_ERR, START_TIMEOUT, arm_start_cb, NULL);
 }
@@ -172,10 +184,10 @@ main (int argc, char *av[])
   GNUNET_log_setup ("test-gnunet-service-arm",
                    "WARNING",
                    NULL);
-  GNUNET_assert (GNUNET_OK ==
-                GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
-                                    argv, "test-gnunet-service-arm",
-                                    "nohelp", options, &run, NULL));
+  GNUNET_break (GNUNET_OK ==
+               GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
+                                   argv, "test-gnunet-service-arm",
+                                   "nohelp", options, &run, NULL));
   return ret;
 }