-fix config, shutdown issue

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

diff --git a/src/ats/gnunet-service-ats_scheduling.c b/src/ats/gnunet-service-ats_scheduling.c
index 65645d1f02dd1c5c9fddba86c75b7f7565e7e624..aba9858a11727202d5b1824b003c32bebd2a334a 100644 (file)
--- a/src/ats/gnunet-service-ats_scheduling.c
+++ b/src/ats/gnunet-service-ats_scheduling.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2011-2014 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2011-2014 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
@@ -25,7 +25,6 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "gnunet-service-ats.h"
 #include "gnunet-service-ats_addresses.h"
 #include "gnunet-service-ats_scheduling.h"
 #include "ats.h"
@@ -41,11 +40,6 @@ static struct GNUNET_SERVER_NotificationContext *nc;
  */
 static struct GNUNET_SERVER_Client *my_client;
 
-/**
- * Handle to address subsystem
- */
-static struct GAS_Addresses_Handle *address_handle;
-
 
 /**
  * Register a new scheduling client.
@@ -56,14 +50,17 @@ static struct GAS_Addresses_Handle *address_handle;
 int
 GAS_scheduling_add_client (struct GNUNET_SERVER_Client *client)
 {
-  if (my_client != NULL)
+  if (NULL != my_client)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "This ATS already has a scheduling client, refusing new scheduling client for now.\n");
     return GNUNET_SYSERR;
   }
   my_client = client;
-  GNUNET_SERVER_notification_context_add (nc, client);
+  GNUNET_SERVER_notification_context_add (nc,
+                                          client);
+  GNUNET_SERVER_client_set_user_context (client,
+                                         &nc);
   return GNUNET_OK;
 }
 
@@ -79,7 +76,7 @@ GAS_scheduling_remove_client (struct GNUNET_SERVER_Client *client)
 {
   if (my_client != client)
     return;
-  GAS_addresses_destroy_all (address_handle);
+  GAS_addresses_destroy_all ();
   my_client = NULL;
 }
 
@@ -104,7 +101,8 @@ GAS_scheduling_transmit_address_suggestion (const struct GNUNET_PeerIdentity *pe
   if (NULL == my_client)
     return;
   GNUNET_STATISTICS_update (GSA_stats,
-                            "# address suggestions made", 1,
+                            "# address suggestions made",
+                           1,
                             GNUNET_NO);
   msg.header.size = htons (sizeof (struct AddressSuggestionMessage));
   msg.header.type = htons (GNUNET_MESSAGE_TYPE_ATS_ADDRESS_SUGGESTION);
@@ -124,78 +122,6 @@ GAS_scheduling_transmit_address_suggestion (const struct GNUNET_PeerIdentity *pe
 }
 
 
-/**
- * Handle 'request address' messages from clients.
- *
- * @param cls unused, NULL
- * @param client client that sent the request
- * @param message the request message
- */
-void
-GAS_handle_request_address (void *cls,
-                            struct GNUNET_SERVER_Client *client,
-                            const struct GNUNET_MessageHeader *message)
-{
-  const struct RequestAddressMessage *msg =
-      (const struct RequestAddressMessage *) message;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n",
-              "REQUEST_ADDRESS");
-  GNUNET_break (0 == ntohl (msg->reserved));
-  GAS_addresses_request_address (address_handle, &msg->peer);
-  GNUNET_SERVER_receive_done (client, GNUNET_OK);
-}
-
-
-/**
- * Handle 'request address' messages from clients.
- *
- * @param cls unused, NULL
- * @param client client that sent the request
- * @param message the request message
- */
-void
-GAS_handle_request_address_cancel (void *cls,
-                                   struct GNUNET_SERVER_Client *client,
-                                   const struct GNUNET_MessageHeader *message)
-{
-  const struct RequestAddressMessage *msg =
-      (const struct RequestAddressMessage *) message;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n",
-              "REQUEST_ADDRESS_CANCEL");
-  GNUNET_break (0 == ntohl (msg->reserved));
-
-  GAS_addresses_request_address_cancel (address_handle, &msg->peer);
-
-  GNUNET_SERVER_receive_done (client, GNUNET_OK);
-}
-
-
-/**
- * Handle 'reset backoff' messages from clients.
- *
- * @param cls unused, NULL
- * @param client client that sent the request
- * @param message the request message
- */
-void
-GAS_handle_reset_backoff (void *cls,
-                          struct GNUNET_SERVER_Client *client,
-                          const struct GNUNET_MessageHeader *message)
-{
-  const struct ResetBackoffMessage *msg =
-      (const struct ResetBackoffMessage *) message;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received `%s' message\n",
-              "RESET_BACKOFF");
-  GNUNET_break (0 == ntohl (msg->reserved));
-  GAS_addresses_handle_backoff_reset (address_handle, &msg->peer);
-  GNUNET_SERVER_receive_done (client, GNUNET_OK);
-}
-
-
 /**
  * Handle 'address add' messages from clients.
  *
@@ -252,12 +178,11 @@ GAS_handle_address_add (void *cls,
   GNUNET_STATISTICS_update (GSA_stats,
                             "# addresses created", 1,
                             GNUNET_NO);
-  GAS_addresses_add (address_handle,
-                     &m->peer,
+  GAS_addresses_add (&m->peer,
                      plugin_name,
                      address,
                      address_length,
-                     ntohl(m->address_local_info),
+                     ntohl (m->address_local_info),
                      ntohl (m->session_id),
                      atsi, ats_count);
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
@@ -308,44 +233,13 @@ GAS_handle_address_update (void *cls,
                             "# address updates received",
                             1,
                             GNUNET_NO);
-  GAS_addresses_update (address_handle,
-                        &m->peer,
+  GAS_addresses_update (&m->peer,
                         ntohl (m->session_id),
                         atsi, ats_count);
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 
 
-/**
- * Handle 'address in use' messages from clients.
- *
- * @param cls unused, NULL
- * @param client client that sent the request
- * @param message the request message
- */
-void
-GAS_handle_address_in_use (void *cls,
-                           struct GNUNET_SERVER_Client *client,
-                           const struct GNUNET_MessageHeader *message)
-{
-  const struct AddressUseMessage *m;
-  int res;
-
-  m = (const struct AddressUseMessage *) message;
-  res = GAS_addresses_in_use (address_handle,
-                              &m->peer,
-                              ntohl (m->session_id),
-                              ntohl (m->in_use));
-  if (GNUNET_OK != res)
-  {
-    GNUNET_break (0);
-    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-    return;
-  }
-  GNUNET_SERVER_receive_done (client, GNUNET_OK);
-}
-
-
 /**
  * Handle 'address destroyed' messages from clients.
  *
@@ -369,8 +263,7 @@ GAS_handle_address_destroyed (void *cls,
                             "# addresses destroyed",
                             1,
                             GNUNET_NO);
-  GAS_addresses_destroy (address_handle,
-                         &m->peer,
+  GAS_addresses_destroy (&m->peer,
                          ntohl (m->session_id));
   srm.header.type = ntohs (GNUNET_MESSAGE_TYPE_ATS_SESSION_RELEASE);
   srm.header.size = ntohs (sizeof (struct SessionReleaseMessage));
@@ -391,11 +284,8 @@ GAS_handle_address_destroyed (void *cls,
  * @param ah the address handle to use
  */
 void
-GAS_scheduling_init (struct GNUNET_SERVER_Handle *server,
-                     struct GAS_Addresses_Handle *ah)
+GAS_scheduling_init (struct GNUNET_SERVER_Handle *server)
 {
-  GNUNET_assert (NULL != ah);
-  address_handle = ah;
   nc = GNUNET_SERVER_notification_context_create (server, 128);
 }