Merge branch 'master' of ssh://gnunet.org/gnunet

[oweals/gnunet.git] / src / fs / gnunet-service-fs.c

diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c
index c83d73555d8389703552ada63cc069b88985b8eb..256d0c2b8d6f676bdea084b7119214ee9cc61ecc 100644 (file)
--- a/src/fs/gnunet-service-fs.c
+++ b/src/fs/gnunet-service-fs.c
@@ -1177,11 +1177,10 @@ handle_client_unindex (void *cls,
 static void
 shutdown_task (void *cls)
 {
-  GSF_cadet_stop_client ();
   GSF_cadet_stop_server ();
   if (NULL != GSF_core)
   {
-    GNUNET_CORE_disconnecT (GSF_core);
+    GNUNET_CORE_disconnect (GSF_core);
     GSF_core = NULL;
   }
   if (NULL != GSF_ats)
@@ -1219,7 +1218,7 @@ shutdown_task (void *cls)
 
 
 /**
- * Function called after GNUNET_CORE_connecT has succeeded
+ * Function called after GNUNET_CORE_connect has succeeded
  * (or failed for good).  Note that the private key of the
  * peer is intentionally not exposed here; if you need it,
  * your process should try to read the private key file
@@ -1299,7 +1298,7 @@ main_init (const struct GNUNET_CONFIGURATION_Handle *c)
               "I am peer %s\n",
               GNUNET_i2s (&GSF_my_id));
   GSF_core
-    = GNUNET_CORE_connecT (GSF_cfg,
+    = GNUNET_CORE_connect (GSF_cfg,
                           NULL,
                            &peer_init_handler,
                            &GSF_peer_connect_handler,
@@ -1320,7 +1319,6 @@ main_init (const struct GNUNET_CONFIGURATION_Handle *c)
                                     NULL);
   datastore_get_load = GNUNET_LOAD_value_init (DATASTORE_LOAD_AUTODECLINE);
   GSF_cadet_start_server ();
-  GSF_cadet_start_client ();
   GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
                                 NULL);
   return GNUNET_OK;
@@ -1351,7 +1349,7 @@ run (void *cls,
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_INFO,
                               "fs",
                                "DATASTORE_QUEUE_SIZE");
-    dqs = 1024;
+    dqs = 32;
   }
   GSF_datastore_queue_size = (unsigned int) dqs;
   GSF_enable_randomized_delays =