more test

2 files changed, 55 insertions, 9 deletions

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 99fe2d936..7f13db342 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -12,6 +12,9 @@ if HAVE_MHD
  GN_LIBMHD = -lmicrohttpd
  HTTP_SERVER_PLUGIN_LA = libgnunet_plugin_transport_http_server.la
  HTTPS_SERVER_PLUGIN_LA = libgnunet_plugin_transport_https_server.la
+ 
+ HTTP_SERVER_PLUGIN_TEST = test_plugin_http_server
+ HTTPS_SERVER_PLUGIN_TEST = test_plugin_https_server
 endif
 
 if HAVE_LIBCURL
@@ -300,6 +303,8 @@ check_PROGRAMS = \
  test_plugin_udp \
  test_plugin_unix \
  $(WLAN_PLUGIN_TEST) \
+ $(HTTP_SERVER_PLUGIN_TEST) \
+ $(HTTPS_SERVER_PLUGIN_TEST) \
  test_transport_api_blacklisting \
  test_transport_api_disconnect_tcp \
  test_transport_api_bidirectional_connect \
@@ -470,7 +475,7 @@ test_plugin_unix_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  \
  $(top_builddir)/src/transport/libgnunettransporttesting.la
- 
+
 test_plugin_wlan_SOURCES = \
  test_plugin_transport.c
 test_plugin_wlan_LDADD = \
@@ -480,6 +485,24 @@ test_plugin_wlan_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  \
  $(top_builddir)/src/transport/libgnunettransporttesting.la 
 
+test_plugin_http_server_SOURCES = \
+ test_plugin_transport.c
+test_plugin_http_server_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/util/libgnunetutil.la  \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la 
+ 
+test_plugin_https_server_SOURCES = \
+ test_plugin_transport.c
+test_plugin_https_server_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/util/libgnunetutil.la  \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la 
+
 test_transport_api_tcp_SOURCES = \
  test_transport_api.c
 test_transport_api_tcp_LDADD = \
diff --git a/src/transport/test_plugin_transport_data.conf b/src/transport/test_plugin_transport_data.conf
index adc7a59bf..bc9a9271e 100644
--- a/src/transport/test_plugin_transport_data.conf
+++ b/src/transport/test_plugin_transport_data.conf
@@ -4,22 +4,45 @@ SERVICEHOME = /tmp/test-gnunetd-plugin-transport/
 DEFAULTCONFIG = test_plugin_transport_data.conf
 
 [transport-tcp]
-PORT = 2368
-TIMEOUT = 5 s
+PORT = 2400
+
+[transport-udp]
+PORT = 2401
+
+[transport-unix]
+
+[transport-wlan]
+
+[transport-http_client]
+
+[transport-http_server]
+PORT = 2402
+
+[transport-https_client]
+
+[transport-https_server]
+PORT = 2403
 
 [arm]
-PORT = 2366
+PORT = 2360
+UNIXPATH = /tmp/gnunet-service-arm.sock
 
 [statistics]
-PORT = 2367
+PORT = 2361
+UNIXPATH = /tmp/gnunet-service-statistics.sock
 
 [resolver]
-PORT = 2364
+PORT = 2362
+UNIXPATH = /tmp/gnunet-service-resolver.sock
 
 [peerinfo]
-PORT = 2369
+PORT = 2363
+UNIXPATH = /tmp/gnunet-service-peerinfo.sock
 
 [transport]
-PORT = 2365
-
+PORT = 2364
+UNIXPATH = /tmp/gnunet-service-transport.sock
 
+[nat]
+RETURN_LOCAL_ADDRESSES = YES
+DISABLEV6 = NO