1 files changed, 334 insertions, 324 deletions

diff --git a/src/ats/gnunet-service-ats-new.c b/src/ats/gnunet-service-ats-new.c
index 1061c28c2..f2ef92436 100644
--- a/src/ats/gnunet-service-ats-new.c
+++ b/src/ats/gnunet-service-ats-new.c
@@ -33,7 +33,8 @@
 /**
  * What type of client is this client?
  */
-enum ClientType {
+enum ClientType
+{
   /**
    * We don't know yet.
    */
@@ -59,7 +60,8 @@ struct Client;
 /**
  * Preferences expressed by a client are kept in a DLL per client.
  */
-struct ClientPreference {
+struct ClientPreference
+{
   /**
    * DLL pointer.
    */
@@ -90,7 +92,8 @@ struct ClientPreference {
 /**
  * Information about ongoing sessions of the transport client.
  */
-struct GNUNET_ATS_Session {
+struct GNUNET_ATS_Session
+{
   /**
    * Session data exposed to the plugin.
    */
@@ -116,7 +119,8 @@ struct GNUNET_ATS_Session {
 /**
  * Information we track per client.
  */
-struct Client {
+struct Client
+{
   /**
    * Type of the client, initially #CT_NONE.
    */
@@ -135,8 +139,10 @@ struct Client {
   /**
    * Details depending on @e type.
    */
-  union {
-    struct {
+  union
+  {
+    struct
+    {
       /**
        * Head of DLL of preferences expressed by this client.
        */
@@ -148,7 +154,8 @@ struct Client {
       struct ClientPreference *cp_tail;
     } application;
 
-    struct {
+    struct
+    {
       /**
        * Map from session IDs to `struct GNUNET_ATS_Session` objects.
        */
@@ -188,32 +195,32 @@ static struct Client *transport_client;
  * @param address address the transport should try
  */
 static void
-suggest_cb(void *cls,
-           const struct GNUNET_PeerIdentity *pid,
-           const char *address)
+suggest_cb (void *cls,
+            const struct GNUNET_PeerIdentity *pid,
+            const char *address)
 {
   struct GNUNET_MQ_Envelope *env;
-  size_t slen = strlen(address) + 1;
+  size_t slen = strlen (address) + 1;
   struct AddressSuggestionMessage *as;
 
   if (NULL == transport_client)
-    {
-      // FIXME: stats!
-      return;
-    }
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Suggesting address `%s' of peer `%s'\n",
-             address,
-             GNUNET_i2s(pid));
-  env = GNUNET_MQ_msg_extra(as,
-                            slen,
-                            GNUNET_MESSAGE_TYPE_ATS_ADDRESS_SUGGESTION);
+  {
+    // FIXME: stats!
+    return;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Suggesting address `%s' of peer `%s'\n",
+              address,
+              GNUNET_i2s (pid));
+  env = GNUNET_MQ_msg_extra (as,
+                             slen,
+                             GNUNET_MESSAGE_TYPE_ATS_ADDRESS_SUGGESTION);
   as->peer = *pid;
-  memcpy(&as[1],
-         address,
-         slen);
-  GNUNET_MQ_send(transport_client->mq,
-                 env);
+  memcpy (&as[1],
+          address,
+          slen);
+  GNUNET_MQ_send (transport_client->mq,
+                  env);
 }
 
 
@@ -228,37 +235,37 @@ suggest_cb(void *cls,
  * @param bw_out suggested bandwidth for transmission
  */
 static void
-allocate_cb(void *cls,
-            struct GNUNET_ATS_Session *session,
-            const struct GNUNET_PeerIdentity *peer,
-            struct GNUNET_BANDWIDTH_Value32NBO bw_in,
-            struct GNUNET_BANDWIDTH_Value32NBO bw_out)
+allocate_cb (void *cls,
+             struct GNUNET_ATS_Session *session,
+             const struct GNUNET_PeerIdentity *peer,
+             struct GNUNET_BANDWIDTH_Value32NBO bw_in,
+             struct GNUNET_BANDWIDTH_Value32NBO bw_out)
 {
   struct GNUNET_MQ_Envelope *env;
   struct SessionAllocationMessage *sam;
 
-  (void)cls;
+  (void) cls;
   if ((NULL == transport_client) ||
       (session->client != transport_client))
-    {
-      /* transport must have just died and solver is addressing the
-         losses of sessions (possibly of previous transport), ignore! */
-      return;
-    }
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Allocating %u/%u bytes for %p of peer `%s'\n",
-             ntohl(bw_in.value__),
-             ntohl(bw_out.value__),
-             session,
-             GNUNET_i2s(peer));
-  env = GNUNET_MQ_msg(sam,
-                      GNUNET_MESSAGE_TYPE_ATS_SESSION_ALLOCATION);
+  {
+    /* transport must have just died and solver is addressing the
+       losses of sessions (possibly of previous transport), ignore! */
+    return;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Allocating %u/%u bytes for %p of peer `%s'\n",
+              ntohl (bw_in.value__),
+              ntohl (bw_out.value__),
+              session,
+              GNUNET_i2s (peer));
+  env = GNUNET_MQ_msg (sam,
+                       GNUNET_MESSAGE_TYPE_ATS_SESSION_ALLOCATION);
   sam->session_id = session->session_id;
   sam->peer = *peer;
   sam->bandwidth_in = bw_in;
   sam->bandwidth_out = bw_out;
-  GNUNET_MQ_send(transport_client->mq,
-                 env);
+  GNUNET_MQ_send (transport_client->mq,
+                  env);
 }
 
 
@@ -269,18 +276,19 @@ allocate_cb(void *cls,
  * @param prop[out] in HBO
  */
 static void
-prop_ntoh(const struct PropertiesNBO *properties,
-          struct GNUNET_ATS_Properties *prop)
+prop_ntoh (const struct PropertiesNBO *properties,
+           struct GNUNET_ATS_Properties *prop)
 {
-  prop->delay = GNUNET_TIME_relative_ntoh(properties->delay);
-  prop->goodput_out = ntohl(properties->goodput_out);
-  prop->goodput_in = ntohl(properties->goodput_in);
-  prop->utilization_out = ntohl(properties->utilization_out);
-  prop->utilization_in = ntohl(properties->utilization_in);
-  prop->distance = ntohl(properties->distance);
-  prop->mtu = ntohl(properties->mtu);
-  prop->nt = (enum GNUNET_NetworkType)ntohl(properties->nt);
-  prop->cc = (enum GNUNET_TRANSPORT_CommunicatorCharacteristics)ntohl(properties->cc);
+  prop->delay = GNUNET_TIME_relative_ntoh (properties->delay);
+  prop->goodput_out = ntohl (properties->goodput_out);
+  prop->goodput_in = ntohl (properties->goodput_in);
+  prop->utilization_out = ntohl (properties->utilization_out);
+  prop->utilization_in = ntohl (properties->utilization_in);
+  prop->distance = ntohl (properties->distance);
+  prop->mtu = ntohl (properties->mtu);
+  prop->nt = (enum GNUNET_NetworkType) ntohl (properties->nt);
+  prop->cc = (enum GNUNET_TRANSPORT_CommunicatorCharacteristics) ntohl (
+    properties->cc);
 }
 
 
@@ -291,8 +299,8 @@ prop_ntoh(const struct PropertiesNBO *properties,
  * @param msg the start message
  */
 static void
-handle_suggest(void *cls,
-               const struct ExpressPreferenceMessage *msg)
+handle_suggest (void *cls,
+                const struct ExpressPreferenceMessage *msg)
 {
   struct Client *c = cls;
   struct ClientPreference *cp;
@@ -300,27 +308,27 @@ handle_suggest(void *cls,
   if (CT_NONE == c->type)
     c->type = CT_APPLICATION;
   if (CT_APPLICATION != c->type)
-    {
-      GNUNET_break(0);
-      GNUNET_SERVICE_client_drop(c->client);
-      return;
-    }
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Client suggested we talk to %s with preference %d at rate %u\n",
-             GNUNET_i2s(&msg->peer),
-             (int)ntohl(msg->pk),
-             (int)ntohl(msg->bw.value__));
-  cp = GNUNET_new(struct ClientPreference);
+  {
+    GNUNET_break (0);
+    GNUNET_SERVICE_client_drop (c->client);
+    return;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Client suggested we talk to %s with preference %d at rate %u\n",
+              GNUNET_i2s (&msg->peer),
+              (int) ntohl (msg->pk),
+              (int) ntohl (msg->bw.value__));
+  cp = GNUNET_new (struct ClientPreference);
   cp->client = c;
   cp->pref.peer = msg->peer;
   cp->pref.bw = msg->bw;
-  cp->pref.pk = (enum GNUNET_MQ_PreferenceKind)ntohl(msg->pk);
-  cp->ph = plugin->preference_add(plugin->cls,
-                                  &cp->pref);
-  GNUNET_CONTAINER_DLL_insert(c->details.application.cp_head,
-                              c->details.application.cp_tail,
-                              cp);
-  GNUNET_SERVICE_client_continue(c->client);
+  cp->pref.pk = (enum GNUNET_MQ_PreferenceKind) ntohl (msg->pk);
+  cp->ph = plugin->preference_add (plugin->cls,
+                                   &cp->pref);
+  GNUNET_CONTAINER_DLL_insert (c->details.application.cp_head,
+                               c->details.application.cp_tail,
+                               cp);
+  GNUNET_SERVICE_client_continue (c->client);
 }
 
 
@@ -331,8 +339,8 @@ handle_suggest(void *cls,
  * @param msg the start message
  */
 static void
-handle_suggest_cancel(void *cls,
-                      const struct ExpressPreferenceMessage *msg)
+handle_suggest_cancel (void *cls,
+                       const struct ExpressPreferenceMessage *msg)
 {
   struct Client *c = cls;
   struct ClientPreference *cp;
@@ -340,33 +348,33 @@ handle_suggest_cancel(void *cls,
   if (CT_NONE == c->type)
     c->type = CT_APPLICATION;
   if (CT_APPLICATION != c->type)
-    {
-      GNUNET_break(0);
-      GNUNET_SERVICE_client_drop(c->client);
-      return;
-    }
+  {
+    GNUNET_break (0);
+    GNUNET_SERVICE_client_drop (c->client);
+    return;
+  }
   for (cp = c->details.application.cp_head;
        NULL != cp;
        cp = cp->next)
-    if ((cp->pref.pk == (enum GNUNET_MQ_PreferenceKind)ntohl(msg->pk)) &&
+    if ((cp->pref.pk == (enum GNUNET_MQ_PreferenceKind) ntohl (msg->pk)) &&
         (cp->pref.bw.value__ == msg->bw.value__) &&
-        (0 == GNUNET_memcmp(&cp->pref.peer,
-                            &msg->peer)))
+        (0 == GNUNET_memcmp (&cp->pref.peer,
+                             &msg->peer)))
       break;
   if (NULL == cp)
-    {
-      GNUNET_break(0);
-      GNUNET_SERVICE_client_drop(c->client);
-      return;
-    }
-  plugin->preference_del(plugin->cls,
-                         cp->ph,
-                         &cp->pref);
-  GNUNET_CONTAINER_DLL_remove(c->details.application.cp_head,
-                              c->details.application.cp_tail,
-                              cp);
-  GNUNET_free(cp);
-  GNUNET_SERVICE_client_continue(c->client);
+  {
+    GNUNET_break (0);
+    GNUNET_SERVICE_client_drop (c->client);
+    return;
+  }
+  plugin->preference_del (plugin->cls,
+                          cp->ph,
+                          &cp->pref);
+  GNUNET_CONTAINER_DLL_remove (c->details.application.cp_head,
+                               c->details.application.cp_tail,
+                               cp);
+  GNUNET_free (cp);
+  GNUNET_SERVICE_client_continue (c->client);
 }
 
 
@@ -377,27 +385,27 @@ handle_suggest_cancel(void *cls,
  * @param message the request message
  */
 static void
-handle_start(void *cls,
-             const struct GNUNET_MessageHeader *hdr)
+handle_start (void *cls,
+              const struct GNUNET_MessageHeader *hdr)
 {
   struct Client *c = cls;
 
   if (CT_NONE != c->type)
-    {
-      GNUNET_break(0);
-      GNUNET_SERVICE_client_drop(c->client);
-      return;
-    }
+  {
+    GNUNET_break (0);
+    GNUNET_SERVICE_client_drop (c->client);
+    return;
+  }
   c->type = CT_TRANSPORT;
   c->details.transport.sessions
-    = GNUNET_CONTAINER_multihashmap32_create(128);
+    = GNUNET_CONTAINER_multihashmap32_create (128);
   if (NULL != transport_client)
-    {
-      GNUNET_SERVICE_client_drop(transport_client->client);
-      transport_client = NULL;
-    }
+  {
+    GNUNET_SERVICE_client_drop (transport_client->client);
+    transport_client = NULL;
+  }
   transport_client = c;
-  GNUNET_SERVICE_client_continue(c->client);
+  GNUNET_SERVICE_client_continue (c->client);
 }
 
 
@@ -410,17 +418,17 @@ handle_start(void *cls,
  * @return #GNUNET_OK if @a message is well-formed
  */
 static int
-check_session_add(void *cls,
-                  const struct SessionAddMessage *message)
+check_session_add (void *cls,
+                   const struct SessionAddMessage *message)
 {
   struct Client *c = cls;
 
-  GNUNET_MQ_check_zero_termination(message);
+  GNUNET_MQ_check_zero_termination (message);
   if (CT_TRANSPORT != c->type)
-    {
-      GNUNET_break(0);
-      return GNUNET_SYSERR;
-    }
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
   return GNUNET_OK;
 }
 
@@ -432,45 +440,46 @@ check_session_add(void *cls,
  * @param message the request message
  */
 static void
-handle_session_add(void *cls,
-                   const struct SessionAddMessage *message)
+handle_session_add (void *cls,
+                    const struct SessionAddMessage *message)
 {
   struct Client *c = cls;
-  const char *address = (const char *)&message[1];
+  const char *address = (const char *) &message[1];
   struct GNUNET_ATS_Session *session;
   int inbound_only = (GNUNET_MESSAGE_TYPE_ATS_SESSION_ADD_INBOUND_ONLY ==
-                      ntohs(message->header.type));
+                      ntohs (message->header.type));
 
-  session = GNUNET_CONTAINER_multihashmap32_get(c->details.transport.sessions,
-                                                message->session_id);
+  session = GNUNET_CONTAINER_multihashmap32_get (c->details.transport.sessions,
+                                                 message->session_id);
   if (NULL != session)
-    {
-      GNUNET_break(0);
-      GNUNET_SERVICE_client_drop(c->client);
-      return;
-    }
-  session = GNUNET_new(struct GNUNET_ATS_Session);
+  {
+    GNUNET_break (0);
+    GNUNET_SERVICE_client_drop (c->client);
+    return;
+  }
+  session = GNUNET_new (struct GNUNET_ATS_Session);
   session->data.session = session;
   session->client = c;
   session->session_id = message->session_id;
   session->data.peer = message->peer;
-  prop_ntoh(&message->properties,
-            &session->data.prop);
+  prop_ntoh (&message->properties,
+             &session->data.prop);
   session->data.inbound_only = inbound_only;
-  GNUNET_assert(GNUNET_YES ==
-                GNUNET_CONTAINER_multihashmap32_put(c->details.transport.sessions,
-                                                    message->session_id,
-                                                    session,
-                                                    GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
-  session->sh = plugin->session_add(plugin->cls,
-                                    &session->data,
-                                    address);
-  GNUNET_assert(NULL != session->sh);
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Transport has new session %p to %s\n",
-             session,
-             GNUNET_i2s(&message->peer));
-  GNUNET_SERVICE_client_continue(c->client);
+  GNUNET_assert (GNUNET_YES ==
+                 GNUNET_CONTAINER_multihashmap32_put (
+                   c->details.transport.sessions,
+                   message->session_id,
+                   session,
+                   GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+  session->sh = plugin->session_add (plugin->cls,
+                                     &session->data,
+                                     address);
+  GNUNET_assert (NULL != session->sh);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Transport has new session %p to %s\n",
+              session,
+              GNUNET_i2s (&message->peer));
+  GNUNET_SERVICE_client_continue (c->client);
 }
 
 
@@ -481,32 +490,32 @@ handle_session_add(void *cls,
  * @param msg the request message
  */
 static void
-handle_session_update(void *cls,
-                      const struct SessionUpdateMessage *msg)
+handle_session_update (void *cls,
+                       const struct SessionUpdateMessage *msg)
 {
   struct Client *c = cls;
   struct GNUNET_ATS_Session *session;
 
   if (CT_TRANSPORT != c->type)
-    {
-      GNUNET_break(0);
-      GNUNET_SERVICE_client_drop(c->client);
-      return;
-    }
-  session = GNUNET_CONTAINER_multihashmap32_get(c->details.transport.sessions,
-                                                msg->session_id);
+  {
+    GNUNET_break (0);
+    GNUNET_SERVICE_client_drop (c->client);
+    return;
+  }
+  session = GNUNET_CONTAINER_multihashmap32_get (c->details.transport.sessions,
+                                                 msg->session_id);
   if (NULL == session)
-    {
-      GNUNET_break(0);
-      GNUNET_SERVICE_client_drop(c->client);
-      return;
-    }
-  prop_ntoh(&msg->properties,
-            &session->data.prop);
-  plugin->session_update(plugin->cls,
-                         session->sh,
-                         &session->data);
-  GNUNET_SERVICE_client_continue(c->client);
+  {
+    GNUNET_break (0);
+    GNUNET_SERVICE_client_drop (c->client);
+    return;
+  }
+  prop_ntoh (&msg->properties,
+             &session->data.prop);
+  plugin->session_update (plugin->cls,
+                          session->sh,
+                          &session->data);
+  GNUNET_SERVICE_client_continue (c->client);
 }
 
 
@@ -517,41 +526,42 @@ handle_session_update(void *cls,
  * @param message the request message
  */
 static void
-handle_session_del(void *cls,
-                   const struct SessionDelMessage *message)
+handle_session_del (void *cls,
+                    const struct SessionDelMessage *message)
 {
   struct Client *c = cls;
   struct GNUNET_ATS_Session *session;
 
   if (CT_TRANSPORT != c->type)
-    {
-      GNUNET_break(0);
-      GNUNET_SERVICE_client_drop(c->client);
-      return;
-    }
-  session = GNUNET_CONTAINER_multihashmap32_get(c->details.transport.sessions,
-                                                message->session_id);
+  {
+    GNUNET_break (0);
+    GNUNET_SERVICE_client_drop (c->client);
+    return;
+  }
+  session = GNUNET_CONTAINER_multihashmap32_get (c->details.transport.sessions,
+                                                 message->session_id);
   if (NULL == session)
-    {
-      GNUNET_break(0);
-      GNUNET_SERVICE_client_drop(c->client);
-      return;
-    }
-  GNUNET_assert(NULL != session->sh);
-  plugin->session_del(plugin->cls,
-                      session->sh,
-                      &session->data);
+  {
+    GNUNET_break (0);
+    GNUNET_SERVICE_client_drop (c->client);
+    return;
+  }
+  GNUNET_assert (NULL != session->sh);
+  plugin->session_del (plugin->cls,
+                       session->sh,
+                       &session->data);
   session->sh = NULL;
-  GNUNET_assert(GNUNET_YES ==
-                GNUNET_CONTAINER_multihashmap32_remove(c->details.transport.sessions,
-                                                       session->session_id,
-                                                       session));
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Transport lost session %p to %s\n",
-             session,
-             GNUNET_i2s(&session->data.peer));
-  GNUNET_free(session);
-  GNUNET_SERVICE_client_continue(c->client);
+  GNUNET_assert (GNUNET_YES ==
+                 GNUNET_CONTAINER_multihashmap32_remove (
+                   c->details.transport.sessions,
+                   session->session_id,
+                   session));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Transport lost session %p to %s\n",
+              session,
+              GNUNET_i2s (&session->data.peer));
+  GNUNET_free (session);
+  GNUNET_SERVICE_client_continue (c->client);
 }
 
 
@@ -565,11 +575,11 @@ handle_session_del(void *cls,
  * @return @a client
  */
 static void *
-client_connect_cb(void *cls,
-                  struct GNUNET_SERVICE_Client *client,
-                  struct GNUNET_MQ_Handle *mq)
+client_connect_cb (void *cls,
+                   struct GNUNET_SERVICE_Client *client,
+                   struct GNUNET_MQ_Handle *mq)
 {
-  struct Client *c = GNUNET_new(struct Client);
+  struct Client *c = GNUNET_new (struct Client);
 
   c->client = client;
   c->mq = mq;
@@ -586,21 +596,21 @@ client_connect_cb(void *cls,
  * @param value a `struct GNUNET_ATS_Session`
  */
 static int
-free_session(void *cls,
-             uint32_t key,
-             void *value)
+free_session (void *cls,
+              uint32_t key,
+              void *value)
 {
   struct Client *c = cls;
   struct GNUNET_ATS_Session *session = value;
 
-  (void)key;
-  GNUNET_assert(c == session->client);
-  GNUNET_assert(NULL != session->sh);
-  plugin->session_del(plugin->cls,
-                      session->sh,
-                      &session->data);
+  (void) key;
+  GNUNET_assert (c == session->client);
+  GNUNET_assert (NULL != session->sh);
+  plugin->session_del (plugin->cls,
+                       session->sh,
+                       &session->data);
   session->sh = NULL;
-  GNUNET_free(session);
+  GNUNET_free (session);
   return GNUNET_OK;
 }
 
@@ -614,44 +624,44 @@ free_session(void *cls,
  * @param app_ctx our `struct Client`
  */
 static void
-client_disconnect_cb(void *cls,
-                     struct GNUNET_SERVICE_Client *client,
-                     void *app_ctx)
+client_disconnect_cb (void *cls,
+                      struct GNUNET_SERVICE_Client *client,
+                      void *app_ctx)
 {
   struct Client *c = app_ctx;
 
-  (void)cls;
-  GNUNET_assert(c->client == client);
+  (void) cls;
+  GNUNET_assert (c->client == client);
   switch (c->type)
+  {
+  case CT_NONE:
+    break;
+
+  case CT_APPLICATION:
+    for (struct ClientPreference *cp = c->details.application.cp_head;
+         NULL != cp;
+         cp = c->details.application.cp_head)
     {
-    case CT_NONE:
-      break;
-
-    case CT_APPLICATION:
-      for (struct ClientPreference *cp = c->details.application.cp_head;
-           NULL != cp;
-           cp = c->details.application.cp_head)
-        {
-          plugin->preference_del(plugin->cls,
-                                 cp->ph,
-                                 &cp->pref);
-          GNUNET_CONTAINER_DLL_remove(c->details.application.cp_head,
-                                      c->details.application.cp_tail,
-                                      cp);
-          GNUNET_free(cp);
-        }
-      break;
-
-    case CT_TRANSPORT:
-      if (transport_client == c)
-        transport_client = NULL;
-      GNUNET_CONTAINER_multihashmap32_iterate(c->details.transport.sessions,
-                                              &free_session,
-                                              c);
-      GNUNET_CONTAINER_multihashmap32_destroy(c->details.transport.sessions);
-      break;
+      plugin->preference_del (plugin->cls,
+                              cp->ph,
+                              &cp->pref);
+      GNUNET_CONTAINER_DLL_remove (c->details.application.cp_head,
+                                   c->details.application.cp_tail,
+                                   cp);
+      GNUNET_free (cp);
     }
-  GNUNET_free(c);
+    break;
+
+  case CT_TRANSPORT:
+    if (transport_client == c)
+      transport_client = NULL;
+    GNUNET_CONTAINER_multihashmap32_iterate (c->details.transport.sessions,
+                                             &free_session,
+                                             c);
+    GNUNET_CONTAINER_multihashmap32_destroy (c->details.transport.sessions);
+    break;
+  }
+  GNUNET_free (c);
 }
 
 
@@ -661,26 +671,26 @@ client_disconnect_cb(void *cls,
  * @param cls unused
  */
 static void
-final_cleanup(void *cls)
+final_cleanup (void *cls)
 {
-  (void)cls;
+  (void) cls;
   if (NULL != stats)
-    {
-      GNUNET_STATISTICS_destroy(stats,
-                                GNUNET_NO);
-      stats = NULL;
-    }
+  {
+    GNUNET_STATISTICS_destroy (stats,
+                               GNUNET_NO);
+    stats = NULL;
+  }
   if (NULL != plugin)
-    {
-      GNUNET_PLUGIN_unload(plugin_name,
-                           plugin);
-      plugin = NULL;
-    }
+  {
+    GNUNET_PLUGIN_unload (plugin_name,
+                          plugin);
+    plugin = NULL;
+  }
   if (NULL != plugin_name)
-    {
-      GNUNET_free(plugin_name);
-      plugin_name = NULL;
-    }
+  {
+    GNUNET_free (plugin_name);
+    plugin_name = NULL;
+  }
 }
 
 
@@ -690,13 +700,13 @@ final_cleanup(void *cls)
  * @param cls unused
  */
 static void
-cleanup_task(void *cls)
+cleanup_task (void *cls)
 {
-  (void)cls;
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "ATS shutdown initiated\n");
-  GNUNET_SCHEDULER_add_now(&final_cleanup,
-                           NULL);
+  (void) cls;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "ATS shutdown initiated\n");
+  GNUNET_SCHEDULER_add_now (&final_cleanup,
+                            NULL);
 }
 
 
@@ -708,45 +718,45 @@ cleanup_task(void *cls)
  * @param service the initialized service
  */
 static void
-run(void *cls,
-    const struct GNUNET_CONFIGURATION_Handle *cfg,
-    struct GNUNET_SERVICE_Handle *service)
+run (void *cls,
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_SERVICE_Handle *service)
 {
   static struct GNUNET_ATS_PluginEnvironment env;
   char *solver;
 
-  stats = GNUNET_STATISTICS_create("ats",
-                                   cfg);
+  stats = GNUNET_STATISTICS_create ("ats",
+                                    cfg);
   if (GNUNET_SYSERR ==
-      GNUNET_CONFIGURATION_get_value_string(cfg,
-                                            "ats",
-                                            "SOLVER",
-                                            &solver))
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
-                 "No ATS solver configured, using 'simple' approach\n");
-      solver = GNUNET_strdup("simple");
-    }
-  GNUNET_SCHEDULER_add_shutdown(&cleanup_task,
-                                NULL);
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+                                             "ats",
+                                             "SOLVER",
+                                             &solver))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "No ATS solver configured, using 'simple' approach\n");
+    solver = GNUNET_strdup ("simple");
+  }
+  GNUNET_SCHEDULER_add_shutdown (&cleanup_task,
+                                 NULL);
   env.cls = NULL;
   env.cfg = cfg;
   env.stats = stats;
   env.suggest_cb = &suggest_cb;
   env.allocate_cb = &allocate_cb;
-  GNUNET_asprintf(&plugin_name,
-                  "libgnunet_plugin_ats2_%s",
-                  solver);
-  GNUNET_free(solver);
-  if (NULL == (plugin = GNUNET_PLUGIN_load(plugin_name,
-                                           &env)))
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                 _("Failed to initialize solver `%s'!\n"),
-                 plugin_name);
-      GNUNET_SCHEDULER_shutdown();
-      return;
-    }
+  GNUNET_asprintf (&plugin_name,
+                   "libgnunet_plugin_ats2_%s",
+                   solver);
+  GNUNET_free (solver);
+  if (NULL == (plugin = GNUNET_PLUGIN_load (plugin_name,
+                                            &env)))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _ ("Failed to initialize solver `%s'!\n"),
+                plugin_name);
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
 }
 
 
@@ -760,35 +770,35 @@ GNUNET_SERVICE_MAIN
   &client_connect_cb,
   &client_disconnect_cb,
   NULL,
-  GNUNET_MQ_hd_fixed_size(suggest,
-                          GNUNET_MESSAGE_TYPE_ATS_SUGGEST,
-                          struct ExpressPreferenceMessage,
-                          NULL),
-  GNUNET_MQ_hd_fixed_size(suggest_cancel,
-                          GNUNET_MESSAGE_TYPE_ATS_SUGGEST_CANCEL,
-                          struct ExpressPreferenceMessage,
-                          NULL),
-  GNUNET_MQ_hd_fixed_size(start,
-                          GNUNET_MESSAGE_TYPE_ATS_START,
-                          struct GNUNET_MessageHeader,
-                          NULL),
-  GNUNET_MQ_hd_var_size(session_add,
-                        GNUNET_MESSAGE_TYPE_ATS_SESSION_ADD,
-                        struct SessionAddMessage,
-                        NULL),
-  GNUNET_MQ_hd_var_size(session_add,
-                        GNUNET_MESSAGE_TYPE_ATS_SESSION_ADD_INBOUND_ONLY,
-                        struct SessionAddMessage,
-                        NULL),
-  GNUNET_MQ_hd_fixed_size(session_update,
-                          GNUNET_MESSAGE_TYPE_ATS_SESSION_UPDATE,
-                          struct SessionUpdateMessage,
-                          NULL),
-  GNUNET_MQ_hd_fixed_size(session_del,
-                          GNUNET_MESSAGE_TYPE_ATS_SESSION_DEL,
-                          struct SessionDelMessage,
-                          NULL),
-  GNUNET_MQ_handler_end());
+  GNUNET_MQ_hd_fixed_size (suggest,
+                           GNUNET_MESSAGE_TYPE_ATS_SUGGEST,
+                           struct ExpressPreferenceMessage,
+                           NULL),
+  GNUNET_MQ_hd_fixed_size (suggest_cancel,
+                           GNUNET_MESSAGE_TYPE_ATS_SUGGEST_CANCEL,
+                           struct ExpressPreferenceMessage,
+                           NULL),
+  GNUNET_MQ_hd_fixed_size (start,
+                           GNUNET_MESSAGE_TYPE_ATS_START,
+                           struct GNUNET_MessageHeader,
+                           NULL),
+  GNUNET_MQ_hd_var_size (session_add,
+                         GNUNET_MESSAGE_TYPE_ATS_SESSION_ADD,
+                         struct SessionAddMessage,
+                         NULL),
+  GNUNET_MQ_hd_var_size (session_add,
+                         GNUNET_MESSAGE_TYPE_ATS_SESSION_ADD_INBOUND_ONLY,
+                         struct SessionAddMessage,
+                         NULL),
+  GNUNET_MQ_hd_fixed_size (session_update,
+                           GNUNET_MESSAGE_TYPE_ATS_SESSION_UPDATE,
+                           struct SessionUpdateMessage,
+                           NULL),
+  GNUNET_MQ_hd_fixed_size (session_del,
+                           GNUNET_MESSAGE_TYPE_ATS_SESSION_DEL,
+                           struct SessionDelMessage,
+                           NULL),
+  GNUNET_MQ_handler_end ());
 
 
 /* end of gnunet-service-ats.c */