/*
This file is part of GNUnet.
- (C) 2011 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011 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
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.
*/
-
/**
* @file ats/gnunet-service-ats.c
* @brief ats service
*/
#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_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"
/**
*/
struct GNUNET_STATISTICS_Handle *GSA_stats;
+/**
+ * Handle to the ATS server.
+ */
static struct GNUNET_SERVER_Handle *GSA_server;
/**
- * We have received a 'ClientStartMessage' from a client. Find out which
- * type of client it is and notify the respective subsystem.
+ * 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
* @param client handle to the client
* @param message the start message
*/
static void
-handle_ats_start (void *cls, struct GNUNET_SERVER_Client *client,
+handle_ats_start (void *cls,
+ struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
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);
+ 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);
}
* @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;
GAS_scheduling_remove_client (client);
- GAS_performance_remove_client (client);
+ GAS_connectivity_remove_client (client);
+ GAS_preference_client_disconnect (client);
}
* Task run during shutdown.
*
* @param cls unused
- * @param tc unused
*/
static void
-cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+cleanup_task (void *cls)
{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "ATS shutdown initiated\n");
+ GAS_connectivity_done ();
GAS_addresses_done ();
+ GAS_plugin_done ();
+ GAS_normalization_stop ();
GAS_scheduling_done ();
GAS_performance_done ();
+ GAS_preference_done ();
GAS_reservations_done ();
if (NULL != GSA_stats)
{
* @param cfg configuration to use
*/
static void
-run (void *cls, struct GNUNET_SERVER_Handle *server,
+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)},
+ 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},
+ GNUNET_MESSAGE_TYPE_ATS_ADDRESS_UPDATE,
+ sizeof (struct AddressUpdateMessage) },
{&GAS_handle_address_destroyed, NULL,
- GNUNET_MESSAGE_TYPE_ATS_ADDRESS_DESTROYED, 0},
+ GNUNET_MESSAGE_TYPE_ATS_ADDRESS_DESTROYED,
+ sizeof (struct AddressDestroyedMessage) },
{&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_feedback, NULL,
+ GNUNET_MESSAGE_TYPE_ATS_PREFERENCE_FEEDBACK, 0},
{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_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);
+ GSA_stats = NULL;
+ }
+ return;
+ }
GAS_performance_init (server);
GAS_scheduling_init (server);
- GAS_addresses_init (cfg, GSA_stats);
- GNUNET_SERVER_disconnect_notify (server, &client_disconnect_handler, NULL);
+
+ 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);
+ GNUNET_SCHEDULER_add_shutdown (&cleanup_task,
+ NULL);
}
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;
}