#include "gnunet-service-ats_performance.h"
#include "gnunet-service-ats_scheduling.h"
#include "gnunet-service-ats_reservations.h"
+#include "gnunet-service-ats_addresses_mlp.h"
+#include "gnunet-service-ats_addresses_simplistic.h"
-struct ATS_Address
-{
- struct GNUNET_PeerIdentity peer;
- size_t addr_len;
+/**
+ * Available ressource assignment modes
+ */
+enum ATS_Mode
+{
+ /*
+ * Simplistic mode:
+ *
+ * Assign each peer an equal amount of bandwidth (bw)
+ *
+ * bw_per_peer = bw_total / #active addresses
+ */
+ MODE_SIMPLISTIC,
- uint32_t session_id;
+ /*
+ * MLP mode:
+ *
+ * Solve ressource assignment as an optimization problem
+ * Uses an mixed integer programming solver
+ */
+ MODE_MLP
+};
- uint32_t ats_count;
+/**
+ * Handle for ATS address component
+ */
+struct GAS_Addresses_Suggestion_Requests
+{
+ struct GAS_Addresses_Suggestion_Requests *next;
+ struct GAS_Addresses_Suggestion_Requests *prev;
- const void *addr;
+ struct GNUNET_PeerIdentity id;
+};
- char *plugin;
+/**
+ * Handle for ATS address component
+ */
+struct GAS_Addresses_Handle
+{
+ /**
+ * A multihashmap to store all addresses
+ */
+ struct GNUNET_CONTAINER_MultiHashMap *addresses;
- struct GNUNET_ATS_Information *ats;
+ /**
+ * Configure WAN quota in
+ */
+ unsigned long long wan_quota_in;
- struct GNUNET_TIME_Relative atsp_latency;
+ /**
+ * Configure WAN quota out
+ */
+ unsigned long long wan_quota_out;
- struct GNUNET_BANDWIDTH_Value32NBO atsp_utilization_in;
+ /**
+ * Is ATS addresses running
+ */
+ int running;
- struct GNUNET_BANDWIDTH_Value32NBO atsp_utilization_out;
+ /**
+ * Configured ATS solver
+ */
+ int ats_mode;
- uint32_t atsp_distance;
+ /**
+ * Solver handle
+ */
+ void *solver;
- uint32_t atsp_cost_wan;
+ /**
+ * Address suggestion requests DLL head
+ */
+ struct GAS_Addresses_Suggestion_Requests *r_head;
- uint32_t atsp_cost_lan;
+ /**
+ * Address suggestion requests DLL tail
+ */
+ struct GAS_Addresses_Suggestion_Requests *r_tail;
- uint32_t atsp_cost_wlan;
+ /* Solver functions */
- struct GNUNET_BANDWIDTH_Value32NBO assigned_bw_in;
+ /**
+ * Initialize solver
+ */
+ GAS_solver_init s_init;
- struct GNUNET_BANDWIDTH_Value32NBO assigned_bw_out;
+ /**
+ * Update address in solver
+ */
+ GAS_solver_address_update s_update;
/**
- * Is this the active address for this peer?
+ * Get address from solver
*/
- int active;
+ GAS_solver_get_preferred_address s_get;
-};
+ /**
+ * Delete address in solver
+ */
+ GAS_solver_address_delete s_del;
+ /**
+ * Change preference for quality in solver
+ */
+ GAS_solver_address_change_preference s_pref;
-static struct GNUNET_CONTAINER_MultiHashMap *addresses;
+ /**
+ * Shutdown solver
+ */
+ GAS_solver_done s_done;
+};
-static unsigned long long total_quota_in;
-static unsigned long long total_quota_out;
+/**
+ * Temporary handle
+ */
+struct GAS_Addresses_Handle *handle;
-static unsigned int active_addr_count;
+static unsigned int
+assemble_ats_information (const struct ATS_Address *aa, struct GNUNET_ATS_Information **dest)
+{
+ unsigned int ats_count = GNUNET_ATS_PropertyCount - 1;
+ struct GNUNET_ATS_Information *ats = GNUNET_malloc (ats_count * sizeof (struct GNUNET_ATS_Information));
+ (*dest) = ats;
+
+ ats[0].type = ntohl(GNUNET_ATS_UTILIZATION_UP);
+ ats[0].value = aa->atsp_utilization_out.value__;
+ ats[1].type = ntohl(GNUNET_ATS_UTILIZATION_DOWN);
+ ats[1].value = aa->atsp_utilization_in.value__;
+ ats[2].type = ntohl(GNUNET_ATS_NETWORK_TYPE);
+ ats[2].value = ntohl(aa->atsp_network_type);
+ ats[3].type = ntohl(GNUNET_ATS_QUALITY_NET_DELAY);
+ ats[3].value = ntohl(aa->atsp_latency.rel_value);
+ ats[4].type = ntohl(GNUNET_ATS_QUALITY_NET_DISTANCE);
+ ats[4].value = ntohl(aa->atsp_distance);
+ ats[5].type = ntohl(GNUNET_ATS_COST_WAN);
+ ats[5].value = ntohl (aa->atsp_cost_wan);
+ ats[6].type = ntohl(GNUNET_ATS_COST_LAN);
+ ats[6].value = ntohl (aa->atsp_cost_lan);
+ ats[7].type = ntohl(GNUNET_ATS_COST_WLAN);
+ ats[7].value = ntohl (aa->atsp_cost_wlan);
+ return ats_count;
+}
/**
- * 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)
+ * Free the given address
+ * @param addr address to destroy
*/
-static int
-update_bw_it (void *cls, const GNUNET_HashCode * key, void *value)
+static void
+free_address (struct ATS_Address *addr)
{
- struct ATS_Address *aa = value;
-
- if (GNUNET_YES != aa->active)
- return GNUNET_OK;
- GNUNET_assert (active_addr_count > 0);
- aa->assigned_bw_in.value__ = htonl (total_quota_in / active_addr_count);
- aa->assigned_bw_out.value__ = htonl (total_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;
+ GNUNET_free_non_null (addr->ats);
+ GNUNET_free (addr->plugin);
+ GNUNET_free (addr);
}
-
/**
- * Some (significant) input changed, recalculate bandwidth assignment
- * for all peers.
+ * 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 void
-recalculate_assigned_bw ()
+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)
{
- 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);
+ 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;
}
ret = GNUNET_NO;
GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_remove (addresses,
+ GNUNET_CONTAINER_multihashmap_remove (handle->addresses,
&addr->peer.hashPubKey,
addr));
- if (GNUNET_YES == addr->active)
- {
- active_addr_count--;
- addr->active = GNUNET_NO;
- ret = GNUNET_YES;
- }
- GNUNET_free_non_null (addr->ats);
- GNUNET_free (addr->plugin);
- GNUNET_free (addr);
+
+ handle->s_del (handle->solver, handle->addresses, addr);
+ free_address (addr);
return ret;
}
struct CompareAddressContext
{
const struct ATS_Address *search;
- struct ATS_Address *result;
+
+ /* 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;
};
static int
-compare_address_it (void *cls, const GNUNET_HashCode * key, void *value)
+compare_address_it (void *cls, const struct 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;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Comparing peer %4s: address length %u session %u <-> address length %u session %u\n",
+ GNUNET_h2s (key),
+ aa->addr_len, aa->session_id,
+ cac->search->addr_len, cac->search->session_id);
+
+ /* Find an matching exact address:
+ *
+ * Compare by:
+ * aa->addr_len == cac->search->addr_len
+ * aa->plugin == cac->search->plugin
+ * aa->addr == cac->search->addr
+ * aa->session == cac->search->session
+ *
+ * return as exact address
+ */
+ 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;
+ }
+
+ /* Find an matching base address:
+ *
+ * Properties:
+ *
+ * aa->session_id == 0
+ *
+ * Compare by:
+ * aa->addr_len == cac->search->addr_len
+ * aa->plugin == cac->search->plugin
+ * aa->addr == cac->search->addr
+ *
+ * return as base address
+ */
+ 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 == 0))
+ cac->base_address = aa;
+ }
+
+ /* Find an matching exact address based on session:
+ *
+ * Properties:
+ *
+ * cac->search->addr_len == 0
+ *
+ * Compare by:
+ * aa->plugin == cac->search->plugin
+ * aa->session_id == cac->search->session_id
+ *
+ * return as exact address
+ */
+ if (0 == cac->search->addr_len)
+ {
+ if ((0 == strcmp (aa->plugin, cac->search->plugin)) && (aa->session_id == cac->search->session_id))
+ cac->exact_address = aa;
+ }
+
+ if (cac->exact_address == NULL)
+ return GNUNET_YES; /* Continue iteration to find exact address */
+ else
+ return GNUNET_NO; /* Stop iteration since we have an exact address */
}
{
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,
+ GNUNET_CONTAINER_multihashmap_get_multiple (handle->addresses, &peer->hashPubKey,
&compare_address_it, &cac);
- return cac.result;
+
+#if 0
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Found exact address: %s base address: %s\n",
+ (cac.exact_address != NULL) ? "YES" : "NO",
+ (cac.base_address != NULL) ? "YES" : "NO");
+#endif
+ if (cac.exact_address == NULL)
+ return cac.base_address;
+ return cac.exact_address;
+}
+
+
+static struct ATS_Address *
+lookup_address (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;
+
+ 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_ATS_Information));
+
+ /* Get existing address or address with session == 0 */
+ old = find_address (peer, aa);
+ free_address (aa);
+ if (old == NULL)
+ {
+ return NULL;
+ }
+ else if (old->session_id != session_id)
+ {
+ return NULL;
+ }
+ return old;
}
+#if 0
+static int
+compare_address_session_it (void *cls, const struct 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
+ */
+static 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 (handle->addresses, &peer->hashPubKey,
+ &compare_address_session_it, &cac);
+ return cac.exact_address;
+}
+#endif
+
void
-GAS_addresses_update (const struct GNUNET_PeerIdentity *peer,
+GAS_addresses_add (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,
{
struct ATS_Address *aa;
struct ATS_Address *old;
- uint32_t i;
- aa = GNUNET_malloc (sizeof (struct ATS_Address) + plugin_addr_len);
+ if (GNUNET_NO == handle->running)
+ return;
+
+ GNUNET_assert (NULL != handle->addresses);
+
+ 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->peer = *peer;
- aa->addr_len = plugin_addr_len;
aa->ats_count = atsi_count;
memcpy (aa->ats, atsi, atsi_count * sizeof (struct GNUNET_ATS_Information));
- aa->addr = &aa[1];
- memcpy (&aa[1], plugin_addr, plugin_addr_len);
- aa->plugin = GNUNET_strdup (plugin_name);
- aa->session_id = session_id;
+
+ /* Get existing address or address with session == 0 */
old = find_address (peer, aa);
if (old == NULL)
{
+ /* We have a new address */
GNUNET_assert (GNUNET_OK ==
- GNUNET_CONTAINER_multihashmap_put (addresses,
+ GNUNET_CONTAINER_multihashmap_put (handle->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;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Added new address for peer `%s' session id %u, %p\n",
+ GNUNET_i2s (peer), session_id, aa);
+ /* Tell solver about update */
+ handle->s_update (handle->solver, handle->addresses, aa);
+ return;
}
- else
+
+ if (old->session_id != 0)
{
- 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);
+ /* This address and session is already existing */
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Added already existing address for peer `%s' `%s' %p with new session %u\n",
+ GNUNET_i2s (peer), plugin_name, session_id);
+ GNUNET_break (0);
+ return;
+ }
+
+ /* We have an address without an session, update this address */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Updated existing address for peer `%s' %p with new session %u\n",
+ GNUNET_i2s (peer), old, session_id);
+ 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);
+ handle->s_update (handle->solver, handle->addresses, old);
+}
+
+
+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)
+{
+ struct ATS_Address *old;
+ uint32_t i;
+
+ if (GNUNET_NO == handle->running)
+ return;
+
+ GNUNET_assert (NULL != handle->addresses);
+
+ /* Get existing address */
+ old = lookup_address (peer, plugin_name, plugin_addr, plugin_addr_len,
+ session_id, atsi, atsi_count);
+ if (old == NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Tried to update unknown address for peer `%s' `%s' session id %u\n",
+ GNUNET_i2s (peer), plugin_name, session_id);
+ GNUNET_break (0);
+ return;
}
+
for (i = 0; i < atsi_count; i++)
switch (ntohl (atsi[i].type))
{
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;
}
+ /* Tell solver about update */
+ handle->s_update (handle->solver, handle->addresses, old);
}
/**
- * Update a bandwidth assignment for a peer. This trivial method currently
- * simply assigns the same share to all active connections.
+ * 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
* @return GNUNET_OK (continue to iterate)
*/
static int
-destroy_by_session_id (void *cls, const GNUNET_HashCode * key, void *value)
+destroy_by_session_id (void *cls, const struct 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)));
- 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_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 ();
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Deleting address for peer `%s': `%s' %u\n",
+ GNUNET_i2s (&aa->peer), aa->plugin, aa->session_id);
+
+ destroy_address (aa);
+ // FIXME 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 */
- GNUNET_break (0 == strcmp (info->plugin,
- aa->plugin));
+ return GNUNET_OK; /* irrelevant */
+ if (aa->session_id != 0)
+ GNUNET_break (0 == strcmp (info->plugin, aa->plugin));
/* session died */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Deleting session for peer `%s': `%s' %u\n",
+ GNUNET_i2s (&aa->peer), aa->plugin, aa->session_id);
aa->session_id = 0;
+
if (GNUNET_YES == aa->active)
{
aa->active = GNUNET_NO;
- active_addr_count--;
- if (aa->addr_len == 0)
- (void) destroy_address (aa);
- recalculate_assigned_bw ();
+ //FIXME recalculate_assigned_bw ();
+ }
+
+ /* session == 0 and addrlen == 0 : destroy address */
+ if (aa->addr_len == 0)
+ {
+ 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);
+ (void) destroy_address (aa);
+ }
+ else
+ {
+ /* session was set to 0, update address */
+#if HAVE_LIBGLPK
+ if (handle->ats_mode == MODE_MLP)
+ GAS_mlp_address_update (handle->solver, handle->addresses, aa);
+#endif
}
+
return GNUNET_OK;
}
const char *plugin_name, const void *plugin_addr,
size_t plugin_addr_len, uint32_t session_id)
{
- struct ATS_Address aa;
+ struct ATS_Address *aa;
+ struct ATS_Address *old;
+
+ if (GNUNET_NO == handle->running)
+ return;
+
+ /* Get existing address */
+ old = lookup_address (peer, plugin_name, plugin_addr, plugin_addr_len,
+ session_id, NULL, 0);
+ if (old == NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Tried to destroy unknown address for peer `%s' `%s' session id %u\n",
+ GNUNET_i2s (peer), plugin_name, session_id);
+ return;
+ }
GNUNET_break (0 < strlen (plugin_name));
- aa.peer = *peer;
- aa.addr_len = plugin_addr_len;
- aa.addr = plugin_addr;
- aa.plugin = (char *) plugin_name;
- aa.session_id = session_id;
- GNUNET_CONTAINER_multihashmap_get_multiple (addresses,
- &peer->hashPubKey,
- &destroy_by_session_id,
- &aa);
+ aa = create_address (peer, plugin_name, plugin_addr, plugin_addr_len, session_id);
+ GNUNET_CONTAINER_multihashmap_get_multiple (handle->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
-find_address_it (void *cls, const GNUNET_HashCode * key, void *value)
+int
+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)
{
- struct ATS_Address **ap = cls;
- struct ATS_Address *aa = (struct ATS_Address *) value;
- struct ATS_Address *ab = *ap;
+#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
- 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)
+ struct ATS_Address *old;
+
+ if (GNUNET_NO == handle->running)
+ return GNUNET_SYSERR;
+
+ old = lookup_address (peer, plugin_name, plugin_addr, plugin_addr_len, session_id, NULL, 0);
+ if (NULL == old)
{
- /* user shorter distance */
- *ap = aa;
- return GNUNET_OK;
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Trying to set unknown address `%s', %s %u %s \n",
+ GNUNET_i2s (peer),
+ plugin_name, session_id,
+ (GNUNET_NO == in_use) ? "NO" : "YES");
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
}
- if (ab->atsp_latency.rel_value > aa->atsp_latency.rel_value)
+ if (old->used == in_use)
{
- /* user lower latency */
- *ap = aa;
- return GNUNET_OK;
+ 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 == in_use) ? "NO" : "YES");
+ return GNUNET_SYSERR;
}
- /* don't care */
+ old->used = in_use;
+
+ /* Tell solver about update */
+ handle->s_update (handle->solver, handle->addresses, old);
+
return GNUNET_OK;
}
+/**
+ * Cancel address suggestions for a peer
+ *
+ * @param peer the respective peer
+ */
void
-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)
+GAS_addresses_request_address_cancel (const struct GNUNET_PeerIdentity *peer)
{
+ struct GAS_Addresses_Suggestion_Requests *cur = handle->r_head;
+ while (NULL != cur)
+ {
+ if (0 == memcmp (peer, &cur->id, sizeof (cur->id)))
+ break; /* found */
+ cur = cur->next;
+ }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message for peer `%s': %i\n",
- "ADDRESS_IN_USE",
- GNUNET_i2s (peer), in_use);
+ if (NULL == cur)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "No address requests pending for peer `%s', cannot remove!\n", GNUNET_i2s (peer));
+ return;
+ }
+ GNUNET_CONTAINER_DLL_remove (handle->r_head, handle->r_tail, cur);
+ GNUNET_free (cur);
}
+
+/**
+ * Add an address suggestions for a peer
+ *
+ * @param peer the respective peer
+ */
void
GAS_addresses_request_address (const struct GNUNET_PeerIdentity *peer)
{
- struct ATS_Address *aa;
+ struct GAS_Addresses_Suggestion_Requests *cur = handle->r_head;
+ const struct ATS_Address *aa;
+ struct GNUNET_ATS_Information *ats;
+ unsigned int ats_count;
- 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));
+ if (GNUNET_NO == handle->running)
return;
- }
- if (aa->active == GNUNET_NO)
+ while (NULL != cur)
{
- aa->active = GNUNET_YES;
- active_addr_count++;
- recalculate_assigned_bw ();
+ if (0 == memcmp (peer, &cur->id, sizeof (cur->id)))
+ break; /* already suggesting */
+ cur = cur->next;
}
- else
+ if (NULL == cur)
{
- /* 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);
+ cur = GNUNET_malloc (sizeof (struct GAS_Addresses_Suggestion_Requests));
+ cur->id = (*peer);
+ GNUNET_CONTAINER_DLL_insert (handle->r_head, handle->r_tail, cur);
}
+
+ /* Get prefered address from solver */
+ aa = handle->s_get (handle->solver, handle->addresses, peer);
+ if (NULL == aa)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Cannot suggest address for peer `%s'\n", GNUNET_i2s (peer));
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Suggesting address %p for peer `%s'\n", aa, GNUNET_i2s (peer));
+
+ ats_count = assemble_ats_information (aa, &ats);
+ GAS_scheduling_transmit_address_suggestion (peer,
+ aa->plugin,
+ aa->addr, aa->addr_len,
+ aa->session_id,
+ ats, ats_count,
+ aa->assigned_bw_out,
+ aa->assigned_bw_in);
+ GNUNET_free (ats);
+
+}
+
+
+static int
+reset_address_it (void *cls, const struct GNUNET_HashCode * key, void *value)
+{
+ struct ATS_Address *aa = value;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Resetting interval for peer `%s' address %p from %llu to 0\n",
+ GNUNET_i2s (&aa->peer), aa, aa->block_interval);
+
+ aa->blocked_until = GNUNET_TIME_UNIT_ZERO_ABS;
+ aa->block_interval = GNUNET_TIME_UNIT_ZERO;
+ return GNUNET_OK;
+}
+
+
+void
+GAS_addresses_handle_backoff_reset (const struct GNUNET_PeerIdentity *peer)
+{
+ GNUNET_break (GNUNET_SYSERR != GNUNET_CONTAINER_multihashmap_get_multiple (handle->addresses,
+ &peer->hashPubKey,
+ &reset_address_it,
+ NULL));
}
-// 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)
{
- // do nothing for now...
+ if (GNUNET_NO == handle->running)
+ return;
+
+ /* Tell solver about update */
+ handle->s_pref (handle->solver, peer, kind, score);
}
+static unsigned int
+load_quotas (const struct GNUNET_CONFIGURATION_Handle *cfg, unsigned long long *out_dest, unsigned long long *in_dest, int dest_length)
+{
+ int quotas[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkType;
+ char * entry_in = NULL;
+ char * entry_out = NULL;
+ char * quota_out_str;
+ char * quota_in_str;
+ int c;
+
+ for (c = 0; (c < GNUNET_ATS_NetworkTypeCount) && (c < dest_length); c++)
+ {
+ in_dest[c] = 0;
+ out_dest[c] = 0;
+ switch (quotas[c]) {
+ case GNUNET_ATS_NET_UNSPECIFIED:
+ entry_out = "UNSPECIFIED_QUOTA_OUT";
+ entry_in = "UNSPECIFIED_QUOTA_IN";
+ break;
+ case GNUNET_ATS_NET_LOOPBACK:
+ entry_out = "LOOPBACK_QUOTA_OUT";
+ entry_in = "LOOPBACK_QUOTA_IN";
+ break;
+ case GNUNET_ATS_NET_LAN:
+ entry_out = "LAN_QUOTA_OUT";
+ entry_in = "LAN_QUOTA_IN";
+ break;
+ case GNUNET_ATS_NET_WAN:
+ entry_out = "WAN_QUOTA_OUT";
+ entry_in = "WAN_QUOTA_IN";
+ break;
+ case GNUNET_ATS_NET_WLAN:
+ entry_out = "WLAN_QUOTA_OUT";
+ entry_in = "WLAN_QUOTA_IN";
+ break;
+ default:
+ break;
+ }
+
+ if ((entry_in == NULL) || (entry_out == NULL))
+ continue;
+
+ /* quota out */
+ if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string(cfg, "ats", entry_out, "a_out_str))
+ {
+ if (0 == strcmp(quota_out_str, BIG_M_STRING) ||
+ (GNUNET_SYSERR == GNUNET_STRINGS_fancy_size_to_bytes (quota_out_str, &out_dest[c])))
+ out_dest[c] = UINT32_MAX;
+
+ GNUNET_free (quota_out_str);
+ quota_out_str = NULL;
+ }
+ else if (GNUNET_ATS_NET_UNSPECIFIED == quotas[c])
+ out_dest[c] = UINT32_MAX;
+ else
+ out_dest[c] = UINT32_MAX;
+
+ /* quota in */
+ if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string(cfg, "ats", entry_in, "a_in_str))
+ {
+ if (0 == strcmp(quota_in_str, BIG_M_STRING) ||
+ (GNUNET_SYSERR == GNUNET_STRINGS_fancy_size_to_bytes (quota_in_str, &in_dest[c])))
+ in_dest[c] = UINT32_MAX;
+
+ GNUNET_free (quota_in_str);
+ quota_in_str = NULL;
+ }
+ else if (GNUNET_ATS_NET_UNSPECIFIED == quotas[c])
+ {
+ in_dest[c] = UINT32_MAX;
+ }
+ else
+ {
+ in_dest[c] = UINT32_MAX;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Loaded quota: %s %u, %s %u\n", entry_in, in_dest[c], entry_out, out_dest[c]);
+
+ }
+ return GNUNET_ATS_NetworkTypeCount;
+}
+
+
/**
* 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)
-{
- GNUNET_assert (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_number (cfg, "core",
- "TOTAL_QUOTA_IN",
- &total_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);
+struct GAS_Addresses_Handle *
+GAS_addresses_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
+ const struct GNUNET_STATISTICS_Handle *stats)
+{
+ struct GAS_Addresses_Handle *ah;
+ int quotas[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkType;
+ unsigned long long quotas_in[GNUNET_ATS_NetworkTypeCount];
+ unsigned long long quotas_out[GNUNET_ATS_NetworkTypeCount];
+ int quota_count;
+ char *mode_str;
+ int c;
+
+ ah = GNUNET_malloc (sizeof (struct GAS_Addresses_Handle));
+ handle = ah;
+ handle->running = GNUNET_NO;
+
+ /* Initialize the addresses database */
+ ah->addresses = GNUNET_CONTAINER_multihashmap_create (128, GNUNET_NO);
+ GNUNET_assert (NULL != ah->addresses);
+
+ /* Figure out configured solution method */
+ if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string (cfg, "ats", "MODE", &mode_str))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "No ressource assignment method configured, using simplistic approch\n");
+ ah->ats_mode = MODE_SIMPLISTIC;
+ }
+ else
+ {
+ for (c = 0; c < strlen (mode_str); c++)
+ mode_str[c] = toupper (mode_str[c]);
+ if (0 == strcmp (mode_str, "SIMPLISTIC"))
+ {
+ ah->ats_mode = MODE_SIMPLISTIC;
+ }
+ else if (0 == strcmp (mode_str, "MLP"))
+ {
+ ah->ats_mode = MODE_MLP;
+#if !HAVE_LIBGLPK
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Assignment method `%s' configured, but GLPK is not availabe, please install \n", mode_str);
+ ah->ats_mode = MODE_SIMPLISTIC;
+#endif
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Invalid ressource assignment method `%s' configured, using simplistic approch\n", mode_str);
+ ah->ats_mode = MODE_SIMPLISTIC;
+ }
+ GNUNET_free (mode_str);
+ }
+ /* Start configured solution method */
+ switch (ah->ats_mode)
+ {
+ case MODE_MLP:
+ /* Init the MLP solver with default values */
+#if HAVE_LIBGLPK
+ ah->ats_mode = MODE_MLP;
+ ah->s_init = &GAS_mlp_init;
+ ah->s_update = &GAS_mlp_address_update;
+ ah->s_get = &GAS_mlp_get_preferred_address;
+ ah->s_pref = &GAS_mlp_address_change_preference;
+ ah->s_del = &GAS_mlp_address_delete;
+ ah->s_done = &GAS_mlp_done;
+#else
+ GNUNET_free (ah);
+ return NULL;
+#endif
+ break;
+ case MODE_SIMPLISTIC:
+ /* Init the simplistic solver with default values */
+ ah->ats_mode = MODE_SIMPLISTIC;
+ ah->s_init = &GAS_simplistic_init;
+ ah->s_update = &GAS_simplistic_address_update;
+ ah->s_get = &GAS_simplistic_get_preferred_address;
+ ah->s_pref = &GAS_simplistic_address_change_preference;
+ ah->s_del = &GAS_simplistic_address_delete;
+ ah->s_done = &GAS_simplistic_done;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS started in %s mode\n", "SIMPLISTIC");
+ break;
+ default:
+ return NULL;
+ break;
+ }
+
+ GNUNET_assert (NULL != ah->s_init);
+ GNUNET_assert (NULL != ah->s_update);
+ GNUNET_assert (NULL != ah->s_get);
+ GNUNET_assert (NULL != ah->s_pref);
+ GNUNET_assert (NULL != ah->s_del);
+ GNUNET_assert (NULL != ah->s_done);
+
+ 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);
+ if (NULL == ah->solver)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to initialize solver!\n");
+ GNUNET_free (ah);
+ return NULL;
+ }
+
+ /* up and running */
+ ah->running = GNUNET_YES;
+ return ah;
}
* @return GNUNET_OK (continue to iterate)
*/
static int
-free_address_it (void *cls, const GNUNET_HashCode * key, void *value)
+free_address_it (void *cls, const struct GNUNET_HashCode * key, void *value)
{
struct ATS_Address *aa = value;
void
GAS_addresses_destroy_all ()
{
- if (addresses != NULL)
- GNUNET_CONTAINER_multihashmap_iterate (addresses, &free_address_it, NULL);
- GNUNET_assert (active_addr_count == 0);
+ if (GNUNET_NO == handle->running)
+ return;
+
+ if (handle->addresses != NULL)
+ GNUNET_CONTAINER_multihashmap_iterate (handle->addresses, &free_address_it, NULL);
}
* Shutdown address subsystem.
*/
void
-GAS_addresses_done ()
+GAS_addresses_done (struct GAS_Addresses_Handle *handle)
{
+ struct GAS_Addresses_Suggestion_Requests *cur;
+
+ GNUNET_assert (NULL != handle);
GAS_addresses_destroy_all ();
- GNUNET_CONTAINER_multihashmap_destroy (addresses);
- addresses = NULL;
+ handle->running = GNUNET_NO;
+ GNUNET_CONTAINER_multihashmap_destroy (handle->addresses);
+ handle->addresses = NULL;
+ while (NULL != (cur = handle->r_head))
+ {
+ GNUNET_CONTAINER_DLL_remove (handle->r_head, handle->r_tail, cur);
+ GNUNET_free (cur);
+ }
+
+ GNUNET_free (handle);
+ /* Stop configured solution method */
+
+}
+
+struct PeerIteratorContext
+{
+ GNUNET_ATS_Peer_Iterator it;
+ void *it_cls;
+ struct GNUNET_CONTAINER_MultiHashMap *peers_returned;
+};
+
+static int
+peer_it (void *cls,
+ const struct GNUNET_HashCode * key,
+ void *value)
+{
+ struct PeerIteratorContext *ip_ctx = cls;
+ struct GNUNET_PeerIdentity tmp;
+
+ if (GNUNET_NO == GNUNET_CONTAINER_multihashmap_contains(ip_ctx->peers_returned, key))
+ {
+ GNUNET_CONTAINER_multihashmap_put(ip_ctx->peers_returned, key, NULL, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
+ tmp.hashPubKey = (*key);
+ ip_ctx->it (ip_ctx->it_cls, &tmp);
+ }
+
+ return GNUNET_OK;
+}
+
+/**
+ * Return all peers currently known to ATS
+ *
+ * @param p_it the iterator to call for every peer, callbach with id == NULL
+ * when done
+ * @param p_it_cls the closure for the iterator
+ */
+void
+GAS_addresses_iterate_peers (GNUNET_ATS_Peer_Iterator p_it, void *p_it_cls)
+{
+ struct PeerIteratorContext ip_ctx;
+ unsigned int size;
+
+ if (NULL == p_it)
+ return;
+ GNUNET_assert (NULL != handle->addresses);
+
+ size = GNUNET_CONTAINER_multihashmap_size(handle->addresses);
+ if (0 != size)
+ {
+ ip_ctx.it = p_it;
+ ip_ctx.it_cls = p_it_cls;
+ ip_ctx.peers_returned = GNUNET_CONTAINER_multihashmap_create (size, GNUNET_NO);
+ GNUNET_CONTAINER_multihashmap_iterate (handle->addresses, &peer_it, &ip_ctx);
+ GNUNET_CONTAINER_multihashmap_destroy (ip_ctx.peers_returned);
+ }
+ p_it (p_it_cls, NULL);
+}
+
+struct PeerInfoIteratorContext
+{
+ GNUNET_ATS_PeerInfo_Iterator it;
+ void *it_cls;
+};
+
+
+static int
+peerinfo_it (void *cls,
+ const struct GNUNET_HashCode * key,
+ void *value)
+{
+ struct PeerInfoIteratorContext *pi_ctx = cls;
+ struct ATS_Address *addr = (struct ATS_Address *) value;
+ struct GNUNET_ATS_Information *ats;
+ uint32_t ats_count;
+
+ if (NULL != pi_ctx->it)
+ {
+ ats_count = assemble_ats_information (addr, &ats);
+
+ pi_ctx->it (pi_ctx->it_cls,
+ &addr->peer,
+ addr->plugin,
+ addr->addr, addr->addr_len,
+ addr->active,
+ ats, ats_count,
+ addr->assigned_bw_out,
+ addr->assigned_bw_in);
+ GNUNET_free (ats);
+ }
+ return GNUNET_YES;
+}
+
+
+/**
+ * Return all peers currently known to ATS
+ *
+ * @param peer the respective peer
+ * @param pi_it the iterator to call for every peer
+ * @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)
+{
+ struct PeerInfoIteratorContext pi_ctx;
+ struct GNUNET_BANDWIDTH_Value32NBO zero_bw;
+ GNUNET_assert (NULL != peer);
+ GNUNET_assert (NULL != handle->addresses);
+ if (NULL == pi_it)
+ return; /* does not make sense without callback */
+
+ zero_bw = GNUNET_BANDWIDTH_value_init (0);
+ pi_ctx.it = pi_it;
+ pi_ctx.it_cls = pi_it_cls;
+
+ GNUNET_CONTAINER_multihashmap_get_multiple (handle->addresses, &peer->hashPubKey, &peerinfo_it, &pi_ctx);
+
+ if (NULL != pi_it)
+ pi_it (pi_it_cls, NULL, NULL, NULL, 0, GNUNET_NO, NULL, 0, zero_bw, zero_bw);
+
}
projects / oweals / gnunet.git / blobdiff