REST: nothing triggers rest
[oweals/gnunet.git] / src / ats / gnunet-service-ats_performance.c
index 6509dbe9de304ee11e2a2f7f3b04656eda870a0b..94a22d378dd12e5fcfc726e69ca4e495b2b00ada 100644 (file)
 /*
      This file is part of GNUnet.
-     (C) 2011 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2011-2015 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
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
+     Affero General Public License for more details.
+    
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-     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.
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
-
 /**
  * @file ats/gnunet-service-ats_performance.c
  * @brief ats service, interaction with 'performance' API
  * @author Matthias Wachs
  * @author Christian Grothoff
+ *
+ * TODO:
+ * - simplify functions by passing a `struct GNUNET_HELLO_Address`
  */
 #include "platform.h"
 #include "gnunet-service-ats.h"
 #include "gnunet-service-ats_addresses.h"
 #include "gnunet-service-ats_performance.h"
-#include "gnunet-service-ats_reservations.h"
 #include "ats.h"
 
-/**
- * We keep clients that are interested in performance in a linked list.
- */
-struct PerformanceClient
-{
-  /**
-   * Next in doubly-linked list.
-   */
-  struct PerformanceClient *next;
-
-  /**
-   * Previous in doubly-linked list.
-   */
-  struct PerformanceClient *prev;
-
-  /**
-   * Actual handle to the client.
-   */
-  struct GNUNET_SERVER_Client *client;
-
-  /**
-   * Options for the client.
-   */
-  enum StartFlag flag;
-
-};
-
-
-/**
- * We keep clients that are interested in performance in a linked list.
- */
-struct AddressIteration
-{
-  /**
-   * Actual handle to the client.
-   */
-  struct PerformanceClient *pc;
-
-  int all;
-
-  uint32_t id;
-
-  unsigned int msg_type;
-};
-
-/**
- * Address handle
- */
-static struct GAS_Addresses_Handle *GSA_addresses;
-
-/**
- * Head of linked list of all clients to this service.
- */
-static struct PerformanceClient *pc_head;
-
-/**
- * Tail of linked list of all clients to this service.
- */
-static struct PerformanceClient *pc_tail;
 
 /**
- * Context for sending messages to performance clients.
+ * Context for sending messages to performance clients without PIC.
  */
-static struct GNUNET_SERVER_NotificationContext *nc;
-
+static struct GNUNET_NotificationContext *nc_no_pic;
 
 /**
- * Find the performance client associated with the given handle.
- *
- * @param client server handle
- * @return internal handle
+ * Context for sending messages to performance clients with PIC.
  */
-static struct PerformanceClient *
-find_client (struct GNUNET_SERVER_Client *client)
-{
-  struct PerformanceClient *pc;
+static struct GNUNET_NotificationContext *nc_pic;
 
-  for (pc = pc_head; pc != NULL; pc = pc->next)
-    if (pc->client == client)
-      return pc;
-  return NULL;
-}
-
-/**
- * Unregister a client (which may have been a performance client,
- * but this is not assured).
- *
- * @param client handle of the (now dead) client
- */
-void
-GAS_performance_remove_client (struct GNUNET_SERVER_Client *client)
-{
-  struct PerformanceClient *pc;
-
-  pc = find_client (client);
-  if (NULL == pc)
-    return;
-  GNUNET_CONTAINER_DLL_remove (pc_head, pc_tail, pc);
-  GAS_addresses_preference_client_disconnect (GSA_addresses, client);
-  GNUNET_free (pc);
-}
 
 /**
  * Transmit the given performance information to all performance
  * clients.
  *
- * @param pc performance client to send to
+ * @param client client to send to, NULL for all
  * @param peer peer for which this is an address suggestion
  * @param plugin_name 0-termintated string specifying the transport plugin
  * @param plugin_addr binary address for the plugin to use
  * @param plugin_addr_len number of bytes in plugin_addr
- * @param active is this address active
- * @param atsi performance data for the address
- * @param atsi_count number of performance records in 'ats'
+ * @param active #GNUNET_YES if this address is actively used
+ *        to maintain a connection to a peer;
+ *        #GNUNET_NO if the address is not actively used;
+ *        #GNUNET_SYSERR if this address is no longer available for ATS
+ * @param prop performance data for the address
+ * @param local_address_info information about the local flags for the address
  * @param bandwidth_out assigned outbound bandwidth
  * @param bandwidth_in assigned inbound bandwidth
  */
-void
-GAS_performance_notify_client (struct PerformanceClient *pc,
-                               const struct GNUNET_PeerIdentity *peer,
-                               const char *plugin_name,
-                               const void *plugin_addr, size_t plugin_addr_len,
-                               int active,
-                               const struct GNUNET_ATS_Information *atsi,
-                               uint32_t atsi_count,
-                               struct GNUNET_BANDWIDTH_Value32NBO
-                               bandwidth_out,
-                               struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
+static void
+notify_client (struct GNUNET_SERVICE_Client *client,
+               const struct GNUNET_PeerIdentity *peer,
+               const char *plugin_name,
+               const void *plugin_addr,
+               size_t plugin_addr_len,
+               int active,
+               const struct GNUNET_ATS_Properties *prop,
+               enum GNUNET_HELLO_AddressInfo local_address_info,
+               struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
+               struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
 {
-
   struct PeerInformationMessage *msg;
   size_t plugin_name_length = strlen (plugin_name) + 1;
   size_t msize =
-      sizeof (struct PeerInformationMessage) +
-      atsi_count * sizeof (struct GNUNET_ATS_Information) + plugin_addr_len +
-      plugin_name_length;
+    sizeof (struct PeerInformationMessage) +
+    plugin_addr_len +
+    plugin_name_length;
   char buf[msize] GNUNET_ALIGN;
-  struct GNUNET_ATS_Information *atsp;
   char *addrp;
 
-  GNUNET_assert (NULL != pc);
-  if (NULL == find_client (pc->client))
-    return; /* Client disconnected */
-
-  GNUNET_assert (msize < GNUNET_SERVER_MAX_MESSAGE_SIZE);
-  GNUNET_assert (atsi_count <
-                 GNUNET_SERVER_MAX_MESSAGE_SIZE /
-                 sizeof (struct GNUNET_ATS_Information));
+  if (NULL != prop)
+    GNUNET_break (GNUNET_NT_UNSPECIFIED != prop->scope);
+  GNUNET_assert (msize < GNUNET_MAX_MESSAGE_SIZE);
   msg = (struct PeerInformationMessage *) buf;
   msg->header.size = htons (msize);
   msg->header.type = htons (GNUNET_MESSAGE_TYPE_ATS_PEER_INFORMATION);
   msg->id = htonl (0);
-  msg->ats_count = htonl (atsi_count);
   msg->peer = *peer;
   msg->address_length = htons (plugin_addr_len);
-  msg->address_active = ntohl (active);
+  msg->address_active = ntohl ((uint32_t) active);
   msg->plugin_name_length = htons (plugin_name_length);
   msg->bandwidth_out = bandwidth_out;
   msg->bandwidth_in = bandwidth_in;
-  atsp = (struct GNUNET_ATS_Information *) &msg[1];
-  memcpy (atsp, atsi, sizeof (struct GNUNET_ATS_Information) * atsi_count);
-  addrp = (char *) &atsp[atsi_count];
-  memcpy (addrp, plugin_addr, plugin_addr_len);
+  if (NULL != prop)
+    GNUNET_ATS_properties_hton (&msg->properties,
+                                prop);
+  else
+    memset (&msg->properties,
+            0,
+            sizeof (struct GNUNET_ATS_Properties));
+  msg->address_local_info = htonl (local_address_info);
+  addrp = (char *) &msg[1];
+  GNUNET_memcpy (addrp, plugin_addr, plugin_addr_len);
   strcpy (&addrp[plugin_addr_len], plugin_name);
-  GNUNET_SERVER_notification_context_unicast (nc, pc->client, &msg->header,
-                                              GNUNET_YES);
+  if (NULL == client)
+  {
+    GNUNET_notification_context_broadcast (nc_pic,
+                                          &msg->header,
+                                          GNUNET_YES);
+  }
+  else
+  {
+    struct GNUNET_MQ_Envelope *env;
+
+    env = GNUNET_MQ_msg_copy (&msg->header);
+    GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client),
+                   env);
+  }
 }
 
 
@@ -207,94 +131,96 @@ GAS_performance_notify_client (struct PerformanceClient *pc,
  * @param peer peer for which this is an address suggestion
  * @param plugin_name 0-termintated string specifying the transport plugin
  * @param plugin_addr binary address for the plugin to use
- * @param plugin_addr_len number of bytes in plugin_addr
- * @param active is this address active
- * @param atsi performance data for the address
- * @param atsi_count number of performance records in 'ats'
+ * @param plugin_addr_len number of bytes in @a plugin_addr
+ * @param active #GNUNET_YES if this address is actively used
+ *        to maintain a connection to a peer;
+ *        #GNUNET_NO if the address is not actively used;
+ *        #GNUNET_SYSERR if this address is no longer available for ATS
+ * @param prop performance data for the address
+ * @param local_address_info information about the local flags for the address
  * @param bandwidth_out assigned outbound bandwidth
  * @param bandwidth_in assigned inbound bandwidth
  */
 void
 GAS_performance_notify_all_clients (const struct GNUNET_PeerIdentity *peer,
                                     const char *plugin_name,
-                                    const void *plugin_addr, size_t plugin_addr_len,
+                                    const void *plugin_addr,
+                                    size_t plugin_addr_len,
                                     int active,
-                                const struct GNUNET_ATS_Information *atsi,
-                                uint32_t atsi_count,
-                                struct GNUNET_BANDWIDTH_Value32NBO
-                                bandwidth_out,
-                                struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
+                                    const struct GNUNET_ATS_Properties *prop,
+                                    enum GNUNET_HELLO_AddressInfo local_address_info,
+                                    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
+                                    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
 {
-  struct PerformanceClient *pc;
-
-  for (pc = pc_head; pc != NULL; pc = pc->next)
-    if (pc->flag == START_FLAG_PERFORMANCE_WITH_PIC)
-    {
-        GAS_performance_notify_client (pc,
-                                       peer,
-                                       plugin_name, plugin_addr, plugin_addr_len,
-                                       active,
-                                       atsi, atsi_count,
-                                       bandwidth_out, bandwidth_in);
-    }
+  GNUNET_break ( (NULL == prop) ||
+                 (GNUNET_NT_UNSPECIFIED != prop->scope) );
+  notify_client (NULL,
+                 peer,
+                 plugin_name,
+                 plugin_addr,
+                 plugin_addr_len,
+                 active,
+                 prop,
+                 local_address_info,
+                 bandwidth_out,
+                 bandwidth_in);
   GNUNET_STATISTICS_update (GSA_stats,
-                            "# performance updates given to clients", 1,
+                            "# performance updates given to clients",
+                            1,
                             GNUNET_NO);
 }
 
 
+/**
+ * Iterator for called from #GAS_addresses_get_peer_info()
+ *
+ * @param cls closure with the `struct GNUNET_SERVICE_Client *` to inform.
+ * @param id the peer id
+ * @param plugin_name plugin name
+ * @param plugin_addr address
+ * @param plugin_addr_len length of @a plugin_addr
+ * @param active is address actively used
+ * @param prop performance information
+ * @param local_address_info information about the local flags for the address
+ * @param bandwidth_out current outbound bandwidth assigned to address
+ * @param bandwidth_in current inbound bandwidth assigned to address
+ */
 static void
 peerinfo_it (void *cls,
              const struct GNUNET_PeerIdentity *id,
              const char *plugin_name,
-             const void *plugin_addr, size_t plugin_addr_len,
-             const int active,
-             const struct GNUNET_ATS_Information *atsi,
-             uint32_t atsi_count,
-             struct GNUNET_BANDWIDTH_Value32NBO
-             bandwidth_out,
+             const void *plugin_addr,
+             size_t plugin_addr_len,
+             int active,
+             const struct GNUNET_ATS_Properties *prop,
+             enum GNUNET_HELLO_AddressInfo local_address_info,
+             struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
              struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
 {
-  struct PerformanceClient *pc = cls;
-  GNUNET_assert (NULL != pc);
+  struct GNUNET_SERVICE_Client *client = cls;
+
   if (NULL == id)
     return;
-
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Callback for peer `%s' plugin `%s' BW out %lu, BW in %lu \n",
+              "Callback for peer `%s' plugin `%s' BW out %u, BW in %u \n",
               GNUNET_i2s (id),
               plugin_name,
-              ntohl (bandwidth_out.value__),
-              ntohl (bandwidth_in.value__));
-  GAS_performance_notify_client(pc,
-                                id,
-                                plugin_name,
-                                plugin_addr,
-                                plugin_addr_len,
-                                active,
-                                atsi, atsi_count,
-                                bandwidth_out, bandwidth_in);
+              (unsigned int) ntohl (bandwidth_out.value__),
+              (unsigned int) ntohl (bandwidth_in.value__));
+  GNUNET_break (GNUNET_NT_UNSPECIFIED != prop->scope);
+  notify_client (client,
+                 id,
+                 plugin_name,
+                 plugin_addr,
+                 plugin_addr_len,
+                 active,
+                 prop,
+                 local_address_info,
+                 bandwidth_out,
+                 bandwidth_in);
 }
 
 
-/**
- * Iterator for GAS_performance_add_client
- *
- * @param cls the client requesting information
- * @param id result
- */
-static void
-peer_it (void *cls,
-         const struct GNUNET_PeerIdentity *id)
-{
-  struct PerformanceClient *pc = cls;
-  if (NULL != id)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback for peer `%s'\n", GNUNET_i2s (id));
-    GAS_addresses_get_peer_info (GSA_addresses, id, &peerinfo_it, pc);
-  }
-}
-
 /**
  * Register a new performance client.
  *
@@ -302,420 +228,38 @@ peer_it (void *cls,
  * @param flag flag specifying the type of the client
  */
 void
-GAS_performance_add_client (struct GNUNET_SERVER_Client *client,
+GAS_performance_add_client (struct GNUNET_SERVICE_Client *client,
                             enum StartFlag flag)
 {
-  struct PerformanceClient *pc;
-  GNUNET_break (NULL == find_client (client));
-
-  pc = GNUNET_new (struct PerformanceClient);
-  pc->client = client;
-  pc->flag = flag;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Adding performance client %s PIC\n",
-      (flag == START_FLAG_PERFORMANCE_WITH_PIC) ? "with" : "without");
-
-  GNUNET_SERVER_notification_context_add (nc, client);
-  GNUNET_CONTAINER_DLL_insert (pc_head, pc_tail, pc);
-
-  /* Send information about clients */
-  GAS_addresses_iterate_peers (GSA_addresses, &peer_it, pc);
-}
-
-
-static void transmit_req_addr (struct AddressIteration *ai,
-    const struct GNUNET_PeerIdentity *id,
-    const char *plugin_name,
-    const void *plugin_addr, size_t plugin_addr_len,
-    const int active,
-    const struct GNUNET_ATS_Information *atsi,
-    uint32_t atsi_count,
-    struct GNUNET_BANDWIDTH_Value32NBO
-    bandwidth_out,
-    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
-
-{
-  struct GNUNET_ATS_Information *atsp;
-  struct PeerInformationMessage *msg;
-  char *addrp;
-  size_t plugin_name_length;
-  size_t msize;
-
-  if (NULL != plugin_name)
-    plugin_name_length = strlen (plugin_name) + 1;
-  else
-    plugin_name_length = 0;
-  msize = sizeof (struct PeerInformationMessage) +
-          atsi_count * sizeof (struct GNUNET_ATS_Information) +
-          plugin_addr_len + plugin_name_length;
-  char buf[msize] GNUNET_ALIGN;
-
-  GNUNET_assert (msize < GNUNET_SERVER_MAX_MESSAGE_SIZE);
-  GNUNET_assert (atsi_count <
-                 GNUNET_SERVER_MAX_MESSAGE_SIZE /
-                 sizeof (struct GNUNET_ATS_Information));
-  msg = (struct PeerInformationMessage *) buf;
-  msg->header.size = htons (msize);
-  msg->header.type = htons (GNUNET_MESSAGE_TYPE_ATS_ADDRESSLIST_RESPONSE);
-  msg->ats_count = htonl (atsi_count);
-  msg->id = htonl (ai->id);
-  if (NULL != id)
-    msg->peer = *id;
-  else
-    memset (&msg->peer, '\0', sizeof (struct GNUNET_PeerIdentity));
-  msg->address_length = htons (plugin_addr_len);
-  msg->address_active = ntohl (active);
-  msg->plugin_name_length = htons (plugin_name_length);
-  msg->bandwidth_out = bandwidth_out;
-  msg->bandwidth_in = bandwidth_in;
-  atsp = (struct GNUNET_ATS_Information *) &msg[1];
-  memcpy (atsp, atsi, sizeof (struct GNUNET_ATS_Information) * atsi_count);
-  addrp = (char *) &atsp[atsi_count];
-  if (NULL != plugin_addr)
-    memcpy (addrp, plugin_addr, plugin_addr_len);
-  if (NULL != plugin_name)
-    strcpy (&addrp[plugin_addr_len], plugin_name);
-  GNUNET_SERVER_notification_context_unicast (nc, ai->pc->client, &msg->header,
-                                              GNUNET_NO);
-}
-
-static void
-req_addr_peerinfo_it (void *cls,
-             const struct GNUNET_PeerIdentity *id,
-             const char *plugin_name,
-             const void *plugin_addr, size_t plugin_addr_len,
-             const int active,
-             const struct GNUNET_ATS_Information *atsi,
-             uint32_t atsi_count,
-             struct GNUNET_BANDWIDTH_Value32NBO
-             bandwidth_out,
-             struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
-{
-  struct AddressIteration *ai = cls;
-
-  GNUNET_assert (NULL != ai);
-  GNUNET_assert (NULL != ai->pc);
-  if (NULL == find_client (ai->pc->client))
-    return; /* Client disconnected */
-
-  if ((NULL == id) && (NULL == plugin_name) && (NULL == plugin_addr))
-  {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Address iteration done\n");
-      return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Callback for  %s peer `%s' plugin `%s' BW out %lu, BW in %lu \n",
-              (active == GNUNET_YES) ? "ACTIVE" : "INACTIVE",
-              GNUNET_i2s (id),
-              plugin_name,
-              ntohl (bandwidth_out.value__),
-              ntohl (bandwidth_in.value__));
-
-  /* Transmit result */
-  if ((GNUNET_YES == ai->all) || (GNUNET_YES == active))
-  {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Sending result for  %s peer `%s' plugin `%s' BW out %lu, BW in %lu \n",
-                  (active == GNUNET_YES) ? "ACTIVE" : "INACTIVE",
-                  GNUNET_i2s (id),
-                  plugin_name,
-                  ntohl (bandwidth_out.value__),
-                  ntohl (bandwidth_in.value__));
-    transmit_req_addr (cls,
-        id,
-        plugin_name,
-        plugin_addr, plugin_addr_len,
-        active,
-        atsi,
-        atsi_count,
-        bandwidth_out, bandwidth_in);
-  }
-}
-
-
-/**
- * Iterator for GAS_handle_request_address_list
- *
- * @param cls the client requesting information
- * @param id result
- */
-static void
-req_addr_peer_it (void *cls,
-         const struct GNUNET_PeerIdentity *id)
-{
-  struct AddressIteration *ai = cls;
-  if (NULL != id)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback for peer `%s'\n", GNUNET_i2s (id));
-    GAS_addresses_get_peer_info (GSA_addresses, id, &req_addr_peerinfo_it, ai);
-  }
-  else
-  {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer iteration done\n");
-  }
-}
-
-
-/**
- * Handle 'address list request' messages from clients.
- *
- * @param cls unused, NULL
- * @param client client that sent the request
- * @param message the request message
- */
-void
-GAS_handle_request_address_list (void *cls, struct GNUNET_SERVER_Client *client,
-                                 const struct GNUNET_MessageHeader *message)
-{
-  struct PerformanceClient *pc;
-  struct AddressIteration ai;
-  struct AddressListRequestMessage * alrm = (struct AddressListRequestMessage *) message;
-  struct GNUNET_PeerIdentity allzeros;
-  struct GNUNET_BANDWIDTH_Value32NBO bandwidth_zero;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n",
-              "ADDRESSLIST_REQUEST");
+  struct GNUNET_MQ_Handle *mq;
 
-  if (NULL == (pc = find_client(client)))
+  mq = GNUNET_SERVICE_client_get_mq (client);
+  if (START_FLAG_PERFORMANCE_WITH_PIC == flag)
   {
-      GNUNET_break (0);
-      return;
-  }
-
-  ai.all = ntohl (alrm->all);
-  ai.id = ntohl (alrm->id);
-  ai.pc = pc;
-
-  memset (&allzeros, '\0', sizeof (struct GNUNET_PeerIdentity));
-  bandwidth_zero.value__ = htonl (0);
-  if (0 == memcmp (&alrm->peer, &allzeros, sizeof (struct GNUNET_PeerIdentity)))
-  {
-      /* Return addresses for all peers */
-      GAS_addresses_iterate_peers (GSA_addresses, &req_addr_peer_it, &ai);
-      transmit_req_addr (&ai, NULL, NULL, NULL, 0, GNUNET_NO, NULL, 0, bandwidth_zero, bandwidth_zero);
+    GNUNET_notification_context_add (nc_pic,
+                                    mq);
+    GAS_addresses_get_peer_info (NULL,
+                                 &peerinfo_it,
+                                 client);
   }
   else
   {
-      /* Return addresses for a specific peer */
-      GAS_addresses_get_peer_info (GSA_addresses, &alrm->peer, &req_addr_peerinfo_it, &ai);
-      transmit_req_addr (&ai, NULL, NULL, NULL, 0, GNUNET_NO, NULL, 0, bandwidth_zero, bandwidth_zero);
-  }
-  GNUNET_SERVER_receive_done (client, GNUNET_OK);
-}
-
-
-void
-GAS_handle_performance_update (struct GNUNET_PeerIdentity *peer,
-                                                                                                                        const char *plugin_name,
-                                                                                                                        const void *plugin_addr,
-                                                                                                                        size_t plugin_addr_len,
-                                                                                                                        const int active,
-                                                                                                                        struct GNUNET_ATS_Information *ats,
-                                                                                                                        uint32_t ats_count,
-                                                                                                                        struct GNUNET_BANDWIDTH_Value32NBO
-                                                                                                                        bandwidth_out,
-                                                                                                                        struct GNUNET_BANDWIDTH_Value32NBO
-                                                                                                                        bandwidth_in)
-{
-/* Notify here */
-       GAS_performance_notify_all_clients (peer,
-                                                                                                                                                       plugin_name,
-                                                                                                                                                       plugin_addr, plugin_addr_len,
-                                                                                                                                                       active,
-                                                                                                                                                       ats, ats_count,
-                                                                                                                                                       bandwidth_out, bandwidth_in);
-
-#if 0
-       struct PerformanceClient *cur;
-       struct PerformanceMonitorClient *curm;
-       struct MonitorResponseMessage *mrm;
-       size_t msglen;
-
-       msglen = sizeof (struct MonitorResponseMessage) +
-                                        ats_count * sizeof (struct GNUNET_ATS_Information);
-       mrm = GNUNET_malloc (msglen);
-
-       mrm->header.type = htons (GNUNET_MESSAGE_TYPE_ATS_MONITOR_RESPONSE);
-       mrm->header.size = htons (msglen);
-       mrm->ats_count = htonl (ats_count);
-       mrm->peer = *peer;
-       memcpy (&mrm[1], ats, ats_count * sizeof (struct GNUNET_ATS_Information));
-
-       for (cur = pc_head; NULL != cur; cur = cur->next)
-               for (curm = cur->pm_head; NULL != curm; curm = curm->next)
-               {
-                               /* Notify client about update */
-                               mrm->id = htonl (curm->id);
-                         GNUNET_SERVER_notification_context_unicast (nc,
-                                       cur->client,
-                                       (struct GNUNET_MessageHeader *) mrm,
-                                       GNUNET_YES);
-               }
-       GNUNET_free (mrm);
-#endif
-}
-
-
-/**
- * Handle 'reservation request' messages from clients.
- *
- * @param cls unused, NULL
- * @param client client that sent the request
- * @param message the request message
- */
-void
-GAS_handle_reservation_request (void *cls, struct GNUNET_SERVER_Client *client,
-                                const struct GNUNET_MessageHeader *message)
-{
-  const struct ReservationRequestMessage *msg =
-      (const struct ReservationRequestMessage *) message;
-  struct ReservationResultMessage result;
-  int32_t amount;
-  struct GNUNET_TIME_Relative res_delay;
-
-  if (NULL == find_client (client))
-  {
-    /* missing start message! */
-    GNUNET_break (0);
-    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n",
-              "RESERVATION_REQUEST");
-  amount = (int32_t) ntohl (msg->amount);
-  res_delay = GAS_reservations_reserve (&msg->peer, amount);
-  if (res_delay.rel_value_us > 0)
-    amount = 0;
-  result.header.size = htons (sizeof (struct ReservationResultMessage));
-  result.header.type = htons (GNUNET_MESSAGE_TYPE_ATS_RESERVATION_RESULT);
-  result.amount = htonl (amount);
-  result.peer = msg->peer;
-  result.res_delay = GNUNET_TIME_relative_hton (res_delay);
-  GNUNET_STATISTICS_update (GSA_stats, "# reservation requests processed", 1,
-                            GNUNET_NO);
-  GNUNET_SERVER_notification_context_unicast (nc, client, &result.header,
-                                              GNUNET_NO);
-  GNUNET_SERVER_receive_done (client, GNUNET_OK);
-}
-
-
-/**
- * Handle 'preference change' messages from clients.
- *
- * @param cls unused, NULL
- * @param client client that sent the request
- * @param message the request message
- */
-void
-GAS_handle_preference_change (void *cls,
-                              struct GNUNET_SERVER_Client *client,
-                              const struct GNUNET_MessageHeader *message)
-{
-  const struct ChangePreferenceMessage *msg;
-  const struct PreferenceInformation *pi;
-  uint16_t msize;
-  uint32_t nump;
-  uint32_t i;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n",
-              "PREFERENCE_CHANGE");
-  msize = ntohs (message->size);
-  if (msize < sizeof (struct ChangePreferenceMessage))
-  {
-    GNUNET_break (0);
-    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-    return;
-  }
-  msg = (const struct ChangePreferenceMessage *) message;
-  nump = ntohl (msg->num_preferences);
-  if (msize !=
-      sizeof (struct ChangePreferenceMessage) +
-      nump * sizeof (struct PreferenceInformation))
-  {
-    GNUNET_break (0);
-    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-    return;
+    GNUNET_notification_context_add (nc_no_pic,
+                                    mq);
   }
-  GNUNET_STATISTICS_update (GSA_stats, "# preference change requests processed",
-                            1, GNUNET_NO);
-  pi = (const struct PreferenceInformation *) &msg[1];
-  for (i = 0; i < nump; i++)
-    GAS_addresses_preference_change (GSA_addresses,
-                                     client,
-                                     &msg->peer,
-                                     (enum GNUNET_ATS_PreferenceKind)
-                                     ntohl (pi[i].preference_kind),
-                                     pi[i].preference_value);
-  GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 
 
-/**
- * Handle 'preference feedback' messages from clients.
- *
- * @param cls unused, NULL
- * @param client client that sent the request
- * @param message the request message
- */
-void
-GAS_handle_preference_feedback (void *cls,
-                              struct GNUNET_SERVER_Client *client,
-                              const struct GNUNET_MessageHeader *message)
-{
-  const struct FeedbackPreferenceMessage *msg;
-  const struct PreferenceInformation *pi;
-  uint16_t msize;
-  uint32_t nump;
-  uint32_t i;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n",
-              "PREFERENCE_FEEDBACK");
-  msize = ntohs (message->size);
-  if (msize < sizeof (struct FeedbackPreferenceMessage))
-  {
-    GNUNET_break (0);
-    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-    return;
-  }
-  msg = (const struct FeedbackPreferenceMessage *) message;
-  nump = ntohl (msg->num_feedback);
-  if (msize !=
-      sizeof (struct FeedbackPreferenceMessage) +
-      nump * sizeof (struct PreferenceInformation))
-  {
-    GNUNET_break (0);
-    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-    return;
-  }
-  GNUNET_STATISTICS_update (GSA_stats, "# preference feedbacks requests processed",
-                            1, GNUNET_NO);
-  pi = (const struct PreferenceInformation *) &msg[1];
-  for (i = 0; i < nump; i++)
-    GAS_addresses_preference_feedback (GSA_addresses,
-                                     client,
-                                     &msg->peer,
-                                     GNUNET_TIME_relative_ntoh(msg->scope),
-                                     (enum GNUNET_ATS_PreferenceKind)
-                                     ntohl (pi[i].preference_kind),
-                                     pi[i].preference_value);
-  GNUNET_SERVER_receive_done (client, GNUNET_OK);
-}
-
-
-
 /**
  * Initialize performance subsystem.
  *
  * @param server handle to our server
- * @param addresses the address handle to use
  */
 void
-GAS_performance_init (struct GNUNET_SERVER_Handle *server,
-                      struct GAS_Addresses_Handle *addresses)
+GAS_performance_init ()
 {
-  GSA_addresses = addresses;
-  nc = GNUNET_SERVER_notification_context_create (server, 128);
+  nc_no_pic = GNUNET_notification_context_create (32);
+  nc_pic = GNUNET_notification_context_create (32);
 }
 
 
@@ -725,8 +269,10 @@ GAS_performance_init (struct GNUNET_SERVER_Handle *server,
 void
 GAS_performance_done ()
 {
-  GNUNET_SERVER_notification_context_destroy (nc);
-  nc = NULL;
+  GNUNET_notification_context_destroy (nc_no_pic);
+  nc_no_pic = NULL;
+  GNUNET_notification_context_destroy (nc_pic);
+  nc_pic = NULL;
 }
 
 /* end of gnunet-service-ats_performance.c */