X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fats%2Fgnunet-service-ats.c;h=3218769a66570267b93e5b4baa74aa324fa150c6;hb=bace3fe85e0dccc59a1d2352e028021e528608b5;hp=5e68710961b45411a69f9384ad75ad0f28e7a11c;hpb=e930d9d48fc6e1f97b2cd3202767245f8327319b;p=oweals%2Fgnunet.git

diff --git a/src/ats/gnunet-service-ats.c b/src/ats/gnunet-service-ats.c
index 5e6871096..3218769a6 100644
--- a/src/ats/gnunet-service-ats.c
+++ b/src/ats/gnunet-service-ats.c
@@ -41,6 +41,7 @@ struct GNUNET_STATISTICS_Handle *GSA_stats;
 
 static struct GNUNET_SERVER_Handle *GSA_server;
 
+struct GAS_Addresses_Handle *GSA_addresses;
 
 /**
  * We have received a 'ClientStartMessage' from a client.  Find out which
@@ -57,7 +58,6 @@ handle_ats_start (void *cls, struct GNUNET_SERVER_Client *client,
   const struct ClientStartMessage *msg =
       (const struct ClientStartMessage *) message;
   enum StartFlag flag;
-
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "ATS_START");
   flag = ntohl (msg->start_flag);
   switch (flag)
@@ -110,12 +110,11 @@ client_disconnect_handler (void *cls, struct GNUNET_SERVER_Client *client)
 static void
 cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_SERVER_destroy (GSA_server);
-  GSA_server = NULL;
-  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);
@@ -144,6 +143,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,
@@ -155,14 +159,18 @@ 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_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,
@@ -181,7 +189,7 @@ int
 main (int argc, char *const *argv)
 {
   return (GNUNET_OK ==
-          GNUNET_SERVICE_run (argc, argv, "ats", GNUNET_SERVICE_OPTION_SOFT_SHUTDOWN,
+          GNUNET_SERVICE_run (argc, argv, "ats", GNUNET_SERVICE_OPTION_NONE,
                               &run, NULL)) ? 0 : 1;
 }