[GNUnet-SVN] r16068 - in gnunet: contrib src/transport

[gnunet]

Author: grothoff
Date: 2011-07-18 09:15:15 +0200 (Mon, 18 Jul 2011)
New Revision: 16068

Modified:
   gnunet/contrib/defaults.conf
   gnunet/src/transport/plugin_transport_http.c
Log:
defaults belong in defaults.conf, not in source

Modified: gnunet/contrib/defaults.conf
===================================================================
--- gnunet/contrib/defaults.conf        2011-07-18 07:13:01 UTC (rev 16067)
+++ gnunet/contrib/defaults.conf        2011-07-18 07:15:15 UTC (rev 16068)
@@ -88,6 +88,8 @@
 # REJECT_FROM6 =
 # BINDTO =
 
+MAX_CONNECTIONS = 128
+
 # ATS options
 DUMP_MLP = NO
 DUMP_SOLUTION = NO
@@ -107,16 +109,16 @@
 
 [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]
 # Name of the interface in monitor mode (typically monX)
 INTERFACE = mon0

Modified: gnunet/src/transport/plugin_transport_http.c
===================================================================
--- gnunet/src/transport/plugin_transport_http.c        2011-07-18 07:13:01 UTC 
(rev 16067)
+++ gnunet/src/transport/plugin_transport_http.c        2011-07-18 07:15:15 UTC 
(rev 16068)
@@ -3348,17 +3348,12 @@
                             &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;