removing experimental from http

[oweals/gnunet.git] / src / transport / Makefile.am

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 39582372421ea9b60523567940733359ffc1db49..8ca01eaf71bc4ad6639b6e65d2c56b1b6792b37f 100644 (file)
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -6,31 +6,21 @@ plugindir = $(libdir)/gnunet
 if HAVE_MHD
  GN_LIBMHD = -lmicrohttpd
  HTTP_PLUGIN_LA = libgnunet_plugin_transport_http.la
-# HTTP_PLUGIN_TEST = test_plugin_transport_http
  HTTP_API_TEST = test_transport_api_http
+ HTTP_NAT_API_TEST = test_transport_api_http_nat
+ HTTP_API_TIMEOUT_TEST = test_transport_api_timeout_http
  HTTP_REL_TEST = test_transport_api_reliability_http
  HTTP_QUOTA_TEST = test_quota_compliance_http \
                   test_quota_compliance_http_asymmetric_recv_constant
  HTTPS_PLUGIN_LA = libgnunet_plugin_transport_https.la
-# HTTPS_PLUGIN_TEST = test_plugin_transport_https
  HTTPS_API_TEST = test_transport_api_https
+ HTTPS_NAT_API_TEST = test_transport_api_https_nat
+ HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https
  HTTPS_REL_TEST = test_transport_api_reliability_https
  HTTPS_QUOTA_TEST = test_quota_compliance_https \
                test_quota_compliance_https_asymmetric_recv_constant
 endif
 
-if HAVE_LIBGLPK
- TRANSPORT_ATS_SRC = gnunet-service-transport_ats.c
- TEST_TRANSPORT_ATS = \
-   test_transport_ats \
-   test_transport_ats_multiple_peers 
-  GN_GLPK = -lglpk
-if HAVE_BENCHMARKS
- ATS_TRANSPORT_BENCHMARKS = \
-   perf_transport_ats 
-endif
-endif
-
 if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
 endif
@@ -46,6 +36,7 @@ if HAVE_EXPERIMENTAL
 endif
 endif
 
+
 if LINUX
 install-exec-hook:
        chown root:root $(bindir)/gnunet-transport-wlan-helper || true
@@ -62,11 +53,23 @@ UNIX_QUOTA_TEST = test_quota_compliance_unix \
      test_quota_compliance_unix_asymmetric_recv_constant
 endif
 
-noinst_PROGRAMS = $(WLAN_BIN_DUMMY)
-
+noinst_PROGRAMS = \
+ $(WLAN_BIN_DUMMY) \
+ gnunet-transport-connect-running-peers
 
 lib_LTLIBRARIES = \
-  libgnunettransport.la 
+  libgnunettransport.la \
+  libgnunettransporttesting.la
+
+libgnunettransporttesting_la_SOURCES = \
+  transport-testing.c transport-testing.h
+libgnunettransporttesting_la_LIBADD = \
+  $(top_builddir)/src/transport/libgnunettransport.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL) 
+libgnunettransporttesting_la_DEPENDENCIES = \
+  libgnunettransport.la
 
 libgnunettransport_la_SOURCES = \
   transport_api.c transport.h \
@@ -86,7 +89,6 @@ bin_PROGRAMS = \
  gnunet-transport \
  $(WLAN_BIN) \
  gnunet-service-transport \
- gnunet-service-transport-new \
  gnunet-transport-list-connections \
  gnunet-transport-certificate-creation
 
@@ -107,15 +109,13 @@ gnunet_transport_wlan_helper_SOURCES = \
  wlan/loopback_helper.h \
  wlan/radiotap-parser.c wlan/radiotap-parser.h \
  gnunet-transport-wlan-helper.c gnunet-transport-wlan-helper.h
+gnunet_transport_wlan_helper_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la 
 
 gnunet_transport_wlan_helper_dummy_SOURCES = \
  wlan/radiotap-parser.c \
  wlan/helper_common.c \
  test_plugin_transport_wlan_dummy.c
-
-gnunet_transport_wlan_helper_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la 
-
 gnunet_transport_wlan_helper_dummy_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la 
 
@@ -138,24 +138,15 @@ gnunet_transport_DEPENDENCIES = \
   libgnunettransport.la                                
 
 gnunet_service_transport_SOURCES = \
- gnunet-service-transport.c $(TRANSPORT_ATS_SRC)
-gnunet_service_transport_LDADD = \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(GN_GLPK) \
-  $(GN_LIBINTL)
-
-gnunet_service_transport_new_SOURCES = \
- gnunet-service-transport-new.c gnunet-service-transport.h \
+ gnunet-service-transport.c gnunet-service-transport.h \
  gnunet-service-transport_blacklist.h gnunet-service-transport_blacklist.c \
  gnunet-service-transport_clients.h gnunet-service-transport_clients.c \
  gnunet-service-transport_hello.h gnunet-service-transport_hello.c \
  gnunet-service-transport_neighbours.h gnunet-service-transport_neighbours.c \
  gnunet-service-transport_plugins.h gnunet-service-transport_plugins.c \
- gnunet-service-transport_validation.h 
-gnunet_service_transport_new_LDADD = \
+ gnunet-service-transport_validation.h gnunet-service-transport_validation.c 
+gnunet_service_transport_LDADD = \
+  $(top_builddir)/src/ats/libgnunetats.la \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -224,7 +215,7 @@ libgnunet_plugin_transport_unix_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
 libgnunet_plugin_transport_http_la_SOURCES = \
-  plugin_transport_http.c
+  plugin_transport_http.c plugin_transport_http_client.c plugin_transport_http_server.c
 libgnunet_plugin_transport_http_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -241,7 +232,7 @@ libgnunet_plugin_transport_http_la_CPPFLAGS = \
  @LIBCURL_CPPFLAGS@
 
 libgnunet_plugin_transport_https_la_SOURCES = \
-  plugin_transport_http.c
+  plugin_transport_http.c plugin_transport_http_client.c plugin_transport_http_server.c
 libgnunet_plugin_transport_https_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -259,25 +250,30 @@ libgnunet_plugin_transport_https_la_CPPFLAGS = \
 
 
 check_PROGRAMS = \
- $(TEST_TRANSPORT_ATS) \
- $(ATS_TRANSPORT_BENCHMARKS) \
+ test_transport_testing \
+ test_transport_startonly \
+ test_transport_api_disconnect \
  test_transport_api_tcp \
+ test_transport_api_timeout_tcp \
+ test_transport_api_limited_sockets_tcp \
  test_transport_api_tcp_nat \
  test_transport_api_udp \
  $(UNIX_PLUGIN_TEST) \
  test_transport_api_udp_nat \
- $(HTTP_PLUGIN_TEST) \
  $(HTTP_API_TEST) \
- $(HTTPS_PLUGIN_TEST) \
+ $(HTTP_NAT_API_TEST) \
+ $(HTTP_API_TIMEOUT_TEST) \
  $(HTTPS_API_TEST) \
+ $(HTTPS_NAT_API_TEST) \
+ $(HTTPS_API_TIMEOUT_TEST) \
  test_transport_api_multi \
  test_transport_api_reliability_tcp \
  test_transport_api_reliability_tcp_nat \
  test_transport_api_unreliability_udp \
+ test_transport_api_unreliability_constant_udp \
  $(UNIX_REL_TEST) \
  $(HTTP_REL_TEST) \
  $(HTTPS_REL_TEST) \
- test_transport_api_multiaddress_tcp \
  test_quota_compliance_tcp \
  test_quota_compliance_tcp_asymmetric_recv_constant \
  test_quota_compliance_udp \
@@ -291,22 +287,27 @@ check_PROGRAMS = \
 
 if ENABLE_TEST_RUN
 TESTS = \
- $(TEST_TRANSPORT_ATS) \
- $(ATS_TRANSPORT_BENCHMARKS) \
+ test_transport_testing \
+ test_transport_startonly \
+ test_transport_api_disconnect \
  test_transport_api_tcp \
+ test_transport_api_timeout_tcp \
+ test_transport_api_limited_sockets_tcp \
  test_transport_api_tcp_nat \
  test_transport_api_udp \
  $(UNIX_PLUGIN_TEST) \
  test_transport_api_udp_nat \
- $(HTTP_PLUGIN_TEST) \
  $(HTTP_API_TEST) \
- $(HTTPS_PLUGIN_TEST) \
+ $(HTTP_NAT_API_TEST) \
+ $(HTTP_API_TIMEOUT_TEST) \
  $(HTTPS_API_TEST) \
- test_transport_api_multiaddress_tcp \
+ $(HTTPS_NAT_API_TEST) \
+ $(HTTPS_API_TIMEOUT_TEST) \
  test_transport_api_multi \
  test_transport_api_reliability_tcp \
  test_transport_api_reliability_tcp_nat \
  test_transport_api_unreliability_udp \
+ test_transport_api_unreliability_constant_udp \
  $(UNIX_REL_TEST) \
  $(HTTP_REL_TEST) \
  $(HTTPS_REL_TEST) \
@@ -322,99 +323,142 @@ TESTS = \
  $(WLAN_UREL_TEST)
 endif
 
-test_transport_ats_SOURCES = \
- test_transport_ats.c $(TRANSPORT_ATS_SRC)
-test_transport_ats_LDADD = -lm \
- -lglpk \
+test_transport_testing_SOURCES = \
+ test_transport_testing.c
+test_transport_testing_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la 
+
+gnunet_transport_connect_running_peers_SOURCES = \
+ gnunet-transport-connect-running-peers.c
+gnunet_transport_connect_running_peers_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la 
+
+test_transport_api_disconnect_SOURCES = \
+ test_transport_api_disconnect.c
+test_transport_api_disconnect_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la 
 
-test_transport_ats_multiple_peers_SOURCES = \
- test_transport_ats_multiple_peers.c $(TRANSPORT_ATS_SRC)
-test_transport_ats_multiple_peers_LDADD = -lm \
- -lglpk \
+test_transport_startonly_SOURCES = \
+ test_transport_startonly.c
+test_transport_startonly_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la  
-
-perf_transport_ats_SOURCES = \
- perf_transport_ats.c
-perf_transport_ats_LDADD = \
- -lglpk \
- $(top_builddir)/src/util/libgnunetutil.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 = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la  \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la
+  
+test_transport_api_limited_sockets_tcp_SOURCES = \
+ test_transport_api_limited_sockets.c
+test_transport_api_limited_sockets_tcp_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/util/libgnunetutil.la  \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la
 
 test_transport_api_tcp_nat_SOURCES = \
  test_transport_api.c
 test_transport_api_tcp_nat_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la 
 
 test_transport_api_reliability_tcp_SOURCES = \
  test_transport_api_reliability.c
 test_transport_api_reliability_tcp_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la 
 
-test_transport_api_multiaddress_tcp_SOURCES = \
- test_transport_api_multiaddress.c
-test_transport_api_multiaddress_tcp_LDADD = \
+test_transport_api_timeout_tcp_SOURCES = \
+ test_transport_api_timeout.c
+test_transport_api_timeout_tcp_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la 
 
+test_transport_api_timeout_http_SOURCES = \
+ test_transport_api_timeout.c
+test_transport_api_timeout_http_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la 
+ 
+test_transport_api_timeout_https_SOURCES = \
+ test_transport_api_timeout.c
+test_transport_api_timeout_https_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la 
+ 
 test_transport_api_reliability_tcp_nat_SOURCES = \
  test_transport_api_reliability.c
 test_transport_api_reliability_tcp_nat_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la 
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la 
 
 test_transport_api_reliability_wlan_SOURCES = \
  test_transport_api_reliability.c
 test_transport_api_reliability_wlan_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la 
 
 test_transport_api_unreliability_wlan_SOURCES = \
  test_transport_api_unreliability.c
 test_transport_api_unreliability_wlan_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la 
+ 
 test_transport_api_udp_SOURCES = \
  test_transport_api.c
 test_transport_api_udp_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la  \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la 
 
 test_transport_api_udp_nat_SOURCES = \
  test_transport_api.c
 test_transport_api_udp_nat_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la   
+ $(top_builddir)/src/util/libgnunetutil.la  \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la  
 
 test_transport_api_unix_SOURCES = \
  test_transport_api.c
 test_transport_api_unix_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la 
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la 
 
 #test_plugin_transport_http_SOURCES = \
 # test_plugin_transport_http.c
@@ -429,50 +473,72 @@ test_transport_api_http_SOURCES = \
 test_transport_api_http_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la 
+ 
+ test_transport_api_http_nat_SOURCES = \
+ test_transport_api.c
+test_transport_api_http_nat_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la 
 
 test_transport_api_reliability_http_SOURCES = \
  test_transport_api_reliability.c
 test_transport_api_reliability_http_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-#test_plugin_transport_https_SOURCES = \
-# test_plugin_transport_https.c
-#test_plugin_transport_https_LDADD = \
-# $(top_builddir)/src/statistics/libgnunetstatistics.la \
-# @LIBCURL@ \
-# $(top_builddir)/src/hello/libgnunethello.la \
-# $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la 
 
 test_transport_api_https_SOURCES = \
  test_transport_api.c
 test_transport_api_https_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la  \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la 
+
+test_transport_api_https_nat_SOURCES = \
+ test_transport_api.c
+test_transport_api_https_nat_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la 
 
 test_transport_api_reliability_https_SOURCES = \
  test_transport_api_reliability.c
 test_transport_api_reliability_https_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la 
 
 test_transport_api_unreliability_unix_SOURCES = \
  test_transport_api_unreliability.c
 test_transport_api_unreliability_unix_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la 
 
 test_transport_api_unreliability_udp_SOURCES = \
  test_transport_api_unreliability.c
 test_transport_api_unreliability_udp_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la 
+
+test_transport_api_unreliability_constant_udp_SOURCES = \
+ test_transport_api_unreliability_constant.c
+test_transport_api_unreliability_constant_udp_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la 
 
 if LINUX
 test_transport_api_wlan_SOURCES = \
@@ -480,7 +546,8 @@ test_transport_api_wlan_SOURCES = \
 test_transport_api_wlan_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la  
 endif
 
 test_quota_compliance_tcp_SOURCES = \
@@ -488,7 +555,8 @@ test_quota_compliance_tcp_SOURCES = \
 test_quota_compliance_tcp_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la 
 
 test_quota_compliance_tcp_asymmetric_recv_constant_SOURCES = \
  test_quota_compliance.c
@@ -557,12 +625,6 @@ test_quota_compliance_udp_asymmetric_recv_constant_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
-#test_quota_compliance_udp_asymmetric_send_constant_SOURCES = \
-# test_quota_compliance.c
-#test_quota_compliance_udp_asymmetric_send_constant_LDADD = \
-# $(top_builddir)/src/transport/libgnunettransport.la \
-# $(top_builddir)/src/util/libgnunetutil.la 
-
 test_quota_compliance_unix_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_unix_LDADD = \
@@ -577,55 +639,71 @@ test_quota_compliance_unix_asymmetric_recv_constant_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
-
 test_transport_api_multi_SOURCES = \
  test_transport_api.c
 test_transport_api_multi_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la 
+
+
 EXTRA_DIST = \
-  gnunet-transport-certificate-creation \
-  ats_mlp_p100_m400.problem \
-  test_transport_defaults.conf \
-  test_transport_api_data.conf \
-  test_transport_api_tcp_peer1.conf \
-  test_transport_api_tcp_peer2.conf \
-  test_transport_api_udp_peer1.conf \
-  test_transport_api_udp_peer2.conf \
-  test_transport_api_unix_peer1.conf \
-  test_transport_api_unix_peer2.conf \
-  test_transport_api_udp_nat_peer1.conf \
-  test_transport_api_udp_nat_peer2.conf \
-  test_transport_api_tcp_nat_peer1.conf \
-  test_transport_api_tcp_nat_peer2.conf \
-  test_plugin_transport_data.conf \
-  test_transport_api_http_peer1.conf \
-  test_transport_api_http_peer2.conf \
-  test_transport_api_https_peer1.conf \
-  test_transport_api_https_peer2.conf \
-  test_transport_api_wlan_peer1.conf \
-  test_transport_api_wlan_peer2.conf \
-  test_transport_api_multi_peer1.conf \
-  test_transport_api_multi_peer2.conf \
-  test_transport_api_rel_http_peer1.conf \
-  test_transport_api_rel_http_peer2.conf \
-  test_transport_api_rel_https_peer1.conf \
-  test_transport_api_rel_https_peer2.conf \
-  test_plugin_transport_data_http.conf \
-  test_plugin_transport_data.conf \
-  test_quota_compliance_data.conf \
-  test_quota_compliance_tcp_peer1.conf \
-  test_quota_compliance_tcp_peer2.conf \
-  test_quota_compliance_http_peer1.conf \
-  test_quota_compliance_http_peer2.conf \
-  test_quota_compliance_https_peer1.conf \
-  test_quota_compliance_https_peer2.conf \
-  test_quota_compliance_udp_peer1.conf \
-  test_quota_compliance_udp_peer2.conf \
-  test_quota_compliance_unix_peer1.conf \
-  test_quota_compliance_unix_peer2.conf \
-  test_plugin_transport_data_udp.conf \
-  test_transport_ats_1addr.conf \
-  test_transport_ats_2addr.conf \
-  test_transport_ats_4addr.conf
+gnunet-transport-certificate-creation \
+template_cfg_peer1.conf\
+template_cfg_peer2.conf\
+test_plugin_transport_data.conf\
+test_plugin_transport_data_http.conf\
+test_plugin_transport_data_udp.conf\
+test_quota_compliance_data.conf\
+test_quota_compliance_http_peer1.conf\
+test_quota_compliance_http_peer2.conf\
+test_quota_compliance_https_peer1.conf\
+test_quota_compliance_https_peer2.conf\
+test_quota_compliance_tcp_peer1.conf\
+test_quota_compliance_tcp_peer2.conf\
+test_quota_compliance_udp_peer1.conf\
+test_quota_compliance_udp_peer2.conf\
+test_quota_compliance_unix_peer1.conf\
+test_quota_compliance_unix_peer2.conf\
+test_transport_api_data.conf\
+test_transport_api_http_peer1.conf\
+test_transport_api_http_peer2.conf\
+test_transport_api_https_peer1.conf\
+test_transport_api_https_peer2.conf\
+test_transport_api_limited_sockets_tcp_peer1.conf\
+test_transport_api_limited_sockets_tcp_peer2.conf\
+test_transport_api_timeout_tcp_peer1.conf\
+test_transport_api_timeout_tcp_peer2.conf\
+test_transport_api_multi_peer1.conf\
+test_transport_api_multi_peer2.conf\
+test_transport_api_reliability_http_peer1.conf\
+test_transport_api_reliability_http_peer2.conf\
+test_transport_api_reliability_https_peer1.conf\
+test_transport_api_reliability_https_peer2.conf\
+test_transport_api_reliability_tcp_nat_peer1.conf\
+test_transport_api_reliability_tcp_nat_peer2.conf\
+test_transport_api_reliability_tcp_peer1.conf\
+test_transport_api_reliability_tcp_peer2.conf\
+test_transport_api_reliability_wlan_peer1.conf\
+test_transport_api_reliability_wlan_peer2.conf\
+test_transport_api_tcp_nat_peer1.conf\
+test_transport_api_tcp_nat_peer2.conf\
+test_transport_api_tcp_peer1.conf\
+test_transport_api_tcp_peer2.conf\
+test_transport_api_udp_nat_peer1.conf\
+test_transport_api_udp_nat_peer2.conf\
+test_transport_api_udp_peer1.conf\
+test_transport_api_udp_peer2.conf\
+test_transport_api_unix_peer1.conf\
+test_transport_api_unix_peer2.conf\
+test_transport_api_unreliability_udp_peer1.conf\
+test_transport_api_unreliability_udp_peer2.conf\
+test_transport_api_unreliability_unix_peer1.conf\
+test_transport_api_unreliability_unix_peer2.conf\
+test_transport_api_unreliability_wlan_peer1.conf\
+test_transport_api_unreliability_wlan_peer2.conf\
+test_transport_api_wlan_peer1.conf\
+test_transport_api_wlan_peer2.conf\
+test_transport_defaults.conf\
+test_transport_startonly.conf