uncrustify as demanded.
[oweals/gnunet.git] / src / fs / gnunet-service-fs_cp.c
index a3a52122171614610ff38bc187af2732911e9110..6dab378693fa7b6b9567615e9ccce1e88397cc9d 100644 (file)
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 /**
  * @file fs/gnunet-service-fs_cp.c
  * @brief API to handle 'connected peers'
 /**
  * How often do we flush respect values to disk?
  */
-#define RESPECT_FLUSH_FREQ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5)
+#define RESPECT_FLUSH_FREQ GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 5)
 
 /**
  * After how long do we discard a reply?
  */
-#define REPLY_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 2)
+#define REPLY_TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 2)
 
 /**
  * Collect an instane number of statistics?  May cause excessive IPC.
@@ -59,9 +59,7 @@
 /**
  * Handle to cancel a transmission request.
  */
-struct GSF_PeerTransmitHandle
-{
-
+struct GSF_PeerTransmitHandle {
   /**
    * Kept in a doubly-linked list.
    */
@@ -101,16 +99,13 @@ struct GSF_PeerTransmitHandle
    * Priority of this request.
    */
   uint32_t priority;
-
 };
 
 
 /**
  * Handle for an entry in our delay list.
  */
-struct GSF_DelayedHandle
-{
-
+struct GSF_DelayedHandle {
   /**
    * Kept in a doubly-linked list.
    */
@@ -140,16 +135,13 @@ struct GSF_DelayedHandle
    * Size of the message.
    */
   size_t msize;
-
 };
 
 
 /**
  * Information per peer and request.
  */
-struct PeerRequest
-{
-
+struct PeerRequest {
   /**
    * Handle to generic request (generic: from peer or local client).
    */
@@ -164,16 +156,13 @@ struct PeerRequest
    * Task for asynchronous stopping of this request.
    */
   struct GNUNET_SCHEDULER_Task *kill_task;
-
 };
 
 
 /**
  * A connected peer.
  */
-struct GSF_ConnectedPeer
-{
-
+struct GSF_ConnectedPeer {
   /**
    * Performance data for this peer.
    */
@@ -278,7 +267,6 @@ struct GSF_ConnectedPeer
    * Handle to the PEERSTORE iterate request for peer respect value
    */
   struct GNUNET_PEERSTORE_IterateContext *respect_iterate_req;
-
 };
 
 
@@ -305,16 +293,16 @@ static struct GNUNET_SCHEDULER_Task *fr_task;
  * @param latency current latency value
  */
 void
-GSF_update_peer_latency_ (const struct GNUNET_PeerIdentity *id,
-                         struct GNUNET_TIME_Relative latency)
+GSF_update_peer_latency_(const struct GNUNET_PeerIdentity *id,
+                         struct GNUNET_TIME_Relative latency)
 {
   struct GSF_ConnectedPeer *cp;
 
-  cp = GSF_peer_get_ (id);
+  cp = GSF_peer_get_(id);
   if (NULL == cp)
     return; /* we're not yet connected at the core level, ignore */
-  GNUNET_LOAD_value_set_decline (cp->ppd.transmission_delay,
-                                 latency);
+  GNUNET_LOAD_value_set_decline(cp->ppd.transmission_delay,
+                                latency);
 }
 
 
@@ -325,7 +313,7 @@ GSF_update_peer_latency_ (const struct GNUNET_PeerIdentity *id,
  * @return performance data record for the peer
  */
 struct GSF_PeerPerformanceData *
-GSF_get_peer_performance_data_ (struct GSF_ConnectedPeer *cp)
+GSF_get_peer_performance_data_(struct GSF_ConnectedPeer *cp)
 {
   return &cp->ppd;
 }
@@ -337,7 +325,7 @@ GSF_get_peer_performance_data_ (struct GSF_ConnectedPeer *cp)
  * @param cp which peer to send a message to
  */
 static void
-peer_transmit (struct GSF_ConnectedPeer *cp);
+peer_transmit(struct GSF_ConnectedPeer *cp);
 
 
 /**
@@ -351,10 +339,10 @@ peer_transmit (struct GSF_ConnectedPeer *cp);
  *        long should the client wait until re-trying?
  */
 static void
-ats_reserve_callback (void *cls,
-                      const struct GNUNET_PeerIdentity *peer,
-                      int32_t amount,
-                      struct GNUNET_TIME_Relative res_delay);
+ats_reserve_callback(void *cls,
+                     const struct GNUNET_PeerIdentity *peer,
+                     int32_t amount,
+                     struct GNUNET_TIME_Relative res_delay);
 
 
 /**
@@ -364,42 +352,42 @@ ats_reserve_callback (void *cls,
  * @param pth transmission handle to schedule
  */
 static void
-schedule_transmission (struct GSF_PeerTransmitHandle *pth)
+schedule_transmission(struct GSF_PeerTransmitHandle *pth)
 {
   struct GSF_ConnectedPeer *cp;
   struct GNUNET_PeerIdentity target;
 
   cp = pth->cp;
-  GNUNET_assert (0 != cp->ppd.pid);
-  GNUNET_PEER_resolve (cp->ppd.pid, &target);
+  GNUNET_assert(0 != cp->ppd.pid);
+  GNUNET_PEER_resolve(cp->ppd.pid, &target);
 
   if (0 != cp->inc_preference)
-  {
-    GNUNET_ATS_performance_change_preference (GSF_ats,
-                                              &target,
-                                              GNUNET_ATS_PREFERENCE_BANDWIDTH,
-                                              (double) cp->inc_preference,
-                                              GNUNET_ATS_PREFERENCE_END);
-    cp->inc_preference = 0;
-  }
-
-  if ( (GNUNET_YES == pth->is_query) &&
-       (GNUNET_YES != pth->was_reserved) )
-  {
-    /* query, need reservation */
-    if (GNUNET_YES != cp->did_reserve)
-      return;                   /* not ready */
-    cp->did_reserve = GNUNET_NO;
-    /* reservation already done! */
-    pth->was_reserved = GNUNET_YES;
-    cp->rc = GNUNET_ATS_reserve_bandwidth (GSF_ats,
-                                           &target,
-                                           DBLOCK_SIZE,
-                                           &ats_reserve_callback,
-                                           cp);
-    return;
-  }
-  peer_transmit (cp);
+    {
+      GNUNET_ATS_performance_change_preference(GSF_ats,
+                                               &target,
+                                               GNUNET_ATS_PREFERENCE_BANDWIDTH,
+                                               (double)cp->inc_preference,
+                                               GNUNET_ATS_PREFERENCE_END);
+      cp->inc_preference = 0;
+    }
+
+  if ((GNUNET_YES == pth->is_query) &&
+      (GNUNET_YES != pth->was_reserved))
+    {
+      /* query, need reservation */
+      if (GNUNET_YES != cp->did_reserve)
+        return;                 /* not ready */
+      cp->did_reserve = GNUNET_NO;
+      /* reservation already done! */
+      pth->was_reserved = GNUNET_YES;
+      cp->rc = GNUNET_ATS_reserve_bandwidth(GSF_ats,
+                                            &target,
+                                            DBLOCK_SIZE,
+                                            &ats_reserve_callback,
+                                            cp);
+      return;
+    }
+  peer_transmit(cp);
 }
 
 
@@ -409,38 +397,38 @@ schedule_transmission (struct GSF_PeerTransmitHandle *pth)
  * @param cp which peer to send a message to
  */
 static void
-peer_transmit (struct GSF_ConnectedPeer *cp)
+peer_transmit(struct GSF_ConnectedPeer *cp)
 {
   struct GSF_PeerTransmitHandle *pth = cp->pth_head;
   struct GSF_PeerTransmitHandle *pos;
 
   if (NULL == pth)
     return;
-  GNUNET_CONTAINER_DLL_remove (cp->pth_head,
-                               cp->pth_tail,
-                               pth);
+  GNUNET_CONTAINER_DLL_remove(cp->pth_head,
+                              cp->pth_tail,
+                              pth);
   if (GNUNET_YES == pth->is_query)
-  {
-    cp->ppd.last_request_times[(cp->last_request_times_off++) %
-                               MAX_QUEUE_PER_PEER] =
-      GNUNET_TIME_absolute_get ();
-    GNUNET_assert (0 < cp->ppd.pending_queries--);
-  }
+    {
+      cp->ppd.last_request_times[(cp->last_request_times_off++) %
+                                 MAX_QUEUE_PER_PEER] =
+        GNUNET_TIME_absolute_get();
+      GNUNET_assert(0 < cp->ppd.pending_queries--);
+    }
   else if (GNUNET_NO == pth->is_query)
-  {
-    GNUNET_assert (0 < cp->ppd.pending_replies--);
-  }
-  GNUNET_LOAD_update (cp->ppd.transmission_delay,
-                      GNUNET_TIME_absolute_get_duration
-                      (pth->transmission_request_start_time).rel_value_us);
-  GNUNET_MQ_send (cp->mq,
-                 pth->env);
-  GNUNET_free (pth);
+    {
+      GNUNET_assert(0 < cp->ppd.pending_replies--);
+    }
+  GNUNET_LOAD_update(cp->ppd.transmission_delay,
+                     GNUNET_TIME_absolute_get_duration
+                       (pth->transmission_request_start_time).rel_value_us);
+  GNUNET_MQ_send(cp->mq,
+                 pth->env);
+  GNUNET_free(pth);
   if (NULL != (pos = cp->pth_head))
-  {
-    GNUNET_assert (pos != pth);
-    schedule_transmission (pos);
-  }
+    {
+      GNUNET_assert(pos != pth);
+      schedule_transmission(pos);
+    }
 }
 
 
@@ -450,18 +438,18 @@ peer_transmit (struct GSF_ConnectedPeer *cp)
  * @param cls the `struct GSF_ConnectedPeer` to reserve from
  */
 static void
-retry_reservation (void *cls)
+retry_reservation(void *cls)
 {
   struct GSF_ConnectedPeer *cp = cls;
   struct GNUNET_PeerIdentity target;
 
-  GNUNET_PEER_resolve (cp->ppd.pid, &target);
+  GNUNET_PEER_resolve(cp->ppd.pid, &target);
   cp->rc_delay_task = NULL;
   cp->rc =
-    GNUNET_ATS_reserve_bandwidth (GSF_ats,
-                                  &target,
-                                  DBLOCK_SIZE,
-                                 &ats_reserve_callback, cp);
+    GNUNET_ATS_reserve_bandwidth(GSF_ats,
+                                 &target,
+                                 DBLOCK_SIZE,
+                                 &ats_reserve_callback, cp);
 }
 
 
@@ -476,34 +464,34 @@ retry_reservation (void *cls)
  *        long should the client wait until re-trying?
  */
 static void
-ats_reserve_callback (void *cls,
-                      const struct GNUNET_PeerIdentity *peer,
-                      int32_t amount,
-                      struct GNUNET_TIME_Relative res_delay)
+ats_reserve_callback(void *cls,
+                     const struct GNUNET_PeerIdentity *peer,
+                     int32_t amount,
+                     struct GNUNET_TIME_Relative res_delay)
 {
   struct GSF_ConnectedPeer *cp = cls;
   struct GSF_PeerTransmitHandle *pth;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Reserved %d bytes / need to wait %s for reservation\n",
-              (int) amount,
-             GNUNET_STRINGS_relative_time_to_string (res_delay, GNUNET_YES));
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+             "Reserved %d bytes / need to wait %s for reservation\n",
+             (int)amount,
+             GNUNET_STRINGS_relative_time_to_string(res_delay, GNUNET_YES));
   cp->rc = NULL;
   if (0 == amount)
-  {
-    cp->rc_delay_task =
-        GNUNET_SCHEDULER_add_delayed (res_delay,
-                                      &retry_reservation,
-                                      cp);
-    return;
-  }
+    {
+      cp->rc_delay_task =
+        GNUNET_SCHEDULER_add_delayed(res_delay,
+                                     &retry_reservation,
+                                     cp);
+      return;
+    }
   cp->did_reserve = GNUNET_YES;
   pth = cp->pth_head;
   if (NULL != pth)
-  {
-    /* reservation success, try transmission now! */
-    peer_transmit (cp);
-  }
+    {
+      /* reservation success, try transmission now! */
+      peer_transmit(cp);
+    }
 }
 
 
@@ -515,22 +503,22 @@ ats_reserve_callback (void *cls,
  * @param emsg error message, or NULL if no errors
  */
 static void
-peer_respect_cb (void *cls,
-                 const struct GNUNET_PEERSTORE_Record *record,
-                 const char *emsg)
+peer_respect_cb(void *cls,
+                const struct GNUNET_PEERSTORE_Record *record,
+                const char *emsg)
 {
   struct GSF_ConnectedPeer *cp = cls;
 
-  GNUNET_assert (NULL != cp->respect_iterate_req);
-  if ( (NULL != record) &&
-       (sizeof (cp->disk_respect) == record->value_size))
-  {
-    cp->disk_respect = *((uint32_t *)record->value);
-    cp->ppd.respect += *((uint32_t *)record->value);
-  }
-  GSF_push_start_ (cp);
+  GNUNET_assert(NULL != cp->respect_iterate_req);
+  if ((NULL != record) &&
+      (sizeof(cp->disk_respect) == record->value_size))
+    {
+      cp->disk_respect = *((uint32_t *)record->value);
+      cp->ppd.respect += *((uint32_t *)record->value);
+    }
+  GSF_push_start_(cp);
   if (NULL != record)
-    GNUNET_PEERSTORE_iterate_cancel (cp->respect_iterate_req);
+    GNUNET_PEERSTORE_iterate_cancel(cp->respect_iterate_req);
   cp->respect_iterate_req = NULL;
 }
 
@@ -546,27 +534,27 @@ peer_respect_cb (void *cls,
  * @return #GNUNET_YES to continue to iterate
  */
 static int
-consider_peer_for_forwarding (void *cls,
-                              const struct GNUNET_HashCode *key,
-                              struct GSF_PendingRequest *pr)
+consider_peer_for_forwarding(void *cls,
+                             const struct GNUNET_HashCode *key,
+                             struct GSF_PendingRequest *pr)
 {
   struct GSF_ConnectedPeer *cp = cls;
   struct GNUNET_PeerIdentity pid;
 
   if (GNUNET_YES !=
-      GSF_pending_request_test_active_ (pr))
+      GSF_pending_request_test_active_(pr))
     return GNUNET_YES; /* request is not actually active, skip! */
-  GSF_connected_peer_get_identity_ (cp, &pid);
+  GSF_connected_peer_get_identity_(cp, &pid);
   if (GNUNET_YES !=
-      GSF_pending_request_test_target_ (pr, &pid))
-  {
-    GNUNET_STATISTICS_update (GSF_stats,
-                              gettext_noop ("# Loopback routes suppressed"),
-                              1,
-                              GNUNET_NO);
-    return GNUNET_YES;
-  }
-  GSF_plan_add_ (cp, pr);
+      GSF_pending_request_test_target_(pr, &pid))
+    {
+      GNUNET_STATISTICS_update(GSF_stats,
+                               gettext_noop("# Loopback routes suppressed"),
+                               1,
+                               GNUNET_NO);
+      return GNUNET_YES;
+    }
+  GSF_plan_add_(cp, pr);
   return GNUNET_YES;
 }
 
@@ -581,49 +569,49 @@ consider_peer_for_forwarding (void *cls,
  * @return our internal handle for the peer
  */
 void *
-GSF_peer_connect_handler (void *cls,
-                         const struct GNUNET_PeerIdentity *peer,
-                         struct GNUNET_MQ_Handle *mq)
+GSF_peer_connect_handler(void *cls,
+                         const struct GNUNET_PeerIdentity *peer,
+                         struct GNUNET_MQ_Handle *mq)
 {
   struct GSF_ConnectedPeer *cp;
 
   if (0 ==
-      GNUNET_memcmp (&GSF_my_id,
-                                       peer))
+      GNUNET_memcmp(&GSF_my_id,
+                    peer))
     return NULL;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Connected to peer %s\n",
-              GNUNET_i2s (peer));
-  cp = GNUNET_new (struct GSF_ConnectedPeer);
-  cp->ppd.pid = GNUNET_PEER_intern (peer);
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+             "Connected to peer %s\n",
+             GNUNET_i2s(peer));
+  cp = GNUNET_new(struct GSF_ConnectedPeer);
+  cp->ppd.pid = GNUNET_PEER_intern(peer);
   cp->ppd.peer = peer;
   cp->mq = mq;
-  cp->ppd.transmission_delay = GNUNET_LOAD_value_init (GNUNET_TIME_UNIT_ZERO);
+  cp->ppd.transmission_delay = GNUNET_LOAD_value_init(GNUNET_TIME_UNIT_ZERO);
   cp->rc =
-      GNUNET_ATS_reserve_bandwidth (GSF_ats,
-                                    peer,
-                                    DBLOCK_SIZE,
-                                    &ats_reserve_callback, cp);
-  cp->request_map = GNUNET_CONTAINER_multihashmap_create (128,
-                                                          GNUNET_YES);
-  GNUNET_break (GNUNET_OK ==
-                GNUNET_CONTAINER_multipeermap_put (cp_map,
-               GSF_connected_peer_get_identity2_ (cp),
-                                                   cp,
-                                                   GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
-  GNUNET_STATISTICS_set (GSF_stats,
-                         gettext_noop ("# peers connected"),
-                         GNUNET_CONTAINER_multipeermap_size (cp_map),
-                         GNUNET_NO);
-  cp->respect_iterate_req 
-    = GNUNET_PEERSTORE_iterate (peerstore,
-                               "fs",
-                                peer,
-                               "respect",
-                                &peer_respect_cb,
+    GNUNET_ATS_reserve_bandwidth(GSF_ats,
+                                 peer,
+                                 DBLOCK_SIZE,
+                                 &ats_reserve_callback, cp);
+  cp->request_map = GNUNET_CONTAINER_multihashmap_create(128,
+                                                         GNUNET_YES);
+  GNUNET_break(GNUNET_OK ==
+               GNUNET_CONTAINER_multipeermap_put(cp_map,
+                                                 GSF_connected_peer_get_identity2_(cp),
+                                                 cp,
+                                                 GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+  GNUNET_STATISTICS_set(GSF_stats,
+                        gettext_noop("# peers connected"),
+                        GNUNET_CONTAINER_multipeermap_size(cp_map),
+                        GNUNET_NO);
+  cp->respect_iterate_req
+    = GNUNET_PEERSTORE_iterate(peerstore,
+                               "fs",
+                               peer,
+                               "respect",
+                               &peer_respect_cb,
+                               cp);
+  GSF_iterate_pending_requests_(&consider_peer_for_forwarding,
                                 cp);
-  GSF_iterate_pending_requests_ (&consider_peer_for_forwarding,
-                                 cp);
   return cp;
 }
 
@@ -635,21 +623,21 @@ GSF_peer_connect_handler (void *cls,
  * @param cls the `struct GSF_ConnectedPeer`
  */
 static void
-revive_migration (void *cls)
+revive_migration(void *cls)
 {
   struct GSF_ConnectedPeer *cp = cls;
   struct GNUNET_TIME_Relative bt;
 
   cp->mig_revive_task = NULL;
-  bt = GNUNET_TIME_absolute_get_remaining (cp->ppd.migration_blocked_until);
+  bt = GNUNET_TIME_absolute_get_remaining(cp->ppd.migration_blocked_until);
   if (0 != bt.rel_value_us)
-  {
-    /* still time left... */
-    cp->mig_revive_task =
-        GNUNET_SCHEDULER_add_delayed (bt, &revive_migration, cp);
-    return;
-  }
-  GSF_push_start_ (cp);
+    {
+      /* still time left... */
+      cp->mig_revive_task =
+        GNUNET_SCHEDULER_add_delayed(bt, &revive_migration, cp);
+      return;
+    }
+  GSF_push_start_(cp);
 }
 
 
@@ -660,44 +648,44 @@ revive_migration (void *cls)
  * @return NULL if the peer is not currently connected
  */
 struct GSF_ConnectedPeer *
-GSF_peer_get_ (const struct GNUNET_PeerIdentity *peer)
+GSF_peer_get_(const struct GNUNET_PeerIdentity *peer)
 {
   if (NULL == cp_map)
     return NULL;
-  return GNUNET_CONTAINER_multipeermap_get (cp_map, peer);
+  return GNUNET_CONTAINER_multipeermap_get(cp_map, peer);
 }
 
 
 /**
- * Handle P2P #GNUNET_MESSAGE_TYPE_FS_MIGRATION_STOP message. 
+ * Handle P2P #GNUNET_MESSAGE_TYPE_FS_MIGRATION_STOP message.
  *
  * @param cls closure, the `struct GSF_ConnectedPeer`
  * @param msm the actual message
  */
 void
-handle_p2p_migration_stop (void *cls,
-                          const struct MigrationStopMessage *msm)
+handle_p2p_migration_stop(void *cls,
+                          const struct MigrationStopMessage *msm)
 {
   struct GSF_ConnectedPeer *cp = cls;
   struct GNUNET_TIME_Relative bt;
 
-  GNUNET_STATISTICS_update (GSF_stats,
-                            gettext_noop ("# migration stop messages received"),
-                            1, GNUNET_NO);
-  bt = GNUNET_TIME_relative_ntoh (msm->duration);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              _("Migration of content to peer `%s' blocked for %s\n"),
-              GNUNET_i2s (cp->ppd.peer),
-             GNUNET_STRINGS_relative_time_to_string (bt, GNUNET_YES));
-  cp->ppd.migration_blocked_until = GNUNET_TIME_relative_to_absolute (bt);
-  if ( (NULL == cp->mig_revive_task) &&
-       (NULL == cp->respect_iterate_req) )
-  {
-    GSF_push_stop_ (cp);
-    cp->mig_revive_task =
-        GNUNET_SCHEDULER_add_delayed (bt,
-                                      &revive_migration, cp);
-  }
+  GNUNET_STATISTICS_update(GSF_stats,
+                           gettext_noop("# migration stop messages received"),
+                           1, GNUNET_NO);
+  bt = GNUNET_TIME_relative_ntoh(msm->duration);
+  GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+             _("Migration of content to peer `%s' blocked for %s\n"),
+             GNUNET_i2s(cp->ppd.peer),
+             GNUNET_STRINGS_relative_time_to_string(bt, GNUNET_YES));
+  cp->ppd.migration_blocked_until = GNUNET_TIME_relative_to_absolute(bt);
+  if ((NULL == cp->mig_revive_task) &&
+      (NULL == cp->respect_iterate_req))
+    {
+      GSF_push_stop_(cp);
+      cp->mig_revive_task =
+        GNUNET_SCHEDULER_add_delayed(bt,
+                                     &revive_migration, cp);
+    }
 }
 
 
@@ -707,26 +695,26 @@ handle_p2p_migration_stop (void *cls,
  * @param peerreq request to free
  */
 static void
-free_pending_request (struct PeerRequest *peerreq)
+free_pending_request(struct PeerRequest *peerreq)
 {
   struct GSF_ConnectedPeer *cp = peerreq->cp;
   struct GSF_PendingRequestData *prd;
 
-  prd = GSF_pending_request_get_data_ (peerreq->pr);
+  prd = GSF_pending_request_get_data_(peerreq->pr);
   if (NULL != peerreq->kill_task)
-  {
-    GNUNET_SCHEDULER_cancel (peerreq->kill_task);
-    peerreq->kill_task = NULL;
-  }
-  GNUNET_STATISTICS_update (GSF_stats,
-                            gettext_noop ("# P2P searches active"),
-                            -1,
-                            GNUNET_NO);
-  GNUNET_break (GNUNET_YES ==
-                GNUNET_CONTAINER_multihashmap_remove (cp->request_map,
-                                                      &prd->query,
-                                                      peerreq));
-  GNUNET_free (peerreq);
+    {
+      GNUNET_SCHEDULER_cancel(peerreq->kill_task);
+      peerreq->kill_task = NULL;
+    }
+  GNUNET_STATISTICS_update(GSF_stats,
+                           gettext_noop("# P2P searches active"),
+                           -1,
+                           GNUNET_NO);
+  GNUNET_break(GNUNET_YES ==
+               GNUNET_CONTAINER_multihashmap_remove(cp->request_map,
+                                                    &prd->query,
+                                                    peerreq));
+  GNUNET_free(peerreq);
 }
 
 
@@ -739,16 +727,16 @@ free_pending_request (struct PeerRequest *peerreq)
  * @return #GNUNET_YES (continue to iterate)
  */
 static int
-cancel_pending_request (void *cls,
-                        const struct GNUNET_HashCode *query,
-                        void *value)
+cancel_pending_request(void *cls,
+                       const struct GNUNET_HashCode *query,
+                       void *value)
 {
   struct PeerRequest *peerreq = value;
   struct GSF_PendingRequest *pr = peerreq->pr;
 
-  free_pending_request (peerreq);
-  GSF_pending_request_cancel_ (pr,
-                               GNUNET_NO);
+  free_pending_request(peerreq);
+  GSF_pending_request_cancel_(pr,
+                              GNUNET_NO);
   return GNUNET_OK;
 }
 
@@ -759,17 +747,17 @@ cancel_pending_request (void *cls,
  * @param cls the request to free
  */
 static void
-peer_request_destroy (void *cls)
+peer_request_destroy(void *cls)
 {
   struct PeerRequest *peerreq = cls;
   struct GSF_PendingRequest *pr = peerreq->pr;
   struct GSF_PendingRequestData *prd;
 
   peerreq->kill_task = NULL;
-  prd = GSF_pending_request_get_data_ (pr);
-  cancel_pending_request (NULL,
-                          &prd->query,
-                          peerreq);
+  prd = GSF_pending_request_get_data_(pr);
+  cancel_pending_request(NULL,
+                         &prd->query,
+                         peerreq);
 }
 
 
@@ -779,20 +767,20 @@ peer_request_destroy (void *cls)
  * @param cls the `struct GSF_DelayedHandle` with the message
  */
 static void
-transmit_delayed_now (void *cls)
+transmit_delayed_now(void *cls)
 {
   struct GSF_DelayedHandle *dh = cls;
   struct GSF_ConnectedPeer *cp = dh->cp;
 
-  GNUNET_CONTAINER_DLL_remove (cp->delayed_head,
-                               cp->delayed_tail,
-                               dh);
+  GNUNET_CONTAINER_DLL_remove(cp->delayed_head,
+                              cp->delayed_tail,
+                              dh);
   cp->delay_queue_size--;
-  GSF_peer_transmit_ (cp,
-                     GNUNET_NO,
-                     UINT32_MAX,
-                     dh->env);
-  GNUNET_free (dh);
+  GSF_peer_transmit_(cp,
+                     GNUNET_NO,
+                     UINT32_MAX,
+                     dh->env);
+  GNUNET_free(dh);
 }
 
 
@@ -802,20 +790,20 @@ transmit_delayed_now (void *cls)
  * @return desired delay
  */
 static struct GNUNET_TIME_Relative
-get_randomized_delay ()
+get_randomized_delay()
 {
   struct GNUNET_TIME_Relative ret;
 
   ret =
-      GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
-                                     GNUNET_CRYPTO_random_u32
-                                     (GNUNET_CRYPTO_QUALITY_WEAK,
-                                      2 * GSF_avg_latency.rel_value_us + 1));
+    GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS,
+                                  GNUNET_CRYPTO_random_u32
+                                    (GNUNET_CRYPTO_QUALITY_WEAK,
+                                    2 * GSF_avg_latency.rel_value_us + 1));
 #if INSANE_STATISTICS
-  GNUNET_STATISTICS_update (GSF_stats,
-                            gettext_noop
-                            ("# artificial delays introduced (ms)"),
-                            ret.rel_value_us / 1000LL, GNUNET_NO);
+  GNUNET_STATISTICS_update(GSF_stats,
+                           gettext_noop
+                             ("# artificial delays introduced (ms)"),
+                           ret.rel_value_us / 1000LL, GNUNET_NO);
 #endif
   return ret;
 }
@@ -840,15 +828,15 @@ get_randomized_delay ()
  * @param data_len number of bytes in @a data
  */
 static void
-handle_p2p_reply (void *cls,
-                  enum GNUNET_BLOCK_EvaluationResult eval,
-                  struct GSF_PendingRequest *pr,
-                  uint32_t reply_anonymity_level,
-                  struct GNUNET_TIME_Absolute expiration,
-                  struct GNUNET_TIME_Absolute last_transmission,
-                  enum GNUNET_BLOCK_Type type,
-                  const void *data,
-                  size_t data_len)
+handle_p2p_reply(void *cls,
+                 enum GNUNET_BLOCK_EvaluationResult eval,
+                 struct GSF_PendingRequest *pr,
+                 uint32_t reply_anonymity_level,
+                 struct GNUNET_TIME_Absolute expiration,
+                 struct GNUNET_TIME_Absolute last_transmission,
+                 enum GNUNET_BLOCK_Type type,
+                 const void *data,
+                 size_t data_len)
 {
   struct PeerRequest *peerreq = cls;
   struct GSF_ConnectedPeer *cp = peerreq->cp;
@@ -857,96 +845,96 @@ handle_p2p_reply (void *cls,
   struct PutMessage *pm;
   size_t msize;
 
-  GNUNET_assert (data_len + sizeof (struct PutMessage) <
-                 GNUNET_MAX_MESSAGE_SIZE);
-  GNUNET_assert (peerreq->pr == pr);
-  prd = GSF_pending_request_get_data_ (pr);
+  GNUNET_assert(data_len + sizeof(struct PutMessage) <
+                GNUNET_MAX_MESSAGE_SIZE);
+  GNUNET_assert(peerreq->pr == pr);
+  prd = GSF_pending_request_get_data_(pr);
   if (NULL == data)
-  {
-    free_pending_request (peerreq);
-    return;
-  }
-  GNUNET_break (GNUNET_BLOCK_TYPE_ANY != type);
+    {
+      free_pending_request(peerreq);
+      return;
+    }
+  GNUNET_break(GNUNET_BLOCK_TYPE_ANY != type);
   if ((prd->type != type) && (GNUNET_BLOCK_TYPE_ANY != prd->type))
-  {
-    GNUNET_STATISTICS_update (GSF_stats,
-                             gettext_noop
-                             ("# replies dropped due to type mismatch"),
-                                1, GNUNET_NO);
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Transmitting result for query `%s' to peer\n",
-              GNUNET_h2s (&prd->query));
-  GNUNET_STATISTICS_update (GSF_stats,
-                            gettext_noop ("# replies received for other peers"),
-                            1, GNUNET_NO);
-  msize = sizeof (struct PutMessage) + data_len;
+    {
+      GNUNET_STATISTICS_update(GSF_stats,
+                               gettext_noop
+                                 ("# replies dropped due to type mismatch"),
+                               1, GNUNET_NO);
+      return;
+    }
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+             "Transmitting result for query `%s' to peer\n",
+             GNUNET_h2s(&prd->query));
+  GNUNET_STATISTICS_update(GSF_stats,
+                           gettext_noop("# replies received for other peers"),
+                           1, GNUNET_NO);
+  msize = sizeof(struct PutMessage) + data_len;
   if (msize >= GNUNET_MAX_MESSAGE_SIZE)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  if ((UINT32_MAX != reply_anonymity_level) && (reply_anonymity_level > 1))
-  {
-    if (reply_anonymity_level - 1 > GSF_cover_content_count)
     {
-      GNUNET_STATISTICS_update (GSF_stats,
-                                gettext_noop
-                                ("# replies dropped due to insufficient cover traffic"),
-                                1, GNUNET_NO);
+      GNUNET_break(0);
       return;
     }
-    GSF_cover_content_count -= (reply_anonymity_level - 1);
-  }
-
-  env = GNUNET_MQ_msg_extra (pm,
-                            data_len,
-                            GNUNET_MESSAGE_TYPE_FS_PUT);
-  pm->type = htonl (type);
-  pm->expiration = GNUNET_TIME_absolute_hton (expiration);
-  GNUNET_memcpy (&pm[1],
-                data,
-                data_len);
-  if ( (UINT32_MAX != reply_anonymity_level) &&
-       (0 != reply_anonymity_level) &&
-       (GNUNET_YES == GSF_enable_randomized_delays) )
-  {
-    struct GSF_DelayedHandle *dh;
-
-    dh = GNUNET_new (struct GSF_DelayedHandle);
-    dh->cp = cp;
-    dh->env = env;
-    dh->msize = msize;
-    GNUNET_CONTAINER_DLL_insert (cp->delayed_head,
-                                 cp->delayed_tail,
-                                 dh);
-    cp->delay_queue_size++;
-    dh->delay_task =
-        GNUNET_SCHEDULER_add_delayed (get_randomized_delay (),
-                                      &transmit_delayed_now,
-                                      dh);
-  }
+  if ((UINT32_MAX != reply_anonymity_level) && (reply_anonymity_level > 1))
+    {
+      if (reply_anonymity_level - 1 > GSF_cover_content_count)
+        {
+          GNUNET_STATISTICS_update(GSF_stats,
+                                   gettext_noop
+                                     ("# replies dropped due to insufficient cover traffic"),
+                                   1, GNUNET_NO);
+          return;
+        }
+      GSF_cover_content_count -= (reply_anonymity_level - 1);
+    }
+
+  env = GNUNET_MQ_msg_extra(pm,
+                            data_len,
+                            GNUNET_MESSAGE_TYPE_FS_PUT);
+  pm->type = htonl(type);
+  pm->expiration = GNUNET_TIME_absolute_hton(expiration);
+  GNUNET_memcpy(&pm[1],
+                data,
+                data_len);
+  if ((UINT32_MAX != reply_anonymity_level) &&
+      (0 != reply_anonymity_level) &&
+      (GNUNET_YES == GSF_enable_randomized_delays))
+    {
+      struct GSF_DelayedHandle *dh;
+
+      dh = GNUNET_new(struct GSF_DelayedHandle);
+      dh->cp = cp;
+      dh->env = env;
+      dh->msize = msize;
+      GNUNET_CONTAINER_DLL_insert(cp->delayed_head,
+                                  cp->delayed_tail,
+                                  dh);
+      cp->delay_queue_size++;
+      dh->delay_task =
+        GNUNET_SCHEDULER_add_delayed(get_randomized_delay(),
+                                     &transmit_delayed_now,
+                                     dh);
+    }
   else
-  {
-    GSF_peer_transmit_ (cp,
-                       GNUNET_NO,
-                       UINT32_MAX,
-                       env);
-  }
+    {
+      GSF_peer_transmit_(cp,
+                         GNUNET_NO,
+                         UINT32_MAX,
+                         env);
+    }
   if (GNUNET_BLOCK_EVALUATION_OK_LAST != eval)
     return;
   if (NULL == peerreq->kill_task)
-  {
-    GNUNET_STATISTICS_update (GSF_stats,
-                              gettext_noop
-                              ("# P2P searches destroyed due to ultimate reply"),
-                              1,
-                              GNUNET_NO);
-    peerreq->kill_task =
-        GNUNET_SCHEDULER_add_now (&peer_request_destroy,
-                                  peerreq);
-  }
+    {
+      GNUNET_STATISTICS_update(GSF_stats,
+                               gettext_noop
+                                 ("# P2P searches destroyed due to ultimate reply"),
+                               1,
+                               GNUNET_NO);
+      peerreq->kill_task =
+        GNUNET_SCHEDULER_add_now(&peer_request_destroy,
+                                 peerreq);
+    }
 }
 
 
@@ -959,31 +947,31 @@ handle_p2p_reply (void *cls,
  * @returns the actual change in respect (positive or negative)
  */
 static int
-change_peer_respect (struct GSF_ConnectedPeer *cp, int value)
+change_peer_respect(struct GSF_ConnectedPeer *cp, int value)
 {
   if (0 == value)
     return 0;
-  GNUNET_assert (NULL != cp);
+  GNUNET_assert(NULL != cp);
   if (value > 0)
-  {
-    if (cp->ppd.respect + value < cp->ppd.respect)
     {
-      value = UINT32_MAX - cp->ppd.respect;
-      cp->ppd.respect = UINT32_MAX;
+      if (cp->ppd.respect + value < cp->ppd.respect)
+        {
+          value = UINT32_MAX - cp->ppd.respect;
+          cp->ppd.respect = UINT32_MAX;
+        }
+      else
+        cp->ppd.respect += value;
     }
-    else
-      cp->ppd.respect += value;
-  }
   else
-  {
-    if (cp->ppd.respect < -value)
     {
-      value = -cp->ppd.respect;
-      cp->ppd.respect = 0;
+      if (cp->ppd.respect < -value)
+        {
+          value = -cp->ppd.respect;
+          cp->ppd.respect = 0;
+        }
+      else
+        cp->ppd.respect += value;
     }
-    else
-      cp->ppd.respect += value;
-  }
   return value;
 }
 
@@ -997,58 +985,58 @@ change_peer_respect (struct GSF_ConnectedPeer *cp, int value)
  * @return effective priority
  */
 static int32_t
-bound_priority (uint32_t prio_in,
-                struct GSF_ConnectedPeer *cp)
+bound_priority(uint32_t prio_in,
+               struct GSF_ConnectedPeer *cp)
 {
 #define N ((double)128.0)
   uint32_t ret;
   double rret;
   int ld;
 
-  ld = GSF_test_get_load_too_high_ (0);
+  ld = GSF_test_get_load_too_high_(0);
   if (GNUNET_SYSERR == ld)
-  {
+    {
 #if INSANE_STATISTICS
-    GNUNET_STATISTICS_update (GSF_stats,
-                              gettext_noop
-                              ("# requests done for free (low load)"), 1,
-                              GNUNET_NO);
+      GNUNET_STATISTICS_update(GSF_stats,
+                               gettext_noop
+                                 ("# requests done for free (low load)"), 1,
+                               GNUNET_NO);
 #endif
-    return 0;                   /* excess resources */
-  }
+      return 0;                 /* excess resources */
+    }
   if (prio_in > INT32_MAX)
     prio_in = INT32_MAX;
-  ret = -change_peer_respect (cp, -(int) prio_in);
+  ret = -change_peer_respect(cp, -(int)prio_in);
   if (ret > 0)
-  {
-    if (ret > GSF_current_priorities + N)
-      rret = GSF_current_priorities + N;
-    else
-      rret = ret;
-    GSF_current_priorities = (GSF_current_priorities * (N - 1) + rret) / N;
-  }
+    {
+      if (ret > GSF_current_priorities + N)
+        rret = GSF_current_priorities + N;
+      else
+        rret = ret;
+      GSF_current_priorities = (GSF_current_priorities * (N - 1) + rret) / N;
+    }
   if ((GNUNET_YES == ld) && (ret > 0))
-  {
-    /* try with charging */
-    ld = GSF_test_get_load_too_high_ (ret);
-  }
+    {
+      /* try with charging */
+      ld = GSF_test_get_load_too_high_(ret);
+    }
   if (GNUNET_YES == ld)
-  {
-    GNUNET_STATISTICS_update (GSF_stats,
-                              gettext_noop
-                              ("# request dropped, priority insufficient"), 1,
-                              GNUNET_NO);
-    /* undo charge */
-    change_peer_respect (cp, (int) ret);
-    return -1;                  /* not enough resources */
-  }
+    {
+      GNUNET_STATISTICS_update(GSF_stats,
+                               gettext_noop
+                                 ("# request dropped, priority insufficient"), 1,
+                               GNUNET_NO);
+      /* undo charge */
+      change_peer_respect(cp, (int)ret);
+      return -1;                /* not enough resources */
+    }
   else
-  {
-    GNUNET_STATISTICS_update (GSF_stats,
-                              gettext_noop
-                              ("# requests done for a price (normal load)"), 1,
-                              GNUNET_NO);
-  }
+    {
+      GNUNET_STATISTICS_update(GSF_stats,
+                               gettext_noop
+                                 ("# requests done for a price (normal load)"), 1,
+                               GNUNET_NO);
+    }
 #undef N
   return ret;
 }
@@ -1064,20 +1052,20 @@ bound_priority (uint32_t prio_in,
  *         otherwise the ttl-limit for the given @a prio
  */
 static int32_t
-bound_ttl (int32_t ttl_in,
-           uint32_t prio)
+bound_ttl(int32_t ttl_in,
+          uint32_t prio)
 {
   unsigned long long allowed;
 
   if (ttl_in <= 0)
     return ttl_in;
-  allowed = ((unsigned long long) prio) * TTL_DECREMENT / 1000;
+  allowed = ((unsigned long long)prio) * TTL_DECREMENT / 1000;
   if (ttl_in > allowed)
-  {
-    if (allowed >= (1 << 30))
-      return 1 << 30;
-    return allowed;
-  }
+    {
+      if (allowed >= (1 << 30))
+        return 1 << 30;
+      return allowed;
+    }
   return ttl_in;
 }
 
@@ -1085,9 +1073,7 @@ bound_ttl (int32_t ttl_in,
 /**
  * Closure for #test_exist_cb().
  */
-struct TestExistClosure
-{
-
+struct TestExistClosure {
   /**
    * Priority of the incoming request.
    */
@@ -1107,7 +1093,6 @@ struct TestExistClosure
    * Set to #GNUNET_YES if we are done handling the query.
    */
   int finished;
-
 };
 
 
@@ -1122,9 +1107,9 @@ struct TestExistClosure
  *         #GNUNET_NO if we successfully merged
  */
 static int
-test_exist_cb (void *cls,
-               const struct GNUNET_HashCode *hc,
-               void *value)
+test_exist_cb(void *cls,
+              const struct GNUNET_HashCode *hc,
+              void *value)
 {
   struct TestExistClosure *tec = cls;
   struct PeerRequest *peerreq = value;
@@ -1132,28 +1117,28 @@ test_exist_cb (void *cls,
   struct GSF_PendingRequestData *prd;
 
   pr = peerreq->pr;
-  prd = GSF_pending_request_get_data_ (pr);
+  prd = GSF_pending_request_get_data_(pr);
   if (prd->type != tec->type)
     return GNUNET_YES;
   if (prd->ttl.abs_value_us >=
-      GNUNET_TIME_absolute_get ().abs_value_us + tec->ttl * 1000LL)
-  {
-    /* existing request has higher TTL, drop new one! */
-    prd->priority += tec->priority;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Have existing request with higher TTL, dropping new request.\n");
-    GNUNET_STATISTICS_update (GSF_stats,
-                              gettext_noop
-                              ("# requests dropped due to higher-TTL request"),
-                              1, GNUNET_NO);
-    tec->finished = GNUNET_YES;
-    return GNUNET_NO;
-  }
+      GNUNET_TIME_absolute_get().abs_value_us + tec->ttl * 1000LL)
+    {
+      /* existing request has higher TTL, drop new one! */
+      prd->priority += tec->priority;
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+                 "Have existing request with higher TTL, dropping new request.\n");
+      GNUNET_STATISTICS_update(GSF_stats,
+                               gettext_noop
+                                 ("# requests dropped due to higher-TTL request"),
+                               1, GNUNET_NO);
+      tec->finished = GNUNET_YES;
+      return GNUNET_NO;
+    }
   /* existing request has lower TTL, drop old one! */
   tec->priority += prd->priority;
-  free_pending_request (peerreq);
-  GSF_pending_request_cancel_ (pr,
-                               GNUNET_YES);
+  free_pending_request(peerreq);
+  GSF_pending_request_cancel_(pr,
+                              GNUNET_YES);
   return GNUNET_NO;
 }
 
@@ -1168,8 +1153,8 @@ test_exist_cb (void *cls,
  * @param gm the GET message
  */
 void
-handle_p2p_get (void *cls,
-               const struct GetMessage *gm)
+handle_p2p_get(void *cls,
+               const struct GetMessage *gm)
 {
   struct GSF_ConnectedPeer *cps = cls;
   struct PeerRequest *peerreq;
@@ -1187,167 +1172,167 @@ handle_p2p_get (void *cls,
   GNUNET_PEER_Id spid;
   const struct GSF_PendingRequestData *prd;
 
-  msize = ntohs (gm->header.size);
-  tec.type = ntohl (gm->type);
-  bm = ntohl (gm->hash_bitmap);
+  msize = ntohs(gm->header.size);
+  tec.type = ntohl(gm->type);
+  bm = ntohl(gm->hash_bitmap);
   bits = 0;
   while (bm > 0)
-  {
-    if (1 == (bm & 1))
-      bits++;
-    bm >>= 1;
-  }
-  opt = (const struct GNUNET_PeerIdentity *) &gm[1];
-  bfsize = msize - sizeof (struct GetMessage) - bits * sizeof (struct GNUNET_PeerIdentity);
-  GNUNET_STATISTICS_update (GSF_stats,
-                            gettext_noop
-                            ("# GET requests received (from other peers)"),
-                            1,
-                            GNUNET_NO);
+    {
+      if (1 == (bm & 1))
+        bits++;
+      bm >>= 1;
+    }
+  opt = (const struct GNUNET_PeerIdentity *)&gm[1];
+  bfsize = msize - sizeof(struct GetMessage) - bits * sizeof(struct GNUNET_PeerIdentity);
+  GNUNET_STATISTICS_update(GSF_stats,
+                           gettext_noop
+                             ("# GET requests received (from other peers)"),
+                           1,
+                           GNUNET_NO);
   GSF_cover_query_count++;
-  bm = ntohl (gm->hash_bitmap);
+  bm = ntohl(gm->hash_bitmap);
   bits = 0;
   if (0 != (bm & GET_MESSAGE_BIT_RETURN_TO))
-    cp = GSF_peer_get_ (&opt[bits++]);
+    cp = GSF_peer_get_(&opt[bits++]);
   else
     cp = cps;
   if (NULL == cp)
-  {
-    if (0 != (bm & GET_MESSAGE_BIT_RETURN_TO))
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Failed to find RETURN-TO peer `%s' in connection set. Dropping query.\n",
-                  GNUNET_i2s (&opt[bits - 1]));
-
-    else
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Failed to find peer `%s' in connection set. Dropping query.\n",
-                  GNUNET_i2s (cps->ppd.peer));
-    GNUNET_STATISTICS_update (GSF_stats,
-                              gettext_noop
-                              ("# requests dropped due to missing reverse route"),
-                              1,
-                              GNUNET_NO);
-    return;
-  }
-  unsigned int queue_size = GNUNET_MQ_get_length (cp->mq);
+    {
+      if (0 != (bm & GET_MESSAGE_BIT_RETURN_TO))
+        GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+                   "Failed to find RETURN-TO peer `%s' in connection set. Dropping query.\n",
+                   GNUNET_i2s(&opt[bits - 1]));
+
+      else
+        GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+                   "Failed to find peer `%s' in connection set. Dropping query.\n",
+                   GNUNET_i2s(cps->ppd.peer));
+      GNUNET_STATISTICS_update(GSF_stats,
+                               gettext_noop
+                                 ("# requests dropped due to missing reverse route"),
+                               1,
+                               GNUNET_NO);
+      return;
+    }
+  unsigned int queue_size = GNUNET_MQ_get_length(cp->mq);
   queue_size += cp->ppd.pending_replies + cp->delay_queue_size;
   if (queue_size > MAX_QUEUE_PER_PEER)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Peer `%s' has too many replies queued already. Dropping query.\n",
-                GNUNET_i2s (cps->ppd.peer));
-    GNUNET_STATISTICS_update (GSF_stats,
-                              gettext_noop ("# requests dropped due to full reply queue"),
-                              1,
-                              GNUNET_NO);
-    return;
-  }
+    {
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+                 "Peer `%s' has too many replies queued already. Dropping query.\n",
+                 GNUNET_i2s(cps->ppd.peer));
+      GNUNET_STATISTICS_update(GSF_stats,
+                               gettext_noop("# requests dropped due to full reply queue"),
+                               1,
+                               GNUNET_NO);
+      return;
+    }
   /* note that we can really only check load here since otherwise
    * peers could find out that we are overloaded by not being
    * disconnected after sending us a malformed query... */
-  tec.priority = bound_priority (ntohl (gm->priority),
-                                 cps);
+  tec.priority = bound_priority(ntohl(gm->priority),
+                                cps);
   if (tec.priority < 0)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Dropping query from `%s', this peer is too busy.\n",
-                GNUNET_i2s (cps->ppd.peer));
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received request for `%s' of type %u from peer `%s' with flags %u\n",
-              GNUNET_h2s (&gm->query),
-              (unsigned int) tec.type,
-              GNUNET_i2s (cps->ppd.peer),
-              (unsigned int) bm);
+    {
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+                 "Dropping query from `%s', this peer is too busy.\n",
+                 GNUNET_i2s(cps->ppd.peer));
+      return;
+    }
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+             "Received request for `%s' of type %u from peer `%s' with flags %u\n",
+             GNUNET_h2s(&gm->query),
+             (unsigned int)tec.type,
+             GNUNET_i2s(cps->ppd.peer),
+             (unsigned int)bm);
   target =
-      (0 !=
-       (bm & GET_MESSAGE_BIT_TRANSMIT_TO)) ? (&opt[bits++]) : NULL;
+    (0 !=
+     (bm & GET_MESSAGE_BIT_TRANSMIT_TO)) ? (&opt[bits++]) : NULL;
   options = GSF_PRO_DEFAULTS;
   spid = 0;
-  if ((GNUNET_LOAD_get_load (cp->ppd.transmission_delay) > 3 * (1 + tec.priority))
-      || (GNUNET_LOAD_get_average (cp->ppd.transmission_delay) >
+  if ((GNUNET_LOAD_get_load(cp->ppd.transmission_delay) > 3 * (1 + tec.priority))
+      || (GNUNET_LOAD_get_average(cp->ppd.transmission_delay) >
           GNUNET_CONSTANTS_MAX_CORK_DELAY.rel_value_us * 2 +
-          GNUNET_LOAD_get_average (GSF_rt_entry_lifetime)))
-  {
-    /* don't have BW to send to peer, or would likely take longer than we have for it,
-     * so at best indirect the query */
-    tec.priority = 0;
-    options |= GSF_PRO_FORWARD_ONLY;
-    spid = GNUNET_PEER_intern (cps->ppd.peer);
-    GNUNET_assert (0 != spid);
-  }
-  tec.ttl = bound_ttl (ntohl (gm->ttl),
-                       tec.priority);
+          GNUNET_LOAD_get_average(GSF_rt_entry_lifetime)))
+    {
+      /* don't have BW to send to peer, or would likely take longer than we have for it,
+       * so at best indirect the query */
+      tec.priority = 0;
+      options |= GSF_PRO_FORWARD_ONLY;
+      spid = GNUNET_PEER_intern(cps->ppd.peer);
+      GNUNET_assert(0 != spid);
+    }
+  tec.ttl = bound_ttl(ntohl(gm->ttl),
+                      tec.priority);
   /* decrement ttl (always) */
   ttl_decrement =
-      2 * TTL_DECREMENT + GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
-                                                    TTL_DECREMENT);
-  if ( (tec.ttl < 0) &&
-       (((int32_t) (tec.ttl - ttl_decrement)) > 0) )
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Dropping query from `%s' due to TTL underflow (%d - %u).\n",
-                GNUNET_i2s (cps->ppd.peer),
-                tec.ttl,
-                ttl_decrement);
-    GNUNET_STATISTICS_update (GSF_stats,
-                              gettext_noop
-                              ("# requests dropped due TTL underflow"), 1,
-                              GNUNET_NO);
-    /* integer underflow => drop (should be very rare)! */
-    return;
-  }
+    2 * TTL_DECREMENT + GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK,
+                                                 TTL_DECREMENT);
+  if ((tec.ttl < 0) &&
+      (((int32_t)(tec.ttl - ttl_decrement)) > 0))
+    {
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+                 "Dropping query from `%s' due to TTL underflow (%d - %u).\n",
+                 GNUNET_i2s(cps->ppd.peer),
+                 tec.ttl,
+                 ttl_decrement);
+      GNUNET_STATISTICS_update(GSF_stats,
+                               gettext_noop
+                                 ("# requests dropped due TTL underflow"), 1,
+                               GNUNET_NO);
+      /* integer underflow => drop (should be very rare)! */
+      return;
+    }
   tec.ttl -= ttl_decrement;
 
   /* test if the request already exists */
   tec.finished = GNUNET_NO;
-  GNUNET_CONTAINER_multihashmap_get_multiple (cp->request_map,
-                                              &gm->query,
-                                              &test_exist_cb,
-                                              &tec);
+  GNUNET_CONTAINER_multihashmap_get_multiple(cp->request_map,
+                                             &gm->query,
+                                             &test_exist_cb,
+                                             &tec);
   if (GNUNET_YES == tec.finished)
     return; /* merged into existing request, we're done */
 
-  peerreq = GNUNET_new (struct PeerRequest);
+  peerreq = GNUNET_new(struct PeerRequest);
   peerreq->cp = cp;
-  pr = GSF_pending_request_create_ (options,
-                                    tec.type,
-                                    &gm->query,
-                                    target,
-                                    (bfsize > 0)
-                                    ? (const char *) &opt[bits]
-                                    : NULL,
-                                    bfsize,
-                                    ntohl (gm->filter_mutator),
-                                    1 /* anonymity */,
-                                    (uint32_t) tec.priority,
-                                    tec.ttl,
-                                    spid,
-                                    GNUNET_PEER_intern (cps->ppd.peer),
-                                    NULL, 0,        /* replies_seen */
-                                    &handle_p2p_reply,
-                                    peerreq);
-  GNUNET_assert (NULL != pr);
-  prd = GSF_pending_request_get_data_ (pr);
+  pr = GSF_pending_request_create_(options,
+                                   tec.type,
+                                   &gm->query,
+                                   target,
+                                   (bfsize > 0)
+                                   ? (const char *)&opt[bits]
+                                   : NULL,
+                                   bfsize,
+                                   ntohl(gm->filter_mutator),
+                                   1 /* anonymity */,
+                                   (uint32_t)tec.priority,
+                                   tec.ttl,
+                                   spid,
+                                   GNUNET_PEER_intern(cps->ppd.peer),
+                                   NULL, 0,         /* replies_seen */
+                                   &handle_p2p_reply,
+                                   peerreq);
+  GNUNET_assert(NULL != pr);
+  prd = GSF_pending_request_get_data_(pr);
   peerreq->pr = pr;
-  GNUNET_break (GNUNET_OK ==
-                GNUNET_CONTAINER_multihashmap_put (cp->request_map,
-                                                   &prd->query,
-                                                   peerreq,
-                                                   GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
-  GNUNET_STATISTICS_update (GSF_stats,
-                            gettext_noop ("# P2P query messages received and processed"),
-                            1,
-                            GNUNET_NO);
-  GNUNET_STATISTICS_update (GSF_stats,
-                            gettext_noop ("# P2P searches active"),
-                            1,
-                            GNUNET_NO);
-  GSF_pending_request_get_data_ (pr)->has_started = GNUNET_YES;
-  GSF_local_lookup_ (pr,
-                     &GSF_consider_forwarding,
-                     NULL);
+  GNUNET_break(GNUNET_OK ==
+               GNUNET_CONTAINER_multihashmap_put(cp->request_map,
+                                                 &prd->query,
+                                                 peerreq,
+                                                 GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
+  GNUNET_STATISTICS_update(GSF_stats,
+                           gettext_noop("# P2P query messages received and processed"),
+                           1,
+                           GNUNET_NO);
+  GNUNET_STATISTICS_update(GSF_stats,
+                           gettext_noop("# P2P searches active"),
+                           1,
+                           GNUNET_NO);
+  GSF_pending_request_get_data_(pr)->has_started = GNUNET_YES;
+  GSF_local_lookup_(pr,
+                    &GSF_consider_forwarding,
+                    NULL);
 }
 
 
@@ -1359,22 +1344,22 @@ handle_p2p_get (void *cls,
  * @param cp target peer
  * @param is_query is this a query (#GNUNET_YES) or content (#GNUNET_NO) or neither (#GNUNET_SYSERR)
  * @param priority how important is this request?
- * @param timeout when does this request timeout 
+ * @param timeout when does this request timeout
  * @param size number of bytes we would like to send to the peer
  * @param env message to send
  */
 void
-GSF_peer_transmit_ (struct GSF_ConnectedPeer *cp,
-                    int is_query,
-                    uint32_t priority,
-                    struct GNUNET_MQ_Envelope *env)
+GSF_peer_transmit_(struct GSF_ConnectedPeer *cp,
+                   int is_query,
+                   uint32_t priority,
+                   struct GNUNET_MQ_Envelope *env)
 {
   struct GSF_PeerTransmitHandle *pth;
   struct GSF_PeerTransmitHandle *pos;
   struct GSF_PeerTransmitHandle *prev;
 
-  pth = GNUNET_new (struct GSF_PeerTransmitHandle);
-  pth->transmission_request_start_time = GNUNET_TIME_absolute_get ();
+  pth = GNUNET_new(struct GSF_PeerTransmitHandle);
+  pth->transmission_request_start_time = GNUNET_TIME_absolute_get();
   pth->env = env;
   pth->is_query = is_query;
   pth->priority = priority;
@@ -1383,19 +1368,19 @@ GSF_peer_transmit_ (struct GSF_ConnectedPeer *cp,
   prev = NULL;
   pos = cp->pth_head;
   while ((NULL != pos) && (pos->priority > priority))
-  {
-    prev = pos;
-    pos = pos->next;
-  }
-  GNUNET_CONTAINER_DLL_insert_after (cp->pth_head,
-                                     cp->pth_tail,
-                                     prev,
-                                     pth);
+    {
+      prev = pos;
+      pos = pos->next;
+    }
+  GNUNET_CONTAINER_DLL_insert_after(cp->pth_head,
+                                    cp->pth_tail,
+                                    prev,
+                                    pth);
   if (GNUNET_YES == is_query)
     cp->ppd.pending_queries++;
   else if (GNUNET_NO == is_query)
     cp->ppd.pending_replies++;
-  schedule_transmission (pth);
+  schedule_transmission(pth);
 }
 
 
@@ -1407,19 +1392,19 @@ GSF_peer_transmit_ (struct GSF_ConnectedPeer *cp,
  * @param request_priority priority of the original request
  */
 void
-GSF_peer_update_performance_ (struct GSF_ConnectedPeer *cp,
-                              struct GNUNET_TIME_Absolute request_time,
-                              uint32_t request_priority)
+GSF_peer_update_performance_(struct GSF_ConnectedPeer *cp,
+                             struct GNUNET_TIME_Absolute request_time,
+                             uint32_t request_priority)
 {
   struct GNUNET_TIME_Relative delay;
 
-  delay = GNUNET_TIME_absolute_get_duration (request_time);
+  delay = GNUNET_TIME_absolute_get_duration(request_time);
   cp->ppd.avg_reply_delay.rel_value_us =
-      (cp->ppd.avg_reply_delay.rel_value_us * (RUNAVG_DELAY_N - 1) +
-       delay.rel_value_us) / RUNAVG_DELAY_N;
+    (cp->ppd.avg_reply_delay.rel_value_us * (RUNAVG_DELAY_N - 1) +
+     delay.rel_value_us) / RUNAVG_DELAY_N;
   cp->ppd.avg_priority =
-      (cp->ppd.avg_priority * (RUNAVG_DELAY_N - 1) +
-       request_priority) / RUNAVG_DELAY_N;
+    (cp->ppd.avg_priority * (RUNAVG_DELAY_N - 1) +
+     request_priority) / RUNAVG_DELAY_N;
 }
 
 
@@ -1431,8 +1416,8 @@ GSF_peer_update_performance_ (struct GSF_ConnectedPeer *cp,
  * @param initiator_client local client on responsible for query
  */
 void
-GSF_peer_update_responder_client_ (struct GSF_ConnectedPeer *cp,
-                                   struct GSF_LocalClient *initiator_client)
+GSF_peer_update_responder_client_(struct GSF_ConnectedPeer *cp,
+                                  struct GSF_LocalClient *initiator_client)
 {
   cp->ppd.last_client_replies[cp->last_client_replies_woff++ %
                               CS2P_SUCCESS_LIST_SIZE] = initiator_client;
@@ -1447,15 +1432,15 @@ GSF_peer_update_responder_client_ (struct GSF_ConnectedPeer *cp,
  * @param initiator_peer other peer responsible for query
  */
 void
-GSF_peer_update_responder_peer_ (struct GSF_ConnectedPeer *cp,
-                                 const struct GSF_ConnectedPeer *initiator_peer)
+GSF_peer_update_responder_peer_(struct GSF_ConnectedPeer *cp,
+                                const struct GSF_ConnectedPeer *initiator_peer)
 {
   unsigned int woff;
 
   woff = cp->last_p2p_replies_woff % P2P_SUCCESS_LIST_SIZE;
-  GNUNET_PEER_change_rc (cp->ppd.last_p2p_replies[woff], -1);
+  GNUNET_PEER_change_rc(cp->ppd.last_p2p_replies[woff], -1);
   cp->ppd.last_p2p_replies[woff] = initiator_peer->ppd.pid;
-  GNUNET_PEER_change_rc (initiator_peer->ppd.pid, 1);
+  GNUNET_PEER_change_rc(initiator_peer->ppd.pid, 1);
   cp->last_p2p_replies_woff = (woff + 1) % P2P_SUCCESS_LIST_SIZE;
 }
 
@@ -1469,23 +1454,23 @@ GSF_peer_update_responder_peer_ (struct GSF_ConnectedPeer *cp,
  * @return #GNUNET_OK to continue iteration
  */
 static int
-flush_respect (void *cls,
-               const struct GNUNET_PeerIdentity *key,
-               void *value)
+flush_respect(void *cls,
+              const struct GNUNET_PeerIdentity *key,
+              void *value)
 {
   struct GSF_ConnectedPeer *cp = value;
   struct GNUNET_PeerIdentity pid;
 
   if (cp->ppd.respect == cp->disk_respect)
     return GNUNET_OK;           /* unchanged */
-  GNUNET_assert (0 != cp->ppd.pid);
-  GNUNET_PEER_resolve (cp->ppd.pid, &pid);
-  GNUNET_PEERSTORE_store (peerstore, "fs", &pid, "respect", &cp->ppd.respect,
-                          sizeof (cp->ppd.respect),
-                          GNUNET_TIME_UNIT_FOREVER_ABS,
-                          GNUNET_PEERSTORE_STOREOPTION_REPLACE,
-                         NULL,
-                         NULL);
+  GNUNET_assert(0 != cp->ppd.pid);
+  GNUNET_PEER_resolve(cp->ppd.pid, &pid);
+  GNUNET_PEERSTORE_store(peerstore, "fs", &pid, "respect", &cp->ppd.respect,
+                         sizeof(cp->ppd.respect),
+                         GNUNET_TIME_UNIT_FOREVER_ABS,
+                         GNUNET_PEERSTORE_STOREOPTION_REPLACE,
+                         NULL,
+                         NULL);
   return GNUNET_OK;
 }
 
@@ -1499,9 +1484,9 @@ flush_respect (void *cls,
  * @param internal_cls the corresponding `struct GSF_ConnectedPeer`
  */
 void
-GSF_peer_disconnect_handler (void *cls,
-                            const struct GNUNET_PeerIdentity *peer,
-                            void *internal_cls)
+GSF_peer_disconnect_handler(void *cls,
+                            const struct GNUNET_PeerIdentity *peer,
+                            void *internal_cls)
 {
   struct GSF_ConnectedPeer *cp = internal_cls;
   struct GSF_PeerTransmitHandle *pth;
@@ -1509,84 +1494,83 @@ GSF_peer_disconnect_handler (void *cls,
 
   if (NULL == cp)
     return;  /* must have been disconnect from core with
-             * 'peer' == my_id, ignore */
-  flush_respect (NULL,
-                peer,
-                cp);
-  GNUNET_assert (GNUNET_YES ==
-                 GNUNET_CONTAINER_multipeermap_remove (cp_map,
-                                                       peer,
-                                                      cp));
-  GNUNET_STATISTICS_set (GSF_stats,
-                        gettext_noop ("# peers connected"),
-                         GNUNET_CONTAINER_multipeermap_size (cp_map),
-                         GNUNET_NO);
+              * 'peer' == my_id, ignore */
+  flush_respect(NULL,
+                peer,
+                cp);
+  GNUNET_assert(GNUNET_YES ==
+                GNUNET_CONTAINER_multipeermap_remove(cp_map,
+                                                     peer,
+                                                     cp));
+  GNUNET_STATISTICS_set(GSF_stats,
+                        gettext_noop("# peers connected"),
+                        GNUNET_CONTAINER_multipeermap_size(cp_map),
+                        GNUNET_NO);
   if (NULL != cp->respect_iterate_req)
-  {
-    GNUNET_PEERSTORE_iterate_cancel (cp->respect_iterate_req);
-    cp->respect_iterate_req = NULL;
-  }
+    {
+      GNUNET_PEERSTORE_iterate_cancel(cp->respect_iterate_req);
+      cp->respect_iterate_req = NULL;
+    }
   if (NULL != cp->rc)
-  {
-    GNUNET_ATS_reserve_bandwidth_cancel (cp->rc);
-    cp->rc = NULL;
-  }
+    {
+      GNUNET_ATS_reserve_bandwidth_cancel(cp->rc);
+      cp->rc = NULL;
+    }
   if (NULL != cp->rc_delay_task)
-  {
-    GNUNET_SCHEDULER_cancel (cp->rc_delay_task);
-    cp->rc_delay_task = NULL;
-  }
-  GNUNET_CONTAINER_multihashmap_iterate (cp->request_map,
-                                         &cancel_pending_request,
-                                         cp);
-  GNUNET_CONTAINER_multihashmap_destroy (cp->request_map);
+    {
+      GNUNET_SCHEDULER_cancel(cp->rc_delay_task);
+      cp->rc_delay_task = NULL;
+    }
+  GNUNET_CONTAINER_multihashmap_iterate(cp->request_map,
+                                        &cancel_pending_request,
+                                        cp);
+  GNUNET_CONTAINER_multihashmap_destroy(cp->request_map);
   cp->request_map = NULL;
-  GSF_plan_notify_peer_disconnect_ (cp);
-  GNUNET_LOAD_value_free (cp->ppd.transmission_delay);
-  GNUNET_PEER_decrement_rcs (cp->ppd.last_p2p_replies,
-                             P2P_SUCCESS_LIST_SIZE);
-  memset (cp->ppd.last_p2p_replies,
-          0,
-          sizeof (cp->ppd.last_p2p_replies));
-  GSF_push_stop_ (cp);
+  GSF_plan_notify_peer_disconnect_(cp);
+  GNUNET_LOAD_value_free(cp->ppd.transmission_delay);
+  GNUNET_PEER_decrement_rcs(cp->ppd.last_p2p_replies,
+                            P2P_SUCCESS_LIST_SIZE);
+  memset(cp->ppd.last_p2p_replies,
+         0,
+         sizeof(cp->ppd.last_p2p_replies));
+  GSF_push_stop_(cp);
   while (NULL != (pth = cp->pth_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (cp->pth_head,
-                                 cp->pth_tail,
-                                 pth);
-    if (GNUNET_YES == pth->is_query)
-      GNUNET_assert (0 < cp->ppd.pending_queries--);
-    else if (GNUNET_NO == pth->is_query)
-      GNUNET_assert (0 < cp->ppd.pending_replies--);
-    GNUNET_free (pth);
-  }
+    {
+      GNUNET_CONTAINER_DLL_remove(cp->pth_head,
+                                  cp->pth_tail,
+                                  pth);
+      if (GNUNET_YES == pth->is_query)
+        GNUNET_assert(0 < cp->ppd.pending_queries--);
+      else if (GNUNET_NO == pth->is_query)
+        GNUNET_assert(0 < cp->ppd.pending_replies--);
+      GNUNET_free(pth);
+    }
   while (NULL != (dh = cp->delayed_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (cp->delayed_head,
-                                 cp->delayed_tail,
-                                 dh);
-    GNUNET_MQ_discard (dh->env);
-    cp->delay_queue_size--;
-    GNUNET_SCHEDULER_cancel (dh->delay_task);
-    GNUNET_free (dh);
-  }
-  GNUNET_PEER_change_rc (cp->ppd.pid, -1);
+    {
+      GNUNET_CONTAINER_DLL_remove(cp->delayed_head,
+                                  cp->delayed_tail,
+                                  dh);
+      GNUNET_MQ_discard(dh->env);
+      cp->delay_queue_size--;
+      GNUNET_SCHEDULER_cancel(dh->delay_task);
+      GNUNET_free(dh);
+    }
+  GNUNET_PEER_change_rc(cp->ppd.pid, -1);
   if (NULL != cp->mig_revive_task)
-  {
-    GNUNET_SCHEDULER_cancel (cp->mig_revive_task);
-    cp->mig_revive_task = NULL;
-  }
-  GNUNET_break (0 == cp->ppd.pending_queries);
-  GNUNET_break (0 == cp->ppd.pending_replies);
-  GNUNET_free (cp);
+    {
+      GNUNET_SCHEDULER_cancel(cp->mig_revive_task);
+      cp->mig_revive_task = NULL;
+    }
+  GNUNET_break(0 == cp->ppd.pending_queries);
+  GNUNET_break(0 == cp->ppd.pending_replies);
+  GNUNET_free(cp);
 }
 
 
 /**
  * Closure for #call_iterator().
  */
-struct IterationContext
-{
+struct IterationContext {
   /**
    * Function to call on each entry.
    */
@@ -1608,16 +1592,16 @@ struct IterationContext
  * @return #GNUNET_YES to continue iteration
  */
 static int
-call_iterator (void *cls,
-               const struct GNUNET_PeerIdentity *key,
-               void *value)
+call_iterator(void *cls,
+              const struct GNUNET_PeerIdentity *key,
+              void *value)
 {
   struct IterationContext *ic = cls;
   struct GSF_ConnectedPeer *cp = value;
 
-  ic->it (ic->it_cls,
-          key, cp,
-          &cp->ppd);
+  ic->it(ic->it_cls,
+         key, cp,
+         &cp->ppd);
   return GNUNET_YES;
 }
 
@@ -1629,16 +1613,16 @@ call_iterator (void *cls,
  * @param it_cls closure for @a it
  */
 void
-GSF_iterate_connected_peers_ (GSF_ConnectedPeerIterator it,
-                              void *it_cls)
+GSF_iterate_connected_peers_(GSF_ConnectedPeerIterator it,
+                             void *it_cls)
 {
   struct IterationContext ic;
 
   ic.it = it;
   ic.it_cls = it_cls;
-  GNUNET_CONTAINER_multipeermap_iterate (cp_map,
-                                         &call_iterator,
-                                         &ic);
+  GNUNET_CONTAINER_multipeermap_iterate(cp_map,
+                                        &call_iterator,
+                                        &ic);
 }
 
 
@@ -1649,11 +1633,11 @@ GSF_iterate_connected_peers_ (GSF_ConnectedPeerIterator it,
  * @param id identity to set (written to)
  */
 void
-GSF_connected_peer_get_identity_ (const struct GSF_ConnectedPeer *cp,
-                                  struct GNUNET_PeerIdentity *id)
+GSF_connected_peer_get_identity_(const struct GSF_ConnectedPeer *cp,
+                                 struct GNUNET_PeerIdentity *id)
 {
-  GNUNET_assert (0 != cp->ppd.pid);
-  GNUNET_PEER_resolve (cp->ppd.pid, id);
+  GNUNET_assert(0 != cp->ppd.pid);
+  GNUNET_PEER_resolve(cp->ppd.pid, id);
 }
 
 
@@ -1664,10 +1648,10 @@ GSF_connected_peer_get_identity_ (const struct GSF_ConnectedPeer *cp,
  * @return reference to peer identity, valid until peer disconnects (!)
  */
 const struct GNUNET_PeerIdentity *
-GSF_connected_peer_get_identity2_ (const struct GSF_ConnectedPeer *cp)
+GSF_connected_peer_get_identity2_(const struct GSF_ConnectedPeer *cp)
 {
-  GNUNET_assert (0 != cp->ppd.pid);
-  return GNUNET_PEER_resolve2 (cp->ppd.pid);
+  GNUNET_assert(0 != cp->ppd.pid);
+  return GNUNET_PEER_resolve2(cp->ppd.pid);
 }
 
 
@@ -1679,38 +1663,38 @@ GSF_connected_peer_get_identity2_ (const struct GSF_ConnectedPeer *cp)
  * @param block_time until when to block
  */
 void
-GSF_block_peer_migration_ (struct GSF_ConnectedPeer *cp,
-                           struct GNUNET_TIME_Absolute block_time)
+GSF_block_peer_migration_(struct GSF_ConnectedPeer *cp,
+                          struct GNUNET_TIME_Absolute block_time)
 {
   struct GNUNET_MQ_Envelope *env;
   struct MigrationStopMessage *msm;
-  
+
   if (cp->last_migration_block.abs_value_us > block_time.abs_value_us)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Migration already blocked for another %s\n",
-                GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_remaining
-                                                       (cp->last_migration_block), GNUNET_YES));
-    return;                     /* already blocked */
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Asking to stop migration for %s\n",
-              GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_remaining (block_time),
-                                                     GNUNET_YES));
+    {
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+                 "Migration already blocked for another %s\n",
+                 GNUNET_STRINGS_relative_time_to_string(GNUNET_TIME_absolute_get_remaining
+                                                          (cp->last_migration_block), GNUNET_YES));
+      return;                   /* already blocked */
+    }
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Asking to stop migration for %s\n",
+             GNUNET_STRINGS_relative_time_to_string(GNUNET_TIME_absolute_get_remaining(block_time),
+                                                    GNUNET_YES));
   cp->last_migration_block = block_time;
-  env = GNUNET_MQ_msg (msm,
-                      GNUNET_MESSAGE_TYPE_FS_MIGRATION_STOP);
-  msm->reserved = htonl (0);
+  env = GNUNET_MQ_msg(msm,
+                      GNUNET_MESSAGE_TYPE_FS_MIGRATION_STOP);
+  msm->reserved = htonl(0);
   msm->duration
-    = GNUNET_TIME_relative_hton (GNUNET_TIME_absolute_get_remaining
-                                (cp->last_migration_block));
-  GNUNET_STATISTICS_update (GSF_stats,
-                            gettext_noop ("# migration stop messages sent"),
-                            1,
-                           GNUNET_NO);
-  GSF_peer_transmit_ (cp,
-                     GNUNET_SYSERR,
-                     UINT32_MAX,
-                     env);
+    = GNUNET_TIME_relative_hton(GNUNET_TIME_absolute_get_remaining
+                                  (cp->last_migration_block));
+  GNUNET_STATISTICS_update(GSF_stats,
+                           gettext_noop("# migration stop messages sent"),
+                           1,
+                           GNUNET_NO);
+  GSF_peer_transmit_(cp,
+                     GNUNET_SYSERR,
+                     UINT32_MAX,
+                     env);
 }
 
 
@@ -1724,8 +1708,8 @@ GSF_block_peer_migration_ (struct GSF_ConnectedPeer *cp,
  * @param pref preference change
  */
 void
-GSF_connected_peer_change_preference_ (struct GSF_ConnectedPeer *cp,
-                                       uint64_t pref)
+GSF_connected_peer_change_preference_(struct GSF_ConnectedPeer *cp,
+                                      uint64_t pref)
 {
   cp->inc_preference += pref;
 }
@@ -1737,15 +1721,15 @@ GSF_connected_peer_change_preference_ (struct GSF_ConnectedPeer *cp,
  * @param cls closure, not used
  */
 static void
-cron_flush_respect (void *cls)
+cron_flush_respect(void *cls)
 {
   fr_task = NULL;
-  GNUNET_CONTAINER_multipeermap_iterate (cp_map,
-                                         &flush_respect,
-                                        NULL);
-  fr_task = GNUNET_SCHEDULER_add_delayed_with_priority (RESPECT_FLUSH_FREQ,
-                                                       GNUNET_SCHEDULER_PRIORITY_HIGH,
-                                                       &cron_flush_respect, NULL);
+  GNUNET_CONTAINER_multipeermap_iterate(cp_map,
+                                        &flush_respect,
+                                        NULL);
+  fr_task = GNUNET_SCHEDULER_add_delayed_with_priority(RESPECT_FLUSH_FREQ,
+                                                       GNUNET_SCHEDULER_PRIORITY_HIGH,
+                                                       &cron_flush_respect, NULL);
 }
 
 
@@ -1753,12 +1737,12 @@ cron_flush_respect (void *cls)
  * Initialize peer management subsystem.
  */
 void
-GSF_connected_peer_init_ ()
+GSF_connected_peer_init_()
 {
-  cp_map = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_YES);
-  peerstore = GNUNET_PEERSTORE_connect (GSF_cfg);
-  fr_task = GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_HIGH,
-                                               &cron_flush_respect, NULL);
+  cp_map = GNUNET_CONTAINER_multipeermap_create(128, GNUNET_YES);
+  peerstore = GNUNET_PEERSTORE_connect(GSF_cfg);
+  fr_task = GNUNET_SCHEDULER_add_with_priority(GNUNET_SCHEDULER_PRIORITY_HIGH,
+                                               &cron_flush_respect, NULL);
 }
 
 
@@ -1766,18 +1750,17 @@ GSF_connected_peer_init_ ()
  * Shutdown peer management subsystem.
  */
 void
-GSF_connected_peer_done_ ()
+GSF_connected_peer_done_()
 {
-  GNUNET_CONTAINER_multipeermap_iterate (cp_map,
-                                         &flush_respect,
-                                         NULL);
-  GNUNET_SCHEDULER_cancel (fr_task);
+  GNUNET_CONTAINER_multipeermap_iterate(cp_map,
+                                        &flush_respect,
+                                        NULL);
+  GNUNET_SCHEDULER_cancel(fr_task);
   fr_task = NULL;
-  GNUNET_CONTAINER_multipeermap_destroy (cp_map);
+  GNUNET_CONTAINER_multipeermap_destroy(cp_map);
   cp_map = NULL;
-  GNUNET_PEERSTORE_disconnect (peerstore,
-                              GNUNET_YES);
-  
+  GNUNET_PEERSTORE_disconnect(peerstore,
+                              GNUNET_YES);
 }
 
 
@@ -1790,9 +1773,9 @@ GSF_connected_peer_done_ ()
  * @return #GNUNET_YES (we should continue to iterate)
  */
 static int
-clean_local_client (void *cls,
-                   const struct GNUNET_PeerIdentity *key,
-                   void *value)
+clean_local_client(void *cls,
+                   const struct GNUNET_PeerIdentity *key,
+                   void *value)
 {
   const struct GSF_LocalClient *lc = cls;
   struct GSF_ConnectedPeer *cp = value;
@@ -1812,13 +1795,13 @@ clean_local_client (void *cls,
  * @param lc handle to the local client (henceforth invalid)
  */
 void
-GSF_handle_local_client_disconnect_ (const struct GSF_LocalClient *lc)
+GSF_handle_local_client_disconnect_(const struct GSF_LocalClient *lc)
 {
   if (NULL == cp_map)
     return;                     /* already cleaned up */
-  GNUNET_CONTAINER_multipeermap_iterate (cp_map,
-                                        &clean_local_client,
-                                         (void *) lc);
+  GNUNET_CONTAINER_multipeermap_iterate(cp_map,
+                                        &clean_local_client,
+                                        (void *)lc);
 }