[GNUnet-SVN] r23433 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2012-08-27 13:51:11 +0200 (Mon, 27 Aug 2012)
New Revision: 23433

Modified:
   gnunet/src/transport/plugin_transport_http_client.c
   gnunet/src/transport/test_transport_api_http_peer1.conf
   gnunet/src/transport/test_transport_api_http_peer2.conf
   gnunet/src/transport/test_transport_api_http_reverse_proxy.conf
Log:
changes


Modified: gnunet/src/transport/plugin_transport_http_client.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_client.c 2012-08-27 11:44:09 UTC 
(rev 23432)
+++ gnunet/src/transport/plugin_transport_http_client.c 2012-08-27 11:51:11 UTC 
(rev 23433)
@@ -1140,6 +1140,24 @@
 }
 
 
+static int
+client_configure_plugin (struct HTTP_Client_Plugin *plugin)
+{
+  unsigned long long max_connections;
+
+  /* Optional parameters */
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (plugin->env->cfg,
+                      plugin->name,
+                      "MAX_CONNECTIONS", &max_connections))
+    max_connections = 128;
+  plugin->max_connections = max_connections;
+
+  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+                   _("Maximum number of connections is %u\n"),
+                   plugin->max_connections);
+  return GNUNET_OK;
+}
+
 /**
  * Entry point for the plugin.
  */
@@ -1184,6 +1202,12 @@
   plugin->protocol = "http";
 #endif
 
+  if (GNUNET_SYSERR == client_configure_plugin (plugin))
+  {
+      LIBGNUNET_PLUGIN_TRANSPORT_DONE (api);
+      return NULL;
+  }
+
   /* Start client */
   if (GNUNET_SYSERR == client_start (plugin))
   {

Modified: gnunet/src/transport/test_transport_api_http_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_http_peer1.conf     2012-08-27 
11:44:09 UTC (rev 23432)
+++ gnunet/src/transport/test_transport_api_http_peer1.conf     2012-08-27 
11:51:11 UTC (rev 23433)
@@ -3,8 +3,7 @@
 SERVICEHOME = /tmp/test-transport/api-http-p1/
 DEFAULTCONFIG = test_transport_api_http_peer1.conf
 
-[transport-http]
-PORT = 12080
+[transport-http_client]
 
 [arm]
 PORT = 12085
@@ -26,7 +25,7 @@
 [transport]
 #DEBUG = YES
 PORT = 12081
-PLUGINS = http
+PLUGINS = http_client
 #BINARY = .libs/gnunet-service-transport
 UNIXPATH = /tmp/gnunet-p1-service-transport.sock
 #PREFIX = valgrind --leak-check=full

Modified: gnunet/src/transport/test_transport_api_http_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_http_peer2.conf     2012-08-27 
11:44:09 UTC (rev 23432)
+++ gnunet/src/transport/test_transport_api_http_peer2.conf     2012-08-27 
11:51:11 UTC (rev 23433)
@@ -3,7 +3,7 @@
 SERVICEHOME = /tmp/test-transport/api-http-p2/
 DEFAULTCONFIG = test_transport_api_http_peer2.conf
 
-[transport-http]
+[transport-http_server]
 PORT = 12090
 
 [arm]
@@ -26,6 +26,6 @@
 [transport]
 #DEBUG = YES
 PORT = 12091
-PLUGINS = http
+PLUGINS = http_server
 UNIXPATH = /tmp/gnunet-p2-service-transport.sock
 #PREFIX = valgrind --leak-check=full

Modified: gnunet/src/transport/test_transport_api_http_reverse_proxy.conf
===================================================================
--- gnunet/src/transport/test_transport_api_http_reverse_proxy.conf     
2012-08-27 11:44:09 UTC (rev 23432)
+++ gnunet/src/transport/test_transport_api_http_reverse_proxy.conf     
2012-08-27 11:51:11 UTC (rev 23433)
@@ -38,7 +38,7 @@
 #DEBUG = YES
 PORT = 12081
 #PLUGINS = http_server
-PLUGINS = http_client
+PLUGINS = http_client http_server
 # http_client
 #BINARY = .libs/gnunet-service-transport
 UNIXPATH = /tmp/gnunet-p1-service-transport.sock