diff options
author | Bart Polot <bart@net.in.tum.de> | 2014-05-07 12:06:50 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2014-05-07 12:06:50 +0000 |
commit | be4c79e4cd4a8f118c5577874f0c95e253359595 (patch) | |
tree | 7fd74fb0cf6921c4e35a43f2593396bb4805f154 /src/fs/gnunet-service-fs.c | |
parent | 15ccd7a167bcce0dde4331092975a6401393610f (diff) | |
download | gnunet-be4c79e4cd4a8f118c5577874f0c95e253359595.tar.gz gnunet-be4c79e4cd4a8f118c5577874f0c95e253359595.zip |
Rename mesh->cadet
Diffstat (limited to 'src/fs/gnunet-service-fs.c')
-rw-r--r-- | src/fs/gnunet-service-fs.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c index 0e38d0dc9..59786bae8 100644 --- a/src/fs/gnunet-service-fs.c +++ b/src/fs/gnunet-service-fs.c | |||
@@ -43,7 +43,7 @@ | |||
43 | #include "gnunet-service-fs_pr.h" | 43 | #include "gnunet-service-fs_pr.h" |
44 | #include "gnunet-service-fs_push.h" | 44 | #include "gnunet-service-fs_push.h" |
45 | #include "gnunet-service-fs_put.h" | 45 | #include "gnunet-service-fs_put.h" |
46 | #include "gnunet-service-fs_mesh.h" | 46 | #include "gnunet-service-fs_cadet.h" |
47 | #include "fs.h" | 47 | #include "fs.h" |
48 | 48 | ||
49 | /** | 49 | /** |
@@ -412,10 +412,10 @@ start_p2p_processing (void *cls, struct GSF_PendingRequest *pr, | |||
412 | { | 412 | { |
413 | case GNUNET_BLOCK_TYPE_FS_DBLOCK: | 413 | case GNUNET_BLOCK_TYPE_FS_DBLOCK: |
414 | case GNUNET_BLOCK_TYPE_FS_IBLOCK: | 414 | case GNUNET_BLOCK_TYPE_FS_IBLOCK: |
415 | /* the above block types MAY be available via 'mesh' */ | 415 | /* the above block types MAY be available via 'cadet' */ |
416 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 416 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
417 | "Considering mesh-based download for block\n"); | 417 | "Considering cadet-based download for block\n"); |
418 | GSF_mesh_lookup_ (pr); | 418 | GSF_cadet_lookup_ (pr); |
419 | break; | 419 | break; |
420 | case GNUNET_BLOCK_TYPE_FS_UBLOCK: | 420 | case GNUNET_BLOCK_TYPE_FS_UBLOCK: |
421 | /* the above block types are in the DHT */ | 421 | /* the above block types are in the DHT */ |
@@ -475,8 +475,8 @@ handle_start_search (void *cls, struct GNUNET_SERVER_Client *client, | |||
475 | static void | 475 | static void |
476 | shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 476 | shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
477 | { | 477 | { |
478 | GSF_mesh_stop_client (); | 478 | GSF_cadet_stop_client (); |
479 | GSF_mesh_stop_server (); | 479 | GSF_cadet_stop_server (); |
480 | if (NULL != GSF_core) | 480 | if (NULL != GSF_core) |
481 | { | 481 | { |
482 | GNUNET_CORE_disconnect (GSF_core); | 482 | GNUNET_CORE_disconnect (GSF_core); |
@@ -646,8 +646,8 @@ main_init (struct GNUNET_SERVER_Handle *server, | |||
646 | GNUNET_SCHEDULER_add_delayed (COVER_AGE_FREQUENCY, &age_cover_counters, | 646 | GNUNET_SCHEDULER_add_delayed (COVER_AGE_FREQUENCY, &age_cover_counters, |
647 | NULL); | 647 | NULL); |
648 | datastore_get_load = GNUNET_LOAD_value_init (DATASTORE_LOAD_AUTODECLINE); | 648 | datastore_get_load = GNUNET_LOAD_value_init (DATASTORE_LOAD_AUTODECLINE); |
649 | GSF_mesh_start_server (); | 649 | GSF_cadet_start_server (); |
650 | GSF_mesh_start_client (); | 650 | GSF_cadet_start_client (); |
651 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task, | 651 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task, |
652 | NULL); | 652 | NULL); |
653 | return GNUNET_OK; | 653 | return GNUNET_OK; |