-only trigger check config if we actually need it

[oweals/gnunet.git] / src / ats / gnunet-service-ats_scheduling.c

diff --git a/src/ats/gnunet-service-ats_scheduling.c b/src/ats/gnunet-service-ats_scheduling.c
index 9d7562e7b7f82c9275e1b0a5a57c8c8ffabbce4e..45cd0dec16edd5845928f967a2f800eda9184873 100644 (file)
--- a/src/ats/gnunet-service-ats_scheduling.c
+++ b/src/ats/gnunet-service-ats_scheduling.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2011-2014 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2011-2014 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -25,7 +25,6 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "gnunet-service-ats.h"
 #include "gnunet-service-ats_addresses.h"
 #include "gnunet-service-ats_scheduling.h"
 #include "ats.h"
@@ -58,7 +57,10 @@ GAS_scheduling_add_client (struct GNUNET_SERVER_Client *client)
     return GNUNET_SYSERR;
   }
   my_client = client;
-  GNUNET_SERVER_notification_context_add (nc, client);
+  GNUNET_SERVER_notification_context_add (nc,
+                                          client);
+  GNUNET_SERVER_client_set_user_context (client,
+                                         &nc);
   return GNUNET_OK;
 }
 
@@ -99,7 +101,8 @@ GAS_scheduling_transmit_address_suggestion (const struct GNUNET_PeerIdentity *pe
   if (NULL == my_client)
     return;
   GNUNET_STATISTICS_update (GSA_stats,
-                            "# address suggestions made", 1,
+                            "# address suggestions made",
+                           1,
                             GNUNET_NO);
   msg.header.size = htons (sizeof (struct AddressSuggestionMessage));
   msg.header.type = htons (GNUNET_MESSAGE_TYPE_ATS_ADDRESS_SUGGESTION);
@@ -132,13 +135,12 @@ GAS_handle_address_add (void *cls,
                         const struct GNUNET_MessageHeader *message)
 {
   const struct AddressAddMessage *m;
-  const struct GNUNET_ATS_Information *atsi;
   const char *address;
   const char *plugin_name;
   uint16_t address_length;
   uint16_t plugin_name_length;
-  uint32_t ats_count;
   uint16_t size;
+  struct GNUNET_ATS_Properties prop;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received `%s' message\n",
@@ -151,38 +153,39 @@ GAS_handle_address_add (void *cls,
     return;
   }
   m = (const struct AddressAddMessage *) 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];
+  address = (const char *) &m[1];
   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 AddressAddMessage) != ntohs (message->size)) ||
-      (ats_count >
-       GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_ATS_Information)) ||
-       ((plugin_name_length > 0) && (plugin_name[plugin_name_length - 1] != '\0')))
+       ( (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 created", 1,
+                            "# addresses created",
+                            1,
                             GNUNET_NO);
+  GNUNET_ATS_properties_ntoh (&prop,
+                              &m->properties);
+  GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != prop.scope);
   GAS_addresses_add (&m->peer,
                      plugin_name,
                      address,
                      address_length,
-                     ntohl(m->address_local_info),
+                     ntohl (m->address_local_info),
                      ntohl (m->session_id),
-                     atsi, ats_count);
-  GNUNET_SERVER_receive_done (client, GNUNET_OK);
+                     &prop);
+  GNUNET_SERVER_receive_done (client,
+                              GNUNET_OK);
 }
 
 
@@ -199,41 +202,20 @@ GAS_handle_address_update (void *cls,
                            const struct GNUNET_MessageHeader *message)
 {
   const struct AddressUpdateMessage *m;
-  const struct GNUNET_ATS_Information *atsi;
-  uint32_t ats_count;
-  uint16_t size;
+  struct GNUNET_ATS_Properties prop;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received `%s' message\n",
-              "ADDRESS_UPDATE");
-  size = ntohs (message->size);
-  if (size < sizeof (struct AddressUpdateMessage))
-  {
-    GNUNET_break (0);
-    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-    return;
-  }
   m = (const struct AddressUpdateMessage *) message;
-  ats_count = ntohl (m->ats_count);
-  atsi = (const struct GNUNET_ATS_Information *) &m[1];
-
-  if ((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)))
-  {
-    GNUNET_break (0);
-    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-    return;
-  }
   GNUNET_STATISTICS_update (GSA_stats,
                             "# address updates received",
                             1,
                             GNUNET_NO);
+  GNUNET_ATS_properties_ntoh (&prop,
+                              &m->properties);
   GAS_addresses_update (&m->peer,
                         ntohl (m->session_id),
-                        atsi, ats_count);
-  GNUNET_SERVER_receive_done (client, GNUNET_OK);
+                        &prop);
+  GNUNET_SERVER_receive_done (client,
+                              GNUNET_OK);
 }
 
 
@@ -250,7 +232,7 @@ GAS_handle_address_destroyed (void *cls,
                               const struct GNUNET_MessageHeader *message)
 {
   const struct AddressDestroyedMessage *m;
-  struct SessionReleaseMessage srm;
+  struct GNUNET_ATS_SessionReleaseMessage srm;
 
   m = (const struct AddressDestroyedMessage *) message;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -263,7 +245,7 @@ GAS_handle_address_destroyed (void *cls,
   GAS_addresses_destroy (&m->peer,
                          ntohl (m->session_id));
   srm.header.type = ntohs (GNUNET_MESSAGE_TYPE_ATS_SESSION_RELEASE);
-  srm.header.size = ntohs (sizeof (struct SessionReleaseMessage));
+  srm.header.size = ntohs (sizeof (struct GNUNET_ATS_SessionReleaseMessage));
   srm.session_id = m->session_id;
   srm.peer = m->peer;
   GNUNET_SERVER_notification_context_unicast (nc,