1 files changed, 79 insertions, 98 deletions

diff --git a/src/ats/gnunet-service-ats_scheduling.c b/src/ats/gnunet-service-ats_scheduling.c
index bb95182c8..4af44e29b 100644
--- a/src/ats/gnunet-service-ats_scheduling.c
+++ b/src/ats/gnunet-service-ats_scheduling.c
@@ -46,7 +46,7 @@ static struct GNUNET_SERVER_Client *my_client;
  * Register a new scheduling client.
  *
  * @param client handle of the new client
- * @return GNUNET_OK on success, GNUNET_SYSERR on error 
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error
  */
 int
 GAS_scheduling_add_client (struct GNUNET_SERVER_Client *client)
@@ -54,7 +54,7 @@ GAS_scheduling_add_client (struct GNUNET_SERVER_Client *client)
   if (my_client != NULL)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "This ATS already has a scheduling client, refusing new scheduling client for now.\n");
+                "This ATS already has a scheduling client, refusing new scheduling client for now.\n");
     return GNUNET_SYSERR;
   }
   my_client = client;
@@ -96,32 +96,37 @@ GAS_scheduling_remove_client (struct GNUNET_SERVER_Client *client)
  * @param bandwidth_in assigned inbound bandwidth
  */
 void
-GAS_scheduling_transmit_address_suggestion (const struct GNUNET_PeerIdentity *peer,
-                                            const char *plugin_name,
-                                            const void *plugin_addr, size_t plugin_addr_len,
-                                            uint32_t session_id,
-                                            const struct GNUNET_ATS_Information *atsi,
-                                            uint32_t atsi_count,                                
-                                            struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
-                                            struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
+GAS_scheduling_transmit_address_suggestion (const struct GNUNET_PeerIdentity
+                                            *peer, const char *plugin_name,
+                                            const void *plugin_addr,
+                                            size_t plugin_addr_len,
+                                            uint32_t session_id,
+                                            const struct GNUNET_ATS_Information
+                                            *atsi, uint32_t atsi_count,
+                                            struct GNUNET_BANDWIDTH_Value32NBO
+                                            bandwidth_out,
+                                            struct GNUNET_BANDWIDTH_Value32NBO
+                                            bandwidth_in)
 {
   struct AddressSuggestionMessage *msg;
   size_t plugin_name_length = strlen (plugin_name) + 1;
-  size_t msize = sizeof (struct AddressSuggestionMessage) + atsi_count * sizeof (struct GNUNET_ATS_Information) 
-    + plugin_addr_len + plugin_name_length;
+  size_t msize =
+      sizeof (struct AddressSuggestionMessage) +
+      atsi_count * sizeof (struct GNUNET_ATS_Information) + plugin_addr_len +
+      plugin_name_length;
   char buf[msize];
   struct GNUNET_ATS_Information *atsp;
   char *addrp;
 
   if (my_client == NULL)
     return;
-  GNUNET_STATISTICS_update (GSA_stats,
-                            "# address suggestions made",
-                            1,
-                            GNUNET_NO);
+  GNUNET_STATISTICS_update (GSA_stats, "# address suggestions made", 1,
+                            GNUNET_NO);
   GNUNET_assert (msize < GNUNET_SERVER_MAX_MESSAGE_SIZE);
-  GNUNET_assert (atsi_count < GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_ATS_Information));
-  msg = (struct AddressSuggestionMessage*) buf;
+  GNUNET_assert (atsi_count <
+                 GNUNET_SERVER_MAX_MESSAGE_SIZE /
+                 sizeof (struct GNUNET_ATS_Information));
+  msg = (struct AddressSuggestionMessage *) buf;
   msg->header.size = htons (msize);
   msg->header.type = htons (GNUNET_MESSAGE_TYPE_ATS_ADDRESS_SUGGESTION);
   msg->ats_count = htonl (atsi_count);
@@ -131,15 +136,13 @@ GAS_scheduling_transmit_address_suggestion (const struct GNUNET_PeerIdentity *pe
   msg->session_id = htonl (session_id);
   msg->bandwidth_out = bandwidth_out;
   msg->bandwidth_in = bandwidth_in;
-  atsp = (struct GNUNET_ATS_Information* ) &msg[1];
+  atsp = (struct GNUNET_ATS_Information *) &msg[1];
   memcpy (atsp, atsi, sizeof (struct GNUNET_ATS_Information) * atsi_count);
-  addrp = (char*) &atsp[atsi_count];
+  addrp = (char *) &atsp[atsi_count];
   memcpy (addrp, plugin_addr, plugin_addr_len);
   strcpy (&addrp[plugin_addr_len], plugin_name);
-  GNUNET_SERVER_notification_context_unicast (nc,
-                                              my_client,
-                                              &msg->header,
-                                              GNUNET_YES);
+  GNUNET_SERVER_notification_context_unicast (nc, my_client, &msg->header,
+                                              GNUNET_YES);
 }
 
 
@@ -152,16 +155,15 @@ GAS_scheduling_transmit_address_suggestion (const struct GNUNET_PeerIdentity *pe
  */
 void
 GAS_handle_request_address (void *cls, struct GNUNET_SERVER_Client *client,
-                            const struct GNUNET_MessageHeader *message)
-
+                            const struct GNUNET_MessageHeader *message)
 {
-  const struct RequestAddressMessage * msg = (const struct RequestAddressMessage *) message;
+  const struct RequestAddressMessage *msg =
+      (const struct RequestAddressMessage *) message;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "REQUEST_ADDRESS");
-  GNUNET_STATISTICS_update (GSA_stats,
-                            "# address requests received",
-                            1,
-                            GNUNET_NO);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n",
+              "REQUEST_ADDRESS");
+  GNUNET_STATISTICS_update (GSA_stats, "# address requests received", 1,
+                            GNUNET_NO);
   GNUNET_break (0 == ntohl (msg->reserved));
   GAS_addresses_request_address (&msg->peer);
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
@@ -177,9 +179,9 @@ GAS_handle_request_address (void *cls, struct GNUNET_SERVER_Client *client,
  */
 void
 GAS_handle_address_update (void *cls, struct GNUNET_SERVER_Client *client,
-                           const struct GNUNET_MessageHeader *message)
+                           const struct GNUNET_MessageHeader *message)
 {
-  const struct AddressUpdateMessage * m;
+  const struct AddressUpdateMessage *m;
   const struct GNUNET_ATS_Information *atsi;
   const char *address;
   const char *plugin_name;
@@ -188,9 +190,8 @@ GAS_handle_address_update (void *cls, struct GNUNET_SERVER_Client *client,
   uint32_t ats_count;
   uint16_t size;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
-              "Received `%s' message\n",
-              "ADDRESS_UPDATE");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n",
+              "ADDRESS_UPDATE");
   size = ntohs (message->size);
   if (size < sizeof (struct AddressUpdateMessage))
   {
@@ -198,38 +199,31 @@ GAS_handle_address_update (void *cls, struct GNUNET_SERVER_Client *client,
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;
   }
-  m = (const struct AddressUpdateMessage*) message;
+  m = (const struct AddressUpdateMessage *) message;
   ats_count = ntohl (m->ats_count);
   address_length = ntohs (m->address_length);
-  plugin_name_length = ntohs (m->plugin_name_length);  
-  atsi = (const struct GNUNET_ATS_Information*) &m[1];
-  address = (const char*) &atsi[ats_count];
+  plugin_name_length = ntohs (m->plugin_name_length);
+  atsi = (const struct GNUNET_ATS_Information *) &m[1];
+  address = (const char *) &atsi[ats_count];
   if (plugin_name_length != 0)
     plugin_name = &address[address_length];
   else
     plugin_name = "";
-  if ( (address_length +
-        plugin_name_length +
-        ats_count * sizeof (struct GNUNET_ATS_Information) +
-        sizeof (struct AddressUpdateMessage) != ntohs (message->size))  ||
-       (ats_count > GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_ATS_Information)) ||
-       (plugin_name[plugin_name_length - 1] != '\0') )
+  if ((address_length + plugin_name_length +
+       ats_count * sizeof (struct GNUNET_ATS_Information) +
+       sizeof (struct AddressUpdateMessage) != ntohs (message->size)) ||
+      (ats_count >
+       GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_ATS_Information))
+      || (plugin_name[plugin_name_length - 1] != '\0'))
   {
     GNUNET_break (0);
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;
   }
-  GNUNET_STATISTICS_update (GSA_stats,
-                            "# address updates received",
-                            1,
-                            GNUNET_NO);
-  GAS_addresses_update (&m->peer,
-                        plugin_name,
-                        address,
-                        address_length,
-                        ntohl (m->session_id),
-                        atsi,
-                        ats_count);
+  GNUNET_STATISTICS_update (GSA_stats, "# address updates received", 1,
+                            GNUNET_NO);
+  GAS_addresses_update (&m->peer, plugin_name, address, address_length,
+                        ntohl (m->session_id), atsi, ats_count);
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 
@@ -245,7 +239,7 @@ void
 GAS_handle_address_in_use (void *cls, struct GNUNET_SERVER_Client *client,
                            const struct GNUNET_MessageHeader *message)
 {
-  const struct AddressUseMessage * m;
+  const struct AddressUseMessage *m;
   const char *address;
   const char *plugin_name;
   uint16_t address_length;
@@ -253,8 +247,7 @@ GAS_handle_address_in_use (void *cls, struct GNUNET_SERVER_Client *client,
 
   uint16_t size;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received `%s' message\n",
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n",
               "ADDRESS_IN_USE");
   size = ntohs (message->size);
   if (size < sizeof (struct AddressUseMessage))
@@ -263,21 +256,20 @@ GAS_handle_address_in_use (void *cls, struct GNUNET_SERVER_Client *client,
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;
   }
-  m = (const struct AddressUseMessage*) message;
+  m = (const struct AddressUseMessage *) message;
 
   address_length = ntohs (m->address_length);
   plugin_name_length = ntohs (m->plugin_name_length);
 
-  address = (const char*) &m[1];
+  address = (const char *) &m[1];
   if (plugin_name_length != 0)
     plugin_name = &address[address_length];
   else
     plugin_name = "";
 
-  if ( (address_length +
-        plugin_name_length +
-        sizeof (struct AddressUseMessage) != ntohs (message->size))  ||
-       (plugin_name[plugin_name_length - 1] != '\0') )
+  if ((address_length + plugin_name_length +
+       sizeof (struct AddressUseMessage) != ntohs (message->size)) ||
+      (plugin_name[plugin_name_length - 1] != '\0'))
   {
     GNUNET_break (0);
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
@@ -306,10 +298,9 @@ GAS_handle_address_in_use (void *cls, struct GNUNET_SERVER_Client *client,
  */
 void
 GAS_handle_address_destroyed (void *cls, struct GNUNET_SERVER_Client *client,
-                              const struct GNUNET_MessageHeader *message)
-
+                              const struct GNUNET_MessageHeader *message)
 {
-  const struct AddressDestroyedMessage * m;
+  const struct AddressDestroyedMessage *m;
   struct SessionReleaseMessage srm;
   const char *address;
   const char *plugin_name;
@@ -317,60 +308,50 @@ GAS_handle_address_destroyed (void *cls, struct GNUNET_SERVER_Client *client,
   uint16_t plugin_name_length;
   uint16_t size;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received `%s' message of size %u %u\n",
-              "ADDRESS_DESTROYED", ntohs (message->size), sizeof (struct AddressDestroyedMessage));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message of size %u %u\n",
+              "ADDRESS_DESTROYED", ntohs (message->size),
+              sizeof (struct AddressDestroyedMessage));
   size = ntohs (message->size);
-  if ( (size < sizeof (struct AddressDestroyedMessage)) ||
-       (client != my_client) )
+  if ((size < sizeof (struct AddressDestroyedMessage)) || (client != my_client))
   {
     GNUNET_break (0);
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;
   }
-  m = (const struct AddressDestroyedMessage*) message;
+  m = (const struct AddressDestroyedMessage *) message;
   GNUNET_break (0 == ntohl (m->reserved));
   address_length = ntohs (m->address_length);
-  plugin_name_length = ntohs (m->plugin_name_length);  
-  address = (const char*) &m[1];
+  plugin_name_length = ntohs (m->plugin_name_length);
+  address = (const char *) &m[1];
   if (plugin_name_length != 0)
     plugin_name = &address[address_length];
   else
     plugin_name = "";
-  if ( (address_length +
-        plugin_name_length +
-        sizeof (struct AddressDestroyedMessage) != ntohs (message->size)))
+  if ((address_length + plugin_name_length +
+       sizeof (struct AddressDestroyedMessage) != ntohs (message->size)))
   {
     GNUNET_break (0);
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;
-  }  
-  if ( (plugin_name_length != 0) &&
-       (plugin_name[plugin_name_length - 1] != '\0') )
+  }
+  if ((plugin_name_length != 0) &&
+      (plugin_name[plugin_name_length - 1] != '\0'))
   {
     GNUNET_break (0);
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;
   }
-  GNUNET_STATISTICS_update (GSA_stats,
-                            "# addresses destroyed",
-                            1,
-                            GNUNET_NO);
-  GAS_addresses_destroy (&m->peer,
-                         plugin_name,
-                         address,
-                         address_length,
-                         ntohl (m->session_id));
+  GNUNET_STATISTICS_update (GSA_stats, "# addresses destroyed", 1, GNUNET_NO);
+  GAS_addresses_destroy (&m->peer, plugin_name, address, address_length,
+                         ntohl (m->session_id));
   if (0 != ntohl (m->session_id))
   {
     srm.header.type = ntohs (GNUNET_MESSAGE_TYPE_ATS_SESSION_RELEASE);
     srm.header.size = ntohs (sizeof (struct SessionReleaseMessage));
     srm.session_id = m->session_id;
     srm.peer = m->peer;
-    GNUNET_SERVER_notification_context_unicast (nc,
-                                                client,
-                                                &srm.header,
-                                                GNUNET_NO);
+    GNUNET_SERVER_notification_context_unicast (nc, client, &srm.header,
+                                                GNUNET_NO);
   }
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
@@ -382,7 +363,7 @@ GAS_handle_address_destroyed (void *cls, struct GNUNET_SERVER_Client *client,
  * @param server handle to our server
  */
 void
-GAS_scheduling_init (struct GNUNET_SERVER_Handle *server)                    
+GAS_scheduling_init (struct GNUNET_SERVER_Handle *server)
 {
   nc = GNUNET_SERVER_notification_context_create (server, 128);
 }