diff options
Diffstat (limited to 'src/peerinfo')
-rw-r--r-- | src/peerinfo/gnunet-service-peerinfo.c | 4 | ||||
-rw-r--r-- | src/peerinfo/peerinfo.conf.in | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/peerinfo/gnunet-service-peerinfo.c b/src/peerinfo/gnunet-service-peerinfo.c index 17ec7303d..5d62e7b52 100644 --- a/src/peerinfo/gnunet-service-peerinfo.c +++ b/src/peerinfo/gnunet-service-peerinfo.c | |||
@@ -1230,14 +1230,16 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
1230 | char *ip; | 1230 | char *ip; |
1231 | struct DirScanContext dsc; | 1231 | struct DirScanContext dsc; |
1232 | int noio; | 1232 | int noio; |
1233 | int use_included; | ||
1233 | 1234 | ||
1234 | hostmap = GNUNET_CONTAINER_multihashmap_create (1024, GNUNET_YES); | 1235 | hostmap = GNUNET_CONTAINER_multihashmap_create (1024, GNUNET_YES); |
1235 | stats = GNUNET_STATISTICS_create ("peerinfo", cfg); | 1236 | stats = GNUNET_STATISTICS_create ("peerinfo", cfg); |
1236 | notify_list = GNUNET_SERVER_notification_context_create (server, 0); | 1237 | notify_list = GNUNET_SERVER_notification_context_create (server, 0); |
1237 | noio = GNUNET_CONFIGURATION_get_value_yesno (cfg, "peerinfo", "NO_IO"); | 1238 | noio = GNUNET_CONFIGURATION_get_value_yesno (cfg, "peerinfo", "NO_IO"); |
1239 | use_included = GNUNET_CONFIGURATION_get_value_yesno (cfg, "peerinfo", "USE_INCLUDED_HELLOS"); | ||
1238 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task, | 1240 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task, |
1239 | NULL); | 1241 | NULL); |
1240 | if (GNUNET_YES != noio) | 1242 | if ((GNUNET_YES != noio) && (GNUNET_YES == use_included)) |
1241 | { | 1243 | { |
1242 | GNUNET_assert (GNUNET_OK == | 1244 | GNUNET_assert (GNUNET_OK == |
1243 | GNUNET_CONFIGURATION_get_value_filename (cfg, "peerinfo", | 1245 | GNUNET_CONFIGURATION_get_value_filename (cfg, "peerinfo", |
diff --git a/src/peerinfo/peerinfo.conf.in b/src/peerinfo/peerinfo.conf.in index 32a679a50..11302211d 100644 --- a/src/peerinfo/peerinfo.conf.in +++ b/src/peerinfo/peerinfo.conf.in | |||
@@ -24,6 +24,9 @@ HOSTS = $SERVICEHOME/peerinfo/ | |||
24 | # (large-scale experiments); disables persistence of HELLOs! | 24 | # (large-scale experiments); disables persistence of HELLOs! |
25 | NO_IO = NO | 25 | NO_IO = NO |
26 | 26 | ||
27 | # Load HELLOs shipped with GNUnet | ||
28 | USE_INCLUDED_HELLOS = YES | ||
29 | |||
27 | [uri] | 30 | [uri] |
28 | hello = gnunet-peerinfo | 31 | hello = gnunet-peerinfo |
29 | friend-hello = gnunet-peerinfo | 32 | friend-hello = gnunet-peerinfo |