5 files changed, 163 insertions, 163 deletions

diff --git a/src/experimentation/gnunet-daemon-experimentation.h b/src/experimentation/gnunet-daemon-experimentation.h
index 9886f5d5d..86e41a114 100644
--- a/src/experimentation/gnunet-daemon-experimentation.h
+++ b/src/experimentation/gnunet-daemon-experimentation.h
@@ -89,54 +89,54 @@ struct Experiment
   /* Header */
   /* ----------------- */
   char *name;
-  
+
   /**
-   * Experiment issuer 
+   * Experiment issuer
    */
   struct GNUNET_CRYPTO_EccPublicSignKey issuer;
-  
+
   /**
-   * Experiment version as timestamp of creation 
+   * Experiment version as timestamp of creation
    */
   struct GNUNET_TIME_Absolute version;
-  
+
   /**
-   * Description 
+   * Description
    */
   char *description;
-  
+
   /**
-   * Required capabilities  
+   * Required capabilities
    */
   uint32_t required_capabilities;
-  
+
   /* Experiment timing */
   /* ----------------- */
-  
+
   /**
-   * When to start experiment 
+   * When to start experiment
    */
   struct GNUNET_TIME_Absolute start;
-  
+
   /**
-   * When to end experiment 
+   * When to end experiment
    */
   struct GNUNET_TIME_Absolute stop;
-  
+
   /**
-   * How often to run experiment 
+   * How often to run experiment
    */
   struct GNUNET_TIME_Relative frequency;
-  
+
   /**
-   * How long to run each execution  
+   * How long to run each execution
    */
   struct GNUNET_TIME_Relative duration;
-  
-  
+
+
   /* Experiment itself */
   /* ----------------- */
-  
+
   /* TBD */
 };
 
@@ -150,34 +150,34 @@ struct Node
    * Peer id
    */
   struct GNUNET_PeerIdentity id;
-  
+
   /**
    * Task for response timeout
    */
   GNUNET_SCHEDULER_TaskIdentifier timeout_task;
-  
+
   /**
    * Core transmission handle
    */
   struct GNUNET_CORE_TransmitHandle *cth;
-  
+
   /**
    * Node capabilities
    */
   uint32_t capabilities;
-  
+
   /**
-   * Experiment version as timestamp of creation 
+   * Experiment version as timestamp of creation
    */
   struct GNUNET_TIME_Absolute version;
-    
+
   struct NodeComCtx *e_req_head;
 
   struct NodeComCtx *e_req_tail;
 
   /**
    * Array of issuers accepted by this neighbor.
-   */ 
+   */
   struct GNUNET_CRYPTO_EccPublicSignKey *issuer_id;
 
   unsigned int issuer_count;
@@ -198,9 +198,9 @@ GNUNET_NETWORK_STRUCT_BEGIN
 struct Experimentation_Request
 {
   struct GNUNET_MessageHeader msg;
-  
+
   uint32_t capabilities GNUNET_PACKED;
-  
+
   uint32_t issuer_count GNUNET_PACKED;
 };
 
@@ -215,9 +215,9 @@ struct Experimentation_Request
 struct Experimentation_Response
 {
   struct GNUNET_MessageHeader msg;
-  
+
   uint32_t capabilities GNUNET_PACKED;
-  
+
   uint32_t issuer_count GNUNET_PACKED;
 };
 
@@ -233,7 +233,7 @@ struct Issuer
 
 /**
  * Hashmap containing valid experiment issuers
- * (the key is the hash of the respective public key, 
+ * (the key is the hash of the respective public key,
  * the values are of type `struct Issuer').
  */
 struct GNUNET_CONTAINER_MultiHashMap *valid_issuers;
@@ -246,19 +246,19 @@ struct GNUNET_CONTAINER_MultiHashMap *valid_issuers;
 struct GED_start_message
 {
   struct GNUNET_MessageHeader header;
-  
+
   /**
    * String length of experiment name following the struct
    */
   uint32_t len_name GNUNET_PACKED;
-  
+
   /**
-   * Experiment issuer 
+   * Experiment issuer
    */
   struct GNUNET_CRYPTO_EccPublicSignKey issuer;
-  
+
   /**
-   * Experiment version as timestamp of creation 
+   * Experiment version as timestamp of creation
    */
   struct GNUNET_TIME_AbsoluteNBO version_nbo;
 };
@@ -267,19 +267,19 @@ struct GED_start_message
 struct GED_start_ack_message
 {
   struct GNUNET_MessageHeader header;
-  
+
   /**
    * String length of experiment name following the struct
    */
   uint32_t len_name GNUNET_PACKED;
-  
+
   /**
-   * Experiment issuer 
+   * Experiment issuer
    */
   struct GNUNET_CRYPTO_EccPublicSignKey issuer;
 
   /**
-   * Experiment version as timestamp of creation 
+   * Experiment version as timestamp of creation
    */
   struct GNUNET_TIME_AbsoluteNBO version_nbo;
 };
@@ -288,19 +288,19 @@ struct GED_start_ack_message
 struct GED_stop_message
 {
   struct GNUNET_MessageHeader header;
-  
+
   /**
    * String length of experiment name following the struct
    */
   uint32_t len_name GNUNET_PACKED;
-  
+
   /**
-   * Experiment issuer 
+   * Experiment issuer
    */
   struct GNUNET_CRYPTO_EccPublicSignKey issuer;
-  
+
   /**
-   * Experiment version as timestamp of creation 
+   * Experiment version as timestamp of creation
    */
   struct GNUNET_TIME_AbsoluteNBO version_nbo;
 };
@@ -396,7 +396,7 @@ GED_experiments_find (const struct GNUNET_CRYPTO_EccPublicSignKey *issuer,
                       const struct GNUNET_TIME_Absolute version);
 
 
-typedef void (*GNUNET_EXPERIMENTATION_experiments_get_cb) (struct Node *n, 
+typedef void (*GNUNET_EXPERIMENTATION_experiments_get_cb) (struct Node *n,
                                                            struct Experiment *e);
 
 
@@ -461,7 +461,7 @@ GED_scheduler_handle_stop (struct Node *n, struct Experiment *e);
  */
 void
 GED_scheduler_add (struct Node *n,
-                   struct Experiment *e, 
+                   struct Experiment *e,
                    int outbound);
 
 
diff --git a/src/experimentation/gnunet-daemon-experimentation_experiments.c b/src/experimentation/gnunet-daemon-experimentation_experiments.c
index b4db5188b..928502cf5 100644
--- a/src/experimentation/gnunet-daemon-experimentation_experiments.c
+++ b/src/experimentation/gnunet-daemon-experimentation_experiments.c
@@ -54,14 +54,14 @@ experiment_verify (struct Issuer *i, struct Experiment *e)
 {
   GNUNET_assert (NULL != i);
   GNUNET_assert (NULL != e);
-  
+
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
               "Verification: to be implemented\n");
   return GNUNET_OK;
 }
 
 
-static int 
+static int
 free_experiment (void *cls,
                  const struct GNUNET_HashCode * key,
                  void *value)
@@ -84,15 +84,15 @@ free_experiment (void *cls,
  * @param value the issuer element to free
  * @return GNUNET_OK to continue
  */
-static int 
+static int
 free_issuer (void *cls,
              const struct GNUNET_HashCode * key,
              void *value)
 {
   struct Issuer *i = value;
 
-  GNUNET_break (0 == GNUNET_CONTAINER_multihashmap_remove (valid_issuers, 
-                                                           key, 
+  GNUNET_break (0 == GNUNET_CONTAINER_multihashmap_remove (valid_issuers,
+                                                           key,
                                                            i));
   GNUNET_free (i);
   return GNUNET_OK;
@@ -149,8 +149,8 @@ GED_experiments_find (const struct GNUNET_CRYPTO_EccPublicSignKey *issuer,
                       const struct GNUNET_TIME_Absolute version)
 {
   struct GNUNET_HashCode hc;
-  
-  get_experiment_key (issuer, 
+
+  get_experiment_key (issuer,
                       name,
                       version,
                       &hc);
@@ -180,7 +180,7 @@ get_it (void *cls,
   if (0 == memcmp (&e->issuer,
                    get_ctx->issuer,
                    sizeof (struct GNUNET_CRYPTO_EccPublicSignKey)))
-    get_ctx->get_cb (get_ctx->n, e);  
+    get_ctx->get_cb (get_ctx->n, e);
   return GNUNET_OK;
 }
 
@@ -222,7 +222,7 @@ GNUNET_EXPERIMENTATION_experiments_add (struct Issuer *i,
   struct Experiment *e;
   struct GNUNET_HashCode hc;
 
-  e = GNUNET_new (struct Experiment);  
+  e = GNUNET_new (struct Experiment);
   e->name = GNUNET_strdup (name);
   e->issuer = *issuer_id;
   e->version = version;
@@ -233,20 +233,20 @@ GNUNET_EXPERIMENTATION_experiments_add (struct Issuer *i,
   e->frequency = frequency;
   e->duration = duration;
   e->stop = stop;
-  
+
   /* verify experiment */
   if (GNUNET_SYSERR == experiment_verify (i, e))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("Experiment `%s': Experiment signature is invalid\n"), 
+                _("Experiment `%s': Experiment signature is invalid\n"),
                 name);
     GNUNET_free (e);
     GNUNET_free_non_null (e->name);
     GNUNET_free_non_null (e->description);
     return GNUNET_SYSERR;
   }
-  
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               _("Adding experiment `%s' running from `%s' to `%s' every %llu sec. for %llu sec. \n"),
               e->name,
               GNUNET_STRINGS_absolute_time_to_string (start),
@@ -259,12 +259,12 @@ GNUNET_EXPERIMENTATION_experiments_add (struct Issuer *i,
                       &hc);
   GNUNET_CONTAINER_multihashmap_put (experiments,
                                      &hc,
-                                     e, 
+                                     e,
                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-  GNUNET_STATISTICS_set (GED_stats, 
-                         "# experiments", 
+  GNUNET_STATISTICS_set (GED_stats,
+                         "# experiments",
                          GNUNET_CONTAINER_multihashmap_size (experiments), GNUNET_NO);
-  
+
   return GNUNET_OK;
 }
 
@@ -293,9 +293,9 @@ exp_file_iterator (void *cls,
   struct GNUNET_TIME_Relative frequency;
   struct GNUNET_TIME_Relative duration;
   struct GNUNET_HashCode phash;
-  
+
   /* Mandatory fields */
-  
+
   /* Issuer */
   if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string (exp, name, "ISSUER", &val))
   {
@@ -303,8 +303,8 @@ exp_file_iterator (void *cls,
                 _("Experiment `%s': Issuer missing\n"), name);
     return;
   }
-  if (GNUNET_SYSERR == 
-      GNUNET_CRYPTO_ecc_public_sign_key_from_string (val, 
+  if (GNUNET_SYSERR ==
+      GNUNET_CRYPTO_ecc_public_sign_key_from_string (val,
                                                      strlen (val),
                                                      &issuer))
   {
@@ -322,20 +322,20 @@ exp_file_iterator (void *cls,
     return;
   }
   GNUNET_free (val);
-  
+
   /* Version */
   if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (exp, name, "VERSION", &number))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 _("Experiment `%s': Version missing or invalid \n"), name);
     return;
   }
   version.abs_value_us = number; // FIXME: what is this supposed to be? Version != TIME!???
-  
+
   /* Required capabilities */
   if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (exp, name, "CAPABILITIES", &number))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 _("Experiment `%s': Required capabilities missing \n"), name);
     return;
   }
@@ -346,23 +346,23 @@ exp_file_iterator (void *cls,
     return;
   }
   required_capabilities = number;
-  
+
   /* Optional fields */
-  
+
   /* Description */
   if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string (exp, name, "DESCRIPTION", &description))
     description = NULL;
-  
+
   if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (exp, name, "START", (long long unsigned int *) &start.abs_value_us))
     start = GNUNET_TIME_UNIT_ZERO_ABS;
-  
+
   if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_time (exp, name, "FREQUENCY", &frequency))
     frequency = EXP_DEFAULT_EXP_FREQ;
   if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_time (exp, name, "DURATION", &duration))
     duration = EXP_DEFAULT_EXP_DUR;
   if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (exp, name, "STOP", (long long unsigned int *)&stop.abs_value_us))
     stop = GNUNET_TIME_UNIT_FOREVER_ABS;
-  
+
   GNUNET_EXPERIMENTATION_experiments_add (i, name, &issuer, version,
                                           description, required_capabilities,
                                           start, frequency, duration, stop);
@@ -382,12 +382,12 @@ load_file (const char * file)
 
   if (NULL == exp)
     return;
-  
+
   if (GNUNET_SYSERR == GNUNET_CONFIGURATION_parse (exp, file))
   {
     GNUNET_CONFIGURATION_destroy (exp);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("Failed to parse file `%s'\n"), 
+                _("Failed to parse file `%s'\n"),
                 file);
     return;
   }
@@ -408,28 +408,28 @@ GED_experiments_start ()
   char *pos;
   struct GNUNET_CRYPTO_EccPublicSignKey issuer_ID;
   struct GNUNET_HashCode hash;
-  
+
   /* Load valid issuer */
-  if (GNUNET_SYSERR == 
-      GNUNET_CONFIGURATION_get_value_string (GED_cfg, 
-                                             "EXPERIMENTATION", 
+  if (GNUNET_SYSERR ==
+      GNUNET_CONFIGURATION_get_value_string (GED_cfg,
+                                             "EXPERIMENTATION",
                                              "ISSUERS",
                                              &issuers))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 _("No valid experiment issuers configured! Set value to public keys of issuers! Exiting.\n"));
     GED_experiments_stop ();
     return GNUNET_SYSERR;
   }
-  
+
   valid_issuers = GNUNET_CONTAINER_multihashmap_create (10, GNUNET_NO);
   for (pos = strtok (issuers, " "); pos != NULL; pos = strtok (NULL, " "))
-  {   
+  {
     if (GNUNET_SYSERR == GNUNET_CRYPTO_ecc_public_sign_key_from_string (pos,
                                                                         strlen (pos),
                                                                         &issuer_ID))
     {
-      GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, 
+      GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
                                  "EXPERIMENTATION",
                                  "ISSUERS",
                                  _("Invalid value for public key\n"));
@@ -439,33 +439,33 @@ GED_experiments_start ()
     i = GNUNET_new (struct Issuer);
     i->pubkey = issuer_ID;
     GNUNET_CRYPTO_hash( &issuer_ID, sizeof (issuer_ID), &hash);
-    GNUNET_CONTAINER_multihashmap_put (valid_issuers, 
+    GNUNET_CONTAINER_multihashmap_put (valid_issuers,
                                        &hash,
                                        i,
-                                       GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);   
+                                       GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
   }
   GNUNET_free (issuers);
   if (0 == GNUNET_CONTAINER_multihashmap_size (valid_issuers))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 _("No valid experiment issuers configured! Set value to public keys of issuers! Exiting.\n"));
     GED_experiments_stop ();
     return GNUNET_SYSERR;
   }
   GNUNET_STATISTICS_set (GED_stats,
-                         "# issuer", 
-                         GNUNET_CONTAINER_multihashmap_size (valid_issuers), 
+                         "# issuer",
+                         GNUNET_CONTAINER_multihashmap_size (valid_issuers),
                          GNUNET_NO);
-  
+
   experiments = GNUNET_CONTAINER_multihashmap_create (10, GNUNET_NO);
   /* Load experiments from file */
   if (GNUNET_SYSERR ==
       GNUNET_CONFIGURATION_get_value_string (GED_cfg,
-                                             "EXPERIMENTATION", 
+                                             "EXPERIMENTATION",
                                              "EXPERIMENTS",
                                              &file))
     return GNUNET_OK;
-  
+
   if (GNUNET_YES != GNUNET_DISK_file_test (file))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
diff --git a/src/experimentation/gnunet-daemon-experimentation_nodes.c b/src/experimentation/gnunet-daemon-experimentation_nodes.c
index 5e29f5f73..f78569146 100644
--- a/src/experimentation/gnunet-daemon-experimentation_nodes.c
+++ b/src/experimentation/gnunet-daemon-experimentation_nodes.c
@@ -64,10 +64,10 @@ struct NodeComCtx
 {
   struct NodeComCtx *prev;
   struct NodeComCtx *next;
-  
+
   struct Node *n;
   struct Experiment *e;
-  
+
   size_t size;
   GNUNET_CONNECTION_TransmitReadyNotify notify;
   void *notify_cls;
@@ -79,7 +79,7 @@ struct NodeComCtx
  *
  * @param m peermap to update values from
  */
-static void 
+static void
 update_stats (struct GNUNET_CONTAINER_MultiPeerMap *m)
 {
   GNUNET_assert (NULL != m);
@@ -122,14 +122,14 @@ cleanup_node (void *cls,
   struct NodeComCtx *e_cur;
   struct NodeComCtx *e_next;
   struct GNUNET_CONTAINER_MultiPeerMap *cur = cls;
-  
+
   n = value;
   if (GNUNET_SCHEDULER_NO_TASK != n->timeout_task)
   {
     GNUNET_SCHEDULER_cancel (n->timeout_task);
     n->timeout_task = GNUNET_SCHEDULER_NO_TASK;
   }
-  
+
   if (NULL != n->cth)
   {
     GNUNET_CORE_notify_transmit_ready_cancel (n->cth);
@@ -154,7 +154,7 @@ cleanup_node (void *cls,
  * @param id the id to check
  * @return GNUNET_YES or GNUNET_NO
  */
-static int 
+static int
 is_me (const struct GNUNET_PeerIdentity *id)
 {
   if (0 == memcmp (&me, id, sizeof (me)))
@@ -187,14 +187,14 @@ transmit_read_wrapper (void *cls, size_t bufsize, void *buf)
 {
   struct NodeComCtx *e_ctx = cls;
   struct NodeComCtx *next;
-  
+
   size_t res = e_ctx->notify (e_ctx->notify_cls, bufsize, buf);
   e_ctx->n->cth = NULL;
-  
+
   GNUNET_CONTAINER_DLL_remove (e_ctx->n->e_req_head, e_ctx->n->e_req_tail, e_ctx);
   next = e_ctx->n->e_req_head;
   GNUNET_free (e_ctx);
-  
+
   if (NULL != next)
   {
     /* Schedule next message */
@@ -209,9 +209,9 @@ schedule_transmisson (struct NodeComCtx *e_ctx)
 {
   if (NULL != e_ctx->n->cth)
     return;
-  
+
   e_ctx->n->cth = GNUNET_CORE_notify_transmit_ready (ch, GNUNET_NO, 0, FAST_TIMEOUT,
-                                                     &e_ctx->n->id, e_ctx->size, 
+                                                     &e_ctx->n->id, e_ctx->size,
                                                      transmit_read_wrapper, e_ctx);
   if (NULL == e_ctx->n->cth)
   {
@@ -219,7 +219,7 @@ schedule_transmisson (struct NodeComCtx *e_ctx)
                 _("Cannot send message to peer `%s' for experiment `%s'\n"),
                 GNUNET_i2s(&e_ctx->n->id), e_ctx->e->name);
     GNUNET_free (e_ctx);
-  }  
+  }
 }
 
 
@@ -233,10 +233,10 @@ static void
 remove_request (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct Node *n = cls;
-  
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Removing request for peer %s due to timeout\n",
-              GNUNET_i2s (&n->id));  
+              GNUNET_i2s (&n->id));
   if (GNUNET_YES == GNUNET_CONTAINER_multipeermap_contains (nodes_requested, &n->id))
   {
     GNUNET_break (0 == GNUNET_CONTAINER_multipeermap_remove (nodes_requested, &n->id, n));
@@ -271,7 +271,7 @@ append_public_key (void *cls,
  * @param buf the buffer to copy to
  * @return bytes passed
  */
-static size_t 
+static size_t
 send_experimentation_request_cb (void *cls, size_t bufsize, void *buf)
 {
   struct Node *n = cls;
@@ -315,22 +315,22 @@ send_experimentation_request_cb (void *cls, size_t bufsize, void *buf)
  *
  * @param peer the peer to send to
  */
-static void 
+static void
 send_experimentation_request (const struct GNUNET_PeerIdentity *peer)
 {
   struct Node *n;
   struct NodeComCtx *e_ctx;
   size_t size;
   size_t c_issuers;
-  
-  c_issuers = GNUNET_CONTAINER_multihashmap_size (valid_issuers);  
+
+  c_issuers = GNUNET_CONTAINER_multihashmap_size (valid_issuers);
   size = sizeof (struct Experimentation_Request) +
     c_issuers * sizeof (struct GNUNET_CRYPTO_EccPublicSignKey);
   n = GNUNET_new (struct Node);
   n->id = *peer;
   n->timeout_task = GNUNET_SCHEDULER_add_delayed (EXP_RESPONSE_TIMEOUT, &remove_request, n);
   n->capabilities = NONE;
-  
+
   e_ctx = GNUNET_new (struct NodeComCtx);
   e_ctx->n = n;
   e_ctx->e = NULL;
@@ -339,10 +339,10 @@ send_experimentation_request (const struct GNUNET_PeerIdentity *peer)
   e_ctx->notify_cls = n;
   GNUNET_CONTAINER_DLL_insert_tail(n->e_req_head, n->e_req_tail, e_ctx);
   schedule_transmisson (e_ctx);
-  
-  GNUNET_assert (GNUNET_OK == 
+
+  GNUNET_assert (GNUNET_OK ==
                  GNUNET_CONTAINER_multipeermap_put (nodes_requested,
-                                                    peer, n, 
+                                                    peer, n,
                                                     GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST));
   update_stats (nodes_requested);
 }
@@ -361,17 +361,17 @@ send_response_cb (void *cls, size_t bufsize, void *buf)
 {
   struct Node *n = cls;
   struct Experimentation_Response msg;
-  size_t c_issuers = GNUNET_CONTAINER_multihashmap_size (valid_issuers);  
+  size_t c_issuers = GNUNET_CONTAINER_multihashmap_size (valid_issuers);
   size_t ri_size = c_issuers * sizeof (struct GNUNET_CRYPTO_EccPublicSignKey);
   size_t msg_size = sizeof (msg);
   size_t total_size = msg_size + ri_size;
   struct GNUNET_CRYPTO_EccPublicSignKey *issuers;
-  
+
   n->cth = NULL;
   if (buf == NULL)
   {
     /* client disconnected */
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Client disconnected\n");
     return 0;
   }
@@ -399,7 +399,7 @@ get_experiments_cb (struct Node *n, struct Experiment *e)
   static int counter = 0;
   if (NULL == e)
     return; /* Done */
-  
+
   /* Tell the scheduler to add a node with an experiment */
   GED_scheduler_add (n, e, GNUNET_YES);
   counter ++;
@@ -417,19 +417,19 @@ get_node (const struct GNUNET_PeerIdentity *id)
   tmp = GNUNET_CONTAINER_multipeermap_get (nodes_active, id);
   if (res == NULL)
     res = tmp;
-  
+
   tmp = GNUNET_CONTAINER_multipeermap_get (nodes_inactive, id);
   if (res == NULL)
     res = tmp;
   else
     GNUNET_break (0); /* Multiple instances */
-  
+
   tmp = GNUNET_CONTAINER_multipeermap_get (nodes_requested, id);
   if (res == NULL)
     res = tmp;
   else
     GNUNET_break (0); /* Multiple instances */
-  
+
   return res;
 }
 
@@ -439,7 +439,7 @@ get_node (const struct GNUNET_PeerIdentity *id)
  *
  * @param n the node
  */
-static void 
+static void
 node_make_active (struct Node *n)
 {
   int c1;
@@ -452,7 +452,7 @@ node_make_active (struct Node *n)
               GNUNET_i2s (&n->id));
   /* Request experiments for this node to start them */
   for (c1 = 0; c1 < n->issuer_count; c1++)
-  {    
+  {
     GED_experiments_get (n, &n->issuer_id[c1], &get_experiments_cb);
   }
 }
@@ -478,20 +478,20 @@ handle_request (const struct GNUNET_PeerIdentity *peer,
   uint32_t ic;
   uint32_t ic_accepted;
   int make_active;
-  
+
   if (ntohs (message->size) < sizeof (struct Experimentation_Request))
   {
     GNUNET_break (0);
     return;
   }
   ic = ntohl (rm->issuer_count);
-  if (ntohs (message->size) != 
+  if (ntohs (message->size) !=
       sizeof (struct Experimentation_Request) + ic * sizeof (struct GNUNET_CRYPTO_EccPublicSignKey))
   {
     GNUNET_break (0);
     return;
   }
-  
+
   make_active = GNUNET_NO;
   if (NULL != (n = GNUNET_CONTAINER_multipeermap_get (nodes_active, peer)))
   {
@@ -522,10 +522,10 @@ handle_request (const struct GNUNET_PeerIdentity *peer,
     n->capabilities = NONE;
     make_active = GNUNET_YES;
   }
-  
+
   /* Update node */
   n->capabilities = ntohl (rm->capabilities);
-  
+
   /* Filter accepted issuer */
   ic_accepted = 0;
   for (c1 = 0; c1 < ic; c1++)
@@ -533,7 +533,7 @@ handle_request (const struct GNUNET_PeerIdentity *peer,
     if (GNUNET_YES == GED_experiments_issuer_accepted(&rmi[c1]))
       ic_accepted ++;
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Request from peer `%s' with %u issuers, we accepted %u issuer \n",
               GNUNET_i2s (peer), ic, ic_accepted);
   GNUNET_free_non_null (n->issuer_id);
@@ -548,19 +548,19 @@ handle_request (const struct GNUNET_PeerIdentity *peer,
     }
   }
   n->issuer_count = ic_accepted;
-  
+
   if (GNUNET_YES == make_active)
     node_make_active (n);
-  
+
   /* Send response */
   e_ctx = GNUNET_new (struct NodeComCtx);
   e_ctx->n = n;
   e_ctx->e = NULL;
-  e_ctx->size = sizeof (struct Experimentation_Response) + 
+  e_ctx->size = sizeof (struct Experimentation_Response) +
     my_issuer_count * sizeof (struct GNUNET_CRYPTO_EccPublicSignKey);
   e_ctx->notify = &send_response_cb;
   e_ctx->notify_cls = n;
-  
+
   GNUNET_CONTAINER_DLL_insert_tail(n->e_req_head, n->e_req_tail, e_ctx);
   schedule_transmisson (e_ctx);
 }
@@ -583,7 +583,7 @@ static void handle_response (const struct GNUNET_PeerIdentity *peer,
   int make_active;
   unsigned int c1;
   unsigned int c2;
-  
+
   if (ntohs (message->size) < sizeof (struct Experimentation_Response))
     {
       GNUNET_break (0);
@@ -595,7 +595,7 @@ static void handle_response (const struct GNUNET_PeerIdentity *peer,
     GNUNET_break (0);
     return;
   }
-  
+
   make_active = GNUNET_NO;
   if (NULL != (n = GNUNET_CONTAINER_multipeermap_get (nodes_active, peer)))
   {
@@ -618,7 +618,7 @@ static void handle_response (const struct GNUNET_PeerIdentity *peer,
   }
   else if (NULL != (n = GNUNET_CONTAINER_multipeermap_get (nodes_inactive, peer)))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Received %s from peer `%s'\n",
                 "RESPONSE", "inactive", GNUNET_i2s (peer));
     GNUNET_break (0 == GNUNET_CONTAINER_multipeermap_remove (nodes_inactive, peer, n));
@@ -631,10 +631,10 @@ static void handle_response (const struct GNUNET_PeerIdentity *peer,
                 "RESPONSE", "unknown", GNUNET_i2s (peer));
     return;
   }
-  
+
   /* Update */
   n->capabilities = ntohl (rm->capabilities);
-  
+
   /* Filter accepted issuer */
   ic_accepted = 0;
   for (c1 = 0; c1 < ic; c1++)
@@ -657,7 +657,7 @@ static void handle_response (const struct GNUNET_PeerIdentity *peer,
     }
   }
   n->issuer_count = ic_accepted;
-  
+
   if (GNUNET_YES == make_active)
     node_make_active (n);
 }
@@ -669,7 +669,7 @@ static void handle_response (const struct GNUNET_PeerIdentity *peer,
  * @param peer the source
  * @param message the message
  */
-static void 
+static void
 handle_start (const struct GNUNET_PeerIdentity *peer,
               const struct GNUNET_MessageHeader *message)
 {
@@ -679,7 +679,7 @@ handle_start (const struct GNUNET_PeerIdentity *peer,
   const char *name;
   struct Node *n;
   struct Experiment *e;
-  
+
   if (NULL == peer)
   {
     GNUNET_break (0);
@@ -690,7 +690,7 @@ handle_start (const struct GNUNET_PeerIdentity *peer,
     GNUNET_break (0);
     return;
   }
-  
+
   size = ntohs (message->size);
   if (size < sizeof (struct GED_start_message))
   {
@@ -704,7 +704,7 @@ handle_start (const struct GNUNET_PeerIdentity *peer,
     GNUNET_break (0);
     return;
   }
-  
+
   n = get_node (peer);
   if (NULL == n)
   {
@@ -716,18 +716,18 @@ handle_start (const struct GNUNET_PeerIdentity *peer,
   {
     GNUNET_break (0);
     return;
-  }  
+  }
   if (name_len != strlen (name) + 1)
   {
     GNUNET_break (0);
     return;
-  }  
+  }
   e = GED_experiments_find (&msg->issuer, name, GNUNET_TIME_absolute_ntoh(msg->version_nbo));
   if (NULL == e)
   {
     GNUNET_break (0);
     return;
-  }  
+  }
   GED_scheduler_handle_start (n, e);
 }
 
@@ -748,7 +748,7 @@ handle_start_ack (const struct GNUNET_PeerIdentity *peer,
   const char *name;
   struct Node *n;
   struct Experiment *e;
-  
+
   if (NULL == peer)
   {
     GNUNET_break (0);
@@ -759,7 +759,7 @@ handle_start_ack (const struct GNUNET_PeerIdentity *peer,
     GNUNET_break (0);
     return;
   }
-  
+
   size = ntohs (message->size);
   if (size < sizeof (struct GED_start_ack_message))
   {
@@ -773,7 +773,7 @@ handle_start_ack (const struct GNUNET_PeerIdentity *peer,
     GNUNET_break (0);
     return;
   }
-  
+
   n = get_node (peer);
   if (NULL == n)
   {
@@ -791,7 +791,7 @@ handle_start_ack (const struct GNUNET_PeerIdentity *peer,
     GNUNET_break (0);
     return;
   }
-  
+
   e = GED_experiments_find (&msg->issuer, name, GNUNET_TIME_absolute_ntoh(msg->version_nbo));
   if (NULL == e)
   {
@@ -885,19 +885,19 @@ core_connect_handler (void *cls,
 {
   if (GNUNET_YES == is_me(peer))
     return;
-  
+
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Connected to peer %s\n"),
               GNUNET_i2s (peer));
-  
+
   if (GNUNET_YES == GNUNET_CONTAINER_multipeermap_contains (nodes_requested, peer))
     return; /* We already sent a request */
-  
+
   if (GNUNET_YES == GNUNET_CONTAINER_multipeermap_contains (nodes_active, peer))
     return; /* This peer is known as active  */
-  
+
   if (GNUNET_YES == GNUNET_CONTAINER_multipeermap_contains (nodes_inactive, peer))
     return; /* This peer is known as inactive  */
-  
+
   send_experimentation_request (peer);
 }
 
diff --git a/src/experimentation/gnunet-daemon-experimentation_scheduler.c b/src/experimentation/gnunet-daemon-experimentation_scheduler.c
index a203fe4a5..a52d60c37 100644
--- a/src/experimentation/gnunet-daemon-experimentation_scheduler.c
+++ b/src/experimentation/gnunet-daemon-experimentation_scheduler.c
@@ -232,8 +232,8 @@ GED_scheduler_handle_start (struct Node *n, struct Experiment *e)
     GNUNET_break_op (0);
     return;
   }
-  
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received %s message from peer %s for experiment `%s'\n",
               "START", GNUNET_i2s (&n->id), e->name);
   GED_scheduler_add (n, e, GNUNET_NO);
diff --git a/src/experimentation/test_experimentation_clique_connect.c b/src/experimentation/test_experimentation_clique_connect.c
index a84eabd7e..e7604b0da 100644
--- a/src/experimentation/test_experimentation_clique_connect.c
+++ b/src/experimentation/test_experimentation_clique_connect.c
@@ -354,7 +354,7 @@ stat_disconnect_adapter (void *cls, void *op_result)
  *          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_,