diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2011-10-27 20:46:53 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2011-10-27 20:46:53 +0000 |
commit | 09a63a3364184a2ce01ca2ad954fc371634e9d3d (patch) | |
tree | 2440d59a78e3badbb6a46e1442c6c9b6b3f97885 /src | |
parent | 83a2993fd05ff8bff76b7aaf36a61a86983713db (diff) | |
download | gnunet-09a63a3364184a2ce01ca2ad954fc371634e9d3d.tar.gz gnunet-09a63a3364184a2ce01ca2ad954fc371634e9d3d.zip |
I do not like the idea of guessing the responsiveness a service
Diffstat (limited to 'src')
-rw-r--r-- | src/transport/gnunet-service-transport_neighbours_3way.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/transport/gnunet-service-transport_neighbours_3way.c b/src/transport/gnunet-service-transport_neighbours_3way.c index e7c630153..db1d643f9 100644 --- a/src/transport/gnunet-service-transport_neighbours_3way.c +++ b/src/transport/gnunet-service-transport_neighbours_3way.c | |||
@@ -56,6 +56,8 @@ | |||
56 | #define KEEPALIVE_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 90) | 56 | #define KEEPALIVE_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 90) |
57 | 57 | ||
58 | 58 | ||
59 | #define ATS_RESPONSE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 3) | ||
60 | |||
59 | /** | 61 | /** |
60 | * Entry in neighbours. | 62 | * Entry in neighbours. |
61 | */ | 63 | */ |
@@ -895,7 +897,7 @@ ats_suggest_cancel (void *cls, | |||
895 | 897 | ||
896 | n->ats_suggest = GNUNET_SCHEDULER_NO_TASK; | 898 | n->ats_suggest = GNUNET_SCHEDULER_NO_TASK; |
897 | 899 | ||
898 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 900 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
899 | " ATS did not suggested address to connect to peer `%s'\n", | 901 | " ATS did not suggested address to connect to peer `%s'\n", |
900 | GNUNET_i2s (&n->id)); | 902 | GNUNET_i2s (&n->id)); |
901 | 903 | ||
@@ -962,9 +964,9 @@ send_connect_continuation (void *cls, | |||
962 | n->addrlen, | 964 | n->addrlen, |
963 | NULL); | 965 | NULL); |
964 | 966 | ||
965 | if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK) | 967 | if (n(ATS_RESPONSE_TIMEOUT, at_suggest != GNUNET_SCHEDULER_NO_TASK) |
966 | GNUNET_SCHEDULER_cancel(n->ats_suggest); | 968 | GNUNET_SCHEDULER_cancel(n->ats_suggest); |
967 | n->ats_suggest = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, ats_suggest_cancel, n); | 969 | n->ats_suggest = GNUNET_SCHEDULER_add_delayed delayed (ATS_RESPONSE_TIMEOUT, ats_suggest_cancel, n); |
968 | GNUNET_ATS_suggest_address(GST_ats, &n->id); | 970 | GNUNET_ATS_suggest_address(GST_ats, &n->id); |
969 | return; | 971 | return; |
970 | } | 972 | } |
@@ -1013,7 +1015,7 @@ send_switch_address_continuation (void *cls, | |||
1013 | 1015 | ||
1014 | if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK) | 1016 | if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK) |
1015 | GNUNET_SCHEDULER_cancel(n->ats_suggest); | 1017 | GNUNET_SCHEDULER_cancel(n->ats_suggest); |
1016 | n->ats_suggest = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, ats_suggest_cancel, n); | 1018 | n->ats_suggest = GNUNET_SCHEDULER_add_delayed (ATS_RESPONSE_TIMEOUT, ats_suggest_cancel, n); |
1017 | GNUNET_ATS_suggest_address(GST_ats, &n->id); | 1019 | GNUNET_ATS_suggest_address(GST_ats, &n->id); |
1018 | return; | 1020 | return; |
1019 | } | 1021 | } |
@@ -1061,7 +1063,7 @@ send_connect_ack_continuation (void *cls, | |||
1061 | 1063 | ||
1062 | if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK) | 1064 | if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK) |
1063 | GNUNET_SCHEDULER_cancel(n->ats_suggest); | 1065 | GNUNET_SCHEDULER_cancel(n->ats_suggest); |
1064 | n->ats_suggest = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, ats_suggest_cancel, n); | 1066 | n->ats_suggest = GNUNET_SCHEDULER_add_delayed (ATS_RESPONSE_TIMEOUT, ats_suggest_cancel, n); |
1065 | GNUNET_ATS_suggest_address(GST_ats, &n->id); | 1067 | GNUNET_ATS_suggest_address(GST_ats, &n->id); |
1066 | } | 1068 | } |
1067 | 1069 | ||
@@ -1287,7 +1289,7 @@ GST_neighbours_try_connect (const struct GNUNET_PeerIdentity *target) | |||
1287 | 1289 | ||
1288 | if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK) | 1290 | if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK) |
1289 | GNUNET_SCHEDULER_cancel(n->ats_suggest); | 1291 | GNUNET_SCHEDULER_cancel(n->ats_suggest); |
1290 | n->ats_suggest = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, ats_suggest_cancel, n); | 1292 | n->ats_suggest = GNUNET_SCHEDULER_add_delayed (ATS_RESPONSE_TIMEOUT, ats_suggest_cancel, n); |
1291 | GNUNET_ATS_suggest_address (GST_ats, &n->id); | 1293 | GNUNET_ATS_suggest_address (GST_ats, &n->id); |
1292 | } | 1294 | } |
1293 | 1295 | ||
@@ -1355,7 +1357,7 @@ GST_neighbours_session_terminated (const struct GNUNET_PeerIdentity *peer, | |||
1355 | /* try QUICKLY to re-establish a connection, reduce timeout! */ | 1357 | /* try QUICKLY to re-establish a connection, reduce timeout! */ |
1356 | if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK) | 1358 | if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK) |
1357 | GNUNET_SCHEDULER_cancel(n->ats_suggest); | 1359 | GNUNET_SCHEDULER_cancel(n->ats_suggest); |
1358 | n->ats_suggest = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, ats_suggest_cancel, n); | 1360 | n->ats_suggest = GNUNET_SCHEDULER_add_delayed (ATS_RESPONSE_TIMEOUT, ats_suggest_cancel, n); |
1359 | GNUNET_ATS_suggest_address (GST_ats, peer); | 1361 | GNUNET_ATS_suggest_address (GST_ats, peer); |
1360 | } | 1362 | } |
1361 | 1363 | ||
@@ -2020,7 +2022,7 @@ handle_connect_blacklist_cont (void *cls, | |||
2020 | /* Ask ATS for an address to connect via that address */ | 2022 | /* Ask ATS for an address to connect via that address */ |
2021 | if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK) | 2023 | if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK) |
2022 | GNUNET_SCHEDULER_cancel(n->ats_suggest); | 2024 | GNUNET_SCHEDULER_cancel(n->ats_suggest); |
2023 | n->ats_suggest = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, ats_suggest_cancel, n); | 2025 | n->ats_suggest = GNUNET_SCHEDULER_add_delayed (ATS_RESPONSE_TIMEOUT, ats_suggest_cancel, n); |
2024 | GNUNET_ATS_suggest_address(GST_ats, peer); | 2026 | GNUNET_ATS_suggest_address(GST_ats, peer); |
2025 | } | 2027 | } |
2026 | 2028 | ||