-improve UDP logging

[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 83fa42b359a010c8f667240ec4bab73b8fa04d40..716bd633251bb0afff64e533e42908a933397d66 100644 (file)
--- a/src/ats/gnunet-service-ats.c
+++ b/src/ats/gnunet-service-ats.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2011 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2011 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -17,7 +17,6 @@
      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
      Boston, MA 02111-1307, USA.
 */
-
 /**
  * @file ats/gnunet-service-ats.c
  * @brief ats service
@@ -29,9 +28,13 @@
 #include "gnunet-service-ats.h"
 #include "gnunet-service-ats_addresses.h"
 #include "gnunet-service-ats_connectivity.h"
+#include "gnunet-service-ats_feedback.h"
+#include "gnunet-service-ats_normalization.h"
 #include "gnunet-service-ats_performance.h"
+#include "gnunet-service-ats_preferences.h"
 #include "gnunet-service-ats_scheduling.h"
 #include "gnunet-service-ats_reservations.h"
+#include "gnunet-service-ats_plugins.h"
 #include "ats.h"
 
 /**
@@ -62,34 +65,39 @@ handle_ats_start (void *cls,
       (const struct ClientStartMessage *) message;
   enum StartFlag flag;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received `%s' message\n",
-              "ATS_START");
   flag = ntohl (msg->start_flag);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Received ATS_START (%d) message\n",
+              (int) flag);
   switch (flag)
   {
   case START_FLAG_SCHEDULING:
     if (GNUNET_OK != GAS_scheduling_add_client (client))
     {
-      GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+      GNUNET_SERVER_receive_done (client,
+                                  GNUNET_SYSERR);
       return;
     }
     break;
   case START_FLAG_PERFORMANCE_WITH_PIC:
-    GAS_performance_add_client (client, flag);
+    GAS_performance_add_client (client,
+                                flag);
     break;
   case START_FLAG_PERFORMANCE_NO_PIC:
-    GAS_performance_add_client (client, flag);
+    GAS_performance_add_client (client,
+                                flag);
     break;
   case START_FLAG_CONNECTION_SUGGESTION:
     /* This client won't receive messages from us, no need to 'add' */
     break;
   default:
     GNUNET_break (0);
-    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+    GNUNET_SERVER_receive_done (client,
+                                GNUNET_SYSERR);
     return;
   }
-  GNUNET_SERVER_receive_done (client, GNUNET_OK);
+  GNUNET_SERVER_receive_done (client,
+                              GNUNET_OK);
 }
 
 
@@ -107,7 +115,8 @@ client_disconnect_handler (void *cls,
   if (NULL == client)
     return;
   GAS_scheduling_remove_client (client);
-  GAS_performance_remove_client (client);
+  GAS_connectivity_remove_client (client);
+  GAS_preference_client_disconnect (client);
 }
 
 
@@ -121,9 +130,13 @@ static void
 cleanup_task (void *cls,
               const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
+  GAS_connectivity_done ();
   GAS_addresses_done ();
+  GAS_plugin_done ();
+  GAS_normalization_stop ();
   GAS_scheduling_done ();
   GAS_performance_done ();
+  GAS_preference_done ();
   GAS_reservations_done ();
   GNUNET_SERVER_disconnect_notify_cancel (GSA_server,
                                           &client_disconnect_handler,
@@ -165,9 +178,6 @@ run (void *cls,
      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,
-     sizeof (struct AddressUseMessage) },
     {&GAS_handle_address_destroyed, NULL,
      GNUNET_MESSAGE_TYPE_ATS_ADDRESS_DESTROYED,
      sizeof (struct AddressDestroyedMessage) },
@@ -176,21 +186,26 @@ run (void *cls,
      sizeof (struct ReservationRequestMessage)},
     {&GAS_handle_preference_change, NULL,
      GNUNET_MESSAGE_TYPE_ATS_PREFERENCE_CHANGE, 0},
-    {&GAS_handle_preference_feedback, NULL,
+    {&GAS_handle_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_reservations_init (server);
+  GAS_connectivity_init ();
+  GAS_preference_init ();
+  GAS_normalization_start ();
+  GAS_addresses_init (server);
   if (GNUNET_OK !=
-      GAS_addresses_init (cfg, GSA_stats))
+      GAS_plugin_init (cfg))
   {
     GNUNET_break (0);
+    GAS_addresses_done ();
+    GAS_normalization_stop ();
     GAS_reservations_done ();
+    GAS_connectivity_done ();
+    GAS_preference_done ();
     if (NULL != GSA_stats)
     {
       GNUNET_STATISTICS_destroy (GSA_stats, GNUNET_NO);
@@ -202,10 +217,12 @@ run (void *cls,
   GAS_scheduling_init (server);
 
   GNUNET_SERVER_disconnect_notify (server,
-                                   &client_disconnect_handler, NULL);
+                                   &client_disconnect_handler,
+                                  NULL);
   GNUNET_SERVER_add_handlers (server, handlers);
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                                &cleanup_task, NULL);
+                                &cleanup_task,
+                               NULL);
 }