diff options
Diffstat (limited to 'src/fs/gnunet-service-fs.c')
-rw-r--r-- | src/fs/gnunet-service-fs.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c index 597e89e14..c4193c2e4 100644 --- a/src/fs/gnunet-service-fs.c +++ b/src/fs/gnunet-service-fs.c | |||
@@ -33,7 +33,6 @@ | |||
33 | #include "gnunet_protocols.h" | 33 | #include "gnunet_protocols.h" |
34 | #include "gnunet_signatures.h" | 34 | #include "gnunet_signatures.h" |
35 | #include "gnunet_statistics_service.h" | 35 | #include "gnunet_statistics_service.h" |
36 | #include "gnunet_transport_service.h" | ||
37 | #include "gnunet_util_lib.h" | 36 | #include "gnunet_util_lib.h" |
38 | #include "gnunet-service-fs_cp.h" | 37 | #include "gnunet-service-fs_cp.h" |
39 | #include "gnunet-service-fs_indexing.h" | 38 | #include "gnunet-service-fs_indexing.h" |
@@ -248,11 +247,6 @@ struct GNUNET_LOAD_Value *GSF_rt_entry_lifetime; | |||
248 | */ | 247 | */ |
249 | struct GNUNET_TIME_Relative GSF_avg_latency = { 500 }; | 248 | struct GNUNET_TIME_Relative GSF_avg_latency = { 500 }; |
250 | 249 | ||
251 | /** | ||
252 | * Handle to ATS service. | ||
253 | */ | ||
254 | struct GNUNET_ATS_PerformanceHandle *GSF_ats; | ||
255 | |||
256 | 250 | ||
257 | /** | 251 | /** |
258 | * Typical priorities we're seeing from other peers right now. Since | 252 | * Typical priorities we're seeing from other peers right now. Since |
@@ -1042,12 +1036,12 @@ hash_for_index_val (void *cls, | |||
1042 | GNUNET_h2s (&isc->file_id)); | 1036 | GNUNET_h2s (&isc->file_id)); |
1043 | 1037 | ||
1044 | const char *emsg = "hash mismatch"; | 1038 | const char *emsg = "hash mismatch"; |
1045 | const size_t msize = strlen(emsg) + 1; | 1039 | const size_t msize = strlen (emsg) + 1; |
1046 | 1040 | ||
1047 | env = GNUNET_MQ_msg_extra (msg, | 1041 | env = GNUNET_MQ_msg_extra (msg, |
1048 | msize, | 1042 | msize, |
1049 | GNUNET_MESSAGE_TYPE_FS_INDEX_START_FAILED); | 1043 | GNUNET_MESSAGE_TYPE_FS_INDEX_START_FAILED); |
1050 | memcpy((char*) &msg[1], emsg, msize); | 1044 | memcpy ((char*) &msg[1], emsg, msize); |
1051 | GNUNET_MQ_send (lc->mq, | 1045 | GNUNET_MQ_send (lc->mq, |
1052 | env); | 1046 | env); |
1053 | GNUNET_SERVICE_client_continue (lc->client); | 1047 | GNUNET_SERVICE_client_continue (lc->client); |
@@ -1182,11 +1176,6 @@ shutdown_task (void *cls) | |||
1182 | GNUNET_CORE_disconnect (GSF_core); | 1176 | GNUNET_CORE_disconnect (GSF_core); |
1183 | GSF_core = NULL; | 1177 | GSF_core = NULL; |
1184 | } | 1178 | } |
1185 | if (NULL != GSF_ats) | ||
1186 | { | ||
1187 | GNUNET_ATS_performance_done (GSF_ats); | ||
1188 | GSF_ats = NULL; | ||
1189 | } | ||
1190 | GSF_put_done_ (); | 1179 | GSF_put_done_ (); |
1191 | GSF_push_done_ (); | 1180 | GSF_push_done_ (); |
1192 | GSF_pending_request_done_ (); | 1181 | GSF_pending_request_done_ (); |
@@ -1378,9 +1367,7 @@ run (void *cls, | |||
1378 | GSF_plan_init (); | 1367 | GSF_plan_init (); |
1379 | GSF_pending_request_init_ (); | 1368 | GSF_pending_request_init_ (); |
1380 | GSF_connected_peer_init_ (); | 1369 | GSF_connected_peer_init_ (); |
1381 | GSF_ats = GNUNET_ATS_performance_init (GSF_cfg, | 1370 | |
1382 | &update_latencies, | ||
1383 | NULL); | ||
1384 | GSF_push_init_ (); | 1371 | GSF_push_init_ (); |
1385 | GSF_put_init_ (); | 1372 | GSF_put_init_ (); |
1386 | if ((GNUNET_OK != GNUNET_FS_indexing_init (cfg, | 1373 | if ((GNUNET_OK != GNUNET_FS_indexing_init (cfg, |