X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fats%2Fgnunet-service-ats.c;h=68be19ba59202577f6907c3b319d27212d6b8258;hb=62d484942e7d01314972d25b93aa7b1ba50e3add;hp=d3f81865304d8dd6d5d6c1ac3bb237cdc3b8e2ca;hpb=5419748cc47ea35b77a616ff269aae822cab8cea;p=oweals%2Fgnunet.git

diff --git a/src/ats/gnunet-service-ats.c b/src/ats/gnunet-service-ats.c
index d3f818653..68be19ba5 100644
--- a/src/ats/gnunet-service-ats.c
+++ b/src/ats/gnunet-service-ats.c
@@ -27,35 +27,47 @@
 #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"
 #include "gnunet-service-ats_scheduling.h"
 #include "gnunet-service-ats_reservations.h"
 #include "ats.h"
 
+/**
+ * Handle for statistics.
+ */
+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
  * type of client it is and notify the respective subsystem.
  *
+ * @param cls closure, unused
  * @param client handle to the client
  * @param message the start message
  */
 static void
 handle_ats_start (void *cls, struct GNUNET_SERVER_Client *client,
-		  const struct GNUNET_MessageHeader *message)
+                  const struct GNUNET_MessageHeader *message)
 {
-  const struct ClientStartMessage * msg = (const struct ClientStartMessage *) message;
+  const struct ClientStartMessage *msg =
+      (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)
   {
   case START_FLAG_SCHEDULING:
-    GAS_scheduling_add_client (client);
+    if (GNUNET_OK != GAS_scheduling_add_client (client))
+    {
+      GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+      return;
+    }
     break;
   case START_FLAG_PERFORMANCE_WITH_PIC:
     GAS_performance_add_client (client, flag);
@@ -68,7 +80,7 @@ handle_ats_start (void *cls, struct GNUNET_SERVER_Client *client,
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;
   }
-  GNUNET_SERVER_receive_done (client, GNUNET_OK);    
+  GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 
 
@@ -82,6 +94,8 @@ handle_ats_start (void *cls, struct GNUNET_SERVER_Client *client,
 static void
 client_disconnect_handler (void *cls, struct GNUNET_SERVER_Client *client)
 {
+  if (NULL == client)
+    return;
   GAS_scheduling_remove_client (client);
   GAS_performance_remove_client (client);
 }
@@ -96,10 +110,16 @@ client_disconnect_handler (void *cls, struct GNUNET_SERVER_Client *client)
 static void
 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);
+    GSA_stats = NULL;
+  }
 }
 
 
@@ -115,27 +135,45 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   static const struct GNUNET_SERVER_MessageHandler handlers[] = {
-    { &handle_ats_start, NULL, 
-      GNUNET_MESSAGE_TYPE_ATS_START, sizeof (struct ClientStartMessage)},
-    { &GAS_handle_request_address, NULL,
-      GNUNET_MESSAGE_TYPE_ATS_REQUEST_ADDRESS, sizeof (struct RequestAddressMessage)},
-    { &GAS_handle_address_update, NULL, 
-      GNUNET_MESSAGE_TYPE_ATS_ADDRESS_UPDATE, 0},
-    { &GAS_handle_address_destroyed, NULL, 
-      GNUNET_MESSAGE_TYPE_ATS_ADDRESS_DESTROYED, 0},
-    { &GAS_handle_reservation_request, NULL, 
-      GNUNET_MESSAGE_TYPE_ATS_RESERVATION_REQUEST, sizeof (struct ReservationRequestMessage)},
-    { &GAS_handle_preference_change, NULL, 
-      GNUNET_MESSAGE_TYPE_ATS_PREFERENCE_CHANGE, 0},
+    {&handle_ats_start, NULL,
+     GNUNET_MESSAGE_TYPE_ATS_START, sizeof (struct ClientStartMessage)},
+    {&GAS_handle_request_address, NULL,
+     GNUNET_MESSAGE_TYPE_ATS_REQUEST_ADDRESS,
+     sizeof (struct RequestAddressMessage)},
+    {&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,
+     GNUNET_MESSAGE_TYPE_ATS_ADDRESS_IN_USE, 0},
+    {&GAS_handle_address_destroyed, NULL,
+     GNUNET_MESSAGE_TYPE_ATS_ADDRESS_DESTROYED, 0},
+    {&GAS_handle_reservation_request, NULL,
+     GNUNET_MESSAGE_TYPE_ATS_RESERVATION_REQUEST,
+     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, cfg);
-  GAS_addresses_init ();
-  GNUNET_SERVER_disconnect_notify (server, 
-				   &client_disconnect_handler,
-                                   NULL);
+  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,
                                 NULL);
@@ -153,8 +191,8 @@ int
 main (int argc, char *const *argv)
 {
   return (GNUNET_OK ==
-          GNUNET_SERVICE_run (argc, argv, "ats",
-                              GNUNET_SERVICE_OPTION_NONE, &run, NULL)) ? 0 : 1;
+          GNUNET_SERVICE_run (argc, argv, "ats", GNUNET_SERVICE_OPTION_NONE,
+                              &run, NULL)) ? 0 : 1;
 }
 
 /* end of gnunet-service-ats.c */