1 files changed, 131 insertions, 123 deletions

diff --git a/src/dht/test_dht_api.c b/src/dht/test_dht_api.c
index 4450cb653..407e2279b 100644
--- a/src/dht/test_dht_api.c
+++ b/src/dht/test_dht_api.c
@@ -112,7 +112,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   die_task = GNUNET_SCHEDULER_NO_TASK;
   GNUNET_DHT_disconnect (p1.dht_handle);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "DHT disconnected, returning success!\n");
+              "DHT disconnected, returning success!\n");
   ok = 0;
 }
 
@@ -138,20 +138,20 @@ end_badly ()
   fprintf (stderr, "Ending on an unhappy note.\n");
 #endif
 
-  if ( (retry_context.peer_ctx != NULL) && 
-       (retry_context.peer_ctx->find_peer_handle != NULL) )
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Stopping find peer request!\n");
-      GNUNET_DHT_find_peer_stop(retry_context.peer_ctx->find_peer_handle);
-    }
-  if ( (retry_context.peer_ctx != NULL) && 
-       (retry_context.peer_ctx->get_handle != NULL) )
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Stopping get request!\n");
-      GNUNET_DHT_get_stop (retry_context.peer_ctx->get_handle);
-    }
+  if ((retry_context.peer_ctx != NULL) &&
+      (retry_context.peer_ctx->find_peer_handle != NULL))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping find peer request!\n");
+    GNUNET_DHT_find_peer_stop (retry_context.peer_ctx->find_peer_handle);
+  }
+  if ((retry_context.peer_ctx != NULL) &&
+      (retry_context.peer_ctx->get_handle != NULL))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping get request!\n");
+    GNUNET_DHT_get_stop (retry_context.peer_ctx->get_handle);
+  }
   if (retry_context.retry_task != GNUNET_SCHEDULER_NO_TASK)
-    GNUNET_SCHEDULER_cancel(retry_context.retry_task);
+    GNUNET_SCHEDULER_cancel (retry_context.retry_task);
   GNUNET_DHT_disconnect (p1.dht_handle);
   ok = 1;
 }
@@ -169,13 +169,13 @@ test_find_peer_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   struct PeerContext *peer = cls;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Called test_find_peer_stop!\n");
-  if ( (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT) != 0)
-    {
-      GNUNET_break (0);
-      GNUNET_SCHEDULER_cancel (die_task);
-      GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-      return;
-    }
+  if ((tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT) != 0)
+  {
+    GNUNET_break (0);
+    GNUNET_SCHEDULER_cancel (die_task);
+    GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+    return;
+  }
 
   GNUNET_assert (peer->dht_handle != NULL);
 
@@ -183,12 +183,14 @@ test_find_peer_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   peer->find_peer_handle = NULL;
 
 #if HAVE_MALICIOUS
-  GNUNET_DHT_set_malicious_getter (peer->dht_handle, GNUNET_TIME_UNIT_SECONDS, NULL, NULL);
-  GNUNET_DHT_set_malicious_putter (peer->dht_handle, GNUNET_TIME_UNIT_SECONDS, NULL, NULL);
+  GNUNET_DHT_set_malicious_getter (peer->dht_handle, GNUNET_TIME_UNIT_SECONDS,
+                                   NULL, NULL);
+  GNUNET_DHT_set_malicious_putter (peer->dht_handle, GNUNET_TIME_UNIT_SECONDS,
+                                   NULL, NULL);
   GNUNET_DHT_set_malicious_dropper (peer->dht_handle, NULL, NULL);
 #endif
-  GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1),
-                               &end, &p1);
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+                                (GNUNET_TIME_UNIT_SECONDS, 1), &end, &p1);
 }
 
 
@@ -200,32 +202,33 @@ test_find_peer_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * @param peer the peer we learned about
  * @param reply response
  */
-void test_find_peer_processor (void *cls,
-                               const struct GNUNET_HELLO_Message *hello)
+void
+test_find_peer_processor (void *cls, const struct GNUNET_HELLO_Message *hello)
 {
   struct RetryContext *retry_ctx = cls;
   struct GNUNET_PeerIdentity peer;
 
-  if (GNUNET_OK == GNUNET_HELLO_get_id(hello, &peer))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "test_find_peer_processor called (peer `%s'), stopping find peer request!\n", GNUNET_i2s(&peer));
-
-      if (retry_ctx->retry_task != GNUNET_SCHEDULER_NO_TASK)
-        {
-          GNUNET_SCHEDULER_cancel(retry_ctx->retry_task);
-          retry_ctx->retry_task = GNUNET_SCHEDULER_NO_TASK;
-        }
+  if (GNUNET_OK == GNUNET_HELLO_get_id (hello, &peer))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "test_find_peer_processor called (peer `%s'), stopping find peer request!\n",
+                GNUNET_i2s (&peer));
 
-      GNUNET_SCHEDULER_add_continuation (&test_find_peer_stop, &p1,
-                                         GNUNET_SCHEDULER_REASON_PREREQ_DONE);
-    }
-  else
+    if (retry_ctx->retry_task != GNUNET_SCHEDULER_NO_TASK)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "received find peer request, but hello_get_id failed!\n");
+      GNUNET_SCHEDULER_cancel (retry_ctx->retry_task);
+      retry_ctx->retry_task = GNUNET_SCHEDULER_NO_TASK;
     }
 
+    GNUNET_SCHEDULER_add_continuation (&test_find_peer_stop, &p1,
+                                       GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+  }
+  else
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "received find peer request, but hello_get_id failed!\n");
+  }
+
 }
 
 /**
@@ -248,35 +251,40 @@ retry_find_peer (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct RetryContext *retry_ctx = cls;
   GNUNET_HashCode hash;
+
   memset (&hash, 42, sizeof (GNUNET_HashCode));
 
-  if (GNUNET_TIME_absolute_get_remaining(retry_ctx->real_timeout).rel_value > 0)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "test_find_peer timed out, retrying!\n");
-      retry_ctx->next_timeout = GNUNET_TIME_relative_multiply(retry_ctx->next_timeout, 2);
-      retry_ctx->peer_ctx->find_peer_handle 
-        = GNUNET_DHT_find_peer_start (retry_ctx->peer_ctx->dht_handle, 
-                                      retry_ctx->next_timeout, &hash,
-                                      GNUNET_DHT_RO_NONE,
-                                      &test_find_peer_processor, retry_ctx);
-    }
+  if (GNUNET_TIME_absolute_get_remaining (retry_ctx->real_timeout).rel_value >
+      0)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "test_find_peer timed out, retrying!\n");
+    retry_ctx->next_timeout =
+        GNUNET_TIME_relative_multiply (retry_ctx->next_timeout, 2);
+    retry_ctx->peer_ctx->find_peer_handle =
+        GNUNET_DHT_find_peer_start (retry_ctx->peer_ctx->dht_handle,
+                                    retry_ctx->next_timeout, &hash,
+                                    GNUNET_DHT_RO_NONE,
+                                    &test_find_peer_processor, retry_ctx);
+  }
   else
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "test_find_peer timed out for good, failing!\n");
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "test_find_peer timed out for good, failing!\n");
 
-      retry_ctx->peer_ctx->find_peer_handle = NULL;
-    }
+    retry_ctx->peer_ctx->find_peer_handle = NULL;
+  }
 
   if (retry_ctx->peer_ctx->find_peer_handle == NULL)
-    {
-      GNUNET_break (0);
-      GNUNET_SCHEDULER_cancel (die_task);
-      GNUNET_SCHEDULER_add_now (&end_badly, &p1);
-      return;
-    }
-  retry_ctx->retry_task = GNUNET_SCHEDULER_add_delayed(retry_ctx->next_timeout, &retry_find_peer_stop, retry_ctx);
+  {
+    GNUNET_break (0);
+    GNUNET_SCHEDULER_cancel (die_task);
+    GNUNET_SCHEDULER_add_now (&end_badly, &p1);
+    return;
+  }
+  retry_ctx->retry_task =
+      GNUNET_SCHEDULER_add_delayed (retry_ctx->next_timeout,
+                                    &retry_find_peer_stop, retry_ctx);
 }
 
 /**
@@ -290,13 +298,14 @@ retry_find_peer_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct RetryContext *retry_ctx = cls;
   GNUNET_HashCode hash;
+
   memset (&hash, 42, sizeof (GNUNET_HashCode));
 
   if (retry_ctx->peer_ctx->find_peer_handle != NULL)
-    {
-      GNUNET_DHT_find_peer_stop(retry_ctx->peer_ctx->find_peer_handle);
-      retry_ctx->peer_ctx->find_peer_handle = NULL;
-    }  
+  {
+    GNUNET_DHT_find_peer_stop (retry_ctx->peer_ctx->find_peer_handle);
+    retry_ctx->peer_ctx->find_peer_handle = NULL;
+  }
   GNUNET_SCHEDULER_add_now (&retry_find_peer, retry_ctx);
 }
 
@@ -311,29 +320,32 @@ test_find_peer (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct PeerContext *peer = cls;
   GNUNET_HashCode hash;
+
   memset (&hash, 42, sizeof (GNUNET_HashCode));
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Called test_find_peer!\n");
   GNUNET_assert (peer->dht_handle != NULL);
 
-  retry_context.real_timeout = GNUNET_TIME_relative_to_absolute(TOTAL_TIMEOUT);
+  retry_context.real_timeout = GNUNET_TIME_relative_to_absolute (TOTAL_TIMEOUT);
   retry_context.next_timeout = BASE_TIMEOUT;
   retry_context.peer_ctx = peer;
 
   peer->find_peer_handle
-    = GNUNET_DHT_find_peer_start (peer->dht_handle, retry_context.next_timeout, 
-                                  &hash,
-                                  GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE,
-                                  &test_find_peer_processor, &retry_context);
+      =
+      GNUNET_DHT_find_peer_start (peer->dht_handle, retry_context.next_timeout,
+                                  &hash, GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE,
+                                  &test_find_peer_processor, &retry_context);
 
   if (peer->find_peer_handle == NULL)
-    {
-      GNUNET_break (0);
-      GNUNET_SCHEDULER_cancel (die_task);
-      GNUNET_SCHEDULER_add_now (&end_badly, &p1);
-      return;
-    }
-  retry_context.retry_task = GNUNET_SCHEDULER_add_delayed(retry_context.next_timeout, &retry_find_peer_stop, &retry_context);
+  {
+    GNUNET_break (0);
+    GNUNET_SCHEDULER_cancel (die_task);
+    GNUNET_SCHEDULER_add_now (&end_badly, &p1);
+    return;
+  }
+  retry_context.retry_task =
+      GNUNET_SCHEDULER_add_delayed (retry_context.next_timeout,
+                                    &retry_find_peer_stop, &retry_context);
 }
 
 /**
@@ -348,28 +360,26 @@ test_get_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   struct PeerContext *peer = cls;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Called test_get_stop!\n");
-  if ( (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT) != 0)
-    {
-      GNUNET_break (0);
-      GNUNET_SCHEDULER_cancel (die_task);
-      GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-      return;
-    }
+  if ((tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT) != 0)
+  {
+    GNUNET_break (0);
+    GNUNET_SCHEDULER_cancel (die_task);
+    GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+    return;
+  }
   GNUNET_assert (peer->dht_handle != NULL);
   GNUNET_DHT_get_stop (peer->get_handle);
   peer->get_handle = NULL;
-  GNUNET_SCHEDULER_add_now(&test_find_peer,
-                           &p1);
+  GNUNET_SCHEDULER_add_now (&test_find_peer, &p1);
 }
 
 void
 test_get_iterator (void *cls,
                    struct GNUNET_TIME_Absolute exp,
                    const GNUNET_HashCode * key,
-                   const struct GNUNET_PeerIdentity * const *get_path,
-                   const struct GNUNET_PeerIdentity * const *put_path,
-                   enum GNUNET_BLOCK_Type type, 
-                   size_t size, const void *data)
+                   const struct GNUNET_PeerIdentity *const *get_path,
+                   const struct GNUNET_PeerIdentity *const *put_path,
+                   enum GNUNET_BLOCK_Type type, size_t size, const void *data)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "test_get_iterator called (we got a result), stopping get request!\n");
@@ -389,32 +399,31 @@ test_get (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct PeerContext *peer = cls;
   GNUNET_HashCode hash;
+
   memset (&hash, 42, sizeof (GNUNET_HashCode));
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Called test_get!\n");
 
   GNUNET_assert (peer->dht_handle != NULL);
-  retry_context.real_timeout = GNUNET_TIME_relative_to_absolute(TOTAL_TIMEOUT);
+  retry_context.real_timeout = GNUNET_TIME_relative_to_absolute (TOTAL_TIMEOUT);
   retry_context.next_timeout = BASE_TIMEOUT;
 
   peer->get_handle =
-    GNUNET_DHT_get_start (peer->dht_handle, 
-                          TOTAL_TIMEOUT,
-                          GNUNET_BLOCK_TYPE_TEST,
-                          &hash,
-                          DEFAULT_GET_REPLICATION,
-                          GNUNET_DHT_RO_NONE,
-                          NULL, 0,
-                          NULL, 0,
-                          &test_get_iterator, NULL);
+      GNUNET_DHT_get_start (peer->dht_handle,
+                            TOTAL_TIMEOUT,
+                            GNUNET_BLOCK_TYPE_TEST,
+                            &hash,
+                            DEFAULT_GET_REPLICATION,
+                            GNUNET_DHT_RO_NONE,
+                            NULL, 0, NULL, 0, &test_get_iterator, NULL);
 
   if (peer->get_handle == NULL)
-    {
-      GNUNET_break (0);
-      GNUNET_SCHEDULER_cancel (die_task);
-      GNUNET_SCHEDULER_add_now (&end_badly, &p1);
-      return;
-    }
+  {
+    GNUNET_break (0);
+    GNUNET_SCHEDULER_cancel (die_task);
+    GNUNET_SCHEDULER_add_now (&end_badly, &p1);
+    return;
+  }
 
   retry_context.peer_ctx = peer;
 }
@@ -432,6 +441,7 @@ test_put (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GNUNET_HashCode hash;
   char *data;
   size_t data_size = 42;
+
   memset (&hash, 42, sizeof (GNUNET_HashCode));
   data = GNUNET_malloc (data_size);
   memset (data, 43, data_size);
@@ -440,15 +450,14 @@ test_put (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   GNUNET_assert (peer->dht_handle != NULL);
 
-  GNUNET_DHT_put (peer->dht_handle, &hash, 
+  GNUNET_DHT_put (peer->dht_handle, &hash,
                   DEFAULT_PUT_REPLICATION,
-                  GNUNET_DHT_RO_NONE,
-                  GNUNET_BLOCK_TYPE_TEST,
-                  data_size, data,
+                  GNUNET_DHT_RO_NONE,
+                  GNUNET_BLOCK_TYPE_TEST,
+                  data_size, data,
                   GNUNET_TIME_relative_to_absolute (TOTAL_TIMEOUT),
-                  TOTAL_TIMEOUT,
-                  &test_get, &p1);
-  GNUNET_free(data);
+                  TOTAL_TIMEOUT, &test_get, &p1);
+  GNUNET_free (data);
 }
 
 static void
@@ -457,11 +466,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_ARM
-                                        "-L", "DEBUG",
+                                         "-L", "DEBUG",
 #endif
-                                        "-c", cfgname, NULL);
+                                         "-c", cfgname, NULL);
 #endif
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
 
@@ -482,8 +491,7 @@ run (void *cls,
   setup_peer (&p1, "test_dht_api_peer1.conf");
 
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                (GNUNET_TIME_UNIT_SECONDS, 1), &test_put,
-                                &p1);
+                                (GNUNET_TIME_UNIT_SECONDS, 1), &test_put, &p1);
 }
 
 static int