defaults belong in defaults.conf, not in source

diff --git a/contrib/defaults.conf b/contrib/defaults.conf
index abc1ae6a7404cb2d0d5167c3c3cfdd34c21b9c3f..82623c87ba7ba5b19e3bb135a37cbddfcbcdffec 100644 (file)
--- a/contrib/defaults.conf
+++ b/contrib/defaults.conf
@@ -88,6 +88,8 @@ TIMEOUT = 5000
 # REJECT_FROM6 =
 # BINDTO =
 
+MAX_CONNECTIONS = 128
+
 # ATS options
 DUMP_MLP = NO
 DUMP_SOLUTION = NO
@@ -107,14 +109,14 @@ MAX_BPS = 1000000
 
 [transport-http]
 PORT = 1080
-
+MAX_CONNECTIONS = 128
 
 [transport-https]
 PORT = 4433
 CRYPTO_INIT = NORMAL
 KEY_FILE = https.key
 CERT_FILE = https.cert
-
+MAX_CONNECTIONS = 128
 
 
 [transport-wlan]

diff --git a/src/transport/plugin_transport_http.c b/src/transport/plugin_transport_http.c
index 8722390ef6472cd9653070f9f4e9aec59d9dceab..f85af629346cf059bdc3d1045d21f416a18da0e1 100644 (file)
--- a/src/transport/plugin_transport_http.c
+++ b/src/transport/plugin_transport_http.c
@@ -3348,17 +3348,12 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls)
                             &plugin->my_ascii_hash_ident);
 
 
-  if (GNUNET_CONFIGURATION_have_value (env->cfg, "TRANSPORT", "NEIGHBOUR_LIMIT"))
-  {
-    GNUNET_CONFIGURATION_get_value_number (env->cfg,
-                                         "TRANSPORT",
-                                         "NEIGHBOUR_LIMIT",
-                                         &tneigh);
-  }
-  else
-  {
-    tneigh = -1;
-  }
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_number (env->cfg,
+                                            component_name,
+                                            "MAX_CONNECTIONS",
+                                            &tneigh))
+    tneigh = 128;
   plugin->max_connect_per_transport = tneigh;