indentation

1 files changed, 89 insertions, 119 deletions

diff --git a/src/testing/test_testing_topology.c b/src/testing/test_testing_topology.c
index 73b49e469..27ad0a24c 100644
--- a/src/testing/test_testing_topology.c
+++ b/src/testing/test_testing_topology.c
@@ -193,9 +193,9 @@ gather_log_data ()
 
   GNUNET_asprintf (&peer_number, "%llu", num_peers);
   GNUNET_asprintf (&connect_number, "%llu", expected_connections);
-  mem_process = GNUNET_OS_start_process (NULL, NULL, "./memsize.pl",
-                                         "memsize.pl", "totals.txt",
-                                         peer_number, connect_number, NULL);
+  mem_process =
+      GNUNET_OS_start_process (NULL, NULL, "./memsize.pl", "memsize.pl",
+                               "totals.txt", peer_number, connect_number, NULL);
   GNUNET_OS_process_wait (mem_process);
   GNUNET_OS_process_close (mem_process);
   mem_process = NULL;
@@ -265,15 +265,13 @@ disconnect_cores (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   /* Disconnect from the respective cores */
 #if VERBOSE > 1
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Disconnecting from peer 1 `%4s'\n",
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from peer 1 `%4s'\n",
               GNUNET_i2s (&pos->peer1->id));
 #endif
   if (pos->peer1handle != NULL)
     GNUNET_CORE_disconnect (pos->peer1handle);
 #if VERBOSE > 1
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Disconnecting from peer 2 `%4s'\n",
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from peer 2 `%4s'\n",
               GNUNET_i2s (&pos->peer2->id));
 #endif
   if (pos->peer2handle != NULL)
@@ -305,20 +303,18 @@ stats_finished (void *cls, int result)
  * @return GNUNET_OK to continue, GNUNET_SYSERR to abort iteration
  */
 static int
-stats_print (void *cls,
-             const struct GNUNET_PeerIdentity *peer,
-             const char *subsystem,
-             const char *name, uint64_t value, int is_persistent)
+stats_print (void *cls, const struct GNUNET_PeerIdentity *peer,
+             const char *subsystem, const char *name, uint64_t value,
+             int is_persistent)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%s:%s:%s -- %llu\n",
-              GNUNET_i2s (peer), subsystem, name, value);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%s:%s:%s -- %llu\n", GNUNET_i2s (peer),
+              subsystem, name, value);
   return GNUNET_OK;
 }
 #endif
 
 static void
-topology_cb (void *cls,
-             const struct GNUNET_PeerIdentity *first,
+topology_cb (void *cls, const struct GNUNET_PeerIdentity *first,
              const struct GNUNET_PeerIdentity *second, const char *emsg)
 {
   FILE *outfile = cls;
@@ -350,8 +346,7 @@ topology_cb (void *cls,
 }
 
 static int
-process_mtype (void *cls,
-               const struct GNUNET_PeerIdentity *peer,
+process_mtype (void *cls, const struct GNUNET_PeerIdentity *peer,
                const struct GNUNET_MessageHeader *message,
                const struct GNUNET_TRANSPORT_ATS_Information *atsi)
 {
@@ -370,8 +365,8 @@ process_mtype (void *cls,
       fprintf (stdout, "0%%");
     else
       fprintf (stdout, "%d%%",
-               (int) (((float) total_messages_received /
-                       expected_messages) * 100));
+               (int) (((float) total_messages_received / expected_messages) *
+                      100));
 
   }
   else if (total_messages_received % dotnum == 0)
@@ -502,8 +497,7 @@ static struct GNUNET_CORE_MessageHandler handlers[] = {
 };
 
 static void
-init_notify_peer2 (void *cls,
-                   struct GNUNET_CORE_Handle *server,
+init_notify_peer2 (void *cls, struct GNUNET_CORE_Handle *server,
                    const struct GNUNET_PeerIdentity *my_identity,
                    const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded
                    *publicKey)
@@ -521,14 +515,11 @@ init_notify_peer2 (void *cls,
                 GNUNET_i2s (my_identity),
                 GNUNET_h2s (&pos->peer1->id.hashPubKey));
 #endif
-    if (NULL == GNUNET_CORE_notify_transmit_ready (pos->peer1handle,
-                                                   GNUNET_YES,
-                                                   0,
-                                                   TIMEOUT,
-                                                   &pos->peer2->id,
-                                                   sizeof (struct
-                                                           GNUNET_TestMessage),
-                                                   &transmit_ready, pos))
+    if (NULL ==
+        GNUNET_CORE_notify_transmit_ready (pos->peer1handle, GNUNET_YES, 0,
+                                           TIMEOUT, &pos->peer2->id,
+                                           sizeof (struct GNUNET_TestMessage),
+                                           &transmit_ready, pos))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "RECEIVED NULL when asking core (1) for transmission to peer `%4s'\n",
@@ -550,9 +541,7 @@ init_notify_peer2 (void *cls,
  * @param atsi performance data for the connection
  */
 static void
-connect_notify_peers (void *cls,
-                      const struct
-                      GNUNET_PeerIdentity *peer,
+connect_notify_peers (void *cls, const struct GNUNET_PeerIdentity *peer,
                       const struct GNUNET_TRANSPORT_ATS_Information *atsi)
 {
   struct TestMessageContext *pos = cls;
@@ -577,14 +566,11 @@ connect_notify_peers (void *cls,
                 GNUNET_i2s (&pos->peer2->id),
                 GNUNET_h2s (&pos->peer1->id.hashPubKey));
 #endif
-    if (NULL == GNUNET_CORE_notify_transmit_ready (pos->peer1handle,
-                                                   GNUNET_YES,
-                                                   0,
-                                                   TIMEOUT,
-                                                   &pos->peer2->id,
-                                                   sizeof (struct
-                                                           GNUNET_TestMessage),
-                                                   &transmit_ready, pos))
+    if (NULL ==
+        GNUNET_CORE_notify_transmit_ready (pos->peer1handle, GNUNET_YES, 0,
+                                           TIMEOUT, &pos->peer2->id,
+                                           sizeof (struct GNUNET_TestMessage),
+                                           &transmit_ready, pos))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "RECEIVED NULL when asking core (1) for transmission to peer `%4s'\n",
@@ -599,8 +585,7 @@ connect_notify_peers (void *cls,
 }
 
 static void
-init_notify_peer1 (void *cls,
-                   struct GNUNET_CORE_Handle *server,
+init_notify_peer1 (void *cls, struct GNUNET_CORE_Handle *server,
                    const struct GNUNET_PeerIdentity *my_identity,
                    const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded
                    *publicKey)
@@ -618,15 +603,10 @@ init_notify_peer1 (void *cls,
   /*
    * Connect to the receiving peer
    */
-  pos->peer2handle = GNUNET_CORE_connect (pos->peer2->cfg,
-                                          1,
-                                          pos,
-                                          &init_notify_peer2,
-                                          NULL,
-                                          NULL,
-                                          NULL, NULL,
-                                          GNUNET_YES, NULL, GNUNET_YES,
-                                          handlers);
+  pos->peer2handle =
+      GNUNET_CORE_connect (pos->peer2->cfg, 1, pos, &init_notify_peer2, NULL,
+                           NULL, NULL, NULL, GNUNET_YES, NULL, GNUNET_YES,
+                           handlers);
 
 }
 
@@ -646,9 +626,9 @@ send_test_messages (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   if (die_task == GNUNET_SCHEDULER_NO_TASK)
   {
-    die_task = GNUNET_SCHEDULER_add_delayed (TEST_TIMEOUT,
-                                             &end_badly,
-                                             "from send test messages (timeout)");
+    die_task =
+        GNUNET_SCHEDULER_add_delayed (TEST_TIMEOUT, &end_badly,
+                                      "from send test messages (timeout)");
   }
 
   if (total_server_connections >= MAX_OUTSTANDING_CONNECTIONS)
@@ -662,15 +642,10 @@ send_test_messages (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   /*
    * Connect to the sending peer
    */
-  pos->peer1handle = GNUNET_CORE_connect (pos->peer1->cfg,
-                                          1,
-                                          pos,
-                                          &init_notify_peer1,
-                                          &connect_notify_peers, NULL,
-                                          NULL,
-                                          NULL,
-                                          GNUNET_NO, NULL, GNUNET_NO,
-                                          no_handlers);
+  pos->peer1handle =
+      GNUNET_CORE_connect (pos->peer1->cfg, 1, pos, &init_notify_peer1,
+                           &connect_notify_peers, NULL, NULL, NULL, GNUNET_NO,
+                           NULL, GNUNET_NO, no_handlers);
 
   GNUNET_assert (pos->peer1handle != NULL);
 
@@ -688,10 +663,8 @@ send_test_messages (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 void
-topology_callback (void *cls,
-                   const struct GNUNET_PeerIdentity *first,
-                   const struct GNUNET_PeerIdentity *second,
-                   uint32_t distance,
+topology_callback (void *cls, const struct GNUNET_PeerIdentity *first,
+                   const struct GNUNET_PeerIdentity *second, uint32_t distance,
                    const struct GNUNET_CONFIGURATION_Handle *first_cfg,
                    const struct GNUNET_CONFIGURATION_Handle *second_cfg,
                    struct GNUNET_TESTING_Daemon *first_daemon,
@@ -709,8 +682,8 @@ topology_callback (void *cls,
         fprintf (stdout, "0%%");
       else
         fprintf (stdout, "%d%%",
-                 (int) (((float) total_connections /
-                         expected_connections) * 100));
+                 (int) (((float) total_connections / expected_connections) *
+                        100));
 
     }
     else if (total_connections % dotnum == 0)
@@ -833,12 +806,11 @@ connect_topology ()
         GNUNET_TESTING_connect_topology (pg, connection_topology,
                                          connect_topology_option,
                                          connect_topology_option_modifier,
-                                         connect_timeout,
-                                         connect_attempts,
+                                         connect_timeout, connect_attempts,
                                          &topology_creation_finished, NULL);
 #if PROGRESS_BARS
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Have %d expected connections\n", expected_connections);
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Have %d expected connections\n",
+                expected_connections);
 #endif
   }
 
@@ -851,11 +823,12 @@ connect_topology ()
     return;
   }
 
-  die_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                           (GNUNET_TIME_UNIT_SECONDS,
-                                            SECONDS_PER_PEER_START * num_peers),
-                                           &end_badly,
-                                           "from connect topology (timeout)");
+  die_task =
+      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+                                    (GNUNET_TIME_UNIT_SECONDS,
+                                     SECONDS_PER_PEER_START * num_peers),
+                                    &end_badly,
+                                    "from connect topology (timeout)");
   modnum = expected_connections / 4;
   dotnum = (expected_connections / 50) + 1;
   if (modnum == 0)
@@ -889,17 +862,17 @@ create_topology ()
                                   "from create topology (bad return)");
   }
   GNUNET_SCHEDULER_cancel (die_task);
-  die_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                           (GNUNET_TIME_UNIT_SECONDS,
-                                            SECONDS_PER_PEER_START * num_peers),
-                                           &end_badly,
-                                           "from continue startup (timeout)");
+  die_task =
+      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+                                    (GNUNET_TIME_UNIT_SECONDS,
+                                     SECONDS_PER_PEER_START * num_peers),
+                                    &end_badly,
+                                    "from continue startup (timeout)");
 }
 
 
 static void
-peers_started_callback (void *cls,
-                        const struct GNUNET_PeerIdentity *id,
+peers_started_callback (void *cls, const struct GNUNET_PeerIdentity *id,
                         const struct GNUNET_CONFIGURATION_Handle *cfg,
                         struct GNUNET_TESTING_Daemon *d, const char *emsg)
 {
@@ -943,10 +916,10 @@ peers_started_callback (void *cls,
     GNUNET_SCHEDULER_cancel (die_task);
     /* Set up task in case topology creation doesn't finish
      * within a reasonable amount of time */
-    die_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                             (GNUNET_TIME_UNIT_MINUTES, 8),
-                                             &end_badly,
-                                             "from peers_started_callback");
+    die_task =
+        GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+                                      (GNUNET_TIME_UNIT_MINUTES, 8), &end_badly,
+                                      "from peers_started_callback");
 #if DELAY_FOR_LOGGING
     fprintf (stdout, "Connecting topology in 10 seconds\n");
     gather_log_data ();
@@ -969,8 +942,7 @@ peers_started_callback (void *cls,
  * @param emsg non-null on failure
  */
 void
-hostkey_callback (void *cls,
-                  const struct GNUNET_PeerIdentity *id,
+hostkey_callback (void *cls, const struct GNUNET_PeerIdentity *id,
                   struct GNUNET_TESTING_Daemon *d, const char *emsg)
 {
   if (emsg != NULL)
@@ -981,8 +953,8 @@ hostkey_callback (void *cls,
 
 #if VERBOSE > 1
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Hostkey (%d/%d) created for peer `%s'\n",
-              num_peers - peers_left, num_peers, GNUNET_i2s (id));
+              "Hostkey (%d/%d) created for peer `%s'\n", num_peers - peers_left,
+              num_peers, GNUNET_i2s (id));
 #endif
 
 #if PROGRESS_BARS
@@ -1012,18 +984,17 @@ hostkey_callback (void *cls,
     GNUNET_SCHEDULER_cancel (die_task);
     /* Set up task in case topology creation doesn't finish
      * within a reasonable amount of time */
-    die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
-                                             &end_badly,
-                                             "from create_topology");
+    die_task =
+        GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly,
+                                      "from create_topology");
     GNUNET_SCHEDULER_add_now (&create_topology, NULL);
     ok = 0;
   }
 }
 
 static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
+run (void *cls, char *const *args, const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   char *topology_str;
   char *connect_topology_str;
@@ -1056,8 +1027,8 @@ run (void *cls,
 
   if ((GNUNET_YES ==
        GNUNET_CONFIGURATION_get_value_string (cfg, "testing", "topology",
-                                              &topology_str))
-      && (GNUNET_NO == GNUNET_TESTING_topology_get (&topology, topology_str)))
+                                              &topology_str)) &&
+      (GNUNET_NO == GNUNET_TESTING_topology_get (&topology, topology_str)))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 "Invalid topology `%s' given for section %s option %s\n",
@@ -1068,10 +1039,10 @@ run (void *cls,
   if ((GNUNET_YES ==
        GNUNET_CONFIGURATION_get_value_string (cfg, "testing",
                                               "connect_topology",
-                                              &connect_topology_str))
-      && (GNUNET_NO ==
-          GNUNET_TESTING_topology_get (&connection_topology,
-                                       connect_topology_str)))
+                                              &connect_topology_str)) &&
+      (GNUNET_NO ==
+       GNUNET_TESTING_topology_get (&connection_topology,
+                                    connect_topology_str)))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 "Invalid connect topology `%s' given for section %s option %s\n",
@@ -1081,10 +1052,10 @@ run (void *cls,
   if ((GNUNET_YES ==
        GNUNET_CONFIGURATION_get_value_string (cfg, "testing",
                                               "connect_topology_option",
-                                              &connect_topology_option_str))
-      && (GNUNET_NO ==
-          GNUNET_TESTING_topology_option_get (&connect_topology_option,
-                                              connect_topology_option_str)))
+                                              &connect_topology_option_str)) &&
+      (GNUNET_NO ==
+       GNUNET_TESTING_topology_option_get (&connect_topology_option,
+                                           connect_topology_option_str)))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 "Invalid connect topology option `%s' given for section %s option %s\n",
@@ -1120,10 +1091,10 @@ run (void *cls,
   if ((GNUNET_YES ==
        GNUNET_CONFIGURATION_get_value_string (cfg, "testing",
                                               "blacklist_topology",
-                                              &blacklist_topology_str))
-      && (GNUNET_NO ==
-          GNUNET_TESTING_topology_get (&blacklist_topology,
-                                       blacklist_topology_str)))
+                                              &blacklist_topology_str)) &&
+      (GNUNET_NO ==
+       GNUNET_TESTING_topology_get (&blacklist_topology,
+                                    blacklist_topology_str)))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 "Invalid topology `%s' given for section %s option %s\n",
@@ -1196,10 +1167,8 @@ run (void *cls,
                                     "didn't generate all hostkeys within a reasonable amount of time!!!");
 
   GNUNET_assert (num_peers > 0 && num_peers < (unsigned int) -1);
-  pg = GNUNET_TESTING_daemons_start (cfg,
-                                     peers_left,
-                                     max_outstanding_connections,
-                                     peers_left,
+  pg = GNUNET_TESTING_daemons_start (cfg, peers_left,
+                                     max_outstanding_connections, peers_left,
                                      GNUNET_TIME_relative_multiply
                                      (GNUNET_TIME_UNIT_SECONDS,
                                       SECONDS_PER_PEER_START * num_peers),
@@ -1231,8 +1200,9 @@ check ()
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
-  ret = GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
-                            argv, binary_name, "nohelp", options, &run, &ok);
+  ret =
+      GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
+                          binary_name, "nohelp", options, &run, &ok);
   if (ret != GNUNET_OK)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,