X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fats%2Fgnunet-service-ats_addresses.c;h=b94a7165624726a85d3996ebb1efa54e6593662f;hb=e8bc9fe72894972f3280eed7cdb0e1994188ff38;hp=d92f600bbfd27ae3f6c2a547cfc0bdc173472789;hpb=c3bf7a364a9dac82d17631f2f2fd71353df5bb2e;p=oweals%2Fgnunet.git diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c index d92f600bb..b94a71656 100644 --- a/src/ats/gnunet-service-ats_addresses.c +++ b/src/ats/gnunet-service-ats_addresses.c @@ -123,6 +123,11 @@ struct GAS_Addresses_Handle */ GAS_solver_init s_init; + /** + * Add an address to the solver + */ + GAS_solver_address_add s_add; + /** * Update address in solver */ @@ -182,6 +187,61 @@ assemble_ats_information (const struct ATS_Address *aa, struct GNUNET_ATS_Infor 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: + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Old ATS type %u %u\n", dest->atsp_distance, ntohl (src[i].type)); + 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 @@ -189,7 +249,6 @@ assemble_ats_information (const struct ATS_Address *aa, struct GNUNET_ATS_Infor static void free_address (struct ATS_Address *addr) { - GNUNET_free_non_null (addr->ats); GNUNET_free (addr->plugin); GNUNET_free (addr); } @@ -218,6 +277,10 @@ create_address (const struct GNUNET_PeerIdentity *peer, memcpy (&aa[1], plugin_addr, plugin_addr_len); aa->plugin = GNUNET_strdup (plugin_name); aa->session_id = session_id; + aa->active = GNUNET_NO; + aa->solver_information = NULL; + aa->assigned_bw_in = GNUNET_BANDWIDTH_value_init(0); + aa->assigned_bw_out = GNUNET_BANDWIDTH_value_init(0); return aa; } @@ -262,11 +325,6 @@ compare_address_it (void *cls, const struct GNUNET_HashCode * key, void *value) 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: @@ -348,12 +406,6 @@ find_address (const struct GNUNET_PeerIdentity *peer, 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; @@ -375,11 +427,6 @@ lookup_address (const struct GNUNET_PeerIdentity *peer, 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); @@ -395,48 +442,6 @@ lookup_address (const struct GNUNET_PeerIdentity *peer, } -#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, @@ -446,6 +451,12 @@ GAS_addresses_add (const struct GNUNET_PeerIdentity *peer, { 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; @@ -456,10 +467,12 @@ GAS_addresses_add (const struct GNUNET_PeerIdentity *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)); + 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); @@ -472,10 +485,12 @@ GAS_addresses_add (const struct GNUNET_PeerIdentity *peer, 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_update (handle->solver, handle->addresses, aa); + /* Tell solver about new address */ + handle->s_add (handle->solver, handle->addresses, aa); return; } + GNUNET_free (aa->plugin); + GNUNET_free (aa); if (old->session_id != 0) { @@ -491,14 +506,14 @@ GAS_addresses_add (const struct GNUNET_PeerIdentity *peer, 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); + 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); + } + handle->s_update (handle->solver, handle->addresses, old); } @@ -510,8 +525,8 @@ GAS_addresses_update (const struct GNUNET_PeerIdentity *peer, const struct GNUNET_ATS_Information *atsi, uint32_t atsi_count) { - struct ATS_Address *old; - uint32_t i; + struct ATS_Address *aa; + uint32_t ats_res; if (GNUNET_NO == handle->running) return; @@ -519,9 +534,9 @@ GAS_addresses_update (const struct GNUNET_PeerIdentity *peer, GNUNET_assert (NULL != handle->addresses); /* Get existing address */ - old = lookup_address (peer, plugin_name, plugin_addr, plugin_addr_len, + aa = lookup_address (peer, plugin_name, plugin_addr, plugin_addr_len, session_id, atsi, atsi_count); - if (old == NULL) + if (aa == 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); @@ -529,42 +544,23 @@ GAS_addresses_update (const struct GNUNET_PeerIdentity *peer, 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; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Received `%s' for peer `%s' address \n", + "ADDRESS UPDATE", + GNUNET_i2s (peer), aa); + + 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); + } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Updated %u ATS elements for address %p\n", + ats_res, aa); - 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); + handle->s_update (handle->solver, handle->addresses, aa); } @@ -649,6 +645,11 @@ GAS_addresses_destroy (const struct GNUNET_PeerIdentity *peer, 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; @@ -675,14 +676,13 @@ GAS_addresses_in_use (const struct GNUNET_PeerIdentity *peer, const char *plugin_name, const void *plugin_addr, size_t plugin_addr_len, uint32_t session_id, int in_use) { -#if DEBUG_ATS - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received `%s' message for peer `%s': %i\n", "ADDRESS_IN_USE", - GNUNET_i2s (peer), in_use); -#endif - struct ATS_Address *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; @@ -759,10 +759,15 @@ void 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) @@ -779,25 +784,34 @@ GAS_addresses_request_address (const struct GNUNET_PeerIdentity *peer) } /* 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)); - - 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); + "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)); + + 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); + + 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); } @@ -819,6 +833,11 @@ reset_address_it (void *cls, const struct GNUNET_HashCode * key, void *value) 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, @@ -831,6 +850,11 @@ GAS_addresses_change_preference (const struct GNUNET_PeerIdentity *peer, 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; @@ -920,6 +944,42 @@ load_quotas (const struct GNUNET_CONFIGURATION_Handle *cfg, unsigned long long * } +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); + GNUNET_free (ats); +} + /** * Initialize address subsystem. @@ -984,6 +1044,7 @@ GAS_addresses_init (const struct GNUNET_CONFIGURATION_Handle *cfg, #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; @@ -998,6 +1059,7 @@ GAS_addresses_init (const struct GNUNET_CONFIGURATION_Handle *cfg, /* 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; @@ -1011,6 +1073,7 @@ GAS_addresses_init (const struct GNUNET_CONFIGURATION_Handle *cfg, } 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); @@ -1019,7 +1082,7 @@ GAS_addresses_init (const struct GNUNET_CONFIGURATION_Handle *cfg, 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"); @@ -1070,6 +1133,8 @@ GAS_addresses_done (struct GAS_Addresses_Handle *handle) { 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; @@ -1080,7 +1145,7 @@ GAS_addresses_done (struct GAS_Addresses_Handle *handle) 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 */