43 files changed, 331 insertions, 331 deletions
diff --git a/src/testbed/gnunet-daemon-testbed-blacklist.c b/src/testbed/gnunet-daemon-testbed-blacklist.c
index d14944362..6be43999c 100644
--- a/src/testbed/gnunet-daemon-testbed-blacklist.c
+++ b/src/testbed/gnunet-daemon-testbed-blacklist.c
@@ -22,8 +22,8 @@
 /**
 * @file testbed/gnunet-daemon-testbed-blacklist.c
 * @brief daemon to restrict incoming connections from other peers at the
- *          transport layer of a peer 
+ *          transport layer of a peer
- * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
 */
 #include "platform.h"
@@ -143,7 +143,7 @@ static int
 check_access (void *cls, const struct GNUNET_PeerIdentity * pid)
 {
  int contains;
- 
  if (NULL != map)
    contains = GNUNET_CONTAINER_multipeermap_contains (map, pid);
  else
@@ -167,7 +167,7 @@ setup_ac (const char *fname, const struct GNUNET_CONFIGURATION_Handle *cfg)
  uint64_t fsize;
  unsigned int npeers;
  unsigned int cnt;
-  
  GNUNET_assert (GNUNET_OK != GNUNET_DISK_file_size (fname, &fsize, GNUNET_NO,
                                                     GNUNET_YES));
  if (0 != (fsize % sizeof (struct GNUNET_PeerIdentity)))
diff --git a/src/testbed/gnunet-helper-testbed.c b/src/testbed/gnunet-helper-testbed.c
index 95c54d06d..f49789a80 100644
--- a/src/testbed/gnunet-helper-testbed.c
+++ b/src/testbed/gnunet-helper-testbed.c
@@ -24,8 +24,8 @@
 *          gnunet-service-testbed. This binary also receives configuration
 *          from the remove controller which is put in a temporary location
 *          with ports and paths fixed so that gnunet-service-testbed runs
- *          without any hurdles.  
+ *          without any hurdles.
- * 
+ *
 *          This helper monitors for three termination events.  They are: (1)The
 *          stdin of the helper is closed for reading; (2)the helper received
 *          SIGTERM/SIGINT; (3)the testbed crashed.  In case of events 1 and 2
@@ -161,13 +161,13 @@ static int status;
 static void
 shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  LOG_DEBUG ("Shutting down\n");  
+  LOG_DEBUG ("Shutting down\n");
  shutdown_task_id = GNUNET_SCHEDULER_NO_TASK;
  if (NULL != testbed)
  {
    LOG_DEBUG ("Killing testbed\n");
    GNUNET_break (0 == GNUNET_OS_process_kill (testbed, SIGTERM));
-  }  
+  }
  if (GNUNET_SCHEDULER_NO_TASK != read_task_id)
  {
    GNUNET_SCHEDULER_cancel (read_task_id);
@@ -194,7 +194,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
    GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (testbed));
    GNUNET_OS_process_destroy (testbed);
    testbed = NULL;
-  }  
+  }
  if (NULL != test_system)
  {
    GNUNET_TESTING_system_destroy (test_system, GNUNET_YES);
@@ -291,7 +291,7 @@ child_death_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
    GNUNET_break (0);
    return;
  }
-  GNUNET_break (GNUNET_SYSERR != 
+  GNUNET_break (GNUNET_SYSERR !=
                (ret = GNUNET_OS_process_status (testbed, &type, &code)));
  if (GNUNET_NO != ret)
  {
@@ -456,7 +456,7 @@ tokenizer_cb (void *cls, void *client,
  wc->data = reply;
  write_task_id =
      GNUNET_SCHEDULER_add_write_file (GNUNET_TIME_UNIT_FOREVER_REL, stdout_fd,
-                                       &write_task, wc);  
+                                       &write_task, wc);
  child_death_task_id =
      GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
                                      GNUNET_DISK_pipe_handle (sigpipe,
@@ -534,7 +534,7 @@ run (void *cls, char *const *args, const char *cfgfile,
  read_task_id =
      GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, stdin_fd,
                                      &read_task, NULL);
-  shutdown_task_id = 
+  shutdown_task_id =
      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
                                    NULL);
 }
@@ -576,7 +576,7 @@ main (int argc, char **argv)
  int ret;
  status = GNUNET_OK;
-  if (NULL == (sigpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, 
+  if (NULL == (sigpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO,
                                           GNUNET_NO, GNUNET_NO)))
  {
    GNUNET_break (0);
diff --git a/src/testbed/gnunet-service-test-barriers.c b/src/testbed/gnunet-service-test-barriers.c
index f22deb57e..efc9d5677 100644
--- a/src/testbed/gnunet-service-test-barriers.c
+++ b/src/testbed/gnunet-service-test-barriers.c
@@ -22,7 +22,7 @@
 * @file testbed/gnunet-service-test-barriers.c
 * @brief Daemon acting as a service for testing testbed barriers.  It is
 *   started as a peer service and waits for a barrier to be crossed.
- * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
 */
 #include "platform.h"
@@ -81,7 +81,7 @@ barrier_wait_cb (void *cls, const char *name, int status)
 *
 * @param cls NULL
 * @param tc scheduler task context
- * @return 
+ * @return
 */
 static void
 do_wait (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
@@ -126,7 +126,7 @@ int main (int argc, char **argv)
    GNUNET_GETOPT_OPTION_END
  };
  int ret;
-  
  ret =
      GNUNET_PROGRAM_run (argc, argv,
                          "test-barriers", "nohelp", options, &run, NULL);
diff --git a/src/testbed/gnunet-service-testbed-logger.c b/src/testbed/gnunet-service-testbed-logger.c
index c92237ccb..dfa9da52f 100644
--- a/src/testbed/gnunet-service-testbed-logger.c
+++ b/src/testbed/gnunet-service-testbed-logger.c
@@ -230,7 +230,7 @@ logger_run (void *cls, struct GNUNET_SERVER_Handle *server,
      GNUNET_CONFIGURATION_get_value_filename (cfg, "TESTBED-LOGGER", "DIR",
                                               &dir))
  {
-    LOG (GNUNET_ERROR_TYPE_ERROR, "Not logging directory definied.  Exiting\n");    
+    LOG (GNUNET_ERROR_TYPE_ERROR, "Not logging directory definied.  Exiting\n");
    GNUNET_SCHEDULER_shutdown ();
    return;
  }
@@ -272,7 +272,7 @@ main (int argc, char *const *argv)
 {
  //sleep (15);                 /* Debugging */
  return (GNUNET_OK ==
-          GNUNET_SERVICE_run (argc, argv, "testbed-logger", 
+          GNUNET_SERVICE_run (argc, argv, "testbed-logger",
                              GNUNET_SERVICE_OPTION_NONE,
                              &logger_run, NULL)) ? 0 : 1;
 }
diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c
index b9465b2fe..6f806e21b 100644
--- a/src/testbed/gnunet-service-testbed.c
+++ b/src/testbed/gnunet-service-testbed.c
@@ -446,7 +446,7 @@ parse_shared_services (char *ss_str, struct GNUNET_CONFIGURATION_Handle *cfg)
    (void) memcpy (&slist[n - 1], &ss,                                  \
                   sizeof (struct GNUNET_TESTING_SharedService));       \
  } while (0)
-  
  slist = NULL;
  n = 0;
  ss.cfg = cfg;
@@ -590,7 +590,7 @@ handle_add_host (void *cls, struct GNUNET_SERVER_Client *client,
  username_length = ntohs (msg->username_length);
  hostname_length = ntohs (msg->hostname_length);
  /* msg must contain hostname */
-  if ((msize <= (sizeof (struct GNUNET_TESTBED_AddHostMessage) + 
+  if ((msize <= (sizeof (struct GNUNET_TESTBED_AddHostMessage) +
                 username_length))
      || (0 == hostname_length))
  {
@@ -731,7 +731,7 @@ void
 GST_clear_fopcq ()
 {
  struct ForwardedOperationContext *fopc;
-  
  while (NULL != (fopc = fopcq_head))
  {
    GNUNET_CONTAINER_DLL_remove (fopcq_head, fopcq_tail, fopc);
@@ -747,7 +747,7 @@ GST_clear_fopcq ()
    case OP_SHUTDOWN_PEERS:
      {
        struct HandlerContext_ShutdownPeers *hc = fopc->cls;
-        
        GNUNET_assert (0 < hc->nslaves);
        hc->nslaves--;
        if (0 == hc->nslaves)
@@ -901,9 +901,9 @@ testbed_run (void *cls, struct GNUNET_SERVER_Handle *server,
     sizeof (struct GNUNET_TESTBED_ShutdownPeersMessage)},
    {&GST_handle_peer_reconfigure, NULL,
     GNUNET_MESSAGE_TYPE_TESTBED_RECONFIGURE_PEER, 0},
-    {&GST_handle_barrier_init, NULL, 
+    {&GST_handle_barrier_init, NULL,
     GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_INIT, 0},
-    {&GST_handle_barrier_cancel, NULL, 
+    {&GST_handle_barrier_cancel, NULL,
     GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_CANCEL, 0},
    {&GST_handle_barrier_status, NULL,
     GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_STATUS, 0},
diff --git a/src/testbed/gnunet-service-testbed_barriers.c b/src/testbed/gnunet-service-testbed_barriers.c
index bffafd7ae..634f0a07a 100644
--- a/src/testbed/gnunet-service-testbed_barriers.c
+++ b/src/testbed/gnunet-service-testbed_barriers.c
@@ -21,7 +21,7 @@
 /**
 * @file testbed/gnunet-service-testbed_barriers.c
 * @brief barrier handling at the testbed controller
- * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
 */
 #include "gnunet-service-testbed.h"
@@ -200,12 +200,12 @@ struct Barrier
   * Identifier for the timeout task
   */
  GNUNET_SCHEDULER_TaskIdentifier tout_task;
-  
  /**
   * The status of this barrier
   */
  enum GNUNET_TESTBED_BarrierStatus status;
-  
  /**
   * Number of barriers wrapped in the above DLL
   */
@@ -235,7 +235,7 @@ struct Barrier
   * Quorum percentage to be reached
   */
  uint8_t quorum;
-  
 };
@@ -261,7 +261,7 @@ static struct GNUNET_SERVICE_Context *ctx;
 * @param buf where the callee should write the message
 * @return number of bytes written to buf
 */
-static size_t 
+static size_t
 transmit_ready_cb (void *cls, size_t size, void *buf)
 {
  struct ClientCtx *ctx = cls;
@@ -276,7 +276,7 @@ transmit_ready_cb (void *cls, size_t size, void *buf)
  {
    GNUNET_assert (NULL != ctx->client);
    GNUNET_SERVER_client_drop (ctx->client);
-    ctx->client = NULL;    
+    ctx->client = NULL;
    return 0;
  }
  mq = ctx->mq_head;
@@ -306,7 +306,7 @@ queue_message (struct ClientCtx *ctx, struct GNUNET_MessageHeader *msg)
 {
  struct MessageQueue *mq;
  struct GNUNET_SERVER_Client *client = ctx->client;
-  
  mq = GNUNET_malloc (sizeof (struct MessageQueue));
  mq->msg = msg;
  LOG_DEBUG ("Queueing message of type %u, size %u for sending\n",
@@ -328,12 +328,12 @@ static void
 cleanup_clientctx (struct ClientCtx *ctx)
 {
  struct MessageQueue *mq;
-  
  if (NULL != ctx->client)
  {
    GNUNET_SERVER_client_set_user_context_ (ctx->client, NULL, 0);
    GNUNET_SERVER_client_drop (ctx->client);
-  } 
+  }
  if (NULL != ctx->tx)
    GNUNET_SERVER_notify_transmit_ready_cancel (ctx->tx);
  if (NULL != (mq = ctx->mq_head))
@@ -356,7 +356,7 @@ static void
 remove_barrier (struct Barrier *barrier)
 {
  struct ClientCtx *ctx;
-  
  GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove (barrier_map,
                                                                    &barrier->hash,
                                                                    barrier));
@@ -397,7 +397,7 @@ cancel_wrappers (struct Barrier *barrier)
 * @param name the barrier name
 * @param status the status of the barrier
 * @param emsg the error message; should be non-NULL for
- *   status=GNUNET_TESTBED_BARRIERSTATUS_ERROR 
+ *   status=GNUNET_TESTBED_BARRIERSTATUS_ERROR
 */
 static void
 send_client_status_msg (struct GNUNET_SERVER_Client *client,
@@ -431,7 +431,7 @@ send_client_status_msg (struct GNUNET_SERVER_Client *client,
 *
 * @param barrier the corresponding barrier
 * @param emsg the error message; should be non-NULL for
- *   status=GNUNET_TESTBED_BARRIERSTATUS_ERROR 
+ *   status=GNUNET_TESTBED_BARRIERSTATUS_ERROR
 */
 static void
 send_barrier_status_msg (struct Barrier *barrier, const char *emsg)
@@ -464,7 +464,7 @@ handle_barrier_wait (void *cls, struct GNUNET_SERVER_Client *client,
  struct GNUNET_HashCode key;
  size_t name_len;
  uint16_t msize;
-  
  msize = ntohs (message->size);
  if (msize <= sizeof (struct GNUNET_TESTBED_BarrierWait))
  {
@@ -500,7 +500,7 @@ handle_barrier_wait (void *cls, struct GNUNET_SERVER_Client *client,
    GNUNET_SERVER_client_keep (client);
    client_ctx->barrier = barrier;
    GNUNET_CONTAINER_DLL_insert_tail (barrier->head, barrier->tail, client_ctx);
-    GNUNET_SERVER_client_set_user_context (client, client_ctx); 
+    GNUNET_SERVER_client_set_user_context (client, client_ctx);
  }
  barrier->nreached++;
  if ((barrier->num_wbarriers_reached == barrier->num_wbarriers)
@@ -525,7 +525,7 @@ static void
 disconnect_cb (void *cls, struct GNUNET_SERVER_Client *client)
 {
  struct ClientCtx *client_ctx;
-  
  if (NULL == client)
    return;
  client_ctx = GNUNET_SERVER_client_get_user_context (client, struct ClientCtx);
@@ -554,7 +554,7 @@ GST_barriers_init (struct GNUNET_CONFIGURATION_Handle *cfg)
                              GNUNET_SERVICE_OPTION_MANUAL_SHUTDOWN);
  srv = GNUNET_SERVICE_get_server (ctx);
  GNUNET_SERVER_add_handlers (srv, message_handlers);
-  GNUNET_SERVER_disconnect_notify (srv, &disconnect_cb, NULL);  
+  GNUNET_SERVER_disconnect_notify (srv, &disconnect_cb, NULL);
 }
@@ -568,7 +568,7 @@ GST_barriers_init (struct GNUNET_CONFIGURATION_Handle *cfg)
 *         iterate,
 *         #GNUNET_NO if not.
 */
-static int 
+static int
 barrier_destroy_iterator (void *cls,
                          const struct GNUNET_HashCode *key,
                          void *value)
@@ -612,7 +612,7 @@ GST_barriers_destroy ()
 * @param emsg if the status were to be GNUNET_SYSERR, this parameter has the
 *   error messsage
 */
-static void 
+static void
 wbarrier_status_cb (void *cls, const char *name,
                    struct GNUNET_TESTBED_Barrier *b_,
                    enum GNUNET_TESTBED_BarrierStatus status,
@@ -679,7 +679,7 @@ static void
 fwd_tout_barrier_init (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
  struct Barrier *barrier = cls;
-  
  cancel_wrappers (barrier);
  barrier->status = GNUNET_TESTBED_BARRIERSTATUS_ERROR;
  send_barrier_status_msg (barrier,
@@ -713,7 +713,7 @@ GST_handle_barrier_init (void *cls, struct GNUNET_SERVER_Client *client,
  size_t name_len;
  unsigned int cnt;
  uint16_t msize;
-  
  if (NULL == GST_context)
  {
    GNUNET_break_op (0);
@@ -741,7 +741,7 @@ GST_handle_barrier_init (void *cls, struct GNUNET_SERVER_Client *client,
  LOG_DEBUG ("Received BARRIER_INIT for barrier `%s'\n", name);
  if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains (barrier_map, &hash))
  {
-    
    send_client_status_msg (client, name, GNUNET_TESTBED_BARRIERSTATUS_ERROR,
                            "A barrier with the same name already exists");
    GNUNET_free (name);
@@ -821,7 +821,7 @@ GST_handle_barrier_cancel (void *cls, struct GNUNET_SERVER_Client *client,
    GNUNET_break_op (0);
    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
    return;
-  }  
+  }
  if (client != GST_context->client)
  {
    GNUNET_break_op (0);
@@ -850,7 +850,7 @@ GST_handle_barrier_cancel (void *cls, struct GNUNET_SERVER_Client *client,
  GNUNET_assert (NULL != barrier);
  cancel_wrappers (barrier);
  remove_barrier (barrier);
-  GNUNET_SERVER_receive_done (client, GNUNET_OK);  
+  GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
@@ -868,20 +868,20 @@ GST_handle_barrier_status (void *cls, struct GNUNET_SERVER_Client *client,
                           const struct GNUNET_MessageHeader *message)
 {
  const struct GNUNET_TESTBED_BarrierStatusMsg *msg;
-  struct Barrier *barrier; 
+  struct Barrier *barrier;
  struct ClientCtx *client_ctx;
  const char *name;
  struct GNUNET_HashCode key;
  enum GNUNET_TESTBED_BarrierStatus status;
  uint16_t msize;
  uint16_t name_len;
-  
  if (NULL == GST_context)
  {
    GNUNET_break_op (0);
    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
    return;
-  }  
+  }
  if (client != GST_context->client)
  {
    GNUNET_break_op (0);
diff --git a/src/testbed/gnunet-service-testbed_barriers.h b/src/testbed/gnunet-service-testbed_barriers.h
index a96812086..2d6cfd4df 100644
--- a/src/testbed/gnunet-service-testbed_barriers.h
+++ b/src/testbed/gnunet-service-testbed_barriers.h
@@ -21,7 +21,7 @@
 /**
 * @file testbed/gnunet-service-testbed_barriers.h
 * @brief Interface for the barrier initialisation handler routine
- * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
 */
 #ifndef GNUNET_SERVER_TESTBED_BARRIERS_H_
diff --git a/src/testbed/gnunet-service-testbed_cache.c b/src/testbed/gnunet-service-testbed_cache.c
index 6a141a252..9db2155fc 100644
--- a/src/testbed/gnunet-service-testbed_cache.c
+++ b/src/testbed/gnunet-service-testbed_cache.c
@@ -352,7 +352,7 @@ close_handles (struct CacheEntry *entry)
  if (NULL != entry->transport_op)
  {
    GNUNET_TESTBED_operation_done (entry->transport_op);
-    entry->transport_op = NULL;    
+    entry->transport_op = NULL;
  }
  if (NULL != entry->core_op)
  {
@@ -610,7 +610,7 @@ oprelease_get_handle_transport (void *cls)
 * @param my_identity ID of this peer, NULL if we failed
 */
 static void
-core_startup_cb (void *cls, 
+core_startup_cb (void *cls,
                 const struct GNUNET_PeerIdentity *my_identity)
 {
  struct CacheEntry *entry = cls;
@@ -836,7 +836,7 @@ cache_clear_iterator (void *cls, const struct GNUNET_HashCode *key, void *value)
  GNUNET_assert (NULL != entry);
  GNUNET_break (0 == entry->demand);
  LOG_DEBUG ("Clearing entry %u of %u\n", ++ncleared, cache_size);
-  GNUNET_assert (GNUNET_YES == 
+  GNUNET_assert (GNUNET_YES ==
                 GNUNET_CONTAINER_multihashmap_remove (cache, key, value));
  close_handles (entry);
  GNUNET_free_non_null (entry->hello);
diff --git a/src/testbed/gnunet-service-testbed_connectionpool.c b/src/testbed/gnunet-service-testbed_connectionpool.c
index 80d020111..f4eb73778 100644
--- a/src/testbed/gnunet-service-testbed_connectionpool.c
+++ b/src/testbed/gnunet-service-testbed_connectionpool.c
@@ -21,7 +21,7 @@
 /**
 * @file testbed/gnunet-service-testbed_connectionpool.c
 * @brief connection pooling for connections to peers' services
- * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
 */
 #include "gnunet-service-testbed.h"
@@ -268,7 +268,7 @@ destroy_pooled_connection (struct PooledConnection *entry)
  if (entry->in_lru)
    GNUNET_CONTAINER_DLL_remove (head_lru, tail_lru, entry);
  if (entry->in_pool)
-    GNUNET_assert (GNUNET_OK == 
+    GNUNET_assert (GNUNET_OK ==
                   GNUNET_CONTAINER_multihashmap32_remove (map,
                                                           entry->index,
                                                           entry));
@@ -466,7 +466,7 @@ transport_peer_connect_notify_cb (void *cls,
                                  const struct GNUNET_PeerIdentity *peer)
 {
  struct PooledConnection *entry = cls;
-  
  peer_connect_notify_cb (entry, peer, GST_CONNECTIONPOOL_SERVICE_TRANSPORT);
 }
@@ -532,7 +532,7 @@ static void
 core_peer_connect_cb (void *cls, const struct GNUNET_PeerIdentity *peer)
 {
  struct PooledConnection *entry = cls;
-  
  peer_connect_notify_cb (entry, peer, GST_CONNECTIONPOOL_SERVICE_CORE);
 }
@@ -550,7 +550,7 @@ core_peer_connect_cb (void *cls, const struct GNUNET_PeerIdentity *peer)
 * @param my_identity ID of this peer, NULL if we failed
 */
 static void
-core_startup_cb (void *cls, 
+core_startup_cb (void *cls,
                 const struct GNUNET_PeerIdentity *my_identity)
 {
  struct PooledConnection *entry = cls;
@@ -642,9 +642,9 @@ cleanup_iterator (void *cls,
                  void *value)
 {
  struct PooledConnection *entry = value;
-  
  GNUNET_assert (NULL != entry);
-  GNUNET_assert (GNUNET_OK == 
+  GNUNET_assert (GNUNET_OK ==
                 GNUNET_CONTAINER_multihashmap32_remove (map, key, entry));
  if (entry->in_lru)
    GNUNET_CONTAINER_DLL_remove (head_lru, tail_lru, entry);
@@ -678,7 +678,7 @@ void
 GST_connection_pool_destroy ()
 {
  struct PooledConnection *entry;
-  
  if (NULL != map)
  {
    GNUNET_assert (GNUNET_SYSERR !=
@@ -776,7 +776,7 @@ GST_connection_pool_get_handle (unsigned int peer_id,
  {
    entry = GNUNET_new (struct PooledConnection);
    entry->index = peer_id32;
-    if ((NULL != map) 
+    if ((NULL != map)
        && (GNUNET_CONTAINER_multihashmap32_size (map) < max_size))
    {
      GNUNET_assert (GNUNET_OK ==
@@ -859,7 +859,7 @@ GST_connection_pool_get_handle_done (struct GST_ConnectionPool_GetHandle *gh)
    GNUNET_CONTAINER_DLL_remove (entry->head_notify, entry->head_notify, gh);
  GNUNET_free (gh);
  gh = NULL;
-  GNUNET_assert (!entry->in_lru);  
+  GNUNET_assert (!entry->in_lru);
  if ( (!entry->in_pool) && (NULL != map) )
  {
    if (GNUNET_YES == GNUNET_CONTAINER_multihashmap32_contains (map,
@@ -871,8 +871,8 @@ GST_connection_pool_get_handle_done (struct GST_ConnectionPool_GetHandle *gh)
    destroy_pooled_connection (head_lru);
    GNUNET_CONTAINER_DLL_remove (head_not_pooled, tail_not_pooled, entry);
    GNUNET_assert (GNUNET_OK ==
-                   GNUNET_CONTAINER_multihashmap32_put (map, 
+                   GNUNET_CONTAINER_multihashmap32_put (map,
-                                                        entry->index, 
+                                                        entry->index,
                                                        entry,
                                                        GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
    entry->in_pool = GNUNET_YES;
diff --git a/src/testbed/gnunet-service-testbed_connectionpool.h b/src/testbed/gnunet-service-testbed_connectionpool.h
index c055b32ac..e2f25cce8 100644
--- a/src/testbed/gnunet-service-testbed_connectionpool.h
+++ b/src/testbed/gnunet-service-testbed_connectionpool.h
@@ -21,7 +21,7 @@
 /**
 * @file testbed/gnunet-service-testbed_connectionpool.h
 * @brief Interface for connection pooling subroutines
- * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
 */
@@ -78,7 +78,7 @@ GST_connection_pool_destroy ();
 * @param peer_id the identity of the peer. Will be NULL if ch is NULL. In other
 *          cases, its value being NULL means that CORE connection has failed.
 */
-typedef void 
+typedef void
 (*GST_connection_pool_connection_ready_cb) (void *cls,
                                            struct GNUNET_CORE_Handle * ch,
                                            struct GNUNET_TRANSPORT_Handle * th,
diff --git a/src/testbed/gnunet-service-testbed_cpustatus.c b/src/testbed/gnunet-service-testbed_cpustatus.c
index 129088c40..4071c7172 100644
--- a/src/testbed/gnunet-service-testbed_cpustatus.c
+++ b/src/testbed/gnunet-service-testbed_cpustatus.c
@@ -318,7 +318,7 @@ updateUsage ()
    kc = kstat_open ();
    if (kc == NULL)
      {
-        GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kstat_close");        
+        GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kstat_close");
        goto ABORT_KSTAT;
      }
@@ -633,7 +633,7 @@ get_nproc ()
  nproc = 0;
  while (NULL != (ent = readdir (dir)))
  {
-    if((*ent->d_name > '0') && (*ent->d_name <= '9')) 
+    if((*ent->d_name > '0') && (*ent->d_name <= '9'))
      nproc++;
  }
  closedir (dir);
@@ -669,14 +669,14 @@ sample_load_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  now = GNUNET_TIME_absolute_get ();
  nbs = GNUNET_asprintf (&str, "%llu %d %d %u %u\n", now.abs_value_us / 1000LL / 1000LL,
                         ld_cpu, ld_disk, mem_usage, nproc);
-  if (0 < nbs) 
+  if (0 < nbs)
  {
    GNUNET_BIO_write (bw, str, nbs);
  }
  else
    GNUNET_break (0);
  GNUNET_free (str);
-  
 reschedule:
  sample_load_task_id =
      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
@@ -696,7 +696,7 @@ GST_stats_init (const struct GNUNET_CONFIGURATION_Handle *cfg)
  char *stats_dir;
  char *fn;
  size_t len;
-  
 #if MINGW
  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
              "Load statistics logging now available for windows\n");
@@ -716,7 +716,7 @@ GST_stats_init (const struct GNUNET_CONFIGURATION_Handle *cfg)
    GNUNET_free (hostname);
    return;
  }
-  fn = NULL;  
+  fn = NULL;
  (void) GNUNET_asprintf (&fn, "%s/%.*s-%jd.dat", stats_dir, len,
                          hostname, (intmax_t) getpid());
  GNUNET_free (stats_dir);
@@ -740,7 +740,7 @@ GST_stats_init (const struct GNUNET_CONFIGURATION_Handle *cfg)
  initMachCpuStats ();
 #endif
  updateUsage ();               /* initialize */
-  
 }
diff --git a/src/testbed/gnunet-service-testbed_links.c b/src/testbed/gnunet-service-testbed_links.c
index 85a4538ef..79166d438 100644
--- a/src/testbed/gnunet-service-testbed_links.c
+++ b/src/testbed/gnunet-service-testbed_links.c
@@ -98,7 +98,7 @@ struct LCFContext
   * The id of the operation which created this context
   */
  uint64_t operation_id;
-  
  /**
   * should the slave controller start the delegated controller?
   */
@@ -186,7 +186,7 @@ struct Neighbour
   * The controller handle
   */
  struct GNUNET_TESTBED_Controller *controller;
-  
  /**
   * Operation handle for opening a lateral connection to another controller.
   * Will be NULL if the slave controller is started by this controller
@@ -217,11 +217,11 @@ struct Neighbour
   * Is the conn_op inactivated?
   */
  unsigned int inactive;
-  
  /**
   * The id of the host this controller is running on
   */
-  uint32_t host_id;  
+  uint32_t host_id;
 };
@@ -256,7 +256,7 @@ struct NeighbourConnectCtxt
   * The neighbour to whom connection should be made
   */
  struct Neighbour *n;
-  
  /**
   * The client requesting the connection
   */
@@ -379,7 +379,7 @@ void
 GST_route_list_clear ()
 {
  unsigned int id;
-  
  for (id = 0; id < route_list_size; id++)
    if (NULL != route_list[id])
      GNUNET_free (route_list[id]);
@@ -437,7 +437,7 @@ kill_slave (struct Slave *slave)
  }
  if (NULL != slave->rhandle)
    GNUNET_TESTBED_cancel_registration (slave->rhandle);
-  GNUNET_assert (GNUNET_SYSERR != 
+  GNUNET_assert (GNUNET_SYSERR !=
                 GNUNET_CONTAINER_multihashmap_iterate (slave->reghost_map,
                                                        reghost_free_iterator,
                                                        slave));
@@ -545,7 +545,7 @@ send_controller_link_response (struct GNUNET_SERVER_Client *client,
  struct GNUNET_TESTBED_ControllerLinkResponse *msg;
  char *xconfig;
  size_t config_size;
-  size_t xconfig_size;  
+  size_t xconfig_size;
  uint16_t msize;
  GNUNET_assert ((NULL == cfg) || (NULL == emsg));
@@ -757,7 +757,7 @@ slave_event_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
  GNUNET_SCHEDULER_cancel (lcf->timeout_task);
  if (NULL == event->details.operation_finished.emsg)
    send_controller_link_response (lcf->client, lcf->operation_id,
-                                   GNUNET_TESTBED_host_get_cfg_ 
+                                   GNUNET_TESTBED_host_get_cfg_
                                   (GST_host_list[lcf->delegated_host_id]),
                                   NULL);
  else
@@ -855,17 +855,17 @@ trigger_notifications (struct Neighbour *n);
 * @param tc scheduler task context
 */
 static void
-neighbour_connect_notify_task (void *cls, 
+neighbour_connect_notify_task (void *cls,
                               const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
  struct Neighbour *n = cls;
  struct NeighbourConnectNotification *h;
  GNUNET_assert (NULL != (h = n->nl_head));
-  GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != n->notify_task);  
+  GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != n->notify_task);
  n->notify_task = GNUNET_SCHEDULER_NO_TASK;
  GNUNET_assert (NULL != n->controller);
-  GNUNET_CONTAINER_DLL_remove (n->nl_head, n->nl_tail, h);  
+  GNUNET_CONTAINER_DLL_remove (n->nl_head, n->nl_tail, h);
  trigger_notifications (n);
  h->cb (h->cb_cls, n->controller);
  GNUNET_free (h);
@@ -889,7 +889,7 @@ trigger_notifications (struct Neighbour *n)
  if (NULL == n->controller)
    return;
  if (GNUNET_SCHEDULER_NO_TASK != n->notify_task)
-    return;  
+    return;
  if (1 == n->inactive)
  {
    GNUNET_assert (0 == n->reference_cnt);
@@ -897,7 +897,7 @@ trigger_notifications (struct Neighbour *n)
    n->inactive = 0;
  }
  n->reference_cnt++;
-  n->notify_task = 
+  n->notify_task =
      GNUNET_SCHEDULER_add_now (&neighbour_connect_notify_task, n);
 }
@@ -913,7 +913,7 @@ static void
 opstart_neighbour_conn (void *cls)
 {
  struct Neighbour *n = cls;
-  
  GNUNET_assert (NULL != n->conn_op);
  GNUNET_assert (NULL == n->controller);
  LOG_DEBUG ("Opening connection to controller on host %u\n", n->host_id);
@@ -999,7 +999,7 @@ GST_neighbour_get_connection_cancel (struct NeighbourConnectNotification *h)
 {
  struct Neighbour *n;
  int cleanup_task;
-  
  n = h->n;
  cleanup_task = (h == n->nl_head) ? GNUNET_YES : GNUNET_NO;
  GNUNET_CONTAINER_DLL_remove (n->nl_head, n->nl_tail, h);
@@ -1121,7 +1121,7 @@ GST_free_nccq ()
 * @param tc the scheduler task context
 */
 static void
-timeout_neighbour_connect (void *cls, 
+timeout_neighbour_connect (void *cls,
                           const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
 struct NeighbourConnectCtxt *ncc = cls;
@@ -1233,7 +1233,7 @@ GST_handle_link_controllers (void *cls, struct GNUNET_SERVER_Client *client,
    struct Slave *slave;
    struct LinkControllersContext *lcc;
-    
    if (1 != msg->is_subordinate)
    {
      struct Neighbour *n;
@@ -1253,12 +1253,12 @@ GST_handle_link_controllers (void *cls, struct GNUNET_SERVER_Client *client,
      ncc->n = n;
      ncc->op_id = op_id;
      ncc->client = client;
-      GNUNET_SERVER_client_keep (client);      
+      GNUNET_SERVER_client_keep (client);
      ncc->nh = GST_neighbour_get_connection (n, neighbour_connect_cb, ncc);
      ncc->timeout_task = GNUNET_SCHEDULER_add_delayed (GST_timeout,
                                                        &timeout_neighbour_connect,
                                                        ncc);
-      GNUNET_CONTAINER_DLL_insert_tail (ncc_head, ncc_tail, ncc);      
+      GNUNET_CONTAINER_DLL_insert_tail (ncc_head, ncc_tail, ncc);
      GNUNET_SERVER_receive_done (client, GNUNET_OK);
      return;
    }
@@ -1351,7 +1351,7 @@ GST_free_lcfq ()
 {
  struct LCFContextQueue *lcfq;
  struct LCFContext *lcf;
-  
  if (NULL != lcfq_head)
  {
    if (GNUNET_SCHEDULER_NO_TASK != lcf_proc_task_id)
diff --git a/src/testbed/gnunet-service-testbed_oc.c b/src/testbed/gnunet-service-testbed_oc.c
index b98f319a2..55f18d251 100644
--- a/src/testbed/gnunet-service-testbed_oc.c
+++ b/src/testbed/gnunet-service-testbed_oc.c
@@ -89,7 +89,7 @@ enum OverlayConnectContextType
   * has to be made between local peers
   */
  OCC_TYPE_LOCAL,
-  
  /**
   * Type to be used when the first peer is local and the other peer is on a slave
   * controller started by us
@@ -109,7 +109,7 @@ enum OverlayConnectContextType
 * contexts
 */
 struct LocalPeer2Context
-{   
+{
  /**
   * The handle for offering the HELLO of the first peer to the second
   * peer.
@@ -128,20 +128,20 @@ struct LocalPeer2Context
 * contexts
 */
 struct RemotePeer2Context
-{  
+{
  /**
   * Controller of peer 2; If OCC_TYPE_REMOTE_LATERAL is the type of overlay
   * connection then this can be NULL until the connection to the controller is
   * established
   */
  struct GNUNET_TESTBED_Controller *p2c;
-  
  /**
   * Operation context for the suboperation we start to get the identity of the
   * second peer
   */
  struct OperationContext *opc;
-  
  /**
   * Notification handle acquire to connect to a remote controller.  Only used
   * if the type of overlay connection is OCC_TYPE_REMOTE_LATERAL.
@@ -152,7 +152,7 @@ struct RemotePeer2Context
   * The neighbour handle.  Only used if the type of overlay connection is
   * OCC_TYPE_REMOTE_LATERAL.
   */
-  struct Neighbour *p2n;  
+  struct Neighbour *p2n;
 };
 /**
@@ -364,7 +364,7 @@ static struct RemoteOverlayConnectCtx *roccq_tail;
 void
 GST_cleanup_focc (struct ForwardedOverlayConnectContext *focc)
 {
-  GNUNET_SERVER_client_drop (focc->client);  
+  GNUNET_SERVER_client_drop (focc->client);
  GNUNET_free_non_null (focc->orig_msg);
  GNUNET_free (focc);
 }
@@ -535,7 +535,7 @@ cleanup_occ (struct OverlayConnectContext *occ)
  if (NULL != occ->cgh_p1th)
    GST_cache_get_handle_done (occ->cgh_p1th);
  GNUNET_assert (NULL != GST_peer_list);
-  GNUNET_assert (occ->peer->reference_cnt > 0);  
+  GNUNET_assert (occ->peer->reference_cnt > 0);
  occ->peer->reference_cnt--;
  if (PEER_EXPIRED (occ->peer))
    GST_destroy_peer (occ->peer);
@@ -776,7 +776,7 @@ occ_hello_sent_cb (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  GNUNET_free_non_null (occ->emsg);
  GNUNET_asprintf (&occ->emsg,
                   "0x%llx: Timeout during TRANSPORT_try_connect() "
-                   "at peer %4s", occ->op_id, 
+                   "at peer %4s", occ->op_id,
                   GNUNET_i2s(&occ->other_peer_identity));
  lp2c->tcc.pid = &occ->peer_identity;
  lp2c->tcc.op_id = occ->op_id;
@@ -798,10 +798,10 @@ send_hello_thru_rocc (struct OverlayConnectContext *occ)
  char *other_peer_str;
  uint16_t msize;
  uint16_t hello_size;
- 
  GNUNET_assert (OCC_TYPE_LOCAL != occ->type);
  GNUNET_assert (NULL != occ->hello);
-  other_peer_str = GNUNET_strdup (GNUNET_i2s (&occ->other_peer_identity));  
+  other_peer_str = GNUNET_strdup (GNUNET_i2s (&occ->other_peer_identity));
  LOG_DEBUG ("0x%llx: Offering HELLO of %s (size: %u) to %s via Remote "
             "Overlay Request\n", occ->op_id,
             GNUNET_i2s (&occ->peer_identity), ntohs (occ->hello->size),
@@ -848,7 +848,7 @@ send_hello (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
    return;
  }
  lp2c = &occ->p2ctx.local;
-  other_peer_str = GNUNET_strdup (GNUNET_i2s (&occ->other_peer_identity));  
+  other_peer_str = GNUNET_strdup (GNUNET_i2s (&occ->other_peer_identity));
  LOG_DEBUG ("0x%llx: Offering HELLO of %s to %s\n", occ->op_id,
             GNUNET_i2s (&occ->peer_identity), other_peer_str);
  GNUNET_free (other_peer_str);
@@ -919,7 +919,7 @@ p2_transport_connect (struct OverlayConnectContext *occ)
  GNUNET_assert (NULL == occ->cgh_p1th);
  if (OCC_TYPE_LOCAL == occ->type)
  {
-    GNUNET_assert (NULL != (peer2 = GST_peer_list[occ->other_peer_id]));    
+    GNUNET_assert (NULL != (peer2 = GST_peer_list[occ->other_peer_id]));
    occ->p2ctx.local.tcc.cgh_th =
        GST_cache_get_handle_transport (occ->other_peer_id,
                                        peer2->details.local.cfg,
@@ -1145,7 +1145,7 @@ static void
 host_registration_comp (void *cls, const char *emsg)
 {
  struct RegisteredHostContext *rhc = cls;
-  
  rhc->state = RHC_DONE;
  GST_process_next_focc (rhc);
 }
@@ -1217,7 +1217,7 @@ register_host (struct Slave *slave, struct GNUNET_TESTBED_Host *host)
 {
  struct GNUNET_HashCode hash;
  struct RegisteredHostContext *rhc;
-  
  rhc = GNUNET_malloc (sizeof (struct RegisteredHostContext));
  rhc->reg_host = host;
  rhc->host = GST_host_list[slave->host_id];
@@ -1290,7 +1290,7 @@ forward_overlay_connect (const struct GNUNET_TESTBED_OverlayConnectMessage *msg,
  route_to_peer1_host = GST_find_dest_route
      (peer->details.remote.remote_host_id);
  GNUNET_assert (NULL != route_to_peer1_host);
-  if ((NULL != route_to_peer2_host) && 
+  if ((NULL != route_to_peer2_host) &&
      (route_to_peer1_host->dest == route_to_peer2_host->dest))
    goto forward;
  /* Peer2 is either with us OR peer1 and peer2 can be reached through
@@ -1417,17 +1417,17 @@ GST_handle_overlay_connect (void *cls, struct GNUNET_SERVER_Client *client,
    {
      GNUNET_break (0);
      GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-      return;      
+      return;
    }
    forward_overlay_connect (msg, client);
    GNUNET_SERVER_receive_done (client, GNUNET_OK);
    return;
  }
  p2n = NULL;
-  occ = GNUNET_malloc (sizeof (struct OverlayConnectContext));  
+  occ = GNUNET_malloc (sizeof (struct OverlayConnectContext));
  occ->type = OCC_TYPE_LOCAL;
  if (!VALID_PEER_ID (p2))       /* May be peer2 is on a another controller */
-  {    
+  {
    if (NULL == (p2n = GST_get_neighbour (peer2_host_id)))
    {
      if (!VALID_HOST_ID (peer2_host_id))
@@ -1455,7 +1455,7 @@ GST_handle_overlay_connect (void *cls, struct GNUNET_SERVER_Client *client,
  occ->client = client;
  occ->other_peer_id = p2;
  GST_peer_list[p1]->reference_cnt++;
-  occ->peer = GST_peer_list[p1];  
+  occ->peer = GST_peer_list[p1];
  occ->op_id = operation_id;
  GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == occ->timeout_task);
  occ->timeout_task =
@@ -1466,7 +1466,7 @@ GST_handle_overlay_connect (void *cls, struct GNUNET_SERVER_Client *client,
    GNUNET_asprintf (&occ->emsg,
                     "0x%llx: Timeout while acquiring connection to peer %u's "
                     "host: %u\n", occ->op_id, occ->other_peer_id, peer2_host_id);
-    occ->p2ctx.remote.ncn = 
+    occ->p2ctx.remote.ncn =
        GST_neighbour_get_connection (p2n, &p2_controller_connect_cb, occ);
    break;
  case OCC_TYPE_REMOTE_SLAVE:
diff --git a/src/testbed/gnunet-service-testbed_peers.c b/src/testbed/gnunet-service-testbed_peers.c
index 1792373a3..959229543 100644
--- a/src/testbed/gnunet-service-testbed_peers.c
+++ b/src/testbed/gnunet-service-testbed_peers.c
@@ -22,7 +22,7 @@
 /**
 * @file testbed/gnunet-service-testbed_peers.c
 * @brief implementation of TESTBED service that deals with peer management
- * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
 */
 #include "gnunet-service-testbed.h"
@@ -70,12 +70,12 @@ struct ManageServiceContext
   * The client which requested to manage the peer's service
   */
  struct GNUNET_SERVER_Client *client;
-  
  /**
   * The operation id of the associated request
   */
  uint64_t op_id;
-  
  /**
   * 1 if the service at the peer has to be started; 0 if it has to be stopped
   */
@@ -85,7 +85,7 @@ struct ManageServiceContext
   * Is this context expired?  Do not work on this context if it is set to
   * GNUNET_YES
   */
-  uint8_t expired;  
+  uint8_t expired;
 };
@@ -343,7 +343,7 @@ GST_handle_peer_create (void *cls, struct GNUNET_SERVER_Client *client,
    return;
  }
  if (UINT32_MAX == peer_id)
-  {    
+  {
    GST_send_operation_fail_msg (client, GNUNET_ntohll (msg->operation_id),
                                 "Cannot create peer with given ID");
    GNUNET_SERVER_receive_done (client, GNUNET_OK);
@@ -793,7 +793,7 @@ prc_stop_cb (void *cls, struct GNUNET_TESTING_Peer *p, int success)
  struct PeerReconfigureContext *prc = cls;
  struct Peer *peer;
  char *emsg;
-  
  GNUNET_assert (VALID_PEER_ID (prc->peer_id));
  peer = GST_peer_list [prc->peer_id];
  GNUNET_assert (GNUNET_NO == peer->is_remote);
@@ -815,13 +815,13 @@ prc_stop_cb (void *cls, struct GNUNET_TESTING_Peer *p, int success)
  }
  if (GNUNET_OK != start_peer (peer))
  {
-    
    GST_send_operation_fail_msg (prc->client, prc->op_id,
                                 "Failed to start reconfigured peer");
    goto cleanup;
  }
  GST_send_operation_success_msg (prc->client, prc->op_id);
-  
 cleanup:
  cleanup_prc (prc);
  return;
@@ -849,7 +849,7 @@ GST_handle_peer_reconfigure (void *cls, struct GNUNET_SERVER_Client *client,
  uint64_t op_id;
  uint32_t peer_id;
  uint16_t msize;
-  
  msize = ntohs (message->size);
  if (msize <= sizeof (struct GNUNET_TESTBED_PeerReconfigureMessage))
  {
@@ -907,7 +907,7 @@ GST_handle_peer_reconfigure (void *cls, struct GNUNET_SERVER_Client *client,
  cfg = GNUNET_TESTBED_extract_config_ (message);
  if (NULL == cfg)
  {
-    GNUNET_break (0);    
+    GNUNET_break (0);
    GST_send_operation_fail_msg (client, op_id, "Compression error");
    GNUNET_SERVER_receive_done (client, GNUNET_OK);
    return;
@@ -916,7 +916,7 @@ GST_handle_peer_reconfigure (void *cls, struct GNUNET_SERVER_Client *client,
  prc->cfg = cfg;
  prc->peer_id = peer_id;
  prc->op_id = op_id;
-  prc->client = client;  
+  prc->client = client;
  GNUNET_SERVER_client_keep (client);
  GNUNET_CONTAINER_DLL_insert_tail (prc_head, prc_tail, prc);
  GNUNET_TESTING_peer_stop_async (peer->details.local.peer, prc_stop_cb, prc);
@@ -1032,8 +1032,8 @@ arm_ret_string (enum GNUNET_ARM_Result result)
 * @param result result of the operation
 */
 static void
-service_manage_result_cb (void *cls, 
+service_manage_result_cb (void *cls,
-                          enum GNUNET_ARM_RequestStatus rs, 
+                          enum GNUNET_ARM_RequestStatus rs,
                          const char *service, enum GNUNET_ARM_Result result)
 {
  struct ManageServiceContext *mctx = cls;
@@ -1072,7 +1072,7 @@ service_manage_result_cb (void *cls,
    goto ret;
  }
  /* service started successfully */
-  
 ret:
  if (NULL != emsg)
  {
@@ -1107,17 +1107,17 @@ GST_handle_manage_peer_service (void *cls, struct GNUNET_SERVER_Client *client,
  uint64_t op_id;
  uint32_t peer_id;
  uint16_t msize;
-  
  msize = ntohs (message->size);
  if (msize <= sizeof (struct GNUNET_TESTBED_ManagePeerServiceMessage))
  {
-    GNUNET_break_op (0);  
+    GNUNET_break_op (0);
    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
    return;
  }
  msg = (const struct GNUNET_TESTBED_ManagePeerServiceMessage *) message;
-  service = (const char *) &msg[1];  
+  service = (const char *) &msg[1];
  if ('\0' != service[msize - sizeof
                      (struct GNUNET_TESTBED_ManagePeerServiceMessage) - 1])
  {
@@ -1129,7 +1129,7 @@ GST_handle_manage_peer_service (void *cls, struct GNUNET_SERVER_Client *client,
  {
    GNUNET_break_op (0);
    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-    return;    
+    return;
  }
  peer_id = ntohl (msg->peer_id);
  op_id = GNUNET_ntohll (msg->operation_id);
@@ -1247,7 +1247,7 @@ GST_destroy_peers ()
  {
    peer = GST_peer_list[id];
    if (NULL == peer)
-      continue;    
+      continue;
    if (GNUNET_NO == peer->is_remote)
    {
      if (GNUNET_YES == peer->details.local.is_running)
@@ -1288,7 +1288,7 @@ shutdown_peers_timeout_cb (void *cls,
    GNUNET_free (hc);
    hc = NULL;
  }
-  GNUNET_TESTBED_forward_operation_msg_cancel_ (fo_ctxt->opc);  
+  GNUNET_TESTBED_forward_operation_msg_cancel_ (fo_ctxt->opc);
  GNUNET_SERVER_client_drop (fo_ctxt->client);
  GNUNET_CONTAINER_DLL_remove (fopcq_head, fopcq_tail, fo_ctxt);
  GNUNET_free (fo_ctxt);
@@ -1309,14 +1309,14 @@ shutdown_peers_reply_cb (void *cls,
 {
  struct ForwardedOperationContext *fo_ctxt = cls;
  struct HandlerContext_ShutdownPeers *hc;
-  
  hc = fo_ctxt->cls;
  GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != fo_ctxt->timeout_task);
  GNUNET_SCHEDULER_cancel (fo_ctxt->timeout_task);
  fo_ctxt->timeout_task = GNUNET_SCHEDULER_NO_TASK;
  GNUNET_assert (0 < hc->nslaves);
  hc->nslaves--;
-  if (GNUNET_MESSAGE_TYPE_TESTBED_GENERIC_OPERATION_SUCCESS != 
+  if (GNUNET_MESSAGE_TYPE_TESTBED_GENERIC_OPERATION_SUCCESS !=
      ntohs (msg->type))
    hc->timeout = GNUNET_YES;
  if (0 == hc->nslaves)
@@ -1398,5 +1398,5 @@ GST_handle_shutdown_peers (void *cls, struct GNUNET_SERVER_Client *client,
    GST_send_operation_success_msg (client, op_id);
    GNUNET_free (hc);
  }
-  GNUNET_SERVER_receive_done (client, GNUNET_OK);  
+  GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c
index 8d85280fe..c6c472f92 100644
--- a/src/testbed/gnunet-testbed-profiler.c
+++ b/src/testbed/gnunet-testbed-profiler.c
@@ -49,7 +49,7 @@ struct GNUNET_TESTBED_Operation *topology_op;
 /**
 * Name of the file with the hosts to run the test over (configuration option).
 * It will be NULL if ENABLE_LL is set
- */ 
+ */
 static char *hosts_file;
 /**
@@ -216,7 +216,7 @@ controller_event_cb (void *cls,
 * @param links_failed the number of overlay link
 */
 static void
-test_run (void *cls, 
+test_run (void *cls,
          struct GNUNET_TESTBED_RunHandle *h,
          unsigned int num_peers, struct GNUNET_TESTBED_Peer **peers,
          unsigned int links_succeeded,
diff --git a/src/testbed/gnunet_testbed_mpi_spawn.c b/src/testbed/gnunet_testbed_mpi_spawn.c
index c7b7aab0b..a7652cfd8 100644
--- a/src/testbed/gnunet_testbed_mpi_spawn.c
+++ b/src/testbed/gnunet_testbed_mpi_spawn.c
@@ -26,7 +26,7 @@ static int ret;
 static struct GNUNET_OS_Process *child;
 /**
- * The arguments including the binary to spawn 
+ * The arguments including the binary to spawn
 */
 static char **argv2;
@@ -79,7 +79,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  shutdown_task_id = GNUNET_SCHEDULER_NO_TASK;
  if (0 != child_exit_code)
  {
-    LOG (GNUNET_ERROR_TYPE_WARNING, "Child exited with error code: %lu\n", 
+    LOG (GNUNET_ERROR_TYPE_WARNING, "Child exited with error code: %lu\n",
         child_exit_code);
    ret = 128 + (int) child_exit_code;
  }
@@ -101,7 +101,7 @@ terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  static int hard_kill;
  GNUNET_assert (NULL != child);
-  terminate_task_id = 
+  terminate_task_id =
      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
                                    &terminate_task, NULL);
  if (0 != hard_kill)
@@ -110,7 +110,7 @@ terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
    {
    case 1:
    case 2:
-      LOG (GNUNET_ERROR_TYPE_WARNING, 
+      LOG (GNUNET_ERROR_TYPE_WARNING,
           "%d more interrupts needed to send SIGKILL to the child\n",
           3 - hard_kill);
      hard_kill++;
@@ -190,7 +190,7 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  char *hostname;
  size_t hostname_len;
  unsigned int nhosts;
-  
  null_cfg = GNUNET_CONFIGURATION_create ();
  nhosts = GNUNET_TESTBED_hosts_load_from_loadleveler (null_cfg, &hosts);
  if (0 == nhosts)
@@ -223,7 +223,7 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  if (NULL == tmpdir)
    tmpdir = getenv ("TMP");
  if (NULL == tmpdir)
-    tmpdir = getenv ("TEMP");  
+    tmpdir = getenv ("TEMP");
  if (NULL == tmpdir)
    tmpdir = "/tmp";
  (void) GNUNET_asprintf (&fn, "%s/gnunet-testbed-spawn.lock", tmpdir);
@@ -304,7 +304,7 @@ main (int argc, char *argv[])
    GNUNET_break (0);
    return 1;
  }
-  if (NULL == (sigpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, 
+  if (NULL == (sigpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO,
                                           GNUNET_NO, GNUNET_NO)))
  {
    GNUNET_break (0);
@@ -321,7 +321,7 @@ main (int argc, char *argv[])
  argv2 = GNUNET_malloc (sizeof (char *) * argc);
  for (cnt = 1; cnt < argc; cnt++)
    argv2[cnt - 1] = argv[cnt];
-  GNUNET_SCHEDULER_run (run, NULL);  
+  GNUNET_SCHEDULER_run (run, NULL);
  GNUNET_free (argv2);
  GNUNET_SIGNAL_handler_uninstall (shc_chld);
  shc_chld = NULL;
diff --git a/src/testbed/test_getcwd.c b/src/testbed/test_getcwd.c
index 2b98a56d8..433f65f09 100644
--- a/src/testbed/test_getcwd.c
+++ b/src/testbed/test_getcwd.c
@@ -5,7 +5,7 @@ int main ()
 {
  char buf[PATH_MAX];
  char *out;
-  
  out = getcwd (buf, PATH_MAX);
  (void) printf ("CWD: %s\n", out);
  return 0;
diff --git a/src/testbed/test_testbed_api.c b/src/testbed/test_testbed_api.c
index 97ca15c5f..47caa06f3 100644
--- a/src/testbed/test_testbed_api.c
+++ b/src/testbed/test_testbed_api.c
@@ -416,7 +416,7 @@ status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg_, int status
    cp = NULL;
    FAIL_TEST (0, return);
    return;
-  }  
+  }
  event_mask = 0;
  event_mask |= (1L << GNUNET_TESTBED_ET_PEER_START);
  event_mask |= (1L << GNUNET_TESTBED_ET_PEER_STOP);
diff --git a/src/testbed/test_testbed_api_barriers.c b/src/testbed/test_testbed_api_barriers.c
index 2fbd6ea81..648af792b 100644
--- a/src/testbed/test_testbed_api_barriers.c
+++ b/src/testbed/test_testbed_api_barriers.c
@@ -21,7 +21,7 @@
 /**
 * @file testbed/test_testbed_api_barriers.c
 * @brief testcase binary for testing testbed barriers API
- * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
 */
 #include "platform.h"
@@ -73,7 +73,7 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
    GNUNET_TESTBED_barrier_cancel (barrier);
    barrier = NULL;
  }
-  
  GNUNET_SCHEDULER_shutdown ();
 }
@@ -99,7 +99,7 @@ barrier_cb (void *cls,
            const char *emsg)
 {
  static enum GNUNET_TESTBED_BarrierStatus old_status;
-  
  GNUNET_assert (NULL == cls);
  GNUNET_assert (_barrier == barrier);
  switch (status)
@@ -109,14 +109,14 @@ barrier_cb (void *cls,
    old_status = status;
    return;
  case GNUNET_TESTBED_BARRIERSTATUS_ERROR:
-    LOG (GNUNET_ERROR_TYPE_ERROR, "Barrier initialisation failed: %s", 
+    LOG (GNUNET_ERROR_TYPE_ERROR, "Barrier initialisation failed: %s",
         (NULL == emsg) ? "unknown reason" : emsg);
    barrier = NULL;
-    GNUNET_SCHEDULER_shutdown ();    
+    GNUNET_SCHEDULER_shutdown ();
    return;
  case GNUNET_TESTBED_BARRIERSTATUS_CROSSED:
    LOG (GNUNET_ERROR_TYPE_INFO, "Barrier crossed\n");
-    if (old_status == GNUNET_TESTBED_BARRIERSTATUS_INITIALISED) 
+    if (old_status == GNUNET_TESTBED_BARRIERSTATUS_INITIALISED)
      result = GNUNET_OK;
    barrier = NULL;
    GNUNET_SCHEDULER_shutdown ();
@@ -161,7 +161,7 @@ test_master (void *cls,
                                         &barrier_cb, NULL);
  shutdown_task =
      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                    (GNUNET_TIME_UNIT_SECONDS, 
+                                    (GNUNET_TIME_UNIT_SECONDS,
                                     10 * (NUM_PEERS + 1)),
                                    &do_shutdown, NULL);
 }
@@ -181,7 +181,7 @@ main (int argc, char **argv)
  result = GNUNET_SYSERR;
  event_mask = 0;
  cfg = GNUNET_CONFIGURATION_create ();
-  GNUNET_assert (GNUNET_YES == 
+  GNUNET_assert (GNUNET_YES ==
                 GNUNET_CONFIGURATION_parse (cfg,
                                             "test_testbed_api_barriers.conf.in"));
  if (NULL == getcwd (pwd, PATH_MAX))
@@ -191,7 +191,7 @@ main (int argc, char **argv)
  GNUNET_CONFIGURATION_set_value_string (cfg, "test-barriers","BINARY", binary);
  GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_write
                 (cfg, "test_testbed_api_barriers.conf"));
-  GNUNET_CONFIGURATION_destroy (cfg);  
+  GNUNET_CONFIGURATION_destroy (cfg);
  cfg = NULL;
  GNUNET_free (binary);
  binary = NULL;
diff --git a/src/testbed/test_testbed_api_hosts.c b/src/testbed/test_testbed_api_hosts.c
index 0c3c17a6b..4d96b2303 100644
--- a/src/testbed/test_testbed_api_hosts.c
+++ b/src/testbed/test_testbed_api_hosts.c
@@ -118,7 +118,7 @@ run (void *cls, char *const *args, const char *cfgfile,
  {
    if (cnt < 3)
    {
-      GNUNET_assert (0 == strcmp ("totakura", 
+      GNUNET_assert (0 == strcmp ("totakura",
                                  GNUNET_TESTBED_host_get_username_
                                  (hosts[cnt])));
      GNUNET_assert (NULL != GNUNET_TESTBED_host_get_hostname (hosts[cnt]));
@@ -126,7 +126,7 @@ run (void *cls, char *const *args, const char *cfgfile,
    }
    if (3 == cnt)
    {
-      GNUNET_assert (0 == strcmp ("totakura", 
+      GNUNET_assert (0 == strcmp ("totakura",
                                  GNUNET_TESTBED_host_get_username_
                                  (hosts[cnt])));
      GNUNET_assert (NULL != GNUNET_TESTBED_host_get_hostname (hosts[cnt]));
@@ -134,7 +134,7 @@ run (void *cls, char *const *args, const char *cfgfile,
    }
    if (4 == cnt)
    {
-      GNUNET_assert (0 == strcmp ("totakura", 
+      GNUNET_assert (0 == strcmp ("totakura",
                                  GNUNET_TESTBED_host_get_username_
                                  (hosts[cnt])));
      GNUNET_assert (0 == strcmp ("asgard.realm",
diff --git a/src/testbed/test_testbed_api_operations.c b/src/testbed/test_testbed_api_operations.c
index feca147b7..ceae76cd4 100644
--- a/src/testbed/test_testbed_api_operations.c
+++ b/src/testbed/test_testbed_api_operations.c
@@ -296,8 +296,8 @@ step (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  case TEST_OP4_STARTED:
    GNUNET_TESTBED_operation_release_ (op4);
    break;
-  case TEST_OP6_RELEASED:    
+  case TEST_OP6_RELEASED:
-    op8 = GNUNET_TESTBED_operation_create_ (&op8, &start_cb, &release_cb);    
+    op8 = GNUNET_TESTBED_operation_create_ (&op8, &start_cb, &release_cb);
    GNUNET_TESTBED_operation_queue_insert2_ (q1, op8, 2);
    GNUNET_TESTBED_operation_queue_insert2_ (q2, op8, 2);
    result = TEST_OP8_WAITING;
@@ -311,13 +311,13 @@ step (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  case TEST_OP8_INACTIVE_1:
    GNUNET_TESTBED_operation_activate_ (op8);
    result = TEST_OP8_ACTIVE;
-    op9 = GNUNET_TESTBED_operation_create_ (&op9, &start_cb, &release_cb);    
+    op9 = GNUNET_TESTBED_operation_create_ (&op9, &start_cb, &release_cb);
    GNUNET_TESTBED_operation_queue_insert2_ (q1, op9, 1);
    GNUNET_TESTBED_operation_queue_insert2_ (q2, op9, 1);
    GNUNET_TESTBED_operation_begin_wait_ (op9);
    step_task = GNUNET_SCHEDULER_add_delayed (STEP_DELAY, &step, NULL);
    break;
-  case TEST_OP8_ACTIVE:    
+  case TEST_OP8_ACTIVE:
    GNUNET_TESTBED_operation_inactivate_ (op8);
    /* op8 should be released by now due to above call */
    GNUNET_assert (TEST_OP8_RELEASED == result);
diff --git a/src/testbed/test_testbed_api_peer_reconfiguration.c b/src/testbed/test_testbed_api_peer_reconfiguration.c
index 7f7bf6473..8ca679c27 100644
--- a/src/testbed/test_testbed_api_peer_reconfiguration.c
+++ b/src/testbed/test_testbed_api_peer_reconfiguration.c
@@ -22,7 +22,7 @@
 * @file testbed/test_testbed_api_peer_reconfiguration.c
 * @brief testcase for testing GNUNET_TESTBED_peer_manage_service()
 *          implementation
- * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
 */
 #include "platform.h"
@@ -63,7 +63,7 @@ enum {
   * Peers have been started
   */
  STATE_PEER_STARTED,
-  
  /**
   * Peer has been reconfigured.  Test completed successfully
   */
@@ -97,7 +97,7 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Aborting\n");
  abort_task = GNUNET_SCHEDULER_NO_TASK;
  if (NULL != op)
-  {  
+  {
    GNUNET_TESTBED_operation_done (op);
    op = NULL;
  }
@@ -128,7 +128,7 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
    fprintf (stderr, "Operation failed: %s\n",
             event->details.operation_finished.emsg);
    GNUNET_TESTBED_operation_done (op);
-    op = NULL;    
+    op = NULL;
    FAIL_TEST (0, return);
  }
  GNUNET_TESTBED_operation_done (op);
@@ -152,7 +152,7 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
 *          failed
 */
 static void
-test_master (void *cls, 
+test_master (void *cls,
             struct GNUNET_TESTBED_RunHandle *h,
             unsigned int num_peers,
             struct GNUNET_TESTBED_Peer **peers_,
diff --git a/src/testbed/test_testbed_api_peers_manage_services.c b/src/testbed/test_testbed_api_peers_manage_services.c
index 29eed3d12..d61c11408 100644
--- a/src/testbed/test_testbed_api_peers_manage_services.c
+++ b/src/testbed/test_testbed_api_peers_manage_services.c
@@ -22,7 +22,7 @@
 * @file testbed/test_testbed_api_peers_manage_services.c
 * @brief testcase for testing GNUNET_TESTBED_peer_manage_service()
 *          implementation
- * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
 */
 #include "platform.h"
@@ -68,7 +68,7 @@ enum {
   * Peers have been started
   */
  STATE_PEERS_STARTED,
-  
  /**
   * statistics service went down
   */
@@ -111,7 +111,7 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Aborting\n");
  abort_task = GNUNET_SCHEDULER_NO_TASK;
  if (NULL != op)
-  {  
+  {
    GNUNET_TESTBED_operation_done (op);
    op = NULL;
  }
diff --git a/src/testbed/test_testbed_api_sd.c b/src/testbed/test_testbed_api_sd.c
index d4fa7af84..0748c0ffd 100644
--- a/src/testbed/test_testbed_api_sd.c
+++ b/src/testbed/test_testbed_api_sd.c
@@ -22,7 +22,7 @@
 /**
 * @file testbed/testbed_api_sd.c
 * @brief test cases for calculating standard deviation
- * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
 */
 #include "platform.h"
@@ -58,7 +58,7 @@ run (void *cls, char *const *args, const char *cfgfile,
    ret = 1;
    goto err;
  }
-  GNUNET_TESTBED_SD_add_data_ (h, 30); 
+  GNUNET_TESTBED_SD_add_data_ (h, 30);
  if (GNUNET_SYSERR == GNUNET_TESTBED_SD_deviation_factor_ (h, 80, &sd))
  {
    GNUNET_break (0);
diff --git a/src/testbed/test_testbed_api_statistics.c b/src/testbed/test_testbed_api_statistics.c
index e0f48fcb5..4c27e2982 100644
--- a/src/testbed/test_testbed_api_statistics.c
+++ b/src/testbed/test_testbed_api_statistics.c
@@ -21,7 +21,7 @@
 /**
 * @file testbed/test_testbed_api_statistics.c
 * @brief testcase for testing GNUNET_TESTBED_get_statistics() implementation
- * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
 */
 #include "platform.h"
@@ -95,7 +95,7 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Test timed out -- Aborting\n");
  abort_task = GNUNET_SCHEDULER_NO_TASK;
  if (NULL != op)
-  {  
+  {
    GNUNET_TESTBED_operation_done (op);
    op = NULL;
  }
@@ -121,12 +121,12 @@ stats_iterator (void *cls,
                int is_persistent)
 {
  unsigned int cnt;
-    
  FAIL_TEST (cls == dummy_cls, return GNUNET_SYSERR);
  for (cnt = 0; cnt < num_seen_peers; cnt++)
    FAIL_TEST (peer != seen_peers[cnt], return GNUNET_SYSERR);
  FAIL_TEST (NULL != subsystem, return GNUNET_SYSERR);
-  FAIL_TEST (NULL != name, return GNUNET_SYSERR);  
+  FAIL_TEST (NULL != name, return GNUNET_SYSERR);
  GNUNET_array_append (seen_peers, num_seen_peers,
                       (struct GNUNET_TESTBED_Peer *) peer);
  return GNUNET_SYSERR;
@@ -151,7 +151,7 @@ op_comp_cb (void *cls,
  GNUNET_TESTBED_operation_done (op);
  op = NULL;
  GNUNET_SCHEDULER_cancel (abort_task);
-  GNUNET_SCHEDULER_shutdown ();  
+  GNUNET_SCHEDULER_shutdown ();
 }
diff --git a/src/testbed/test_testbed_api_testbed_run.c b/src/testbed/test_testbed_api_testbed_run.c
index b7cff2ec7..30acf268f 100644
--- a/src/testbed/test_testbed_api_testbed_run.c
+++ b/src/testbed/test_testbed_api_testbed_run.c
@@ -107,7 +107,7 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 *          failed
 */
 static void
-test_master (void *cls, 
+test_master (void *cls,
             struct GNUNET_TESTBED_RunHandle *h,
             unsigned int num_peers,
             struct GNUNET_TESTBED_Peer **peers_,
diff --git a/src/testbed/test_testbed_logger_api.c b/src/testbed/test_testbed_logger_api.c
index a8ed3d22c..dae972427 100644
--- a/src/testbed/test_testbed_logger_api.c
+++ b/src/testbed/test_testbed_logger_api.c
@@ -142,12 +142,12 @@ iterator_cb (void *cls, struct GNUNET_DISK_DirectoryIterator *di,
  if ((BSIZE * 2) != fs)        /* The file size should be equal to what we
                                   have written */
    goto iteration_cont;
-  
  cancel = GNUNET_YES;
  result = GNUNET_OK;
-    
 iteration_cont:
-  if ( (NULL != di) && 
+  if ( (NULL != di) &&
       (GNUNET_YES == GNUNET_DISK_directory_iterator_next (di, cancel)) )
    return;
  shutdown_now ();
@@ -193,7 +193,7 @@ do_write (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 /**
 * Signature of the 'main' function for a (single-peer) testcase that
 * is run using 'GNUNET_TESTING_peer_run'.
- * 
+ *
 * @param cls closure
 * @param cfg configuration of the peer that was started
 * @param peer identity of the peer that was created
diff --git a/src/testbed/testbed.h b/src/testbed/testbed.h
index f781eea0d..cb39cc993 100644
--- a/src/testbed/testbed.h
+++ b/src/testbed/testbed.h
@@ -175,7 +175,7 @@ struct GNUNET_TESTBED_ControllerLinkRequest
 */
 struct GNUNET_TESTBED_ControllerLinkResponse
 {
-  
  /**
   * Type is GNUNET_MESSAGE_TYPE_TESTBED_LINK_CONTROLLERS_RESULT
   */
@@ -453,7 +453,7 @@ struct GNUNET_TESTBED_RemoteOverlayConnectMessage
  /**
   * To be followed by the HELLO message of A
   */
-  struct GNUNET_MessageHeader hello[0]; 
+  struct GNUNET_MessageHeader hello[0];
  // FIXME: we usually do not use this gcc-hack as some
  // compilers / tools really get messed up by it...
@@ -763,7 +763,7 @@ struct GNUNET_TESTBED_ManagePeerServiceMessage
   * set this to 1 to start the service; 0 to stop the service
   */
  uint8_t start;
-  
  /**
   * The NULL-terminated name of the service to start/stop follows here
   */
@@ -830,7 +830,7 @@ struct GNUNET_TESTBED_BarrierStatusMsg
   * Type is GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_STATUS
   */
  struct GNUNET_MessageHeader header;
-  
  /**
   * status.  Use enumerated values of enum BarrierStatus
   */
@@ -840,7 +840,7 @@ struct GNUNET_TESTBED_BarrierStatusMsg
   * strlen of the barrier name
   */
  uint16_t name_len GNUNET_PACKED;
-  
  /**
   * the barrier name (NULL terminated) concatenated with an error message (NULL
   * terminated) if the status were to indicate an error
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index 3539eae03..2ee17c9e0 100644
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -202,7 +202,7 @@ exop_insert (struct GNUNET_TESTBED_Operation *op)
  entry = GNUNET_malloc (sizeof (struct ExpireOperationEntry));
  entry->op = op;
-  GNUNET_CONTAINER_DLL_insert_tail (exop_head, exop_tail, entry);  
+  GNUNET_CONTAINER_DLL_insert_tail (exop_head, exop_tail, entry);
 }
@@ -281,7 +281,7 @@ opc_search_iterator (void *cls, uint32_t key, void *value)
 {
  struct SearchContext *sc = cls;
  struct OperationContext *opc = value;
-  
  GNUNET_assert (NULL != opc);
  GNUNET_assert (NULL == sc->opc);
  if (opc->id != sc->id)
@@ -307,7 +307,7 @@ find_opc (const struct GNUNET_TESTBED_Controller *c, const uint64_t id)
  sc.id = id;
  sc.opc = NULL;
  GNUNET_assert (NULL != c->opc_map);
-  if (GNUNET_SYSERR != 
+  if (GNUNET_SYSERR !=
      GNUNET_CONTAINER_multihashmap32_get_multiple (c->opc_map, (uint32_t) id,
                                                    &opc_search_iterator, &sc))
    return NULL;
@@ -330,7 +330,7 @@ GNUNET_TESTBED_insert_opc_ (struct GNUNET_TESTBED_Controller *c,
  if (NULL == c->opc_map)
    c->opc_map = GNUNET_CONTAINER_multihashmap32_create (256);
  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONTAINER_multihashmap32_put (c->opc_map, 
+                 GNUNET_CONTAINER_multihashmap32_put (c->opc_map,
                                                      (uint32_t) opc->id, opc,
                                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
 }
@@ -341,7 +341,7 @@ GNUNET_TESTBED_insert_opc_ (struct GNUNET_TESTBED_Controller *c,
 * given controller
 *
 * @param c the controller
- * @param opc the operation context to remove 
+ * @param opc the operation context to remove
 */
 void
 GNUNET_TESTBED_remove_opc_ (const struct GNUNET_TESTBED_Controller *c,
@@ -465,7 +465,7 @@ handle_opsuccess (struct GNUNET_TESTBED_Controller *c,
  }
  GNUNET_TESTBED_remove_opc_ (opc->c, opc);
  opc->state = OPC_STATE_FINISHED;
-  exop_insert (event.op);  
+  exop_insert (event.op);
  if (0 != (c->event_mask & (1L << GNUNET_TESTBED_ET_OPERATION_FINISHED)))
  {
    if (NULL != c->cc)
@@ -611,7 +611,7 @@ handle_peer_event (struct GNUNET_TESTBED_Controller *c,
  if (0 != (mask & c->event_mask))
  {
    if (NULL != c->cc)
-      c->cc (c->cc_cls, &event);    
+      c->cc (c->cc_cls, &event);
    if (GNUNET_NO == exop_check (event.op))
      return GNUNET_YES;
  }
@@ -689,7 +689,7 @@ handle_peer_conevent (struct GNUNET_TESTBED_Controller *c,
      c->cc (c->cc_cls, &event);
    if (GNUNET_NO == exop_check (event.op))
      return GNUNET_YES;
-  }  
+  }
  if (NULL != cb)
    cb (cb_cls, opc->op, NULL);
   /* You could have marked the operation as done by now */
@@ -738,12 +738,12 @@ handle_peer_config (struct GNUNET_TESTBED_Controller *c,
  GNUNET_assert (NULL != peer);
  GNUNET_assert (ntohl (msg->peer_id) == peer->unique_id);
  pinfo = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_PeerInformation));
-  pinfo->pit = data->pit;  
+  pinfo->pit = data->pit;
  cb = data->cb;
  cb_cls = data->cb_cls;
  GNUNET_assert (NULL != cb);
  GNUNET_free (data);
-  opc->data = NULL;  
+  opc->data = NULL;
  switch (pinfo->pit)
  {
  case GNUNET_TESTBED_PIT_IDENTITY:
@@ -760,7 +760,7 @@ handle_peer_config (struct GNUNET_TESTBED_Controller *c,
    break;
  }
  opc->data = pinfo;
-  GNUNET_TESTBED_remove_opc_ (opc->c, opc);  
+  GNUNET_TESTBED_remove_opc_ (opc->c, opc);
  opc->state = OPC_STATE_FINISHED;
  cb (cb_cls, opc->op, pinfo, NULL);
  /* We dont check whether the operation is marked as done here as the
@@ -871,7 +871,7 @@ handle_op_fail_event (struct GNUNET_TESTBED_Controller *c,
  case OP_FORWARDED:
    GNUNET_assert (0);
  case OP_LINK_CONTROLLERS:    /* No secondary callback */
-    break;    
+    break;
  case OP_SHUTDOWN_PEERS:
  {
    struct ShutdownPeersData *data;
@@ -1156,7 +1156,7 @@ message_handler (void *cls, const struct GNUNET_MessageHeader *msg)
                             msg);
    break;
  case GNUNET_MESSAGE_TYPE_TESTBED_LINK_CONTROLLERS_RESULT:
-    status = 
+    status =
        handle_link_controllers_result (c,
                                        (const struct
                                         GNUNET_TESTBED_ControllerLinkResponse
@@ -1365,7 +1365,7 @@ oprelease_link_controllers (void *cls)
  switch (opc->state)
  {
  case OPC_STATE_INIT:
-    GNUNET_free (data->msg);    
+    GNUNET_free (data->msg);
    break;
  case OPC_STATE_STARTED:
    GNUNET_TESTBED_remove_opc_ (opc->c, opc);
@@ -1543,7 +1543,7 @@ opc_free_iterator (void *cls, uint32_t key, void *value)
  GNUNET_assert (NULL != opc);
  GNUNET_break (0);
-  GNUNET_assert (GNUNET_YES == 
+  GNUNET_assert (GNUNET_YES ==
                 GNUNET_CONTAINER_multihashmap32_remove (map, key, value));
  GNUNET_free (opc);
  return GNUNET_YES;
@@ -1638,7 +1638,7 @@ GNUNET_TESTBED_compress_cfg_ (const struct GNUNET_CONFIGURATION_Handle *cfg,
  char *xconfig;
  size_t size_;
  size_t xsize_;
-  
  config = GNUNET_CONFIGURATION_serialize (cfg, &size_);
  xsize_ = GNUNET_TESTBED_compress_config_ (config, size_, &xconfig);
  GNUNET_free (config);
@@ -1689,7 +1689,7 @@ GNUNET_TESTBED_controller_link (void *op_cls,
  uint32_t slave_host_id;
  uint32_t delegated_host_id;
  uint16_t msg_size;
-  
  GNUNET_assert (GNUNET_YES ==
                 GNUNET_TESTBED_is_host_registered_ (delegated_host, master));
  slave_host_id =
@@ -1875,7 +1875,7 @@ GNUNET_TESTBED_create_helper_init_msg_ (const char *trusted_ip,
 * cancels the operation, frees its resources and ensures the no event is
 * generated with respect to this operation. Note that however cancelling an
 * operation does NOT guarantee that the operation will be fully undone (or that
- * nothing ever happened). 
+ * nothing ever happened).
 *
 * This function MUST be called for every operation to fully remove the
 * operation from the operation queue.  After calling this function, if
@@ -1949,11 +1949,11 @@ GNUNET_TESTBED_extract_config_ (const struct GNUNET_MessageHeader *msg)
    {
      const struct GNUNET_TESTBED_AddHostMessage *imsg;
      uint16_t osize;
-      
      imsg = (const struct GNUNET_TESTBED_AddHostMessage *) msg;
      data_len = (uLong) ntohs (imsg->config_size);
      osize = sizeof (struct GNUNET_TESTBED_AddHostMessage) +
-          ntohs (imsg->username_length) + ntohs (imsg->hostname_length); 
+          ntohs (imsg->username_length) + ntohs (imsg->hostname_length);
      xdata_len = ntohs (imsg->header.size) - osize;
      xdata = (const Bytef *) ((const void *) imsg + osize);
    }
@@ -1961,10 +1961,10 @@ GNUNET_TESTBED_extract_config_ (const struct GNUNET_MessageHeader *msg)
  case GNUNET_MESSAGE_TYPE_TESTBED_LINK_CONTROLLERS_RESULT:
    {
      const struct GNUNET_TESTBED_ControllerLinkResponse *imsg;
-      
      imsg = (const struct GNUNET_TESTBED_ControllerLinkResponse *) msg;
      data_len = ntohs (imsg->config_size);
-      xdata_len = ntohs (imsg->header.size) - 
+      xdata_len = ntohs (imsg->header.size) -
          sizeof (const struct GNUNET_TESTBED_ControllerLinkResponse);
      xdata = (const Bytef *) &imsg[1];
    }
@@ -2077,7 +2077,7 @@ opstart_shutdown_peers (void *cls)
  opc->state = OPC_STATE_STARTED;
  msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_ShutdownPeersMessage));
-  msg->header.size = 
+  msg->header.size =
      htons (sizeof (struct GNUNET_TESTBED_ShutdownPeersMessage));
  msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_SHUTDOWN_PEERS);
  msg->operation_id = GNUNET_htonll (opc->id);
@@ -2146,7 +2146,7 @@ GNUNET_TESTBED_shutdown_peers (struct GNUNET_TESTBED_Controller *c,
  opc->data = data;
  opc->id =  GNUNET_TESTBED_get_next_op_id (c);
  opc->type = OP_SHUTDOWN_PEERS;
-  opc->state = OPC_STATE_INIT;  
+  opc->state = OPC_STATE_INIT;
  opc->op = GNUNET_TESTBED_operation_create_ (opc, &opstart_shutdown_peers,
                                              &oprelease_shutdown_peers);
  GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_parallel_operations,
diff --git a/src/testbed/testbed_api.h b/src/testbed/testbed_api.h
index 3b6678c56..46a9bc203 100644
--- a/src/testbed/testbed_api.h
+++ b/src/testbed/testbed_api.h
@@ -94,7 +94,7 @@ enum OperationType
  OP_GET_SLAVE_CONFIG,
  /**
-   * Stop and destroy all peers  
+   * Stop and destroy all peers
   */
  OP_SHUTDOWN_PEERS,
@@ -320,7 +320,7 @@ GNUNET_TESTBED_insert_opc_ (struct GNUNET_TESTBED_Controller *c,
 * given controller
 *
 * @param c the controller
- * @param opc the operation context to remove 
+ * @param opc the operation context to remove
 */
 void
 GNUNET_TESTBED_remove_opc_ (const struct GNUNET_TESTBED_Controller *c,
diff --git a/src/testbed/testbed_api_barriers.c b/src/testbed/testbed_api_barriers.c
index 2a197719f..2ec34bb1b 100644
--- a/src/testbed/testbed_api_barriers.c
+++ b/src/testbed/testbed_api_barriers.c
@@ -21,7 +21,7 @@
 /**
 * @file testbed/testbed_api_barriers.c
 * @brief API implementation for testbed barriers
- * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
 */
 #include "platform.h"
@@ -55,7 +55,7 @@ struct GNUNET_TESTBED_Barrier
   * The controller handle given while initiliasing this barrier
   */
  struct GNUNET_TESTBED_Controller *c;
-  
  /**
   * The name of the barrier
   */
@@ -70,7 +70,7 @@ struct GNUNET_TESTBED_Barrier
   * the closure for the above callback
   */
  void *cls;
- 
  /**
   * Should the barrier crossed status message be echoed back to the controller?
   */
@@ -125,15 +125,15 @@ GNUNET_TESTBED_handle_barrier_status_ (struct GNUNET_TESTBED_Controller *c,
  struct GNUNET_TESTBED_Barrier *barrier;
  char *emsg;
  const char *name;
-  struct GNUNET_HashCode key;  
+  struct GNUNET_HashCode key;
  size_t emsg_len;
  int status;
  uint16_t msize;
  uint16_t name_len;
-  
  emsg = NULL;
  barrier = NULL;
-  msize = ntohs (msg->header.size);  
+  msize = ntohs (msg->header.size);
  name = msg->data;
  name_len = ntohs (msg->name_len);
  LOG_DEBUG ("Received BARRIER_STATUS msg\n");
@@ -219,7 +219,7 @@ GNUNET_TESTBED_barrier_init_ (struct GNUNET_TESTBED_Controller *controller,
  struct GNUNET_HashCode key;
  size_t name_len;
  uint16_t msize;
-  
  GNUNET_assert (quorum <= 100);
  GNUNET_assert (NULL != cb);
  name_len = strlen (name);
@@ -310,11 +310,11 @@ struct GNUNET_TESTBED_BarrierWaitHandle
   * The name of the barrier
   */
  char *name;
-  
  /**
   * Then configuration used for the client connection
   */
-  struct GNUNET_CONFIGURATION_Handle *cfg;  
+  struct GNUNET_CONFIGURATION_Handle *cfg;
  /**
   * The client connection
@@ -376,7 +376,7 @@ receive_handler (void *cls, const struct GNUNET_MessageHeader *message)
  struct GNUNET_TESTBED_BarrierWaitHandle *h = cls;
  const struct GNUNET_TESTBED_BarrierStatusMsg *msg;
  uint16_t msize;
-  
  if (NULL == message)
  {
    GNUNET_break_op (0);
@@ -386,13 +386,13 @@ receive_handler (void *cls, const struct GNUNET_MessageHeader *message)
  {
    GNUNET_break_op (0);
    goto fail;
-  } 
+  }
  msize = ntohs (message->size);
  if (msize <= sizeof (struct GNUNET_TESTBED_BarrierStatusMsg))
  {
    GNUNET_break_op (0);
    goto fail;
-  } 
+  }
  msg = (const struct GNUNET_TESTBED_BarrierStatusMsg *) message;
  switch (ntohs (msg->status))
  {
@@ -432,7 +432,7 @@ transmit_notify (void *cls, size_t size, void *buf)
 {
  struct GNUNET_TESTBED_BarrierWaitHandle *h = cls;
  uint16_t msize;
-  
  h->tx = NULL;
  if ((0 == size) || (NULL == buf))
  {
@@ -507,7 +507,7 @@ GNUNET_TESTBED_barrier_wait (const char *name,
  msg->header.size = htons (msize);
  (void) memcpy (msg->name, name, name_len);
  h->msg = &msg->header;
-  h->tx = 
+  h->tx =
      GNUNET_CLIENT_notify_transmit_ready (h->conn, msize,
                                           GNUNET_TIME_UNIT_FOREVER_REL,
                                           GNUNET_NO,
diff --git a/src/testbed/testbed_api_barriers.h b/src/testbed/testbed_api_barriers.h
index 89aa56ca5..708b2db04 100644
--- a/src/testbed/testbed_api_barriers.h
+++ b/src/testbed/testbed_api_barriers.h
@@ -22,7 +22,7 @@
 * @file testbed/testbed_api_barriers.h
 * @brief interface for barriers API function that are used internally (not
 *   exposed as user API)
- * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
 */
 #include "gnunet_testbed_service.h"
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c
index e8417c0d8..51bd632c7 100644
--- a/src/testbed/testbed_api_hosts.c
+++ b/src/testbed/testbed_api_hosts.c
@@ -318,7 +318,7 @@ GNUNET_TESTBED_host_replace_cfg_ (struct GNUNET_TESTBED_Host *host,
 */
 struct GNUNET_TESTBED_Host *
 GNUNET_TESTBED_host_create_with_id (uint32_t id, const char *hostname,
-                                    const char *username, 
+                                    const char *username,
                                    const struct GNUNET_CONFIGURATION_Handle
                                    *cfg,
                                    uint16_t port)
@@ -338,7 +338,7 @@ GNUNET_TESTBED_host_create_with_id (uint32_t id, const char *hostname,
  host->port = (0 == port) ? 22 : port;
  host->cfg = GNUNET_CONFIGURATION_dup (cfg);
  host->opq_parallel_overlay_connect_operations =
-      GNUNET_TESTBED_operation_queue_create_ (OPERATION_QUEUE_TYPE_ADAPTIVE, 
+      GNUNET_TESTBED_operation_queue_create_ (OPERATION_QUEUE_TYPE_ADAPTIVE,
                                              UINT_MAX);
  new_size = host_list_size;
  while (id >= new_size)
@@ -371,7 +371,7 @@ GNUNET_TESTBED_host_create (const char *hostname, const char *username,
  static uint32_t uid_generator;
  if (NULL == hostname)
-    return GNUNET_TESTBED_host_create_with_id (0, hostname, username, 
+    return GNUNET_TESTBED_host_create_with_id (0, hostname, username,
                                               cfg, port);
  return GNUNET_TESTBED_host_create_with_id (++uid_generator, hostname,
                                             username, cfg, port);
@@ -398,7 +398,7 @@ GNUNET_TESTBED_hosts_load_from_file (const char *filename,
  //struct GNUNET_TESTBED_Host **host_array;
  struct GNUNET_TESTBED_Host *starting_host;
  char *data;
-  char *buf;  
+  char *buf;
  char *username;
  char *hostname;
  regex_t rex;
@@ -417,12 +417,12 @@ GNUNET_TESTBED_hosts_load_from_file (const char *filename,
  }
  if (GNUNET_OK !=
      GNUNET_DISK_file_size (filename, &fs, GNUNET_YES, GNUNET_YES))
-    fs = 0;  
+    fs = 0;
  if (0 == fs)
  {
    LOG (GNUNET_ERROR_TYPE_WARNING, _("Hosts file %s has no data\n"), filename);
    return 0;
-  }  
+  }
  data = GNUNET_malloc (fs);
  if (fs != GNUNET_DISK_fn_read (filename, data, fs))
  {
@@ -440,9 +440,9 @@ GNUNET_TESTBED_hosts_load_from_file (const char *filename,
                               "^(([[:alnum:]]+)@)?" /* username */
                               "([[:alnum:]]+[-[:alnum:]_\\.]+)" /* hostname */
                               "(:([[:digit:]]{1,5}))?", /* port */
-                               REG_EXTENDED | REG_ICASE));  
+                               REG_EXTENDED | REG_ICASE));
  while (offset < (fs - 1))
-  {    
+  {
    offset++;
    if (((data[offset] == '\n')) && (buf != &data[offset]))
    {
@@ -469,7 +469,7 @@ GNUNET_TESTBED_hosts_load_from_file (const char *filename,
      }
      if (-1 != pmatch[5].rm_so)
      {
-        (void) SSCANF (buf + pmatch[5].rm_so, "%5hd", &port); 
+        (void) SSCANF (buf + pmatch[5].rm_so, "%5hd", &port);
      }
      size = pmatch[3].rm_eo - pmatch[3].rm_so;
      hostname = GNUNET_malloc (size + 1);
@@ -489,7 +489,7 @@ GNUNET_TESTBED_hosts_load_from_file (const char *filename,
        (void) GNUNET_TESTBED_host_create (hostname, username, cfg, port);
      count++;
      GNUNET_free_non_null (username);
-      GNUNET_free (hostname);        
+      GNUNET_free (hostname);
      buf = &data[offset + 1];
    }
    else if ((data[offset] == '\n') || (data[offset] == '\0'))
@@ -516,7 +516,7 @@ const char *
 simple_resolve (const char *host)
 {
  struct addrinfo *res;
-  const struct sockaddr_in *in_addr; 
+  const struct sockaddr_in *in_addr;
  char *hostip;
  struct addrinfo hint;
  unsigned int rc;
@@ -566,13 +566,13 @@ GNUNET_TESTBED_hosts_load_from_loadleveler (const struct
                                            struct GNUNET_TESTBED_Host ***hosts)
 {
 #if !ENABLE_LL
-  LOG (GNUNET_ERROR_TYPE_ERROR, 
+  LOG (GNUNET_ERROR_TYPE_ERROR,
       _("The function %s is only available when compiled with (--with-ll)\n"),
       __func__);
  GNUNET_assert (0);
 #else
  const char *hostfile;
-  
  if (NULL == (hostfile = getenv ("MP_SAVEHOSTFILE")))
  {
    GNUNET_break (0);
@@ -930,7 +930,7 @@ gen_rsh_suffix_args (const char * const *append_args)
  }
  if (NULL != append_args)
  {
-    for (append_cnt = 0; NULL != append_args[append_cnt]; append_cnt++)      
+    for (append_cnt = 0; NULL != append_args[append_cnt]; append_cnt++)
      GNUNET_array_append (rshell_args, cnt, GNUNET_strdup (append_args[append_cnt]));
  }
  GNUNET_array_append (rshell_args, cnt, NULL);
@@ -1070,7 +1070,7 @@ GNUNET_TESTBED_controller_start (const char *trusted_ip,
  static char *const binary_argv[] = {
    HELPER_TESTBED_BINARY, NULL
  };
-  
  GNUNET_assert (NULL != host);
  GNUNET_assert (NULL != (cfg = GNUNET_TESTBED_host_get_cfg_ (host)));
  hostname = NULL;
@@ -1118,7 +1118,7 @@ GNUNET_TESTBED_controller_start (const char *trusted_ip,
    argstr = GNUNET_strdup ("");
    for (cnt = 0; NULL != cp->helper_argv[cnt]; cnt++)
    {
-      aux = argstr;      
+      aux = argstr;
      GNUNET_assert (0 < GNUNET_asprintf (&argstr, "%s %s", aux, cp->helper_argv[cnt]));
      GNUNET_free (aux);
    }
@@ -1334,7 +1334,7 @@ GNUNET_TESTBED_is_host_habitable (const struct GNUNET_TESTBED_Host *host,
                                             "HELPER_BINARY_PATH",
                                             &stat_args[1]))
    stat_args[1] =
-        GNUNET_OS_get_libexec_binary_path (HELPER_TESTBED_BINARY);  
+        GNUNET_OS_get_libexec_binary_path (HELPER_TESTBED_BINARY);
  GNUNET_asprintf (&port, "%u", host->port);
  rsh_args = gen_rsh_args (port, hostname, host->username);
  GNUNET_free (port);
@@ -1523,12 +1523,12 @@ GNUNET_TESTBED_cancel_registration (struct GNUNET_TESTBED_HostRegistrationHandle
 *
 * @param h the host handle
 * @param op the operation to queue in the given host's parally overlay connect
- *          queue 
+ *          queue
 */
 void
-GNUNET_TESTBED_host_queue_oc_ (struct GNUNET_TESTBED_Host *h, 
+GNUNET_TESTBED_host_queue_oc_ (struct GNUNET_TESTBED_Host *h,
                               struct GNUNET_TESTBED_Operation *op)
-{  
+{
  GNUNET_TESTBED_operation_queue_insert_
      (h->opq_parallel_overlay_connect_operations, op);
 }
diff --git a/src/testbed/testbed_api_hosts.h b/src/testbed/testbed_api_hosts.h
index a1cbb5b88..f83ffd148 100644
--- a/src/testbed/testbed_api_hosts.h
+++ b/src/testbed/testbed_api_hosts.h
@@ -156,10 +156,10 @@ GNUNET_TESTBED_is_host_registered_ (const struct GNUNET_TESTBED_Host *host,
 *
 * @param h the host handle
 * @param op the operation to queue in the given host's parally overlay connect
- *          queue 
+ *          queue
 */
 void
-GNUNET_TESTBED_host_queue_oc_ (struct GNUNET_TESTBED_Host *h, 
+GNUNET_TESTBED_host_queue_oc_ (struct GNUNET_TESTBED_Host *h,
                               struct GNUNET_TESTBED_Operation *op);
diff --git a/src/testbed/testbed_api_operations.c b/src/testbed/testbed_api_operations.c
index ce715785f..e3e9bb83d 100644
--- a/src/testbed/testbed_api_operations.c
+++ b/src/testbed/testbed_api_operations.c
@@ -115,7 +115,7 @@ struct FeedbackCtx
   * Head for DLL of time slots which are free to be allocated to operations
   */
  struct TimeSlot *alloc_head;
-    
  /**
   * Tail for DLL of time slots which are free to be allocated to operations
   */
@@ -131,7 +131,7 @@ struct FeedbackCtx
   * Number of time slots filled so far
   */
  unsigned int tslots_filled;
-  
  /**
   * Bound on the maximum number of operations which can be active
   */
@@ -267,7 +267,7 @@ struct ReadyQueueEntry
   * next ptr for DLL
   */
  struct ReadyQueueEntry *next;
-  
  /**
   * prev ptr for DLL
   */
@@ -407,7 +407,7 @@ remove_queue_entry (struct GNUNET_TESTBED_Operation *op, unsigned int index)
 {
  struct OperationQueue *opq;
  struct QueueEntry *entry;
-  
  opq = op->queues[index];
  entry = op->qentries[index];
  switch (op->state)
@@ -445,7 +445,7 @@ change_state (struct GNUNET_TESTBED_Operation *op, enum OperationState state)
  struct OperationQueue *opq;
  unsigned int cnt;
  unsigned int s;
-  
  GNUNET_assert (OP_STATE_INIT != state);
  GNUNET_assert (NULL != op->queues);
  GNUNET_assert (NULL != op->nres);
@@ -459,7 +459,7 @@ change_state (struct GNUNET_TESTBED_Operation *op, enum OperationState state)
      entry->op = op;
      entry->nres = op->nres[cnt];
      s = cnt;
-      GNUNET_array_append (op->qentries, s, entry);      
+      GNUNET_array_append (op->qentries, s, entry);
    }
    else
    {
@@ -498,7 +498,7 @@ change_state (struct GNUNET_TESTBED_Operation *op, enum OperationState state)
 */
 static void
 rq_remove (struct GNUNET_TESTBED_Operation *op)
-{  
+{
  GNUNET_assert (NULL != op->rq_entry);
  GNUNET_CONTAINER_DLL_remove (rq_head, rq_tail, op->rq_entry);
  GNUNET_free (op->rq_entry);
@@ -650,7 +650,7 @@ decide_capacity (struct OperationQueue *opq,
  }
 ret:
-  GNUNET_free_non_null (evict_entries);  
+  GNUNET_free_non_null (evict_entries);
  if (NULL != ops_)
    *ops_ = ops;
  else
@@ -680,12 +680,12 @@ merge_ops (struct GNUNET_TESTBED_Operation ***old,
  unsigned int i;
  unsigned int j;
  unsigned int n_cur;
- 
  GNUNET_assert (NULL != old);
  n_cur = *n_old;
  cur = *old;
  for (i = 0; i < n_new; i++)
-  {    
+  {
    for (j = 0; j < *n_old; j++)
    {
      if (new[i] == cur[j])
@@ -698,7 +698,7 @@ merge_ops (struct GNUNET_TESTBED_Operation ***old,
  *old = cur;
  *n_old = n_cur;
 }
-           
 /**
@@ -732,12 +732,12 @@ check_readiness (struct GNUNET_TESTBED_Operation *op)
    if (NULL == ops)
      continue;
    merge_ops (&evict_ops, &n_evict_ops, ops, n_ops);
-    GNUNET_free (ops);    
+    GNUNET_free (ops);
  }
  if (NULL != evict_ops)
  {
    for (i = 0; i < n_evict_ops; i++)
-      GNUNET_TESTBED_operation_release_ (evict_ops[i]); 
+      GNUNET_TESTBED_operation_release_ (evict_ops[i]);
    GNUNET_free (evict_ops);
    evict_ops = NULL;
    /* Evicting the operations should schedule this operation */
@@ -767,7 +767,7 @@ defer (struct GNUNET_TESTBED_Operation *op)
  for (i = 0; i < op->nqueues; i++)
  {
    GNUNET_assert (op->queues[i]->active >= op->nres[i]);
-    op->queues[i]->active -= op->nres[i];    
+    op->queues[i]->active -= op->nres[i];
  }
  change_state (op, OP_STATE_WAITING);
 }
@@ -809,7 +809,7 @@ cleanup_tslots (struct OperationQueue *queue)
 * Cleansup the existing timing slots and sets new timing slots in the given
 * queue to accommodate given number of max active operations.
 *
- * @param queue the queue 
+ * @param queue the queue
 * @param n the number of maximum active operations.  If n is greater than the
 *   maximum limit set while creating the queue, then the minimum of these two
 *   will be selected as n
@@ -820,7 +820,7 @@ adaptive_queue_set_max_active (struct OperationQueue *queue, unsigned int n)
  struct FeedbackCtx *fctx = queue->fctx;
  struct TimeSlot *tslot;
  unsigned int cnt;
-  
  cleanup_tslots (queue);
  n = GNUNET_MIN (n ,fctx->max_active_bound);
  fctx->tslots_freeptr = GNUNET_malloc (n * sizeof (struct TimeSlot));
@@ -872,7 +872,7 @@ adapt_parallelism (struct OperationQueue *queue)
    return;
  }
  avg = GNUNET_TIME_relative_divide (avg, nvals);
-  if (GNUNET_SYSERR == 
+  if (GNUNET_SYSERR ==
      GNUNET_TESTBED_SD_deviation_factor_ (fctx->sd,
                                           (unsigned int) avg.rel_value_us,
                                           &sd))
@@ -923,14 +923,14 @@ update_tslots (struct GNUNET_TESTBED_Operation *op)
  struct GNUNET_TIME_Relative t;
  struct TimeSlot *tslot;
  struct FeedbackCtx *fctx;
-  
  t = GNUNET_TIME_absolute_get_duration (op->tstart);
  while (NULL != (tslot = op->tslots_head)) /* update time slots */
  {
    queue = tslot->queue;
    fctx = queue->fctx;
    GNUNET_CONTAINER_DLL_remove (op->tslots_head, op->tslots_tail, tslot);
-    tslot->op = NULL;    
+    tslot->op = NULL;
    GNUNET_CONTAINER_DLL_insert_tail (fctx->alloc_head, fctx->alloc_tail,
                                      tslot);
    if (op->failed)
@@ -1011,7 +1011,7 @@ void
 GNUNET_TESTBED_operation_queue_destroy_ (struct OperationQueue *queue)
 {
  struct FeedbackCtx *fctx;
-  
  GNUNET_break (GNUNET_YES == is_queue_empty (queue));
  if (OPERATION_QUEUE_TYPE_ADAPTIVE == queue->type)
  {
@@ -1205,7 +1205,7 @@ GNUNET_TESTBED_operation_activate_ (struct GNUNET_TESTBED_Operation *op)
 void
 GNUNET_TESTBED_operation_release_ (struct GNUNET_TESTBED_Operation *op)
 {
-  struct QueueEntry *entry;  
+  struct QueueEntry *entry;
  struct OperationQueue *opq;
  unsigned int i;
@@ -1221,19 +1221,19 @@ GNUNET_TESTBED_operation_release_ (struct GNUNET_TESTBED_Operation *op)
  if (OP_STATE_ACTIVE == op->state)
    update_tslots (op);
  GNUNET_assert (NULL != op->queues);
-  GNUNET_assert (NULL != op->qentries);  
+  GNUNET_assert (NULL != op->qentries);
  for (i = 0; i < op->nqueues; i++)
  {
    entry = op->qentries[i];
    remove_queue_entry (op, i);
    opq = op->queues[i];
    switch (op->state)
-    {      
+    {
    case OP_STATE_INIT:
    case OP_STATE_INACTIVE:
      GNUNET_assert (0);
      break;
-    case OP_STATE_WAITING:      
+    case OP_STATE_WAITING:
      break;
    case OP_STATE_ACTIVE:
    case OP_STATE_READY:
@@ -1242,7 +1242,7 @@ GNUNET_TESTBED_operation_release_ (struct GNUNET_TESTBED_Operation *op)
      opq->active -= entry->nres;
      recheck_waiting (opq);
      break;
-    }    
+    }
    GNUNET_free (entry);
  }
  GNUNET_free_non_null (op->qentries);
diff --git a/src/testbed/testbed_api_peers.c b/src/testbed/testbed_api_peers.c
index 9b21bfb3a..5d55e3ef6 100644
--- a/src/testbed/testbed_api_peers.c
+++ b/src/testbed/testbed_api_peers.c
@@ -105,7 +105,7 @@ opstart_peer_create (void *cls)
  size_t xc_size;
  uint16_t msize;
-  GNUNET_assert (OP_PEER_CREATE == opc->type);  
+  GNUNET_assert (OP_PEER_CREATE == opc->type);
  GNUNET_assert (NULL != data);
  GNUNET_assert (NULL != data->peer);
  opc->state = OPC_STATE_STARTED;
@@ -464,7 +464,7 @@ opstart_peer_reconfigure (void *cls)
  char *xconfig;
  size_t xc_size;
  uint16_t msize;
-  
  opc->state = OPC_STATE_STARTED;
  GNUNET_assert (NULL != data);
  xc_size = GNUNET_TESTBED_compress_config_ (data->config, data->cfg_size,
@@ -472,7 +472,7 @@ opstart_peer_reconfigure (void *cls)
  GNUNET_free (data->config);
  data->config = NULL;
  GNUNET_assert (xc_size <= UINT16_MAX);
-  msize = (uint16_t) xc_size + 
+  msize = (uint16_t) xc_size +
      sizeof (struct GNUNET_TESTBED_PeerReconfigureMessage);
  msg = GNUNET_realloc (xconfig, msize);
  (void) memmove (&msg[1], msg, xc_size);
@@ -498,7 +498,7 @@ oprelease_peer_reconfigure (void *cls)
 {
  struct OperationContext *opc = cls;
  struct PeerReconfigureData *data = opc->data;
- 
  switch (opc->state)
  {
  case OPC_STATE_INIT:
@@ -508,7 +508,7 @@ oprelease_peer_reconfigure (void *cls)
  case OPC_STATE_STARTED:
    GNUNET_TESTBED_remove_opc_ (opc->c, opc);
    break;
-  case OPC_STATE_FINISHED:    
+  case OPC_STATE_FINISHED:
    break;
  }
  GNUNET_free (opc);
@@ -874,15 +874,15 @@ opstart_manage_service (void *cls)
  struct OperationContext *opc = cls;
  struct ManageServiceData *data = opc->data;
  struct GNUNET_TESTBED_ManagePeerServiceMessage *msg;
-  
-  GNUNET_assert (NULL != data);  
+  GNUNET_assert (NULL != data);
  msg = GNUNET_malloc (data->msize);
  msg->header.size = htons (data->msize);
  msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_MANAGE_PEER_SERVICE);
  msg->peer_id = htonl (data->peer->unique_id);
  msg->operation_id = GNUNET_htonll (opc->id);
  msg->start = (uint8_t) data->start;
-  (void) memcpy (&msg[1], data->service_name, data->msize 
+  (void) memcpy (&msg[1], data->service_name, data->msize
                 - sizeof (struct GNUNET_TESTBED_ManagePeerServiceMessage));
  GNUNET_free (data->service_name);
  data->service_name = NULL;
diff --git a/src/testbed/testbed_api_peers.h b/src/testbed/testbed_api_peers.h
index 7416e1f05..2dbce8ef7 100644
--- a/src/testbed/testbed_api_peers.h
+++ b/src/testbed/testbed_api_peers.h
@@ -255,13 +255,13 @@ struct OverlayConnectData
 struct ManageServiceData {
  GNUNET_TESTBED_OperationCompletionCallback cb;
-  
  void *cb_cls;
-  
  struct GNUNET_TESTBED_Peer *peer;
  char *service_name;
-  
  unsigned int start;
  uint16_t msize;
diff --git a/src/testbed/testbed_api_sd.c b/src/testbed/testbed_api_sd.c
index 62f358de9..7a1da6b80 100644
--- a/src/testbed/testbed_api_sd.c
+++ b/src/testbed/testbed_api_sd.c
@@ -21,7 +21,7 @@
 /**
 * @file testbed/testbed_api_sd.c
 * @brief functions to calculate standard deviation
- * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
 */
 #include "platform.h"
diff --git a/src/testbed/testbed_api_sd.h b/src/testbed/testbed_api_sd.h
index b3e19c0bd..577522d07 100644
--- a/src/testbed/testbed_api_sd.h
+++ b/src/testbed/testbed_api_sd.h
@@ -21,7 +21,7 @@
 /**
 * @file testbed/testbed_api_sd.h
 * @brief functions to calculate standard deviation
- * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
 */
 #ifndef TESTBED_API_SD_H
diff --git a/src/testbed/testbed_api_statistics.c b/src/testbed/testbed_api_statistics.c
index dbbb99e4a..5fa0750e3 100644
--- a/src/testbed/testbed_api_statistics.c
+++ b/src/testbed/testbed_api_statistics.c
@@ -95,7 +95,7 @@ struct GetStatsContext
   * The task for calling the continuation callback
   */
  GNUNET_SCHEDULER_TaskIdentifier call_completion_task_id;
-  
  /**
   * The number of peers present in the peers array.  This number also
   * represents the number of service connect operations in the ops array
@@ -180,7 +180,7 @@ op_done_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  sc = peer_sc->sc;
  peer_sc->op_done_task_id = GNUNET_SCHEDULER_NO_TASK;
-  op = &sc->ops[peer_sc->peer_index];  
+  op = &sc->ops[peer_sc->peer_index];
  GNUNET_assert (NULL != *op);
  GNUNET_TESTBED_operation_done (*op);
  *op = NULL;
@@ -202,7 +202,7 @@ iteration_completion_cb (void *cls, int success)
  GNUNET_break (GNUNET_OK == success);
  sc = peer_sc->sc;
-  peer_sc->get_handle = NULL; 
+  peer_sc->get_handle = NULL;
  sc->num_completed++;
  peer_sc->op_done_task_id = GNUNET_SCHEDULER_add_now (&op_done_task, peer_sc);
  if (sc->num_completed == sc->num_peers)
@@ -239,7 +239,7 @@ iterator_cb (void *cls, const char *subsystem,
  LOG_DEBUG ("Peer %u: [%s,%s] -> %lu\n", peer_sc->peer_index,
             subsystem, name, (unsigned long) value);
  ret = sc->proc (sc->cb_cls, peer,
-                  subsystem, name, value, is_persistent);  
+                  subsystem, name, value, is_persistent);
  if (GNUNET_SYSERR == ret)
    LOG_DEBUG ("Aborting iteration for peer %u\n", peer_sc->peer_index);
  return ret;
@@ -283,11 +283,11 @@ service_connect_comp (void *cls,
 *          from GNUNET_TESTBED_service_connect()
 * @return service handle to return in 'op_result', NULL on error
 */
-static void * 
+static void *
 statistics_ca (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
  struct PeerGetStatsContext *peer_sc = cls;
-  
  LOG_DEBUG ("Connecting to statistics service of peer %u\n",
             peer_sc->peer_index);
  return GNUNET_STATISTICS_create ("<testbed-api>", cfg);
@@ -300,7 +300,7 @@ statistics_ca (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
 * @param cls the PeerGetStatsContext
 * @param op_result service handle returned from the connect adapter
 */
-static void 
+static void
 statistics_da (void *cls, void *op_result)
 {
  struct PeerGetStatsContext *peer_sc = cls;
@@ -331,7 +331,7 @@ opstart_get_stats (void *cls)
  unsigned int peer;
  LOG_DEBUG ("Starting get_statistics operation\n");
-  sc->ops = GNUNET_malloc (sc->num_peers * 
+  sc->ops = GNUNET_malloc (sc->num_peers *
                           sizeof (struct GNUNET_TESTBED_Operation *));
  for (peer = 0; peer < sc->num_peers; peer++)
  {
@@ -343,7 +343,7 @@ opstart_get_stats (void *cls)
    peer_sc = GNUNET_malloc (sizeof (struct PeerGetStatsContext));
    peer_sc->sc = sc;
    peer_sc->peer_index = peer;
-    sc->ops[peer] = 
+    sc->ops[peer] =
        GNUNET_TESTBED_service_connect (sc, sc->peers[peer], "statistics",
                                        &service_connect_comp,
                                        peer_sc,
@@ -364,7 +364,7 @@ oprelease_get_stats (void *cls)
 {
  struct GetStatsContext *sc = cls;
  unsigned int peer;
-  
  LOG_DEBUG ("Cleaning up get_statistics operation\n");
  if (GNUNET_SCHEDULER_NO_TASK != sc->call_completion_task_id)
    GNUNET_SCHEDULER_cancel (sc->call_completion_task_id);
@@ -383,7 +383,7 @@ oprelease_get_stats (void *cls)
  GNUNET_free_non_null (sc->subsystem);
  GNUNET_free_non_null (sc->name);
  GNUNET_free (sc);
-  if (GNUNET_YES == 
+  if (GNUNET_YES ==
      GNUNET_TESTBED_operation_queue_destroy_empty_ (no_wait_queue))
    no_wait_queue = NULL;
 }
@@ -415,7 +415,7 @@ GNUNET_TESTBED_get_statistics (unsigned int num_peers,
  GNUNET_assert (NULL != proc);
  GNUNET_assert (NULL != cont);
  if (NULL == no_wait_queue)
-    no_wait_queue = GNUNET_TESTBED_operation_queue_create_ 
+    no_wait_queue = GNUNET_TESTBED_operation_queue_create_
        (OPERATION_QUEUE_TYPE_FIXED, UINT_MAX);
  sc = GNUNET_malloc (sizeof (struct GetStatsContext));
  sc->peers = peers;
diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c
index 2f5fc70e8..2d420c3e3 100644
--- a/src/testbed/testbed_api_testbed.c
+++ b/src/testbed/testbed_api_testbed.c
@@ -338,7 +338,7 @@ struct GNUNET_TESTBED_RunHandle
 */
 static uint32_t
 rcop_key (void *rcop)
-{  
+{
  return * ((uint32_t *) &rcop);
 }
@@ -397,10 +397,10 @@ static struct RunContextOperation *
 search_rcop (struct GNUNET_TESTBED_RunHandle *rc, struct GNUNET_TESTBED_Operation *op)
 {
  struct SearchContext sc;
-  
  sc.query = op;
  sc.result = NULL;
-  if (GNUNET_SYSERR == 
+  if (GNUNET_SYSERR ==
      GNUNET_CONTAINER_multihashmap32_get_multiple (rc->rcop_map,
                                                    rcop_key (op),
                                                    &search_iterator,
@@ -481,7 +481,7 @@ cleanup (void *cls)
 /**
- * Iterator for cleaning up elements from rcop_map 
+ * Iterator for cleaning up elements from rcop_map
 *
 * @param cls the RunContext
 * @param key the 32-bit key
@@ -546,7 +546,7 @@ rc_cleanup_operations (struct GNUNET_TESTBED_RunHandle *rc)
    rc->topology_operation = NULL;
  }
  /* cancel any exiting operations */
-  GNUNET_assert (GNUNET_SYSERR != 
+  GNUNET_assert (GNUNET_SYSERR !=
                 GNUNET_CONTAINER_multihashmap32_iterate (rc->rcop_map,
                                                          &rcop_cleanup_iterator,
                                                          rc));
@@ -568,7 +568,7 @@ cancel_interrupt_task (struct GNUNET_TESTBED_RunHandle *rc)
 /**
 * This callback will be called when all the operations are completed
- * (done/cancelled) 
+ * (done/cancelled)
 *
 * @param cls run context
 */
@@ -624,9 +624,9 @@ interrupt (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  /* reschedule */
  rc->interrupt_task = GNUNET_SCHEDULER_add_delayed
      (GNUNET_TIME_UNIT_FOREVER_REL, &interrupt, rc);
-  rc_cleanup_operations (rc);  
+  rc_cleanup_operations (rc);
  if ( (GNUNET_NO == rc->shutdown)
-       && (NULL != c) 
+       && (NULL != c)
       && (0 != (size = GNUNET_CONTAINER_multihashmap32_size (c->opc_map))))
  {
    LOG (GNUNET_ERROR_TYPE_WARNING, "Shutdown postponed as there are "
@@ -917,7 +917,7 @@ call_cc:
      {
        unsigned long long number;
        unsigned int cap;
-        GNUNET_assert (GNUNET_OK == 
+        GNUNET_assert (GNUNET_OK ==
                       GNUNET_CONFIGURATION_get_value_number (rc->cfg, TESTBED_CONFIG_SECTION,
                                                              SCALE_FREE_CAP,
                                                              &number));
@@ -1199,7 +1199,7 @@ static void
 timeout_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
  struct GNUNET_TESTBED_RunHandle *rc = cls;
-  
  rc->timeout_task = GNUNET_SCHEDULER_NO_TASK;
  LOG (GNUNET_ERROR_TYPE_ERROR, _("Shutting down testbed due to timeout while setup.\n"));
   GNUNET_SCHEDULER_shutdown ();
@@ -1246,7 +1246,7 @@ GNUNET_TESTBED_run (const char *host_filename,
 {
  struct GNUNET_TESTBED_RunHandle *rc;
  char *topology;
-  struct CompatibilityCheckContext *hc;      
+  struct CompatibilityCheckContext *hc;
  struct GNUNET_TIME_Relative timeout;
  unsigned long long number;
  unsigned int hid;
diff --git a/src/testbed/testbed_api_topology.c b/src/testbed/testbed_api_topology.c
index d506ee7e3..b1b96ed56 100644
--- a/src/testbed/testbed_api_topology.c
+++ b/src/testbed/testbed_api_topology.c
@@ -89,7 +89,7 @@ struct RetryListEntry
   * the prev pointer for the DLL
   */
  struct RetryListEntry *prev;
-  
  /**
   * The link to be retired
   */
@@ -136,7 +136,7 @@ struct TopologyContext
   * DLL tail for retry list
   */
  struct RetryListEntry *rl_tail;
-  
  /**
   * The number of peers
   */
@@ -292,7 +292,7 @@ overlay_link_completed (void *cls, struct GNUNET_TESTBED_Operation *op,
    tc->nlinks = 0;
    while (NULL != (retry_entry = tc->rl_head))
    {
-      link = retry_entry->link;      
+      link = retry_entry->link;
      link->op =
          GNUNET_TESTBED_overlay_connect (tc->op_cls, &overlay_link_completed,
                                          link, tc->peers[link->A],
@@ -609,7 +609,7 @@ gen_scale_free (struct TopologyContext *tc, uint16_t cap, uint8_t m)
  unsigned int redo_threshold;
  links = 0;
-  etaboff = 0;  
+  etaboff = 0;
  tc->link_array_size = tc->num_peers * m;
  tc->link_array = GNUNET_malloc_large (sizeof (struct OverlayLink) *
                                        tc->link_array_size);
@@ -657,7 +657,7 @@ gen_scale_free (struct TopologyContext *tc, uint16_t cap, uint8_t m)
          goto redo;
      make_link (&tc->link_array[links + cnt], random_peer, peer, tc);
      deg[random_peer]++;
-      deg[peer]++;      
+      deg[peer]++;
      used[cnt] = random_peer;
    }
    for (cnt = 0; cnt < GNUNET_MIN (peer, m); cnt++)
@@ -672,7 +672,7 @@ gen_scale_free (struct TopologyContext *tc, uint16_t cap, uint8_t m)
  GNUNET_free (deg);
  GNUNET_assert (links <= tc->link_array_size);
  tc->link_array_size = links;
-  tc->link_array = 
+  tc->link_array =
      GNUNET_realloc (tc->link_array,
                      sizeof (struct OverlayLink) * tc->link_array_size);
 }
@@ -982,7 +982,7 @@ GNUNET_TESTBED_overlay_configure_topology_va (void *op_cls,
    {
      uint16_t cap;
      uint8_t m;
-      
      cap = (uint16_t) va_arg (va, unsigned int);
      m = (uint8_t) va_arg (va, unsigned int);
      gen_scale_free (tc, cap, m);
@@ -1074,7 +1074,7 @@ GNUNET_TESTBED_overlay_configure_topology (void *op_cls,
  GNUNET_assert (topo < GNUNET_TESTBED_TOPOLOGY_OPTION_END);
  va_start (vargs, topo);
  op = GNUNET_TESTBED_overlay_configure_topology_va (op_cls, num_peers, peers,
-                                                     max_connections, 
+                                                     max_connections,
                                                     comp_cb, comp_cb_cls,
                                                     topo,
                                                     vargs);
diff --git a/src/testbed/testbed_logger_api.c b/src/testbed/testbed_logger_api.c
index c520b1062..562902218 100644
--- a/src/testbed/testbed_logger_api.c
+++ b/src/testbed/testbed_logger_api.c
@@ -21,7 +21,7 @@
 /**
 * @file testbed/testbed_logger_api.c
 * @brief Client-side routines for communicating with the tesbted logger service
- * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
 */
 #include "platform.h"
@@ -158,7 +158,7 @@ static void
 cancel_timeout_flush (struct GNUNET_TESTBED_LOGGER_Handle *h)
 {
  GNUNET_SCHEDULER_cancel (h->timeout_flush_task);
-  h->timeout_flush_task = GNUNET_SCHEDULER_NO_TASK;  
+  h->timeout_flush_task = GNUNET_SCHEDULER_NO_TASK;
 }
@@ -310,7 +310,7 @@ dispatch_buffer (struct GNUNET_TESTBED_LOGGER_Handle *h)
  msg = GNUNET_realloc (h->buf, msize);
  h->buf = NULL;
  memmove (&msg[1], msg, h->bs);
-  h->bs = 0;    
+  h->bs = 0;
  msg->type = htons (GNUNET_MESSAGE_TYPE_TESTBED_LOGGER_MSG);
  msg->size = htons (msize);
  queue_message (h, msg);
@@ -329,7 +329,7 @@ GNUNET_TESTBED_LOGGER_connect (const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
  struct GNUNET_TESTBED_LOGGER_Handle *h;
  struct GNUNET_CLIENT_Connection *client;
-  
  client = GNUNET_CLIENT_connect ("testbed-logger", cfg);
  if (NULL == client)
    return NULL;
@@ -374,7 +374,7 @@ GNUNET_TESTBED_LOGGER_disconnect (struct GNUNET_TESTBED_LOGGER_Handle *h)
 void
 GNUNET_TESTBED_LOGGER_write (struct GNUNET_TESTBED_LOGGER_Handle *h,
                             const void *data, size_t size)
-{  
+{
  size_t fit_size;
  GNUNET_assert (0 != size);
@@ -445,7 +445,7 @@ GNUNET_TESTBED_LOGGER_flush (struct GNUNET_TESTBED_LOGGER_Handle *h,
  h->cb = cb;
  h->cb_cls = cb_cls;
  GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == h->timeout_flush_task);
-  h->timeout_flush_task = 
+  h->timeout_flush_task =
      GNUNET_SCHEDULER_add_delayed (timeout, &timeout_flush, h);
  if (NULL == h->buf)
  {