comment

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

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index bc116171f4270139d5aa68742bd7025d34d01179..7fc679b201498ad9a6f65ea66753878c0c0f757f 100644 (file)
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -2,6 +2,11 @@ INCLUDES = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
 
 plugindir = $(libdir)/gnunet
 
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+pkgcfg_DATA = \
+  transport.conf
+
 
 if HAVE_MHD
  GN_LIBMHD = -lmicrohttpd
@@ -28,21 +33,22 @@ if USE_COVERAGE
 endif
 
 if LINUX
-if HAVE_EXPERIMENTAL
- WLAN_BIN = gnunet-transport-wlan-helper
- WLAN_BIN_DUMMY = gnunet-transport-wlan-helper-dummy
+ WLAN_BIN = gnunet-helper-transport-wlan
+ WLAN_BIN_DUMMY = gnunet-helper-transport-wlan-dummy
+ WLAN_BIN_SENDER = gnunet-transport-wlan-sender
  WLAN_PLUGIN_LA = libgnunet_plugin_transport_wlan.la
  WLAN_API_TEST = test_transport_api_wlan
  WLAN_REL_TEST = test_transport_api_reliability_wlan
  WLAN_UREL_TEST = test_transport_api_unreliability_wlan
-endif
+ WLAN_QUOTA_TEST = test_quota_compliance_wlan \
+               test_quota_compliance_wlan_asymmetric
 endif
 
 
 if LINUX
 install-exec-hook:
-       chown root:root $(bindir)/gnunet-transport-wlan-helper || true
-       chmod u+s $(bindir)/gnunet-transport-wlan-helper || true
+       $(SUDO_BINARY) chown root:root $(bindir)/gnunet-helper-transport-wlan || true
+       $(SUDO_BINARY) chmod u+s $(bindir)/gnunet-helper-transport-wlan || true
 else
 install-exec-hook:
 endif
@@ -50,14 +56,14 @@ endif
 if !MINGW
 UNIX_PLUGIN_LA = libgnunet_plugin_transport_unix.la
 UNIX_PLUGIN_TEST = test_transport_api_unix 
+UNIX_PLUGIN_TIMEOUT_TEST = test_transport_api_timeout_unix
 UNIX_REL_TEST = test_transport_api_unreliability_unix
 UNIX_QUOTA_TEST = test_quota_compliance_unix \
      test_quota_compliance_unix_asymmetric
 endif
 
 noinst_PROGRAMS = \
- $(WLAN_BIN_DUMMY)
-# gnunet-transport-connect-running-peers
+ $(WLAN_BIN_SENDER)
 
 lib_LTLIBRARIES = \
   libgnunettransport.la \
@@ -69,27 +75,30 @@ libgnunettransporttesting_la_LIBADD = \
   $(top_builddir)/src/transport/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)
 
 libgnunettransport_la_SOURCES = \
   transport_api.c transport.h \
   transport_api_blacklist.c \
-  transport_api_address_lookup.c \
-  transport_api_peer_address_lookup.c \
-  transport_api_address_iterate.c
+  transport_api_address_to_string.c \
+  transport_api_address_lookup.c
 libgnunettransport_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL) 
 libgnunettransport_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
-  -version-info 0:0:0
+  -version-info 1:0:0
 
 bin_PROGRAMS = \
  gnunet-transport \
  $(WLAN_BIN) \
+ $(WLAN_BIN_DUMMY) \
  gnunet-service-transport \
  gnunet-transport-certificate-creation
 
@@ -101,40 +110,36 @@ gnunet_transport_certificate_creation_SOURCES = \
 gnunet_transport_certificate_creation_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la
 
-gnunet_transport_wlan_helper_SOURCES = \
- 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 = \
+gnunet_helper_transport_wlan_SOURCES = \
+ gnunet-helper-transport-wlan.c
+
+gnunet_helper_transport_wlan_dummy_SOURCES = \
+ gnunet-helper-transport-wlan-dummy.c
+gnunet_helper_transport_wlan_dummy_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_dummy_LDADD = \
+gnunet_transport_wlan_sender_SOURCES = \
+ gnunet-transport-wlan-sender.c
+gnunet_transport_wlan_sender_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la 
 
 gnunet_transport_SOURCES = \
  gnunet-transport.c         
 gnunet_transport_LDADD = \
   $(top_builddir)/src/transport/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_3way.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_3way.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 = \
@@ -146,25 +151,6 @@ gnunet_service_transport_LDADD = \
   $(GN_GLPK) \
   $(GN_LIBINTL)
 
-
-#gnunet_service_transport_SOURCES = \
-# 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 \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(GN_GLPK) \
-#  $(GN_LIBINTL)
-
-
 plugin_LTLIBRARIES = \
   libgnunet_plugin_transport_tcp.la \
   libgnunet_plugin_transport_udp.la \
@@ -181,14 +167,16 @@ libgnunet_plugin_transport_tcp_la_LIBADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
   $(top_builddir)/src/nat/libgnunetnat.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(LTLIBINTL)
 libgnunet_plugin_transport_tcp_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
 libgnunet_plugin_transport_template_la_SOURCES = \
   plugin_transport_template.c
 libgnunet_plugin_transport_template_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(LTLIBINTL)
 libgnunet_plugin_transport_template_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
@@ -204,14 +192,16 @@ libgnunet_plugin_transport_wlan_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS)
 
 libgnunet_plugin_transport_udp_la_SOURCES = \
-  plugin_transport_udp.c
+  plugin_transport_udp.c plugin_transport_udp.h \
+  plugin_transport_udp_broadcasting.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 
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(LTLIBINTL)
 libgnunet_plugin_transport_udp_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
@@ -221,12 +211,14 @@ libgnunet_plugin_transport_unix_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(LTLIBINTL)
 libgnunet_plugin_transport_unix_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
 libgnunet_plugin_transport_http_la_SOURCES = \
-  plugin_transport_http.c plugin_transport_http_client.c plugin_transport_http_server.c
+  plugin_transport_http.c plugin_transport_http.h \
+  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 \
@@ -243,7 +235,8 @@ libgnunet_plugin_transport_http_la_CPPFLAGS = \
  @LIBCURL_CPPFLAGS@
 
 libgnunet_plugin_transport_https_la_SOURCES = \
-  plugin_transport_http.c plugin_transport_http_client.c plugin_transport_http_server.c
+  plugin_transport_http.c plugin_transport_http.h \
+  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 \
@@ -261,15 +254,23 @@ libgnunet_plugin_transport_https_la_CPPFLAGS = \
 
 
 check_PROGRAMS = \
+ test_transport_testing_startstop \
+ test_transport_testing_restart \
  test_transport_testing \
  test_transport_startonly \
+ test_transport_api_blacklisting \
  test_transport_api_disconnect_tcp \
+ 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 \
  test_transport_api_udp \
+ test_transport_api_timeout_udp \
  $(UNIX_PLUGIN_TEST) \
+ $(UNIX_PLUGIN_TIMEOUT_TEST) \
  test_transport_api_udp_nat \
  $(HTTP_API_TEST) \
  $(HTTP_NAT_API_TEST) \
@@ -277,6 +278,7 @@ check_PROGRAMS = \
  $(HTTPS_API_TEST) \
  $(HTTPS_NAT_API_TEST) \
  $(HTTPS_API_TIMEOUT_TEST) \
+ $(WLAN_API_TEST) \
  test_transport_api_multi \
  test_transport_api_reliability_tcp \
  test_transport_api_reliability_tcp_nat \
@@ -287,27 +289,35 @@ check_PROGRAMS = \
  $(HTTP_NAT_REL_TEST) \
  $(HTTPS_REL_TEST) \
  $(HTTPS_NAT_REL_TEST) \
+ $(WLAN_REL_TEST) \
+ $(WLAN_UREL_TEST) \
  test_quota_compliance_tcp \
  test_quota_compliance_tcp_asymmetric \
  test_quota_compliance_udp \
  $(UNIX_QUOTA_TEST) \
  $(HTTP_QUOTA_TEST) \
  $(HTTPS_QUOTA_TEST) \
- $(WLAN_API_TEST) \
- $(WLAN_REL_TEST) \
- $(WLAN_UREL_TEST)
+ $(WLAN_QUOTA_TEST)
 
 if ENABLE_TEST_RUN
 TESTS = \
+ test_transport_testing_startstop \
+ test_transport_testing_restart \
  test_transport_testing \
  test_transport_startonly \
+ test_transport_api_blacklisting \
  test_transport_api_disconnect_tcp \
+ 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 \
  test_transport_api_udp \
+ test_transport_api_timeout_udp \
  $(UNIX_PLUGIN_TEST) \
+ $(UNIX_PLUGIN_TIMEOUT_TEST) \
  test_transport_api_udp_nat \
  $(HTTP_API_TEST) \
  $(HTTP_NAT_API_TEST) \
@@ -315,6 +325,7 @@ TESTS = \
  $(HTTPS_API_TEST) \
  $(HTTPS_NAT_API_TEST) \
  $(HTTPS_API_TIMEOUT_TEST) \
+ $(WLAN_API_TEST) \
  test_transport_api_multi \
  test_transport_api_reliability_tcp \
  test_transport_api_reliability_tcp_nat \
@@ -325,17 +336,32 @@ TESTS = \
  $(HTTP_NAT_REL_TEST) \
  $(HTTPS_REL_TEST) \
  $(HTTPS_NAT_REL_TEST) \
+ $(WLAN_REL_TEST) \
+ $(WLAN_UREL_TEST) \
  test_quota_compliance_tcp \
  test_quota_compliance_tcp_asymmetric \
  test_quota_compliance_udp \
  $(UNIX_QUOTA_TEST) \
  $(HTTP_QUOTA_TEST) \
- $(HTTPS_QUOTA_TEST) \
- $(WLAN_API_TEST) \
- $(WLAN_REL_TEST) \
- $(WLAN_UREL_TEST)
+ $(HTTPS_QUOTA_TEST)
 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 \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/transport/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 \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la 
+
 test_transport_testing_SOURCES = \
  test_transport_testing.c
 test_transport_testing_LDADD = \
@@ -344,13 +370,15 @@ test_transport_testing_LDADD = \
  $(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_blacklisting_SOURCES = \
+ test_transport_api_blacklisting.c
+test_transport_api_blacklisting_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_disconnect_tcp_SOURCES = \
  test_transport_api_disconnect.c
@@ -377,7 +405,33 @@ test_transport_api_tcp_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  \
  $(top_builddir)/src/transport/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 \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/util/libgnunetutil.la  \
+ $(top_builddir)/src/transport/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 \
+ $(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_restart_2peers_SOURCES = \
+ test_transport_api_restart_2peers.c
+test_transport_api_restart_2peers_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_limited_sockets_tcp_SOURCES = \
  test_transport_api_limited_sockets.c
 test_transport_api_limited_sockets_tcp_LDADD = \
@@ -410,6 +464,14 @@ test_transport_api_timeout_tcp_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/transport/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 \
+ $(top_builddir)/src/hello/libgnunethello.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 = \
@@ -417,7 +479,7 @@ test_transport_api_timeout_http_LDADD = \
  $(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 = \
@@ -425,7 +487,7 @@ test_transport_api_timeout_https_LDADD = \
  $(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 = \
@@ -449,14 +511,22 @@ test_transport_api_unreliability_wlan_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.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/transport/libgnunettransporttesting.la 
+ $(top_builddir)/src/transport/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 \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la  
 
 test_transport_api_udp_nat_SOURCES = \
  test_transport_api.c
@@ -474,14 +544,6 @@ test_transport_api_unix_LDADD = \
  $(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_transport_api_http_SOURCES = \
  test_transport_api.c
 test_transport_api_http_LDADD = \
@@ -489,8 +551,8 @@ test_transport_api_http_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/transport/libgnunettransporttesting.la 
- 
- test_transport_api_http_nat_SOURCES = \
+
+test_transport_api_http_nat_SOURCES = \
  test_transport_api.c
 test_transport_api_http_nat_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
@@ -596,12 +658,6 @@ test_quota_compliance_tcp_asymmetric_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/transport/libgnunettransporttesting.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/libgnunettransport.la \
-# $(top_builddir)/src/util/libgnunetutil.la
-
 test_quota_compliance_http_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_http_LDADD = \
@@ -610,7 +666,7 @@ test_quota_compliance_http_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/transport/libgnunettransporttesting.la 
 
- test_quota_compliance_http_asymmetric_SOURCES = \
+test_quota_compliance_http_asymmetric_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_http_asymmetric_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
@@ -618,12 +674,6 @@ test_quota_compliance_http_asymmetric_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/transport/libgnunettransporttesting.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/libgnunettransport.la \
-# $(top_builddir)/src/util/libgnunetutil.la
-
 test_quota_compliance_https_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_https_LDADD = \
@@ -632,7 +682,7 @@ test_quota_compliance_https_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/transport/libgnunettransporttesting.la
 
- test_quota_compliance_https_asymmetric_SOURCES = \
+test_quota_compliance_https_asymmetric_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_https_asymmetric_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
@@ -640,12 +690,6 @@ test_quota_compliance_https_asymmetric_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/transport/libgnunettransporttesting.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/libgnunettransport.la \
-# $(top_builddir)/src/util/libgnunetutil.la
-
 test_quota_compliance_udp_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_udp_LDADD = \
@@ -670,6 +714,22 @@ test_quota_compliance_unix_asymmetric_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/transport/libgnunettransporttesting.la
 
+test_quota_compliance_wlan_SOURCES = \
+ test_quota_compliance.c
+test_quota_compliance_wlan_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_quota_compliance_wlan_asymmetric_SOURCES = \
+ test_quota_compliance.c
+test_quota_compliance_wlan_asymmetric_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_multi_SOURCES = \
  test_transport_api.c
 test_transport_api_multi_LDADD = \
@@ -684,7 +744,6 @@ 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\
@@ -697,6 +756,14 @@ 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_quota_compliance_http_asymmetric_peer1.conf\
+test_quota_compliance_http_asymmetric_peer2.conf\
+test_quota_compliance_https_asymmetric_peer1.conf\
+test_quota_compliance_https_asymmetric_peer2.conf\
+test_quota_compliance_tcp_asymmetric_peer1.conf\
+test_quota_compliance_tcp_asymmetric_peer2.conf\
+test_quota_compliance_unix_asymmetric_peer1.conf\
+test_quota_compliance_unix_asymmetric_peer2.conf\
 test_transport_api_data.conf\
 test_transport_api_http_peer1.conf\
 test_transport_api_http_peer2.conf\
@@ -718,6 +785,8 @@ 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_bidirectional_connect_peer1.conf\
+test_transport_api_bidirectional_connect_peer2.conf\
 test_transport_api_tcp_nat_peer1.conf\
 test_transport_api_tcp_nat_peer2.conf\
 test_transport_api_tcp_peer1.conf\
@@ -726,8 +795,12 @@ 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_timeout_udp_peer1.conf\
+test_transport_api_timeout_udp_peer2.conf\
 test_transport_api_unix_peer1.conf\
 test_transport_api_unix_peer2.conf\
+test_transport_api_timeout_unix_peer1.conf\
+test_transport_api_timeout_unix_peer2.conf\
 test_transport_api_unreliability_udp_peer1.conf\
 test_transport_api_unreliability_udp_peer2.conf\
 test_transport_api_unreliability_unix_peer1.conf\
@@ -737,4 +810,20 @@ 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
+test_transport_startonly.conf\
+test_transport_api_disconnect_tcp_peer1.conf\
+test_transport_api_disconnect_tcp_peer2.conf\
+test_transport_api_http_nat_peer1.conf\
+test_transport_api_http_nat_peer2.conf\
+test_transport_api_https_nat_peer1.conf\
+test_transport_api_https_nat_peer2.conf\
+test_transport_api_reliability_http_nat_peer1.conf\
+test_transport_api_reliability_http_nat_peer2.conf\
+test_transport_api_reliability_https_nat_peer1.conf\
+test_transport_api_reliability_https_nat_peer2.conf\
+test_transport_api_timeout_http_peer1.conf\
+test_transport_api_timeout_http_peer2.conf\
+test_transport_api_timeout_https_peer1.conf\
+test_transport_api_timeout_https_peer2.conf\
+test_transport_api_unreliability_constant_udp_peer1.conf\
+test_transport_api_unreliability_constant_udp_peer2.conf