From 1d18c4dbc82dfa442933148a171d37546ec41332 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Mon, 27 Aug 2012 11:51:11 +0000 Subject: changes --- src/transport/plugin_transport_http_client.c | 24 ++++++++++++++++++++++ src/transport/test_transport_api_http_peer1.conf | 5 ++--- src/transport/test_transport_api_http_peer2.conf | 4 ++-- .../test_transport_api_http_reverse_proxy.conf | 2 +- 4 files changed, 29 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c index 6f74fdf34..5fbf3592d 100644 --- a/src/transport/plugin_transport_http_client.c +++ b/src/transport/plugin_transport_http_client.c @@ -1140,6 +1140,24 @@ LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls) } +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 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls) 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)) { diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf index 26c29699b..4af712a43 100644 --- a/src/transport/test_transport_api_http_peer1.conf +++ b/src/transport/test_transport_api_http_peer1.conf @@ -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 @@ UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock [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 diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf index fa7aa3b29..0ac73ee2a 100644 --- a/src/transport/test_transport_api_http_peer2.conf +++ b/src/transport/test_transport_api_http_peer2.conf @@ -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 @@ UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock [transport] #DEBUG = YES PORT = 12091 -PLUGINS = http +PLUGINS = http_server UNIXPATH = /tmp/gnunet-p2-service-transport.sock #PREFIX = valgrind --leak-check=full diff --git a/src/transport/test_transport_api_http_reverse_proxy.conf b/src/transport/test_transport_api_http_reverse_proxy.conf index 53a7d467c..c8162df0d 100644 --- a/src/transport/test_transport_api_http_reverse_proxy.conf +++ b/src/transport/test_transport_api_http_reverse_proxy.conf @@ -38,7 +38,7 @@ UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock #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 -- cgit v1.2.3