X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fats%2Fgnunet-service-ats_addresses.c;h=fb9bad037049020cc516ffe003e49c3aab27bf06;hb=82c4c89493dcbfc6ee7fd1232a9088d02e2cd0a2;hp=5eb6a4e6ef0426eec45159cb50500d442941f77c;hpb=206531cbf35d8a7f017857ae87b305ccf27e8ef7;p=oweals%2Fgnunet.git

diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index 5eb6a4e6e..fb9bad037 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -25,279 +25,734 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
+#include "gnunet_ats_service.h"
+#include "gnunet-service-ats.h"
 #include "gnunet-service-ats_addresses.h"
 #include "gnunet-service-ats_performance.h"
 #include "gnunet-service-ats_scheduling.h"
 #include "gnunet-service-ats_reservations.h"
+#if HAVE_LIBGLPK
+#include "gnunet-service-ats_addresses_mlp.h"
+#endif
 
-struct ATS_Address
+#define VERBOSE GNUNET_NO
+
+enum ATS_Mode
 {
-  struct GNUNET_PeerIdentity peer;
+  /*
+   * Assign each peer an equal amount of bandwidth (bw)
+   *
+   * bw_per_peer = bw_total / #active addresses
+   */
+  SIMPLE,
+
+  /*
+   * Use MLP solver to assign bandwidth
+   */
+  MLP
+};
 
-  size_t addr_len;
+static struct GNUNET_CONTAINER_MultiHashMap *addresses;
 
-  struct GNUNET_SERVER_Client *session_client;
-		   
-  uint32_t session_id;
+#if HAVE_LIBGLPK
+static struct GAS_MLP_Handle *mlp;
+#endif
 
-  uint32_t ats_count;
+static unsigned long long wan_quota_in;
 
-  const void * addr;
+static unsigned long long wan_quota_out;
 
-  char * plugin;
+static unsigned int active_addr_count;
 
-  struct GNUNET_TRANSPORT_ATS_Information * ats;
+static int ats_mode;
 
-  struct GNUNET_BANDWIDTH_Value32NBO bw_in;
 
-  struct GNUNET_BANDWIDTH_Value32NBO bw_out;
+/**
+ * Update a bandwidth assignment for a peer.  This trivial method currently
+ * simply assigns the same share to all active connections.
+ *
+ * @param cls unused
+ * @param key unused
+ * @param value the 'struct ATS_Address'
+ * @return GNUNET_OK (continue to iterate)
+ */
+static int
+update_bw_simple_it (void *cls, const GNUNET_HashCode * key, void *value)
+{
+  struct ATS_Address *aa = value;
+
+  if (GNUNET_YES != aa->active)
+    return GNUNET_OK;
+  GNUNET_assert (active_addr_count > 0);
+
+
+  /* Simple method */
+  aa->assigned_bw_in.value__ = htonl (wan_quota_in / active_addr_count);
+  aa->assigned_bw_out.value__ = htonl (wan_quota_out / active_addr_count);
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "New bandwidth for peer %s is %u/%u\n",
+              GNUNET_i2s (&aa->peer), ntohl (aa->assigned_bw_in.value__),
+              ntohl (aa->assigned_bw_out.value__));
+  GAS_scheduling_transmit_address_suggestion (&aa->peer, aa->plugin, aa->addr,
+                                              aa->addr_len, aa->session_id,
+                                              aa->ats, aa->ats_count,
+                                              aa->assigned_bw_out,
+                                              aa->assigned_bw_in);
+  GAS_reservations_set_bandwidth (&aa->peer, aa->assigned_bw_in);
+  GAS_performance_notify_clients (&aa->peer, aa->plugin, aa->addr, aa->addr_len,
+                                  aa->ats, aa->ats_count, aa->assigned_bw_out,
+                                  aa->assigned_bw_in);
+  return GNUNET_OK;
+}
 
-};
 
+/**
+ * Some (significant) input changed, recalculate bandwidth assignment
+ * for all peers.
+ */
+static void
+recalculate_assigned_bw ()
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Recalculating bandwidth for all active connections\n");
+  GNUNET_STATISTICS_update (GSA_stats, "# bandwidth recalculations performed",
+                            1, GNUNET_NO);
+  GNUNET_STATISTICS_set (GSA_stats, "# active addresses", active_addr_count,
+                         GNUNET_NO);
 
-static struct GNUNET_CONTAINER_MultiHashMap * addresses;
+  GNUNET_CONTAINER_multihashmap_iterate (addresses, &update_bw_simple_it, NULL);
+}
 
-static unsigned long long total_quota_in;
+/**
+ * Free the given address
+ * @param addr address to destroy
+ */
+static void
+free_address (struct ATS_Address *addr)
+{
+  GNUNET_free_non_null (addr->ats);
+  GNUNET_free (addr->plugin);
+  GNUNET_free (addr);
+}
 
-static unsigned long long total_quota_out;
+/**
+ * Create a ATS_address with the given information
+ * @param peer peer
+ * @param plugin_name plugin
+ * @param plugin_addr address
+ * @param plugin_addr_len address length
+ * @param session_id session
+ * @return the ATS_Address
+ */
+static struct ATS_Address *
+create_address (const struct GNUNET_PeerIdentity *peer,
+                const char *plugin_name,
+                const void *plugin_addr, size_t plugin_addr_len,
+                uint32_t session_id)
+{
+  struct ATS_Address *aa = NULL;
 
-static unsigned int active_addr_count;
+  aa = GNUNET_malloc (sizeof (struct ATS_Address) + plugin_addr_len);
+  aa->peer = *peer;
+  aa->addr_len = plugin_addr_len;
+  aa->addr = &aa[1];
+  memcpy (&aa[1], plugin_addr, plugin_addr_len);
+  aa->plugin = GNUNET_strdup (plugin_name);
+  aa->session_id = session_id;
+  aa->mlp_information = NULL;
+  aa->next = NULL;
+  aa->prev = NULL;
+  return aa;
+}
 
 
-struct CompareAddressContext
+/**
+ * Destroy the given address.
+ *
+ * @param addr address to destroy
+ * @return GNUNET_YES if bandwidth allocations should be recalcualted
+ */
+static int
+destroy_address (struct ATS_Address *addr)
 {
-  struct ATS_Address * search;
-  struct ATS_Address * result;
-};
+  int ret;
 
+  ret = GNUNET_NO;
+  GNUNET_assert (GNUNET_YES ==
+                 GNUNET_CONTAINER_multihashmap_remove (addresses,
+                                                       &addr->peer.hashPubKey,
+                                                       addr));
 
-static void
-destroy_address (struct ATS_Address *addr)
-{
-  GNUNET_assert (GNUNET_YES == 
-		 GNUNET_CONTAINER_multihashmap_remove(addresses, 
-						      &addr->peer.hashPubKey, 
-						      addr));
-  if (ntohl (addr->bw_in.value__) > 0)
+#if HAVE_LIBGLPK
+  if (ats_mode == MLP)
+    GAS_mlp_address_delete (mlp, addresses, addr);
+#endif
+
+  if (GNUNET_YES == addr->active)
   {
     active_addr_count--;
-    // FIXME: update address assignment for other peers...
+    addr->active = GNUNET_NO;
+    ret = GNUNET_YES;
   }
-  GNUNET_free_non_null (addr->ats);
-  GNUNET_free (addr->plugin);
-  GNUNET_free (addr);
+  free_address (addr);
+  return ret;
 }
 
 
-static int 
-compare_address_it (void *cls,
-		    const GNUNET_HashCode * key,
-		    void *value)
+struct CompareAddressContext
 {
-  struct CompareAddressContext * cac = cls;
-  struct ATS_Address * aa = (struct ATS_Address *) value;
+  const struct ATS_Address *search;
+
+  /* exact_address != NULL if address and session is equal */
+  struct ATS_Address *exact_address;
+  /* exact_address != NULL if address and session is 0 */
+  struct ATS_Address *base_address;
+};
 
-  /* compare sessions */
-  if ((aa->session_client != cac->search->session_client) ||
-      (aa->session_id != cac->search->session_id))
-    return GNUNET_YES;
 
-  if (aa->addr_len != cac->search->addr_len)
+static int
+compare_address_it (void *cls, const GNUNET_HashCode * key, void *value)
+{
+  struct CompareAddressContext *cac = cls;
+  struct ATS_Address *aa = value;
+/*
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Comparing to: %s %s %u session %u\n",
+              GNUNET_i2s (&aa->peer), aa->plugin, aa->addr_len, aa->session_id);
+
+*/
+  /* find an exact matching address: aa->addr == cac->search->addr && aa->session == cac->search->session */
+  if ((aa->addr_len == cac->search->addr_len) && (0 == strcmp (aa->plugin, cac->search->plugin)))
   {
-    return GNUNET_YES;
+      if ((0 == memcmp (aa->addr, cac->search->addr, aa->addr_len)) && (aa->session_id == cac->search->session_id))
+      {
+        cac->exact_address = aa;
+      }
   }
 
-  if (0 == strcmp(aa->plugin, cac->search->plugin))
+  /* find an matching address: aa->addr == cac->search->addr && aa->session == 0 */
+  /* this address can be used to be updated */
+  if ((aa->addr_len == cac->search->addr_len) && (0 == strcmp (aa->plugin, cac->search->plugin)))
   {
-    return GNUNET_YES;
+      if ((0 == memcmp (aa->addr, cac->search->addr, aa->addr_len)) && (aa->session_id == 0))
+      {
+        cac->base_address = aa;
+      }
   }
 
-  if (0 == memcmp (aa->addr, cac->search->addr, aa->addr_len))
-  {
-    cac->result = aa;
+  if (cac->exact_address == NULL)
+    return GNUNET_YES;
+  else
     return GNUNET_NO;
-  }
-  return GNUNET_YES;
 }
 
 
+/**
+ * Find an existing equivalent address record.
+ * Compares by peer identity and network address OR by session ID
+ * (one of the two must match).
+ *
+ * @param peer peer to lookup addresses for
+ * @param addr existing address record
+ * @return existing address record, NULL for none
+ */
 struct ATS_Address *
 find_address (const struct GNUNET_PeerIdentity *peer,
-              struct ATS_Address * addr)
+              const struct ATS_Address *addr)
 {
   struct CompareAddressContext cac;
-  cac.result = NULL;
+
+  cac.exact_address = NULL;
+  cac.base_address = NULL;
   cac.search = addr;
+  GNUNET_CONTAINER_multihashmap_get_multiple (addresses, &peer->hashPubKey,
+                                              &compare_address_it, &cac);
+
+/*
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "exact address: %s           base address: %s\n",
+              (cac.exact_address != NULL) ? "YES" : "NO",
+              (cac.base_address != NULL) ? "YES" : "NO");
+*/
+  if (cac.exact_address == NULL)
+    return cac.base_address;
+  return cac.exact_address;
+}
 
-  GNUNET_CONTAINER_multihashmap_get_multiple(addresses,
-         &peer->hashPubKey,
-         compare_address_it,
-         &cac);
 
-  return cac.result;
+static int
+compare_address_session_it (void *cls, const GNUNET_HashCode * key, void *value)
+{
+  struct CompareAddressContext *cac = cls;
+  struct ATS_Address *aa = value;
+
+  if ((aa->addr_len == cac->search->addr_len) && (0 == strcmp (aa->plugin, cac->search->plugin)))
+  {
+      if ((0 == memcmp (aa->addr, cac->search->addr, aa->addr_len)) && (aa->session_id == cac->search->session_id))
+      {
+        cac->exact_address = aa;
+        return GNUNET_NO;
+      }
+  }
+  return GNUNET_YES;
+}
+
+
+/**
+ * Find an existing equivalent address record.
+ * Compares by peer identity and network address AND by session ID
+ * (one of the two must match).
+ *
+ * @param peer peer to lookup addresses for
+ * @param addr existing address record
+ * @return existing address record, NULL for none
+ */
+struct ATS_Address *
+find_exact_address (const struct GNUNET_PeerIdentity *peer,
+              const struct ATS_Address *addr)
+{
+  struct CompareAddressContext cac;
+
+  cac.exact_address = NULL;
+  cac.search = addr;
+  GNUNET_CONTAINER_multihashmap_get_multiple (addresses, &peer->hashPubKey,
+                                              &compare_address_session_it, &cac);
+  return cac.exact_address;
 }
 
 
 void
-GAS_address_update (const struct GNUNET_PeerIdentity *peer,
-		    const char *plugin_name,
-		    const void *plugin_addr, size_t plugin_addr_len,
-		    struct GNUNET_SERVER_Client *session_client,
-		    uint32_t session_id,
-		    const struct GNUNET_TRANSPORT_ATS_Information *atsi,
-		    uint32_t atsi_count)
+GAS_addresses_update (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,
+                      uint32_t atsi_count)
 {
-  struct ATS_Address * aa;
-  struct ATS_Address * old;
+  struct ATS_Address *aa;
+  struct ATS_Address *old;
+  uint32_t i;
 
-  aa = GNUNET_malloc (sizeof (struct ATS_Address) + plugin_addr_len);
-  aa->ats = GNUNET_malloc(atsi_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information));
-  aa->peer = *peer;
-  aa->addr_len = plugin_addr_len;
+  aa = create_address (peer,
+                       plugin_name,
+                       plugin_addr, plugin_addr_len,
+                       session_id);
+
+  aa->mlp_information = NULL;
+  aa->ats = GNUNET_malloc (atsi_count * sizeof (struct GNUNET_ATS_Information));
   aa->ats_count = atsi_count;
-  memcpy (aa->ats, atsi, atsi_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information));
-  aa->addr = &aa[1];
-  memcpy (&aa[1], plugin_addr, plugin_addr_len);
-  aa->plugin = GNUNET_strdup (plugin_name);
-  aa->session_client = session_client;
-  aa->session_id = session_id;
+  memcpy (aa->ats, atsi, atsi_count * sizeof (struct GNUNET_ATS_Information));
+
+#if DEBUG_ATS
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating address for peer `%s' %u\n",
+              GNUNET_i2s (peer),
+              session_id);
+#endif
+  /* Get existing address or address with session == 0 */
   old = find_address (peer, aa);
   if (old == NULL)
   {
     GNUNET_assert (GNUNET_OK ==
                    GNUNET_CONTAINER_multihashmap_put (addresses,
-						      &peer->hashPubKey,
-						      aa,
-						      GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
+                                                      &peer->hashPubKey, aa,
+                                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
+#if DEBUG_ATS
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Added new address for peer `%s' %X\n",
+                GNUNET_i2s (peer), aa);
+#endif
+    old = aa;
+  }
+  else
+  {
+#if DEBUG_ATS
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Updated existing address for peer `%s' %p old session %u new session %u\n",
+                GNUNET_i2s (peer), old,
+                old->session_id, session_id);
+#endif
+    GNUNET_free_non_null (old->ats);
+    old->session_id = session_id;
+    old->ats = NULL;
+    old->ats_count = 0;
+    old->ats = aa->ats;
+    old->ats_count = aa->ats_count;
+    GNUNET_free (aa->plugin);
+    GNUNET_free (aa);
+  }
+  for (i = 0; i < atsi_count; i++)
+    switch (ntohl (atsi[i].type))
+    {
+    case GNUNET_ATS_UTILIZATION_UP:
+      old->atsp_utilization_out.value__ = atsi[i].value;
+      break;
+    case GNUNET_ATS_UTILIZATION_DOWN:
+      old->atsp_utilization_in.value__ = atsi[i].value;
+      break;
+    case GNUNET_ATS_QUALITY_NET_DELAY:
+      old->atsp_latency.rel_value = ntohl (atsi[i].value);
+      break;
+    case GNUNET_ATS_QUALITY_NET_DISTANCE:
+      old->atsp_distance = ntohl (atsi[i].value);
+      break;
+    case GNUNET_ATS_COST_WAN:
+      old->atsp_cost_wan = ntohl (atsi[i].value);
+      break;
+    case GNUNET_ATS_COST_LAN:
+      old->atsp_cost_lan = ntohl (atsi[i].value);
+      break;
+    case GNUNET_ATS_COST_WLAN:
+      old->atsp_cost_wlan = ntohl (atsi[i].value);
+      break;
+    case GNUNET_ATS_NETWORK_TYPE:
+      old->atsp_network_type = ntohl (atsi[i].value);
+      break;
+
+    default:
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Received unsupported ATS type %u\n", ntohl (atsi[i].type));
+      GNUNET_break (0);
+      break;
+    }
+#if HAVE_LIBGLPK
+  if (ats_mode == MLP)
+    GAS_mlp_address_update (mlp, addresses, old);
+#endif
+}
+
+
+/**
+ * Delete an address
+ *
+ * If session != 0, just the session is deleted, the address itself still exists
+ * If session == 0, remove full address
+ * If session == 0 and addrlen == 0, destroy inbound address
+ *
+ * @param cls unused
+ * @param key unused
+ * @param value the 'struct ATS_Address'
+ * @return GNUNET_OK (continue to iterate)
+ */
+static int
+destroy_by_session_id (void *cls, const GNUNET_HashCode * key, void *value)
+{
+  const struct ATS_Address *info = cls;
+  struct ATS_Address *aa = value;
+
+  GNUNET_assert (0 ==
+                 memcmp (&aa->peer, &info->peer,
+                         sizeof (struct GNUNET_PeerIdentity)));
+  /* session == 0, remove full address  */
+  if ((info->session_id == 0) && (0 == strcmp (info->plugin, aa->plugin)) &&
+      (aa->addr_len == info->addr_len) &&
+      (0 == memcmp (info->addr, aa->addr, aa->addr_len)))
+  {
+#if VERBOSE
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-		"Added new address for peer `%s' %X\n",
-		GNUNET_i2s (peer), aa);
-    return;
+                "Deleting address for peer `%s': `%s' %u\n",
+                GNUNET_i2s (&aa->peer), aa->plugin, aa->session_id);
+#endif
+    if (GNUNET_YES == destroy_address (aa))
+      recalculate_assigned_bw ();
+    return GNUNET_OK;
   }
+  /* session != 0, just remove session */
+  if (aa->session_id != info->session_id)
+    return GNUNET_OK;           /* irrelevant */
+  if (aa->session_id != 0)
+    GNUNET_break (0 == strcmp (info->plugin, aa->plugin));
+  /* session died */
+#if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-	      "Updated existing address for peer `%s' %X \n",
-	      GNUNET_i2s (peer), old);
-  GNUNET_free_non_null (old->ats);
-  old->ats = NULL;
-  old->ats_count = 0;
-  old->ats = aa->ats;
-  old->ats_count = aa->ats_count;
-  GNUNET_free (aa->plugin);
-  GNUNET_free (aa);
+              "Deleting session for peer `%s': `%s' %u\n",
+              GNUNET_i2s (&aa->peer), aa->plugin, aa->session_id);
+#endif
+  aa->session_id = 0;
+
+  if (GNUNET_YES == aa->active)
+  {
+    aa->active = GNUNET_NO;
+    active_addr_count--;
+    recalculate_assigned_bw ();
+  }
+
+  /* session == 0 and addrlen == 0 : destroy address */
+  if (aa->addr_len == 0)
+  {
+#if VERBOSE
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Deleting session and address for peer `%s': `%s' %u\n",
+                GNUNET_i2s (&aa->peer), aa->plugin, aa->session_id);
+#endif
+    (void) destroy_address (aa);
+  }
+  else
+  {
+    /* session was set to 0, update address */
+#if HAVE_LIBGLPK
+  if (ats_mode == MLP)
+    GAS_mlp_address_update (mlp, addresses, aa);
+#endif
+  }
+
+  return GNUNET_OK;
 }
 
+void
+GAS_addresses_destroy (const struct GNUNET_PeerIdentity *peer,
+                       const char *plugin_name, const void *plugin_addr,
+                       size_t plugin_addr_len, uint32_t session_id)
+{
+  struct ATS_Address *aa;
 
+  GNUNET_break (0 < strlen (plugin_name));
+  aa = create_address (peer, plugin_name, plugin_addr, plugin_addr_len, session_id);
+
+  GNUNET_CONTAINER_multihashmap_get_multiple (addresses, &peer->hashPubKey,
+                                              &destroy_by_session_id, aa);
+
+  free_address (aa);
+}
+
+
+/**
+ * Find a "good" address to use for a peer.  If we already have an existing
+ * address, we stick to it.  Otherwise, we pick by lowest distance and then
+ * by lowest latency.
+ *
+ * @param cls the 'struct ATS_Address**' where we store the result
+ * @param key unused
+ * @param value another 'struct ATS_Address*' to consider using
+ * @return GNUNET_OK (continue to iterate)
+ */
 static int
-remove_address_by_client (void *cls,
-			  const GNUNET_HashCode * key,
-			  void *value)
+find_address_it (void *cls, const GNUNET_HashCode * key, void *value)
 {
-  struct GNUNET_SERVER_Client *client = cls;
-  struct ATS_Address * aa = value;
+  struct ATS_Address **ap = cls;
+  struct ATS_Address *aa = (struct ATS_Address *) value;
+  struct ATS_Address *ab = *ap;
 
-  if (aa->session_client == client)
-    destroy_address (aa);  
+  if (NULL == ab)
+  {
+    *ap = aa;
+    return GNUNET_OK;
+  }
+  if ((ntohl (ab->assigned_bw_in.value__) == 0) &&
+      (ntohl (aa->assigned_bw_in.value__) > 0))
+  {
+    /* stick to existing connection */
+    *ap = aa;
+    return GNUNET_OK;
+  }
+  if (ab->atsp_distance > aa->atsp_distance)
+  {
+    /* user shorter distance */
+    *ap = aa;
+    return GNUNET_OK;
+  }
+  if (ab->atsp_latency.rel_value > aa->atsp_latency.rel_value)
+  {
+    /* user lower latency */
+    *ap = aa;
+    return GNUNET_OK;
+  }
+  /* don't care */
   return GNUNET_OK;
 }
 
 
 void
-GAS_address_client_disconnected (struct GNUNET_SERVER_Client *client)
+GAS_addresses_in_use (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)
 {
-  if (addresses != NULL)
-    GNUNET_CONTAINER_multihashmap_iterate(addresses, 
-					  &remove_address_by_client, client);
+#if DEBUG_ATS
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Received `%s' message for peer `%s': %i\n", "ADDRESS_IN_USE",
+              GNUNET_i2s (peer), in_use);
+#endif
+
+  struct ATS_Address *aa;
+  struct ATS_Address *old;
+
+
+  aa = create_address(peer, plugin_name, plugin_addr, plugin_addr_len, session_id);
+  old = find_exact_address (peer, aa);
+  free_address (aa);
+
+  GNUNET_assert (old != NULL);
+  GNUNET_assert (old->used != in_use);
+  old->used = in_use;
+
+#if HAVE_LIBGLPK
+  if (ats_mode == MLP)
+     GAS_mlp_address_update (mlp, addresses, old);
+#endif
 }
 
 
-void
-GAS_address_destroyed (const struct GNUNET_PeerIdentity *peer,
-		       const char *plugin_name,
-		       const void *plugin_addr, size_t plugin_addr_len,
-		       struct GNUNET_SERVER_Client *session_client,
-		       uint32_t session_id)
+void request_address_mlp (const struct GNUNET_PeerIdentity *peer)
 {
+  struct ATS_Address *aa;
+  aa = NULL;
+
+#if HAVE_GLPK
+  /* Get preferred address from MLP */
+  struct ATS_PreferedAddress * paddr = NULL;
+  paddr = GAS_mlp_get_preferred_address (mlp, addresses, peer);
+  aa = paddr->address;
+  aa->assigned_bw_out = GNUNET_BANDWIDTH_value_init(paddr->bandwidth_out);
+  /* FIXME use bw in value */
+  paddr->bandwidth_in = paddr->bandwidth_out;
+  aa->assigned_bw_in = GNUNET_BANDWIDTH_value_init (paddr->bandwidth_in);
+  GNUNET_free (paddr);
+#endif
 
-  struct ATS_Address aa;
-  struct ATS_Address *res;
+  if (aa == NULL)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Cannot suggest address for peer `%s'\n", GNUNET_i2s (peer));
+    return;
+  }
+  if (aa->active == GNUNET_NO)
+  {
+    aa->active = GNUNET_YES;
+    active_addr_count++;
 
-  aa.peer = *peer;
-  aa.addr_len = plugin_addr_len;
-  aa.addr = plugin_addr;
-  aa.plugin = (char*) plugin_name;
-  aa.session_client = session_client;
-  aa.session_id = session_id;
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "New bandwidth for peer %s is %u/%u\n",
+                GNUNET_i2s (&aa->peer), ntohl (aa->assigned_bw_in.value__),
+                ntohl (aa->assigned_bw_out.value__));
+    GAS_scheduling_transmit_address_suggestion (&aa->peer, aa->plugin, aa->addr,
+                                                aa->addr_len, aa->session_id,
+                                                aa->ats, aa->ats_count,
+                                                aa->assigned_bw_out,
+                                                aa->assigned_bw_in);
+    GAS_reservations_set_bandwidth (&aa->peer, aa->assigned_bw_in);
+    GAS_performance_notify_clients (&aa->peer, aa->plugin, aa->addr, aa->addr_len,
+                                    aa->ats, aa->ats_count, aa->assigned_bw_out,
+                                    aa->assigned_bw_in);
+  }
+  else
+  {
+    /* just to be sure... */
+    GAS_scheduling_transmit_address_suggestion (peer, aa->plugin, aa->addr,
+                                                aa->addr_len, aa->session_id,
+                                                aa->ats, aa->ats_count,
+                                                aa->assigned_bw_out,
+                                                aa->assigned_bw_in);
+  }
+
+}
 
-  res = find_address (peer, &aa);
-  if (res == NULL)
+void request_address_simple (const struct GNUNET_PeerIdentity *peer)
+{
+  struct ATS_Address *aa;
+  aa = NULL;
+
+  /* Get address with: stick to current address, lower distance, lower latency */
+  GNUNET_CONTAINER_multihashmap_get_multiple (addresses, &peer->hashPubKey,
+                                              &find_address_it, &aa);
+  if (aa == NULL)
   {
-    /* we don't even know this one, can this happen? */
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-		"Asked to delete unknown address for peer `%s'\n",
-		GNUNET_i2s (peer));
-    return; 
+                "Cannot suggest address for peer `%s'\n", GNUNET_i2s (peer));
+    return;
+  }
+
+  if (aa->active == GNUNET_NO)
+  {
+    aa->active = GNUNET_YES;
+    active_addr_count++;
+    if (ats_mode == SIMPLE)
+    {
+      recalculate_assigned_bw ();
+    }
+  }
+  else
+  {
+    /* just to be sure... */
+    GAS_scheduling_transmit_address_suggestion (peer, aa->plugin, aa->addr,
+                                                aa->addr_len, aa->session_id,
+                                                aa->ats, aa->ats_count,
+                                                aa->assigned_bw_out,
+                                                aa->assigned_bw_in);
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-	      "Deleting address for peer `%s': `%s'\n",
-	      GNUNET_i2s (peer), plugin_name);
-  destroy_address (res);
 }
 
 
 void
 GAS_addresses_request_address (const struct GNUNET_PeerIdentity *peer)
 {
-  struct ATS_Address * aa;
-
-  aa = GNUNET_CONTAINER_multihashmap_get (addresses, &peer->hashPubKey);
-  if (aa == NULL)
+  if (ats_mode == SIMPLE)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-		"Cannot suggest address for peer `%s'\n",
-		GNUNET_i2s (peer));
-    return; 
+    request_address_simple (peer);
   }
-  /* FIXME: ensure that we don't do this multiple times per peer! */
-  if (ntohl (aa->bw_in.value__) == 0)
+  if (ats_mode == MLP)
   {
-    active_addr_count++;
-    aa->bw_in.value__ = htonl (total_quota_in / active_addr_count);
-    aa->bw_out.value__ = htonl (total_quota_out / active_addr_count);
-    /* FIXME: update bw assignments for other addresses... */
+    request_address_mlp(peer);
   }
-  GAS_reservations_set_bandwidth (peer,
-				  aa->bw_in);
-  GAS_scheduling_transmit_address_suggestion (peer, aa->plugin, 
-					      aa->addr, aa->addr_len, 
-					      aa->session_client, aa->session_id, 
-					      aa->ats, aa->ats_count, 
-					      aa->bw_out, aa->bw_in);
-  GAS_performance_notify_clients (peer, aa->plugin, 
-				  aa->addr, aa->addr_len, 
-				  aa->ats, aa->ats_count, 
-				  aa->bw_out, aa->bw_in);
 }
 
 
+// FIXME: this function should likely end up in the LP-subsystem and
+// not with 'addresses' in the future...
+void
+GAS_addresses_change_preference (const struct GNUNET_PeerIdentity *peer,
+                                 enum GNUNET_ATS_PreferenceKind kind,
+                                 float score)
+{
+#if HAVE_LIBGLPK
+  if (ats_mode == MLP)
+    GAS_mlp_address_change_preference (mlp, peer, kind, score);
+#endif
+}
+
+
+
 /**
  * Initialize address subsystem.
  *
  * @param cfg configuration to use
+ * @param stats the statistics handle to use
  */
 void
-GAS_addresses_init (const struct GNUNET_CONFIGURATION_Handle *cfg)
+GAS_addresses_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
+                    const struct GNUNET_STATISTICS_Handle *stats)
 {
   GNUNET_assert (GNUNET_OK ==
-		 GNUNET_CONFIGURATION_get_value_number (cfg,
-							"core",
-							"TOTAL_QUOTA_IN",
-							&total_quota_in));
+                 GNUNET_CONFIGURATION_get_value_size (cfg, "ats",
+                                                      "WAN_QUOTA_IN",
+                                                      &wan_quota_in));
   GNUNET_assert (GNUNET_OK ==
-		 GNUNET_CONFIGURATION_get_value_number (cfg,
-							"core",
-							"TOTAL_QUOTA_OUT",
-							&total_quota_out));
-  addresses = GNUNET_CONTAINER_multihashmap_create(128);
+                 GNUNET_CONFIGURATION_get_value_size (cfg, "ats",
+                                                      "WAN_QUOTA_OUT",
+                                                      &wan_quota_out));
+
+  switch (GNUNET_CONFIGURATION_get_value_yesno (cfg, "ats", "MLP"))
+  {
+	/* MLP = YES */
+	case GNUNET_YES:
+#if HAVE_LIBGLPK
+          ats_mode = MLP;
+          /* Init the MLP solver with default values */
+          mlp = GAS_mlp_init (cfg, stats, MLP_MAX_EXEC_DURATION, MLP_MAX_ITERATIONS);
+          break;
+#else
+          GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "MLP mode was configured, but libglpk is not installed, switching to simple mode");
+          ats_mode = SIMPLE;
+          break;
+#endif
+	/* MLP = NO */
+	case GNUNET_NO:
+		ats_mode = SIMPLE;
+		break;
+	/* No configuration value */
+	case GNUNET_SYSERR:
+		ats_mode = SIMPLE;
+		break;
+	default:
+		break;
+  }
+
+  addresses = GNUNET_CONTAINER_multihashmap_create (128);
 }
 
 
@@ -309,18 +764,24 @@ GAS_addresses_init (const struct GNUNET_CONFIGURATION_Handle *cfg)
  * @param value the 'struct ATS_Address' to free
  * @return GNUNET_OK (continue to iterate)
  */
-static int 
-free_address_it (void *cls,
-		 const GNUNET_HashCode * key,
-		 void *value)
+static int
+free_address_it (void *cls, const GNUNET_HashCode * key, void *value)
 {
-  struct ATS_Address * aa = value;
+  struct ATS_Address *aa = value;
 
   destroy_address (aa);
   return GNUNET_OK;
 }
 
 
+void
+GAS_addresses_destroy_all ()
+{
+  if (addresses != NULL)
+    GNUNET_CONTAINER_multihashmap_iterate (addresses, &free_address_it, NULL);
+  GNUNET_assert (active_addr_count == 0);
+}
+
 
 /**
  * Shutdown address subsystem.
@@ -328,9 +789,16 @@ free_address_it (void *cls,
 void
 GAS_addresses_done ()
 {
-  GNUNET_CONTAINER_multihashmap_iterate (addresses, &free_address_it, NULL);
+  GAS_addresses_destroy_all ();
   GNUNET_CONTAINER_multihashmap_destroy (addresses);
   addresses = NULL;
+#if HAVE_LIBGLPK
+  if (ats_mode == MLP)
+  {
+    GAS_mlp_done (mlp);
+  }
+#endif
+
 }