/*
This file is part of GNUnet.
- (C) 2011 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011-2015 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
* @author Christian Grothoff
*/
#include "platform.h"
-#include "gnunet_ats_service.h"
-#include "gnunet_ats_plugin.h"
-#include "gnunet-service-ats.h"
#include "gnunet-service-ats_addresses.h"
-#include "gnunet-service-ats_normalization.h"
#include "gnunet-service-ats_performance.h"
-#include "gnunet-service-ats_scheduling.h"
-#include "gnunet-service-ats_reservations.h"
+#include "gnunet-service-ats_normalization.h"
+#include "gnunet-service-ats_plugins.h"
/**
* NOTE: Do not change this documentation. This documentation is based on
- * gnunet.org:/vcs/fsnsg/ats-paper.git/tech-doku/ats-tech-guide.tex
+ * gnunet.org:/vcs/fsnsg/2014-p2p-ats.git/tech-doku/ats-tech-guide.tex
* use build_txt.sh to generate plaintext output
*
* 1 ATS addresses : ATS address management
* available it will not respond at all If the client is not interested
* anymore, it has to cancel the address suggestion request.
*
- * 1.7.6 Suggestions blocks and reset
- *
- * After suggesting an address it is blocked for ATS_BLOCKING_DELTA sec. to
- * prevent the client from being thrashed. If the client requires immediately
- * it can reset this block using GAS_addresses_handle_backoff_reset.
- *
- * 1.7.7 Marking address in use
- *
- * The client can notify addresses that it successfully uses an address and
- * wants this address to be kept by calling GSA_address_in_use. Adresses will
- * mark the address as used an notify the solver about the use.
- *
- * 1.7.8 Address lifecycle
+ * 1.7.6 Address lifecycle
*
* * (add address)
- * * (updated address) || (address in use)
+ * * (updated address)
* * (delete address)
*
* 1.8 Bandwidth assignment
* The bandwidth assigned to a peer can be influenced by setting a preference
* for a peer. The prefernce will be given to to the solver with s_pref which
* has to take care of the preference value
-
*/
/**
- * Pending Address suggestion requests
+ * A multihashmap to store all addresses
*/
-struct GAS_Addresses_Suggestion_Requests
-{
- /**
- * Next in DLL
- */
- struct GAS_Addresses_Suggestion_Requests *next;
-
- /**
- * Previous in DLL
- */
- struct GAS_Addresses_Suggestion_Requests *prev;
+struct GNUNET_CONTAINER_MultiPeerMap *GSA_addresses;
- /**
- * Peer ID
- */
- struct GNUNET_PeerIdentity id;
-};
/**
- * Handle for ATS address component
+ * Update statistic on number of addresses.
*/
-struct GAS_Addresses_Handle
+static void
+update_addresses_stat ()
{
- /**
- *
- */
- struct GNUNET_STATISTICS_Handle *stat;
-
- /**
- * A multihashmap to store all addresses
- */
- struct GNUNET_CONTAINER_MultiPeerMap *addresses;
-
- /**
- * Is ATS addresses running
- */
- int running;
-
- /**
- * Configured ATS solver
- */
- int ats_mode;
-
- /**
- * Solver handle
- */
- void *solver;
-
- /**
- * Address suggestion requests DLL head
- */
- struct GAS_Addresses_Suggestion_Requests *pending_requests_head;
-
- /**
- * Address suggestion requests DLL tail
- */
- struct GAS_Addresses_Suggestion_Requests *pending_requests_tail;
-
- /**
- * Solver functions
- */
- struct GNUNET_ATS_PluginEnvironment env;
+ GNUNET_STATISTICS_set (GSA_stats,
+ "# addresses",
+ GNUNET_CONTAINER_multipeermap_size (GSA_addresses),
+ GNUNET_NO);
+}
- /**
- * Solver plugin name as string
- */
- char *plugin;
-};
/**
* Disassemble ATS information and update performance information in address
*
* @param dest destination address
* @param update source ATS information
- * @param update_count number of ATS information
+ * @param update_count number of ATS information in @a update
* @param delta_dest ats performance information which were updated
* including previous value
- * @param delta_count number of ATS information in the delta
- * @return GNUNET_YES if address was address updated, GNUNET_NO otherwise
+ * @param delta_count number of ATS information in the @a delta_dest
+ * @return #GNUNET_YES if address was address updated, GNUNET_NO otherwise
*/
static unsigned int
disassemble_ats_information (struct ATS_Address *dest,
- const struct GNUNET_ATS_Information *update, uint32_t update_count,
- struct GNUNET_ATS_Information **delta_dest, uint32_t *delta_count)
+ const struct GNUNET_ATS_Information *update,
+ uint32_t update_count,
+ struct GNUNET_ATS_Information **delta_dest,
+ uint32_t *delta_count)
{
-
int c1;
int c2;
int found;
int change;
-
struct GNUNET_ATS_Information add_atsi[update_count];
struct GNUNET_ATS_Information delta_atsi[update_count];
struct GNUNET_ATS_Information *tmp_atsi;
dest->atsi =
GNUNET_malloc (update_count * sizeof (struct GNUNET_ATS_Information));
dest->atsi_count = update_count;
- memcpy (dest->atsi, update,
- update_count * sizeof(struct GNUNET_ATS_Information));
- (*delta_dest) =
+ memcpy (dest->atsi,
+ update,
+ update_count * sizeof(struct GNUNET_ATS_Information));
+ *delta_dest =
GNUNET_malloc (update_count * sizeof (struct GNUNET_ATS_Information));
for (c1 = 0; c1 < update_count; c1++)
{
dest->atsi_count * sizeof(struct GNUNET_ATS_Information));
memcpy (&tmp_atsi[dest->atsi_count], add_atsi,
add_atsi_count * sizeof(struct GNUNET_ATS_Information));
- GNUNET_free(dest->atsi);
+ GNUNET_free (dest->atsi);
dest->atsi = tmp_atsi;
dest->atsi_count = dest->atsi_count + add_atsi_count;
change = GNUNET_YES;
return change;
}
+
/**
* Free the given address
*
static void
free_address (struct ATS_Address *addr)
{
- GNUNET_free(addr->plugin);
- GNUNET_free_non_null(addr->atsi);
- GNUNET_free(addr);
+ GNUNET_CONTAINER_multipeermap_remove (GSA_addresses,
+ &addr->peer,
+ addr);
+ update_addresses_stat ();
+ GAS_plugin_delete_address (addr);
+ GAS_performance_notify_all_clients (&addr->peer,
+ addr->plugin,
+ addr->addr,
+ addr->addr_len,
+ GNUNET_NO,
+ NULL, 0,
+ GNUNET_BANDWIDTH_ZERO,
+ GNUNET_BANDWIDTH_ZERO);
+ GNUNET_free (addr->plugin);
+ GNUNET_free_non_null (addr->atsi);
+ GNUNET_free (addr);
}
+
/**
* Create a ATS_address with the given information
*
* @param plugin_name plugin
* @param plugin_addr address
* @param plugin_addr_len address length
- * @param session_id session
+ * @param local_address_info additional local info for the address
+ * @param session_id session identifier, can never be 0
* @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)
+create_address (const struct GNUNET_PeerIdentity *peer,
+ const char *plugin_name,
+ const void *plugin_addr,
+ size_t plugin_addr_len,
+ uint32_t local_address_info,
+ uint32_t session_id)
{
- struct ATS_Address *aa = NULL;
- int c1;
- int c2;
+ struct ATS_Address *aa;
+ unsigned int c1;
+ unsigned int c2;
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);
+ memcpy (&aa[1],
+ plugin_addr,
+ plugin_addr_len);
aa->plugin = GNUNET_strdup (plugin_name);
aa->session_id = session_id;
- aa->active = GNUNET_NO;
- aa->used = GNUNET_NO;
- aa->solver_information = NULL;
- aa->atsi = NULL;
- aa->atsi_count = 0;
- aa->assigned_bw_in = GNUNET_BANDWIDTH_value_init (0);
- aa->assigned_bw_out = GNUNET_BANDWIDTH_value_init (0);
+ aa->local_address_info = local_address_info;
for (c1 = 0; c1 < GNUNET_ATS_QualityPropertiesCount; c1++)
{
aa->atsin[c1].avg_queue_index = 0;
+ aa->atsin[c1].norm = DEFAULT_REL_QUALITY;
for (c2 = 0; c2 < GAS_normalization_queue_length; c2++)
aa->atsin[c1].atsi_abs[c2] = GNUNET_ATS_VALUE_UNDEFINED;
}
-
return aa;
}
-struct CompareAddressContext
+
+/**
+ * Closure for #find_address_cb()
+ */
+struct FindAddressContext
{
- const struct ATS_Address *search;
+ /**
+ * Session Id to look for.
+ */
+ uint32_t session_id;
- /* exact_address != NULL if address and session is equal */
+ /**
+ * Where to store matching address result.
+ */
struct ATS_Address *exact_address;
- /* exact_address != NULL if address and session is 0 */
- struct ATS_Address *base_address;
+
};
/**
- * Comapre addresses
+ * Find session matching given session ID.
*
- * @param cls a CompareAddressContext containin the source address
+ * @param cls a `struct FindAddressContext`
* @param key peer id
* @param value the address to compare with
- * @return #GNUNET_YES to continue, #GNUNET_NO if address is founce
+ * @return #GNUNET_YES to continue, #GNUNET_NO if address is found
*/
static int
-compare_address_it (void *cls,
- const struct GNUNET_PeerIdentity *key,
- void *value)
+find_address_cb (void *cls,
+ const struct GNUNET_PeerIdentity *key,
+ void *value)
{
- struct CompareAddressContext *cac = cls;
+ struct FindAddressContext *fac = cls;
struct ATS_Address *aa = value;
- /* 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 (aa->session_id == fac->session_id)
{
- if ((0 == strcmp (aa->plugin, cac->search->plugin))
- && (aa->session_id == cac->search->session_id))
- cac->exact_address = aa;
+ fac->exact_address = aa;
+ return GNUNET_NO;
}
-
- 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 */
-}
-
-/**
- * Find an existing equivalent address record.
- * Compares by peer identity and network address OR by session ID
- * (one of the two must match).
- *
- * @param handle the address handle
- * @param peer peer to lookup addresses for
- * @param addr existing address record
- * @return existing address record, NULL for none
- */
-struct ATS_Address *
-find_equivalent_address (struct GAS_Addresses_Handle *handle,
- const struct GNUNET_PeerIdentity *peer, const struct ATS_Address *addr)
-{
- struct CompareAddressContext cac;
-
- cac.exact_address = NULL;
- cac.base_address = NULL;
- cac.search = addr;
- GNUNET_CONTAINER_multipeermap_get_multiple (handle->addresses,
- peer,
- &compare_address_it, &cac);
-
- if (cac.exact_address == NULL)
- return cac.base_address;
- return cac.exact_address;
+ return GNUNET_YES;
}
/**
* Find the exact address
*
- * @param handle the address handle to use
* @param peer peer
- * @param plugin_name transport plugin name
- * @param plugin_addr plugin address
- * @param plugin_addr_len length of the plugin address
- * @param session_id session id, can be 0
+ * @param session_id session id, can never be 0
* @return an ATS_address or NULL
*/
-
static struct ATS_Address *
-find_exact_address (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)
+find_exact_address (const struct GNUNET_PeerIdentity *peer,
+ uint32_t session_id)
{
- struct ATS_Address *aa;
- struct ATS_Address *ea;
-
- aa = create_address (peer, plugin_name, plugin_addr, plugin_addr_len,
- session_id);
+ struct FindAddressContext fac;
- /* Get existing address or address with session == 0 */
- ea = find_equivalent_address (handle, peer, aa);
- free_address (aa);
- if (ea == NULL )
- return NULL ;
- else if (ea->session_id != session_id)
- return NULL ;
- return ea;
+ fac.exact_address = NULL;
+ fac.session_id = session_id;
+ GNUNET_CONTAINER_multipeermap_get_multiple (GSA_addresses,
+ peer,
+ &find_address_cb, &fac);
+ return fac.exact_address;
}
+
/**
* Extract an ATS performance info from an address
*
* @param address the address
* @param type the type to extract in HBO
- * @return the value in HBO or GNUNET_ATS_VALUE_UNDEFINED in HBO if value does not exist
+ * @return the value in HBO or #GNUNET_ATS_VALUE_UNDEFINED in HBO if value does not exist
*/
static int
-get_performance_info (struct ATS_Address *address, uint32_t type)
+get_performance_info (struct ATS_Address *address,
+ uint32_t type)
{
- int c1;
- GNUNET_assert(NULL != address);
+ uint32_t c1;
if ((NULL == address->atsi) || (0 == address->atsi_count))
return GNUNET_ATS_VALUE_UNDEFINED;
return GNUNET_ATS_VALUE_UNDEFINED;
}
+
/**
* Add a new address for a peer.
*
- * @param handle the address handle to use
* @param peer peer
* @param plugin_name transport plugin name
* @param plugin_addr plugin address
- * @param plugin_addr_len length of the plugin address
+ * @param plugin_addr_len length of the plugin address in @a plugin_addr
+ * @param local_address_info the local address for the address
* @param session_id session id, can be 0
* @param atsi performance information for this address
- * @param atsi_count number of performance information contained
+ * @param atsi_count number of performance information contained in @a atsi
*/
void
-GAS_addresses_add (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, uint32_t atsi_count)
+GAS_addresses_add (const struct GNUNET_PeerIdentity *peer,
+ const char *plugin_name,
+ const void *plugin_addr,
+ size_t plugin_addr_len,
+ uint32_t local_address_info,
+ uint32_t session_id,
+ const struct GNUNET_ATS_Information *atsi,
+ uint32_t atsi_count)
{
struct ATS_Address *new_address;
- struct ATS_Address *existing_address;
struct GNUNET_ATS_Information *atsi_delta;
uint32_t atsi_delta_count;
uint32_t addr_net;
- uint32_t previous_session;
- int c1;
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Received `%s' for peer `%s'\n",
- "ADDRESS ADD", GNUNET_i2s (peer));
-
- if (GNUNET_NO == handle->running)
- return;
-
- GNUNET_assert(NULL != handle->addresses);
-
- new_address = create_address (peer, plugin_name, plugin_addr, plugin_addr_len,
- session_id);
- atsi_delta = NULL;
- disassemble_ats_information (new_address, atsi, atsi_count, &atsi_delta,
- &atsi_delta_count);
- GNUNET_free_non_null(atsi_delta);
- addr_net = get_performance_info (new_address, GNUNET_ATS_NETWORK_TYPE);
- if (GNUNET_ATS_VALUE_UNDEFINED == addr_net)
- addr_net = GNUNET_ATS_NET_UNSPECIFIED;
-
- /* Get existing address or address with session == 0 */
- existing_address = find_equivalent_address (handle, peer, new_address);
- if (existing_address == NULL )
- {
- /* Add a new address */
- GNUNET_assert(
- GNUNET_OK == GNUNET_CONTAINER_multipeermap_put (handle->addresses,
- peer,
- new_address,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
-
- GNUNET_STATISTICS_set (handle->stat, "# addresses",
- GNUNET_CONTAINER_multipeermap_size (handle->addresses), GNUNET_NO);
-
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Adding new address %p for peer `%s', length %u, session id %u, %s\n",
- new_address, GNUNET_i2s (peer), plugin_addr_len, session_id,
- GNUNET_ATS_print_network_type (addr_net));
-
- /* Tell solver about new address */
- handle->env.sf.s_add (handle->solver, new_address, addr_net);
-
- handle->env.sf.s_bulk_start (handle->solver);
- GAS_normalization_normalize_property (handle->addresses, new_address, atsi,
- atsi_count);
- handle->env.sf.s_bulk_stop (handle->solver);
-
- /* Notify performance clients about new address */
- GAS_performance_notify_all_clients (&new_address->peer, new_address->plugin,
- new_address->addr, new_address->addr_len, new_address->session_id,
- new_address->atsi, new_address->atsi_count,
- new_address->assigned_bw_out, new_address->assigned_bw_in);
- return;
- }
-
- /* We have an existing address we can use, clean up new */
- GNUNET_free(new_address->plugin);
- GNUNET_free_non_null(new_address->atsi);
- GNUNET_free(new_address);
- new_address = NULL;
-
- if (0 != existing_address->session_id)
+ if (NULL != find_exact_address (peer, session_id))
{
- /* Should not happen */
- GNUNET_break(0);
+ GNUNET_break (0);
return;
}
-
- addr_net = get_performance_info (existing_address, GNUNET_ATS_NETWORK_TYPE);
+ new_address = create_address (peer,
+ plugin_name,
+ plugin_addr,
+ plugin_addr_len,
+ local_address_info,
+ session_id);
+ atsi_delta = NULL;
+ disassemble_ats_information (new_address,
+ atsi, atsi_count,
+ &atsi_delta,
+ &atsi_delta_count);
+ GNUNET_free_non_null (atsi_delta);
+ addr_net = get_performance_info (new_address, GNUNET_ATS_NETWORK_TYPE);
if (GNUNET_ATS_VALUE_UNDEFINED == addr_net)
addr_net = GNUNET_ATS_NET_UNSPECIFIED;
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Found existing address for peer `%s' %p with new session %u in network %s\n",
- GNUNET_i2s (peer), existing_address, session_id,
- GNUNET_ATS_print_network_type (addr_net));
- /* We have an address without an session, update this address */
- atsi_delta = NULL;
- atsi_delta_count = 0;
- if (GNUNET_YES
- == disassemble_ats_information (existing_address, atsi, atsi_count,
- &atsi_delta, &atsi_delta_count))
- {
- /* Notify performance clients about properties */
- GAS_performance_notify_all_clients (&existing_address->peer,
- existing_address->plugin, existing_address->addr,
- existing_address->addr_len, existing_address->session_id,
- existing_address->atsi, existing_address->atsi_count,
- existing_address->assigned_bw_out, existing_address->assigned_bw_in);
-
- for (c1 = 0; c1 < atsi_delta_count; c1++)
- {
- if ((GNUNET_ATS_NETWORK_TYPE == ntohl (atsi_delta[c1].type))
- && (addr_net != ntohl (atsi_delta[c1].value)))
- {
- /* Network type changed */
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Address for peer `%s' %p changed from network %s to %s\n",
- GNUNET_i2s (peer), existing_address,
- GNUNET_ATS_print_network_type (addr_net),
- GNUNET_ATS_print_network_type (ntohl (atsi_delta[c1].value)));
- handle->env.sf.s_address_update_network (handle->solver, existing_address,
- ntohl (atsi_delta[c1].value),
- get_performance_info (existing_address, GNUNET_ATS_NETWORK_TYPE));
- addr_net = get_performance_info (existing_address,
- GNUNET_ATS_NETWORK_TYPE);
- }
- }
- /* Notify solver about update with atsi information and session */
- handle->env.sf.s_bulk_start (handle->solver);
- GAS_normalization_normalize_property (handle->addresses, existing_address,
- atsi, atsi_count);
- handle->env.sf.s_bulk_stop (handle->solver);
- }
- GNUNET_free_non_null(atsi_delta);
-
- /* Notify solver about new session */
- if (existing_address->session_id == session_id)
- return; /* possible, can both be 0 since address is revalidated */
-
- previous_session = existing_address->session_id;
- existing_address->session_id = session_id;
- handle->env.sf.s_address_update_session (handle->solver, existing_address,
- previous_session, session_id);
-
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Updated existing address for peer `%s' %p length %u with new session %u in network %s\n",
- GNUNET_i2s (peer), existing_address, existing_address->addr_len,
- session_id, GNUNET_ATS_print_network_type (addr_net));
+ /* Add a new address */
+ new_address->t_added = GNUNET_TIME_absolute_get();
+ new_address->t_last_activity = GNUNET_TIME_absolute_get();
+ GNUNET_assert(GNUNET_OK ==
+ GNUNET_CONTAINER_multipeermap_put (GSA_addresses,
+ peer,
+ new_address,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
+ update_addresses_stat ();
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Adding new address for peer `%s' slot %u\n",
+ GNUNET_i2s (peer),
+ session_id);
+ /* Tell solver about new address */
+ GAS_plugin_solver_lock ();
+ GAS_plugin_new_address (new_address,
+ addr_net);
+ GAS_normalization_update_property (new_address,
+ atsi,
+ atsi_count);
+ GAS_plugin_solver_unlock ();
+ /* Notify performance clients about new address */
+ GAS_performance_notify_all_clients (&new_address->peer,
+ new_address->plugin,
+ new_address->addr,
+ new_address->addr_len,
+ new_address->active,
+ new_address->atsi,
+ new_address->atsi_count,
+ GNUNET_BANDWIDTH_value_init (new_address->assigned_bw_out),
+ GNUNET_BANDWIDTH_value_init (new_address->assigned_bw_in));
}
+
/**
- * Update an address with a session or performance information for a peer.
- *
- * If an address was added without a session it will be updated with the
- * session
+ * Update an address with new performance information for a peer.
*
- * @param handle the address handle to use
* @param peer peer
- * @param plugin_name transport plugin name
- * @param plugin_addr plugin address
- * @param plugin_addr_len length of the plugin address
- * @param session_id session id, can be 0
+ * @param session_id session id, never 0
* @param atsi performance information for this address
- * @param atsi_count number of performance information contained
+ * @param atsi_count number of performance information contained in @a atsi
*/
void
-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, uint32_t atsi_count)
+GAS_addresses_update (const struct GNUNET_PeerIdentity *peer,
+ uint32_t session_id,
+ const struct GNUNET_ATS_Information *atsi,
+ uint32_t atsi_count)
{
struct ATS_Address *aa;
struct GNUNET_ATS_Information *atsi_delta;
uint32_t atsi_delta_count;
- uint32_t prev_session;
- int c1;
-
- if (GNUNET_NO == handle->running)
- return;
-
- GNUNET_assert(NULL != handle->addresses);
/* Get existing address */
- aa = find_exact_address (handle, peer, plugin_name, plugin_addr,
- plugin_addr_len, session_id);
- if (aa == NULL )
+ aa = find_exact_address (peer,
+ session_id);
+ if (NULL == aa)
{
- /* 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); */
+ GNUNET_break (0);
return;
}
-
if (NULL == aa->solver_information)
{
- 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;
}
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Received `%s' for peer `%s' address \n",
- "ADDRESS UPDATE", GNUNET_i2s (peer), aa);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received ADDRESS_UPDATE for peer `%s' slot %u\n",
+ GNUNET_i2s (peer),
+ (unsigned int) session_id);
/* Update address */
- if (session_id != aa->session_id)
- {
- /* Session changed */
- prev_session = aa->session_id;
- aa->session_id = session_id;
- handle->env.sf.s_address_update_session (handle->solver, aa, prev_session,
- aa->session_id);
- }
-
+ aa->t_last_activity = GNUNET_TIME_absolute_get();
atsi_delta = NULL;
atsi_delta_count = 0;
- if (GNUNET_YES
- == disassemble_ats_information (aa, atsi, atsi_count, &atsi_delta,
- &atsi_delta_count))
+ if (GNUNET_YES ==
+ disassemble_ats_information (aa, atsi,
+ atsi_count,
+ &atsi_delta,
+ &atsi_delta_count))
{
- /* ATS properties changed */
- for (c1 = 0; c1 < atsi_delta_count; c1++)
- {
- if (GNUNET_ATS_NETWORK_TYPE == ntohl (atsi_delta[c1].type))
- {
- /* Network type changed */
- handle->env.sf.s_address_update_network (handle->solver, aa,
- ntohl (atsi_delta[c1].value),
- get_performance_info (aa, GNUNET_ATS_NETWORK_TYPE));
- }
- }
-
/* Notify performance clients about updated address */
- GAS_performance_notify_all_clients (&aa->peer, aa->plugin, aa->addr,
- aa->addr_len, aa->session_id, aa->atsi, aa->atsi_count,
- aa->assigned_bw_out, aa->assigned_bw_in);
-
- handle->env.sf.s_bulk_start (handle->solver);
- GAS_normalization_normalize_property (handle->addresses, aa, atsi,
- atsi_count);
- handle->env.sf.s_bulk_stop (handle->solver);
+ GAS_performance_notify_all_clients (&aa->peer,
+ aa->plugin,
+ aa->addr,
+ aa->addr_len,
+ aa->active,
+ aa->atsi,
+ aa->atsi_count,
+ GNUNET_BANDWIDTH_value_init (aa->assigned_bw_out),
+ GNUNET_BANDWIDTH_value_init (aa->assigned_bw_in));
+
+ GAS_normalization_update_property (aa,
+ atsi,
+ atsi_count);
}
- GNUNET_free_non_null(atsi_delta);
+ GNUNET_free_non_null (atsi_delta);
}
-struct DestroyContext
-{
- struct ATS_Address *aa;
-
- struct GAS_Addresses_Handle *handle;
-
- /**
- * GNUNET_NO : full address
- * GNUNET_YES : just session
- */
- int result;
-};
/**
- * 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
+ * Remove an address for a peer.
*
- * @param cls unused
- * @param key unused
- * @param value the 'struct ATS_Address'
- * @return GNUNET_OK (continue to iterate)
+ * @param peer peer
+ * @param session_id session id, can never be 0
*/
-static int
-destroy_by_session_id (void *cls,
- const struct GNUNET_PeerIdentity *key,
- void *value)
+void
+GAS_addresses_destroy (const struct GNUNET_PeerIdentity *peer,
+ uint32_t session_id)
{
- struct DestroyContext *dc = cls;
- struct GAS_Addresses_Handle *handle = dc->handle;
- const struct ATS_Address *des = dc->aa;
- struct ATS_Address *aa = value;
-
- GNUNET_assert(
- 0 == memcmp (&aa->peer, &des->peer, sizeof(struct GNUNET_PeerIdentity)));
-
- if (des->session_id == 0)
- {
- /* Session == 0, remove full address */
- if ((0 == strcmp (des->plugin, aa->plugin))
- && (aa->addr_len == des->addr_len)
- && (0 == memcmp (des->addr, aa->addr, aa->addr_len)))
- {
+ struct ATS_Address *ea;
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Deleting full address for peer `%s' session %u %p\n",
- GNUNET_i2s (&aa->peer), aa->session_id, aa);
-
- /* Notify solver about deletion */
- GNUNET_assert(
- GNUNET_YES == GNUNET_CONTAINER_multipeermap_remove (handle->addresses,
- &aa->peer,
- aa));
- handle->env.sf.s_del (handle->solver, aa, GNUNET_NO);
- free_address (aa);
- dc->result = GNUNET_NO;
- return GNUNET_OK; /* Continue iteration */
- }
- }
- else
+ /* Get existing address */
+ ea = find_exact_address (peer,
+ session_id);
+ if (NULL == ea)
{
- /* Session != 0, just remove session */
- if (aa->session_id != des->session_id)
- return GNUNET_OK; /* irrelevant */
-
- if ((aa->session_id != 0) && (0 != strcmp (des->plugin, aa->plugin)))
- {
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "Different plugins during removal: `%s' vs `%s' \n", des->plugin,
- aa->plugin);
- GNUNET_break(0);
- return GNUNET_OK;
- }
-
- if (aa->addr_len == 0)
- {
- /* Inbound connection died, delete full address */
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Deleting inbound address for peer `%s': `%s' session %u\n",
- GNUNET_i2s (&aa->peer), aa->plugin, aa->session_id);
-
- /* Notify solver about deletion */
- GNUNET_assert(
- GNUNET_YES == GNUNET_CONTAINER_multipeermap_remove (handle->addresses,
- &aa->peer, aa));
- handle->env.sf.s_del (handle->solver, aa, GNUNET_NO);
- free_address (aa);
- dc->result = GNUNET_NO;
- return GNUNET_OK; /* Continue iteration */
- }
- else
- {
- /* Session died */
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Deleting session for peer `%s': `%s' %u\n", GNUNET_i2s (&aa->peer),
- aa->plugin, aa->session_id);
- /* Notify solver to delete session */
- handle->env.sf.s_del (handle->solver, aa, GNUNET_YES);
- aa->session_id = 0;
- aa->active = GNUNET_NO;
- return GNUNET_OK;
- }
+ GNUNET_break (0);
+ return;
}
- return GNUNET_OK;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received ADDRESS_DESTROYED for peer `%s' session %u\n",
+ GNUNET_i2s (peer),
+ session_id);
+ free_address (ea);
}
/**
- * Remove an address or just a session for a peer.
+ * Initialize address subsystem. The addresses subsystem manages the addresses
+ * known and current performance information. It has a solver component
+ * responsible for the resource allocation. It tells the solver about changes
+ * and receives updates when the solver changes the resource allocation.
*
- * @param handle the address handle to use
- * @param peer peer
- * @param plugin_name transport plugin name
- * @param plugin_addr plugin address
- * @param plugin_addr_len length of the plugin address
- * @param session_id session id, can be 0
+ * @param server handle to our server
*/
void
-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)
+GAS_addresses_init (struct GNUNET_SERVER_Handle *server)
{
- struct ATS_Address *ea;
- struct DestroyContext dc;
- if (GNUNET_NO == handle->running)
- return;
-
- /* Get existing address */
- ea = find_exact_address (handle, peer, plugin_name, plugin_addr,
- plugin_addr_len, session_id);
- if (ea == 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_log(GNUNET_ERROR_TYPE_INFO,
- "Received `%s' for peer `%s' address %p session %u\n", "ADDRESS DESTROY",
- GNUNET_i2s (peer), ea, session_id);
-
- GNUNET_break(0 < strlen (plugin_name));
- dc.handle = handle;
- dc.aa = create_address (peer, plugin_name, plugin_addr, plugin_addr_len,
- session_id);
-
- GNUNET_CONTAINER_multipeermap_get_multiple (handle->addresses,
- peer,
- &destroy_by_session_id, &dc);
- GNUNET_STATISTICS_set (handle->stat, "# addresses",
- GNUNET_CONTAINER_multipeermap_size (handle->addresses), GNUNET_NO);
- free_address (dc.aa);
+ GSA_addresses = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_NO);
+ update_addresses_stat ();
}
+
/**
- * Notification about active use of an address.
- * in_use == GNUNET_YES:
- * This address is used to maintain an active connection with a peer.
- * in_use == GNUNET_NO:
- * This address is no longer used to maintain an active connection with a peer.
- *
- * Note: can only be called with in_use == GNUNET_NO if called with GNUNET_YES
- * before
+ * Destroy all addresses iterator
*
- * @param handle the address handle to use
- * @param peer peer
- * @param plugin_name transport plugin name
- * @param plugin_addr plugin address
- * @param plugin_addr_len length of the plugin address
- * @param session_id session id, can be 0
- * @param in_use GNUNET_YES if GNUNET_NO
- * @return GNUNET_SYSERR on failure (address unknown ...)
+ * @param cls NULL
+ * @param key peer identity (unused)
+ * @param value the 'struct ATS_Address' to free
+ * @return #GNUNET_OK (continue to iterate)
*/
-int
-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)
+static int
+destroy_all_address_it (void *cls,
+ const struct GNUNET_PeerIdentity *key,
+ void *value)
{
- struct ATS_Address *ea;
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Received `%s' for peer `%s'\n",
- "ADDRESS IN USE", GNUNET_i2s (peer));
-
- if (GNUNET_NO == handle->running)
- return GNUNET_SYSERR;
-
- ea = find_exact_address (handle, peer, plugin_name, plugin_addr,
- plugin_addr_len, session_id);
- if (NULL == ea)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "Trying to set unknown address `%s' `%s' `%u' to %s \n",
- GNUNET_i2s (peer), plugin_name, session_id,
- (GNUNET_NO == in_use) ? "NO" : "YES");
- GNUNET_break(0);
- return GNUNET_SYSERR;
- }
- 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 == ea->used) ? "NO" : "YES",
- (GNUNET_NO == in_use) ? "NO" : "YES");
- return GNUNET_SYSERR;
- }
+ struct ATS_Address *aa = value;
- /* Tell solver about update */
- ea->used = in_use;
- handle->env.sf.s_address_update_inuse (handle->solver, ea, ea->used);
+ free_address (aa);
return GNUNET_OK;
}
+
/**
- * Cancel address suggestions for a peer
- *
- * @param handle the address handle
- * @param peer the peer id
+ * Remove all addresses
*/
void
-GAS_addresses_request_address_cancel (struct GAS_Addresses_Handle *handle,
- const struct GNUNET_PeerIdentity *peer)
+GAS_addresses_destroy_all ()
{
- struct GAS_Addresses_Suggestion_Requests *cur = handle->pending_requests_head;
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Received request: `%s' for peer %s\n",
- "request_address_cancel", GNUNET_i2s (peer));
-
- while (NULL != cur)
- {
- if (0 == memcmp (peer, &cur->id, sizeof(cur->id)))
- break; /* found */
- cur = cur->next;
- }
-
- if (NULL == cur)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
- "No address requests pending for peer `%s', cannot remove!\n",
- GNUNET_i2s (peer));
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Destroying all addresses\n");
+ if (0 ==
+ GNUNET_CONTAINER_multipeermap_size (GSA_addresses))
return;
- }
- handle->env.sf.s_get_stop (handle->solver, 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->pending_requests_head, handle->pending_requests_tail, cur);
- GNUNET_free(cur);
+ GAS_plugin_solver_lock ();
+ GNUNET_CONTAINER_multipeermap_iterate (GSA_addresses,
+ &destroy_all_address_it,
+ NULL);
+ GAS_plugin_solver_unlock ();
}
/**
- * Request address suggestions for a peer
- *
- * @param handle the address handle
- * @param peer the peer id
+ * Shutdown address subsystem.
*/
void
-GAS_addresses_request_address (struct GAS_Addresses_Handle *handle,
- const struct GNUNET_PeerIdentity *peer)
+GAS_addresses_done ()
{
- struct GAS_Addresses_Suggestion_Requests *cur = handle->pending_requests_head;
- struct ATS_Address *aa;
-
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Received `%s' for peer `%s'\n",
- "REQUEST ADDRESS", GNUNET_i2s (peer));
-
- if (GNUNET_NO == handle->running)
- return;
- while (NULL != cur)
- {
- if (0 == memcmp (peer, &cur->id, sizeof(cur->id)))
- break; /* already suggesting */
- cur = cur->next;
- }
- if (NULL == cur)
- {
- cur = GNUNET_malloc (sizeof (struct GAS_Addresses_Suggestion_Requests));
- cur->id = (*peer);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Adding new address suggestion request for `%s'\n",
- GNUNET_i2s (peer));
- GNUNET_CONTAINER_DLL_insert(handle->pending_requests_head, handle->pending_requests_tail, cur);
- }
-
- /* Get prefered address from solver */
- aa = (struct ATS_Address *) handle->env.sf.s_get (handle->solver, peer);
- if (NULL == aa)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Cannot suggest address for peer `%s'\n",
- GNUNET_i2s (peer));
- return;
- }
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Suggesting address %p for peer `%s'\n",
- aa, GNUNET_i2s (peer));
-
- GAS_scheduling_transmit_address_suggestion (peer, aa->plugin, aa->addr,
- aa->addr_len, aa->session_id, aa->atsi, aa->atsi_count,
- aa->assigned_bw_out, aa->assigned_bw_in);
-
- aa->block_interval = GNUNET_TIME_relative_add (aa->block_interval,
- ATS_BLOCKING_DELTA);
- aa->blocked_until = GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get (),
- aa->block_interval);
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Address %p ready for suggestion, block interval now %llu \n", aa,
- aa->block_interval);
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ "Shutting down addresses\n");
+ GAS_addresses_destroy_all ();
+ GNUNET_CONTAINER_multipeermap_destroy (GSA_addresses);
+ GSA_addresses = NULL;
}
+
/**
- * Iterator to reset address blocking
- *
- * @param cls not used
- * @param key the peer
- * @param value the address to reset
- * @return #GNUNET_OK to continue
+ * Closure for #peerinfo_it().
*/
-static int
-reset_address_it (void *cls,
- const struct GNUNET_PeerIdentity *key,
- void *value)
+struct PeerInfoIteratorContext
{
- struct ATS_Address *aa = value;
+ /**
+ * Function to call for each address.
+ */
+ GNUNET_ATS_PeerInfo_Iterator it;
- 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;
-}
+ /**
+ * Closure for @e it.
+ */
+ void *it_cls;
+};
/**
- * Reset suggestion backoff for a peer
- *
- * Suggesting addresses is blocked for ATS_BLOCKING_DELTA. Blocking can be
- * reset using this function
+ * Iterator to iterate over a peer's addresses
*
- * @param handle the address handle
- * @param peer the peer id
+ * @param cls a `struct PeerInfoIteratorContext`
+ * @param key the peer id
+ * @param value the `struct ATS_address`
+ * @return #GNUNET_OK to continue
*/
-void
-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",
- "RESET BACKOFF", GNUNET_i2s (peer));
-
- GNUNET_break(
- GNUNET_SYSERR != GNUNET_CONTAINER_multipeermap_get_multiple (handle->addresses,
- peer,
- &reset_address_it, NULL));
-}
-
-
-
-static int
-eval_count_active_it (void *cls, const struct GNUNET_PeerIdentity *id, void *obj)
-{
- int *request_fulfilled = cls;
- struct ATS_Address *addr = obj;
-
- if (GNUNET_YES == addr->active)
- (*request_fulfilled) = GNUNET_YES;
-
- if (*request_fulfilled == GNUNET_YES)
- return GNUNET_NO;
- else
- return GNUNET_YES;
-}
-
-struct SummaryContext {
- unsigned long long bandwidth_in_assigned[GNUNET_ATS_NetworkTypeCount];
- unsigned long long bandwidth_out_assigned[GNUNET_ATS_NetworkTypeCount];
- unsigned int addresses_in_network[GNUNET_ATS_NetworkTypeCount];
-};
-
-
static int
-eval_sum_bw_used (void *cls, const struct GNUNET_PeerIdentity *id, void *obj)
+peerinfo_it (void *cls,
+ const struct GNUNET_PeerIdentity *key,
+ void *value)
{
- struct ATS_Address *addr = obj;
- int networks[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkType;
- int net;
- struct SummaryContext *ctx = cls;
-
- int c;
+ struct PeerInfoIteratorContext *pi_ctx = cls;
+ struct ATS_Address *addr = value;
- if (GNUNET_YES == addr->active)
- {
- net = get_performance_info (addr, GNUNET_ATS_NETWORK_TYPE);
- for (c = 0; c < GNUNET_ATS_NetworkTypeCount; c++)
- {
- if (net == networks[c])
- {
- ctx->addresses_in_network[c] ++;
- ctx->bandwidth_in_assigned[c] += ntohl (addr->assigned_bw_in.value__);
- ctx->bandwidth_out_assigned[c] += ntohl (addr->assigned_bw_out.value__);
- }
- }
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Active address in %s with (in/out) %llu/%llu Bps\n",
- GNUNET_ATS_print_network_type(net),
- ntohl (addr->assigned_bw_in.value__),
- ntohl (addr->assigned_bw_out.value__));
- }
+ pi_ctx->it (pi_ctx->it_cls,
+ &addr->peer,
+ addr->plugin,
+ addr->addr,
+ addr->addr_len,
+ addr->active,
+ addr->atsi, addr->atsi_count,
+ GNUNET_BANDWIDTH_value_init (addr->assigned_bw_out),
+ GNUNET_BANDWIDTH_value_init (addr->assigned_bw_in));
return GNUNET_OK;
}
/**
- * Evaluate current bandwidth assignment
+ * Return information all peers currently known to ATS
*
- * @param ah address handle
+ * @param peer the respective peer, NULL for 'all' peers
+ * @param pi_it the iterator to call for every peer
+ * @param pi_it_cls the closure for @a pi_it
*/
void
-GAS_addresses_evaluate_assignment (struct GAS_Addresses_Handle *ah)
+GAS_addresses_get_peer_info (const struct GNUNET_PeerIdentity *peer,
+ GNUNET_ATS_PeerInfo_Iterator pi_it,
+ void *pi_it_cls)
{
- struct GAS_Addresses_Suggestion_Requests *cur;
- int c;
-
- float quality_requests_fulfilled = 0.0;
- float quality_bandwidth_utilization[GNUNET_ATS_NetworkTypeCount];
- float quality_bandwidth_utilization_total = 0.0;
- float quality_application_requirements = 0.0;
- float guq = 0.0;
-
- /* Variable related to requests */
- unsigned int requests_pending;
- unsigned int requests_fulfilled;
- unsigned int request_active;
-
- /* Variable related to utilization */
- struct SummaryContext sum;
- int network_count;
-
- GNUNET_assert (NULL != ah);
- GNUNET_assert (NULL != ah->addresses);
-
- requests_pending = 0;
- requests_fulfilled = 0;
- /* 1) How many requests could be fulfilled? */
- for (cur = ah->pending_requests_head; NULL != cur; cur = cur->next)
- {
- request_active = GNUNET_NO;
- GNUNET_CONTAINER_multipeermap_get_multiple (ah->addresses,
- &cur->id, &eval_count_active_it, &request_active);
- if (GNUNET_YES == request_active)
- requests_fulfilled ++;
- requests_pending ++;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Peer `%s': pending requests, %s\n",
- GNUNET_i2s (&cur->id),
- (GNUNET_YES == request_active) ? "active adress" : "no active address");
-
- }
- if (requests_pending > 0)
- quality_requests_fulfilled = (float) requests_fulfilled / requests_pending;
- else
- quality_requests_fulfilled = 0.0;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "%u pending requests, %u requests fullfilled\n",
- requests_pending, requests_fulfilled);
+ struct PeerInfoIteratorContext pi_ctx;
- /* 2) How well is bandwidth utilized? */
- network_count = 0;
- for (c = 0; c < GNUNET_ATS_NetworkTypeCount; c++)
- {
- quality_bandwidth_utilization[c] = 0.0;
- sum.addresses_in_network[c] = 0;
- sum.bandwidth_in_assigned[c] = 0;
- sum.bandwidth_out_assigned[c] = 0;
- }
- GNUNET_CONTAINER_multipeermap_iterate(ah->addresses,
- &eval_sum_bw_used, &sum);
- for (c = 0; c < GNUNET_ATS_NetworkTypeCount; c++)
+ if (NULL == pi_it)
{
- quality_bandwidth_utilization[c] = (((float)sum.bandwidth_out_assigned[c] / ah->env.out_quota[c]) +
- ((float)sum.bandwidth_in_assigned[c] / ah->env.in_quota[c])) / 2;
-
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Utilization for network `%s': %f\n",
- GNUNET_ATS_print_network_type(ah->env.networks[c]),
- quality_bandwidth_utilization[c]);
- if (sum.addresses_in_network[c] > 0)
- {
- quality_bandwidth_utilization_total += quality_bandwidth_utilization[c];
- network_count ++;
- }
+ /* does not make sense without callback */
+ GNUNET_break (0);
+ return;
}
- if (0 < network_count)
- quality_bandwidth_utilization_total /= network_count;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Returning information for %s from a total of %u known addresses\n",
+ (NULL == peer)
+ ? "all peers"
+ : GNUNET_i2s (peer),
+ (unsigned int) GNUNET_CONTAINER_multipeermap_size (GSA_addresses));
+ pi_ctx.it = pi_it;
+ pi_ctx.it_cls = pi_it_cls;
+ if (NULL == peer)
+ GNUNET_CONTAINER_multipeermap_iterate (GSA_addresses,
+ &peerinfo_it,
+ &pi_ctx);
else
- quality_bandwidth_utilization_total = 0.0;
-
- /* 3) How well does selection match application requirements */
-
- /* GUQ */
- guq = (quality_requests_fulfilled + quality_bandwidth_utilization_total + quality_application_requirements) /3;
-
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Requests fulfilled %.3f bandwidth utilized %.3f application preferences met %.3f => %.3f\n",
- quality_requests_fulfilled,
- quality_bandwidth_utilization_total,
- quality_application_requirements,
- guq);
-}
-
-/**
- * Solver information callback
- *
- * @param cls the closure
- * @param op the operation
- * @param stat operation status
- * @param add additional information
- */
-
-static void
-solver_info_cb (void *cls,
- enum GAS_Solver_Operation op,
- enum GAS_Solver_Status stat,
- enum GAS_Solver_Additional_Information add)
-{
- char *add_info;
-
- switch (add) {
- case GAS_INFO_NONE:
- add_info = "GAS_INFO_NONE";
- break;
- case GAS_INFO_FULL:
- add_info = "GAS_INFO_MLP_FULL";
- break;
- case GAS_INFO_UPDATED:
- add_info = "GAS_INFO_MLP_UPDATED";
- break;
- case GAS_INFO_PROP_ALL:
- add_info = "GAS_INFO_PROP_ALL";
- break;
- case GAS_INFO_PROP_SINGLE:
- add_info = "GAS_INFO_PROP_SINGLE";
- break;
- default:
- add_info = "INVALID";
- break;
- }
- switch (op)
- {
- case GAS_OP_SOLVE_START:
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Solver notifies `%s' with result `%s' `%s'\n", "GAS_OP_SOLVE_START",
- (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL", add_info);
- return;
- case GAS_OP_SOLVE_STOP:
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Solver notifies `%s' with result `%s'\n", "GAS_OP_SOLVE_STOP",
- (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL", add_info);
- return;
-
- case GAS_OP_SOLVE_SETUP_START:
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Solver notifies `%s' with result `%s'\n", "GAS_OP_SOLVE_SETUP_START",
- (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL");
- return;
-
- case GAS_OP_SOLVE_SETUP_STOP:
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Solver notifies `%s' with result `%s'\n", "GAS_OP_SOLVE_SETUP_STOP",
- (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL");
- return;
-
- case GAS_OP_SOLVE_MLP_LP_START:
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Solver notifies `%s' with result `%s'\n", "GAS_OP_SOLVE_LP_START",
- (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL");
- return;
- case GAS_OP_SOLVE_MLP_LP_STOP:
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Solver notifies `%s' with result `%s'\n", "GAS_OP_SOLVE_LP_STOP",
- (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL");
- return;
-
- case GAS_OP_SOLVE_MLP_MLP_START:
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Solver notifies `%s' with result `%s'\n", "GAS_OP_SOLVE_MLP_START",
- (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL");
- return;
- case GAS_OP_SOLVE_MLP_MLP_STOP:
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Solver notifies `%s' with result `%s'\n", "GAS_OP_SOLVE_MLP_STOP",
- (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL");
- return;
- case GAS_OP_SOLVE_UPDATE_NOTIFICATION_START:
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Solver notifies `%s' with result `%s'\n", "GAS_OP_SOLVE_UPDATE_NOTIFICATION_START",
- (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL");
- return;
- case GAS_OP_SOLVE_UPDATE_NOTIFICATION_STOP:
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Solver notifies `%s' with result `%s'\n", "GAS_OP_SOLVE_UPDATE_NOTIFICATION_STOP",
- (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL");
- GAS_addresses_evaluate_assignment (cls);
- return;
- default:
- break;
- }
+ GNUNET_CONTAINER_multipeermap_get_multiple (GSA_addresses,
+ peer,
+ &peerinfo_it, &pi_ctx);
+ pi_it (pi_it_cls,
+ NULL, NULL, NULL, 0,
+ GNUNET_NO,
+ NULL, 0,
+ GNUNET_BANDWIDTH_ZERO,
+ GNUNET_BANDWIDTH_ZERO);
}
/**
- * The preference changed for a peer
- *
- * @param cls the address handle
- * @param peer the peer
- * @param kind the ATS kind
- * @param pref_rel the new relative preference value
+ * Information we need for the callbacks to return a list of addresses
+ * back to the client.
*/
-static void
-normalized_preference_changed_cb (void *cls,
- const struct GNUNET_PeerIdentity *peer, enum GNUNET_ATS_PreferenceKind kind,
- double pref_rel)
+struct AddressIteration
{
- GNUNET_assert(NULL != cls);
- struct GAS_Addresses_Handle *handle = cls;
-
- /* Tell solver about update */
- handle->env.sf.s_pref (handle->solver, peer, kind, pref_rel);
-}
+ /**
+ * Actual handle to the client.
+ */
+ struct GNUNET_SERVER_Client *client;
-/**
- * The relative value for a property changed
- *
- * @param cls the address handle
- * @param address the peer
- * @param type the ATS type
- * @param prop_rel the new relative preference value
- */
-static void
-normalized_property_changed_cb (void *cls, struct ATS_Address *address,
- uint32_t type, double prop_rel)
-{
- struct GAS_Addresses_Handle *ah = (struct GAS_Addresses_Handle *) cls;
- GNUNET_assert(NULL != ah);
+ /**
+ * Are we sending all addresses, or only those that are active?
+ */
+ int all;
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Normalized property %s for peer `%s' changed to %.3f \n",
- GNUNET_ATS_print_property_type (type), GNUNET_i2s (&address->peer),
- prop_rel);
+ /**
+ * Which ID should be included in the response?
+ */
+ uint32_t id;
- ah->env.sf.s_address_update_property (ah->solver, address, type, 0, prop_rel);
-}
+};
-/**
- * Function allowing the solver to obtain normalized preference
- * values from solver
- *
- * @param cls unused
- * @param id the peer to return the normalized properties for
- * @return array of double values with |GNUNET_ATS_PreferenceCount| elements
- */
-const double *
-get_preferences_cb (void *cls, const struct GNUNET_PeerIdentity *id)
-{
- return GAS_normalization_get_preferences (id);
-}
/**
- * Function allowing the solver to obtain normalized property
- * values for an address from solver
+ * Send a #GNUNET_MESSAGE_TYPE_ATS_ADDRESSLIST_RESPONSE with the
+ * given address details to the client identified in @a ai.
*
- * @param cls unused
- * @param address the address
- * @return array of double values with |GNUNET_ATS_QualityPropertiesCount| elements
+ * @param ai our address information context (identifies the client)
+ * @param id the peer id this address is for
+ * @param plugin_name name of the plugin that supports this address
+ * @param plugin_addr address
+ * @param plugin_addr_len length of @a plugin_addr
+ * @param active #GNUNET_YES if this address is actively used
+ * @param atsi ats performance information
+ * @param atsi_count number of ats performance elements in @a atsi
+ * @param bandwidth_out current outbound bandwidth assigned to address
+ * @param bandwidth_in current inbound bandwidth assigned to address
*/
-const double *
-get_property_cb (void *cls, const struct ATS_Address *address)
-{
- return GAS_normalization_get_properties ((struct ATS_Address *) address);
-}
+static void
+transmit_req_addr (struct AddressIteration *ai,
+ const struct GNUNET_PeerIdentity *id,
+ const char *plugin_name,
+ const void *plugin_addr,
+ size_t plugin_addr_len,
+ int active,
+ const struct GNUNET_ATS_Information *atsi,
+ uint32_t atsi_count,
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
-/**
- * Change the preference for a peer
- *
- * @param handle the address handle
- * @param client the client sending this request
- * @param peer the peer id
- * @param kind the preference kind to change
- * @param score_abs the new preference score
- */
-void
-GAS_addresses_change_preference (struct GAS_Addresses_Handle *handle,
- void *client, const struct GNUNET_PeerIdentity *peer,
- enum GNUNET_ATS_PreferenceKind kind, float score_abs)
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Received `%s' for peer `%s' for client %p\n", "CHANGE PREFERENCE",
- GNUNET_i2s (peer), client);
-
- if (GNUNET_NO == handle->running)
- return;
-
- if (GNUNET_NO ==
- GNUNET_CONTAINER_multipeermap_contains (handle->addresses,
- peer))
+ struct GNUNET_ATS_Information *atsp;
+ struct PeerInformationMessage *msg;
+ char *addrp;
+ size_t plugin_name_length;
+ size_t msize;
+ struct GNUNET_SERVER_NotificationContext *nc;
+
+ if (NULL != plugin_name)
+ plugin_name_length = strlen (plugin_name) + 1;
+ else
+ plugin_name_length = 0;
+ msize = sizeof (struct PeerInformationMessage) +
+ atsi_count * sizeof (struct GNUNET_ATS_Information) +
+ plugin_addr_len + plugin_name_length;
+ char buf[msize] GNUNET_ALIGN;
+
+ GNUNET_assert (msize < GNUNET_SERVER_MAX_MESSAGE_SIZE);
+ GNUNET_assert (atsi_count <
+ GNUNET_SERVER_MAX_MESSAGE_SIZE /
+ sizeof (struct GNUNET_ATS_Information));
+ msg = (struct PeerInformationMessage *) buf;
+ msg->header.size = htons (msize);
+ msg->header.type = htons (GNUNET_MESSAGE_TYPE_ATS_ADDRESSLIST_RESPONSE);
+ msg->ats_count = htonl (atsi_count);
+ msg->id = htonl (ai->id);
+ if (NULL != id)
+ msg->peer = *id;
+ else
+ memset (&msg->peer, '\0', sizeof (struct GNUNET_PeerIdentity));
+ msg->address_length = htons (plugin_addr_len);
+ msg->address_active = ntohl (active);
+ msg->plugin_name_length = htons (plugin_name_length);
+ msg->bandwidth_out = bandwidth_out;
+ msg->bandwidth_in = bandwidth_in;
+ atsp = (struct GNUNET_ATS_Information *) &msg[1];
+ memcpy (atsp, atsi, sizeof (struct GNUNET_ATS_Information) * atsi_count);
+ addrp = (char *) &atsp[atsi_count];
+ if (NULL != plugin_addr)
+ memcpy (addrp, plugin_addr, plugin_addr_len);
+ if (NULL != plugin_name)
+ strcpy (&addrp[plugin_addr_len], plugin_name);
+ nc = *GNUNET_SERVER_client_get_user_context (ai->client,
+ struct GNUNET_SERVER_NotificationContext *);
+ if (NULL == nc)
{
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
- "Received `%s' for unknown peer `%s' from client %p\n",
- "CHANGE PREFERENCE", GNUNET_i2s (peer), client);
+ GNUNET_break (0);
return;
}
-
- handle->env.sf.s_bulk_start (handle->solver);
- /* Tell normalization about change, normalization will call callback if preference changed */
- GAS_normalization_normalize_preference (client, peer, kind, score_abs);
- handle->env.sf.s_bulk_stop (handle->solver);
+ GNUNET_SERVER_notification_context_unicast (nc,
+ ai->client,
+ &msg->header,
+ GNUNET_NO);
}
-/**
- * Change the preference for a peer
- *
- * @param handle the address handle
- * @param application the client sending this request
- * @param peer the peer id
- * @param scope the time interval for this feedback: [now - scope .. now]
- * @param kind the preference kind to change
- * @param score_abs the new preference score
- */
-void
-GAS_addresses_preference_feedback (struct GAS_Addresses_Handle *handle,
- void *application, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_TIME_Relative scope,
- enum GNUNET_ATS_PreferenceKind kind, float score_abs)
-{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Received `%s' for peer `%s' for client %p\n", "PREFERENCE FEEDBACK",
- GNUNET_i2s (peer), application);
-
- if (GNUNET_NO == handle->running)
- return;
-
- if (GNUNET_NO ==
- GNUNET_CONTAINER_multipeermap_contains (handle->addresses,
- peer))
- {
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
- "Received `%s' for unknown peer `%s' from client %p\n",
- "PREFERENCE FEEDBACK", GNUNET_i2s (peer), application);
- return;
- }
-
- handle->env.sf.s_feedback (handle->solver, application, peer, scope, kind,
- score_abs);
-}
/**
- * Load quotas for networks from configuration
+ * Iterator for #GAS_addresses_get_peer_info(), called with peer-specific
+ * information to be passed back to the client.
*
- * @param cfg configuration handle
- * @param out_dest where to write outbound quotas
- * @param in_dest where to write inbound quotas
- * @param dest_length length of inbound and outbound arrays
- * @return number of networks loaded
- */
-static unsigned int
-load_quotas (const struct GNUNET_CONFIGURATION_Handle *cfg,
- unsigned long long *out_dest, unsigned long long *in_dest, int dest_length)
-{
- char *network_str[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkTypeString;
- char * entry_in = NULL;
- char * entry_out = NULL;
- char * quota_out_str;
- char * quota_in_str;
- int c;
- int res;
-
- for (c = 0; (c < GNUNET_ATS_NetworkTypeCount) && (c < dest_length); c++)
- {
- in_dest[c] = 0;
- out_dest[c] = 0;
- GNUNET_asprintf (&entry_out, "%s_QUOTA_OUT", network_str[c]);
- GNUNET_asprintf (&entry_in, "%s_QUOTA_IN", network_str[c]);
-
- /* quota out */
- if (GNUNET_OK
- == GNUNET_CONFIGURATION_get_value_string (cfg, "ats", entry_out,
- "a_out_str))
- {
- res = GNUNET_NO;
- if (0 == strcmp (quota_out_str, GNUNET_ATS_MaxBandwidthString))
- {
- out_dest[c] = GNUNET_ATS_MaxBandwidth;
- res = GNUNET_YES;
- }
- if ((GNUNET_NO == res)
- && (GNUNET_OK
- == GNUNET_STRINGS_fancy_size_to_bytes (quota_out_str,
- &out_dest[c])))
- res = GNUNET_YES;
- if ((GNUNET_NO == res)
- && (GNUNET_OK
- == GNUNET_CONFIGURATION_get_value_number (cfg, "ats", entry_out,
- &out_dest[c])))
- res = GNUNET_YES;
-
- if (GNUNET_NO == res)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- _("Could not load quota for network `%s': `%s', assigning default bandwidth %llu\n"),
- network_str[c], quota_out_str, GNUNET_ATS_DefaultBandwidth);
- out_dest[c] = GNUNET_ATS_DefaultBandwidth;
- }
- else
- {
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- _("Outbound quota configure for network `%s' is %llu\n"),
- network_str[c], out_dest[c]);
- }
- GNUNET_free(quota_out_str);
- }
- else
- {
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
- _("No outbound quota configured for network `%s', assigning default bandwidth %llu\n"),
- network_str[c], GNUNET_ATS_DefaultBandwidth);
- out_dest[c] = GNUNET_ATS_DefaultBandwidth;
- }
-
- /* quota in */
- if (GNUNET_OK
- == GNUNET_CONFIGURATION_get_value_string (cfg, "ats", entry_in,
- "a_in_str))
- {
- res = GNUNET_NO;
- if (0 == strcmp (quota_in_str, GNUNET_ATS_MaxBandwidthString))
- {
- in_dest[c] = GNUNET_ATS_MaxBandwidth;
- res = GNUNET_YES;
- }
- if ((GNUNET_NO == res)
- && (GNUNET_OK
- == GNUNET_STRINGS_fancy_size_to_bytes (quota_in_str, &in_dest[c])))
- res = GNUNET_YES;
- if ((GNUNET_NO == res)
- && (GNUNET_OK
- == GNUNET_CONFIGURATION_get_value_number (cfg, "ats", entry_in,
- &in_dest[c])))
- res = GNUNET_YES;
-
- if (GNUNET_NO == res)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- _("Could not load quota for network `%s': `%s', assigning default bandwidth %llu\n"),
- network_str[c], quota_in_str, GNUNET_ATS_DefaultBandwidth);
- in_dest[c] = GNUNET_ATS_DefaultBandwidth;
- }
- else
- {
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- _("Inbound quota configured for network `%s' is %llu\n"),
- network_str[c], in_dest[c]);
- }
- GNUNET_free(quota_in_str);
- }
- else
- {
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
- _("No outbound quota configure for network `%s', assigning default bandwidth %llu\n"),
- network_str[c], GNUNET_ATS_DefaultBandwidth);
- out_dest[c] = GNUNET_ATS_DefaultBandwidth;
- }
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Loaded quota for network `%s' (in/out): %llu %llu\n", network_str[c],
- in_dest[c], out_dest[c]);
- GNUNET_free(entry_out);
- GNUNET_free(entry_in);
- }
- return GNUNET_ATS_NetworkTypeCount;
-}
-
-/**
- * Callback for solver to notify about assignment changes
- *
- * @param cls the GAS_Addresses_Handle
- * @param address the address with changes
+ * @param cls closure with our `struct AddressIteration *`
+ * @param id the peer id
+ * @param plugin_name plugin name
+ * @param plugin_addr address
+ * @param plugin_addr_len length of @a plugin_addr
+ * @param active is address actively used
+ * @param atsi ats performance information
+ * @param atsi_count number of ats performance elements in @a atsi
+ * @param bandwidth_out current outbound bandwidth assigned to address
+ * @param bandwidth_in current inbound bandwidth assigned to address
*/
static void
-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));
-
- /* Notify performance clients about changes to address */
- GAS_performance_notify_all_clients (&address->peer, address->plugin,
- address->addr, address->addr_len, address->session_id, address->atsi,
- address->atsi_count, address->assigned_bw_out, address->assigned_bw_in);
- cur = handle->pending_requests_head;
- while (NULL != cur)
- {
- if (0 == memcmp (&address->peer, &cur->id, sizeof(cur->id)))
- break; /* we have an address request pending*/
- cur = cur->next;
- }
- if (NULL == cur)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Nobody is interested in peer `%s' :(\n",
- GNUNET_i2s (&address->peer));
- return;
- }
-
- if ((0 == ntohl (address->assigned_bw_in.value__))
- && (0 == ntohl (address->assigned_bw_out.value__)))
- {
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Telling transport to disconnect peer `%s'\n",
- GNUNET_i2s (&address->peer));
- }
- else
- {
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Sending bandwidth update for peer `%s': %llu %llu\n",
- GNUNET_i2s (&address->peer), address->assigned_bw_out,
- address->assigned_bw_out);
- }
-
- /* *Notify scheduling clients about suggestion */
- GAS_scheduling_transmit_address_suggestion (&address->peer, address->plugin,
- address->addr, address->addr_len, address->session_id, address->atsi,
- address->atsi_count, address->assigned_bw_out, address->assigned_bw_in);
-}
-
-/**
- * Initialize address subsystem. The addresses subsystem manages the addresses
- * known and current performance information. It has a solver component
- * responsible for the resource allocation. It tells the solver about changes
- * and receives updates when the solver changes the resource allocation.
- *
- * @param cfg configuration to use
- * @param stats the statistics handle to use
- * @return an address handle
- */
-struct GAS_Addresses_Handle *
-GAS_addresses_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
- const struct GNUNET_STATISTICS_Handle *stats)
+req_addr_peerinfo_it (void *cls,
+ const struct GNUNET_PeerIdentity *id,
+ const char *plugin_name,
+ const void *plugin_addr,
+ size_t plugin_addr_len,
+ int active,
+ const struct GNUNET_ATS_Information *atsi,
+ uint32_t atsi_count,
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
{
- struct GAS_Addresses_Handle *ah;
- unsigned long long quotas_in[GNUNET_ATS_NetworkTypeCount];
- unsigned long long quotas_out[GNUNET_ATS_NetworkTypeCount];
- char *mode_str;
- char *plugin_short;
- int c;
-
- ah = GNUNET_malloc (sizeof (struct GAS_Addresses_Handle));
- ah->running = GNUNET_NO;
-
- ah->stat = (struct GNUNET_STATISTICS_Handle *) stats;
- /* Initialize the addresses database */
- ah->addresses = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_NO);
- GNUNET_assert(NULL != ah->addresses);
-
- /* Figure out configured solution method */
- plugin_short = NULL;
- if (GNUNET_SYSERR
- == GNUNET_CONFIGURATION_get_value_string (cfg, "ats", "MODE", &mode_str))
- {
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
- "No resource assignment method configured, using proportional approach\n");
- ah->ats_mode = MODE_PROPORTIONAL;
- }
- else
- {
- for (c = 0; c < strlen (mode_str); c++)
- mode_str[c] = toupper (mode_str[c]);
- if (0 == strcmp (mode_str, "PROPORTIONAL"))
- {
- ah->ats_mode = MODE_PROPORTIONAL;
- plugin_short = "proportional";
- }
- else if (0 == strcmp (mode_str, "MLP"))
- {
- ah->ats_mode = MODE_MLP;
- plugin_short = "mlp";
-#if !HAVE_LIBGLPK
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "Assignment method `%s' configured, but GLPK is not available, please install \n",
- mode_str);
- ah->ats_mode = MODE_PROPORTIONAL;
- plugin_short = "proportional";
-#endif
- }
- else if (0 == strcmp (mode_str, "RIL"))
- {
- ah->ats_mode = MODE_RIL;
- plugin_short = "ril";
- }
- else
- {
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "Invalid resource assignment method `%s' configured, using proportional approach\n",
- mode_str);
- ah->ats_mode = MODE_PROPORTIONAL;
- plugin_short = "proportional";
- }
- GNUNET_free(mode_str);
- }
-
- load_quotas (cfg, quotas_in, quotas_out, GNUNET_ATS_NetworkTypeCount);
- ah->env.info_cb = &solver_info_cb;
- ah->env.info_cb_cls = ah;
- ah->env.bandwidth_changed_cb = &bandwidth_changed_cb;
- ah->env.bw_changed_cb_cls = ah;
- ah->env.get_preferences = &get_preferences_cb;
- ah->env.get_preference_cls = ah;
- ah->env.get_property = &get_property_cb;
- ah->env.get_property_cls = ah;
- ah->env.cfg = cfg;
- ah->env.stats = stats;
- ah->env.addresses = ah->addresses;
-
- ah->env.network_count = GNUNET_ATS_NetworkTypeCount;
- int networks[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkType;
- for (c = 0; c < GNUNET_ATS_NetworkTypeCount; c++)
- {
- ah->env.networks[c] = networks[c];
- ah->env.out_quota[c] = quotas_out[c];
- ah->env.in_quota[c] = quotas_in[c];
- }
+ struct AddressIteration *ai = cls;
- GNUNET_asprintf (&ah->plugin, "libgnunet_plugin_ats_%s", plugin_short);
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("Initializing solver `%s '`%s'\n"), plugin_short, ah->plugin);
- if (NULL == (ah->solver = GNUNET_PLUGIN_load (ah->plugin, &ah->env)))
+ if ( (NULL == id) &&
+ (NULL == plugin_name) &&
+ (NULL == plugin_addr) )
{
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR, _("Failed to initialize solver `%s'!\n"), ah->plugin);
- return NULL;
- }
-
- GNUNET_assert (NULL != ah->env.sf.s_add);
- GNUNET_assert (NULL != ah->env.sf.s_address_update_inuse);
- GNUNET_assert (NULL != ah->env.sf.s_address_update_property);
- GNUNET_assert (NULL != ah->env.sf.s_address_update_session);
- GNUNET_assert (NULL != ah->env.sf.s_address_update_network);
- GNUNET_assert (NULL != ah->env.sf.s_get);
- GNUNET_assert (NULL != ah->env.sf.s_get_stop);
- GNUNET_assert (NULL != ah->env.sf.s_pref);
- GNUNET_assert (NULL != ah->env.sf.s_feedback);
- GNUNET_assert (NULL != ah->env.sf.s_del);
- GNUNET_assert (NULL != ah->env.sf.s_bulk_start);
- GNUNET_assert (NULL != ah->env.sf.s_bulk_stop);
-
-
- GAS_normalization_start (&normalized_preference_changed_cb, ah,
- &normalized_property_changed_cb, ah);
-
- 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;
-
- GNUNET_STATISTICS_set (ah->stat, "# addresses",
- GNUNET_CONTAINER_multipeermap_size (ah->addresses), GNUNET_NO);
-
- return ah;
-}
-
-/**
- * Destroy all addresses iterator
- *
- * @param cls NULL
- * @param key peer identity (unused)
- * @param value the 'struct ATS_Address' to free
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-destroy_all_address_it (void *cls,
- const struct GNUNET_PeerIdentity *key,
- void *value)
-{
- struct GAS_Addresses_Handle *handle = cls;
- struct ATS_Address *aa = value;
-
- /* Remove */
- GNUNET_assert(GNUNET_YES ==
- GNUNET_CONTAINER_multipeermap_remove (handle->addresses, key, value));
- /* Notify */
- handle->env.sf.s_del (handle->solver, aa, GNUNET_NO);
- /* Destroy */
- free_address (aa);
-
- return GNUNET_OK;
-}
-
-
-/**
- * Remove all addresses
- *
- * @param handle the address handle to use
- */
-void
-GAS_addresses_destroy_all (struct GAS_Addresses_Handle *handle)
-{
- if (GNUNET_NO == handle->running)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Address iteration done for one peer\n");
return;
-
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Destroying all addresses\n");
- handle->env.sf.s_bulk_start (handle->solver);
- if (handle->addresses != NULL )
- GNUNET_CONTAINER_multipeermap_iterate (handle->addresses,
- &destroy_all_address_it,
- handle);
- handle->env.sf.s_bulk_start (handle->solver);
-}
-
-
-/**
- * Shutdown address subsystem.
- *
- * @param handle the address handle to shutdown
- */
-void
-GAS_addresses_done (struct GAS_Addresses_Handle *handle)
-{
- struct GAS_Addresses_Suggestion_Requests *cur;
-
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Shutting down addresses\n");
- GNUNET_assert(NULL != handle);
- GAS_addresses_destroy_all (handle);
- handle->running = GNUNET_NO;
- GNUNET_CONTAINER_multipeermap_destroy (handle->addresses);
- handle->addresses = NULL;
- while (NULL != (cur = handle->pending_requests_head))
- {
- GNUNET_CONTAINER_DLL_remove(handle->pending_requests_head, handle->pending_requests_tail, cur);
- GNUNET_free(cur);
}
-
- GNUNET_PLUGIN_unload (handle->plugin, handle->solver);
- GNUNET_free (handle->plugin);
- GNUNET_free(handle);
- /* Stop configured solution method */
- GAS_normalization_stop ();
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Callback for %s peer `%s' plugin `%s' BW out %u, BW in %u\n",
+ (active == GNUNET_YES) ? "ACTIVE" : "INACTIVE",
+ GNUNET_i2s (id),
+ plugin_name,
+ (unsigned int) ntohl (bandwidth_out.value__),
+ (unsigned int) ntohl (bandwidth_in.value__));
+ /* Transmit result (either if address is active, or if
+ client wanted all addresses) */
+ if ( (GNUNET_YES != ai->all) &&
+ (GNUNET_YES != active))
+ return;
+ transmit_req_addr (ai,
+ id,
+ plugin_name,
+ plugin_addr, plugin_addr_len,
+ active,
+ atsi,
+ atsi_count,
+ bandwidth_out,
+ bandwidth_in);
}
-struct PeerIteratorContext
-{
- GNUNET_ATS_Peer_Iterator it;
- void *it_cls;
- struct GNUNET_CONTAINER_MultiPeerMap *peers_returned;
-};
-
-
-/**
- * Iterator to iterate over all peers
- *
- * @param cls a PeerIteratorContext
- * @param key the peer id
- * @param value the ATS_address
- * @return #GNUNET_OK to continue
- */
-static int
-peer_it (void *cls,
- const struct GNUNET_PeerIdentity *key,
- void *value)
-{
- struct PeerIteratorContext *ip_ctx = cls;
-
- if (GNUNET_NO ==
- GNUNET_CONTAINER_multipeermap_contains (ip_ctx->peers_returned, key))
- {
- GNUNET_CONTAINER_multipeermap_put (ip_ctx->peers_returned, key, NULL,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
- ip_ctx->it (ip_ctx->it_cls, key);
- }
-
- return GNUNET_OK;
-}
-
/**
- * Return information all peers currently known to ATS
+ * Handle 'address list request' messages from clients.
*
- * @param handle the address handle to use
- * @param p_it the iterator to call for every peer
- * @param p_it_cls the closure for the iterator
+ * @param cls unused, NULL
+ * @param client client that sent the request
+ * @param message the request message
*/
void
-GAS_addresses_iterate_peers (struct GAS_Addresses_Handle *handle,
- GNUNET_ATS_Peer_Iterator p_it, void *p_it_cls)
+GAS_handle_request_address_list (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
{
- struct PeerIteratorContext ip_ctx;
- unsigned int size;
-
- if (NULL == p_it)
- return;
- GNUNET_assert(NULL != handle->addresses);
-
- size = GNUNET_CONTAINER_multipeermap_size (handle->addresses);
- if (0 != size)
+ struct AddressIteration ai;
+ const struct AddressListRequestMessage *alrm;
+ struct GNUNET_PeerIdentity allzeros;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received ADDRESSLIST_REQUEST message\n");
+ alrm = (const struct AddressListRequestMessage *) message;
+ ai.all = ntohl (alrm->all);
+ ai.id = ntohl (alrm->id);
+ ai.client = client;
+
+ memset (&allzeros,
+ '\0',
+ sizeof (struct GNUNET_PeerIdentity));
+ if (0 == memcmp (&alrm->peer,
+ &allzeros,
+ sizeof (struct GNUNET_PeerIdentity)))
{
- ip_ctx.it = p_it;
- ip_ctx.it_cls = p_it_cls;
- ip_ctx.peers_returned = GNUNET_CONTAINER_multipeermap_create (size,
- GNUNET_NO);
- GNUNET_CONTAINER_multipeermap_iterate (handle->addresses,
- &peer_it,
- &ip_ctx);
- GNUNET_CONTAINER_multipeermap_destroy (ip_ctx.peers_returned);
+ /* Return addresses for all peers */
+ GAS_addresses_get_peer_info (NULL,
+ &req_addr_peerinfo_it,
+ &ai);
}
- p_it (p_it_cls, NULL );
-}
-
-struct PeerInfoIteratorContext
-{
- GNUNET_ATS_PeerInfo_Iterator it;
- void *it_cls;
-};
-
-
-/**
- * Iterator to iterate over a peer's addresses
- *
- * @param cls a `struct PeerInfoIteratorContext`
- * @param key the peer id
- * @param value the `struct ATS_address`
- * @return #GNUNET_OK to continue
- */
-static int
-peerinfo_it (void *cls,
- const struct GNUNET_PeerIdentity *key,
- void *value)
-{
- struct PeerInfoIteratorContext *pi_ctx = cls;
- struct ATS_Address *addr = value;
-
- if (NULL != pi_ctx->it)
+ else
{
- pi_ctx->it (pi_ctx->it_cls, &addr->peer, addr->plugin, addr->addr,
- addr->addr_len, addr->active, addr->atsi, addr->atsi_count,
- addr->assigned_bw_out, addr->assigned_bw_in);
+ /* Return addresses for a specific peer */
+ GAS_addresses_get_peer_info (&alrm->peer,
+ &req_addr_peerinfo_it,
+ &ai);
}
- return GNUNET_YES;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Finished handling `%s' message\n",
+ "ADDRESSLIST_REQUEST");
+ transmit_req_addr (&ai,
+ NULL, NULL, NULL,
+ 0, GNUNET_NO,
+ NULL, 0,
+ GNUNET_BANDWIDTH_ZERO,
+ GNUNET_BANDWIDTH_ZERO);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
}
-/**
- * Return information all peers currently known to ATS
- *
- * @param handle the address handle to use
- * @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 (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;
-
- 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_multipeermap_get_multiple (handle->addresses,
- peer,
- &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);
-
-}
/* end of gnunet-service-ats_addresses.c */
projects / oweals / gnunet.git / blobdiff