-remove dead include

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

diff --git a/src/ats/gnunet-service-ats.c b/src/ats/gnunet-service-ats.c
index e8cde18b6604a5b23ef2e36d202fe8fee2214cfe..729f1952b3e7bb1f4dd1e91805051c44cf2091dd 100644 (file)
--- a/src/ats/gnunet-service-ats.c
+++ b/src/ats/gnunet-service-ats.c
@@ -26,7 +26,6 @@
  */
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_ats_service.h"
 #include "gnunet-service-ats.h"
 #include "gnunet-service-ats_addresses.h"
 #include "gnunet-service-ats_performance.h"
@@ -39,11 +38,19 @@
  */
 struct GNUNET_STATISTICS_Handle *GSA_stats;
 
+/**
+ * Handle to the ATS server.
+ */
 static struct GNUNET_SERVER_Handle *GSA_server;
 
+/**
+ * Handle to the address state.
+ */
+static struct GAS_Addresses_Handle *GSA_addresses;
+
 
 /**
- * We have received a 'ClientStartMessage' from a client.  Find out which
+ * We have received a `struct ClientStartMessage` from a client.  Find out which
  * type of client it is and notify the respective subsystem.
  *
  * @param cls closure, unused
@@ -58,7 +65,9 @@ handle_ats_start (void *cls, struct GNUNET_SERVER_Client *client,
       (const struct ClientStartMessage *) message;
   enum StartFlag flag;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "ATS_START");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Received `%s' message\n",
+              "ATS_START");
   flag = ntohl (msg->start_flag);
   switch (flag)
   {
@@ -92,7 +101,8 @@ handle_ats_start (void *cls, struct GNUNET_SERVER_Client *client,
  * @param client handle of the client
  */
 static void
-client_disconnect_handler (void *cls, struct GNUNET_SERVER_Client *client)
+client_disconnect_handler (void *cls,
+                           struct GNUNET_SERVER_Client *client)
 {
   if (NULL == client)
     return;
@@ -108,12 +118,16 @@ client_disconnect_handler (void *cls, struct GNUNET_SERVER_Client *client)
  * @param tc unused
  */
 static void
-cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+cleanup_task (void *cls,
+              const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GAS_addresses_done ();
+  GAS_addresses_done (GSA_addresses);
   GAS_scheduling_done ();
   GAS_performance_done ();
   GAS_reservations_done ();
+  GNUNET_SERVER_disconnect_notify_cancel (GSA_server,
+                                          &client_disconnect_handler,
+                                          NULL);
   if (NULL != GSA_stats)
   {
     GNUNET_STATISTICS_destroy (GSA_stats, GNUNET_NO);
@@ -142,6 +156,11 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
     {&GAS_handle_request_address_cancel, NULL,
      GNUNET_MESSAGE_TYPE_ATS_REQUEST_ADDRESS_CANCEL,
      sizeof (struct RequestAddressMessage)},
+    {&GAS_handle_request_address_list, NULL,
+     GNUNET_MESSAGE_TYPE_ATS_ADDRESSLIST_REQUEST,
+     sizeof (struct AddressListRequestMessage)},
+    {&GAS_handle_address_add, NULL,
+     GNUNET_MESSAGE_TYPE_ATS_ADDRESS_ADD, 0},
     {&GAS_handle_address_update, NULL,
      GNUNET_MESSAGE_TYPE_ATS_ADDRESS_UPDATE, 0},
     {&GAS_handle_address_in_use, NULL,
@@ -153,14 +172,20 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
      sizeof (struct ReservationRequestMessage)},
     {&GAS_handle_preference_change, NULL,
      GNUNET_MESSAGE_TYPE_ATS_PREFERENCE_CHANGE, 0},
+    {&GAS_handle_preference_feedback, NULL,
+     GNUNET_MESSAGE_TYPE_ATS_PREFERENCE_FEEDBACK, 0},
+    {&GAS_handle_reset_backoff, NULL,
+     GNUNET_MESSAGE_TYPE_ATS_RESET_BACKOFF,
+     sizeof (struct ResetBackoffMessage)},
     {NULL, NULL, 0, 0}
   };
   GSA_server = server;
   GSA_stats = GNUNET_STATISTICS_create ("ats", cfg);
   GAS_reservations_init ();
-  GAS_performance_init (server);
-  GAS_scheduling_init (server);
-  GAS_addresses_init (cfg, GSA_stats);
+  GSA_addresses = GAS_addresses_init (cfg, GSA_stats);
+  GAS_performance_init (server, GSA_addresses);
+  GAS_scheduling_init (server, GSA_addresses);
+
   GNUNET_SERVER_disconnect_notify (server, &client_disconnect_handler, NULL);
   GNUNET_SERVER_add_handlers (server, handlers);
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleanup_task,
@@ -179,7 +204,8 @@ int
 main (int argc, char *const *argv)
 {
   return (GNUNET_OK ==
-          GNUNET_SERVICE_run (argc, argv, "ats", GNUNET_SERVICE_OPTION_NONE,
+          GNUNET_SERVICE_run (argc, argv, "ats",
+                              GNUNET_SERVICE_OPTION_NONE,
                               &run, NULL)) ? 0 : 1;
 }