1 files changed, 157 insertions, 171 deletions

diff --git a/src/core/test_core_api_preferences.c b/src/core/test_core_api_preferences.c
index cc55f1644..200ae4176 100644
--- a/src/core/test_core_api_preferences.c
+++ b/src/core/test_core_api_preferences.c
@@ -41,7 +41,7 @@ struct PeerContext
 {
   struct GNUNET_CONFIGURATION_Handle *cfg;
   struct GNUNET_CORE_Handle *ch;
-  struct GNUNET_PeerIdentity id;   
+  struct GNUNET_PeerIdentity id;
   struct GNUNET_TRANSPORT_Handle *th;
   struct GNUNET_MessageHeader *hello;
   int connect_status;
@@ -75,13 +75,14 @@ static GNUNET_SCHEDULER_TaskIdentifier ask_task;
 static unsigned int total_reserve = 5;
 
 
-static void process_hello (void *cls, const struct GNUNET_MessageHeader *message);
+static void process_hello (void *cls,
+                           const struct GNUNET_MessageHeader *message);
 
 static void
 terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
 #if VERBOSE
-  fprintf(stderr, "Regular shutdown\n");
+  fprintf (stderr, "Regular shutdown\n");
 #endif
   GNUNET_assert (ok == 6);
   GNUNET_assert (NULL == irc);
@@ -100,24 +101,24 @@ terminate_task_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   err_task = GNUNET_SCHEDULER_NO_TASK;
 #if VERBOSE
-  fprintf(stderr, "ENDING ANGRILY %u\n", ok);
+  fprintf (stderr, "ENDING ANGRILY %u\n", ok);
 #endif
   GNUNET_break (0);
   if (NULL != irc)
-    {
-      GNUNET_CORE_peer_change_preference_cancel (irc);
-      irc = NULL;
-    }
+  {
+    GNUNET_CORE_peer_change_preference_cancel (irc);
+    irc = NULL;
+  }
   if (GNUNET_SCHEDULER_NO_TASK != irc_task)
-    {
-      GNUNET_SCHEDULER_cancel (irc_task);
-      irc_task = GNUNET_SCHEDULER_NO_TASK;
-    }
+  {
+    GNUNET_SCHEDULER_cancel (irc_task);
+    irc_task = GNUNET_SCHEDULER_NO_TASK;
+  }
   if (GNUNET_SCHEDULER_NO_TASK != ask_task)
-    {
-      GNUNET_SCHEDULER_cancel (ask_task);
-      ask_task = GNUNET_SCHEDULER_NO_TASK;
-    }
+  {
+    GNUNET_SCHEDULER_cancel (ask_task);
+    ask_task = GNUNET_SCHEDULER_NO_TASK;
+  }
   GNUNET_TRANSPORT_get_hello_cancel (p1.th, &process_hello, &p1);
   GNUNET_TRANSPORT_get_hello_cancel (p2.th, &process_hello, &p2);
   GNUNET_CORE_disconnect (p1.ch);
@@ -142,160 +143,151 @@ transmit_ready (void *cls, size_t size, void *buf)
   m = (struct GNUNET_MessageHeader *) buf;
   m->type = htons (MTYPE);
   m->size = htons (sizeof (struct GNUNET_MessageHeader));
-  err_task = 
-    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 120), 
-                                  &terminate_task_error, NULL);
+  err_task =
+      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+                                    (GNUNET_TIME_UNIT_SECONDS, 120),
+                                    &terminate_task_error, NULL);
 
   return sizeof (struct GNUNET_MessageHeader);
 }
 
 static void
 preference_cb (void *cls,
-               const struct
-               GNUNET_PeerIdentity *peer,
-               struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
-               int32_t amount,
-               struct GNUNET_TIME_Relative res_delay,
-               uint64_t preference);
+               const struct
+               GNUNET_PeerIdentity *peer,
+               struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
+               int32_t amount,
+               struct GNUNET_TIME_Relative res_delay, uint64_t preference);
 
 static void
-do_reserve (void *cls,
-            const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_reserve (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct PeerContext *pc = cls;
 
   irc_task = GNUNET_SCHEDULER_NO_TASK;
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Aborted during attempt to request reservation\n");
-      return;
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Aborted during attempt to request reservation\n");
+    return;
+  }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Requesting reservatin of 32k from core in 1s!\n");
+              "Requesting reservatin of 32k from core in 1s!\n");
   irc = GNUNET_CORE_peer_change_preference (p1.ch,
-                                            &p2.id,
-                                            GNUNET_TIME_UNIT_SECONDS,
-                                            GNUNET_BANDWIDTH_VALUE_MAX,
-                                            1000000 /* bandwidth for 1s */,
-                                            0,
-                                            &preference_cb,
-                                            pc);
+                                            &p2.id,
+                                            GNUNET_TIME_UNIT_SECONDS,
+                                            GNUNET_BANDWIDTH_VALUE_MAX,
+                                            1000000 /* bandwidth for 1s */ ,
+                                            0, &preference_cb, pc);
 }
 
 static void
 preference_cb (void *cls,
-               const struct
-               GNUNET_PeerIdentity *peer,
-               struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
-               int32_t amount,
-               struct GNUNET_TIME_Relative res_delay,
-               uint64_t preference)
+               const struct
+               GNUNET_PeerIdentity *peer,
+               struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
+               int32_t amount,
+               struct GNUNET_TIME_Relative res_delay, uint64_t preference)
 {
   struct PeerContext *pc = cls;
 
   irc = NULL;
   if (0 == amount)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Delaying reservation request by %llu ms!\n",
-                  (unsigned long long) res_delay.rel_value);
-      irc_task = GNUNET_SCHEDULER_add_delayed (res_delay,
-                                               &do_reserve, pc);
-      return;
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Delaying reservation request by %llu ms!\n",
+                (unsigned long long) res_delay.rel_value);
+    irc_task = GNUNET_SCHEDULER_add_delayed (res_delay, &do_reserve, pc);
+    return;
+  }
   total_reserve--;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Reservation done!\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Reservation done!\n");
   if (total_reserve > 0)
-    {
-      irc_task = GNUNET_SCHEDULER_add_now (&do_reserve, pc);
-      return;
-    }
+  {
+    irc_task = GNUNET_SCHEDULER_add_now (&do_reserve, pc);
+    return;
+  }
   GNUNET_SCHEDULER_cancel (err_task);
   err_task = GNUNET_SCHEDULER_NO_TASK;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Asking core (1) for transmission to peer `%4s'\n",
-              GNUNET_i2s (&p2.id));
+              "Asking core (1) for transmission to peer `%4s'\n",
+              GNUNET_i2s (&p2.id));
   if (NULL == (th = GNUNET_CORE_notify_transmit_ready (p1.ch,
-                                                       GNUNET_YES,
-                                                       0,
-                                                       GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 45),
-                                                       &p2.id,
-                                                       sizeof (struct GNUNET_MessageHeader),
-                                                       &transmit_ready, &p1)))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "RECEIVED NULL when asking core (1) for transmission to peer `%4s'\n",
-                  GNUNET_i2s (&p2.id));
-    }    
+                                                       GNUNET_YES,
+                                                       0,
+                                                       GNUNET_TIME_relative_multiply
+                                                       (GNUNET_TIME_UNIT_SECONDS,
+                                                        45), &p2.id,
+                                                       sizeof (struct
+                                                               GNUNET_MessageHeader),
+                                                       &transmit_ready, &p1)))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "RECEIVED NULL when asking core (1) for transmission to peer `%4s'\n",
+                GNUNET_i2s (&p2.id));
+  }
 }
 
 
 static void
 connect_notify (void *cls,
                 const struct GNUNET_PeerIdentity *peer,
-                const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+                const struct GNUNET_TRANSPORT_ATS_Information *atsi)
 {
   struct PeerContext *pc = cls;
 
-  if (0 == memcmp (&pc->id,
-                   peer,
-                   sizeof (struct GNUNET_PeerIdentity)))
+  if (0 == memcmp (&pc->id, peer, sizeof (struct GNUNET_PeerIdentity)))
     return;
   GNUNET_assert (pc->connect_status == 0);
   pc->connect_status = 1;
   if (pc == &p1)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Encrypted connection established to peer `%4s'\n",
+                GNUNET_i2s (peer));
+    if (GNUNET_SCHEDULER_NO_TASK != ask_task)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Encrypted connection established to peer `%4s'\n",
-                  GNUNET_i2s (peer));
-      if (GNUNET_SCHEDULER_NO_TASK != ask_task)
-        {
-          GNUNET_SCHEDULER_cancel (ask_task);
-          ask_task = GNUNET_SCHEDULER_NO_TASK;
-        }
-      GNUNET_SCHEDULER_cancel (err_task);
-      err_task = 
-        GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 120), 
-                                      &terminate_task_error, NULL);
-      irc_task = GNUNET_SCHEDULER_add_now (&do_reserve, pc);
+      GNUNET_SCHEDULER_cancel (ask_task);
+      ask_task = GNUNET_SCHEDULER_NO_TASK;
     }
+    GNUNET_SCHEDULER_cancel (err_task);
+    err_task =
+        GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+                                      (GNUNET_TIME_UNIT_SECONDS, 120),
+                                      &terminate_task_error, NULL);
+    irc_task = GNUNET_SCHEDULER_add_now (&do_reserve, pc);
+  }
 }
 
 
 static void
-disconnect_notify (void *cls,
-                   const struct GNUNET_PeerIdentity *peer)
+disconnect_notify (void *cls, const struct GNUNET_PeerIdentity *peer)
 {
   struct PeerContext *pc = cls;
 
-  if (0 == memcmp (&pc->id,
-                   peer,
-                   sizeof (struct GNUNET_PeerIdentity)))
+  if (0 == memcmp (&pc->id, peer, sizeof (struct GNUNET_PeerIdentity)))
     return;
   pc->connect_status = 0;
   if (GNUNET_SCHEDULER_NO_TASK != irc_task)
+  {
+    GNUNET_SCHEDULER_cancel (irc_task);
+    irc_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+  if (0 == memcmp (peer, &p1.id, sizeof (struct GNUNET_PeerIdentity)))
+  {
+    if (irc != NULL)
     {
-      GNUNET_SCHEDULER_cancel (irc_task);
-      irc_task = GNUNET_SCHEDULER_NO_TASK;
+      GNUNET_CORE_peer_change_preference_cancel (irc);
+      irc = NULL;
     }
-  if (0 == memcmp (peer, &p1.id, sizeof (struct GNUNET_PeerIdentity)))
+    if (th != NULL)
     {
-      if (irc != NULL) 
-        {
-          GNUNET_CORE_peer_change_preference_cancel (irc);
-          irc = NULL;
-        }
-      if (th != NULL)
-        {
-          GNUNET_CORE_notify_transmit_ready_cancel (th);
-          th = NULL;
-        }
+      GNUNET_CORE_notify_transmit_ready_cancel (th);
+      th = NULL;
     }
+  }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Encrypted connection to `%4s' cut\n", 
-              GNUNET_i2s (peer));
+              "Encrypted connection to `%4s' cut\n", GNUNET_i2s (peer));
 }
 
 
@@ -303,7 +295,7 @@ static int
 inbound_notify (void *cls,
                 const struct GNUNET_PeerIdentity *other,
                 const struct GNUNET_MessageHeader *message,
-                const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+                const struct GNUNET_TRANSPORT_ATS_Information *atsi)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Core provides inbound data from `%4s'.\n", GNUNET_i2s (other));
@@ -315,7 +307,7 @@ static int
 outbound_notify (void *cls,
                  const struct GNUNET_PeerIdentity *other,
                  const struct GNUNET_MessageHeader *message,
-                 const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+                 const struct GNUNET_TRANSPORT_ATS_Information *atsi)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Core notifies about outbound data for `%4s'.\n",
@@ -329,7 +321,7 @@ static int
 process_mtype (void *cls,
                const struct GNUNET_PeerIdentity *peer,
                const struct GNUNET_MessageHeader *message,
-               const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+               const struct GNUNET_TRANSPORT_ATS_Information *atsi)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Receiving message from `%4s'.\n", GNUNET_i2s (peer));
@@ -349,19 +341,16 @@ static struct GNUNET_CORE_MessageHandler handlers[] = {
 
 
 
-static void 
-ask_connect_task (void *cls,
-                  const struct GNUNET_SCHEDULER_TaskContext *tc)
+static void
+ask_connect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   ask_task =
-    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                  &ask_connect_task, NULL);
+      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+                                    &ask_connect_task, NULL);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Asking core (1) AGAIN to connect to peer `%4s'\n",
-              GNUNET_i2s (&p2.id));
-  GNUNET_CORE_peer_request_connect (p1.ch,
-                                    &p2.id,
-                                    NULL, NULL);
+              "Asking core (1) AGAIN to connect to peer `%4s'\n",
+              GNUNET_i2s (&p2.id));
+  GNUNET_CORE_peer_request_connect (p1.ch, &p2.id, NULL, NULL);
 }
 
 
@@ -380,52 +369,48 @@ init_notify (void *cls,
   p->id = *my_identity;
   p->ch = server;
   if (cls == &p1)
-    {
-      GNUNET_assert (ok == 2);
-      OKPP;
-      /* connect p2 */
-      GNUNET_CORE_connect (p2.cfg, 1,
-                           &p2,
-                           &init_notify,                         
-                           &connect_notify,
-                           &disconnect_notify,
-                           NULL,
-                           &inbound_notify,
-                           GNUNET_YES,
-                           &outbound_notify, GNUNET_YES, handlers);
-    }
+  {
+    GNUNET_assert (ok == 2);
+    OKPP;
+    /* connect p2 */
+    GNUNET_CORE_connect (p2.cfg, 1,
+                         &p2,
+                         &init_notify,
+                         &connect_notify,
+                         &disconnect_notify,
+                         NULL,
+                         &inbound_notify,
+                         GNUNET_YES, &outbound_notify, GNUNET_YES, handlers);
+  }
   else
-    {
-      GNUNET_assert (ok == 3);
-      OKPP;
-      GNUNET_assert (cls == &p2);
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Asking core (1) to connect to peer `%4s'\n",
-                  GNUNET_i2s (&p2.id));
-      err_task = 
-        GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 60), 
-                                      &terminate_task_error, NULL);
-      if (GNUNET_SCHEDULER_NO_TASK != ask_task)
-        GNUNET_SCHEDULER_cancel (ask_task);
-      ask_task =
-        GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                      &ask_connect_task, NULL);
-      GNUNET_CORE_peer_request_connect (p1.ch,
-                                        &p2.id,
-                                        NULL, NULL);
-    }
+  {
+    GNUNET_assert (ok == 3);
+    OKPP;
+    GNUNET_assert (cls == &p2);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Asking core (1) to connect to peer `%4s'\n",
+                GNUNET_i2s (&p2.id));
+    err_task =
+        GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+                                      (GNUNET_TIME_UNIT_SECONDS, 60),
+                                      &terminate_task_error, NULL);
+    if (GNUNET_SCHEDULER_NO_TASK != ask_task)
+      GNUNET_SCHEDULER_cancel (ask_task);
+    ask_task =
+        GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+                                      &ask_connect_task, NULL);
+    GNUNET_CORE_peer_request_connect (p1.ch, &p2.id, NULL, NULL);
+  }
 }
 
 
 static void
-process_hello (void *cls,
-               const struct GNUNET_MessageHeader *message)
+process_hello (void *cls, const struct GNUNET_MessageHeader *message)
 {
   struct PeerContext *p = cls;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received (my) `%s' from transport service\n",
-              "HELLO");
+              "Received (my) `%s' from transport service\n", "HELLO");
   GNUNET_assert (message != NULL);
   p->hello = GNUNET_malloc (ntohs (message->size));
   memcpy (p->hello, message, ntohs (message->size));
@@ -448,11 +433,11 @@ setup_peer (struct PeerContext *p, const char *cfgname)
   p->cfg = GNUNET_CONFIGURATION_create ();
 #if START_ARM
   p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
-                                        "gnunet-service-arm",
+                                         "gnunet-service-arm",
 #if VERBOSE
-                                        "-L", "DEBUG",
+                                         "-L", "DEBUG",
 #endif
-                                        "-c", cfgname, NULL);
+                                         "-c", cfgname, NULL);
 #endif
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
   p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, NULL, NULL);
@@ -464,8 +449,7 @@ setup_peer (struct PeerContext *p, const char *cfgname)
 static void
 run (void *cls,
      char *const *args,
-     const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+     const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   GNUNET_assert (ok == 1);
   OKPP;
@@ -474,9 +458,9 @@ run (void *cls,
   GNUNET_CORE_connect (p1.cfg, 1,
                        &p1,
                        &init_notify,
-                       &connect_notify,
+                       &connect_notify,
                        &disconnect_notify,
-                       NULL,
+                       NULL,
                        &inbound_notify,
                        GNUNET_YES, &outbound_notify, GNUNET_YES, handlers);
 }
@@ -487,10 +471,11 @@ stop_arm (struct PeerContext *p)
 #if START_ARM
   if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-  if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
+  if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK)
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
+              "ARM process %u stopped\n",
+              GNUNET_OS_process_get_pid (p->arm_proc));
   GNUNET_OS_process_close (p->arm_proc);
   p->arm_proc = NULL;
 #endif
@@ -513,7 +498,8 @@ check ()
   };
   ok = 1;
   GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
-                      argv, "test-core-api-preferences", "nohelp", options, &run, &ok);
+                      argv, "test-core-api-preferences", "nohelp", options,
+                      &run, &ok);
   stop_arm (&p1);
   stop_arm (&p2);
   return ok;
@@ -532,7 +518,7 @@ main (int argc, char *argv[])
 #endif
                     NULL);
   ret = check ();
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-1"); 
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-1");
   GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-2");
 
   return ret;