* @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
+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;
- 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_it (void *cls, const GNUNET_HashCode * key, void *value)
+{
+ struct ATS_Address *aa = value;
+
+
+ /* Simple method */
+ if (GNUNET_YES != aa->active)
+ return GNUNET_OK;
+ GNUNET_assert (active_addr_count > 0);
+ 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;
+}
-static struct GNUNET_CONTAINER_MultiHashMap * addresses;
+/**
+ * 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);
+ GNUNET_CONTAINER_multihashmap_iterate (addresses, &update_bw_it, NULL);
+}
+/**
+ * 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);
+}
-struct CompareAddressContext
+/**
+ * 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 * search;
- struct ATS_Address * result;
-};
+ struct ATS_Address *aa = NULL;
+
+ 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;
+
+ return aa;
+}
-static int
-compare_address_it (void *cls,
- const GNUNET_HashCode * key,
- void *value)
+/**
+ * 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 CompareAddressContext * cac = cls;
- struct ATS_Address * aa = (struct ATS_Address *) value;
+ int ret;
- /* compare sessions */
- if ((aa->session_client != cac->search->session_client) ||
- (aa->session_id != cac->search->session_id))
- return GNUNET_YES;
+ ret = GNUNET_NO;
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_remove (addresses,
+ &addr->peer.hashPubKey,
+ addr));
+
+#if HAVE_LIBGLPK
+ if (ats_mode == MLP)
+ GAS_mlp_address_delete (mlp, addresses, addr);
+#endif
- if (0 == strcmp(aa->plugin, cac->search->plugin))
+ if (GNUNET_YES == addr->active)
{
- if (aa->addr_len != cac->search->addr_len)
- return GNUNET_YES;
- if (aa->addr_len == 0)
- return GNUNET_YES;
- if (0 == memcmp (aa->addr, cac->search->addr, aa->addr_len))
- cac->result = aa;
- return GNUNET_NO;
+ active_addr_count--;
+ addr->active = GNUNET_NO;
+ ret = GNUNET_YES;
}
- return GNUNET_YES;
+ free_address (addr);
+ return ret;
}
+
+struct CompareAddressContext
+{
+ const struct ATS_Address *search;
+ struct ATS_Address *result;
+};
+
+
+static int
+compare_address_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)) ||
+ (0 != memcmp (aa->addr, cac->search->addr, aa->addr_len))) &&
+ ((aa->session_id != cac->search->session_id) ||
+ (cac->search->session_id == 0)))
+ return GNUNET_YES;
+ cac->result = aa;
+ return GNUNET_NO;
+}
+
+
+/**
+ * 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.search = addr;
-
- GNUNET_CONTAINER_multihashmap_get_multiple(addresses,
- &peer->hashPubKey,
- compare_address_it,
- &cac);
-
+ GNUNET_CONTAINER_multihashmap_get_multiple (addresses, &peer->hashPubKey,
+ &compare_address_it, &cac);
return cac.result;
}
-static void
-merge_ats (struct ATS_Address * dest, struct ATS_Address * source)
+
+void
+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)
{
- int c_src = 0;
- int c_dest = 0;
- struct GNUNET_TRANSPORT_ATS_Information * a_src = source->ats;
- struct GNUNET_TRANSPORT_ATS_Information * a_dest = dest->ats;
- struct ATS_Address * bigger = NULL;
+ struct ATS_Address *aa;
+ struct ATS_Address *old;
+ uint32_t i;
- bigger = (dest->ats_count > source->ats_count) ? dest : source;
- int new_entries = bigger->ats_count;
+ aa = create_address (peer,
+ plugin_name,
+ plugin_addr, plugin_addr_len,
+ session_id);
- if (new_entries == 0)
- return;
+ 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_ATS_Information));
- for (c_dest = 0; c_dest < dest->ats_count; c_dest ++)
+ old = find_address (peer, aa);
+ if (old == NULL)
+ {
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (addresses,
+ &peer->hashPubKey, aa,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Added new address for peer `%s' %X\n",
+ GNUNET_i2s (peer), aa);
+ old = aa;
+ }
+ else
{
- for (c_src = 0; c_src < source->ats_count; c_src ++)
+ 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->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))
{
- if (a_src[c_src].type == a_dest[c_dest].type)
- new_entries--;
+ 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)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Deleting address for peer `%s': `%s'\n",
+ GNUNET_i2s (&aa->peer), aa->plugin);
+ 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 */
+ aa->session_id = 0;
+
+ if (GNUNET_YES == aa->active)
+ {
+ aa->active = GNUNET_NO;
+ active_addr_count--;
+ recalculate_assigned_bw ();
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Have %u entries to update and %u new entries\n",bigger->ats_count,
- new_entries);
+ /* session == 0 and addrlen == 0 : destroy address */
+ if (aa->addr_len == 0)
+ {
+ (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_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_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;
- struct ATS_Address * old;
+ struct ATS_Address *aa;
- aa = GNUNET_malloc (sizeof (struct ATS_Address) + plugin_addr_len);
- aa->ats = GNUNET_malloc(atsi_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information));
+ GNUNET_break (0 < strlen (plugin_name));
+ aa = create_address (peer, plugin_name, plugin_addr, plugin_addr_len, session_id);
- aa->peer = *peer;
- aa->addr_len = plugin_addr_len;
- aa->ats_count = atsi_count;
- memcpy (aa->ats, atsi, atsi_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information));
- aa->addr = &aa[1];
- memcpy (aa->addr, plugin_addr, plugin_addr_len);
- aa->plugin = GNUNET_strdup (plugin_name);
- aa->session_client = session_client;
- aa->session_id = session_id;
+ GNUNET_CONTAINER_multihashmap_get_multiple (addresses, &peer->hashPubKey,
+ &destroy_by_session_id, aa);
- old = find_address (peer, aa);
- if (old == NULL)
+ 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
+find_address_it (void *cls, const GNUNET_HashCode * key, void *value)
+{
+ struct ATS_Address **ap = cls;
+ struct ATS_Address *aa = (struct ATS_Address *) value;
+ struct ATS_Address *ab = *ap;
+
+ if (NULL == ab)
{
- GNUNET_assert (GNUNET_OK ==
- GNUNET_CONTAINER_multihashmap_put(addresses,
- &peer->hashPubKey,
- aa,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Added new address for peer `%s' %X\n",
- GNUNET_i2s (peer), aa);
+ *ap = aa;
+ return GNUNET_OK;
}
- else
+ if ((ntohl (ab->assigned_bw_in.value__) == 0) &&
+ (ntohl (aa->assigned_bw_in.value__) > 0))
{
- merge_ats (old, aa);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Updated existing address for peer `%s' %X \n",
- GNUNET_i2s (peer), old);
- GNUNET_free (aa->ats);
- GNUNET_free (aa->plugin);
- GNUNET_free (aa);
+ /* 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_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)
+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 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 *res;
+ struct ATS_Address *old;
- 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->addr, plugin_addr, plugin_addr_len);
- aa->plugin = GNUNET_strdup (plugin_name);
- aa->session_client = session_client;
- aa->session_id = session_id;
+ aa = create_address(peer, plugin_name, plugin_addr, plugin_addr_len, session_id);
+ old = find_address (peer, aa);
+ free_address (aa);
- res = find_address (peer, aa);
- GNUNET_assert (res != 0);
+ GNUNET_assert (old != NULL);
+ GNUNET_assert (in_use != old->used);
+ old->used = in_use;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Deleting address for peer `%s'\n",
- GNUNET_i2s (peer));
+#if HAVE_LIBGLPK
+ if (ats_mode == MLP)
+ GAS_mlp_address_update (mlp, addresses, old);
+#endif
+}
- GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove(addresses, &peer->hashPubKey, res));
- GNUNET_free (res->plugin);
- GNUNET_free_non_null (res->ats);
- GNUNET_free (res);
+void
+GAS_addresses_request_address (const struct GNUNET_PeerIdentity *peer)
+{
+ struct ATS_Address *aa;
+ aa = NULL;
+ GNUNET_CONTAINER_multihashmap_get_multiple (addresses, &peer->hashPubKey,
+ &find_address_it, &aa);
+ 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++;
+ 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);
+ }
}
+// FIXME: this function should likely end up in the LP-subsystem and
+// not with 'addresses' in the future...
void
-GAS_addresses_request_address (const struct GNUNET_PeerIdentity *peer)
+GAS_addresses_change_preference (const struct GNUNET_PeerIdentity *peer,
+ enum GNUNET_ATS_PreferenceKind kind,
+ float score)
{
- struct ATS_Address * aa = NULL;
- aa = GNUNET_CONTAINER_multihashmap_get (addresses, &peer->hashPubKey);
- if (aa != NULL)
- 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);
+ // do nothing for now...
}
+
/**
* Initialize address subsystem.
+ *
+ * @param cfg configuration to use
+ * @param stats the statistics handle to use
*/
void
-GAS_addresses_init ()
+GAS_addresses_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
+ const struct GNUNET_STATISTICS_Handle *stats)
{
- addresses = GNUNET_CONTAINER_multihashmap_create(128);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_size (cfg, "ats",
+ "WAN_QUOTA_IN",
+ &wan_quota_in));
+ GNUNET_assert (GNUNET_OK ==
+ 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);
}
* @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;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Freeing address for peer `%s' %X\n",
- GNUNET_i2s (&aa->peer), aa);
- GNUNET_free (aa->plugin);
- GNUNET_free_non_null (aa->ats);
- GNUNET_free (aa);
+ 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.
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
+
}