- fix

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

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index ce05e6d5574ad9cbc5ef2b420423054357437d0c..950b0a9a031278380d28385f47109cebc76e3d62 100644 (file)
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -1,3 +1,4 @@
+# This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
 
 plugindir = $(libdir)/gnunet
@@ -23,6 +24,17 @@ if HAVE_LIBGNURL
  HTTPS_CLIENT_PLUGIN_TEST = test_plugin_https_client
  HTTP_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_http_client.la
  HTTPS_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_https_client.la
+LIB_GNURL=@LIBGNURL@
+CPP_GNURL=@LIBGNURL_CPPFLAGS@
+else
+if HAVE_LIBCURL
+ HTTP_CLIENT_PLUGIN_TEST = test_plugin_http_client
+ HTTPS_CLIENT_PLUGIN_TEST = test_plugin_https_client
+ HTTP_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_http_client.la
+ HTTPS_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_https_client.la
+LIB_GNURL=@LIBCURL@
+CPP_GNURL=@LIBCURL_CPPFLAGS@
+endif
 endif
 
 if HAVE_MHD
@@ -30,14 +42,36 @@ if HAVE_LIBGNURL
  HTTP_API_TEST = test_transport_api_http
  HTTP_REVERSE_API_TEST = test_transport_api_http_reverse
  HTTP_API_TIMEOUT_TEST = test_transport_api_timeout_http
- HTTP_REL_TEST = test_transport_api_reliability_http
+ HTTP_REL_TEST = test_transport_api_reliability_http \
+                test_transport_api_reliability_http_xhr
  HTTP_QUOTA_TEST = test_quota_compliance_http \
                   test_quota_compliance_http_asymmetric
+ HTTP_SWITCH = test_transport_address_switch_http
  HTTPS_API_TEST = test_transport_api_https
  HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https
- HTTPS_REL_TEST = test_transport_api_reliability_https
+ HTTPS_REL_TEST = test_transport_api_reliability_https \
+                 test_transport_api_reliability_https_xhr
  HTTPS_QUOTA_TEST = test_quota_compliance_https \
                test_quota_compliance_https_asymmetric
+ HTTPS_SWITCH = test_transport_address_switch_https
+else
+if HAVE_LIBCURL
+ HTTP_API_TEST = test_transport_api_http
+ HTTP_REVERSE_API_TEST = test_transport_api_http_reverse
+ HTTP_API_TIMEOUT_TEST = test_transport_api_timeout_http
+ HTTP_REL_TEST = test_transport_api_reliability_http \
+                test_transport_api_reliability_http_xhr
+ HTTP_QUOTA_TEST = test_quota_compliance_http \
+                  test_quota_compliance_http_asymmetric
+ HTTP_SWITCH = test_transport_address_switch_http
+ HTTPS_API_TEST = test_transport_api_https
+ HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https
+ HTTPS_REL_TEST = test_transport_api_reliability_https \
+                 test_transport_api_reliability_https_xhr
+ HTTPS_QUOTA_TEST = test_quota_compliance_https \
+               test_quota_compliance_https_asymmetric
+ HTTPS_SWITCH = test_transport_address_switch_https
+endif
 endif
 endif
 
@@ -62,6 +96,9 @@ endif
 if LINUX
 install-exec-hook:
        $(top_srcdir)/src/transport/install-wlan-helper.sh $(libexecdir) $(SUDO_BINARY) || true
+if HAVE_LIBBLUETOOTH
+       $(top_srcdir)/src/transport/install-bluetooth-helper.sh $(libexecdir) $(SUDO_BINARY) || true
+endif
 else
 install-exec-hook:
 endif
@@ -84,14 +121,7 @@ if MINGW
 endif
 endif
 
-if LINUX
-if HAVE_LIBBLUETOOTH
-install-exec-hook2:
-       $(top_srcdir)/src/transport/install-bluetooth-helper.sh $(libexecdir) $(SUDO_BINARY) || true
-endif
-else
-install-exec-hook2:
-endif
+
 
 if !MINGW
 UNIX_PLUGIN_LA = libgnunet_plugin_transport_unix.la
@@ -107,6 +137,7 @@ endif
 endif
 
 noinst_PROGRAMS = \
+ gnunet-transport-profiler \
  $(WLAN_BIN_SENDER) \
  $(WLAN_BIN_RECEIVER)
 
@@ -121,13 +152,11 @@ lib_LTLIBRARIES = \
 libgnunettransporttesting_la_SOURCES = \
   transport-testing.c transport-testing.h
 libgnunettransporttesting_la_LIBADD = \
-  $(top_builddir)/src/transport/libgnunettransport.la \
+  libgnunettransport.la \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(GN_LIBINTL)
-libgnunettransporttesting_la_DEPENDENCIES = \
-  libgnunettransport.la
 libgnunettransporttesting_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS)
 
@@ -135,9 +164,12 @@ libgnunettransport_la_SOURCES = \
   transport_api.c transport.h \
   transport_api_blacklist.c \
   transport_api_address_to_string.c \
-  transport_api_monitoring.c
+  transport_api_monitor_peers.c \
+  transport_api_monitor_plugins.c \
+  transport_api_monitor_validation.c
 libgnunettransport_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
 libgnunettransport_la_LDFLAGS = \
@@ -190,19 +222,27 @@ else
  gnunet_helper_transport_bluetooth_LDFLAGS = -lbluetooth
 endif
 
+gnunet_transport_profiler_SOURCES = \
+ gnunet-transport-profiler.c
+gnunet_transport_profiler_LDADD = \
+  libgnunettransport.la \
+  $(top_builddir)/src/nat/libgnunetnat.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+
 gnunet_transport_SOURCES = \
  gnunet-transport.c
 gnunet_transport_LDADD = \
-  $(top_builddir)/src/transport/libgnunettransport.la \
+  libgnunettransport.la \
   $(top_builddir)/src/nat/libgnunetnat.la \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_transport_DEPENDENCIES = \
-  libgnunettransport.la
 
 gnunet_service_transport_SOURCES = \
  gnunet-service-transport.c gnunet-service-transport.h \
+ gnunet-service-transport_ats.h gnunet-service-transport_ats.c \
  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 \
@@ -216,7 +256,7 @@ gnunet_service_transport_SOURCES = \
 # a crash on unloading of a plugin unless the service links against
 # that library as well.
 gnunet_service_transport_LDADD = \
-  $(top_builddir)/src/transport/libgnunettransport.la \
+  libgnunettransport.la \
   $(top_builddir)/src/ats/libgnunetats.la \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
@@ -225,8 +265,6 @@ gnunet_service_transport_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_GLPK) \
   $(GN_LIBINTL)
-gnunet_service_transport_DEPENDENCIES = \
- libgnunettransport.la
 gnunet_service_transport_CFLAGS = \
   $(CFLAGS)
 # -DANALYZE
@@ -240,7 +278,11 @@ plugin_LTLIBRARIES = \
   $(HTTP_SERVER_PLUGIN_LA) \
   $(HTTPS_SERVER_PLUGIN_LA) \
   $(WLAN_PLUGIN_LA) \
-  $(BT_PLUGIN_LA) \
+  $(BT_PLUGIN_LA)
+
+# Note: real plugins of course need to be added
+# to the plugin_LTLIBRARIES above
+noinst_LTLIBRARIES = \
   libgnunet_plugin_transport_template.la
 
 libgnunet_plugin_transport_tcp_la_SOURCES = \
@@ -273,9 +315,11 @@ libgnunet_plugin_transport_wlan_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la
 libgnunet_plugin_transport_wlan_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_transport_wlan_la_CFLAGS = \
+ $(CFLAGS) -DBUILD_WLAN
 
 libgnunet_plugin_transport_bluetooth_la_SOURCES = \
-  plugin_transport_bluetooth.c plugin_transport_wlan.h
+  plugin_transport_wlan.c plugin_transport_wlan.h
 libgnunet_plugin_transport_bluetooth_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -284,6 +328,8 @@ libgnunet_plugin_transport_bluetooth_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la
 libgnunet_plugin_transport_bluetooth_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_transport_bluetooth_la_CFLAGS = \
+ $(CFLAGS) -DBUILD_BLUETOOTH
 
 libgnunet_plugin_transport_udp_la_SOURCES = \
   plugin_transport_udp.c plugin_transport_udp.h \
@@ -317,7 +363,7 @@ libgnunet_plugin_transport_http_client_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
-  @LIBGNURL@ \
+  $(LIB_GNURL) \
   $(top_builddir)/src/nat/libgnunetnat.la \
   $(top_builddir)/src/util/libgnunetutil.la
 libgnunet_plugin_transport_http_client_la_LDFLAGS = \
@@ -325,7 +371,7 @@ libgnunet_plugin_transport_http_client_la_LDFLAGS = \
 libgnunet_plugin_transport_http_client_la_CFLAGS = \
  $(CFLAGS)
 libgnunet_plugin_transport_http_client_la_CPPFLAGS = \
- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS)
+ $(CPP_GNURL) $(AM_CPPFLAGS)
 
 
 libgnunet_plugin_transport_http_server_la_SOURCES = \
@@ -348,7 +394,7 @@ libgnunet_plugin_transport_https_client_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
-  @LIBGNURL@ \
+  $(LIB_GNURL) \
   $(top_builddir)/src/nat/libgnunetnat.la \
   $(top_builddir)/src/util/libgnunetutil.la
 libgnunet_plugin_transport_https_client_la_LDFLAGS = \
@@ -356,7 +402,7 @@ libgnunet_plugin_transport_https_client_la_LDFLAGS = \
 libgnunet_plugin_transport_https_client_la_CFLAGS = \
  $(CFLAGS) -DBUILD_HTTPS
 libgnunet_plugin_transport_https_client_la_CPPFLAGS = \
- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS)
+ $(CPP_GNURL) $(AM_CPPFLAGS)
 
 
 libgnunet_plugin_transport_https_server_la_SOURCES = \
@@ -376,6 +422,9 @@ libgnunet_plugin_transport_https_server_la_CFLAGS = \
 
 if HAVE_TESTING
 check_PROGRAMS = \
+ test_transport_api_restart_2peers \
+ test_transport_address_switch_tcp \
+ test_transport_address_switch_udp \
  test_transport_testing_startstop \
  test_transport_testing_restart \
  test_transport_testing \
@@ -395,7 +444,6 @@ check_PROGRAMS = \
  test_transport_api_bidirectional_connect \
  test_transport_api_tcp \
  test_transport_api_restart_1peer \
- test_transport_api_restart_2peers \
  test_transport_api_timeout_tcp \
  test_transport_api_limited_sockets_tcp \
  test_transport_api_tcp_nat \
@@ -408,15 +456,17 @@ check_PROGRAMS = \
  $(HTTP_API_TEST) \
  $(HTTP_REVERSE_API_TEST) \
  $(HTTP_API_TIMEOUT_TEST) \
+ $(HTTP_SWITCH) \
  $(HTTPS_API_TEST) \
  $(HTTPS_API_TIMEOUT_TEST) \
+ $(HTTPS_SWITCH) \
  $(WLAN_API_TEST) \
  $(WLAN_TIMEOUT_TEST) \
  $(BT_API_TEST) \
  $(BT_TIMEOUT_TEST) \
  test_transport_api_multi \
- test_transport_api_monitoring \
- test_transport_api_monitoring_validation \
+ test_transport_api_monitor_peers \
+ test_transport_api_monitor_validation \
  test_transport_blacklisting_no_bl \
  test_transport_blacklisting_outbound_bl_full \
  test_transport_blacklisting_outbound_bl_plugin \
@@ -444,6 +494,10 @@ check_PROGRAMS = \
  $(HTTPS_QUOTA_TEST) \
  $(WLAN_QUOTA_TEST) \
  $(BT_QUOTA_TEST)
+if HAVE_GETOPT_BINARY
+check_PROGRAMS += \
+test_transport_api_slow_ats
+endif
 endif
 
 if ENABLE_TEST_RUN
@@ -464,26 +518,19 @@ TESTS = \
  test_transport_api_tcp \
  test_transport_api_restart_1peer \
  test_transport_api_restart_2peers \
- test_transport_api_timeout_tcp \
  test_transport_api_limited_sockets_tcp \
  test_transport_api_tcp_nat \
  test_transport_api_udp \
- test_transport_api_timeout_udp \
  $(UNIX_PLUGIN_TEST) \
- $(UNIX_PLUGIN_TIMEOUT_TEST) \
  $(UNIX_API_ABSTRACT_TEST) \
  test_transport_api_udp_nat \
  $(HTTP_API_TEST) \
- $(HTTP_API_TIMEOUT_TEST) \
  $(HTTPS_API_TEST) \
- $(HTTPS_API_TIMEOUT_TEST) \
  $(WLAN_API_TEST) \
- $(WLAN_TIMEOUT_TEST) \
  $(BT_API_TEST) \
- $(BT_TIMEOUT_TEST) \
  test_transport_api_multi \
- test_transport_api_monitoring \
- test_transport_api_monitoring_validation \
+ test_transport_api_monitor_peers \
+ test_transport_api_monitor_validation \
  test_transport_blacklisting_no_bl \
  test_transport_blacklisting_outbound_bl_full \
  test_transport_blacklisting_outbound_bl_plugin \
@@ -508,498 +555,533 @@ TESTS = \
  test_quota_compliance_udp \
  $(UNIX_QUOTA_TEST) \
  $(HTTP_QUOTA_TEST) \
- $(HTTPS_QUOTA_TEST)
+ $(HTTPS_QUOTA_TEST) \
+ test_transport_api_timeout_tcp \
+ test_transport_api_timeout_udp \
+ $(UNIX_PLUGIN_TIMEOUT_TEST) \
+ $(HTTP_API_TIMEOUT_TEST) \
+ $(HTTPS_API_TIMEOUT_TEST) \
+ $(WLAN_TIMEOUT_TEST) \
+ $(BT_TIMEOUT_TEST) \
+ test_transport_address_switch_tcp \
+ test_transport_address_switch_udp \
+ $(HTTP_SWITCH) \
+ $(HTTPS_SWITCH)
+if HAVE_GETOPT_BINARY
+TESTS += \
+test_transport_api_slow_ats
+endif
 endif
 
 test_transport_testing_startstop_SOURCES = \
  test_transport_testing_startstop.c
 test_transport_testing_startstop_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_testing_restart_SOURCES = \
  test_transport_testing_restart.c
 test_transport_testing_restart_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.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 \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_blacklisting_SOURCES = \
  test_transport_api_blacklisting.c
 test_transport_api_blacklisting_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ 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
+ libgnunettransporttesting.la
 
 test_transport_blacklisting_no_bl_SOURCES = \
  test_transport_blacklisting.c
 test_transport_blacklisting_no_bl_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ 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
+ libgnunettransporttesting.la
 
 test_transport_blacklisting_outbound_bl_full_SOURCES = \
  test_transport_blacklisting.c
 test_transport_blacklisting_outbound_bl_full_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ 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
+ libgnunettransporttesting.la
 
 test_transport_blacklisting_outbound_bl_plugin_SOURCES = \
  test_transport_blacklisting.c
 test_transport_blacklisting_outbound_bl_plugin_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ 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
+ libgnunettransporttesting.la
 
 test_transport_blacklisting_inbound_bl_full_SOURCES = \
  test_transport_blacklisting.c
 test_transport_blacklisting_inbound_bl_full_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ 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
+ libgnunettransporttesting.la
 
 test_transport_blacklisting_inbound_bl_plugin_SOURCES = \
  test_transport_blacklisting.c
 test_transport_blacklisting_inbound_bl_plugin_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ 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
+ libgnunettransporttesting.la
 
 test_transport_blacklisting_multiple_plugins_SOURCES = \
  test_transport_blacklisting.c
 test_transport_blacklisting_multiple_plugins_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ 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
+ libgnunettransporttesting.la
 
 
 test_transport_api_disconnect_tcp_SOURCES = \
  test_transport_api_disconnect.c
 test_transport_api_disconnect_tcp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ 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
+ libgnunettransporttesting.la
 
 test_transport_startonly_SOURCES = \
  test_transport_startonly.c
 test_transport_startonly_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ 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
+ libgnunettransporttesting.la
 
 test_plugin_tcp_SOURCES = \
  test_plugin_transport.c
 test_plugin_tcp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ 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
+ libgnunettransporttesting.la
 
 test_plugin_udp_SOURCES = \
  test_plugin_transport.c
 test_plugin_udp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ 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
+ libgnunettransporttesting.la
 
 test_plugin_unix_SOURCES = \
  test_plugin_transport.c
 test_plugin_unix_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ 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
+ libgnunettransporttesting.la
 
 test_plugin_wlan_SOURCES = \
  test_plugin_transport.c
 test_plugin_wlan_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ 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
+ libgnunettransporttesting.la
 
 test_plugin_bluetooth_SOURCES = \
  test_plugin_transport.c
 test_plugin_bluetooth_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ 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
+ libgnunettransporttesting.la
 
 test_http_common_SOURCES = \
  test_http_common.c plugin_transport_http_common.c
 test_http_common_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ 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
+ libgnunettransporttesting.la
 
 test_plugin_http_server_SOURCES = \
  test_plugin_transport.c
 test_plugin_http_server_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ 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
+ libgnunettransporttesting.la
 
 test_plugin_https_server_SOURCES = \
  test_plugin_transport.c
 test_plugin_https_server_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ 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
+ libgnunettransporttesting.la
 
 test_plugin_http_client_SOURCES = \
  test_plugin_transport.c
 test_plugin_http_client_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ 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
+ libgnunettransporttesting.la
 
 test_plugin_https_client_SOURCES = \
  test_plugin_transport.c
 test_plugin_https_client_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ 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
+ libgnunettransporttesting.la
 
 test_transport_api_tcp_SOURCES = \
  test_transport_api.c
 test_transport_api_tcp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_bidirectional_connect_SOURCES = \
  test_transport_api_bidirectional_connect.c
 test_transport_api_bidirectional_connect_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_restart_1peer_SOURCES = \
  test_transport_api_restart_1peer.c
 test_transport_api_restart_1peer_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ 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
+ libgnunettransporttesting.la
 
 test_transport_api_restart_2peers_SOURCES = \
  test_transport_api_restart_2peers.c
 test_transport_api_restart_2peers_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ 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
+ 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 \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_tcp_nat_SOURCES = \
  test_transport_api.c
 test_transport_api_tcp_nat_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_manipulation_send_tcp_SOURCES = \
  test_transport_api_manipulation_send_tcp.c
 test_transport_api_manipulation_send_tcp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_manipulation_recv_tcp_SOURCES = \
  test_transport_api_manipulation_recv_tcp.c
 test_transport_api_manipulation_recv_tcp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_manipulation_cfg_SOURCES = \
  test_transport_api_manipulation_cfg.c
 test_transport_api_manipulation_cfg_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ 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 \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ 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 \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_timeout_unix_SOURCES = \
  test_transport_api_timeout.c
 test_transport_api_timeout_unix_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_timeout_wlan_SOURCES = \
  test_transport_api_timeout.c
 test_transport_api_timeout_wlan_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_timeout_bluetooth_SOURCES = \
  test_transport_api_timeout.c
 test_transport_api_timeout_bluetooth_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ 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 \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_reliability_bluetooth_SOURCES = \
  test_transport_api_reliability.c
 test_transport_api_reliability_bluetooth_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ 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 \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_udp_SOURCES = \
  test_transport_api.c
 test_transport_api_udp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_timeout_udp_SOURCES = \
  test_transport_api_timeout.c
 test_transport_api_timeout_udp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_udp_nat_SOURCES = \
  test_transport_api.c
 test_transport_api_udp_nat_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_unix_SOURCES = \
  test_transport_api.c
 test_transport_api_unix_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_unix_abstract_SOURCES = \
  test_transport_api.c
 test_transport_api_unix_abstract_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 # HTTP tests
 test_transport_api_http_SOURCES = \
  test_transport_api.c
 test_transport_api_http_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_http_reverse_SOURCES = \
  test_transport_api.c
 test_transport_api_http_reverse_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ 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 \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ 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 \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
+
+test_transport_api_reliability_http_xhr_SOURCES = \
+ test_transport_api_reliability.c
+test_transport_api_reliability_http_xhr_LDADD = \
+ libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettransporttesting.la
 
 test_quota_compliance_http_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_http_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_quota_compliance_http_asymmetric_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_http_asymmetric_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_quota_compliance_https_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_https_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_quota_compliance_https_asymmetric_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_https_asymmetric_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 # HTTPS tests
 test_transport_api_https_SOURCES = \
  test_transport_api.c
 test_transport_api_https_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ 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 \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ 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 \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
+
+test_transport_api_reliability_https_xhr_SOURCES = \
+ test_transport_api_reliability.c
+test_transport_api_reliability_https_xhr_LDADD = \
+ libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettransporttesting.la
 
 test_transport_api_reliability_unix_SOURCES = \
  test_transport_api_reliability.c
 test_transport_api_reliability_unix_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_reliability_udp_SOURCES = \
  test_transport_api_reliability.c
 test_transport_api_reliability_udp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 if LINUX
 test_transport_api_wlan_SOURCES = \
  test_transport_api.c
 test_transport_api_wlan_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 endif
 
 if LINUX
@@ -1007,114 +1089,169 @@ if HAVE_LIBBLUETOOTH
 test_transport_api_bluetooth_SOURCES = \
  test_transport_api.c
 test_transport_api_bluetooth_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 endif
 endif
 
+test_transport_address_switch_tcp_SOURCES = \
+ test_transport_address_switch.c
+test_transport_address_switch_tcp_LDADD = \
+ libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettransporttesting.la
+
+ test_transport_address_switch_udp_SOURCES = \
+ test_transport_address_switch.c
+test_transport_address_switch_udp_LDADD = \
+ libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettransporttesting.la
+
+
+ test_transport_address_switch_http_SOURCES = \
+ test_transport_address_switch.c
+test_transport_address_switch_http_LDADD = \
+ libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettransporttesting.la
+
+ test_transport_address_switch_https_SOURCES = \
+ test_transport_address_switch.c
+test_transport_address_switch_https_LDADD = \
+ libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettransporttesting.la
+
 test_quota_compliance_tcp_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_tcp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_quota_compliance_tcp_asymmetric_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_tcp_asymmetric_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_quota_compliance_udp_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_udp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_quota_compliance_unix_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_unix_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_quota_compliance_unix_asymmetric_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_unix_asymmetric_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_quota_compliance_wlan_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_wlan_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_quota_compliance_wlan_asymmetric_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_wlan_asymmetric_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_quota_compliance_bluetooth_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_bluetooth_LDADD = \
  $(top_builddir)/src/nat/libgnunetnat.la \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_quota_compliance_bluetooth_asymmetric_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_bluetooth_asymmetric_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_multi_SOURCES = \
  test_transport_api.c
 test_transport_api_multi_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
-test_transport_api_monitoring_SOURCES = \
- test_transport_api_monitoring.c
-test_transport_api_monitoring_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+test_transport_api_monitor_peers_SOURCES = \
+ test_transport_api_monitor_peers.c
+test_transport_api_monitor_peers_LDADD = \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
-test_transport_api_monitoring_validation_SOURCES = \
- test_transport_api_monitoring_validation.c
-test_transport_api_monitoring_validation_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+test_transport_api_monitor_validation_SOURCES = \
+ test_transport_api_monitor_validation.c
+test_transport_api_monitor_validation_LDADD = \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
+
+test_transport_api_slow_ats_SOURCES = \
+ test_transport_api.c
+test_transport_api_slow_ats_LDADD = \
+ libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/util/libgnunetutil.la  \
+ libgnunettransporttesting.la
 
 
 EXTRA_DIST = \
 test_plugin_hostkey \
 test_plugin_hostkey.ecc \
+test_delay \
 template_cfg_peer1.conf\
 template_cfg_peer2.conf\
 test_plugin_transport_data.conf\
@@ -1197,22 +1334,28 @@ test_transport_api_timeout_wlan_peer1.conf \
 test_transport_api_timeout_wlan_peer2.conf \
 test_transport_api_timeout_bluetooth_peer1.conf\
 test_transport_api_timeout_bluetooth_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_reliability_udp_peer1.conf\
+test_transport_api_reliability_udp_peer2.conf\
+test_transport_api_reliability_http_xhr_peer1.conf\
+test_transport_api_reliability_http_xhr_peer2.conf\
+test_transport_api_reliability_https_xhr_peer1.conf\
+test_transport_api_reliability_https_xhr_peer2.conf\
+test_transport_api_reliability_unix_peer1.conf\
+test_transport_api_reliability_unix_peer2.conf\
+test_transport_api_reliability_wlan_peer1.conf\
+test_transport_api_reliability_wlan_peer2.conf\
 test_transport_api_unreliability_wlan_peer1.conf\
 test_transport_api_unreliability_wlan_peer2.conf\
-test_transport_api_unreliability_bluetooth_peer1.conf\
-test_transport_api_unreliability_bluetooth_peer2.conf\
+test_transport_api_reliability_bluetooth_peer1.conf\
+test_transport_api_reliability_bluetooth_peer2.conf\
 test_transport_api_wlan_peer1.conf\
 test_transport_api_wlan_peer2.conf\
 test_transport_api_bluetooth_peer1.conf\
 test_transport_api_bluetooth_peer2.conf\
-test_transport_api_monitoring_peer1.conf\
-test_transport_api_monitoring_peer2.conf\
-test_transport_api_monitoring_validation_peer1.conf\
-test_transport_api_monitoring_validation_peer2.conf\
+test_transport_api_monitor_peers_peer1.conf\
+test_transport_api_monitor_peers_peer2.conf\
+test_transport_api_monitor_validation_peer1.conf\
+test_transport_api_monitor_validation_peer2.conf\
 test_transport_defaults.conf\
 test_transport_startonly.conf\
 test_transport_api_disconnect_tcp_peer1.conf\
@@ -1230,4 +1373,8 @@ test_transport_blacklisting_cfg_blp_peer2_plugin.conf \
 test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf \
 test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf \
 test_transport_api_http_reverse_peer1.conf \
-test_transport_api_http_reverse_peer2.conf
+test_transport_api_http_reverse_peer2.conf \
+perf_tcp_peer1.conf \
+perf_tcp_peer2.conf \
+test_transport_api_slow_ats_peer1.conf \
+test_transport_api_slow_ats_peer2.conf