1 files changed, 233 insertions, 294 deletions

diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c
index e26bb4d5c..740707ce1 100644
--- a/src/core/gnunet-service-core.c
+++ b/src/core/gnunet-service-core.c
@@ -11,7 +11,7 @@
      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/>.
 
@@ -107,7 +107,6 @@ struct GSC_Client
    * specifically cares about.  Size of the @e types array.
    */
   unsigned int tcnt;
-
 };
 
 
@@ -150,12 +149,10 @@ static struct GSC_Client *client_tail;
  * @return #GNUNET_YES if @a c is interested, #GNUNET_NO if not.
  */
 static int
-type_match (uint16_t type,
-            struct GSC_Client *c)
+type_match (uint16_t type, struct GSC_Client *c)
 {
-  if ( (0 == c->tcnt) &&
-       (0 != c->options) )
-    return GNUNET_YES;          /* peer without handlers and inbound/outbond
+  if ((0 == c->tcnt) && (0 != c->options))
+    return GNUNET_YES; /* peer without handlers and inbound/outbond
                                    callbacks matches ALL */
   if (NULL == c->types)
     return GNUNET_NO;
@@ -174,8 +171,7 @@ type_match (uint16_t type,
  * @return #GNUNET_OK if @a im is well-formed
  */
 static int
-check_client_init (void *cls,
-                   const struct InitMessage *im)
+check_client_init (void *cls, const struct InitMessage *im)
 {
   return GNUNET_OK;
 }
@@ -188,8 +184,7 @@ check_client_init (void *cls,
  * @param im the `struct InitMessage`
  */
 static void
-handle_client_init (void *cls,
-                    const struct InitMessage *im)
+handle_client_init (void *cls, const struct InitMessage *im)
 {
   struct GSC_Client *c = cls;
   struct GNUNET_MQ_Envelope *env;
@@ -206,24 +201,23 @@ handle_client_init (void *cls,
   all_client_options |= c->options;
   c->types = GNUNET_malloc (msize);
   GNUNET_assert (GNUNET_YES ==
-                 GNUNET_CONTAINER_multipeermap_put (c->connectmap,
-                                                    &GSC_my_identity,
-                                                    NULL,
-                                                    GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+                 GNUNET_CONTAINER_multipeermap_put (
+                   c->connectmap,
+                   &GSC_my_identity,
+                   NULL,
+                   GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
   for (unsigned int i = 0; i < c->tcnt; i++)
     c->types[i] = ntohs (types[i]);
-  GSC_TYPEMAP_add (c->types,
-                   c->tcnt);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Client connecting to core service is interested in %u message types\n",
-              (unsigned int) c->tcnt);
+  GSC_TYPEMAP_add (c->types, c->tcnt);
+  GNUNET_log (
+    GNUNET_ERROR_TYPE_DEBUG,
+    "Client connecting to core service is interested in %u message types\n",
+    (unsigned int) c->tcnt);
   /* send init reply message */
-  env = GNUNET_MQ_msg (irm,
-                       GNUNET_MESSAGE_TYPE_CORE_INIT_REPLY);
+  env = GNUNET_MQ_msg (irm, GNUNET_MESSAGE_TYPE_CORE_INIT_REPLY);
   irm->reserved = htonl (0);
   irm->my_identity = GSC_my_identity;
-  GNUNET_MQ_send (c->mq,
-                  env);
+  GNUNET_MQ_send (c->mq, env);
   GSC_SESSIONS_notify_client_about_sessions (c);
   GNUNET_SERVICE_client_continue (c->client);
 }
@@ -245,11 +239,11 @@ void
 GSC_CLIENTS_reject_request (struct GSC_ClientActiveRequest *car,
                             int drop_client)
 {
-  GNUNET_assert (GNUNET_YES ==
-                 GNUNET_CONTAINER_multipeermap_remove (car->
-                                                       client_handle->requests,
-                                                       &car->target,
-                                                       car));
+  GNUNET_assert (
+    GNUNET_YES ==
+    GNUNET_CONTAINER_multipeermap_remove (car->client_handle->requests,
+                                          &car->target,
+                                          car));
   if (GNUNET_YES == drop_client)
     GNUNET_SERVICE_client_drop (car->client_handle->client);
   GNUNET_free (car);
@@ -274,38 +268,31 @@ GSC_CLIENTS_solicit_request (struct GSC_ClientActiveRequest *car)
 
   c = car->client_handle;
   if (GNUNET_YES !=
-      GNUNET_CONTAINER_multipeermap_contains (c->connectmap,
-                                              &car->target))
+      GNUNET_CONTAINER_multipeermap_contains (c->connectmap, &car->target))
   {
     /* connection has gone down since, drop request */
-    GNUNET_assert (0 !=
-                   memcmp (&car->target,
-                           &GSC_my_identity,
-                           sizeof (struct GNUNET_PeerIdentity)));
+    GNUNET_assert (0 != memcmp (&car->target,
+                                &GSC_my_identity,
+                                sizeof (struct GNUNET_PeerIdentity)));
     GSC_SESSIONS_dequeue_request (car);
-    GSC_CLIENTS_reject_request (car,
-                                GNUNET_NO);
+    GSC_CLIENTS_reject_request (car, GNUNET_NO);
     return;
   }
   delay = GNUNET_TIME_absolute_get_duration (car->received_time);
   left = GNUNET_TIME_absolute_get_duration (car->deadline);
   if (delay.rel_value_us > GNUNET_CONSTANTS_LATENCY_WARN.rel_value_us)
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Client waited %s for permission to transmit to `%s'%s (priority %u)\n",
-                GNUNET_STRINGS_relative_time_to_string (delay,
-                                                        GNUNET_YES),
-                GNUNET_i2s (&car->target),
-                (0 == left.rel_value_us)
-                ? " (past deadline)"
-                : "",
-                car->priority);
-  env = GNUNET_MQ_msg (smr,
-                       GNUNET_MESSAGE_TYPE_CORE_SEND_READY);
+    GNUNET_log (
+      GNUNET_ERROR_TYPE_WARNING,
+      "Client waited %s for permission to transmit to `%s'%s (priority %u)\n",
+      GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES),
+      GNUNET_i2s (&car->target),
+      (0 == left.rel_value_us) ? " (past deadline)" : "",
+      car->priority);
+  env = GNUNET_MQ_msg (smr, GNUNET_MESSAGE_TYPE_CORE_SEND_READY);
   smr->size = htons (car->msize);
   smr->smr_id = car->smr_id;
   smr->peer = car->target;
-  GNUNET_MQ_send (c->mq,
-                  env);
+  GNUNET_MQ_send (c->mq, env);
 }
 
 
@@ -316,51 +303,47 @@ GSC_CLIENTS_solicit_request (struct GSC_ClientActiveRequest *car)
  * @param req the `struct SendMessageRequest`
  */
 static void
-handle_client_send_request (void *cls,
-                            const struct SendMessageRequest *req)
+handle_client_send_request (void *cls, const struct SendMessageRequest *req)
 {
   struct GSC_Client *c = cls;
   struct GSC_ClientActiveRequest *car;
   int is_loopback;
 
   if (NULL == c->requests)
-    c->requests = GNUNET_CONTAINER_multipeermap_create (16,
-                                                        GNUNET_NO);
+    c->requests = GNUNET_CONTAINER_multipeermap_create (16, GNUNET_NO);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Client asked for transmission to `%s'\n",
               GNUNET_i2s (&req->peer));
-  is_loopback =
-      (0 ==
-       memcmp (&req->peer,
-               &GSC_my_identity,
-               sizeof (struct GNUNET_PeerIdentity)));
+  is_loopback = (0 == memcmp (&req->peer,
+                              &GSC_my_identity,
+                              sizeof (struct GNUNET_PeerIdentity)));
   if ((! is_loopback) &&
       (GNUNET_YES !=
-       GNUNET_CONTAINER_multipeermap_contains (c->connectmap,
-                                               &req->peer)))
+       GNUNET_CONTAINER_multipeermap_contains (c->connectmap, &req->peer)))
   {
     /* neighbour must have disconnected since request was issued,
      * ignore (client will realize it once it processes the
      * disconnect notification) */
     GNUNET_STATISTICS_update (GSC_stats,
-                              gettext_noop
-                              ("# send requests dropped (disconnected)"), 1,
+                              gettext_noop (
+                                "# send requests dropped (disconnected)"),
+                              1,
                               GNUNET_NO);
     GNUNET_SERVICE_client_continue (c->client);
     return;
   }
 
-  car = GNUNET_CONTAINER_multipeermap_get (c->requests,
-                                           &req->peer);
+  car = GNUNET_CONTAINER_multipeermap_get (c->requests, &req->peer);
   if (NULL == car)
   {
     /* create new entry */
     car = GNUNET_new (struct GSC_ClientActiveRequest);
     GNUNET_assert (GNUNET_OK ==
-                   GNUNET_CONTAINER_multipeermap_put (c->requests,
-                                                      &req->peer,
-                                                      car,
-                                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST));
+                   GNUNET_CONTAINER_multipeermap_put (
+                     c->requests,
+                     &req->peer,
+                     car,
+                     GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST));
     car->client_handle = c;
   }
   else
@@ -368,8 +351,9 @@ handle_client_send_request (void *cls,
     /* dequeue and recycle memory from pending request, there can only
        be at most one per client and peer */
     GNUNET_STATISTICS_update (GSC_stats,
-                              gettext_noop ("# dequeuing CAR (duplicate request)"),
-                              1,
+                              gettext_noop (
+                                "# dequeuing CAR (duplicate request)"),
+                              1,
                               GNUNET_NO);
     GSC_SESSIONS_dequeue_request (car);
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -379,7 +363,7 @@ handle_client_send_request (void *cls,
   car->target = req->peer;
   car->received_time = GNUNET_TIME_absolute_get ();
   car->deadline = GNUNET_TIME_absolute_ntoh (req->deadline);
-  car->priority = (enum GNUNET_CORE_Priority) ntohl (req->priority);
+  car->priority = (enum GNUNET_MQ_PriorityPreferences) ntohl (req->priority);
   car->msize = ntohs (req->size);
   car->smr_id = req->smr_id;
   car->was_solicited = GNUNET_NO;
@@ -408,13 +392,7 @@ struct TokenizerContext
   /**
    * How important is this message.
    */
-  enum GNUNET_CORE_Priority priority;
-
-  /**
-   * Is corking allowed (set only once we have the real message).
-   */
-  int cork;
-
+  enum GNUNET_MQ_PriorityPreferences priority;
 };
 
 
@@ -431,65 +409,57 @@ struct TokenizerContext
  *    #GNUNET_SYSERR to stop further processing with error
  */
 static int
-tokenized_cb (void *cls,
-              const struct GNUNET_MessageHeader *message)
+tokenized_cb (void *cls, const struct GNUNET_MessageHeader *message)
 {
   struct TokenizerContext *tc = cls;
   struct GSC_ClientActiveRequest *car = tc->car;
   char buf[92];
 
   GNUNET_snprintf (buf,
-                   sizeof (buf),
-                   gettext_noop ("# bytes of messages of type %u received"),
-                   (unsigned int) ntohs (message->type));
-  GNUNET_STATISTICS_update (GSC_stats,
-                            buf,
-                            ntohs (message->size),
-                            GNUNET_NO);
-  if (0 ==
-      memcmp (&car->target,
-              &GSC_my_identity,
-              sizeof (struct GNUNET_PeerIdentity)))
+                   sizeof (buf),
+                   gettext_noop ("# bytes of messages of type %u received"),
+                   (unsigned int) ntohs (message->type));
+  GNUNET_STATISTICS_update (GSC_stats, buf, ntohs (message->size), GNUNET_NO);
+  if (0 == memcmp (&car->target,
+                   &GSC_my_identity,
+                   sizeof (struct GNUNET_PeerIdentity)))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Delivering message of type %u to myself\n",
                 ntohs (message->type));
     GSC_CLIENTS_deliver_message (&GSC_my_identity,
-                                 message,
-                                 ntohs (message->size),
-                                 GNUNET_CORE_OPTION_SEND_FULL_OUTBOUND);
+                                 message,
+                                 ntohs (message->size),
+                                 GNUNET_CORE_OPTION_SEND_FULL_OUTBOUND);
     GSC_CLIENTS_deliver_message (&GSC_my_identity,
-                                 message,
-                                 sizeof (struct GNUNET_MessageHeader),
-                                 GNUNET_CORE_OPTION_SEND_HDR_OUTBOUND);
+                                 message,
+                                 sizeof (struct GNUNET_MessageHeader),
+                                 GNUNET_CORE_OPTION_SEND_HDR_OUTBOUND);
     GSC_CLIENTS_deliver_message (&GSC_my_identity,
-                                 message,
-                                 ntohs (message->size),
-                                 GNUNET_CORE_OPTION_SEND_FULL_INBOUND);
+                                 message,
+                                 ntohs (message->size),
+                                 GNUNET_CORE_OPTION_SEND_FULL_INBOUND);
     GSC_CLIENTS_deliver_message (&GSC_my_identity,
-                                 message,
-                                 sizeof (struct GNUNET_MessageHeader),
-                                 GNUNET_CORE_OPTION_SEND_HDR_INBOUND);
+                                 message,
+                                 sizeof (struct GNUNET_MessageHeader),
+                                 GNUNET_CORE_OPTION_SEND_HDR_INBOUND);
   }
   else
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Delivering message of type %u and size %u to %s\n",
                 ntohs (message->type),
-                ntohs (message->size),
+                ntohs (message->size),
                 GNUNET_i2s (&car->target));
     GSC_CLIENTS_deliver_message (&car->target,
-                                 message,
-                                 ntohs (message->size),
-                                 GNUNET_CORE_OPTION_SEND_FULL_OUTBOUND);
+                                 message,
+                                 ntohs (message->size),
+                                 GNUNET_CORE_OPTION_SEND_FULL_OUTBOUND);
     GSC_CLIENTS_deliver_message (&car->target,
-                                 message,
-                                 sizeof (struct GNUNET_MessageHeader),
-                                 GNUNET_CORE_OPTION_SEND_HDR_OUTBOUND);
-    GSC_SESSIONS_transmit (car,
-                           message,
-                           tc->cork,
-                           tc->priority);
+                                 message,
+                                 sizeof (struct GNUNET_MessageHeader),
+                                 GNUNET_CORE_OPTION_SEND_HDR_OUTBOUND);
+    GSC_SESSIONS_transmit (car, message, tc->priority);
   }
   return GNUNET_OK;
 }
@@ -503,8 +473,7 @@ tokenized_cb (void *cls,
  * @return #GNUNET_OK if @a sm is well-formed
  */
 static int
-check_client_send (void *cls,
-                   const struct SendMessage *sm)
+check_client_send (void *cls, const struct SendMessage *sm)
 {
   return GNUNET_OK;
 }
@@ -517,8 +486,7 @@ check_client_send (void *cls,
  * @param sm the `struct SendMessage`
  */
 static void
-handle_client_send (void *cls,
-                    const struct SendMessage *sm)
+handle_client_send (void *cls, const struct SendMessage *sm)
 {
   struct GSC_Client *c = cls;
   struct TokenizerContext tc;
@@ -527,9 +495,7 @@ handle_client_send (void *cls,
   struct GNUNET_MessageStreamTokenizer *mst;
 
   msize = ntohs (sm->header.size) - sizeof (struct SendMessage);
-  GNUNET_break (0 == ntohl (sm->reserved));
-  tc.car = GNUNET_CONTAINER_multipeermap_get (c->requests,
-                                              &sm->peer);
+  tc.car = GNUNET_CONTAINER_multipeermap_get (c->requests, &sm->peer);
   if (NULL == tc.car)
   {
     /* Must have been that we first approved the request, then got disconnected
@@ -538,43 +504,37 @@ handle_client_send (void *cls,
      * might also now be *again* connected.  So this can happen (but should be
      * rare).  If it does happen, the message is discarded. */
     GNUNET_STATISTICS_update (GSC_stats,
-                              gettext_noop ("# messages discarded (session disconnected)"),
+                              gettext_noop (
+                                "# messages discarded (session disconnected)"),
                               1,
-                              GNUNET_NO);
+                              GNUNET_NO);
     GNUNET_SERVICE_client_continue (c->client);
     return;
   }
   delay = GNUNET_TIME_absolute_get_duration (tc.car->received_time);
-  tc.cork = ntohl (sm->cork);
-  tc.priority = (enum GNUNET_CORE_Priority) ntohl (sm->priority);
+  tc.priority = (enum GNUNET_MQ_PriorityPreferences) ntohl (sm->priority);
   if (delay.rel_value_us > GNUNET_CONSTANTS_LATENCY_WARN.rel_value_us)
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Client waited %s for transmission of %u bytes to `%s'%s\n",
-                GNUNET_STRINGS_relative_time_to_string (delay,
-                                                        GNUNET_YES),
+                "Client waited %s for transmission of %u bytes to `%s'\n",
+                GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES),
                 msize,
-                GNUNET_i2s (&sm->peer),
-                tc.cork ? " (cork)" : " (uncorked)");
+                GNUNET_i2s (&sm->peer));
   else
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Client waited %s for transmission of %u bytes to `%s'%s\n",
-                GNUNET_STRINGS_relative_time_to_string (delay,
-                                                        GNUNET_YES),
+                "Client waited %s for transmission of %u bytes to `%s'\n",
+                GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES),
                 msize,
-                GNUNET_i2s (&sm->peer),
-                tc.cork ? " (cork)" : " (uncorked)");
+                GNUNET_i2s (&sm->peer));
 
-  GNUNET_assert (GNUNET_YES ==
-                 GNUNET_CONTAINER_multipeermap_remove (c->requests,
-                                                       &sm->peer,
-                                                       tc.car));
-  mst = GNUNET_MST_create (&tokenized_cb,
-                           &tc);
+  GNUNET_assert (
+    GNUNET_YES ==
+    GNUNET_CONTAINER_multipeermap_remove (c->requests, &sm->peer, tc.car));
+  mst = GNUNET_MST_create (&tokenized_cb, &tc);
   GNUNET_MST_from_buffer (mst,
-                          (const char *) &sm[1],
-                          msize,
-                          GNUNET_YES,
-                          GNUNET_NO);
+                          (const char *) &sm[1],
+                          msize,
+                          GNUNET_YES,
+                          GNUNET_NO);
   GNUNET_MST_destroy (mst);
   GSC_SESSIONS_dequeue_request (tc.car);
   GNUNET_free (tc.car);
@@ -592,16 +552,16 @@ handle_client_send (void *cls,
  */
 static int
 destroy_active_client_request (void *cls,
-                               const struct GNUNET_PeerIdentity *key,
+                               const struct GNUNET_PeerIdentity *key,
                                void *value)
 {
   struct GSC_ClientActiveRequest *car = value;
 
-  GNUNET_assert (GNUNET_YES ==
-                 GNUNET_CONTAINER_multipeermap_remove (car->
-                                                       client_handle->requests,
-                                                       &car->target,
-                                                       car));
+  GNUNET_assert (
+    GNUNET_YES ==
+    GNUNET_CONTAINER_multipeermap_remove (car->client_handle->requests,
+                                          &car->target,
+                                          car));
   GSC_SESSIONS_dequeue_request (car);
   GNUNET_free (car);
   return GNUNET_YES;
@@ -618,19 +578,16 @@ destroy_active_client_request (void *cls,
  */
 static void *
 client_connect_cb (void *cls,
-                   struct GNUNET_SERVICE_Client *client,
-                   struct GNUNET_MQ_Handle *mq)
+                   struct GNUNET_SERVICE_Client *client,
+                   struct GNUNET_MQ_Handle *mq)
 {
   struct GSC_Client *c;
 
   c = GNUNET_new (struct GSC_Client);
   c->client = client;
   c->mq = mq;
-  c->connectmap = GNUNET_CONTAINER_multipeermap_create (16,
-                                                        GNUNET_NO);
-  GNUNET_CONTAINER_DLL_insert (client_head,
-                               client_tail,
-                               c);
+  c->connectmap = GNUNET_CONTAINER_multipeermap_create (16, GNUNET_NO);
+  GNUNET_CONTAINER_DLL_insert (client_head, client_tail, c);
   return c;
 }
 
@@ -644,17 +601,15 @@ client_connect_cb (void *cls,
  */
 static void
 client_disconnect_cb (void *cls,
-                      struct GNUNET_SERVICE_Client *client,
-                      void *app_ctx)
+                      struct GNUNET_SERVICE_Client *client,
+                      void *app_ctx)
 {
   struct GSC_Client *c = app_ctx;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Client %p has disconnected from core service.\n",
               client);
-  GNUNET_CONTAINER_DLL_remove (client_head,
-                               client_tail,
-                               c);
+  GNUNET_CONTAINER_DLL_remove (client_head, client_tail, c);
   if (NULL != c->requests)
   {
     GNUNET_CONTAINER_multipeermap_iterate (c->requests,
@@ -666,15 +621,14 @@ client_disconnect_cb (void *cls,
   c->connectmap = NULL;
   if (NULL != c->types)
   {
-    GSC_TYPEMAP_remove (c->types,
-                        c->tcnt);
+    GSC_TYPEMAP_remove (c->types, c->tcnt);
     GNUNET_free (c->types);
   }
   GNUNET_free (c);
 
   /* recalculate 'all_client_options' */
   all_client_options = 0;
-  for (c = client_head; NULL != c ; c = c->next)
+  for (c = client_head; NULL != c; c = c->next)
     all_client_options |= c->options;
 }
 
@@ -690,10 +644,11 @@ client_disconnect_cb (void *cls,
  * @param tmap_new updated type map for the neighbour, NULL for disconnect
  */
 void
-GSC_CLIENTS_notify_client_about_neighbour (struct GSC_Client *client,
-                                           const struct GNUNET_PeerIdentity *neighbour,
-                                           const struct GSC_TypeMap *tmap_old,
-                                           const struct GSC_TypeMap *tmap_new)
+GSC_CLIENTS_notify_client_about_neighbour (
+  struct GSC_Client *client,
+  const struct GNUNET_PeerIdentity *neighbour,
+  const struct GSC_TypeMap *tmap_old,
+  const struct GSC_TypeMap *tmap_new)
 {
   struct GNUNET_MQ_Envelope *env;
   int old_match;
@@ -701,12 +656,8 @@ GSC_CLIENTS_notify_client_about_neighbour (struct GSC_Client *client,
 
   if (GNUNET_YES != client->got_init)
     return;
-  old_match = GSC_TYPEMAP_test_match (tmap_old,
-                                      client->types,
-                                      client->tcnt);
-  new_match = GSC_TYPEMAP_test_match (tmap_new,
-                                      client->types,
-                                      client->tcnt);
+  old_match = GSC_TYPEMAP_test_match (tmap_old, client->types, client->tcnt);
+  new_match = GSC_TYPEMAP_test_match (tmap_new, client->types, client->tcnt);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Notifying client about neighbour %s (%d/%d)\n",
               GNUNET_i2s (neighbour),
@@ -714,55 +665,52 @@ GSC_CLIENTS_notify_client_about_neighbour (struct GSC_Client *client,
               new_match);
   if (old_match == new_match)
   {
-    GNUNET_assert (old_match ==
-                   GNUNET_CONTAINER_multipeermap_contains (client->connectmap,
-                                                           neighbour));
-    return;                     /* no change */
+    GNUNET_assert (
+      old_match ==
+      GNUNET_CONTAINER_multipeermap_contains (client->connectmap, neighbour));
+    return; /* no change */
   }
   if (GNUNET_NO == old_match)
   {
     struct ConnectNotifyMessage *cnm;
 
     /* send connect */
-    GNUNET_assert (GNUNET_NO ==
-                   GNUNET_CONTAINER_multipeermap_contains (client->connectmap,
-                                                           neighbour));
+    GNUNET_assert (
+      GNUNET_NO ==
+      GNUNET_CONTAINER_multipeermap_contains (client->connectmap, neighbour));
     GNUNET_assert (GNUNET_YES ==
-                   GNUNET_CONTAINER_multipeermap_put (client->connectmap,
-                                                      neighbour,
-                                                      NULL,
-                                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
-    env = GNUNET_MQ_msg (cnm,
-                         GNUNET_MESSAGE_TYPE_CORE_NOTIFY_CONNECT);
+                   GNUNET_CONTAINER_multipeermap_put (
+                     client->connectmap,
+                     neighbour,
+                     NULL,
+                     GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+    env = GNUNET_MQ_msg (cnm, GNUNET_MESSAGE_TYPE_CORE_NOTIFY_CONNECT);
     cnm->reserved = htonl (0);
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Sending NOTIFY_CONNECT message about peer %s to client.\n",
                 GNUNET_i2s (neighbour));
     cnm->peer = *neighbour;
-    GNUNET_MQ_send (client->mq,
-                    env);
+    GNUNET_MQ_send (client->mq, env);
   }
   else
   {
     struct DisconnectNotifyMessage *dcm;
 
     /* send disconnect */
-    GNUNET_assert (GNUNET_YES ==
-                   GNUNET_CONTAINER_multipeermap_contains (client->connectmap,
-                                                           neighbour));
+    GNUNET_assert (
+      GNUNET_YES ==
+      GNUNET_CONTAINER_multipeermap_contains (client->connectmap, neighbour));
     GNUNET_assert (GNUNET_YES ==
                    GNUNET_CONTAINER_multipeermap_remove (client->connectmap,
                                                          neighbour,
                                                          NULL));
-    env = GNUNET_MQ_msg (dcm,
-                         GNUNET_MESSAGE_TYPE_CORE_NOTIFY_DISCONNECT);
+    env = GNUNET_MQ_msg (dcm, GNUNET_MESSAGE_TYPE_CORE_NOTIFY_DISCONNECT);
     dcm->reserved = htonl (0);
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Sending NOTIFY_DISCONNECT message about peer %s to client.\n",
                 GNUNET_i2s (neighbour));
     dcm->peer = *neighbour;
-    GNUNET_MQ_send (client->mq,
-                    env);
+    GNUNET_MQ_send (client->mq, env);
   }
 }
 
@@ -777,17 +725,18 @@ GSC_CLIENTS_notify_client_about_neighbour (struct GSC_Client *client,
  * @param tmap_new updated type map for the neighbour, NULL for disconnect
  */
 void
-GSC_CLIENTS_notify_clients_about_neighbour (const struct GNUNET_PeerIdentity *neighbour,
-                                            const struct GSC_TypeMap *tmap_old,
-                                            const struct GSC_TypeMap *tmap_new)
+GSC_CLIENTS_notify_clients_about_neighbour (
+  const struct GNUNET_PeerIdentity *neighbour,
+  const struct GSC_TypeMap *tmap_old,
+  const struct GSC_TypeMap *tmap_new)
 {
   struct GSC_Client *c;
 
   for (c = client_head; NULL != c; c = c->next)
     GSC_CLIENTS_notify_client_about_neighbour (c,
-                                               neighbour,
+                                               neighbour,
                                                tmap_old,
-                                               tmap_new);
+                                               tmap_new);
 }
 
 
@@ -815,15 +764,14 @@ GSC_CLIENTS_deliver_message (const struct GNUNET_PeerIdentity *sender,
     GNUNET_break (0);
     return;
   }
-  if (! ( (0 != (all_client_options & options)) ||
-          (0 != (options & GNUNET_CORE_OPTION_SEND_FULL_INBOUND)) ))
+  if (! ((0 != (all_client_options & options)) ||
+         (0 != (options & GNUNET_CORE_OPTION_SEND_FULL_INBOUND))))
     return; /* no client cares about this message notification */
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Core service passes message from `%s' of type %u to client.\n",
               GNUNET_i2s (sender),
               (unsigned int) ntohs (msg->type));
-  GSC_SESSIONS_add_to_typemap (sender,
-                               ntohs (msg->type));
+  GSC_SESSIONS_add_to_typemap (sender, ntohs (msg->type));
 
   for (struct GSC_Client *c = client_head; NULL != c; c = c->next)
   {
@@ -833,18 +781,17 @@ GSC_CLIENTS_deliver_message (const struct GNUNET_PeerIdentity *sender,
     unsigned int qlen;
     int tm;
 
-    tm = type_match (ntohs (msg->type),
-                     c);
-    if (! ( (0 != (c->options & options)) ||
-            ( (0 != (options & GNUNET_CORE_OPTION_SEND_FULL_INBOUND)) &&
-              (GNUNET_YES == tm) ) ) )
-      continue;  /* neither options nor type match permit the message */
-    if ( (0 != (options & GNUNET_CORE_OPTION_SEND_HDR_INBOUND)) &&
-         ( (0 != (c->options & GNUNET_CORE_OPTION_SEND_FULL_INBOUND)) ||
-           (GNUNET_YES == tm) ) )
+    tm = type_match (ntohs (msg->type), c);
+    if (! ((0 != (c->options & options)) ||
+           ((0 != (options & GNUNET_CORE_OPTION_SEND_FULL_INBOUND)) &&
+            (GNUNET_YES == tm))))
+      continue; /* neither options nor type match permit the message */
+    if ((0 != (options & GNUNET_CORE_OPTION_SEND_HDR_INBOUND)) &&
+        ((0 != (c->options & GNUNET_CORE_OPTION_SEND_FULL_INBOUND)) ||
+         (GNUNET_YES == tm)))
       continue;
-    if ( (0 != (options & GNUNET_CORE_OPTION_SEND_HDR_OUTBOUND)) &&
-         (0 != (c->options & GNUNET_CORE_OPTION_SEND_FULL_OUTBOUND)) )
+    if ((0 != (options & GNUNET_CORE_OPTION_SEND_HDR_OUTBOUND)) &&
+        (0 != (c->options & GNUNET_CORE_OPTION_SEND_FULL_OUTBOUND)))
       continue;
 
     /* Drop messages if:
@@ -862,54 +809,50 @@ GSC_CLIENTS_deliver_message (const struct GNUNET_PeerIdentity *sender,
        (ACK, queries) which may be cummulative or highly redundant,
        and cheap to drop than data traffic.  */
     qlen = GNUNET_MQ_get_length (c->mq);
-    if ( (qlen >= HARD_MAX_QUEUE) ||
-         ( (qlen > SOFT_MAX_QUEUE) &&
-           ( (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
-                                        ntohs (msg->size)) ) <
-             (qlen - SOFT_MAX_QUEUE) * 0x8000 /
-             (HARD_MAX_QUEUE - SOFT_MAX_QUEUE) ) ) )
+    if ((qlen >= HARD_MAX_QUEUE) ||
+        ((qlen > SOFT_MAX_QUEUE) &&
+         ((GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
+                                     ntohs (msg->size))) <
+          (qlen - SOFT_MAX_QUEUE) * 0x8000 /
+            (HARD_MAX_QUEUE - SOFT_MAX_QUEUE))))
     {
       char buf[1024];
 
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO | GNUNET_ERROR_TYPE_BULK,
-                  "Dropping decrypted message of type %u as client is too busy (queue full)\n",
-                  (unsigned int) ntohs (msg->type));
+      GNUNET_log (
+        GNUNET_ERROR_TYPE_INFO | GNUNET_ERROR_TYPE_BULK,
+        "Dropping decrypted message of type %u as client is too busy (queue full)\n",
+        (unsigned int) ntohs (msg->type));
       GNUNET_snprintf (buf,
                        sizeof (buf),
-                       gettext_noop ("# messages of type %u discarded (client busy)"),
+                       gettext_noop (
+                         "# messages of type %u discarded (client busy)"),
                        (unsigned int) ntohs (msg->type));
-      GNUNET_STATISTICS_update (GSC_stats,
-                                buf,
-                                1,
-                                GNUNET_NO);
+      GNUNET_STATISTICS_update (GSC_stats, buf, 1, GNUNET_NO);
       continue;
     }
 
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Sending %u message with %u bytes to client interested in messages of type %u.\n",
-                options,
-                ntohs (msg->size),
-                (unsigned int) ntohs (msg->type));
+    GNUNET_log (
+      GNUNET_ERROR_TYPE_DEBUG,
+      "Sending %u message with %u bytes to client interested in messages of type %u.\n",
+      options,
+      ntohs (msg->size),
+      (unsigned int) ntohs (msg->type));
 
-    if (0 != (options & (GNUNET_CORE_OPTION_SEND_FULL_INBOUND | GNUNET_CORE_OPTION_SEND_HDR_INBOUND)))
+    if (0 != (options & (GNUNET_CORE_OPTION_SEND_FULL_INBOUND |
+                         GNUNET_CORE_OPTION_SEND_HDR_INBOUND)))
       mtype = GNUNET_MESSAGE_TYPE_CORE_NOTIFY_INBOUND;
     else
       mtype = GNUNET_MESSAGE_TYPE_CORE_NOTIFY_OUTBOUND;
-    env = GNUNET_MQ_msg_extra (ntm,
-                               msize,
-                               mtype);
+    env = GNUNET_MQ_msg_extra (ntm, msize, mtype);
     ntm->peer = *sender;
-    GNUNET_memcpy (&ntm[1],
-                   msg,
-                   msize);
-
-    GNUNET_assert ( (0 == (c->options & GNUNET_CORE_OPTION_SEND_FULL_INBOUND)) ||
-                    (GNUNET_YES != tm) ||
-                    (GNUNET_YES ==
-                     GNUNET_CONTAINER_multipeermap_contains (c->connectmap,
-                                                             sender)) );
-    GNUNET_MQ_send (c->mq,
-                    env);
+    GNUNET_memcpy (&ntm[1], msg, msize);
+
+    GNUNET_assert (
+      (0 == (c->options & GNUNET_CORE_OPTION_SEND_FULL_INBOUND)) ||
+      (GNUNET_YES != tm) ||
+      (GNUNET_YES ==
+       GNUNET_CONTAINER_multipeermap_contains (c->connectmap, sender)));
+    GNUNET_MQ_send (c->mq, env);
   }
 }
 
@@ -925,8 +868,7 @@ shutdown_task (void *cls)
 {
   struct GSC_Client *c;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Core service shutting down.\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Core service shutting down.\n");
   while (NULL != (c = client_head))
     GNUNET_SERVICE_client_drop (c->client);
   GSC_SESSIONS_done ();
@@ -934,8 +876,7 @@ shutdown_task (void *cls)
   GSC_TYPEMAP_done ();
   if (NULL != GSC_stats)
   {
-    GNUNET_STATISTICS_destroy (GSC_stats,
-                               GNUNET_NO);
+    GNUNET_STATISTICS_destroy (GSC_stats, GNUNET_NO);
     GSC_stats = NULL;
   }
   GSC_cfg = NULL;
@@ -953,7 +894,7 @@ shutdown_task (void *cls)
  */
 static void
 handle_client_monitor_peers (void *cls,
-                             const struct GNUNET_MessageHeader *message)
+                             const struct GNUNET_MessageHeader *message)
 {
   struct GSC_Client *c = cls;
 
@@ -978,21 +919,19 @@ run (void *cls,
   char *keyfile;
 
   GSC_cfg = c;
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_filename (GSC_cfg,
-                                               "PEER",
-                                               "PRIVATE_KEY",
-                                               &keyfile))
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (GSC_cfg,
+                                                            "PEER",
+                                                            "PRIVATE_KEY",
+                                                            &keyfile))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("Core service is lacking HOSTKEY configuration setting.  Exiting.\n"));
+    GNUNET_log (
+      GNUNET_ERROR_TYPE_ERROR,
+      _ ("Core service is lacking HOSTKEY configuration setting.  Exiting.\n"));
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
-  GSC_stats = GNUNET_STATISTICS_create ("core",
-                                        GSC_cfg);
-  GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
-                                 NULL);
+  GSC_stats = GNUNET_STATISTICS_create ("core", GSC_cfg);
+  GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
   GNUNET_SERVICE_suspend (service);
   GSC_TYPEMAP_init ();
   pk = GNUNET_CRYPTO_eddsa_key_create_from_file (keyfile);
@@ -1006,7 +945,7 @@ run (void *cls,
   GSC_SESSIONS_init ();
   GNUNET_SERVICE_resume (service);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              _("Core service of `%s' ready.\n"),
+              _ ("Core service of `%s' ready.\n"),
               GNUNET_i2s (&GSC_my_identity));
 }
 
@@ -1014,30 +953,30 @@ run (void *cls,
 /**
  * Define "main" method using service macro.
  */
-GNUNET_SERVICE_MAIN
-("core",
- GNUNET_SERVICE_OPTION_NONE,
- &run,
- &client_connect_cb,
- &client_disconnect_cb,
- NULL,
- GNUNET_MQ_hd_var_size (client_init,
-                        GNUNET_MESSAGE_TYPE_CORE_INIT,
-                        struct InitMessage,
-                        NULL),
- GNUNET_MQ_hd_fixed_size (client_monitor_peers,
-                          GNUNET_MESSAGE_TYPE_CORE_MONITOR_PEERS,
-                          struct GNUNET_MessageHeader,
-                          NULL),
- GNUNET_MQ_hd_fixed_size (client_send_request,
-                          GNUNET_MESSAGE_TYPE_CORE_SEND_REQUEST,
-                          struct SendMessageRequest,
-                          NULL),
- GNUNET_MQ_hd_var_size (client_send,
-                        GNUNET_MESSAGE_TYPE_CORE_SEND,
-                        struct SendMessage,
-                        NULL),
- GNUNET_MQ_handler_end ());
+GNUNET_SERVICE_MAIN (
+  "core",
+  GNUNET_SERVICE_OPTION_NONE,
+  &run,
+  &client_connect_cb,
+  &client_disconnect_cb,
+  NULL,
+  GNUNET_MQ_hd_var_size (client_init,
+                         GNUNET_MESSAGE_TYPE_CORE_INIT,
+                         struct InitMessage,
+                         NULL),
+  GNUNET_MQ_hd_fixed_size (client_monitor_peers,
+                           GNUNET_MESSAGE_TYPE_CORE_MONITOR_PEERS,
+                           struct GNUNET_MessageHeader,
+                           NULL),
+  GNUNET_MQ_hd_fixed_size (client_send_request,
+                           GNUNET_MESSAGE_TYPE_CORE_SEND_REQUEST,
+                           struct SendMessageRequest,
+                           NULL),
+  GNUNET_MQ_hd_var_size (client_send,
+                         GNUNET_MESSAGE_TYPE_CORE_SEND,
+                         struct SendMessage,
+                         NULL),
+  GNUNET_MQ_handler_end ());
 
 
 /* end of gnunet-service-core.c */