1 files changed, 145 insertions, 163 deletions

diff --git a/src/chat/test_chat_private.c b/src/chat/test_chat_private.c
index c14de0a88..507e333c9 100644
--- a/src/chat/test_chat_private.c
+++ b/src/chat/test_chat_private.c
@@ -133,11 +133,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));
 }
@@ -149,10 +149,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
@@ -161,41 +162,39 @@ 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;
+  }
   if (carol_room != NULL)
-    {
-      GNUNET_CHAT_leave_room (carol_room);
-      carol_room = NULL;
-    }
+  {
+    GNUNET_CHAT_leave_room (carol_room);
+    carol_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);
 }
@@ -226,11 +225,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),
@@ -248,34 +247,34 @@ member_list_cb (void *cls,
           GNUNET_CONTAINER_meta_data_test_equal (member_info,
                                                  want->meta2))))) &&
       (options == want->opt))
-    {
-      /* remember Bob's public key, we need it to send private message */
-      if (NULL == bob_public_key &&
-          (0 == memcmp (&bob, want->sender, sizeof (GNUNET_HashCode))))
-        bob_public_key =
+  {
+    /* remember Bob's public key, we need it to send private message */
+    if (NULL == bob_public_key &&
+        (0 == memcmp (&bob, want->sender, sizeof (GNUNET_HashCode))))
+      bob_public_key =
           GNUNET_memdup (member_id,
-                         sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
-      if (want->sender2 != NULL)
-        {
-          /* flush alternative sender */
-          if (0 == memcmp (&sender, want->sender, sizeof (GNUNET_HashCode)))
-            {
-              want->sender = want->sender2;
-              want->meta = want->meta2;
-            }
-          want->sender2 = NULL;
-          want->meta2 = NULL;
-        }
-      else
-        if (NULL != want->next_task)
-          GNUNET_SCHEDULER_add_now (want->next_task, want->next_task_cls);
-    }
-  else
+                         sizeof (struct
+                                 GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
+    if (want->sender2 != NULL)
     {
-      GNUNET_SCHEDULER_cancel (kill_task);
-      kill_task = GNUNET_SCHEDULER_NO_TASK;
-      GNUNET_SCHEDULER_add_now (&abort_test, NULL);
+      /* flush alternative sender */
+      if (0 == memcmp (&sender, want->sender, sizeof (GNUNET_HashCode)))
+      {
+        want->sender = want->sender2;
+        want->meta = want->meta2;
+      }
+      want->sender2 = NULL;
+      want->meta2 = NULL;
     }
+    else 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);
+  }
   return GNUNET_OK;
 }
 
@@ -283,7 +282,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,
@@ -311,25 +310,24 @@ 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_cancel (finish_task);
-      finish_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_cancel (finish_task);
+    finish_task = GNUNET_SCHEDULER_NO_TASK;
+    GNUNET_SCHEDULER_add_now (&abort_test, NULL);
+  }
   return GNUNET_OK;
 }
 
 
 static void
-wait_until_all_ready (void *cls,
-                      const struct GNUNET_SCHEDULER_TaskContext *tc)
+wait_until_all_ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GNUNET_SCHEDULER_Task task = cls;
 
@@ -337,38 +335,34 @@ wait_until_all_ready (void *cls,
   printf ("Waiting...\n");
 #endif
   if (alice_ready && bob_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,
-                                                                   5000),
-                                    &wait_until_all_ready,
-                                    task);
+        GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+                                      (GNUNET_TIME_UNIT_MILLISECONDS, 5000),
+                                      &wait_until_all_ready, task);
 }
 
 
 static void
-set_alice_ready (void *cls,
-           const struct GNUNET_SCHEDULER_TaskContext *tc)
+set_alice_ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   alice_ready = GNUNET_YES;
 }
 
 
 static void
-set_bob_ready (void *cls,
-           const struct GNUNET_SCHEDULER_TaskContext *tc)
+set_bob_ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   bob_ready = GNUNET_YES;
 }
 
 
 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");
@@ -383,8 +377,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");
@@ -403,8 +396,7 @@ disconnect_bob (void *cls,
 
 
 static void
-disconnect_carol (void *cls,
-                  const struct GNUNET_SCHEDULER_TaskContext *tc)
+disconnect_carol (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
 #if VERBOSE
   printf ("Carol is leaving.\n");
@@ -454,8 +446,7 @@ send_from_alice_to_bob (void *cls,
   carol_wanted.next_task_cls = NULL;
   GNUNET_CHAT_send_message (alice_room,
                             "Hi Bob!",
-                            GNUNET_CHAT_MSG_PRIVATE,
-                            bob_public_key, &seq);
+                            GNUNET_CHAT_MSG_PRIVATE, bob_public_key, &seq);
   finish_task = GNUNET_SCHEDULER_add_delayed (PM_TIMEOUT,
                                               &wait_until_all_ready,
                                               &disconnect_carol);
@@ -477,12 +468,13 @@ prepare_bob_for_alice_task (void *cls,
 
 static void
 prepare_carol_for_alice_and_bob_task (void *cls,
-                                      const struct GNUNET_SCHEDULER_TaskContext *tc)
+                                      const struct GNUNET_SCHEDULER_TaskContext
+                                      *tc)
 {
   carol_wanted.meta = alice_meta;
   carol_wanted.sender = &alice;
   /* set alternative meta/sender since we don't know from which peer
-     notification will come first */
+   * notification will come first */
   carol_wanted.meta2 = bob_meta;
   carol_wanted.sender2 = &bob;
   carol_wanted.msg = NULL;
@@ -493,8 +485,7 @@ prepare_carol_for_alice_and_bob_task (void *cls,
 
 
 static void
-join_carol_task (void *cls,
-                 const struct GNUNET_SCHEDULER_TaskContext *tc)
+join_carol_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
 #if VERBOSE
   printf ("Carol joining\n");
@@ -516,28 +507,27 @@ join_carol_task (void *cls,
   carol_wanted.next_task = &prepare_carol_for_alice_and_bob_task;
   carol_wanted.next_task_cls = NULL;
   carol_room =
-    GNUNET_CHAT_join_room (is_p2p ? p3.cfg : p1.cfg, "carol", carol_meta,
-                           "test", -1,
-                           &join_cb, &carol_wanted,
-                           &receive_cb, &carol_wanted,
-                           &member_list_cb, &carol_wanted,
-                           NULL, NULL, &carol);
+      GNUNET_CHAT_join_room (is_p2p ? p3.cfg : p1.cfg, "carol", carol_meta,
+                             "test", -1,
+                             &join_cb, &carol_wanted,
+                             &receive_cb, &carol_wanted,
+                             &member_list_cb, &carol_wanted,
+                             NULL, NULL, &carol);
   if (NULL == carol_room)
-    {
-      GNUNET_SCHEDULER_cancel (kill_task);
-      kill_task = GNUNET_SCHEDULER_NO_TASK;
-      GNUNET_CHAT_leave_room (alice_room);
-      alice_room = NULL;
-      GNUNET_CHAT_leave_room (bob_room);
-      bob_room = NULL;
-      err = 1;
-    }
+  {
+    GNUNET_SCHEDULER_cancel (kill_task);
+    kill_task = GNUNET_SCHEDULER_NO_TASK;
+    GNUNET_CHAT_leave_room (alice_room);
+    alice_room = NULL;
+    GNUNET_CHAT_leave_room (bob_room);
+    bob_room = NULL;
+    err = 1;
+  }
 }
 
 
 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");
@@ -553,26 +543,24 @@ join_bob_task (void *cls,
   bob_wanted.next_task_cls = NULL;
   bob_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,
-                           NULL, NULL, &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, NULL, NULL, &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");
@@ -580,33 +568,32 @@ 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,
-                           NULL, NULL, &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,
+                             NULL, NULL, &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 (&p3, "test_chat_peer3.conf");
-    }
+  {
+    setup_peer (&p1, "test_chat_peer1.conf");
+    setup_peer (&p2, "test_chat_peer2.conf");
+    setup_peer (&p3, "test_chat_peer3.conf");
+  }
   else
     setup_peer (&p1, "test_chat_data.conf");
 
@@ -622,24 +609,20 @@ 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);
+                                     "text/plain", "Bob", strlen ("Bob") + 1);
   carol_meta = GNUNET_CONTAINER_meta_data_create ();
   GNUNET_CONTAINER_meta_data_insert (carol_meta,
                                      "<gnunet>",
                                      EXTRACTOR_METATYPE_TITLE,
                                      EXTRACTOR_METAFORMAT_UTF8,
                                      "text/plain",
-                                     "Carol",
-                                     strlen("Carol")+1);
+                                     "Carol", strlen ("Carol") + 1);
   kill_task = GNUNET_SCHEDULER_add_delayed (KILL_TIMEOUT, &timeout_kill, NULL);
   GNUNET_SCHEDULER_add_now (&join_alice_task, NULL);
 }
@@ -648,7 +631,7 @@ run (void *cls,
 int
 main (int argc, char *argv[])
 {
-  char *const argvx[] = { 
+  char *const argvx[] = {
     "test-chat",
     "-c",
     "test_chat_data.conf",
@@ -661,30 +644,29 @@ 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], "p2p") != NULL)
+  {
+    is_p2p = 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);
   GNUNET_CONTAINER_meta_data_destroy (carol_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-3/");
-    }
+  {
+    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-3/");
+  }
   else
     GNUNET_DISK_directory_remove ("/tmp/gnunet-test-chat/");
   return err;