1 files changed, 196 insertions, 193 deletions

diff --git a/src/arm/test_exponential_backoff.c b/src/arm/test_exponential_backoff.c
index b13ab1cb8..5d1863f37 100644
--- a/src/arm/test_exponential_backoff.c
+++ b/src/arm/test_exponential_backoff.c
@@ -27,15 +27,16 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 
-#define LOG(...) GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__)
+#define LOG(...) GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__)
 
 #define LOG_BACKOFF GNUNET_NO
 
-#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 10)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
 
 #define SERVICE_TEST_TIMEOUT GNUNET_TIME_UNIT_FOREVER_REL
 
-#define FIVE_MILLISECONDS GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 5)
+#define FIVE_MILLISECONDS GNUNET_TIME_relative_multiply ( \
+    GNUNET_TIME_UNIT_MILLISECONDS, 5)
 
 #define SERVICE "do-nothing"
 
@@ -74,7 +75,8 @@ static char *killLogFileName;
 /**
  * Context for handling the shutdown of a service.
  */
-struct ShutdownContext {
+struct ShutdownContext
+{
   /**
    * Connection to the service that is being shutdown.
    */
@@ -88,7 +90,7 @@ struct ShutdownContext {
 
 
 static void
-kill_task(void *cbData);
+kill_task (void *cbData);
 
 
 /**
@@ -97,9 +99,9 @@ kill_task(void *cbData);
  * @param cls closure
  */
 static void
-service_shutdown_timeout(void *cls)
+service_shutdown_timeout (void *cls)
 {
-  GNUNET_assert(0);
+  GNUNET_assert (0);
 }
 
 
@@ -112,196 +114,197 @@ service_shutdown_timeout(void *cls)
  * @param error error code
  */
 static void
-mq_error_handler(void *cls,
-                 enum GNUNET_MQ_Error error)
+mq_error_handler (void *cls,
+                  enum GNUNET_MQ_Error error)
 {
   struct ShutdownContext *shutdown_ctx = cls;
 
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Service shutdown complete (MQ error).\n");
-  GNUNET_SCHEDULER_cancel(shutdown_ctx->cancel_task);
-  GNUNET_MQ_destroy(shutdown_ctx->mq);
-  GNUNET_free(shutdown_ctx);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Service shutdown complete (MQ error).\n");
+  GNUNET_SCHEDULER_cancel (shutdown_ctx->cancel_task);
+  GNUNET_MQ_destroy (shutdown_ctx->mq);
+  GNUNET_free (shutdown_ctx);
 }
 
 
 static void
-kill_task(void *cbData)
+kill_task (void *cbData)
 {
   struct ShutdownContext *shutdown_ctx
-    = GNUNET_new(struct ShutdownContext);
+    = GNUNET_new (struct ShutdownContext);
   struct GNUNET_MQ_Envelope *env;
   struct GNUNET_MessageHeader *msg;
   struct GNUNET_MQ_MessageHandler handlers[] = {
-    GNUNET_MQ_handler_end()
+    GNUNET_MQ_handler_end ()
   };
 
   kt = NULL;
   if (trialCount == 13)
-    {
-      LOG("Saw enough kills, asking ARM to stop mock service for good\n");
-      GNUNET_ARM_request_service_stop(arm,
-                                      SERVICE,
-                                      NULL,
-                                      NULL);
-      ok = 0;
-      trialCount++;
-      GNUNET_free(shutdown_ctx);
-      return;
-    }
-  shutdown_ctx->mq = GNUNET_CLIENT_connect(cfg,
-                                           SERVICE,
-                                           handlers,
-                                           &mq_error_handler,
-                                           shutdown_ctx);
-  GNUNET_assert(NULL != shutdown_ctx->mq);
+  {
+    LOG ("Saw enough kills, asking ARM to stop mock service for good\n");
+    GNUNET_ARM_request_service_stop (arm,
+                                     SERVICE,
+                                     NULL,
+                                     NULL);
+    ok = 0;
+    trialCount++;
+    GNUNET_free (shutdown_ctx);
+    return;
+  }
+  shutdown_ctx->mq = GNUNET_CLIENT_connect (cfg,
+                                            SERVICE,
+                                            handlers,
+                                            &mq_error_handler,
+                                            shutdown_ctx);
+  GNUNET_assert (NULL != shutdown_ctx->mq);
   trialCount++;
-  LOG("Sending a shutdown request to the mock service\n");
-  env = GNUNET_MQ_msg(msg,
-                      GNUNET_MESSAGE_TYPE_ARM_STOP);  /* FIXME: abuse of message type */
-  GNUNET_MQ_send(shutdown_ctx->mq,
-                 env);
+  LOG ("Sending a shutdown request to the mock service\n");
+  env = GNUNET_MQ_msg (msg,
+                       GNUNET_MESSAGE_TYPE_ARM_STOP); /* FIXME: abuse of message type */
+  GNUNET_MQ_send (shutdown_ctx->mq,
+                  env);
   shutdown_ctx->cancel_task
-    = GNUNET_SCHEDULER_add_delayed(TIMEOUT,
-                                   &service_shutdown_timeout,
-                                   shutdown_ctx);
+    = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+                                    &service_shutdown_timeout,
+                                    shutdown_ctx);
 }
 
 
 static void
-trigger_disconnect(void *cls)
+trigger_disconnect (void *cls)
 {
-  GNUNET_ARM_disconnect(arm);
-  GNUNET_ARM_monitor_stop(mon);
+  GNUNET_ARM_disconnect (arm);
+  GNUNET_ARM_monitor_stop (mon);
   if (NULL != kt)
-    {
-      GNUNET_SCHEDULER_cancel(kt);
-      kt = NULL;
-    }
+  {
+    GNUNET_SCHEDULER_cancel (kt);
+    kt = NULL;
+  }
 }
 
 
 static void
-arm_stop_cb(void *cls,
-            enum GNUNET_ARM_RequestStatus status,
-            enum GNUNET_ARM_Result result)
+arm_stop_cb (void *cls,
+             enum GNUNET_ARM_RequestStatus status,
+             enum GNUNET_ARM_Result result)
 {
-  GNUNET_break(status == GNUNET_ARM_REQUEST_SENT_OK);
-  GNUNET_break(result == GNUNET_ARM_RESULT_STOPPED);
-  LOG("ARM service stopped\n");
-  GNUNET_SCHEDULER_shutdown();
+  GNUNET_break (status == GNUNET_ARM_REQUEST_SENT_OK);
+  GNUNET_break (result == GNUNET_ARM_RESULT_STOPPED);
+  LOG ("ARM service stopped\n");
+  GNUNET_SCHEDULER_shutdown ();
 }
 
 
 static void
-srv_status(void *cls,
-           const char *service,
-           enum GNUNET_ARM_ServiceMonitorStatus status)
+srv_status (void *cls,
+            const char *service,
+            enum GNUNET_ARM_ServiceMonitorStatus status)
 {
   if (status == GNUNET_ARM_SERVICE_MONITORING_STARTED)
-    {
-      LOG("ARM monitor started, starting mock service\n");
-      phase++;
-      GNUNET_ARM_request_service_start(arm,
-                                       SERVICE,
-                                       GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
-                                       NULL,
-                                       NULL);
-      return;
-    }
-  if (0 != strcasecmp(service, SERVICE))
+  {
+    LOG ("ARM monitor started, starting mock service\n");
+    phase++;
+    GNUNET_ARM_request_service_start (arm,
+                                      SERVICE,
+                                      GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+                                      NULL,
+                                      NULL);
+    return;
+  }
+  if (0 != strcasecmp (service, SERVICE))
     return; /* not what we care about */
   if (phase == 1)
+  {
+    GNUNET_break (status == GNUNET_ARM_SERVICE_STARTING);
+    GNUNET_break (phase == 1);
+    LOG ("do-nothing is starting\n");
+    phase++;
+    ok = 1;
+    GNUNET_assert (NULL == kt);
+    startedWaitingAt = GNUNET_TIME_absolute_get ();
+    kt = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+                                       &kill_task,
+                                       NULL);
+  }
+  else if (phase == 2)
+  {
+    /* We passively monitor ARM for status updates. ARM should tell us
+     * when do-nothing dies (no need to run a service upness test ourselves).
+     */
+    if (status == GNUNET_ARM_SERVICE_STARTING)
     {
-      GNUNET_break(status == GNUNET_ARM_SERVICE_STARTING);
-      GNUNET_break(phase == 1);
-      LOG("do-nothing is starting\n");
-      phase++;
-      ok = 1;
-      GNUNET_assert(NULL == kt);
-      startedWaitingAt = GNUNET_TIME_absolute_get();
-      kt = GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_UNIT_SECONDS,
-                                        &kill_task,
-                                        NULL);
+      waitedFor = GNUNET_TIME_absolute_get_duration (startedWaitingAt);
+      LOG ("Waited for: %s\n",
+           GNUNET_STRINGS_relative_time_to_string (waitedFor,
+                                                   GNUNET_YES));
+
+      LOG ("do-nothing is starting, killing it...\n");
+      GNUNET_assert (NULL == kt);
+      kt = GNUNET_SCHEDULER_add_now (&kill_task, &ok);
     }
-  else if (phase == 2)
+    else if ((status == GNUNET_ARM_SERVICE_STOPPED) && (trialCount == 14))
     {
-      /* We passively monitor ARM for status updates. ARM should tell us
-       * when do-nothing dies (no need to run a service upness test ourselves).
-       */
-      if (status == GNUNET_ARM_SERVICE_STARTING)
-        {
-          waitedFor = GNUNET_TIME_absolute_get_duration(startedWaitingAt);
-          LOG("Waited for: %s\n",
-              GNUNET_STRINGS_relative_time_to_string(waitedFor,
-                                                     GNUNET_YES));
-
-          LOG("do-nothing is starting, killing it...\n");
-          GNUNET_assert(NULL == kt);
-          kt = GNUNET_SCHEDULER_add_now(&kill_task, &ok);
-        }
-      else if ((status == GNUNET_ARM_SERVICE_STOPPED) && (trialCount == 14))
-        {
-          phase++;
-          LOG("do-nothing stopped working %u times, we are done here\n",
-              (unsigned int)trialCount);
-          GNUNET_ARM_request_service_stop(arm,
-                                          "arm",
-                                          &arm_stop_cb,
-                                          NULL);
-        }
+      phase++;
+      LOG ("do-nothing stopped working %u times, we are done here\n",
+           (unsigned int) trialCount);
+      GNUNET_ARM_request_service_stop (arm,
+                                       "arm",
+                                       &arm_stop_cb,
+                                       NULL);
     }
+  }
 }
 
 
 static void
-arm_start_cb(void *cls,
-             enum GNUNET_ARM_RequestStatus status,
-             enum GNUNET_ARM_Result result)
+arm_start_cb (void *cls,
+              enum GNUNET_ARM_RequestStatus status,
+              enum GNUNET_ARM_Result result)
 {
-  GNUNET_break(status == GNUNET_ARM_REQUEST_SENT_OK);
-  GNUNET_break(result == GNUNET_ARM_RESULT_STARTING);
-  GNUNET_break(phase == 0);
-  LOG("Sent 'START' request for arm to ARM %s\n",
-      (status == GNUNET_ARM_REQUEST_SENT_OK) ? "successfully" : "unsuccessfully");
+  GNUNET_break (status == GNUNET_ARM_REQUEST_SENT_OK);
+  GNUNET_break (result == GNUNET_ARM_RESULT_STARTING);
+  GNUNET_break (phase == 0);
+  LOG ("Sent 'START' request for arm to ARM %s\n",
+       (status == GNUNET_ARM_REQUEST_SENT_OK) ? "successfully" :
+       "unsuccessfully");
 }
 
 
 static void
-task(void *cls,
-     char *const *args,
-     const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *c)
+task (void *cls,
+      char *const *args,
+      const char *cfgfile,
+      const struct GNUNET_CONFIGURATION_Handle *c)
 {
   cfg = c;
-  arm = GNUNET_ARM_connect(cfg, NULL, NULL);
+  arm = GNUNET_ARM_connect (cfg, NULL, NULL);
   if (NULL == arm)
-    {
-      GNUNET_break(0);
-      return;
-    }
-  mon = GNUNET_ARM_monitor_start(cfg,
-                                 &srv_status,
-                                 NULL);
+  {
+    GNUNET_break (0);
+    return;
+  }
+  mon = GNUNET_ARM_monitor_start (cfg,
+                                  &srv_status,
+                                  NULL);
   if (NULL == mon)
-    {
-      GNUNET_break(0);
-      GNUNET_ARM_disconnect(arm);
-      arm = NULL;
-      return;
-    }
-  GNUNET_ARM_request_service_start(arm,
-                                   "arm",
-                                   GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
-                                   &arm_start_cb,
-                                   NULL);
-  GNUNET_SCHEDULER_add_shutdown(&trigger_disconnect,
-                                NULL);
+  {
+    GNUNET_break (0);
+    GNUNET_ARM_disconnect (arm);
+    arm = NULL;
+    return;
+  }
+  GNUNET_ARM_request_service_start (arm,
+                                    "arm",
+                                    GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+                                    &arm_start_cb,
+                                    NULL);
+  GNUNET_SCHEDULER_add_shutdown (&trigger_disconnect,
+                                 NULL);
 }
 
 
 static int
-check()
+check ()
 {
   char *const argv[] = {
     "test-exponential-backoff",
@@ -313,14 +316,14 @@ check()
   };
 
   /* Running ARM  and running the do_nothing task */
-  GNUNET_assert(GNUNET_OK ==
-                GNUNET_PROGRAM_run((sizeof(argv) / sizeof(char *)) - 1,
-                                   argv,
-                                   "test-exponential-backoff",
-                                   "nohelp",
-                                   options,
-                                   &task,
-                                   NULL));
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_PROGRAM_run ((sizeof(argv) / sizeof(char *)) - 1,
+                                     argv,
+                                     "test-exponential-backoff",
+                                     "nohelp",
+                                     options,
+                                     &task,
+                                     NULL));
   return ok;
 }
 
@@ -334,78 +337,78 @@ check()
 
 
 static int
-init()
+init ()
 {
   struct GNUNET_CONFIGURATION_Handle *cfg;
   char pwd[PATH_MAX];
   char *binary;
 
-  cfg = GNUNET_CONFIGURATION_create();
-  if (GNUNET_OK != GNUNET_CONFIGURATION_parse(cfg,
-                                              "test_arm_api_data.conf"))
-    {
-      GNUNET_CONFIGURATION_destroy(cfg);
-      return GNUNET_SYSERR;
-    }
-  if (NULL == getcwd(pwd, PATH_MAX))
+  cfg = GNUNET_CONFIGURATION_create ();
+  if (GNUNET_OK != GNUNET_CONFIGURATION_parse (cfg,
+                                               "test_arm_api_data.conf"))
+  {
+    GNUNET_CONFIGURATION_destroy (cfg);
     return GNUNET_SYSERR;
-  GNUNET_assert(0 < GNUNET_asprintf(&binary,
-                                    "%s/%s",
-                                    pwd,
-                                    BINARY));
-  GNUNET_CONFIGURATION_set_value_string(cfg,
-                                        SERVICE,
-                                        "BINARY",
-                                        binary);
-  GNUNET_free(binary);
-  if (GNUNET_OK != GNUNET_CONFIGURATION_write(cfg,
-                                              CFGFILENAME))
-    {
-      GNUNET_CONFIGURATION_destroy(cfg);
-      return GNUNET_SYSERR;
-    }
-  GNUNET_CONFIGURATION_destroy(cfg);
+  }
+  if (NULL == getcwd (pwd, PATH_MAX))
+    return GNUNET_SYSERR;
+  GNUNET_assert (0 < GNUNET_asprintf (&binary,
+                                      "%s/%s",
+                                      pwd,
+                                      BINARY));
+  GNUNET_CONFIGURATION_set_value_string (cfg,
+                                         SERVICE,
+                                         "BINARY",
+                                         binary);
+  GNUNET_free (binary);
+  if (GNUNET_OK != GNUNET_CONFIGURATION_write (cfg,
+                                               CFGFILENAME))
+  {
+    GNUNET_CONFIGURATION_destroy (cfg);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_CONFIGURATION_destroy (cfg);
 
 #if LOG_BACKOFF
-  killLogFileName = GNUNET_DISK_mktemp("exponential-backoff-waiting.log");
-  if (NULL == (killLogFilePtr = fopen(killLogFileName,
-                                      "w")))
-    {
-      GNUNET_log_strerror_file(GNUNET_ERROR_TYPE_WARNING,
-                               "fopen",
-                               killLogFileName);
-      GNUNET_free(killLogFileName);
-      return GNUNET_SYSERR;
-    }
+  killLogFileName = GNUNET_DISK_mktemp ("exponential-backoff-waiting.log");
+  if (NULL == (killLogFilePtr = fopen (killLogFileName,
+                                       "w")))
+  {
+    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+                              "fopen",
+                              killLogFileName);
+    GNUNET_free (killLogFileName);
+    return GNUNET_SYSERR;
+  }
 #endif
   return GNUNET_OK;
 }
 
 
 static void
-houseKeep()
+houseKeep ()
 {
 #if LOG_BACKOFF
-  GNUNET_assert(0 == fclose(killLogFilePtr));
-  GNUNET_free(killLogFileName);
+  GNUNET_assert (0 == fclose (killLogFilePtr));
+  GNUNET_free (killLogFileName);
 #endif
-  (void)unlink(CFGFILENAME);
+  (void) unlink (CFGFILENAME);
 }
 
 
 int
-main(int argc, char *argv[])
+main (int argc, char *argv[])
 {
   int ret;
 
-  GNUNET_log_setup("test-exponential-backoff",
-                   "WARNING",
-                   NULL);
+  GNUNET_log_setup ("test-exponential-backoff",
+                    "WARNING",
+                    NULL);
 
-  if (GNUNET_OK != init())
+  if (GNUNET_OK != init ())
     return 1;
-  ret = check();
-  houseKeep();
+  ret = check ();
+  houseKeep ();
   return ret;
 }