-remove trailing whitespace

6 files changed, 108 insertions, 108 deletions

diff --git a/src/dv/dv.h b/src/dv/dv.h
index c0247218e..c0a4828a2 100644
--- a/src/dv/dv.h
+++ b/src/dv/dv.h
@@ -142,7 +142,7 @@ struct GNUNET_DV_AckMessage
   /**
    * Type: GNUNET_MESSAGE_TYPE_DV_SEND_ACK or
    * GNUNET_MESSAGE_TYPE_DV_SEND_NACK.
-   */ 
+   */
   struct GNUNET_MessageHeader header;
 
   /**
@@ -166,7 +166,7 @@ struct GNUNET_DV_DistanceUpdateMessage
 {
   /**
    * Type: GNUNET_MESSAGE_TYPE_DV_DISTANCE_CHANGED.
-   */ 
+   */
   struct GNUNET_MessageHeader header;
 
   /**
diff --git a/src/dv/dv_api.c b/src/dv/dv_api.c
index 1bbb789f9..412ab47ad 100644
--- a/src/dv/dv_api.c
+++ b/src/dv/dv_api.c
@@ -63,7 +63,7 @@ struct GNUNET_DV_TransmitHandle
    * Closure for 'cb'.
    */
   void *cb_cls;
-  
+
   /**
    * The actual message (allocated at the end of this struct).
    */
@@ -78,7 +78,7 @@ struct GNUNET_DV_TransmitHandle
    * UID of our message, if any.
    */
   uint32_t uid;
-  
+
 };
 
 
@@ -107,7 +107,7 @@ struct GNUNET_DV_ServiceHandle
    * Closure for the callbacks.
    */
   void *cls;
-  
+
   /**
    * Function to call on connect events.
    */
@@ -221,12 +221,12 @@ start_transmit (struct GNUNET_DV_ServiceHandle *sh)
   if (NULL != sh->th)
     return;
   if (NULL == sh->th_head)
-    return; 
+    return;
   sh->th =
     GNUNET_CLIENT_notify_transmit_ready (sh->client,
                                          ntohs (sh->th_head->msg->size),
                                          GNUNET_TIME_UNIT_FOREVER_REL,
-                                         GNUNET_NO, 
+                                         GNUNET_NO,
                                          &transmit_pending, sh);
 }
 
@@ -291,7 +291,7 @@ process_ack (void *cls,
  * @param msg the message that was received
  */
 static void
-handle_message_receipt (void *cls, 
+handle_message_receipt (void *cls,
                         const struct GNUNET_MessageHeader *msg)
 {
   struct GNUNET_DV_ServiceHandle *sh = cls;
@@ -302,7 +302,7 @@ handle_message_receipt (void *cls,
   const struct GNUNET_MessageHeader *payload;
   const struct GNUNET_DV_AckMessage *ack;
   struct AckContext ctx;
-  
+
   if (NULL == msg)
   {
     /* Connection closed */
@@ -389,7 +389,7 @@ handle_message_receipt (void *cls,
     reconnect (sh);
     break;
   }
-  GNUNET_CLIENT_receive (sh->client, 
+  GNUNET_CLIENT_receive (sh->client,
                          &handle_message_receipt, sh,
                          GNUNET_TIME_UNIT_FOREVER_REL);
 }
@@ -402,7 +402,7 @@ handle_message_receipt (void *cls,
  * @param size number of bytes available in buf
  * @param buf where to copy the message
  * @return number of bytes written to buf
- */ 
+ */
 static size_t
 transmit_start (void *cls,
                 size_t size,
@@ -464,7 +464,7 @@ cleanup_send_cb (void *cls,
  */
 static void
 reconnect (struct GNUNET_DV_ServiceHandle *sh)
-{ 
+{
   if (NULL != sh->th)
   {
     GNUNET_CLIENT_notify_transmit_ready_cancel (sh->th);
@@ -538,7 +538,7 @@ void
 GNUNET_DV_service_disconnect (struct GNUNET_DV_ServiceHandle *sh)
 {
   struct GNUNET_DV_TransmitHandle *pos;
-  
+
   if (NULL == sh)
     return;
   if (NULL != sh->th)
@@ -553,7 +553,7 @@ GNUNET_DV_service_disconnect (struct GNUNET_DV_ServiceHandle *sh)
                                  pos);
     GNUNET_free (pos);
   }
-  if (NULL != sh->client) 
+  if (NULL != sh->client)
   {
     GNUNET_CLIENT_disconnect (sh->client);
     sh->client = NULL;
@@ -607,7 +607,7 @@ GNUNET_DV_send (struct GNUNET_DV_ServiceHandle *sh,
   th->msg = (const struct GNUNET_MessageHeader *) &th[1];
   sm = (struct GNUNET_DV_SendMessage *) &th[1];
   sm->header.type = htons (GNUNET_MESSAGE_TYPE_DV_SEND);
-  sm->header.size = htons (sizeof (struct GNUNET_DV_SendMessage) + 
+  sm->header.size = htons (sizeof (struct GNUNET_DV_SendMessage) +
                            ntohs (msg->size));
   if (0 == sh->uid_gen)
     sh->uid_gen = 1;
diff --git a/src/dv/gnunet-dv.c b/src/dv/gnunet-dv.c
index 77324978e..43af3458e 100644
--- a/src/dv/gnunet-dv.c
+++ b/src/dv/gnunet-dv.c
@@ -44,7 +44,7 @@ static int verbose;
  * @param peer newly connected peer
  * @param distance distance to the peer
  */
-static void 
+static void
 connect_cb (void *cls,
             const struct GNUNET_PeerIdentity *peer,
             uint32_t distance)
@@ -62,7 +62,7 @@ connect_cb (void *cls,
  * @param peer connected peer
  * @param distance new distance to the peer
  */
-static void 
+static void
 change_cb (void *cls,
            const struct GNUNET_PeerIdentity *peer,
            uint32_t distance)
@@ -79,7 +79,7 @@ change_cb (void *cls,
  * @param cls closure
  * @param peer peer that disconnected
  */
-static void 
+static void
 disconnect_cb (void *cls,
                const struct GNUNET_PeerIdentity *peer)
 {
@@ -96,7 +96,7 @@ disconnect_cb (void *cls,
  * @param distance how far did the message travel
  * @param msg actual message payload
  */
-static void 
+static void
 message_cb (void *cls,
             const struct GNUNET_PeerIdentity *sender,
             uint32_t distance,
@@ -171,7 +171,7 @@ main (int argc, char *const *argv)
     return 2;
 
   res = GNUNET_PROGRAM_run (argc, argv, "gnunet-dv",
-                            gettext_noop ("Print information about DV state"), 
+                            gettext_noop ("Print information about DV state"),
                             options, &run,
                             NULL);
   GNUNET_free ((void *) argv);
diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c
index 19303ed83..cd4517164 100644
--- a/src/dv/gnunet-service-dv.c
+++ b/src/dv/gnunet-service-dv.c
@@ -92,7 +92,7 @@ struct Target
 
 /**
  * Message exchanged between DV services (via core), requesting a
- * message to be routed.  
+ * message to be routed.
  */
 struct RouteMessage
 {
@@ -176,7 +176,7 @@ struct DirectNeighbor
    * with other applications.
    */
   struct GNUNET_HashCode real_session_id;
-  
+
   /**
    * Head of linked list of messages to send to this peer.
    */
@@ -197,7 +197,7 @@ struct DirectNeighbor
    * Keys are peer identities, values are 'struct Target' entries.
    * Note that the distances in the targets are from the point-of-view
    * of the peer, not from us!
-   */ 
+   */
   struct GNUNET_CONTAINER_MultiPeerMap *neighbor_table;
 
   /**
@@ -206,7 +206,7 @@ struct DirectNeighbor
    * Keys are peer identities, values are 'struct Target' entries.
    * Note that the distances in the targets are from the point-of-view
    * of the peer, not from us!
-   */ 
+   */
   struct GNUNET_CONTAINER_MultiPeerMap *neighbor_table_consensus;
 
   /**
@@ -318,13 +318,13 @@ struct ConsensusSet
 
 /**
  * Peermap of all of our neighbors; processing these usually requires
- * first checking to see if the peer is core-connected and if the 
+ * first checking to see if the peer is core-connected and if the
  * distance is 1, in which case they are direct neighbors.
  */
 static struct GNUNET_CONTAINER_MultiPeerMap *direct_neighbors;
 
 /**
- * Hashmap with all routes that we currently support; contains 
+ * Hashmap with all routes that we currently support; contains
  * routing information for all peers from distance 2
  * up to distance DEFAULT_FISHEYE_DEPTH.
  */
@@ -367,7 +367,7 @@ static struct GNUNET_STATISTICS_Handle *stats;
  * Handle to ATS service.
  */
 static struct GNUNET_ATS_PerformanceHandle *ats;
- 
+
 
 /**
  * Start creating a new DV set union by initiating the connection.
@@ -375,7 +375,7 @@ static struct GNUNET_ATS_PerformanceHandle *ats;
  * @param cls the 'struct DirectNeighbor' of the peer we're building
  *        a routing consensus with
  * @param tc scheduler context
- */    
+ */
 static void
 initiate_set_union (void *cls,
                     const struct GNUNET_SCHEDULER_TaskContext *tc);
@@ -396,7 +396,7 @@ initiate_set_union (void *cls,
  *        necessary to specify the set we want to do the operation with,
  *        whith sometimes can be derived from the context message.
  *        Also necessary to specify the timeout.
- */    
+ */
 static void
 listen_set_union (void *cls,
                   const struct GNUNET_PeerIdentity *other_peer,
@@ -412,7 +412,7 @@ listen_set_union (void *cls,
  * @param distance distance to the original sender of the message
  */
 static void
-send_data_to_plugin (const struct GNUNET_MessageHeader *message, 
+send_data_to_plugin (const struct GNUNET_MessageHeader *message,
                      const struct GNUNET_PeerIdentity *origin,
                      uint32_t distance)
 {
@@ -422,10 +422,10 @@ send_data_to_plugin (const struct GNUNET_MessageHeader *message,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Delivering message from peer `%s'\n",
               GNUNET_i2s (origin));
-  size = sizeof (struct GNUNET_DV_ReceivedMessage) + 
+  size = sizeof (struct GNUNET_DV_ReceivedMessage) +
     ntohs (message->size);
   if (size >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
-  {    
+  {
     GNUNET_break (0); /* too big */
     return;
   }
@@ -435,7 +435,7 @@ send_data_to_plugin (const struct GNUNET_MessageHeader *message,
   received_msg->distance = htonl (distance);
   received_msg->sender = *origin;
   memcpy (&received_msg[1], message, ntohs (message->size));
-  GNUNET_SERVER_notification_context_broadcast (nc, 
+  GNUNET_SERVER_notification_context_broadcast (nc,
                                                 &received_msg->header,
                                                 GNUNET_YES);
   GNUNET_free (received_msg);
@@ -450,7 +450,7 @@ send_data_to_plugin (const struct GNUNET_MessageHeader *message,
 static void
 send_control_to_plugin (const struct GNUNET_MessageHeader *message)
 {
-  GNUNET_SERVER_notification_context_broadcast (nc, 
+  GNUNET_SERVER_notification_context_broadcast (nc,
                                                 message,
                                                 GNUNET_NO);
 }
@@ -464,7 +464,7 @@ send_control_to_plugin (const struct GNUNET_MessageHeader *message)
  * @param nack GNUNET_NO to send ACK, GNUNET_YES to send NACK
  */
 static void
-send_ack_to_plugin (const struct GNUNET_PeerIdentity *target, 
+send_ack_to_plugin (const struct GNUNET_PeerIdentity *target,
                     uint32_t uid,
                     int nack)
 {
@@ -474,7 +474,7 @@ send_ack_to_plugin (const struct GNUNET_PeerIdentity *target,
               "Delivering ACK for message to peer `%s'\n",
               GNUNET_i2s (target));
   ack_msg.header.size = htons (sizeof (ack_msg));
-  ack_msg.header.type = htons ((GNUNET_YES == nack) 
+  ack_msg.header.type = htons ((GNUNET_YES == nack)
                                ? GNUNET_MESSAGE_TYPE_DV_SEND_NACK
                                : GNUNET_MESSAGE_TYPE_DV_SEND_ACK);
   ack_msg.uid = htonl (uid);
@@ -490,7 +490,7 @@ send_ack_to_plugin (const struct GNUNET_PeerIdentity *target,
  * @param distance new distance to the peer
  */
 static void
-send_distance_change_to_plugin (const struct GNUNET_PeerIdentity *peer, 
+send_distance_change_to_plugin (const struct GNUNET_PeerIdentity *peer,
                                 uint32_t distance)
 {
   struct GNUNET_DV_DistanceUpdateMessage du_msg;
@@ -513,7 +513,7 @@ send_distance_change_to_plugin (const struct GNUNET_PeerIdentity *peer,
  * @param distance distance to the target
  */
 static void
-send_connect_to_plugin (const struct GNUNET_PeerIdentity *target, 
+send_connect_to_plugin (const struct GNUNET_PeerIdentity *target,
                         uint32_t distance)
 {
   struct GNUNET_DV_ConnectMessage cm;
@@ -585,7 +585,7 @@ core_transmit_notify (void *cls, size_t size, void *buf)
                                  dn->pm_tail,
                                  pending);
     memcpy (&cbuf[off], pending->msg, msize);
-    if (0 != pending->uid) 
+    if (0 != pending->uid)
       send_ack_to_plugin (&pending->ultimate_target,
                           pending->uid,
                           GNUNET_NO);
@@ -599,7 +599,7 @@ core_transmit_notify (void *cls, size_t size, void *buf)
                                          0 /* priority */,
                                          GNUNET_TIME_UNIT_FOREVER_REL,
                                          &dn->peer,
-                                         msize,                                  
+                                         msize,                                 
                                          &core_transmit_notify, dn);
   return off;
 }
@@ -662,7 +662,7 @@ forward_payload (struct DirectNeighbor *target,
                                                      0 /* priority */,
                                                      GNUNET_TIME_UNIT_FOREVER_REL,
                                                      &target->peer,
-                                                     msize,                                      
+                                                     msize,                                     
                                                      &core_transmit_notify, target);
 }
 
@@ -738,7 +738,7 @@ move_route (struct Route *route,
   release_route (route);
   i = get_consensus_slot (new_distance);
   route->set_offset = i;
-  consensi[new_distance].targets[i] = route;     
+  consensi[new_distance].targets[i] = route;
   route->target.distance = htonl (new_distance);
 }
 
@@ -785,13 +785,13 @@ build_set (void *cls)
   while ( (DEFAULT_FISHEYE_DEPTH - 1 > neighbor->consensus_insertion_distance) &&
           (consensi[neighbor->consensus_insertion_distance].array_length < neighbor->consensus_insertion_offset) &&
           (NULL == consensi[neighbor->consensus_insertion_distance].targets[neighbor->consensus_insertion_offset]) )
-    neighbor->consensus_insertion_offset++;  
+    neighbor->consensus_insertion_offset++;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Adding element to SET\n");
   GNUNET_SET_add_element (neighbor->my_set,
                           &element,
                           &build_set, neighbor);
-  
+
 }
 
 
@@ -814,9 +814,9 @@ handle_direct_connect (struct DirectNeighbor *neighbor)
   GNUNET_STATISTICS_update (stats,
                             "# peers connected (1-hop)",
                             1, GNUNET_NO);
-  route = GNUNET_CONTAINER_multipeermap_get (all_routes, 
+  route = GNUNET_CONTAINER_multipeermap_get (all_routes,
                                              &neighbor->peer);
-  if (NULL != route)  
+  if (NULL != route)
   {
     send_disconnect_to_plugin (&neighbor->peer);
     release_route (route);
@@ -839,7 +839,7 @@ handle_direct_connect (struct DirectNeighbor *neighbor)
                   sizeof (struct GNUNET_PeerIdentity)))
   {
     neighbor->initiate_task = GNUNET_SCHEDULER_add_now (&initiate_set_union,
-                                                        neighbor);  
+                                                        neighbor);
   }
   else
   {
@@ -861,16 +861,16 @@ handle_direct_connect (struct DirectNeighbor *neighbor)
  * @param peer peer identity this notification is about
  */
 static void
-handle_core_connect (void *cls, 
+handle_core_connect (void *cls,
                      const struct GNUNET_PeerIdentity *peer)
 {
   struct DirectNeighbor *neighbor;
- 
+
   /* Check for connect to self message */
   if (0 == memcmp (&my_identity, peer, sizeof (struct GNUNET_PeerIdentity)))
     return;
   /* check if entry exists */
-  neighbor = GNUNET_CONTAINER_multipeermap_get (direct_neighbors, 
+  neighbor = GNUNET_CONTAINER_multipeermap_get (direct_neighbors,
                                                 peer);
   if (NULL != neighbor)
   {
@@ -929,14 +929,14 @@ free_targets (void *cls,
  * @return GNUNET_YES to continue iteration, GNUNET_NO to stop
  */
 static int
-check_possible_route (void *cls, 
-                      const struct GNUNET_PeerIdentity *key, 
+check_possible_route (void *cls,
+                      const struct GNUNET_PeerIdentity *key,
                       void *value)
 {
   struct DirectNeighbor *neighbor = cls;
   struct Target *target = value;
   struct Route *route;
-  
+
   route = GNUNET_CONTAINER_multipeermap_get (all_routes,
                                              key);
   if (NULL != route)
@@ -975,15 +975,15 @@ check_possible_route (void *cls,
  * @return GNUNET_YES to continue iteration
  */
 static int
-refresh_routes (void *cls, 
-                const struct GNUNET_PeerIdentity *key, 
+refresh_routes (void *cls,
+                const struct GNUNET_PeerIdentity *key,
                 void *value)
 {
   struct DirectNeighbor *neighbor = value;
 
   if ( (GNUNET_YES != neighbor->connected) ||
        (DIRECT_NEIGHBOR_COST != neighbor->distance) )
-    return GNUNET_YES;    
+    return GNUNET_YES;
   if (NULL != neighbor->neighbor_table)
     GNUNET_CONTAINER_multipeermap_iterate (neighbor->neighbor_table,
                                            &check_possible_route,
@@ -1024,8 +1024,8 @@ get_atsi_distance (const struct GNUNET_ATS_Information *atsi,
  * @return GNUNET_YES to continue iteration, GNUNET_NO to stop
  */
 static int
-cull_routes (void *cls, 
-             const struct GNUNET_PeerIdentity *key, 
+cull_routes (void *cls,
+             const struct GNUNET_PeerIdentity *key,
              void *value)
 {
   struct DirectNeighbor *neighbor = cls;
@@ -1047,7 +1047,7 @@ cull_routes (void *cls,
  * disrupted.  Remove all routes via that peer and
  * stop the consensus with it.
  *
- * @param neighbor peer that was disconnected (or at least is no 
+ * @param neighbor peer that was disconnected (or at least is no
  *    longer at distance 1)
  */
 static void
@@ -1118,7 +1118,7 @@ handle_ats_update (void *cls,
                    int active,
                    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
                    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
-                   const struct GNUNET_ATS_Information *ats, 
+                   const struct GNUNET_ATS_Information *ats,
                    uint32_t ats_count)
 {
   struct DirectNeighbor *neighbor;
@@ -1126,25 +1126,25 @@ handle_ats_update (void *cls,
 
   if (GNUNET_NO == active)
         return;
-  distance = get_atsi_distance (ats, ats_count); 
+  distance = get_atsi_distance (ats, ats_count);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "ATS says distance to %s is %u\n",
               GNUNET_i2s (&address->peer),
               (unsigned int) distance);
   /* check if entry exists */
-  neighbor = GNUNET_CONTAINER_multipeermap_get (direct_neighbors, 
+  neighbor = GNUNET_CONTAINER_multipeermap_get (direct_neighbors,
                                                 &address->peer);
   if (NULL != neighbor)
-  {    
+  {
     if ( (DIRECT_NEIGHBOR_COST == neighbor->distance) &&
          (DIRECT_NEIGHBOR_COST == distance) )
       return; /* no change */
-    if (DIRECT_NEIGHBOR_COST == neighbor->distance) 
+    if (DIRECT_NEIGHBOR_COST == neighbor->distance)
     {
       neighbor->distance = distance;
       GNUNET_STATISTICS_update (stats,
                                 "# peers connected (1-hop)",
-                                -1, GNUNET_NO);  
+                                -1, GNUNET_NO);
       handle_direct_disconnect (neighbor);
       GNUNET_CONTAINER_multipeermap_iterate (direct_neighbors,
                                              &refresh_routes,
@@ -1153,7 +1153,7 @@ handle_ats_update (void *cls,
     }
     neighbor->distance = distance;
     if (DIRECT_NEIGHBOR_COST != neighbor->distance)
-      return;    
+      return;
     if (GNUNET_YES != neighbor->connected)
       return;
     handle_direct_connect (neighbor);
@@ -1167,7 +1167,7 @@ handle_ats_update (void *cls,
                                                     neighbor,
                                                     GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
   neighbor->connected = GNUNET_NO; /* not yet */
-  neighbor->distance = distance; 
+  neighbor->distance = distance;
 }
 
 
@@ -1357,7 +1357,7 @@ handle_set_union_result (void *cls,
       /* check if we got an alternative for the removed routes */
       GNUNET_CONTAINER_multipeermap_iterate (direct_neighbors,
                                              &refresh_routes,
-                                             NULL);    
+                                             NULL);
     }
     /* add targets that appeared (and check for improved routes) */
     GNUNET_CONTAINER_multipeermap_iterate (neighbor->neighbor_table_consensus,
@@ -1406,7 +1406,7 @@ handle_set_union_result (void *cls,
  *        necessary to specify the set we want to do the operation with,
  *        whith sometimes can be derived from the context message.
  *        Also necessary to specify the timeout.
- */    
+ */
 static void
 listen_set_union (void *cls,
                   const struct GNUNET_PeerIdentity *other_peer,
@@ -1446,7 +1446,7 @@ listen_set_union (void *cls,
  * @param cls the 'struct DirectNeighbor' of the peer we're building
  *        a routing consensus with
  * @param tc scheduler context
- */    
+ */
 static void
 initiate_set_union (void *cls,
                     const struct GNUNET_SCHEDULER_TaskContext *tc)
@@ -1550,7 +1550,7 @@ handle_dv_route_message (void *cls, const struct GNUNET_PeerIdentity *peer,
                    &rm->target,
                    &rm->sender,
                    payload);
-  return GNUNET_OK;  
+  return GNUNET_OK;
 }
 
 
@@ -1627,12 +1627,12 @@ cleanup_neighbor (struct DirectNeighbor *neighbor)
     neighbor->pm_queue_size--;
     GNUNET_CONTAINER_DLL_remove (neighbor->pm_head,
                                  neighbor->pm_tail,
-                                 pending);    
+                                 pending);
     GNUNET_free (pending);
   }
   handle_direct_disconnect (neighbor);
   GNUNET_assert (GNUNET_YES ==
-                 GNUNET_CONTAINER_multipeermap_remove (direct_neighbors, 
+                 GNUNET_CONTAINER_multipeermap_remove (direct_neighbors,
                                                        &neighbor->peer,
                                                        neighbor));
   GNUNET_free (neighbor);
@@ -1669,7 +1669,7 @@ handle_core_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
   {
     GNUNET_STATISTICS_update (stats,
                               "# peers connected (1-hop)",
-                              -1, GNUNET_NO);  
+                              -1, GNUNET_NO);
   }
   cleanup_neighbor (neighbor);
   GNUNET_CONTAINER_multipeermap_iterate (direct_neighbors,
@@ -1770,13 +1770,13 @@ add_route (void *cls,
   struct GNUNET_SERVER_Client *client = cls;
   struct Route *route = value;
   struct GNUNET_DV_ConnectMessage cm;
-  
+
   cm.header.size = htons (sizeof (cm));
   cm.header.type = htons (GNUNET_MESSAGE_TYPE_DV_CONNECT);
   cm.distance = htonl (route->target.distance);
   cm.peer = route->target.peer;
 
-  GNUNET_SERVER_notification_context_unicast (nc, 
+  GNUNET_SERVER_notification_context_unicast (nc,
                                               client,
                                               &cm.header,
                                               GNUNET_NO);
@@ -1796,7 +1796,7 @@ static void
 handle_start (void *cls, struct GNUNET_SERVER_Client *client,
               const struct GNUNET_MessageHeader *message)
 {
-  GNUNET_SERVER_notification_context_add (nc, client);  
+  GNUNET_SERVER_notification_context_add (nc, client);
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
   GNUNET_CONTAINER_multipeermap_iterate (all_routes,
                                          &add_route,
@@ -1837,11 +1837,11 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
     {NULL, 0, 0}
   };
   static struct GNUNET_SERVER_MessageHandler plugin_handlers[] = {
-    {&handle_start, NULL, 
-     GNUNET_MESSAGE_TYPE_DV_START, 
+    {&handle_start, NULL,
+     GNUNET_MESSAGE_TYPE_DV_START,
      sizeof (struct GNUNET_MessageHeader) },
-    { &handle_dv_send_message, NULL, 
-      GNUNET_MESSAGE_TYPE_DV_SEND, 
+    { &handle_dv_send_message, NULL,
+      GNUNET_MESSAGE_TYPE_DV_SEND,
       0},
     {NULL, NULL, 0, 0}
   };
@@ -1850,11 +1850,11 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
   direct_neighbors = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_NO);
   all_routes = GNUNET_CONTAINER_multipeermap_create (65536, GNUNET_NO);
   core_api = GNUNET_CORE_connect (cfg, NULL,
-                                  &core_init, 
+                                  &core_init,
                                   &handle_core_connect,
                                   &handle_core_disconnect,
-                                  NULL, GNUNET_NO, 
-                                  NULL, GNUNET_NO, 
+                                  NULL, GNUNET_NO,
+                                  NULL, GNUNET_NO,
                                   core_handlers);
 
   if (NULL == core_api)
diff --git a/src/dv/plugin_transport_dv.c b/src/dv/plugin_transport_dv.c
index 76c823b17..2acc3da3f 100644
--- a/src/dv/plugin_transport_dv.c
+++ b/src/dv/plugin_transport_dv.c
@@ -160,7 +160,7 @@ struct Plugin
   /**
    * Tokenizer for boxed messages.
    */
-  struct GNUNET_SERVER_MessageStreamTokenizer *mst; 
+  struct GNUNET_SERVER_MessageStreamTokenizer *mst;
 
 };
 
@@ -202,11 +202,11 @@ unbox_cb (void *cls,
   struct Plugin *plugin = cls;
   struct Session *session = client;
   struct GNUNET_ATS_Information ats;
-  
+
   ats.type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE);
   ats.value = htonl (session->distance);
   session->active = GNUNET_YES;
-  plugin->env->receive (plugin->env->cls, 
+  plugin->env->receive (plugin->env->cls,
                         &session->sender,
                         message,
                         session, "", 0);
@@ -222,7 +222,7 @@ unbox_cb (void *cls,
  * @param cls closure with the plugin
  * @param sender sender of the message
  * @param distance how far did the message travel
- * @param msg actual message payload 
+ * @param msg actual message payload
  */
 static void
 handle_dv_message_received (void *cls,
@@ -236,7 +236,7 @@ handle_dv_message_received (void *cls,
 
   session = GNUNET_CONTAINER_multipeermap_get (plugin->sessions,
                                                sender);
-  if (NULL == session)    
+  if (NULL == session)
   {
     GNUNET_break (0);
     return;
@@ -244,7 +244,7 @@ handle_dv_message_received (void *cls,
   if (GNUNET_MESSAGE_TYPE_DV_BOX == ntohs (msg->type))
   {
     /* need to unbox using MST */
-    GNUNET_SERVER_mst_receive (plugin->mst, 
+    GNUNET_SERVER_mst_receive (plugin->mst,
                                session,
                                (const char *) &msg[1],
                                ntohs (msg->size) - sizeof (struct GNUNET_MessageHeader),
@@ -270,7 +270,7 @@ handle_dv_message_received (void *cls,
  * @param peer newly connected peer
  * @param distance distance to the peer
  */
-static void 
+static void
 handle_dv_connect (void *cls,
                    const struct GNUNET_PeerIdentity *peer,
                    uint32_t distance)
@@ -280,13 +280,13 @@ handle_dv_connect (void *cls,
 
   session = GNUNET_CONTAINER_multipeermap_get (plugin->sessions,
                                                peer);
-  if (NULL != session)    
+  if (NULL != session)
   {
     GNUNET_break (0);
     session->distance = distance;
     if (GNUNET_YES == session->active)
       notify_distance_change (session);
-    return; /* nothing to do */  
+    return; /* nothing to do */
   }
   session = GNUNET_new (struct Session);
   session->sender = *peer;
@@ -306,7 +306,7 @@ handle_dv_connect (void *cls,
  * @param peer connected peer
  * @param distance new distance to the peer
  */
-static void 
+static void
 handle_dv_distance_changed (void *cls,
                             const struct GNUNET_PeerIdentity *peer,
                             uint32_t distance)
@@ -316,7 +316,7 @@ handle_dv_distance_changed (void *cls,
 
   session = GNUNET_CONTAINER_multipeermap_get (plugin->sessions,
                                                peer);
-  if (NULL == session)    
+  if (NULL == session)
   {
     GNUNET_break (0);
     handle_dv_connect (plugin, peer, distance);
@@ -370,7 +370,7 @@ free_session (struct Session *session)
  * @param cls closure with 'struct Plugin'
  * @param peer peer that disconnected
  */
-static void 
+static void
 handle_dv_disconnect (void *cls,
                       const struct GNUNET_PeerIdentity *peer)
 {
@@ -379,7 +379,7 @@ handle_dv_disconnect (void *cls,
 
   session = GNUNET_CONTAINER_multipeermap_get (plugin->sessions,
                                                peer);
-  if (NULL == session)    
+  if (NULL == session)
     return; /* nothing to do */
   free_session (session);
 }
@@ -431,10 +431,10 @@ send_finished (void *cls,
  *         and does NOT mean that the message was not transmitted (DV)
  */
 static ssize_t
-dv_plugin_send (void *cls, 
+dv_plugin_send (void *cls,
                 struct Session *session,
                 const char *msgbuf, size_t msgbuf_size, unsigned int priority,
-                struct GNUNET_TIME_Relative timeout, 
+                struct GNUNET_TIME_Relative timeout,
                 GNUNET_TRANSPORT_TransmitContinuation cont, void *cont_cls)
 {
   struct PendingRequest *pr;
@@ -486,8 +486,8 @@ dv_plugin_disconnect (void *cls, const struct GNUNET_PeerIdentity *target)
 
   session = GNUNET_CONTAINER_multipeermap_get (plugin->sessions,
                                                target);
-  if (NULL == session)    
-    return; /* nothing to do */  
+  if (NULL == session)
+    return; /* nothing to do */
   while (NULL != (pr = session->pr_head))
   {
     GNUNET_CONTAINER_DLL_remove (session->pr_head,
@@ -548,7 +548,7 @@ dv_plugin_address_to_string (void *cls, const void *addr, size_t addrlen)
   if (0 != addrlen)
   {
     GNUNET_break (0); /* malformed */
-    return NULL; 
+    return NULL;
   }
   return "dv";
 }
@@ -588,7 +588,7 @@ dv_plugin_check_address (void *cls, const void *addr, size_t addrlen)
  * @param address the address
  * @return the session if the address is valid, NULL otherwise
  */
-static struct Session * 
+static struct Session *
 dv_get_session (void *cls,
                 const struct GNUNET_HELLO_Address *address)
 {
@@ -618,7 +618,7 @@ dv_get_session (void *cls,
  * @param added length of created address
  * @return GNUNET_OK on success, GNUNET_SYSERR on failure
  */
-static int 
+static int
 dv_plugin_string_to_address (void *cls,
                              const char *addr,
                              uint16_t addrlen,
@@ -646,7 +646,7 @@ dv_plugin_string_to_address (void *cls,
  * @param session the session
  * @return the network type
  */
-static enum GNUNET_ATS_Network_Type 
+static enum GNUNET_ATS_Network_Type
 dv_get_network (void *cls,
                 struct Session *session)
 {
@@ -682,7 +682,7 @@ libgnunet_plugin_transport_dv_init (void *cls)
   if (NULL == plugin->dvh)
   {
     GNUNET_CONTAINER_multipeermap_destroy (plugin->sessions);
-    GNUNET_SERVER_mst_destroy (plugin->mst);    
+    GNUNET_SERVER_mst_destroy (plugin->mst);
     GNUNET_free (plugin);
     return NULL;
   }
@@ -737,7 +737,7 @@ libgnunet_plugin_transport_dv_done (void *cls)
                                          &free_session_iterator,
                                          NULL);
   GNUNET_CONTAINER_multipeermap_destroy (plugin->sessions);
-  GNUNET_SERVER_mst_destroy (plugin->mst);    
+  GNUNET_SERVER_mst_destroy (plugin->mst);
   GNUNET_free (plugin);
   GNUNET_free (api);
   return NULL;
diff --git a/src/dv/test_transport_blacklist.c b/src/dv/test_transport_blacklist.c
index 601544afa..e76964744 100644
--- a/src/dv/test_transport_blacklist.c
+++ b/src/dv/test_transport_blacklist.c
@@ -42,7 +42,7 @@ test_connection (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Links successful %u / %u failed\n", links_succeeded, links_failed);
   if ( (4 == num_peers) && (0 == links_failed) )
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Testbed connect peers despite blacklist!\n");
     ok = 1;
   }