aboutsummaryrefslogtreecommitdiff
path: root/src/ats
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2012-06-15 15:46:22 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2012-06-15 15:46:22 +0000
commitc7e1c3a7fa2e68c1710c9e7dd742bd4b6aa5caf3 (patch)
treef36645a0f81bc755ffca6a40c3d25d478f019a79 /src/ats
parentf54c9264d43001f34dc8aabf8e2fc31e440c3d30 (diff)
downloadgnunet-c7e1c3a7fa2e68c1710c9e7dd742bd4b6aa5caf3.tar.gz
gnunet-c7e1c3a7fa2e68c1710c9e7dd742bd4b6aa5caf3.zip
- fix
Diffstat (limited to 'src/ats')
-rw-r--r--src/ats/gnunet-service-ats_addresses.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index aedef817f..2a15d922f 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -276,12 +276,12 @@ find_address (const struct GNUNET_PeerIdentity *peer,
276 GNUNET_CONTAINER_multihashmap_get_multiple (addresses, &peer->hashPubKey, 276 GNUNET_CONTAINER_multihashmap_get_multiple (addresses, &peer->hashPubKey,
277 &compare_address_it, &cac); 277 &compare_address_it, &cac);
278 278
279/* 279#if 0
280 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 280 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
281 "exact address: %s base address: %s\n", 281 "exact address: %s base address: %s\n",
282 (cac.exact_address != NULL) ? "YES" : "NO", 282 (cac.exact_address != NULL) ? "YES" : "NO",
283 (cac.base_address != NULL) ? "YES" : "NO"); 283 (cac.base_address != NULL) ? "YES" : "NO");
284*/ 284#endif
285 if (cac.exact_address == NULL) 285 if (cac.exact_address == NULL)
286 return cac.base_address; 286 return cac.base_address;
287 return cac.exact_address; 287 return cac.exact_address;
@@ -317,7 +317,6 @@ lookup_address (const struct GNUNET_PeerIdentity *peer,
317 } 317 }
318 else if (old->session_id != session_id) 318 else if (old->session_id != session_id)
319 { 319 {
320
321 GNUNET_free (aa); 320 GNUNET_free (aa);
322 GNUNET_break (0); 321 GNUNET_break (0);
323 return NULL; 322 return NULL;
@@ -401,8 +400,8 @@ GAS_addresses_add (const struct GNUNET_PeerIdentity *peer,
401 GNUNET_CONTAINER_multihashmap_put (addresses, 400 GNUNET_CONTAINER_multihashmap_put (addresses,
402 &peer->hashPubKey, aa, 401 &peer->hashPubKey, aa,
403 GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE)); 402 GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
404 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Added new address for peer `%s' %p\n", 403 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Added new address for peer `%s' session id %u, %p\n",
405 GNUNET_i2s (peer), aa); 404 GNUNET_i2s (peer), session_id, aa);
406 return; 405 return;
407 } 406 }
408 407
@@ -447,7 +446,7 @@ GAS_addresses_update (const struct GNUNET_PeerIdentity *peer,
447 GNUNET_assert (NULL != addresses); 446 GNUNET_assert (NULL != addresses);
448 447
449 /* Get existing address */ 448 /* Get existing address */
450 old = lookup_address(peer, plugin_name, plugin_addr, plugin_addr_len, 449 old = lookup_address (peer, plugin_name, plugin_addr, plugin_addr_len,
451 session_id, atsi, atsi_count); 450 session_id, atsi, atsi_count);
452 if (old == NULL) 451 if (old == NULL)
453 { 452 {