13 files changed, 189 insertions, 117 deletions
diff --git a/src/ats/gnunet-service-ats.c b/src/ats/gnunet-service-ats.c
index e994b1da8..3218769a6 100644
--- a/src/ats/gnunet-service-ats.c
+++ b/src/ats/gnunet-service-ats.c
@@ -167,8 +167,8 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
  GSA_server = server;
  GSA_stats = GNUNET_STATISTICS_create ("ats", cfg);
  GAS_reservations_init ();
-  GAS_performance_init (server);
  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);
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index ef45144fa..e36e9372f 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -86,13 +86,23 @@ enum ATS_Mode
 };
 /**
- * Handle for ATS address component
+ * Pending Address suggestion requests
 */
 struct GAS_Addresses_Suggestion_Requests
 {
+  /**
+   * Next in DLL
+   */
  struct GAS_Addresses_Suggestion_Requests *next;
+  /**
+   * Previous in DLL
+   */
  struct GAS_Addresses_Suggestion_Requests *prev;
+  /**
+   * Peer ID
+   */
  struct GNUNET_PeerIdentity id;
 };
@@ -102,6 +112,11 @@ struct GAS_Addresses_Suggestion_Requests
 struct GAS_Addresses_Handle
 {
  /**
+   *
+   */
+  struct GNUNET_STATISTICS_Handle *stat;
+  /**
   * A multihashmap to store all addresses
   */
  struct GNUNET_CONTAINER_MultiHashMap *addresses;
@@ -180,12 +195,6 @@ struct GAS_Addresses_Handle
 };
-/**
- * Temporary handle
- */
-struct GAS_Addresses_Handle *handle;
 static unsigned int
 assemble_ats_information (const struct ATS_Address *aa,  struct GNUNET_ATS_Information **dest)
 {
@@ -315,7 +324,7 @@ create_address (const struct GNUNET_PeerIdentity *peer,
 * @return GNUNET_YES if bandwidth allocations should be recalcualted
 */
 static int
-destroy_address (struct ATS_Address *addr)
+destroy_address (struct GAS_Addresses_Handle *handle, struct ATS_Address *addr)
 {
  int ret;
@@ -416,8 +425,9 @@ compare_address_it (void *cls, const struct GNUNET_HashCode * key, void *value)
 * @return existing address record, NULL for none
 */
 struct ATS_Address *
-find_equivalent_address (const struct GNUNET_PeerIdentity *peer,
+find_equivalent_address (struct GAS_Addresses_Handle *handle,
-              const struct ATS_Address *addr)
+                         const struct GNUNET_PeerIdentity *peer,
+                         const struct ATS_Address *addr)
 {
  struct CompareAddressContext cac;
@@ -434,7 +444,8 @@ find_equivalent_address (const struct GNUNET_PeerIdentity *peer,
 static struct ATS_Address *
-lookup_address (const struct GNUNET_PeerIdentity *peer,
+lookup_address (struct GAS_Addresses_Handle *handle,
+                const struct GNUNET_PeerIdentity *peer,
                const char *plugin_name,
                const void *plugin_addr,
                size_t plugin_addr_len,
@@ -451,7 +462,7 @@ lookup_address (const struct GNUNET_PeerIdentity *peer,
                       session_id);
  /* Get existing address or address with session == 0 */
-  ea = find_equivalent_address (peer, aa);
+  ea = find_equivalent_address (handle, peer, aa);
  free_address (aa);
  if (ea == NULL)
  {
@@ -466,11 +477,12 @@ lookup_address (const struct GNUNET_PeerIdentity *peer,
 void
-GAS_addresses_add (const struct GNUNET_PeerIdentity *peer,
+GAS_addresses_add (struct GAS_Addresses_Handle *handle,
-                      const char *plugin_name, const void *plugin_addr,
+                   const struct GNUNET_PeerIdentity *peer,
-                      size_t plugin_addr_len, uint32_t session_id,
+                   const char *plugin_name, const void *plugin_addr,
-                      const struct GNUNET_ATS_Information *atsi,
+                   size_t plugin_addr_len, uint32_t session_id,
-                      uint32_t atsi_count)
+                   const struct GNUNET_ATS_Information *atsi,
+                   uint32_t atsi_count)
 {
  struct ATS_Address *aa;
  struct ATS_Address *ea;
@@ -496,7 +508,7 @@ GAS_addresses_add (const struct GNUNET_PeerIdentity *peer,
  }
  /* Get existing address or address with session == 0 */
-  ea = find_equivalent_address (peer, aa);
+  ea = find_equivalent_address (handle, peer, aa);
  if (ea == NULL)
  {
    /* We have a new address */
@@ -508,6 +520,9 @@ GAS_addresses_add (const struct GNUNET_PeerIdentity *peer,
                GNUNET_i2s (peer), session_id, aa);
    /* Tell solver about new address */
    handle->s_add (handle->solver, handle->addresses, aa);
    return;
  }
  GNUNET_free (aa->plugin);
@@ -540,7 +555,8 @@ GAS_addresses_add (const struct GNUNET_PeerIdentity *peer,
 void
-GAS_addresses_update (const struct GNUNET_PeerIdentity *peer,
+GAS_addresses_update (struct GAS_Addresses_Handle *handle,
+                      const struct GNUNET_PeerIdentity *peer,
                      const char *plugin_name, const void *plugin_addr,
                      size_t plugin_addr_len, uint32_t session_id,
                      const struct GNUNET_ATS_Information *atsi,
@@ -555,7 +571,7 @@ GAS_addresses_update (const struct GNUNET_PeerIdentity *peer,
  GNUNET_assert (NULL != handle->addresses);
  /* Get existing address */
-  aa = lookup_address (peer, plugin_name, plugin_addr, plugin_addr_len,
+  aa = lookup_address (handle, peer, plugin_name, plugin_addr, plugin_addr_len,
                       session_id, atsi, atsi_count);
  if (aa == NULL)
  {
@@ -637,7 +653,7 @@ destroy_by_session_id (void *cls, const struct GNUNET_HashCode * key, void *valu
      /* Notify solver about deletion */
      handle->s_del (handle->solver, handle->addresses, aa, GNUNET_NO);
-      destroy_address (aa);
+      destroy_address (handle, aa);
      dc->result = GNUNET_NO;
      return GNUNET_OK; /* Continue iteration */
    }
@@ -667,7 +683,7 @@ destroy_by_session_id (void *cls, const struct GNUNET_HashCode * key, void *valu
        /* Notify solver about deletion */
        handle->s_del (handle->solver, handle->addresses, aa, GNUNET_NO);
-        destroy_address (aa);
+        destroy_address (handle, aa);
        dc->result = GNUNET_NO;
        return GNUNET_OK; /* Continue iteration */
    }
@@ -687,7 +703,8 @@ destroy_by_session_id (void *cls, const struct GNUNET_HashCode * key, void *valu
 }
 void
-GAS_addresses_destroy (const struct GNUNET_PeerIdentity *peer,
+GAS_addresses_destroy (struct GAS_Addresses_Handle *handle,
+                       const struct GNUNET_PeerIdentity *peer,
                       const char *plugin_name, const void *plugin_addr,
                       size_t plugin_addr_len, uint32_t session_id)
 {
@@ -698,7 +715,7 @@ GAS_addresses_destroy (const struct GNUNET_PeerIdentity *peer,
    return;
  /* Get existing address */
-  ea = lookup_address (peer, plugin_name, plugin_addr, plugin_addr_len,
+  ea = lookup_address (handle, peer, plugin_name, plugin_addr, plugin_addr_len,
                       session_id, NULL, 0);
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -724,11 +741,12 @@ GAS_addresses_destroy (const struct GNUNET_PeerIdentity *peer,
 int
-GAS_addresses_in_use (const struct GNUNET_PeerIdentity *peer,
+GAS_addresses_in_use (struct GAS_Addresses_Handle *handle,
+                      const struct GNUNET_PeerIdentity *peer,
                      const char *plugin_name, const void *plugin_addr,
                      size_t plugin_addr_len, uint32_t session_id, int in_use)
 {
-  struct ATS_Address *old;
+  struct ATS_Address *ea;
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                "Received `%s' for peer `%s'\n",
@@ -738,8 +756,10 @@ GAS_addresses_in_use (const struct GNUNET_PeerIdentity *peer,
  if (GNUNET_NO == handle->running)
    return GNUNET_SYSERR;
-  old = lookup_address (peer, plugin_name, plugin_addr, plugin_addr_len, session_id, NULL, 0);
+  ea = lookup_address (handle, peer, plugin_name,
-  if (NULL == old)
+                        plugin_addr, plugin_addr_len,
+                        session_id, NULL, 0);
+  if (NULL == ea)
  {
    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                "Trying to set unknown address `%s', %s %u %s \n",
@@ -749,20 +769,20 @@ GAS_addresses_in_use (const struct GNUNET_PeerIdentity *peer,
    GNUNET_break (0);
    return GNUNET_SYSERR;
  }
-  if (old->used == in_use)
+  if (ea->used == in_use)
  {
    GNUNET_break (0);
    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                "Address in use called multiple times for peer `%s': %s -> %s \n",
                GNUNET_i2s (peer),
-                (GNUNET_NO == old->used) ? "NO" : "YES",
+                (GNUNET_NO == ea->used) ? "NO" : "YES",
                (GNUNET_NO == in_use) ? "NO" : "YES");
    return GNUNET_SYSERR;
  }
-  old->used = in_use;
+  ea->used = in_use;
  /* Tell solver about update */
-  handle->s_update (handle->solver, handle->addresses, old);
+  handle->s_update (handle->solver, handle->addresses, ea);
  return GNUNET_OK;
 }
@@ -774,7 +794,8 @@ GAS_addresses_in_use (const struct GNUNET_PeerIdentity *peer,
 * @param peer the respective peer
 */
 void
-GAS_addresses_request_address_cancel (const struct GNUNET_PeerIdentity *peer)
+GAS_addresses_request_address_cancel (struct GAS_Addresses_Handle *handle,
+                                      const struct GNUNET_PeerIdentity *peer)
 {
  struct GAS_Addresses_Suggestion_Requests *cur = handle->r_head;
@@ -794,7 +815,7 @@ GAS_addresses_request_address_cancel (const struct GNUNET_PeerIdentity *peer)
                  "No address requests pending for peer `%s', cannot remove!\n", GNUNET_i2s (peer));
      return;
  }
-  GAS_addresses_handle_backoff_reset (peer);
+  GAS_addresses_handle_backoff_reset (handle, peer);
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Removed request pending for peer `%s\n", GNUNET_i2s (peer));
  GNUNET_CONTAINER_DLL_remove (handle->r_head, handle->r_tail, cur);
@@ -808,7 +829,8 @@ GAS_addresses_request_address_cancel (const struct GNUNET_PeerIdentity *peer)
 * @param peer the respective peer
 */
 void
-GAS_addresses_request_address (const struct GNUNET_PeerIdentity *peer)
+GAS_addresses_request_address (struct GAS_Addresses_Handle *handle,
+                               const struct GNUNET_PeerIdentity *peer)
 {
  struct GAS_Addresses_Suggestion_Requests *cur = handle->r_head;
  struct ATS_Address *aa;
@@ -883,7 +905,8 @@ reset_address_it (void *cls, const struct GNUNET_HashCode * key, void *value)
 void
-GAS_addresses_handle_backoff_reset (const struct GNUNET_PeerIdentity *peer)
+GAS_addresses_handle_backoff_reset (struct GAS_Addresses_Handle *handle,
+                                    const struct GNUNET_PeerIdentity *peer)
 {
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Received `%s' for peer `%s'\n",
@@ -898,7 +921,8 @@ GAS_addresses_handle_backoff_reset (const struct GNUNET_PeerIdentity *peer)
 void
-GAS_addresses_change_preference (const struct GNUNET_PeerIdentity *peer,
+GAS_addresses_change_preference (struct GAS_Addresses_Handle *handle,
+                                 const struct GNUNET_PeerIdentity *peer,
                                 enum GNUNET_ATS_PreferenceKind kind,
                                 float score)
 {
@@ -997,9 +1021,14 @@ load_quotas (const struct GNUNET_CONFIGURATION_Handle *cfg, unsigned long long *
 static void
-bandwidth_changed_cb (struct ATS_Address *address)
+bandwidth_changed_cb (void *cls, struct ATS_Address *address)
 {
+  struct GAS_Addresses_Handle *handle = cls;
  struct GAS_Addresses_Suggestion_Requests *cur;
+  GNUNET_assert (handle != NULL);
+  GNUNET_assert (address != NULL);
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Bandwidth assignment changed for peer %s \n", GNUNET_i2s(&address->peer));
  struct GNUNET_ATS_Information *ats;
  unsigned int ats_count;
@@ -1052,9 +1081,9 @@ GAS_addresses_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
  int c;
  ah = GNUNET_malloc (sizeof (struct GAS_Addresses_Handle));
-  handle = ah;
+  ah->running = GNUNET_NO;
-  handle->running = GNUNET_NO;
+  ah->stat = (struct GNUNET_STATISTICS_Handle *) stats;
  /* Initialize the addresses database */
  ah->addresses = GNUNET_CONTAINER_multihashmap_create (128, GNUNET_NO);
  GNUNET_assert (NULL != ah->addresses);
@@ -1134,7 +1163,7 @@ GAS_addresses_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
  quota_count = load_quotas(cfg, quotas_in, quotas_out, GNUNET_ATS_NetworkTypeCount);
-  ah->solver = ah->s_init (cfg, stats, quotas, quotas_in, quotas_out, quota_count, &bandwidth_changed_cb);
+  ah->solver = ah->s_init (cfg, stats, quotas, quotas_in, quotas_out, quota_count, &bandwidth_changed_cb, ah);
  if (NULL == ah->solver)
  {
    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to initialize solver!\n");
@@ -1162,7 +1191,7 @@ free_address_it (void *cls, const struct GNUNET_HashCode * key, void *value)
  struct GAS_Addresses_Handle *handle = cls;
  struct ATS_Address *aa = value;
  handle->s_del (handle->solver, handle->addresses, aa, GNUNET_NO);
-  destroy_address (aa);
+  destroy_address (handle, aa);
  return GNUNET_OK;
 }
@@ -1241,7 +1270,7 @@ peer_it (void *cls,
 * @param p_it_cls the closure for the iterator
 */
 void
-GAS_addresses_iterate_peers (GNUNET_ATS_Peer_Iterator p_it, void *p_it_cls)
+GAS_addresses_iterate_peers (struct GAS_Addresses_Handle *handle, GNUNET_ATS_Peer_Iterator p_it, void *p_it_cls)
 {
  struct PeerIteratorContext ip_ctx;
  unsigned int size;
@@ -1305,7 +1334,10 @@ peerinfo_it (void *cls,
 * @param pi_it_cls the closure for the iterator
 */
 void
-GAS_addresses_get_peer_info (const struct GNUNET_PeerIdentity *peer, GNUNET_ATS_PeerInfo_Iterator pi_it, void *pi_it_cls)
+GAS_addresses_get_peer_info (struct GAS_Addresses_Handle *handle,
+                             const struct GNUNET_PeerIdentity *peer,
+                             GNUNET_ATS_PeerInfo_Iterator pi_it,
+                             void *pi_it_cls)
 {
  struct PeerInfoIteratorContext pi_ctx;
  struct GNUNET_BANDWIDTH_Value32NBO zero_bw;
diff --git a/src/ats/gnunet-service-ats_addresses.h b/src/ats/gnunet-service-ats_addresses.h
index 31b747300..b5c665992 100644
--- a/src/ats/gnunet-service-ats_addresses.h
+++ b/src/ats/gnunet-service-ats_addresses.h
@@ -34,6 +34,8 @@
 #define ATS_BLOCKING_DELTA GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 100)
+struct GAS_Addresses_Handle;
 /**
 * Address with additional information
 */
@@ -143,7 +145,7 @@ struct ATS_Address
 */
 typedef void
- (*GAS_bandwidth_changed_cb) (struct ATS_Address *address);
+ (*GAS_bandwidth_changed_cb) (void *cls, struct ATS_Address *address);
 /**
 * Init the simplistic problem solving component
@@ -174,7 +176,8 @@ typedef void *
                     unsigned long long *out_quota,
                     unsigned long long *in_quota,
                     int dest_length,
-                     GAS_bandwidth_changed_cb bw_changed_cb);
+                     GAS_bandwidth_changed_cb bw_changed_cb,
+                     void *bw_changed_cb_cls);
 typedef void
@@ -236,18 +239,21 @@ void
 GAS_addresses_done (struct GAS_Addresses_Handle *handle);
 void
-GAS_addresses_handle_backoff_reset (const struct GNUNET_PeerIdentity *peer);
+GAS_addresses_handle_backoff_reset (struct GAS_Addresses_Handle *handle,
+                                    const struct GNUNET_PeerIdentity *peer);
 /**
 * This address is now used or not used anymore
 */
 int
-GAS_addresses_in_use (const struct GNUNET_PeerIdentity *peer,
+GAS_addresses_in_use (struct GAS_Addresses_Handle *handle,
+                      const struct GNUNET_PeerIdentity *peer,
                      const char *plugin_name, const void *plugin_addr,
                      size_t plugin_addr_len, uint32_t session_id, int in_use);
 void
-GAS_addresses_update (const struct GNUNET_PeerIdentity *peer,
+GAS_addresses_update (struct GAS_Addresses_Handle *handle,
+                      const struct GNUNET_PeerIdentity *peer,
                      const char *plugin_name, const void *plugin_addr,
                      size_t plugin_addr_len, uint32_t session_id,
                      const struct GNUNET_ATS_Information *atsi,
@@ -255,7 +261,8 @@ GAS_addresses_update (const struct GNUNET_PeerIdentity *peer,
 void
-GAS_addresses_destroy (const struct GNUNET_PeerIdentity *peer,
+GAS_addresses_destroy (struct GAS_Addresses_Handle *handle,
+                       const struct GNUNET_PeerIdentity *peer,
                       const char *plugin_name, const void *plugin_addr,
                       size_t plugin_addr_len, uint32_t session_id);
@@ -270,22 +277,26 @@ GAS_addresses_destroy_all (struct GAS_Addresses_Handle *handle);
 * @param peer the respective peer
 */
 void
-GAS_addresses_request_address_cancel (const struct GNUNET_PeerIdentity *peer);
+GAS_addresses_request_address_cancel (struct GAS_Addresses_Handle *handle,
+                                      const struct GNUNET_PeerIdentity *peer);
 void
-GAS_addresses_request_address (const struct GNUNET_PeerIdentity *peer);
+GAS_addresses_request_address (struct GAS_Addresses_Handle *handle,
+                               const struct GNUNET_PeerIdentity *peer);
 void
-GAS_addresses_change_preference (const struct GNUNET_PeerIdentity *peer,
+GAS_addresses_change_preference (struct GAS_Addresses_Handle *handle,
+                                 const struct GNUNET_PeerIdentity *peer,
                                 enum GNUNET_ATS_PreferenceKind kind,
                                 float score);
 void
-GAS_addresses_add (const struct GNUNET_PeerIdentity *peer,
+GAS_addresses_add (struct GAS_Addresses_Handle *handle,
-                      const char *plugin_name, const void *plugin_addr,
+                   const struct GNUNET_PeerIdentity *peer,
-                      size_t plugin_addr_len, uint32_t session_id,
+                   const char *plugin_name, const void *plugin_addr,
-                      const struct GNUNET_ATS_Information *atsi,
+                   size_t plugin_addr_len, uint32_t session_id,
-                      uint32_t atsi_count);
+                   const struct GNUNET_ATS_Information *atsi,
+                   uint32_t atsi_count);
 typedef void (*GNUNET_ATS_Peer_Iterator) (void *p_it_cls,
@@ -298,7 +309,9 @@ typedef void (*GNUNET_ATS_Peer_Iterator) (void *p_it_cls,
 * @param p_it_cls the closure for the iterator
 */
 void
-GAS_addresses_iterate_peers (GNUNET_ATS_Peer_Iterator p_it, void *p_it_cls);
+GAS_addresses_iterate_peers (struct GAS_Addresses_Handle *handle,
+                             GNUNET_ATS_Peer_Iterator p_it,
+                             void *p_it_cls);
 typedef void (*GNUNET_ATS_PeerInfo_Iterator) (void *p_it_cls,
    const struct GNUNET_PeerIdentity *id,
@@ -319,7 +332,10 @@ typedef void (*GNUNET_ATS_PeerInfo_Iterator) (void *p_it_cls,
 * @param pi_it_cls the closure for the iterator
 */
 void
-GAS_addresses_get_peer_info (const struct GNUNET_PeerIdentity *peer, GNUNET_ATS_PeerInfo_Iterator pi_it, void *pi_it_cls);
+GAS_addresses_get_peer_info (struct GAS_Addresses_Handle *handle,
+                             const struct GNUNET_PeerIdentity *peer,
+                             GNUNET_ATS_PeerInfo_Iterator pi_it,
+                             void *pi_it_cls);
 #endif
diff --git a/src/ats/gnunet-service-ats_addresses_mlp.c b/src/ats/gnunet-service-ats_addresses_mlp.c
index fe212e78e..4dbf02cd7 100644
--- a/src/ats/gnunet-service-ats_addresses_mlp.c
+++ b/src/ats/gnunet-service-ats_addresses_mlp.c
@@ -1082,7 +1082,8 @@ GAS_mlp_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
              unsigned long long *out_dest,
              unsigned long long *in_dest,
              int dest_length,
-              GAS_bandwidth_changed_cb bw_changed_cb)
+              GAS_bandwidth_changed_cb bw_changed_cb,
+              void *bw_changed_cb_cls)
 {
  struct GAS_MLP_Handle * mlp = GNUNET_malloc (sizeof (struct GAS_MLP_Handle));
diff --git a/src/ats/gnunet-service-ats_addresses_mlp.h b/src/ats/gnunet-service-ats_addresses_mlp.h
index ea7f87af6..49996ba51 100644
--- a/src/ats/gnunet-service-ats_addresses_mlp.h
+++ b/src/ats/gnunet-service-ats_addresses_mlp.h
@@ -326,7 +326,8 @@ GAS_mlp_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
              unsigned long long *out_dest,
              unsigned long long *in_dest,
              int dest_length,
-              GAS_bandwidth_changed_cb bw_changed_cb);
+              GAS_bandwidth_changed_cb bw_changed_cb,
+              void *bw_changed_cb_cls);
 /**
diff --git a/src/ats/gnunet-service-ats_addresses_simplistic.c b/src/ats/gnunet-service-ats_addresses_simplistic.c
index 84e8911d1..37491dd7f 100644
--- a/src/ats/gnunet-service-ats_addresses_simplistic.c
+++ b/src/ats/gnunet-service-ats_addresses_simplistic.c
@@ -68,6 +68,7 @@ struct GAS_SIMPLISTIC_Handle
  unsigned int networks;
  GAS_bandwidth_changed_cb bw_changed;
+  void *bw_changed_cls;
 };
 struct Network
@@ -144,7 +145,8 @@ GAS_simplistic_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
                     unsigned long long *out_quota,
                     unsigned long long *in_quota,
                     int dest_length,
-                     GAS_bandwidth_changed_cb bw_changed_cb)
+                     GAS_bandwidth_changed_cb bw_changed_cb,
+                     void *bw_changed_cb_cls)
 {
  int c;
  struct GAS_SIMPLISTIC_Handle *s = GNUNET_malloc (sizeof (struct GAS_SIMPLISTIC_Handle));
@@ -152,6 +154,7 @@ GAS_simplistic_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
  char * net_str[GNUNET_ATS_NetworkTypeCount] = {"UNSPECIFIED", "LOOPBACK", "LAN", "WAN", "WLAN"};
  s->bw_changed = bw_changed_cb;
+  s->bw_changed_cls = bw_changed_cb_cls;
  s->networks = dest_length;
  s->network_entries = GNUNET_malloc (dest_length * sizeof (struct Network));
  s->active_addresses = 0;
@@ -277,7 +280,7 @@ update_quota_per_network (struct GAS_SIMPLISTIC_Handle *s,
        cur->addr->assigned_bw_out.value__ = htonl (quota_out);
        /* Notify on change */
        if ((GNUNET_YES == cur->addr->active) && (cur->addr != address_except))
-          s->bw_changed (cur->addr);
+          s->bw_changed (s->bw_changed_cls, cur->addr);
      }
      cur = cur->next;
  }
@@ -606,7 +609,7 @@ GAS_simplistic_get_preferred_address (void *solver,
      prev->active = GNUNET_NO; /* No active any longer */
      prev->assigned_bw_in = GNUNET_BANDWIDTH_value_init (0); /* no bw assigned */
      prev->assigned_bw_out = GNUNET_BANDWIDTH_value_init (0); /* no bw assigned */
-      s->bw_changed (prev); /* notify about bw change, REQUIRED? */
+      s->bw_changed (s->bw_changed_cls, prev); /* notify about bw change, REQUIRED? */
      if (net_prev->active_addresses < 1)
        GNUNET_break (0);
      else
diff --git a/src/ats/gnunet-service-ats_addresses_simplistic.h b/src/ats/gnunet-service-ats_addresses_simplistic.h
index 773772583..3fd36cf32 100644
--- a/src/ats/gnunet-service-ats_addresses_simplistic.h
+++ b/src/ats/gnunet-service-ats_addresses_simplistic.h
@@ -59,7 +59,8 @@ GAS_simplistic_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
                     unsigned long long *out_quota,
                     unsigned long long *in_quota,
                     int dest_length,
-                     GAS_bandwidth_changed_cb bw_changed_cb);
+                     GAS_bandwidth_changed_cb bw_changed_cb,
+                     void *bw_changed_cb_cls);
 /**
 * Shutdown the simplistic problem solving component
diff --git a/src/ats/gnunet-service-ats_performance.c b/src/ats/gnunet-service-ats_performance.c
index c762ebc33..ef6e5572a 100644
--- a/src/ats/gnunet-service-ats_performance.c
+++ b/src/ats/gnunet-service-ats_performance.c
@@ -77,6 +77,10 @@ struct AddressIteration
  unsigned int msg_type;
 };
+/**
+ * Address handle
+ */
+static struct GAS_Addresses_Handle *GSA_addresses;
 /**
 * Head of linked list of all clients to this service.
@@ -288,7 +292,7 @@ peer_it (void *cls,
  if (NULL != id)
  {
    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback for peer `%s'\n", GNUNET_i2s (id));
-    GAS_addresses_get_peer_info (id, &peerinfo_it, pc);
+    GAS_addresses_get_peer_info (GSA_addresses, id, &peerinfo_it, pc);
  }
 }
@@ -313,7 +317,7 @@ GAS_performance_add_client (struct GNUNET_SERVER_Client *client,
  GNUNET_CONTAINER_DLL_insert (pc_head, pc_tail, pc);
  /* Send information about clients */
-  GAS_addresses_iterate_peers (&peer_it, pc);
+  GAS_addresses_iterate_peers (GSA_addresses, &peer_it, pc);
 }
 static void transmit_req_addr (struct AddressIteration *ai,
@@ -442,7 +446,7 @@ req_addr_peer_it (void *cls,
  if (NULL != id)
  {
    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback for peer `%s'\n", GNUNET_i2s (id));
-    GAS_addresses_get_peer_info (id, &req_addr_peerinfo_it, ai);
+    GAS_addresses_get_peer_info (GSA_addresses, id, &req_addr_peerinfo_it, ai);
  }
  else
  {
@@ -485,13 +489,13 @@ GAS_handle_request_address_list (void *cls, struct GNUNET_SERVER_Client *client,
  if (0 == memcmp (&alrm->peer, &allzeros, sizeof (struct GNUNET_PeerIdentity)))
  {
      /* Return addresses for all peers */
-      GAS_addresses_iterate_peers (&req_addr_peer_it, &ai);
+      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);
  }
  else
  {
      /* Return addresses for a specific peer */
-      GAS_addresses_get_peer_info (&alrm->peer, &req_addr_peerinfo_it, &ai);
+      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);
@@ -582,7 +586,7 @@ GAS_handle_preference_change (void *cls, struct GNUNET_SERVER_Client *client,
                            1, GNUNET_NO);
  pi = (const struct PreferenceInformation *) &msg[1];
  for (i = 0; i < nump; i++)
-    GAS_addresses_change_preference (&msg->peer,
+    GAS_addresses_change_preference (GSA_addresses, &msg->peer,
                                     (enum GNUNET_ATS_PreferenceKind)
                                     ntohl (pi[i].preference_kind),
                                     pi[i].preference_value);
@@ -596,8 +600,10 @@ GAS_handle_preference_change (void *cls, struct GNUNET_SERVER_Client *client,
 * @param server handle to our server
 */
 void
-GAS_performance_init (struct GNUNET_SERVER_Handle *server)
+GAS_performance_init (struct GNUNET_SERVER_Handle *server,
+                      struct GAS_Addresses_Handle *addresses)
 {
+  GSA_addresses = addresses;
  nc = GNUNET_SERVER_notification_context_create (server, 128);
 }
diff --git a/src/ats/gnunet-service-ats_performance.h b/src/ats/gnunet-service-ats_performance.h
index f237c71ac..0ef481d48 100644
--- a/src/ats/gnunet-service-ats_performance.h
+++ b/src/ats/gnunet-service-ats_performance.h
@@ -120,7 +120,8 @@ GAS_handle_preference_change (void *cls, struct GNUNET_SERVER_Client *client,
 * @param server handle to our server
 */
 void
-GAS_performance_init (struct GNUNET_SERVER_Handle *server);
+GAS_performance_init (struct GNUNET_SERVER_Handle *server,
+                      struct GAS_Addresses_Handle *GSA_addresses);
 /**
diff --git a/src/ats/gnunet-service-ats_scheduling.c b/src/ats/gnunet-service-ats_scheduling.c
index 4526e1286..70009b310 100644
--- a/src/ats/gnunet-service-ats_scheduling.c
+++ b/src/ats/gnunet-service-ats_scheduling.c
@@ -171,10 +171,8 @@ GAS_handle_request_address (void *cls, struct GNUNET_SERVER_Client *client,
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n",
              "REQUEST_ADDRESS");
-  GNUNET_STATISTICS_update (GSA_stats, "# address requests received", 1,
-                            GNUNET_NO);
  GNUNET_break (0 == ntohl (msg->reserved));
-  GAS_addresses_request_address (&msg->peer);
+  GAS_addresses_request_address (address_handle, &msg->peer);
  GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
@@ -198,7 +196,7 @@ GAS_handle_request_address_cancel (void *cls,
              "REQUEST_ADDRESS_CANCEL");
  GNUNET_break (0 == ntohl (msg->reserved));
-  GAS_addresses_request_address_cancel (&msg->peer);
+  GAS_addresses_request_address_cancel (address_handle, &msg->peer);
  GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
@@ -220,10 +218,8 @@ GAS_handle_reset_backoff (void *cls,
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n",
              "RESET_BACKOFF");
-  GNUNET_STATISTICS_update (GSA_stats, "# backoff reset requests received", 1,
-                            GNUNET_NO);
  GNUNET_break (0 == ntohl (msg->reserved));
-  GAS_addresses_handle_backoff_reset (&msg->peer);
+  GAS_addresses_handle_backoff_reset (address_handle, &msg->peer);
  GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
@@ -280,7 +276,7 @@ GAS_handle_address_add (void *cls, struct GNUNET_SERVER_Client *client,
  }
  GNUNET_STATISTICS_update (GSA_stats, "# address updates received", 1,
                            GNUNET_NO);
-  GAS_addresses_add (&m->peer, plugin_name, address, address_length,
+  GAS_addresses_add (address_handle, &m->peer, plugin_name, address, address_length,
                        ntohl (m->session_id), atsi, ats_count);
  GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
@@ -339,7 +335,7 @@ GAS_handle_address_update (void *cls, struct GNUNET_SERVER_Client *client,
  }
  GNUNET_STATISTICS_update (GSA_stats, "# address updates received", 1,
                            GNUNET_NO);
-  GAS_addresses_update (&m->peer, plugin_name, address, address_length,
+  GAS_addresses_update (address_handle, &m->peer, plugin_name, address, address_length,
                        ntohl (m->session_id), atsi, ats_count);
  GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
@@ -395,12 +391,13 @@ GAS_handle_address_in_use (void *cls, struct GNUNET_SERVER_Client *client,
  }
  in_use = ntohs (m->in_use);
-  res = GAS_addresses_in_use (&m->peer,
+  res = GAS_addresses_in_use (address_handle,
-                             plugin_name,
+                              &m->peer,
-                             address,
+                              plugin_name,
-                             address_length,
+                              address,
-                             ntohl (m->session_id),
+                              address_length,
-                             in_use);
+                              ntohl (m->session_id),
+                              in_use);
  if (res == GNUNET_OK)
    GNUNET_SERVER_receive_done (client, GNUNET_OK);
@@ -465,7 +462,8 @@ GAS_handle_address_destroyed (void *cls, struct GNUNET_SERVER_Client *client,
    return;
  }
  GNUNET_STATISTICS_update (GSA_stats, "# addresses destroyed", 1, GNUNET_NO);
-  GAS_addresses_destroy (&m->peer, plugin_name, address, address_length,
+  GAS_addresses_destroy (address_handle, &m->peer, plugin_name,
+                         address, address_length,
                         ntohl (m->session_id));
  if (0 != ntohl (m->session_id))
  {
diff --git a/src/sysmon/Makefile.am b/src/sysmon/Makefile.am
index dd9c24691..0e87a627f 100644
--- a/src/sysmon/Makefile.am
+++ b/src/sysmon/Makefile.am
@@ -16,16 +16,16 @@ if USE_COVERAGE
 endif
 libexec_PROGRAMS = \
- gnunet_daemon_sysmon
+ gnunet_service_sysmon
 check_PROGRAMS = \
 test_glibtop \
 test_glibtop_process \
 test_glibtop_network
 
-gnunet_daemon_sysmon_SOURCES = \
+gnunet_service_sysmon_SOURCES = \
- gnunet-daemon-sysmon.c         
+ gnunet-service-sysmon.c         
-gnunet_daemon_sysmon_LDADD = \
+gnunet_service_sysmon_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(GN_LIBINTL)
diff --git a/src/sysmon/gnunet-daemon-sysmon.c b/src/sysmon/gnunet-service-sysmon.c
index 3fb0fdd5a..32b4ccbed 100644
--- a/src/sysmon/gnunet-daemon-sysmon.c
+++ b/src/sysmon/gnunet-service-sysmon.c
@@ -19,8 +19,8 @@
 */
 /**
- * @file sysmon/gnunet-daemon-sysmon.c
+ * @file sysmon/gnunet-service-sysmon.c
- * @brief system monitoring daemon
+ * @brief system monitoring service
 * @author Matthias Wachs
 */
 #include "platform.h"
@@ -508,18 +508,40 @@ run_properties (void)
  return GNUNET_OK;
 }
+/**
+ * Task run during shutdown.
+ *
+ * @param cls unused
+ * @param tc unused
+ */
+static void
+cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  /* FIXME: do clean up here */
+}
 /**
- * Main function that will be run by the scheduler.
+ * Process template requests.
 *
 * @param cls closure
- * @param args remaining command-line arguments
+ * @param server the initialized server
- * @param cfgfile name of the configuration file used (for saving, can be NULL!)
+ * @param cfg configuration to use
- * @param cfg configuration
 */
 static void
-run (void *cls, char *const *args, const char *cfgfile,
+run (void *cls, struct GNUNET_SERVER_Handle *server,
     const struct GNUNET_CONFIGURATION_Handle *mycfg)
 {
+  static const struct GNUNET_SERVER_MessageHandler handlers[] = {
+    /* FIXME: add handlers here! */
+    {NULL, NULL, 0, 0}
+  };
+  /* FIXME: do setup here */
+  GNUNET_SERVER_add_handlers (server, handlers);
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleanup_task,
+                                NULL);
  struct GNUNET_CONFIGURATION_Handle *properties;
  char *file;
@@ -590,7 +612,7 @@ run (void *cls, char *const *args, const char *cfgfile,
 /**
- * The main function.
+ * The main function for the template service.
 *
 * @param argc number of arguments from the command line
 * @param argv command line arguments
@@ -599,18 +621,9 @@ run (void *cls, char *const *args, const char *cfgfile,
 int
 main (int argc, char *const *argv)
 {
-  static const struct GNUNET_GETOPT_CommandLineOption options[] = {
+  return (GNUNET_OK ==
-    GNUNET_GETOPT_OPTION_END
+          GNUNET_SERVICE_run (argc, argv, "sysmon",
-  };
+                              GNUNET_SERVICE_OPTION_NONE, &run, NULL)) ? 0 : 1;
-  if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
-    return 2;
-  ret = (GNUNET_OK ==
-         GNUNET_PROGRAM_run (argc, argv, "gnunet-daemon-sysmon",
-                             gettext_noop ("GNUnet system monitoring and information daemon"), options, &run,
-                             NULL)) ? ret : 1;
-  GNUNET_free ((void*) argv);
-  return ret;
 }
-/* end of gnunet-daemon-sysmon.c */
+/* end of gnunet-service-sysmon.c */
diff --git a/src/sysmon/sysmon.conf.in b/src/sysmon/sysmon.conf.in
index b5c4c7355..238f4e2ae 100644
--- a/src/sysmon/sysmon.conf.in
+++ b/src/sysmon/sysmon.conf.in
@@ -5,4 +5,4 @@ HOSTNAME = localhost
 HOME = $SERVICEHOME
 BINARY = gnunet-daemon-sysmon
 CFGFILE = sysmon-properties.conf
-UNIXPATH = /tmp/gnunet-daemon-sysmon.sock
+UNIXPATH = /tmp/gnunet-service-sysmon.sock