aboutsummaryrefslogtreecommitdiff
path: root/src/ats/ats_api_connectivity.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2015-02-05 00:53:22 +0000
committerChristian Grothoff <christian@grothoff.org>2015-02-05 00:53:22 +0000
commit15dd8e6cc1199d611d804853e134882bf13b234a (patch)
tree7cc90886eabe8d0ffa397a319e12a87042d0ba28 /src/ats/ats_api_connectivity.c
parentbf6a2c9deeff7a3b384eb029d8267d6099066df3 (diff)
downloadgnunet-15dd8e6cc1199d611d804853e134882bf13b234a.tar.gz
gnunet-15dd8e6cc1199d611d804853e134882bf13b234a.zip
Various changes:
- removed "in_use" from being passed to ATS, no longer needed as we tell ATS when we cannot follow a suggestion by removing the address; simplifies the code a lot - better handling of state machine, fallback to primary session if address switch to new session timed out - nicer logging - more comments - new testcase failures, because of #3652, #3651 and #3650 (or more that i missed).
Diffstat (limited to 'src/ats/ats_api_connectivity.c')
-rw-r--r--src/ats/ats_api_connectivity.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ats/ats_api_connectivity.c b/src/ats/ats_api_connectivity.c
index 9198118a4..0871544dc 100644
--- a/src/ats/ats_api_connectivity.c
+++ b/src/ats/ats_api_connectivity.c
@@ -303,6 +303,9 @@ GNUNET_ATS_connectivity_suggest (struct GNUNET_ATS_ConnectivityHandle *ch,
303{ 303{
304 struct GNUNET_ATS_ConnectivitySuggestHandle *s; 304 struct GNUNET_ATS_ConnectivitySuggestHandle *s;
305 305
306 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
307 "Requesting ATS to suggest address for `%s'\n",
308 GNUNET_i2s (peer));
306 s = GNUNET_new (struct GNUNET_ATS_ConnectivitySuggestHandle); 309 s = GNUNET_new (struct GNUNET_ATS_ConnectivitySuggestHandle);
307 s->ch = ch; 310 s->ch = ch;
308 s->id = *peer; 311 s->id = *peer;
@@ -336,6 +339,9 @@ GNUNET_ATS_connectivity_suggest_cancel (struct GNUNET_ATS_ConnectivitySuggestHan
336 struct GNUNET_MQ_Envelope *ev; 339 struct GNUNET_MQ_Envelope *ev;
337 struct RequestAddressMessage *m; 340 struct RequestAddressMessage *m;
338 341
342 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
343 "Telling ATS we no longer care for an address for `%s'\n",
344 GNUNET_i2s (&sh->id));
339 GNUNET_assert (GNUNET_OK == 345 GNUNET_assert (GNUNET_OK ==
340 GNUNET_CONTAINER_multipeermap_remove (ch->sug_requests, 346 GNUNET_CONTAINER_multipeermap_remove (ch->sug_requests,
341 &sh->id, 347 &sh->id,