diff options
Diffstat (limited to 'src/ats/gnunet-service-ats_addresses.c')
-rw-r--r-- | src/ats/gnunet-service-ats_addresses.c | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c index ff4222780..c471a70f9 100644 --- a/src/ats/gnunet-service-ats_addresses.c +++ b/src/ats/gnunet-service-ats_addresses.c | |||
@@ -35,8 +35,6 @@ | |||
35 | #include "gnunet-service-ats_addresses_mlp.h" | 35 | #include "gnunet-service-ats_addresses_mlp.h" |
36 | #endif | 36 | #endif |
37 | 37 | ||
38 | #define VERBOSE GNUNET_NO | ||
39 | |||
40 | #define ATS_BLOCKING_DELTA GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 100) | 38 | #define ATS_BLOCKING_DELTA GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 100) |
41 | 39 | ||
42 | enum ATS_Mode | 40 | enum ATS_Mode |
@@ -356,6 +354,8 @@ lookup_address (const struct GNUNET_PeerIdentity *peer, | |||
356 | return old; | 354 | return old; |
357 | } | 355 | } |
358 | 356 | ||
357 | |||
358 | #if DEADCODE | ||
359 | static int | 359 | static int |
360 | compare_address_session_it (void *cls, const struct GNUNET_HashCode * key, void *value) | 360 | compare_address_session_it (void *cls, const struct GNUNET_HashCode * key, void *value) |
361 | { | 361 | { |
@@ -383,7 +383,7 @@ compare_address_session_it (void *cls, const struct GNUNET_HashCode * key, void | |||
383 | * @param addr existing address record | 383 | * @param addr existing address record |
384 | * @return existing address record, NULL for none | 384 | * @return existing address record, NULL for none |
385 | */ | 385 | */ |
386 | struct ATS_Address * | 386 | static struct ATS_Address * |
387 | find_exact_address (const struct GNUNET_PeerIdentity *peer, | 387 | find_exact_address (const struct GNUNET_PeerIdentity *peer, |
388 | const struct ATS_Address *addr) | 388 | const struct ATS_Address *addr) |
389 | { | 389 | { |
@@ -395,6 +395,7 @@ find_exact_address (const struct GNUNET_PeerIdentity *peer, | |||
395 | &compare_address_session_it, &cac); | 395 | &compare_address_session_it, &cac); |
396 | return cac.exact_address; | 396 | return cac.exact_address; |
397 | } | 397 | } |
398 | #endif | ||
398 | 399 | ||
399 | 400 | ||
400 | void | 401 | void |
@@ -569,11 +570,9 @@ destroy_by_session_id (void *cls, const struct GNUNET_HashCode * key, void *valu | |||
569 | if (aa->session_id != 0) | 570 | if (aa->session_id != 0) |
570 | GNUNET_break (0 == strcmp (info->plugin, aa->plugin)); | 571 | GNUNET_break (0 == strcmp (info->plugin, aa->plugin)); |
571 | /* session died */ | 572 | /* session died */ |
572 | #if VERBOSE | ||
573 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 573 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
574 | "Deleting session for peer `%s': `%s' %u\n", | 574 | "Deleting session for peer `%s': `%s' %u\n", |
575 | GNUNET_i2s (&aa->peer), aa->plugin, aa->session_id); | 575 | GNUNET_i2s (&aa->peer), aa->plugin, aa->session_id); |
576 | #endif | ||
577 | aa->session_id = 0; | 576 | aa->session_id = 0; |
578 | 577 | ||
579 | if (GNUNET_YES == aa->active) | 578 | if (GNUNET_YES == aa->active) |
@@ -586,11 +585,9 @@ destroy_by_session_id (void *cls, const struct GNUNET_HashCode * key, void *valu | |||
586 | /* session == 0 and addrlen == 0 : destroy address */ | 585 | /* session == 0 and addrlen == 0 : destroy address */ |
587 | if (aa->addr_len == 0) | 586 | if (aa->addr_len == 0) |
588 | { | 587 | { |
589 | #if VERBOSE | ||
590 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 588 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
591 | "Deleting session and address for peer `%s': `%s' %u\n", | 589 | "Deleting session and address for peer `%s': `%s' %u\n", |
592 | GNUNET_i2s (&aa->peer), aa->plugin, aa->session_id); | 590 | GNUNET_i2s (&aa->peer), aa->plugin, aa->session_id); |
593 | #endif | ||
594 | (void) destroy_address (aa); | 591 | (void) destroy_address (aa); |
595 | } | 592 | } |
596 | else | 593 | else |
@@ -605,6 +602,7 @@ destroy_by_session_id (void *cls, const struct GNUNET_HashCode * key, void *valu | |||
605 | return GNUNET_OK; | 602 | return GNUNET_OK; |
606 | } | 603 | } |
607 | 604 | ||
605 | |||
608 | void | 606 | void |
609 | GAS_addresses_destroy (const struct GNUNET_PeerIdentity *peer, | 607 | GAS_addresses_destroy (const struct GNUNET_PeerIdentity *peer, |
610 | const char *plugin_name, const void *plugin_addr, | 608 | const char *plugin_name, const void *plugin_addr, |
@@ -773,7 +771,8 @@ GAS_addresses_in_use (const struct GNUNET_PeerIdentity *peer, | |||
773 | } | 771 | } |
774 | 772 | ||
775 | 773 | ||
776 | void request_address_mlp (const struct GNUNET_PeerIdentity *peer) | 774 | static void |
775 | request_address_mlp (const struct GNUNET_PeerIdentity *peer) | ||
777 | { | 776 | { |
778 | struct ATS_Address *aa; | 777 | struct ATS_Address *aa; |
779 | aa = NULL; | 778 | aa = NULL; |
@@ -815,7 +814,9 @@ void request_address_mlp (const struct GNUNET_PeerIdentity *peer) | |||
815 | 814 | ||
816 | } | 815 | } |
817 | 816 | ||
818 | void request_address_simple (const struct GNUNET_PeerIdentity *peer) | 817 | |
818 | static void | ||
819 | request_address_simple (const struct GNUNET_PeerIdentity *peer) | ||
819 | { | 820 | { |
820 | struct ATS_Address *aa; | 821 | struct ATS_Address *aa; |
821 | aa = NULL; | 822 | aa = NULL; |
@@ -884,6 +885,7 @@ reset_address_it (void *cls, const struct GNUNET_HashCode * key, void *value) | |||
884 | return GNUNET_OK; | 885 | return GNUNET_OK; |
885 | } | 886 | } |
886 | 887 | ||
888 | |||
887 | void | 889 | void |
888 | GAS_addresses_handle_backoff_reset (const struct GNUNET_PeerIdentity *peer) | 890 | GAS_addresses_handle_backoff_reset (const struct GNUNET_PeerIdentity *peer) |
889 | { | 891 | { |
@@ -1112,9 +1114,11 @@ struct PeerInfoIteratorContext | |||
1112 | void *it_cls; | 1114 | void *it_cls; |
1113 | }; | 1115 | }; |
1114 | 1116 | ||
1115 | int peerinfo_it (void *cls, | 1117 | |
1116 | const struct GNUNET_HashCode * key, | 1118 | static int |
1117 | void *value) | 1119 | peerinfo_it (void *cls, |
1120 | const struct GNUNET_HashCode * key, | ||
1121 | void *value) | ||
1118 | { | 1122 | { |
1119 | struct PeerInfoIteratorContext *pi_ctx = cls; | 1123 | struct PeerInfoIteratorContext *pi_ctx = cls; |
1120 | struct ATS_Address *addr = (struct ATS_Address *) value; | 1124 | struct ATS_Address *addr = (struct ATS_Address *) value; |
@@ -1130,6 +1134,7 @@ int peerinfo_it (void *cls, | |||
1130 | return GNUNET_YES; | 1134 | return GNUNET_YES; |
1131 | } | 1135 | } |
1132 | 1136 | ||
1137 | |||
1133 | /** | 1138 | /** |
1134 | * Return all peers currently known to ATS | 1139 | * Return all peers currently known to ATS |
1135 | * | 1140 | * |