-use sane defaults

3 files changed, 25 insertions, 5 deletions

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 6404f4ae..61d21968 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -38,4 +38,9 @@ gnunet_fs_gtk_LDADD = \
 gnunet_fs_gtk_LDFLAGS = \
   -export-dynamic 
 
-EXTRA_DIST = metatypes.c
+pkgcfg_DATA = \
+  gnunet-fs-gtk.conf
+
+EXTRA_DIST = metatypes.c \
+ $(pkgcfg_DATA)
+
diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index 6a39aa7a..415f142c 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -27,6 +27,18 @@
 #include "gnunet-fs-gtk_common.h"
 #include "gnunet-fs-gtk_event-handler.h"
 
+
+/**
+ * How many block requests can we have outstanding in parallel at a time by default?
+ */
+#define DEFAULT_MAX_PARALLEL_REQUESTS 100000
+
+/**
+ * How many downloads can we have outstanding in parallel at a time by default?
+ */
+#define DEFAULT_MAX_PARALLEL_DOWNLOADS 128
+
+
 /**
  * Should gnunet-fs-gtk start in tray mode?
  */
@@ -275,12 +287,12 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   /* FIXME: should these '1's be here? Maybe better to put them into
    * default config files?
    */
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (main_context->cfg, "gnunet-gtk",
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (main_context->cfg, "gnunet-fs-gtk",
       "MAX_PARALLEL_DOWNLOADS", &dl_parallel))
-    dl_parallel = 1;
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (main_context->cfg, "gnunet-gtk",
+    dl_parallel = DEFAULT_MAX_PARALLEL_DOWNLOADS;
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (main_context->cfg, "gnunet-fs-gtk",
       "MAX_PARALLEL_REQUESTS", &req_parallel))
-    req_parallel = 1;
+    req_parallel = DEFAULT_MAX_PARALLEL_REQUESTS;
 
   /* initialize file-sharing */
   fs = GNUNET_FS_start (main_context->cfg, "gnunet-fs-gtk",
diff --git a/src/fs/gnunet-fs-gtk.conf b/src/fs/gnunet-fs-gtk.conf
new file mode 100644
index 00000000..db99fa63
--- /dev/null
+++ b/src/fs/gnunet-fs-gtk.conf
@@ -0,0 +1,3 @@
+[gnunet-fs-gtk]
+MAX_PARALLEL_DOWNLOADS = 128
+MAX_PARALLEL_REQUESTS = 100000
\ No newline at end of file