*/
unsigned long long wan_quota_out;
- /**
- * Number of active addresses
- */
- unsigned int active_addr_count;
-
/**
* Is ATS addresses running
*/
*/
GAS_solver_init s_init;
+ /**
+ * Add an address to the solver
+ */
+ GAS_solver_address_add s_add;
+
/**
* Update address in solver
*/
return ats_count;
}
+static unsigned int
+disassemble_ats_information (const struct GNUNET_ATS_Information *src,
+ uint32_t ats_count,
+ struct ATS_Address *dest)
+{
+ int i;
+ int res = 0;
+ for (i = 0; i < ats_count; i++)
+ switch (ntohl (src[i].type))
+ {
+ case GNUNET_ATS_UTILIZATION_UP:
+ dest->atsp_utilization_out.value__ = src[i].value;
+ res ++;
+ break;
+ case GNUNET_ATS_UTILIZATION_DOWN:
+ dest->atsp_utilization_in.value__ = src[i].value;
+ res ++;
+ break;
+ case GNUNET_ATS_QUALITY_NET_DELAY:
+ dest->atsp_latency.rel_value = ntohl (src[i].value);
+ res ++;
+ break;
+ case GNUNET_ATS_QUALITY_NET_DISTANCE:
+ dest->atsp_distance = ntohl (src[i].value);
+ res ++;
+ break;
+ case GNUNET_ATS_COST_WAN:
+ dest->atsp_cost_wan = ntohl (src[i].value);
+ res ++;
+ break;
+ case GNUNET_ATS_COST_LAN:
+ dest->atsp_cost_lan = ntohl (src[i].value);
+ res ++;
+ break;
+ case GNUNET_ATS_COST_WLAN:
+ dest->atsp_cost_wlan = ntohl (src[i].value);
+ res ++;
+ break;
+ case GNUNET_ATS_NETWORK_TYPE:
+ dest->atsp_network_type = ntohl (src[i].value);
+ res ++;
+ break;
+ case GNUNET_ATS_ARRAY_TERMINATOR:
+ break;
+ default:
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Received unsupported ATS type %u\n", ntohl (src[i].type));
+ GNUNET_break (0);
+ break;
+ }
+ return res;
+}
+
/**
* Free the given address
* @param addr address to destroy
static void
free_address (struct ATS_Address *addr)
{
- GNUNET_free_non_null (addr->ats);
GNUNET_free (addr->plugin);
GNUNET_free (addr);
}
memcpy (&aa[1], plugin_addr, plugin_addr_len);
aa->plugin = GNUNET_strdup (plugin_name);
aa->session_id = session_id;
+ aa->active = GNUNET_NO;
+ aa->mlp_information = NULL;
+ aa->assigned_bw_in = GNUNET_BANDWIDTH_value_init(0);
+ aa->assigned_bw_out = GNUNET_BANDWIDTH_value_init(0);
return aa;
}
&addr->peer.hashPubKey,
addr));
-#if HAVE_LIBGLPK
- if (handle->ats_mode == MODE_MLP)
- GAS_mlp_address_delete (handle->solver, handle->addresses, addr);
-#endif
-
- if (GNUNET_YES == addr->active)
- {
- handle->active_addr_count--;
- addr->active = GNUNET_NO;
- ret = GNUNET_YES;
- }
+ handle->s_del (handle->solver, handle->addresses, addr);
free_address (addr);
return ret;
}
struct CompareAddressContext *cac = cls;
struct ATS_Address *aa = value;
- 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:
GNUNET_CONTAINER_multihashmap_get_multiple (handle->addresses, &peer->hashPubKey,
&compare_address_it, &cac);
-#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;
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 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_add (const struct GNUNET_PeerIdentity *peer,
const char *plugin_name, const void *plugin_addr,
{
struct ATS_Address *aa;
struct ATS_Address *old;
+ unsigned int ats_res;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received `%s' for peer `%s'\n",
+ "ADDRESS ADD",
+ GNUNET_i2s (peer));
if (GNUNET_NO == handle->running)
return;
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));
+ if (atsi_count != (ats_res = disassemble_ats_information(atsi, atsi_count, aa)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "While adding address: had %u ATS elements to add, could only add %u\n",
+ atsi_count, ats_res);
+ }
/* Get existing address or address with session == 0 */
old = find_address (peer, aa);
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
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_add (handle->solver, handle->addresses, aa);
return;
}
- if (old->session_id == 0)
+ if (old->session_id != 0)
{
- /* We have a base address with out 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);
- return;
+ /* 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;
}
- /* 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);
+ /* 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);
+ old->session_id = session_id;
+ if (atsi_count != (ats_res = disassemble_ats_information(atsi, atsi_count, old)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "While updating address: had %u ATS elements to add, could only add %u\n",
+ atsi_count, ats_res);
+ }
+ GNUNET_free (aa->plugin);
+ GNUNET_free (aa);
+ handle->s_add (handle->solver, handle->addresses, old);
}
uint32_t atsi_count)
{
struct ATS_Address *old;
- uint32_t i;
+ uint32_t ats_res;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received `%s' for peer `%s'\n",
+ "ADDRESS UPDATE",
+ GNUNET_i2s (peer));
if (GNUNET_NO == handle->running)
return;
return;
}
- for (i = 0; i < atsi_count; i++)
- switch (ntohl (atsi[i].type))
- {
- case GNUNET_ATS_UTILIZATION_UP:
- old->atsp_utilization_out.value__ = atsi[i].value;
- break;
- case GNUNET_ATS_UTILIZATION_DOWN:
- old->atsp_utilization_in.value__ = atsi[i].value;
- break;
- case GNUNET_ATS_QUALITY_NET_DELAY:
- old->atsp_latency.rel_value = ntohl (atsi[i].value);
- break;
- case GNUNET_ATS_QUALITY_NET_DISTANCE:
- old->atsp_distance = ntohl (atsi[i].value);
- break;
- case GNUNET_ATS_COST_WAN:
- old->atsp_cost_wan = ntohl (atsi[i].value);
- break;
- case GNUNET_ATS_COST_LAN:
- old->atsp_cost_lan = ntohl (atsi[i].value);
- break;
- case GNUNET_ATS_COST_WLAN:
- old->atsp_cost_wlan = ntohl (atsi[i].value);
- break;
- case GNUNET_ATS_NETWORK_TYPE:
- old->atsp_network_type = ntohl (atsi[i].value);
- break;
-
- default:
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Received unsupported ATS type %u\n", ntohl (atsi[i].type));
- GNUNET_break (0);
- break;
- }
+ if (atsi_count != (ats_res = disassemble_ats_information (atsi, atsi_count, old)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "While adding address: had %u ATS elements to add, could only add %u\n",
+ atsi_count, ats_res);
+ }
/* Tell solver about update */
handle->s_update (handle->solver, handle->addresses, old);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Deleting address for peer `%s': `%s' %u\n",
GNUNET_i2s (&aa->peer), aa->plugin, aa->session_id);
- /*FIXME
- if (GNUNET_YES == destroy_address (aa))
- recalculate_assigned_bw (); */
+
+ destroy_address (aa);
+ // FIXME if (GNUNET_YES == destroy_address (aa))recalculate_assigned_bw ();
return GNUNET_OK;
}
/* session != 0, just remove session */
if (GNUNET_YES == aa->active)
{
aa->active = GNUNET_NO;
- handle->active_addr_count--;
//FIXME recalculate_assigned_bw ();
}
struct ATS_Address *aa;
struct ATS_Address *old;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received `%s' for peer `%s'\n",
+ "ADDRESS DESTROY",
+ GNUNET_i2s (peer));
+
if (GNUNET_NO == handle->running)
return;
return;
}
-
GNUNET_break (0 < strlen (plugin_name));
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);
}
const char *plugin_name, const void *plugin_addr,
size_t plugin_addr_len, uint32_t session_id, int in_use)
{
-#if DEBUG_ATS
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received `%s' message for peer `%s': %i\n", "ADDRESS_IN_USE",
- GNUNET_i2s (peer), in_use);
-#endif
-
struct ATS_Address *old;
+ 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;
GAS_addresses_request_address_cancel (const struct GNUNET_PeerIdentity *peer)
{
struct GAS_Addresses_Suggestion_Requests *cur = handle->r_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)))
if (NULL == cur)
{
- GNUNET_break (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "No address requests pending for peer `%s', cannot remove!\n", GNUNET_i2s (peer));
return;
}
+ GAS_addresses_handle_backoff_reset (peer);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Removed request pending for peer `%s\n", GNUNET_i2s (peer));
GNUNET_CONTAINER_DLL_remove (handle->r_head, handle->r_tail, cur);
GNUNET_free (cur);
}
GAS_addresses_request_address (const struct GNUNET_PeerIdentity *peer)
{
struct GAS_Addresses_Suggestion_Requests *cur = handle->r_head;
- const struct ATS_Address *aa;
+ struct ATS_Address *aa;
struct GNUNET_ATS_Information *ats;
unsigned int ats_count;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received `%s' for peer `%s'\n",
+ "REQUEST ADDRESS",
+ GNUNET_i2s (peer));
+
if (GNUNET_NO == handle->running)
return;
while (NULL != cur)
}
/* Get prefered address from solver */
- aa = handle->s_get (handle->solver, handle->addresses, peer);
+ aa = (struct ATS_Address *) 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));
+ return;
+ }
+
+ 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,
ats, ats_count,
aa->assigned_bw_out,
aa->assigned_bw_in);
- GNUNET_free (ats);
+ 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_free (ats);
}
void
GAS_addresses_handle_backoff_reset (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_multihashmap_get_multiple (handle->addresses,
&peer->hashPubKey,
&reset_address_it,
enum GNUNET_ATS_PreferenceKind kind,
float score)
{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received `%s' for peer `%s'\n",
+ "CHANGE PREFERENCE",
+ GNUNET_i2s (peer));
+
if (GNUNET_NO == handle->running)
return;
}
+static void
+bandwidth_changed_cb (struct ATS_Address *address)
+{
+ struct GAS_Addresses_Suggestion_Requests *cur;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Bandwidth assignment changed for peer %s \n", GNUNET_i2s(&address->peer));
+ struct GNUNET_ATS_Information *ats;
+ unsigned int ats_count;
+
+ cur = handle->r_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_DEBUG,
+ "Nobody is interested in peer `%s' :(\n",GNUNET_i2s (&address->peer));
+ return;
+ }
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending bandwidth update for peer `%s'\n",GNUNET_i2s (&address->peer));
+
+ ats_count = assemble_ats_information (address, &ats);
+ GAS_scheduling_transmit_address_suggestion (&address->peer,
+ address->plugin,
+ address->addr, address->addr_len,
+ address->session_id,
+ ats, ats_count,
+ address->assigned_bw_out,
+ address->assigned_bw_in);
+}
+
/**
* Initialize address subsystem.
#if HAVE_LIBGLPK
ah->ats_mode = MODE_MLP;
ah->s_init = &GAS_mlp_init;
+ ah->s_add = &GAS_mlp_address_add;
ah->s_update = &GAS_mlp_address_update;
ah->s_get = &GAS_mlp_get_preferred_address;
ah->s_pref = &GAS_mlp_address_change_preference;
/* Init the simplistic solver with default values */
ah->ats_mode = MODE_SIMPLISTIC;
ah->s_init = &GAS_simplistic_init;
+ ah->s_add = &GAS_simplistic_address_add;
ah->s_update = &GAS_simplistic_address_update;
ah->s_get = &GAS_simplistic_get_preferred_address;
ah->s_pref = &GAS_simplistic_address_change_preference;
}
GNUNET_assert (NULL != ah->s_init);
+ GNUNET_assert (NULL != ah->s_add);
GNUNET_assert (NULL != ah->s_update);
GNUNET_assert (NULL != ah->s_get);
GNUNET_assert (NULL != ah->s_pref);
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);
+ ah->solver = ah->s_init (cfg, stats, quotas, quotas_in, quotas_out, quota_count, &bandwidth_changed_cb);
if (NULL == ah->solver)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to initialize solver!\n");
if (handle->addresses != NULL)
GNUNET_CONTAINER_multihashmap_iterate (handle->addresses, &free_address_it, NULL);
- GNUNET_assert (handle->active_addr_count == 0);
}
{
struct GAS_Addresses_Suggestion_Requests *cur;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Shutting down addresses\n");
GNUNET_assert (NULL != handle);
GAS_addresses_destroy_all ();
handle->running = GNUNET_NO;
GNUNET_CONTAINER_DLL_remove (handle->r_head, handle->r_tail, cur);
GNUNET_free (cur);
}
-
+ handle->s_done (handle->solver);
GNUNET_free (handle);
/* Stop configured solution method */
projects / oweals / gnunet.git / blobdiff