diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2012-06-19 11:49:11 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-06-19 11:49:11 +0000 |
commit | 7774b6353e522384f3da3c2be065223d9447531b (patch) | |
tree | 91c8674c904596b7b5daea7ef6d016b787ff657b /src/ats | |
parent | 947168d67f19350dc5bdfcb3ad7ba7800539d2c8 (diff) | |
download | gnunet-7774b6353e522384f3da3c2be065223d9447531b.tar.gz gnunet-7774b6353e522384f3da3c2be065223d9447531b.zip |
- fix: addr is not NULLs
Diffstat (limited to 'src/ats')
-rw-r--r-- | src/ats/gnunet-service-ats_addresses.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c index 8667977e9..790c30e8c 100644 --- a/src/ats/gnunet-service-ats_addresses.c +++ b/src/ats/gnunet-service-ats_addresses.c | |||
@@ -224,6 +224,11 @@ compare_address_it (void *cls, const struct GNUNET_HashCode * key, void *value) | |||
224 | struct CompareAddressContext *cac = cls; | 224 | struct CompareAddressContext *cac = cls; |
225 | struct ATS_Address *aa = value; | 225 | struct ATS_Address *aa = value; |
226 | 226 | ||
227 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Comparing peer %4s: address length %u session %u <-> address length %u session %u\n", | ||
228 | GNUNET_h2s (key), | ||
229 | aa->addr_len, aa->session_id, | ||
230 | cac->search->addr_len, cac->search->session_id); | ||
231 | |||
227 | /* Find an matching exact address: | 232 | /* Find an matching exact address: |
228 | * | 233 | * |
229 | * Compare by: | 234 | * Compare by: |
@@ -264,7 +269,6 @@ compare_address_it (void *cls, const struct GNUNET_HashCode * key, void *value) | |||
264 | * Properties: | 269 | * Properties: |
265 | * | 270 | * |
266 | * cac->search->addr_len == 0 | 271 | * cac->search->addr_len == 0 |
267 | * cac->addr == NULL | ||
268 | * | 272 | * |
269 | * Compare by: | 273 | * Compare by: |
270 | * aa->plugin == cac->search->plugin | 274 | * aa->plugin == cac->search->plugin |
@@ -272,7 +276,7 @@ compare_address_it (void *cls, const struct GNUNET_HashCode * key, void *value) | |||
272 | * | 276 | * |
273 | * return as exact address | 277 | * return as exact address |
274 | */ | 278 | */ |
275 | if ((0 == cac->search->addr_len) && (NULL == cac->search->addr)) | 279 | if (0 == cac->search->addr_len) |
276 | { | 280 | { |
277 | if ((0 == strcmp (aa->plugin, cac->search->plugin)) && (aa->session_id == cac->search->session_id)) | 281 | if ((0 == strcmp (aa->plugin, cac->search->plugin)) && (aa->session_id == cac->search->session_id)) |
278 | cac->exact_address = aa; | 282 | cac->exact_address = aa; |
@@ -307,8 +311,8 @@ find_address (const struct GNUNET_PeerIdentity *peer, | |||
307 | &compare_address_it, &cac); | 311 | &compare_address_it, &cac); |
308 | 312 | ||
309 | #if 0 | 313 | #if 0 |
310 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 314 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
311 | "exact address: %s base address: %s\n", | 315 | "Found exact address: %s base address: %s\n", |
312 | (cac.exact_address != NULL) ? "YES" : "NO", | 316 | (cac.exact_address != NULL) ? "YES" : "NO", |
313 | (cac.base_address != NULL) ? "YES" : "NO"); | 317 | (cac.base_address != NULL) ? "YES" : "NO"); |
314 | #endif | 318 | #endif |
@@ -616,7 +620,7 @@ GAS_addresses_destroy (const struct GNUNET_PeerIdentity *peer, | |||
616 | return; | 620 | return; |
617 | 621 | ||
618 | /* Get existing address */ | 622 | /* Get existing address */ |
619 | old = lookup_address(peer, plugin_name, plugin_addr, plugin_addr_len, | 623 | old = lookup_address (peer, plugin_name, plugin_addr, plugin_addr_len, |
620 | session_id, NULL, 0); | 624 | session_id, NULL, 0); |
621 | if (old == NULL) | 625 | if (old == NULL) |
622 | { | 626 | { |