aboutsummaryrefslogtreecommitdiff
path: root/src/ats/gnunet-service-ats_addresses.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/ats/gnunet-service-ats_addresses.c')
-rw-r--r--src/ats/gnunet-service-ats_addresses.c43
1 files changed, 18 insertions, 25 deletions
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index 04eacbbb1..e9f7539be 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -305,26 +305,22 @@ destroy_by_session_id (void *cls, const GNUNET_HashCode * key, void *value)
305 const struct ATS_Address *info = cls; 305 const struct ATS_Address *info = cls;
306 struct ATS_Address *aa = value; 306 struct ATS_Address *aa = value;
307 307
308 GNUNET_assert (0 == memcmp (&aa->peer, 308 GNUNET_assert (0 ==
309 &info->peer, 309 memcmp (&aa->peer, &info->peer,
310 sizeof (struct GNUNET_PeerIdentity))); 310 sizeof (struct GNUNET_PeerIdentity)));
311 if ( (info->session_id == 0) && 311 if ((info->session_id == 0) && (0 == strcmp (info->plugin, aa->plugin)) &&
312 (0 == strcmp (info->plugin, 312 (aa->addr_len == info->addr_len) &&
313 aa->plugin)) && 313 (0 == memcmp (info->addr, aa->addr, aa->addr_len)))
314 (aa->addr_len == info->addr_len) &&
315 (0 == memcmp (info->addr,
316 aa->addr,
317 aa->addr_len)) )
318 { 314 {
319 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 315 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
320 "Deleting address for peer `%s': `%s'\n", 316 "Deleting address for peer `%s': `%s'\n",
321 GNUNET_i2s (&aa->peer), aa->plugin); 317 GNUNET_i2s (&aa->peer), aa->plugin);
322 if (GNUNET_YES == destroy_address (aa)) 318 if (GNUNET_YES == destroy_address (aa))
323 recalculate_assigned_bw (); 319 recalculate_assigned_bw ();
324 return GNUNET_OK; 320 return GNUNET_OK;
325 } 321 }
326 if (aa->session_id != info->session_id) 322 if (aa->session_id != info->session_id)
327 return GNUNET_OK; /* irrelevant */ 323 return GNUNET_OK; /* irrelevant */
328 if (aa->session_id != 0) 324 if (aa->session_id != 0)
329 GNUNET_break (0 == strcmp (info->plugin, aa->plugin)); 325 GNUNET_break (0 == strcmp (info->plugin, aa->plugin));
330 /* session died */ 326 /* session died */
@@ -358,10 +354,8 @@ GAS_addresses_destroy (const struct GNUNET_PeerIdentity *peer,
358 aa.addr = plugin_addr; 354 aa.addr = plugin_addr;
359 aa.plugin = (char *) plugin_name; 355 aa.plugin = (char *) plugin_name;
360 aa.session_id = session_id; 356 aa.session_id = session_id;
361 GNUNET_CONTAINER_multihashmap_get_multiple (addresses, 357 GNUNET_CONTAINER_multihashmap_get_multiple (addresses, &peer->hashPubKey,
362 &peer->hashPubKey, 358 &destroy_by_session_id, &aa);
363 &destroy_by_session_id,
364 &aa);
365} 359}
366 360
367 361
@@ -414,12 +408,11 @@ find_address_it (void *cls, const GNUNET_HashCode * key, void *value)
414void 408void
415GAS_addresses_in_use (const struct GNUNET_PeerIdentity *peer, 409GAS_addresses_in_use (const struct GNUNET_PeerIdentity *peer,
416 const char *plugin_name, const void *plugin_addr, 410 const char *plugin_name, const void *plugin_addr,
417 size_t plugin_addr_len, uint32_t session_id, 411 size_t plugin_addr_len, uint32_t session_id, int in_use)
418 int in_use)
419{ 412{
420 413
421 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message for peer `%s': %i\n", 414 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
422 "ADDRESS_IN_USE", 415 "Received `%s' message for peer `%s': %i\n", "ADDRESS_IN_USE",
423 GNUNET_i2s (peer), in_use); 416 GNUNET_i2s (peer), in_use);
424} 417}
425 418
@@ -476,12 +469,12 @@ GAS_addresses_init (const struct GNUNET_CONFIGURATION_Handle *cfg)
476{ 469{
477 GNUNET_assert (GNUNET_OK == 470 GNUNET_assert (GNUNET_OK ==
478 GNUNET_CONFIGURATION_get_value_size (cfg, "ats", 471 GNUNET_CONFIGURATION_get_value_size (cfg, "ats",
479 "WAN_QUOTA_IN", 472 "WAN_QUOTA_IN",
480 &wan_quota_in)); 473 &wan_quota_in));
481 GNUNET_assert (GNUNET_OK == 474 GNUNET_assert (GNUNET_OK ==
482 GNUNET_CONFIGURATION_get_value_size (cfg, "ats", 475 GNUNET_CONFIGURATION_get_value_size (cfg, "ats",
483 "WAN_QUOTA_OUT", 476 "WAN_QUOTA_OUT",
484 &wan_quota_out)); 477 &wan_quota_out));
485 addresses = GNUNET_CONTAINER_multihashmap_create (128); 478 addresses = GNUNET_CONTAINER_multihashmap_create (128);
486} 479}
487 480