1 files changed, 119 insertions, 118 deletions

diff --git a/src/topology/test_gnunet_daemon_topology.c b/src/topology/test_gnunet_daemon_topology.c
index 9e2db4f66..f6d0e2c2b 100644
--- a/src/topology/test_gnunet_daemon_topology.c
+++ b/src/topology/test_gnunet_daemon_topology.c
@@ -41,7 +41,7 @@
 /**
  * How long until we give up on connecting the peers?
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 60)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
 
 /*
  * Store manual connections.
@@ -71,7 +71,8 @@ static struct GNUNET_SCHEDULER_Task *timeout_tid;
 /*
  * Peer context for every testbed peer.
  */
-struct peerctx {
+struct peerctx
+{
   int index;
   struct GNUNET_STATISTICS_Handle *statistics;
   int connections;
@@ -80,32 +81,32 @@ struct peerctx {
 
 
 static void
-shutdown_task(void *cls)
+shutdown_task (void *cls)
 {
   unsigned int i;
 
-  GNUNET_log(GNUNET_ERROR_TYPE_INFO,
-             "Shutting down testcase\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Shutting down testcase\n");
 
   for (i = 0; i < NUM_PEERS; i++)
-    {
-      if (NULL != op[i])
-        GNUNET_TESTBED_operation_done(op[i]);
-    }
+  {
+    if (NULL != op[i])
+      GNUNET_TESTBED_operation_done (op[i]);
+  }
 
   if (NULL != timeout_tid)
-    GNUNET_SCHEDULER_cancel(timeout_tid);
+    GNUNET_SCHEDULER_cancel (timeout_tid);
 }
 
 static void
-timeout_task(void *cls)
+timeout_task (void *cls)
 {
   timeout_tid = NULL;
-  GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-             "Testcase timeout\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Testcase timeout\n");
 
   result = GNUNET_SYSERR;
-  GNUNET_SCHEDULER_shutdown();
+  GNUNET_SCHEDULER_shutdown ();
 }
 
 /*
@@ -113,174 +114,174 @@ timeout_task(void *cls)
  * peers to a peer changes.
  */
 int
-statistics_iterator(void *cls,
-                    const char *subsystem,
-                    const char *name,
-                    uint64_t value,
-                    int is_persistent)
+statistics_iterator (void *cls,
+                     const char *subsystem,
+                     const char *name,
+                     uint64_t value,
+                     int is_persistent)
 {
-  struct peerctx *p_ctx = (struct peerctx*)cls;
+  struct peerctx *p_ctx = (struct peerctx*) cls;
 
-  GNUNET_log(GNUNET_ERROR_TYPE_INFO,
-             "Peer %d: %s = %llu\n",
-             p_ctx->index,
-             name,
-             (unsigned long long)value);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Peer %d: %s = %llu\n",
+              p_ctx->index,
+              name,
+              (unsigned long long) value);
 
   if (p_ctx->connections < value)
     p_ctx->connections = value;
 
-  if (THRESHOLD <= value && GNUNET_NO == p_ctx->reported)
+  if ((THRESHOLD <= value)&&(GNUNET_NO == p_ctx->reported))
+  {
+    p_ctx->reported = GNUNET_YES;
+    checked_peers++;
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Peer %d successfully connected to at least %d peers once.\n",
+                p_ctx->index,
+                THRESHOLD);
+
+    if (checked_peers == NUM_PEERS)
     {
-      p_ctx->reported = GNUNET_YES;
-      checked_peers++;
-      GNUNET_log(GNUNET_ERROR_TYPE_INFO,
-                 "Peer %d successfully connected to at least %d peers once.\n",
-                 p_ctx->index,
-                 THRESHOLD);
-
-      if (checked_peers == NUM_PEERS)
-        {
-          GNUNET_log(GNUNET_ERROR_TYPE_INFO,
-                     "Test OK: All peers have connected to %d peers once.\n",
-                     THRESHOLD);
-          result = GNUNET_YES;
-          GNUNET_SCHEDULER_shutdown();
-        }
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Test OK: All peers have connected to %d peers once.\n",
+                  THRESHOLD);
+      result = GNUNET_YES;
+      GNUNET_SCHEDULER_shutdown ();
     }
+  }
 
   return GNUNET_YES;
 }
 
 static void *
-ca_statistics(void *cls,
-              const struct GNUNET_CONFIGURATION_Handle *cfg)
+ca_statistics (void *cls,
+               const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  return GNUNET_STATISTICS_create("topology", cfg);
+  return GNUNET_STATISTICS_create ("topology", cfg);
 }
 
 
 void
-da_statistics(void *cls,
-              void *op_result)
+da_statistics (void *cls,
+               void *op_result)
 {
-  struct peerctx *p_ctx = (struct peerctx *)cls;
+  struct peerctx *p_ctx = (struct peerctx *) cls;
 
-  GNUNET_break(GNUNET_OK == GNUNET_STATISTICS_watch_cancel
-                 (p_ctx->statistics, "topology", "# peers connected",
-                 statistics_iterator, p_ctx));
+  GNUNET_break (GNUNET_OK == GNUNET_STATISTICS_watch_cancel
+                  (p_ctx->statistics, "topology", "# peers connected",
+                  statistics_iterator, p_ctx));
 
-  GNUNET_STATISTICS_destroy(p_ctx->statistics, GNUNET_NO);
+  GNUNET_STATISTICS_destroy (p_ctx->statistics, GNUNET_NO);
   p_ctx->statistics = NULL;
 
-  GNUNET_free(p_ctx);
+  GNUNET_free (p_ctx);
 }
 
 
 static void
-service_connect_complete(void *cls,
-                         struct GNUNET_TESTBED_Operation *op,
-                         void *ca_result,
-                         const char *emsg)
+service_connect_complete (void *cls,
+                          struct GNUNET_TESTBED_Operation *op,
+                          void *ca_result,
+                          const char *emsg)
 {
   int ret;
-  struct peerctx *p_ctx = (struct peerctx*)cls;
+  struct peerctx *p_ctx = (struct peerctx*) cls;
 
   if (NULL == ca_result)
-    GNUNET_SCHEDULER_shutdown();
+    GNUNET_SCHEDULER_shutdown ();
 
   p_ctx->statistics = ca_result;
 
-  ret = GNUNET_STATISTICS_watch(ca_result,
-                                "topology",
-                                "# peers connected",
-                                statistics_iterator,
-                                p_ctx);
+  ret = GNUNET_STATISTICS_watch (ca_result,
+                                 "topology",
+                                 "# peers connected",
+                                 statistics_iterator,
+                                 p_ctx);
 
   if (GNUNET_NO == ret)
-    GNUNET_log(GNUNET_ERROR_TYPE_INFO,
-               "call to GNUNET_STATISTICS_watch() failed\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "call to GNUNET_STATISTICS_watch() failed\n");
 }
 
 static void
-notify_connect_complete(void *cls,
-                        struct GNUNET_TESTBED_Operation *op,
-                        const char *emsg)
+notify_connect_complete (void *cls,
+                         struct GNUNET_TESTBED_Operation *op,
+                         const char *emsg)
 {
-  GNUNET_TESTBED_operation_done(op);
+  GNUNET_TESTBED_operation_done (op);
   if (NULL != emsg)
-    {
-      fprintf(stderr, "Failed to connect two peers: %s\n", emsg);
-      result = GNUNET_SYSERR;
-      GNUNET_SCHEDULER_shutdown();
-      return;
-    }
+  {
+    fprintf (stderr, "Failed to connect two peers: %s\n", emsg);
+    result = GNUNET_SYSERR;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
   connect_left--;
 }
 
 static void
-do_connect(void *cls,
-           struct GNUNET_TESTBED_RunHandle *h,
-           unsigned int num_peers,
-           struct GNUNET_TESTBED_Peer **peers,
-           unsigned int links_succeeded,
-           unsigned int links_failed)
+do_connect (void *cls,
+            struct GNUNET_TESTBED_RunHandle *h,
+            unsigned int num_peers,
+            struct GNUNET_TESTBED_Peer **peers,
+            unsigned int links_succeeded,
+            unsigned int links_failed)
 {
   unsigned int i;
   struct peerctx *p_ctx;
 
-  GNUNET_log(GNUNET_ERROR_TYPE_INFO,
-             "Threshold is set to %d.\n",
-             THRESHOLD);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Threshold is set to %d.\n",
+              THRESHOLD);
 
-  GNUNET_assert(NUM_PEERS == num_peers);
+  GNUNET_assert (NUM_PEERS == num_peers);
 
   for (i = 0; i < NUM_PEERS; i++)
+  {
+    p_ctx = GNUNET_new (struct peerctx);
+    p_ctx->index = i;
+    p_ctx->connections = 0;
+    p_ctx->reported = GNUNET_NO;
+
+    if (i < NUM_PEERS - 1)
     {
-      p_ctx = GNUNET_new(struct peerctx);
-      p_ctx->index = i;
-      p_ctx->connections = 0;
-      p_ctx->reported = GNUNET_NO;
-
-      if (i < NUM_PEERS - 1)
-        {
-          connect_left++;
-          GNUNET_TESTBED_overlay_connect(NULL,
-                                         &notify_connect_complete, NULL,
-                                         peers[i], peers[i + 1]);
-        }
-
-      op[i] =
-        GNUNET_TESTBED_service_connect(cls,
-                                       peers[i],
-                                       "statistics",
-                                       service_connect_complete,
-                                       p_ctx,  /* cls of completion cb */
-                                       ca_statistics,  /* connect adapter */
-                                       da_statistics,  /* disconnect adapter */
-                                       p_ctx);
+      connect_left++;
+      GNUNET_TESTBED_overlay_connect (NULL,
+                                      &notify_connect_complete, NULL,
+                                      peers[i], peers[i + 1]);
     }
 
-  GNUNET_SCHEDULER_add_shutdown(&shutdown_task, NULL);
+    op[i] =
+      GNUNET_TESTBED_service_connect (cls,
+                                      peers[i],
+                                      "statistics",
+                                      service_connect_complete,
+                                      p_ctx,   /* cls of completion cb */
+                                      ca_statistics,   /* connect adapter */
+                                      da_statistics,   /* disconnect adapter */
+                                      p_ctx);
+  }
+
+  GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
   timeout_tid =
-    GNUNET_SCHEDULER_add_delayed(TIMEOUT,
-                                 &timeout_task,
-                                 NULL);
+    GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+                                  &timeout_task,
+                                  NULL);
 }
 
 
 int
-main(int argc, char *argv[])
+main (int argc, char *argv[])
 {
   result = GNUNET_SYSERR;
   checked_peers = 0;
 
-  (void)GNUNET_TESTBED_test_run("test-gnunet-daemon-topology",
-                                "test_gnunet_daemon_topology_data.conf",
-                                NUM_PEERS,
-                                0, NULL, NULL,
-                                &do_connect, NULL);
-  GNUNET_DISK_directory_remove("/tmp/test-gnunet-topology");
+  (void) GNUNET_TESTBED_test_run ("test-gnunet-daemon-topology",
+                                  "test_gnunet_daemon_topology_data.conf",
+                                  NUM_PEERS,
+                                  0, NULL, NULL,
+                                  &do_connect, NULL);
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-topology");
 
   return (GNUNET_OK != result) ? 1 : 0;
 }