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

[gnunet]

Author: wachs
Date: 2013-07-09 15:19:11 +0200 (Tue, 09 Jul 2013)
New Revision: 27827

Modified:
   gnunet/src/peerinfo/gnunet-service-peerinfo.c
Log:
if io is enabled and shipped hellos not, hellos from peers we created should 
still be read


Modified: gnunet/src/peerinfo/gnunet-service-peerinfo.c
===================================================================
--- gnunet/src/peerinfo/gnunet-service-peerinfo.c       2013-07-09 12:40:15 UTC 
(rev 27826)
+++ gnunet/src/peerinfo/gnunet-service-peerinfo.c       2013-07-09 13:19:11 UTC 
(rev 27827)
@@ -1239,7 +1239,7 @@
   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) && (GNUNET_YES == use_included))
+  if (GNUNET_YES != noio)
   {
     GNUNET_assert (GNUNET_OK ==
                   GNUNET_CONFIGURATION_get_value_filename (cfg, "peerinfo",
@@ -1257,23 +1257,25 @@
 
     GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE,
                                        &cron_clean_data_hosts, NULL);
-
-    ip = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR);
-    GNUNET_asprintf (&peerdir,
+    if (GNUNET_YES == use_included)
+    {
+       ip = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR);
+       GNUNET_asprintf (&peerdir,
                     "%shellos",
                     ip);
-    GNUNET_free (ip);
+       GNUNET_free (ip);
 
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-               _("Importing HELLOs from `%s'\n"),
-               peerdir);
-    dsc.matched = 0;
-    dsc.remove_files = GNUNET_NO;
+                       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                       _("Importing HELLOs from `%s'\n"),
+                       peerdir);
+                       dsc.matched = 0;
+                       dsc.remove_files = GNUNET_NO;
 
-    GNUNET_DISK_directory_scan (peerdir,
-                               &hosts_directory_scan_callback, &dsc);
+                       GNUNET_DISK_directory_scan (peerdir,
+                                       &hosts_directory_scan_callback, &dsc);
 
-    GNUNET_free (peerdir);
+                       GNUNET_free (peerdir);
+    }
   }
   GNUNET_SERVER_add_handlers (server, handlers);
   GNUNET_SERVER_disconnect_notify (server, &disconnect_cb, NULL) ;