removing experimental from http

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

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 031cfe8b939ed13e3ec198df9b0bbcdee01d1337..8ca01eaf71bc4ad6639b6e65d2c56b1b6792b37f 100644 (file)
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -1,28 +1,21 @@
-INCLUDES = -I$(top_srcdir)/src/include
+INCLUDES = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
 
 plugindir = $(libdir)/gnunet
 
-if MINGW
-  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
-  NATBIN = gnunet-nat-server gnunet-nat-client
-  NATSERVER = gnunet-nat-server-windows.c
-  NATCLIENT = gnunet-nat-client-windows.c
-else
-  NATSERVER = gnunet-nat-server.c
-  NATCLIENT = gnunet-nat-client.c
-endif
 
 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
@@ -33,6 +26,7 @@ if USE_COVERAGE
 endif
 
 if LINUX
+if HAVE_EXPERIMENTAL
  WLAN_BIN = gnunet-transport-wlan-helper
  WLAN_BIN_DUMMY = gnunet-transport-wlan-helper-dummy
  WLAN_PLUGIN_LA = libgnunet_plugin_transport_wlan.la
@@ -40,6 +34,16 @@ if LINUX
  WLAN_REL_TEST = test_transport_api_reliability_wlan
  WLAN_UREL_TEST = test_transport_api_unreliability_wlan
 endif
+endif
+
+
+if LINUX
+install-exec-hook:
+       chown root:root $(bindir)/gnunet-transport-wlan-helper || true
+       chmod u+s $(bindir)/gnunet-transport-wlan-helper || true
+else
+install-exec-hook:
+endif
 
 if !MINGW
 UNIX_PLUGIN_LA = libgnunet_plugin_transport_unix.la
@@ -49,37 +53,30 @@ UNIX_QUOTA_TEST = test_quota_compliance_unix \
      test_quota_compliance_unix_asymmetric_recv_constant
 endif
 
-if LINUX
-NATBIN = gnunet-nat-server gnunet-nat-client
-install-exec-hook:
-       chown root $(bindir)/gnunet-nat-server $(bindir)/gnunet-nat-client $(bindir)/gnunet-transport-wlan-helper || true
-       chmod u+s $(bindir)/gnunet-nat-server $(bindir)/gnunet-nat-client $(bindir)/gnunet-transport-wlan-helper || true
-else
-install-exec-hook:
-endif
-
-#noinst_PROGRAMS = ${check_PROGRAMS}
+noinst_PROGRAMS = \
+ $(WLAN_BIN_DUMMY) \
+ gnunet-transport-connect-running-peers
 
 lib_LTLIBRARIES = \
   libgnunettransport.la \
-  libgnunettransportnew.la
+  libgnunettransporttesting.la
 
-libgnunettransportnew_la_SOURCES = \
-  transport_api_new.c transport.h \
-  transport_api_blacklist.c \
-  transport_api_address_lookup.c 
-libgnunettransportnew_la_LIBADD = \
+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) 
-libgnunettransportnew_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS) $(WINFLAGS) \
-  -version-info 0:0:0
+libgnunettransporttesting_la_DEPENDENCIES = \
+  libgnunettransport.la
 
 libgnunettransport_la_SOURCES = \
   transport_api.c transport.h \
   transport_api_blacklist.c \
-  transport_api_address_lookup.c 
+  transport_api_address_lookup.c \
+  transport_api_peer_address_lookup.c \
+  transport_api_address_iterate.c
 libgnunettransport_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/util/libgnunetutil.la \
@@ -88,55 +85,68 @@ libgnunettransport_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
   -version-info 0:0:0
 
-
 bin_PROGRAMS = \
  gnunet-transport \
  $(WLAN_BIN) \
- gnunet-service-transport $(NATBIN) \
- $(WLAN_BIN_DUMMY)
-
-bin_SCRIPTS = \
+ gnunet-service-transport \
+ gnunet-transport-list-connections \
  gnunet-transport-certificate-creation
 
-gnunet_nat_server_SOURCES = \
- $(NATSERVER)
+#bin_SCRIPTS = \
+# gnunet-transport-certificate-creation
 
+gnunet_transport_certificate_creation_SOURCES = \
+ gnunet-transport-certificate-creation.c
+gnunet_transport_certificate_creation_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la
 
 gnunet_transport_wlan_helper_SOURCES = \
- wlan/radiotap-parser.c \
- wlan/helper_common.c \
- gnunet-transport-wlan-helper.c
+ wlan/byteorder.h \
+ wlan/crctable_osdep.h \
+ wlan/helper_common.c wlan/helper_common.h \
+ wlan/ieee80211.h \
+ wlan/ieee80211_radiotap.h \
+ 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 
 
-gnunet_nat_client_SOURCES = \
- $(NATCLIENT)         
+gnunet_transport_list_connections_SOURCES = \
+ gnunet-transport-list-connections.c         
+gnunet_transport_list_connections_LDADD = \
+  $(top_builddir)/src/transport/libgnunettransport.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+gnunet_transport_list_connections_DEPENDENCIES = \
+  libgnunettransport.la
 
 gnunet_transport_SOURCES = \
  gnunet-transport.c         
 gnunet_transport_LDADD = \
-  $(top_builddir)/src/transport/libgnunettransportnew.la \
+  $(top_builddir)/src/transport/libgnunettransport.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
 gnunet_transport_DEPENDENCIES = \
-  libgnunettransportnew.la                             
-
-if HAVE_LIBGLPK
-  GN_GLPK = -lglpk
-endif
+  libgnunettransport.la                                
 
 gnunet_service_transport_SOURCES = \
- gnunet-service-transport.c
+ 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_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 \
@@ -152,7 +162,6 @@ plugin_LTLIBRARIES = \
   $(HTTPS_PLUGIN_LA) \
   $(WLAN_PLUGIN_LA) \
   libgnunet_plugin_transport_template.la
-# TODO: add nat, etc.
 
 libgnunet_plugin_transport_tcp_la_SOURCES = \
   plugin_transport_tcp.c
@@ -173,11 +182,12 @@ libgnunet_plugin_transport_template_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
 libgnunet_plugin_transport_wlan_la_SOURCES = \
-  plugin_transport_wlan.c
+  plugin_transport_wlan.c plugin_transport_wlan.h
 libgnunet_plugin_transport_wlan_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+  $(top_builddir)/src/fragmentation/libgnunetfragmentation.la \
   $(top_builddir)/src/util/libgnunetutil.la 
 libgnunet_plugin_transport_wlan_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS)
@@ -186,8 +196,10 @@ libgnunet_plugin_transport_udp_la_SOURCES = \
   plugin_transport_udp.c
 libgnunet_plugin_transport_udp_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/fragmentation/libgnunetfragmentation.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+  $(top_builddir)/src/nat/libgnunetnat.la \
   $(top_builddir)/src/util/libgnunetutil.la 
 libgnunet_plugin_transport_udp_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
@@ -203,28 +215,30 @@ 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 \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
   @LIBCURL@ \
+  $(top_builddir)/src/nat/libgnunetnat.la \
   $(top_builddir)/src/util/libgnunetutil.la 
 libgnunet_plugin_transport_http_la_LDFLAGS = \
  $(GN_LIBMHD) \
  $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_transport_https_la_CFLAGS = \
+libgnunet_plugin_transport_http_la_CFLAGS = \
  $(CFLAGS) 
-libgnunet_plugin_transport_https_la_CPPFLAGS = \
+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 \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
   @LIBCURL@ \
+  $(top_builddir)/src/nat/libgnunetnat.la \
   $(top_builddir)/src/util/libgnunetutil.la 
 libgnunet_plugin_transport_https_la_LDFLAGS = \
  $(GN_LIBMHD) \
@@ -236,21 +250,27 @@ libgnunet_plugin_transport_https_la_CPPFLAGS = \
 
 
 check_PROGRAMS = \
- test_transport_ats \
- perf_transport_ats \
+ 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) \
@@ -264,25 +284,30 @@ check_PROGRAMS = \
  $(WLAN_API_TEST) \
  $(WLAN_REL_TEST) \
  $(WLAN_UREL_TEST)
-# TODO: add tests for nat, etc.
 
-if !DISABLE_TEST_RUN
+if ENABLE_TEST_RUN
 TESTS = \
- test_transport_ats \
- perf_transport_ats \
+ 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) \
@@ -298,288 +323,387 @@ TESTS = \
  $(WLAN_UREL_TEST)
 endif
 
-test_transport_ats_SOURCES = \
- test_transport_ats.c
-test_transport_ats_LDADD = -lm \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+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  
+ $(top_builddir)/src/util/libgnunetutil.la 
 
-perf_transport_ats_SOURCES = \
- perf_transport_ats.c
-perf_transport_ats_LDADD = \
- $(GN_GLPK) \
- $(top_builddir)/src/util/libgnunetutil.la  
+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/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/libgnunettransportnew.la \
+ $(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_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/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/libgnunettransportnew.la \
+ $(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/libgnunettransportnew.la \
+ $(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_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/libgnunettransportnew.la \
+ $(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/libgnunettransportnew.la \
+ $(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/libgnunettransportnew.la \
+ $(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/libgnunettransportnew.la \
+ $(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/libgnunettransportnew.la \
+ $(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/libgnunettransportnew.la \
+ $(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
-test_plugin_transport_http_LDADD = \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
- @LIBCURL@ \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la  
+#test_plugin_transport_http_SOURCES = \
+# test_plugin_transport_http.c
+#test_plugin_transport_http_LDADD = \
+# $(top_builddir)/src/statistics/libgnunetstatistics.la \
+# @LIBCURL@ \
+# $(top_builddir)/src/hello/libgnunethello.la \
+# $(top_builddir)/src/util/libgnunetutil.la  
 
 test_transport_api_http_SOURCES = \
  test_transport_api.c
 test_transport_api_http_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(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/libgnunettransportnew.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/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_SOURCES = \
  test_transport_api.c
 test_transport_api_https_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(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/libgnunettransportnew.la \
+ $(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/libgnunettransportnew.la \
+ $(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/libgnunettransportnew.la \
+ $(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 = \
  test_transport_api.c
 test_transport_api_wlan_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(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 = \
  test_quota_compliance.c
 test_quota_compliance_tcp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(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
 test_quota_compliance_tcp_asymmetric_recv_constant_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 #test_quota_compliance_tcp_asymmetric_send_constant_SOURCES = \
 # test_quota_compliance.c
 #test_quota_compliance_tcp_asymmetric_send_constant_LDADD = \
-# $(top_builddir)/src/transport/libgnunettransportnew.la \
+# $(top_builddir)/src/transport/libgnunettransport.la \
 # $(top_builddir)/src/util/libgnunetutil.la
 
 test_quota_compliance_http_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_http_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
  test_quota_compliance_http_asymmetric_recv_constant_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_http_asymmetric_recv_constant_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 #test_quota_compliance_http_asymmetric_send_constant_SOURCES = \
 # test_quota_compliance.c
 #test_quota_compliance_http_asymmetric_send_constant_LDADD = \
-# $(top_builddir)/src/transport/libgnunettransportnew.la \
+# $(top_builddir)/src/transport/libgnunettransport.la \
 # $(top_builddir)/src/util/libgnunetutil.la
 
 test_quota_compliance_https_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_https_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
  test_quota_compliance_https_asymmetric_recv_constant_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_https_asymmetric_recv_constant_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 #test_quota_compliance_https_asymmetric_send_constant_SOURCES = \
 # test_quota_compliance.c
 #test_quota_compliance_https_asymmetric_send_constant_LDADD = \
-# $(top_builddir)/src/transport/libgnunettransportnew.la \
+# $(top_builddir)/src/transport/libgnunettransport.la \
 # $(top_builddir)/src/util/libgnunetutil.la
 
 test_quota_compliance_udp_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_udp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_quota_compliance_udp_asymmetric_recv_constant_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_udp_asymmetric_recv_constant_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
  $(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/libgnunettransportnew.la \
-# $(top_builddir)/src/util/libgnunetutil.la 
-
 test_quota_compliance_unix_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_unix_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_quota_compliance_unix_asymmetric_recv_constant_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_unix_asymmetric_recv_constant_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
  $(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/libgnunettransportnew.la \
+ $(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_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
+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