diff options
Diffstat (limited to 'src/fs/fs_search.c')
-rw-r--r-- | src/fs/fs_search.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c index 94a77e136..ef3e66fbc 100644 --- a/src/fs/fs_search.c +++ b/src/fs/fs_search.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include "gnunet_protocols.h" | 30 | #include "gnunet_protocols.h" |
31 | #include "fs_api.h" | 31 | #include "fs_api.h" |
32 | 32 | ||
33 | #define DEBUG_SEARCH GNUNET_EXTRA_LOGGING | ||
34 | 33 | ||
35 | /** | 34 | /** |
36 | * Number of availability trials we perform per search result. | 35 | * Number of availability trials we perform per search result. |
@@ -1152,7 +1151,7 @@ try_reconnect (struct GNUNET_FS_SearchContext *sc) | |||
1152 | { | 1151 | { |
1153 | if (NULL != sc->client) | 1152 | if (NULL != sc->client) |
1154 | { | 1153 | { |
1155 | GNUNET_CLIENT_disconnect (sc->client, GNUNET_NO); | 1154 | GNUNET_CLIENT_disconnect (sc->client); |
1156 | sc->client = NULL; | 1155 | sc->client = NULL; |
1157 | } | 1156 | } |
1158 | sc->task = | 1157 | sc->task = |
@@ -1369,7 +1368,7 @@ GNUNET_FS_search_signal_suspend_ (void *cls) | |||
1369 | if (sc->task != GNUNET_SCHEDULER_NO_TASK) | 1368 | if (sc->task != GNUNET_SCHEDULER_NO_TASK) |
1370 | GNUNET_SCHEDULER_cancel (sc->task); | 1369 | GNUNET_SCHEDULER_cancel (sc->task); |
1371 | if (NULL != sc->client) | 1370 | if (NULL != sc->client) |
1372 | GNUNET_CLIENT_disconnect (sc->client, GNUNET_NO); | 1371 | GNUNET_CLIENT_disconnect (sc->client); |
1373 | GNUNET_CONTAINER_multihashmap_destroy (sc->master_result_map); | 1372 | GNUNET_CONTAINER_multihashmap_destroy (sc->master_result_map); |
1374 | if (sc->requests != NULL) | 1373 | if (sc->requests != NULL) |
1375 | { | 1374 | { |
@@ -1425,7 +1424,7 @@ GNUNET_FS_search_pause (struct GNUNET_FS_SearchContext *sc) | |||
1425 | GNUNET_SCHEDULER_cancel (sc->task); | 1424 | GNUNET_SCHEDULER_cancel (sc->task); |
1426 | sc->task = GNUNET_SCHEDULER_NO_TASK; | 1425 | sc->task = GNUNET_SCHEDULER_NO_TASK; |
1427 | if (NULL != sc->client) | 1426 | if (NULL != sc->client) |
1428 | GNUNET_CLIENT_disconnect (sc->client, GNUNET_NO); | 1427 | GNUNET_CLIENT_disconnect (sc->client); |
1429 | sc->client = NULL; | 1428 | sc->client = NULL; |
1430 | GNUNET_FS_search_sync_ (sc); | 1429 | GNUNET_FS_search_sync_ (sc); |
1431 | GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map, | 1430 | GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map, |
@@ -1569,7 +1568,7 @@ GNUNET_FS_search_stop (struct GNUNET_FS_SearchContext *sc) | |||
1569 | if (sc->task != GNUNET_SCHEDULER_NO_TASK) | 1568 | if (sc->task != GNUNET_SCHEDULER_NO_TASK) |
1570 | GNUNET_SCHEDULER_cancel (sc->task); | 1569 | GNUNET_SCHEDULER_cancel (sc->task); |
1571 | if (NULL != sc->client) | 1570 | if (NULL != sc->client) |
1572 | GNUNET_CLIENT_disconnect (sc->client, GNUNET_NO); | 1571 | GNUNET_CLIENT_disconnect (sc->client); |
1573 | GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map, | 1572 | GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map, |
1574 | &search_result_free, sc); | 1573 | &search_result_free, sc); |
1575 | GNUNET_CONTAINER_multihashmap_destroy (sc->master_result_map); | 1574 | GNUNET_CONTAINER_multihashmap_destroy (sc->master_result_map); |