1 files changed, 155 insertions, 176 deletions

diff --git a/src/chat/test_chat.c b/src/chat/test_chat.c
index 7a20c0331..0953a895b 100644
--- a/src/chat/test_chat.c
+++ b/src/chat/test_chat.c
@@ -119,11 +119,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));
 }
@@ -135,10 +135,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
@@ -147,36 +148,34 @@ stop_arm (struct PeerContext *p)
 
 
 static void
-abort_test (void *cls,
-            const struct GNUNET_SCHEDULER_TaskContext *tc)
+abort_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   if (alice_room != NULL)
-    {
-      GNUNET_CHAT_leave_room (alice_room);
-      alice_room = NULL;
-    }
+  {
+    GNUNET_CHAT_leave_room (alice_room);
+    alice_room = NULL;
+  }
   if (bob_room != NULL)
-    {
-      GNUNET_CHAT_leave_room (bob_room);
-      bob_room = NULL;
-    }
+  {
+    GNUNET_CHAT_leave_room (bob_room);
+    bob_room = NULL;
+  }
   err = 1;
 }
 
 
 static void
-timeout_kill (void *cls,
-              const struct GNUNET_SCHEDULER_TaskContext *tc)
+timeout_kill (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
 #if VERBOSE
   printf ("Timed out, stopping the test.\n");
 #endif
   kill_task = GNUNET_SCHEDULER_NO_TASK;
   if (wait_task != GNUNET_SCHEDULER_NO_TASK)
-    {
-      GNUNET_SCHEDULER_cancel (wait_task);
-      wait_task = GNUNET_SCHEDULER_NO_TASK;
-    }
+  {
+    GNUNET_SCHEDULER_cancel (wait_task);
+    wait_task = GNUNET_SCHEDULER_NO_TASK;
+  }
   GNUNET_SCHEDULER_add_continuation (&abort_test, NULL,
                                      GNUNET_SCHEDULER_REASON_PREREQ_DONE);
 }
@@ -207,11 +206,11 @@ member_list_cb (void *cls,
 
 #if VERBOSE
   printf ("%s - told that %s has %s\n",
-           want->me,
-           member_info == NULL ? NULL
-           : GNUNET_CONTAINER_meta_data_get_by_type (member_info,
-                                                     EXTRACTOR_METATYPE_TITLE),
-           member_info == NULL ? "left" : "joined");
+          want->me,
+          member_info == NULL ? NULL
+          : GNUNET_CONTAINER_meta_data_get_by_type (member_info,
+                                                    EXTRACTOR_METATYPE_TITLE),
+          member_info == NULL ? "left" : "joined");
 #endif
   GNUNET_CRYPTO_hash (member_id,
                       sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
@@ -225,16 +224,16 @@ member_list_cb (void *cls,
         (GNUNET_CONTAINER_meta_data_test_equal (member_info,
                                                 want->meta)))) &&
       (options == want->opt))
-    {
-      if (NULL != want->next_task)
-        GNUNET_SCHEDULER_add_now (want->next_task, want->next_task_cls);
-    }
+  {
+    if (NULL != want->next_task)
+      GNUNET_SCHEDULER_add_now (want->next_task, want->next_task_cls);
+  }
   else
-    {
-      GNUNET_SCHEDULER_cancel (kill_task);
-      kill_task = GNUNET_SCHEDULER_NO_TASK;
-      GNUNET_SCHEDULER_add_now (&abort_test, NULL);
-    }
+  {
+    GNUNET_SCHEDULER_cancel (kill_task);
+    kill_task = GNUNET_SCHEDULER_NO_TASK;
+    GNUNET_SCHEDULER_add_now (&abort_test, NULL);
+  }
   return GNUNET_OK;
 }
 
@@ -242,7 +241,7 @@ member_list_cb (void *cls,
 static int
 receive_cb (void *cls,
             struct GNUNET_CHAT_Room *room,
-            const GNUNET_HashCode *sender,
+            const GNUNET_HashCode * sender,
             const struct GNUNET_CONTAINER_MetaData *meta,
             const char *message,
             struct GNUNET_TIME_Absolute timestamp,
@@ -269,16 +268,16 @@ receive_cb (void *cls,
        * slightly greater
        */
       (timestamp.abs_value >= want->timestamp.abs_value))
-    {
-      if (NULL != want->next_task)
-        GNUNET_SCHEDULER_add_now (want->next_task, want->next_task_cls);
-    }
+  {
+    if (NULL != want->next_task)
+      GNUNET_SCHEDULER_add_now (want->next_task, want->next_task_cls);
+  }
   else
-    {
-      GNUNET_SCHEDULER_cancel (kill_task);
-      kill_task = GNUNET_SCHEDULER_NO_TASK;
-      GNUNET_SCHEDULER_add_now (&abort_test, NULL);
-    }
+  {
+    GNUNET_SCHEDULER_cancel (kill_task);
+    kill_task = GNUNET_SCHEDULER_NO_TASK;
+    GNUNET_SCHEDULER_add_now (&abort_test, NULL);
+  }
   return GNUNET_OK;
 }
 
@@ -288,7 +287,7 @@ confirmation_cb (void *cls,
                  struct GNUNET_CHAT_Room *room,
                  uint32_t orig_seq_number,
                  struct GNUNET_TIME_Absolute timestamp,
-                 const GNUNET_HashCode *receiver)
+                 const GNUNET_HashCode * receiver)
 {
   struct Wanted *want = cls;
 
@@ -303,23 +302,22 @@ confirmation_cb (void *cls,
                     sizeof (GNUNET_HashCode))) &&
       (orig_seq_number == want->sequence_number) &&
       (timestamp.abs_value >= want->timestamp.abs_value))
-    {
-      if (NULL != want->next_task)
-        GNUNET_SCHEDULER_add_now (want->next_task, want->next_task_cls);
-    }
+  {
+    if (NULL != want->next_task)
+      GNUNET_SCHEDULER_add_now (want->next_task, want->next_task_cls);
+  }
   else
-    {
-      GNUNET_SCHEDULER_cancel (kill_task);
-      kill_task = GNUNET_SCHEDULER_NO_TASK;
-      GNUNET_SCHEDULER_add_now (&abort_test, NULL);
-    }
+  {
+    GNUNET_SCHEDULER_cancel (kill_task);
+    kill_task = GNUNET_SCHEDULER_NO_TASK;
+    GNUNET_SCHEDULER_add_now (&abort_test, NULL);
+  }
   return GNUNET_OK;
 }
 
 
 static void
-wait_until_ready (void *cls,
-                  const struct GNUNET_SCHEDULER_TaskContext *tc)
+wait_until_ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GNUNET_SCHEDULER_Task task = cls;
 
@@ -327,22 +325,20 @@ wait_until_ready (void *cls,
   printf ("Waiting...\n");
 #endif
   if (is_ready)
-    {
-      wait_task = GNUNET_SCHEDULER_NO_TASK;
-      GNUNET_SCHEDULER_add_now (task, NULL);
-    }
+  {
+    wait_task = GNUNET_SCHEDULER_NO_TASK;
+    GNUNET_SCHEDULER_add_now (task, NULL);
+  }
   else
     wait_task =
-      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
-                                                                   50),
-                                    &wait_until_ready,
-                                    task);
+        GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+                                      (GNUNET_TIME_UNIT_MILLISECONDS, 50),
+                                      &wait_until_ready, task);
 }
 
 
 static void
-disconnect_alice (void *cls,
-                  const struct GNUNET_SCHEDULER_TaskContext *tc)
+disconnect_alice (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
 #if VERBOSE
   printf ("Alice is leaving.\n");
@@ -357,8 +353,7 @@ disconnect_alice (void *cls,
 
 
 static void
-disconnect_bob (void *cls,
-                const struct GNUNET_SCHEDULER_TaskContext *tc)
+disconnect_bob (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
 #if VERBOSE
   printf ("Bod is leaving.\n");
@@ -375,16 +370,14 @@ disconnect_bob (void *cls,
 
 
 static void
-set_ready (void *cls,
-           const struct GNUNET_SCHEDULER_TaskContext *tc)
+set_ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   is_ready = GNUNET_YES;
 }
 
 
 static void
-send_to_alice (void *cls,
-               const struct GNUNET_SCHEDULER_TaskContext *tc)
+send_to_alice (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
 #if VERBOSE
   printf ("Bob says 'Hi!'\n");
@@ -399,15 +392,12 @@ send_to_alice (void *cls,
   alice_wanted.next_task_cls = NULL;
   GNUNET_CHAT_send_message (bob_room,
                             "Hi Alice!",
-                            GNUNET_CHAT_MSG_OPTION_NONE,
-                            NULL,
-                            NULL);
+                            GNUNET_CHAT_MSG_OPTION_NONE, NULL, NULL);
 }
 
 
 static void
-send_to_bob (void *cls,
-             const struct GNUNET_SCHEDULER_TaskContext *tc)
+send_to_bob (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   enum GNUNET_CHAT_MsgOptions options;
   uint32_t *seq = NULL;
@@ -416,39 +406,39 @@ send_to_bob (void *cls,
   printf ("Alice says 'Hi!'\n");
 #endif
   if (is_ackn)
-    {
-      options = GNUNET_CHAT_MSG_ACKNOWLEDGED;
-      alice_wanted.meta = bob_meta;
-      alice_wanted.sender = &bob;
-      alice_wanted.timestamp = GNUNET_TIME_absolute_get ();
-      alice_wanted.next_task = &disconnect_bob;
-      alice_wanted.next_task_cls = NULL;
-      bob_wanted.meta = alice_meta;
-      bob_wanted.sender = &alice;
-      bob_wanted.next_task = NULL;
-      seq = &(alice_wanted.sequence_number);
-    }
+  {
+    options = GNUNET_CHAT_MSG_ACKNOWLEDGED;
+    alice_wanted.meta = bob_meta;
+    alice_wanted.sender = &bob;
+    alice_wanted.timestamp = GNUNET_TIME_absolute_get ();
+    alice_wanted.next_task = &disconnect_bob;
+    alice_wanted.next_task_cls = NULL;
+    bob_wanted.meta = alice_meta;
+    bob_wanted.sender = &alice;
+    bob_wanted.next_task = NULL;
+    seq = &(alice_wanted.sequence_number);
+  }
   else if (is_anon)
-    {
-      options = GNUNET_CHAT_MSG_ANONYMOUS;
-      bob_wanted.meta = NULL;
-      bob_wanted.sender = NULL;
-      bob_wanted.next_task = &disconnect_bob;
-    }
+  {
+    options = GNUNET_CHAT_MSG_ANONYMOUS;
+    bob_wanted.meta = NULL;
+    bob_wanted.sender = NULL;
+    bob_wanted.next_task = &disconnect_bob;
+  }
   else if (is_auth)
-    {
-      options = GNUNET_CHAT_MSG_AUTHENTICATED;
-      bob_wanted.meta = alice_meta;
-      bob_wanted.sender = &alice;
-      bob_wanted.next_task = &disconnect_bob;
-    }
+  {
+    options = GNUNET_CHAT_MSG_AUTHENTICATED;
+    bob_wanted.meta = alice_meta;
+    bob_wanted.sender = &alice;
+    bob_wanted.next_task = &disconnect_bob;
+  }
   else
-    {
-      options = GNUNET_CHAT_MSG_OPTION_NONE;
-      bob_wanted.meta = alice_meta;
-      bob_wanted.sender = &alice;
-      bob_wanted.next_task = &send_to_alice;
-    }
+  {
+    options = GNUNET_CHAT_MSG_OPTION_NONE;
+    bob_wanted.meta = alice_meta;
+    bob_wanted.sender = &alice;
+    bob_wanted.next_task = &send_to_alice;
+  }
   bob_wanted.msg = "Hi Bob!";
   bob_wanted.opt = options;
   bob_wanted.timestamp = GNUNET_TIME_absolute_get ();
@@ -471,8 +461,7 @@ prepare_for_alice_task (void *cls,
 
 
 static void
-join_bob_task (void *cls,
-               const struct GNUNET_SCHEDULER_TaskContext *tc)
+join_bob_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
 #if VERBOSE
   printf ("Bob joining\n");
@@ -487,27 +476,25 @@ join_bob_task (void *cls,
   bob_wanted.next_task_cls = NULL;
   is_ready = GNUNET_NO;
   bob_room =
-    GNUNET_CHAT_join_room (is_p2p ? p2.cfg : p1.cfg, "bob", bob_meta,
-                           "test", -1,
-                           &join_cb, &bob_wanted,
-                           &receive_cb, &bob_wanted,
-                           &member_list_cb, &bob_wanted,
-                           &confirmation_cb, &bob_wanted,
-                           &bob);
+      GNUNET_CHAT_join_room (is_p2p ? p2.cfg : p1.cfg, "bob", bob_meta,
+                             "test", -1,
+                             &join_cb, &bob_wanted,
+                             &receive_cb, &bob_wanted,
+                             &member_list_cb, &bob_wanted,
+                             &confirmation_cb, &bob_wanted, &bob);
   if (NULL == bob_room)
-    {
-      GNUNET_SCHEDULER_cancel (kill_task);
-      kill_task = GNUNET_SCHEDULER_NO_TASK;
-      GNUNET_CHAT_leave_room (alice_room);
-      alice_room = NULL;
-      err = 1;
-    }
+  {
+    GNUNET_SCHEDULER_cancel (kill_task);
+    kill_task = GNUNET_SCHEDULER_NO_TASK;
+    GNUNET_CHAT_leave_room (alice_room);
+    alice_room = NULL;
+    err = 1;
+  }
 }
 
 
 static void
-join_alice_task (void *cls,
-                 const struct GNUNET_SCHEDULER_TaskContext *tc)
+join_alice_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
 #if VERBOSE
   printf ("Alice joining\n");
@@ -515,33 +502,31 @@ join_alice_task (void *cls,
   alice_wanted.next_task = &join_bob_task;
   alice_wanted.next_task_cls = NULL;
   alice_room =
-    GNUNET_CHAT_join_room (p1.cfg, "alice", alice_meta,
-                           "test", -1,
-                           &join_cb, &alice_wanted,
-                           &receive_cb, &alice_wanted,
-                           &member_list_cb, &alice_wanted,
-                           &confirmation_cb, &alice_wanted,
-                           &alice);
+      GNUNET_CHAT_join_room (p1.cfg, "alice", alice_meta,
+                             "test", -1,
+                             &join_cb, &alice_wanted,
+                             &receive_cb, &alice_wanted,
+                             &member_list_cb, &alice_wanted,
+                             &confirmation_cb, &alice_wanted, &alice);
   if (NULL == alice_room)
-    {
-      GNUNET_SCHEDULER_cancel (kill_task);
-      kill_task = GNUNET_SCHEDULER_NO_TASK;
-      err = 1;
-    }
+  {
+    GNUNET_SCHEDULER_cancel (kill_task);
+    kill_task = GNUNET_SCHEDULER_NO_TASK;
+    err = 1;
+  }
 }
 
 
 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)
 {
   if (is_p2p)
-    {
-      setup_peer (&p1, "test_chat_peer1.conf");
-      setup_peer (&p2, "test_chat_peer2.conf");
-    }
+  {
+    setup_peer (&p1, "test_chat_peer1.conf");
+    setup_peer (&p2, "test_chat_peer2.conf");
+  }
   else
     setup_peer (&p1, "test_chat_data.conf");
 
@@ -555,19 +540,14 @@ run (void *cls,
                                      EXTRACTOR_METATYPE_TITLE,
                                      EXTRACTOR_METAFORMAT_UTF8,
                                      "text/plain",
-                                     "Alice",
-                                     strlen("Alice")+1);
+                                     "Alice", strlen ("Alice") + 1);
   bob_meta = GNUNET_CONTAINER_meta_data_create ();
   GNUNET_CONTAINER_meta_data_insert (bob_meta,
                                      "<gnunet>",
                                      EXTRACTOR_METATYPE_TITLE,
                                      EXTRACTOR_METAFORMAT_UTF8,
-                                     "text/plain",
-                                     "Bob",
-                                     strlen("Bob")+1);
-  kill_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
-                                            &timeout_kill,
-                                            NULL);
+                                     "text/plain", "Bob", strlen ("Bob") + 1);
+  kill_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &timeout_kill, NULL);
   GNUNET_SCHEDULER_add_now (&join_alice_task, NULL);
 }
 
@@ -575,7 +555,7 @@ run (void *cls,
 int
 main (int argc, char *argv[])
 {
-  char *const argvx[] = { 
+  char *const argvx[] = {
     "test-chat",
     "-c",
     "test_chat_data.conf",
@@ -588,40 +568,39 @@ main (int argc, char *argv[])
     GNUNET_GETOPT_OPTION_END
   };
 
-  GNUNET_log_setup ("test_chat", 
+  GNUNET_log_setup ("test_chat",
 #if VERBOSE
                     "DEBUG",
 #else
                     "WARNING",
 #endif
                     NULL);
-  if (strstr(argv[0], "p2p") != NULL)
-    {
-      is_p2p = GNUNET_YES;
-    }
-  if (strstr(argv[0], "acknowledgment") != NULL)
-    {
-      is_ackn = GNUNET_YES;
-    }
-  else if (strstr(argv[0], "anonymous") != NULL)
-    {
-      is_anon = GNUNET_YES;
-    }
-  else if (strstr(argv[0], "authentication") != NULL)
-    {
-      is_auth = GNUNET_YES;
-    }
+  if (strstr (argv[0], "p2p") != NULL)
+  {
+    is_p2p = GNUNET_YES;
+  }
+  if (strstr (argv[0], "acknowledgment") != NULL)
+  {
+    is_ackn = GNUNET_YES;
+  }
+  else if (strstr (argv[0], "anonymous") != NULL)
+  {
+    is_anon = GNUNET_YES;
+  }
+  else if (strstr (argv[0], "authentication") != NULL)
+  {
+    is_auth = GNUNET_YES;
+  }
   GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1,
-                      argvx, "test-chat",
-                      "nohelp", options, &run, NULL);
+                      argvx, "test-chat", "nohelp", options, &run, NULL);
   stop_arm (&p1);
   GNUNET_CONTAINER_meta_data_destroy (alice_meta);
   GNUNET_CONTAINER_meta_data_destroy (bob_meta);
   if (is_p2p)
-    {
-      GNUNET_DISK_directory_remove ("/tmp/gnunet-test-chat-peer-1/");
-      GNUNET_DISK_directory_remove ("/tmp/gnunet-test-chat-peer-2/");
-    }
+  {
+    GNUNET_DISK_directory_remove ("/tmp/gnunet-test-chat-peer-1/");
+    GNUNET_DISK_directory_remove ("/tmp/gnunet-test-chat-peer-2/");
+  }
   else
     GNUNET_DISK_directory_remove ("/tmp/gnunet-test-chat/");
   return err;