aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2010-07-30 11:10:45 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2010-07-30 11:10:45 +0000
commit64431cc5c9b837526e2a954a3cd24351cb2f8acf (patch)
tree3a30a830294d81746e880481a881f186845fa0fc /src
parentaf9166cc548fe2ceb021987a294f95b6be7f3400 (diff)
downloadgnunet-64431cc5c9b837526e2a954a3cd24351cb2f8acf.tar.gz
gnunet-64431cc5c9b837526e2a954a3cd24351cb2f8acf.zip
Diffstat (limited to 'src')
-rw-r--r--src/transport/plugin_transport_https.c7
-rw-r--r--src/transport/test_transport_api_rel_https_peer1.conf2
-rw-r--r--src/transport/test_transport_api_rel_https_peer2.conf2
3 files changed, 7 insertions, 4 deletions
diff --git a/src/transport/plugin_transport_https.c b/src/transport/plugin_transport_https.c
index 880d09017..ab8c26595 100644
--- a/src/transport/plugin_transport_https.c
+++ b/src/transport/plugin_transport_https.c
@@ -41,7 +41,8 @@
41#include "microhttpd.h" 41#include "microhttpd.h"
42#include <curl/curl.h> 42#include <curl/curl.h>
43 43
44#define DEBUG_HTTPS GNUNET_NO 44#define DEBUG_HTTPS GNUNET_YES
45#define VERBOSE GNUNET_YES
45#define DEBUG_CURL GNUNET_NO 46#define DEBUG_CURL GNUNET_NO
46#define DEBUG_CONNECTIONS GNUNET_NO 47#define DEBUG_CONNECTIONS GNUNET_NO
47#define DEBUG_SESSION_SELECTION GNUNET_NO 48#define DEBUG_SESSION_SELECTION GNUNET_NO
@@ -2558,6 +2559,8 @@ libgnunet_plugin_transport_https_init (void *cls)
2558 2559
2559 2560
2560 GNUNET_assert((plugin->key!=NULL) && (plugin->cert!=NULL)); 2561 GNUNET_assert((plugin->key!=NULL) && (plugin->cert!=NULL));
2562 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "TLS certificate loaded\n", key_file, cert_file);
2563
2561 GNUNET_assert ((port > 0) && (port <= 65535)); 2564 GNUNET_assert ((port > 0) && (port <= 65535));
2562 plugin->port_inbound = port; 2565 plugin->port_inbound = port;
2563 gn_timeout = GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT; 2566 gn_timeout = GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT;
@@ -2664,4 +2667,4 @@ libgnunet_plugin_transport_https_init (void *cls)
2664 return api; 2667 return api;
2665} 2668}
2666 2669
2667/* end of plugin_transport_http.c */ 2670/* end of plugin_transport_https.c */
diff --git a/src/transport/test_transport_api_rel_https_peer1.conf b/src/transport/test_transport_api_rel_https_peer1.conf
index 81bd192a0..628a3efc5 100644
--- a/src/transport/test_transport_api_rel_https_peer1.conf
+++ b/src/transport/test_transport_api_rel_https_peer1.conf
@@ -45,7 +45,7 @@ MINIMUM-FRIENDS = 0
45[transport] 45[transport]
46PLUGINS = https 46PLUGINS = https
47#PLUGINS = tcp http 47#PLUGINS = tcp http
48DEBUG = NO 48DEBUG = YES
49ACCEPT_FROM6 = ::1; 49ACCEPT_FROM6 = ::1;
50ACCEPT_FROM = 127.0.0.1; 50ACCEPT_FROM = 127.0.0.1;
51NEIGHBOUR_LIMIT = 50 51NEIGHBOUR_LIMIT = 50
diff --git a/src/transport/test_transport_api_rel_https_peer2.conf b/src/transport/test_transport_api_rel_https_peer2.conf
index 998d70a41..5b4582a30 100644
--- a/src/transport/test_transport_api_rel_https_peer2.conf
+++ b/src/transport/test_transport_api_rel_https_peer2.conf
@@ -45,7 +45,7 @@ MINIMUM-FRIENDS = 0
45[transport] 45[transport]
46PLUGINS = https 46PLUGINS = https
47#PLUGINS = tcp http 47#PLUGINS = tcp http
48DEBUG = NO 48DEBUG = YES
49ACCEPT_FROM6 = ::1; 49ACCEPT_FROM6 = ::1;
50ACCEPT_FROM = 127.0.0.1; 50ACCEPT_FROM = 127.0.0.1;
51NEIGHBOUR_LIMIT = 50 51NEIGHBOUR_LIMIT = 50