[GNUnet-SVN] r27824 - gnunet/src/peerinfo

[gnunet]

Author: wachs
Date: 2013-07-09 13:23:37 +0200 (Tue, 09 Jul 2013)
New Revision: 27824

Modified:
   gnunet/src/peerinfo/gnunet-service-peerinfo.c
   gnunet/src/peerinfo/peerinfo.conf.in
Log:
functionality to disable shipped hellos


Modified: gnunet/src/peerinfo/gnunet-service-peerinfo.c
===================================================================
--- gnunet/src/peerinfo/gnunet-service-peerinfo.c       2013-07-09 11:23:16 UTC 
(rev 27823)
+++ gnunet/src/peerinfo/gnunet-service-peerinfo.c       2013-07-09 11:23:37 UTC 
(rev 27824)
@@ -1230,14 +1230,16 @@
   char *ip;
   struct DirScanContext dsc;
   int noio;
+  int use_included;
 
   hostmap = GNUNET_CONTAINER_multihashmap_create (1024, GNUNET_YES);
   stats = GNUNET_STATISTICS_create ("peerinfo", cfg);
   notify_list = GNUNET_SERVER_notification_context_create (server, 0);
   noio = GNUNET_CONFIGURATION_get_value_yesno (cfg, "peerinfo", "NO_IO");
+  use_included = GNUNET_CONFIGURATION_get_value_yesno (cfg, "peerinfo", 
"USE_INCLUDED_HELLOS");
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
                                 NULL);
-  if (GNUNET_YES != noio)
+  if ((GNUNET_YES != noio) && (GNUNET_YES == use_included))
   {
     GNUNET_assert (GNUNET_OK ==
                   GNUNET_CONFIGURATION_get_value_filename (cfg, "peerinfo",

Modified: gnunet/src/peerinfo/peerinfo.conf.in
===================================================================
--- gnunet/src/peerinfo/peerinfo.conf.in        2013-07-09 11:23:16 UTC (rev 
27823)
+++ gnunet/src/peerinfo/peerinfo.conf.in        2013-07-09 11:23:37 UTC (rev 
27824)
@@ -24,6 +24,9 @@
 # (large-scale experiments); disables persistence of HELLOs!
 NO_IO = NO
 
+# Load HELLOs shipped with GNUnet
+USE_INCLUDED_HELLOS = YES
+
 [uri]
 hello = gnunet-peerinfo
 friend-hello = gnunet-peerinfo