291 files changed, 0 insertions, 99280 deletions

diff --git a/src/transport/.gitignore b/src/transport/.gitignore
deleted file mode 100644
index d88d40ef7..000000000
--- a/src/transport/.gitignore
+++ /dev/null
@@ -1,91 +0,0 @@
-gnunet-transport-wlan-sender
-gnunet-helper-transport-bluetooth
-gnunet-helper-transport-wlan
-gnunet-helper-transport-wlan-dummy
-gnunet-service-transport
-gnunet-transport
-gnunet-transport-certificate-creation
-gnunet-transport-profiler
-gnunet-transport-wlan-receiver
-https_cert_qutoa_p2.crt
-https_key_quota_p2.key
-test_http_common
-test_plugin_bluetooth
-test_plugin_http_client
-test_plugin_http_server
-test_plugin_https_client
-test_plugin_https_server
-test_plugin_tcp
-test_plugin_udp
-test_plugin_unix
-test_plugin_wlan
-test_quota_compliance_bluetooth
-test_quota_compliance_bluetooth_asymmetric
-test_quota_compliance_http
-test_quota_compliance_http_asymmetric
-test_quota_compliance_https
-test_quota_compliance_https_asymmetric
-test_quota_compliance_tcp
-test_quota_compliance_tcp_asymmetric
-test_quota_compliance_udp
-test_quota_compliance_unix
-test_quota_compliance_unix_asymmetric
-test_quota_compliance_wlan
-test_quota_compliance_wlan_asymmetric
-test_transport_address_switch_http
-test_transport_address_switch_https
-test_transport_address_switch_tcp
-test_transport_address_switch_udp
-test_transport_api_blacklisting_tcp
-test_transport_api_bluetooth
-test_transport_api_disconnect_tcp
-test_transport_api_http
-test_transport_api_http_reverse
-test_transport_api_https
-test_transport_api_limited_sockets_tcp
-test_transport_api_manipulation_cfg
-test_transport_api_manipulation_recv_tcp
-test_transport_api_manipulation_send_tcp
-test_transport_api_monitor_peers
-test_transport_api_multi
-test_transport_api_reliability_bluetooth
-test_transport_api_reliability_http
-test_transport_api_reliability_http_xhr
-test_transport_api_reliability_https
-test_transport_api_reliability_https_xhr
-test_transport_api_reliability_tcp
-test_transport_api_reliability_tcp_nat
-test_transport_api_reliability_udp
-test_transport_api_reliability_unix
-test_transport_api_reliability_wlan
-test_transport_api_restart_1peer
-test_transport_api_restart_2peers
-test_transport_api_slow_ats
-test_transport_api_tcp
-test_transport_api_tcp_nat
-test_transport_api_timeout_bluetooth
-test_transport_api_timeout_http
-test_transport_api_timeout_https
-test_transport_api_timeout_tcp
-test_transport_api_timeout_udp
-test_transport_api_timeout_unix
-test_transport_api_timeout_wlan
-test_transport_api_udp
-test_transport_api_udp_nat
-test_transport_api_unix
-test_transport_api_unix_abstract
-test_transport_api_wlan
-test_transport_blacklisting_inbound_bl_full
-test_transport_blacklisting_inbound_bl_plugin
-test_transport_blacklisting_multiple_plugins
-test_transport_blacklisting_no_bl
-test_transport_blacklisting_outbound_bl_full
-test_transport_blacklisting_outbound_bl_plugin
-test_transport_testing_restart
-test_transport_testing_startstop
-gnunet-communicator-unix
-gnunet-service-tng
-gnunet-communicator-tcp
-gnunet-communicator-udp
-test_communicator_unix
-test_communicator_basic_unix
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
deleted file mode 100644
index 2b09ccf63..000000000
--- a/src/transport/Makefile.am
+++ /dev/null
@@ -1,1687 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
-
-plugindir = $(libdir)/gnunet
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfg_DATA = \
-  transport.conf \
-  communicator-unix.conf
-
-HTTP_SERVER_PLUGIN_LA = libgnunet_plugin_transport_http_server.la
-HTTPS_SERVER_PLUGIN_LA = libgnunet_plugin_transport_https_server.la
-HTTP_SERVER_PLUGIN_TEST = test_plugin_http_server
-HTTPS_SERVER_PLUGIN_TEST = test_plugin_https_server
-
-if HAVE_LIBGNURL
- 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=@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_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 \
-                 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
-if HAVE_EXPERIMENTAL
- HTTPS_REL_TEST = test_transport_api_reliability_https \
-                  test_transport_api_reliability_https_xhr
-endif
- 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
-if HAVE_EXPERIMENTAL
- HTTPS_REL_TEST = test_transport_api_reliability_https \
-                  test_transport_api_reliability_https_xhr
-endif
- HTTPS_QUOTA_TEST = test_quota_compliance_https \
-                test_quota_compliance_https_asymmetric
- HTTPS_SWITCH = test_transport_address_switch_https
-endif
-endif
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-endif
-
-if HAVE_EXPERIMENTAL
-if LINUX
- WLAN_BIN = gnunet-helper-transport-wlan
- WLAN_BIN_DUMMY = gnunet-helper-transport-wlan-dummy
- WLAN_BIN_SENDER = gnunet-transport-wlan-sender
- WLAN_BIN_RECEIVER = gnunet-transport-wlan-receiver
- WLAN_PLUGIN_LA = libgnunet_plugin_transport_wlan.la
- WLAN_PLUGIN_TEST = test_plugin_wlan
- WLAN_API_TEST = test_transport_api_wlan
- WLAN_TIMEOUT_TEST = test_transport_api_timeout_wlan
- WLAN_REL_TEST = test_transport_api_reliability_wlan
- WLAN_QUOTA_TEST = test_quota_compliance_wlan \
-                test_quota_compliance_wlan_asymmetric
-endif
-
-if LINUX
-if HAVE_LIBBLUETOOTH
- BT_BIN = gnunet-helper-transport-bluetooth
- BT_PLUGIN_LA = libgnunet_plugin_transport_bluetooth.la
- BT_PLUGIN_TEST = test_plugin_bluetooth
- BT_API_TEST = test_transport_api_bluetooth
- BT_TIMEOUT_TEST = test_transport_api_timeout_bluetooth
- BT_REL_TEST = test_transport_api_reliability_bluetooth
- BT_QUOTA_TEST = test_quota_compliance_bluetooth \
-    test_quota_compliance_bluetooth_asymmetric
-endif
-endif
-
-# end of HAVE_EXPERIMENTAL
-endif
-
-
-UNIX_PLUGIN_LA = libgnunet_plugin_transport_unix.la
-UNIX_PLUGIN_TEST = test_transport_api_unix
-UNIX_TEST = test_plugin_unix
-UNIX_PLUGIN_TIMEOUT_TEST = test_transport_api_timeout_unix
-UNIX_REL_TEST = test_transport_api_reliability_unix
-UNIX_QUOTA_TEST = test_quota_compliance_unix \
-     test_quota_compliance_unix_asymmetric
-if LINUX
- UNIX_API_ABSTRACT_TEST = test_transport_api_unix_abstract
-endif
-
-
-noinst_PROGRAMS = \
- test_transport_start_with_config \
- gnunet-transport-profiler \
- gnunet-communicator-udp \
- $(WLAN_BIN_SENDER) \
- $(WLAN_BIN_RECEIVER)
-
-TESTING_LIBS = \
-  libgnunettransporttesting.la \
-  libgnunettransporttesting2.la
-
-lib_LTLIBRARIES = \
-  libgnunettransport.la \
-  libgnunettransportapplication.la \
-  libgnunettransportcore.la \
-  libgnunettransportcommunicator.la \
-  libgnunettransportmonitor.la \
-  $(TESTING_LIBS)
-
-libgnunettransporttesting_la_SOURCES = \
-  transport-testing.c transport-testing.h \
-  transport-testing-filenames.c \
-  transport-testing-loggers.c \
-  transport-testing-main.c \
-  transport-testing-send.c
-libgnunettransporttesting_la_LIBADD = \
-  libgnunettransport.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/arm/libgnunetarm.la \
-  $(GN_LIBINTL)
-libgnunettransporttesting_la_LDFLAGS = \
- $(GN_LIB_LDFLAGS)
-
-libgnunettransporttesting2_la_SOURCES = \
-  transport_api_traits.c \
-  transport_api_cmd_connecting_peers.c \
-  transport_api_cmd_backchannel_check.c \
-  transport_api_cmd_start_peer.c \
-  transport_api_cmd_stop_peer.c \
-  transport_api_cmd_send_simple.c \
-  transport-testing2.c transport-testing2.h \
-  transport-testing-cmds.h \
-  transport-testing-filenames2.c \
-  transport-testing-loggers2.c \
-  transport-testing-main2.c \
-  transport-testing-send2.c \
-  transport-testing-communicator.c transport-testing-communicator.h
-libgnunettransporttesting2_la_LIBADD = \
-  libgnunettransportapplication.la \
-  libgnunettransportcore.la \
-  $(top_builddir)/src/arm/libgnunetarm.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-libgnunettransporttesting2_la_LDFLAGS = \
-  $(GN_LIBINTL) \
-  $(GN_LIB_LDFLAGS) \
-  -version-info 0:0:0
-
-libgnunettransport_la_SOURCES = \
-  transport.h \
-  transport_api_address_to_string.c \
-  transport_api_blacklist.c \
-  transport_api_core.c \
-  transport_api_hello_get.c \
-  transport_api_manipulation.c \
-  transport_api_monitor_peers.c \
-  transport_api_monitor_plugins.c \
-  transport_api_offer_hello.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 = \
-  $(GN_LIB_LDFLAGS)  \
-  -version-info 4:0:2
-
-libgnunettransportapplication_la_SOURCES = \
-  transport_api2_application.c
-libgnunettransportapplication_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
-libgnunettransportapplication_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  \
-  -version-info 0:0:0
-
-
-libgnunettransportcore_la_SOURCES = \
-  transport_api2_core.c
-libgnunettransportcore_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-libgnunettransportcore_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  \
-  -version-info 0:0:0
-
-libgnunettransportcommunicator_la_SOURCES = \
-  transport_api2_communication.c
-libgnunettransportcommunicator_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-libgnunettransportcommunicator_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  \
-  -version-info 0:0:0
-
-
-libgnunettransportmonitor_la_SOURCES = \
-  transport_api2_monitor.c
-libgnunettransportmonitor_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-libgnunettransportmonitor_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  \
-  -version-info 0:0:0
-
-
-libexec_PROGRAMS = \
- $(WLAN_BIN) \
- $(WLAN_BIN_DUMMY) \
- $(BT_BIN) \
- gnunet-service-transport \
- gnunet-service-tng \
- gnunet-communicator-unix \
- gnunet-communicator-udp \
- gnunet-communicator-tcp
-
-
-
-bin_PROGRAMS = \
- gnunet-transport
-
-bin_SCRIPTS = \
- gnunet-transport-certificate-creation
-
-# See: https://www.gnu.org/software/automake/manual/html_node/Scripts.html#Scripts
-do_subst = sed -e 's,[@]pkgdatadir[@],$(pkgdatadir),g'
-
-
-gnunet-transport-certificate-creation: gnunet-transport-certificate-creation.in Makefile
-        $(do_subst) < $(srcdir)/gnunet-transport-certificate-creation.in > gnunet-transport-certificate-creation
-        chmod +x gnunet-transport-certificate-creation
-
-
-
-gnunet_communicator_unix_SOURCES = \
- gnunet-communicator-unix.c
-gnunet_communicator_unix_LDADD = \
-  libgnunettransportcommunicator.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-
-gnunet_communicator_tcp_SOURCES = \
- gnunet-communicator-tcp.c
-gnunet_communicator_tcp_LDADD = \
-  libgnunettransportcommunicator.la \
-  $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
-  $(top_builddir)/src/nat/libgnunetnatnew.la \
-  $(top_builddir)/src/nt/libgnunetnt.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(LIBGCRYPT_LIBS)
-
-gnunet_communicator_udp_SOURCES = \
- gnunet-communicator-udp.c
-gnunet_communicator_udp_LDADD = \
-  libgnunettransportapplication.la \
-  libgnunettransportcommunicator.la \
-  $(top_builddir)/src/nat/libgnunetnatnew.la \
-  $(top_builddir)/src/nt/libgnunetnt.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(LIBGCRYPT_LIBS)
-
-
-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_sender_SOURCES = \
- gnunet-transport-wlan-sender.c
-gnunet_transport_wlan_sender_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la
-
-gnunet_transport_wlan_receiver_SOURCES = \
- gnunet-transport-wlan-receiver.c
-gnunet_transport_wlan_receiver_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la
-
-gnunet_helper_transport_bluetooth_SOURCES = \
- gnunet-helper-transport-bluetooth.c
-
-gnunet_helper_transport_bluetooth_LDFLAGS = -lbluetooth
-
-
-gnunet_transport_profiler_SOURCES = \
- gnunet-transport-profiler.c
-gnunet_transport_profiler_LDADD = \
-  libgnunettransport.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-gnunet_transport_SOURCES = \
- gnunet-transport.c
-gnunet_transport_LDADD = \
-  libgnunettransport.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-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_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_manipulation.h gnunet-service-transport_manipulation.c
-# Note that while gnunet-service-transport does not use libgnunetnat
-# directly, we must link against it as GNUNET_NAT_mini_map_stop will
-# leave a 'dangling' task to process_unmap_output which will cause
-# a crash on unloading of a plugin unless the service links against
-# that library as well.
-gnunet_service_transport_LDADD = \
-  libgnunettransport.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/nt/libgnunetnt.la \
-  $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(GN_GLPK) \
-  $(GN_LIBINTL)
-gnunet_service_transport_CFLAGS = \
-  $(AM_CFLAGS)
-# -DANALYZE
-
-
-gnunet_service_tng_SOURCES = \
- gnunet-service-tng.c
-gnunet_service_tng_LDADD = \
-  $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(LIBGCRYPT_LIBS) \
-  $(GN_LIBINTL)
-
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_transport_tcp.la \
-  $(UNIX_PLUGIN_LA) \
-  $(HTTP_CLIENT_PLUGIN_LA) \
-  $(HTTPS_CLIENT_PLUGIN_LA) \
-  $(HTTP_SERVER_PLUGIN_LA) \
-  $(HTTPS_SERVER_PLUGIN_LA) \
-  $(WLAN_PLUGIN_LA) \
-  $(BT_PLUGIN_LA) \
-  libgnunet_test_transport_plugin_cmd_simple_send.la \
-  libgnunet_test_transport_plugin_cmd_simple_send_broadcast.la \
-  libgnunet_test_transport_plugin_cmd_simple_send_dv.la \
-  libgnunet_test_transport_plugin_cmd_udp_backchannel.la
-
-libgnunet_test_transport_plugin_cmd_udp_backchannel_la_SOURCES = \
- test_transport_plugin_cmd_udp_backchannel.c
-libgnunet_test_transport_plugin_cmd_udp_backchannel_la_LIBADD = \
-  libgnunettransporttesting2.la \
-  libgnunettransportapplication.la \
-  libgnunettransportcore.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/arm/libgnunetarm.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_test_transport_plugin_cmd_udp_backchannel_la_LDFLAGS = \
-  $(GN_PLUGIN_LDFLAGS)
-
-libgnunet_test_transport_plugin_cmd_simple_send_la_SOURCES = \
- test_transport_plugin_cmd_simple_send.c
-libgnunet_test_transport_plugin_cmd_simple_send_la_LIBADD = \
-  libgnunettransporttesting2.la \
-  libgnunettransportapplication.la \
-  libgnunettransportcore.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/arm/libgnunetarm.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_test_transport_plugin_cmd_simple_send_la_LDFLAGS = \
-  $(GN_PLUGIN_LDFLAGS)
-
-libgnunet_test_transport_plugin_cmd_simple_send_broadcast_la_SOURCES = \
- test_transport_plugin_cmd_simple_send_broadcast.c
-libgnunet_test_transport_plugin_cmd_simple_send_broadcast_la_LIBADD = \
-  libgnunettransporttesting2.la \
-  libgnunettransportapplication.la \
-  libgnunettransportcore.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/arm/libgnunetarm.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_test_transport_plugin_cmd_simple_send_broadcast_la_LDFLAGS = \
-  $(GN_PLUGIN_LDFLAGS)
-
-libgnunet_test_transport_plugin_cmd_simple_send_dv_la_SOURCES = \
- test_transport_plugin_cmd_simple_send_dv.c
-libgnunet_test_transport_plugin_cmd_simple_send_dv_la_LIBADD = \
-  libgnunettransporttesting2.la \
-  libgnunettransportapplication.la \
-  libgnunettransportcore.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/arm/libgnunetarm.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_test_transport_plugin_cmd_simple_send_dv_la_LDFLAGS = \
-  $(GN_PLUGIN_LDFLAGS)
-
-if HAVE_EXPERIMENTAL
-plugin_LTLIBRARIES += \
-  libgnunet_plugin_transport_udp.la
-endif
-
-# 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 = \
-  plugin_transport_tcp.c
-libgnunet_plugin_transport_tcp_la_LIBADD = \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
-  $(top_builddir)/src/nat/libgnunetnatnew.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 \
-  $(LTLIBINTL)
-libgnunet_plugin_transport_template_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-libgnunet_plugin_transport_wlan_la_SOURCES = \
-  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)
-libgnunet_plugin_transport_wlan_la_CFLAGS = \
- $(AM_CFLAGS) -DBUILD_WLAN
-
-libgnunet_plugin_transport_bluetooth_la_SOURCES = \
-  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 \
-  $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
-  $(top_builddir)/src/fragmentation/libgnunetfragmentation.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-libgnunet_plugin_transport_bluetooth_la_LDFLAGS = \
-  $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_transport_bluetooth_la_CFLAGS = \
- $(AM_CFLAGS) -DBUILD_BLUETOOTH
-
-if HAVE_EXPERIMENTAL
-libgnunet_plugin_transport_udp_la_SOURCES = \
-  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/libgnunetnatnew.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_plugin_transport_udp_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-endif
-
-libgnunet_plugin_transport_unix_la_SOURCES = \
-  plugin_transport_unix.c
-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 \
-  $(LTLIBINTL)
-libgnunet_plugin_transport_unix_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
-libgnunet_plugin_transport_http_client_la_SOURCES = \
-  plugin_transport_http_client.c plugin_transport_http_common.c plugin_transport_http_common.h
-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 \
-  $(LIB_GNURL) \
-  $(top_builddir)/src/util/libgnunetutil.la
-libgnunet_plugin_transport_http_client_la_LDFLAGS = \
-  $(GN_LIBINTL) \
-  $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_transport_http_client_la_CFLAGS = \
- $(CPP_GNURL) $(AM_CFLAGS)
-
-
-libgnunet_plugin_transport_http_server_la_SOURCES = \
-  plugin_transport_http_server.c plugin_transport_http_common.c
-libgnunet_plugin_transport_http_server_la_LIBADD = \
-  $(MHD_LIBS) \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
-  $(top_builddir)/src/nat/libgnunetnatnew.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-libgnunet_plugin_transport_http_server_la_LDFLAGS = \
-  $(GN_LIBINTL) \
- $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_transport_http_server_la_CFLAGS = \
- $(MHD_CFLAGS) $(AM_CFLAGS)
-
-libgnunet_plugin_transport_https_client_la_SOURCES = \
-  plugin_transport_http_client.c plugin_transport_http_common.c
-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 \
-  $(LIB_GNURL) \
-  $(top_builddir)/src/util/libgnunetutil.la
-libgnunet_plugin_transport_https_client_la_LDFLAGS = \
-  $(GN_LIBINTL) \
-  $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_transport_https_client_la_CFLAGS = \
- $(CPP_GNURL) $(AM_CFLAGS) -DBUILD_HTTPS
-
-
-libgnunet_plugin_transport_https_server_la_SOURCES = \
-  plugin_transport_http_server.c plugin_transport_http_common.c
-libgnunet_plugin_transport_https_server_la_LIBADD = \
-  $(MHD_LIBS) \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
-  $(top_builddir)/src/nat/libgnunetnatnew.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-libgnunet_plugin_transport_https_server_la_LDFLAGS = \
-  $(GN_LIBINTL) \
- $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_transport_https_server_la_CFLAGS = \
- $(MHD_CFLAGS) $(AM_CFLAGS) -DBUILD_HTTPS
-
-check_PROGRAMS = \
- test_transport_address_switch_tcp \
- test_transport_testing_startstop \
- test_transport_testing_restart \
- test_plugin_tcp \
- $(UNIX_TEST) \
- $(WLAN_PLUGIN_TEST) \
- $(BT_PLUGIN_TEST) \
- test_http_common \
- $(HTTP_CLIENT_PLUGIN_TEST) \
- $(HTTPS_CLIENT_PLUGIN_TEST) \
- $(HTTP_SERVER_PLUGIN_TEST) \
- $(HTTPS_SERVER_PLUGIN_TEST) \
- test_transport_api_blacklisting_tcp \
- test_transport_api_disconnect_tcp \
- test_transport_api_tcp \
- test_transport_api2_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 \
- $(UNIX_PLUGIN_TEST) \
- $(UNIX_PLUGIN_TIMEOUT_TEST) \
- $(UNIX_API_ABSTRACT_TEST) \
- $(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_monitor_peers \
- test_transport_blacklisting_no_bl \
- test_transport_blacklisting_outbound_bl_full \
- test_transport_blacklisting_outbound_bl_plugin \
- test_transport_blacklisting_inbound_bl_plugin \
- test_transport_blacklisting_inbound_bl_full \
- test_transport_blacklisting_multiple_plugins \
- test_transport_api_manipulation_send_tcp \
- test_transport_api_manipulation_recv_tcp \
- test_transport_api_manipulation_cfg \
- test_transport_api_reliability_tcp \
- test_transport_api_reliability_tcp_nat \
- $(UNIX_REL_TEST) \
- $(HTTP_REL_TEST) \
- $(HTTPS_REL_TEST) \
- $(WLAN_REL_TEST) \
- $(WLAN_UREL_TEST) \
- $(BT_REL_TEST) \
- $(BT_UREL_TEST) \
- test_quota_compliance_tcp \
- test_quota_compliance_tcp_asymmetric \
- $(UNIX_QUOTA_TEST) \
- $(HTTP_QUOTA_TEST) \
- $(HTTPS_QUOTA_TEST) \
- $(WLAN_QUOTA_TEST) \
- $(BT_QUOTA_TEST)
-if HAVE_GETOPT_BINARY
-check_PROGRAMS += \
-test_transport_api_slow_ats
-endif
-if HAVE_EXPERIMENTAL
-check_PROGRAMS += \
-  test_transport_address_switch_udp \
-  test_plugin_udp \
-  test_transport_api_udp \
-  test_transport_api_timeout_udp \
-  test_transport_api_udp_nat \
-  test_transport_api_reliability_udp \
-  test_quota_compliance_udp \
-  test_communicator_basic-unix \
-  test_communicator_basic-tcp \
-  test_communicator_basic-udp \
-  test_communicator_rekey-tcp \
-  test_communicator_rekey-udp \
-  test_communicator_backchannel-udp \
-  test_communicator_bidirect-tcp
-endif
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = \
- test_transport_address_switch_tcp \
- $(HTTP_SWITCH) \
- $(HTTPS_SWITCH) \
- test_transport_testing_startstop \
- test_transport_testing_restart \
- test_plugin_tcp \
- $(UNIX_TEST) \
- $(WLAN_PLUGIN_TEST) \
- $(BT_PLUGIN_TEST) \
- test_transport_api_blacklisting_tcp \
- test_transport_api_disconnect_tcp \
- test_transport_api_tcp \
- test_transport_api_restart_1peer \
- test_transport_api_restart_2peers \
- test_transport_api_limited_sockets_tcp \
- test_transport_api_tcp_nat \
- $(UNIX_PLUGIN_TEST) \
- $(UNIX_API_ABSTRACT_TEST) \
- $(HTTP_API_TEST) \
- $(HTTPS_API_TEST) \
- $(WLAN_API_TEST) \
- $(BT_API_TEST) \
- test_transport_api_multi \
- test_transport_api_monitor_peers \
- test_transport_blacklisting_no_bl \
- test_transport_blacklisting_outbound_bl_full \
- test_transport_blacklisting_outbound_bl_plugin \
- test_transport_blacklisting_inbound_bl_plugin \
- test_transport_blacklisting_inbound_bl_full \
- test_transport_blacklisting_multiple_plugins \
- test_transport_api_manipulation_send_tcp \
- test_transport_api_manipulation_recv_tcp \
- test_transport_api_manipulation_cfg \
- test_transport_api_reliability_tcp \
- test_transport_api_reliability_tcp_nat \
- $(UNIX_REL_TEST) \
- $(HTTP_REL_TEST) \
- $(HTTPS_REL_TEST) \
- $(WLAN_REL_TEST) \
- $(WLAN_UREL_TEST) \
- $(BT_REL_TEST) \
- $(BT_UREL_TEST) \
- test_quota_compliance_tcp \
- test_quota_compliance_tcp_asymmetric \
- $(UNIX_QUOTA_TEST) \
- $(HTTP_QUOTA_TEST) \
- $(HTTPS_QUOTA_TEST) \
- test_transport_api_timeout_tcp \
- $(UNIX_PLUGIN_TIMEOUT_TEST) \
- $(HTTP_API_TIMEOUT_TEST) \
- $(HTTPS_API_TIMEOUT_TEST) \
- $(WLAN_TIMEOUT_TEST) \
- $(BT_TIMEOUT_TEST) \
- $(check_SCRIPTS)
-if HAVE_GETOPT_BINARY
-TESTS += \
-test_transport_api_slow_ats
-endif
-if HAVE_EXPERIMENTAL
-TESTS += \
-  test_transport_address_switch_udp \
-  test_plugin_udp \
-  test_transport_api_udp \
-  test_transport_api_timeout_udp \
-  test_transport_api_udp_nat \
-  test_transport_api_reliability_udp \
-  test_quota_compliance_udp \
-  test_communicator_basic-unix \
-  test_communicator_basic-tcp \
-  test_communicator_basic-udp \
-  test_communicator_rekey-tcp \
-  test_communicator_rekey-udp \
-  test_communicator_backchannel-udp \
-  test_communicator_bidirect-tcp
-endif
-endif
-
-# Only test TNG if we run experimental
-if HAVE_EXPERIMENTAL
-check_SCRIPTS= \
-  test_transport_simple_send_string.sh \
-  test_transport_simple_send.sh \
-  test_transport_simple_send_broadcast.sh \
-  test_transport_udp_backchannel.sh \
-  test_transport_simple_send_dv_circle.sh 
-  # test_transport_simple_send_dv_inverse.sh
-endif
-
-test_transport_start_with_config_SOURCES = \
- test_transport_start_with_config.c
-test_transport_start_with_config_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- libgnunettransportcore.la \
- libgnunettransporttesting2.la
-
-test_transport_testing_startstop_SOURCES = \
- test_transport_testing_startstop.c
-test_transport_testing_startstop_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- libgnunettransporttesting.la
-
-test_transport_testing_restart_SOURCES = \
- test_transport_testing_restart.c
-test_transport_testing_restart_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- libgnunettransporttesting.la
-
-test_transport_api_blacklisting_tcp_SOURCES = \
- test_transport_api_blacklisting.c
-test_transport_api_blacklisting_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_blacklisting_no_bl_SOURCES = \
- test_transport_blacklisting.c
-test_transport_blacklisting_no_bl_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_blacklisting_outbound_bl_full_SOURCES = \
- test_transport_blacklisting.c
-test_transport_blacklisting_outbound_bl_full_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_blacklisting_outbound_bl_plugin_SOURCES = \
- test_transport_blacklisting.c
-test_transport_blacklisting_outbound_bl_plugin_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_blacklisting_inbound_bl_full_SOURCES = \
- test_transport_blacklisting.c
-test_transport_blacklisting_inbound_bl_full_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_blacklisting_inbound_bl_plugin_SOURCES = \
- test_transport_blacklisting.c
-test_transport_blacklisting_inbound_bl_plugin_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_blacklisting_multiple_plugins_SOURCES = \
- test_transport_blacklisting.c
-test_transport_blacklisting_multiple_plugins_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_api_disconnect_tcp_SOURCES = \
- test_transport_api_disconnect.c
-test_transport_api_disconnect_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_plugin_tcp_SOURCES = \
- test_plugin_transport.c
-test_plugin_tcp_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la  \
- libgnunettransporttesting.la
-
-if HAVE_EXPERIMENTAL
-test_plugin_udp_SOURCES = \
- test_plugin_transport.c
-test_plugin_udp_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la  \
- libgnunettransporttesting.la
-endif
-
-if HAVE_EXPERIMENTAL
-test_communicator_basic_unix_SOURCES = \
- test_communicator_basic.c
-test_communicator_basic_unix_LDADD = \
- libgnunettransporttesting2.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la
-
-test_communicator_basic_tcp_SOURCES = \
- test_communicator_basic.c
-test_communicator_basic_tcp_LDADD = \
- libgnunettransporttesting2.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la
-
-test_communicator_basic_udp_SOURCES = \
- test_communicator_basic.c
-test_communicator_basic_udp_LDADD = \
- libgnunettransporttesting2.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la
-
-test_communicator_rekey_tcp_SOURCES = \
- test_communicator_basic.c
-test_communicator_rekey_tcp_LDADD = \
- libgnunettransporttesting2.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la
-
-test_communicator_rekey_udp_SOURCES = \
- test_communicator_basic.c
-test_communicator_rekey_udp_LDADD = \
- libgnunettransporttesting2.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la
-
-test_communicator_backchannel_udp_SOURCES = \
- test_communicator_basic.c
-test_communicator_backchannel_udp_LDADD = \
- libgnunettransporttesting2.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la
-
-test_communicator_bidirect_tcp_SOURCES = \
- test_communicator_basic.c
-test_communicator_bidirect_tcp_LDADD = \
- libgnunettransporttesting2.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la
-endif
-
-test_plugin_unix_SOURCES = \
- test_plugin_transport.c
-test_plugin_unix_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la  \
- libgnunettransporttesting.la
-
-test_plugin_wlan_SOURCES = \
- test_plugin_transport.c
-test_plugin_wlan_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la  \
- libgnunettransporttesting.la
-
-test_plugin_bluetooth_SOURCES = \
- test_plugin_transport.c
-test_plugin_bluetooth_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la  \
- libgnunettransporttesting.la
-
-test_http_common_SOURCES = \
- test_http_common.c plugin_transport_http_common.c
-test_http_common_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la  \
- libgnunettransporttesting.la
-
-test_plugin_http_server_SOURCES = \
- test_plugin_transport.c
-test_plugin_http_server_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la  \
- libgnunettransporttesting.la
-
-test_plugin_https_server_SOURCES = \
- test_plugin_transport.c
-test_plugin_https_server_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la  \
- libgnunettransporttesting.la
-
-test_plugin_http_client_SOURCES = \
- test_plugin_transport.c
-test_plugin_http_client_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la  \
- libgnunettransporttesting.la
-
-test_plugin_https_client_SOURCES = \
- test_plugin_transport.c
-test_plugin_https_client_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la  \
- libgnunettransporttesting.la
-
-test_transport_api_tcp_SOURCES = \
- test_transport_api.c
-test_transport_api_tcp_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la  \
- libgnunettransporttesting.la
-
-test_transport_api2_tcp_SOURCES = \
- test_transport_api2.c
-test_transport_api2_tcp_LDADD = \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la  \
- libgnunettransporttesting2.la
-
-test_transport_api_restart_1peer_SOURCES = \
- test_transport_api_restart_reconnect.c
-test_transport_api_restart_1peer_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/ats/libgnunetats.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-test_transport_api_restart_2peers_SOURCES = \
- test_transport_api_restart_reconnect.c
-test_transport_api_restart_2peers_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/ats/libgnunetats.la \
-$(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-test_transport_api_limited_sockets_tcp_SOURCES = \
- test_transport_api_limited_sockets.c
-test_transport_api_limited_sockets_tcp_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la  \
- libgnunettransporttesting.la
-
-test_transport_api_tcp_nat_SOURCES = \
- test_transport_api.c
-test_transport_api_tcp_nat_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-test_transport_api_manipulation_send_tcp_SOURCES = \
- test_transport_api_manipulation_send_tcp.c
-test_transport_api_manipulation_send_tcp_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-test_transport_api_manipulation_recv_tcp_SOURCES = \
- test_transport_api_manipulation_recv_tcp.c
-test_transport_api_manipulation_recv_tcp_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-test_transport_api_manipulation_cfg_SOURCES = \
- test_transport_api_manipulation_cfg.c
-test_transport_api_manipulation_cfg_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-test_transport_api_reliability_tcp_SOURCES = \
- test_transport_api_reliability.c
-test_transport_api_reliability_tcp_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-test_transport_api_timeout_tcp_SOURCES = \
- test_transport_api_timeout.c
-test_transport_api_timeout_tcp_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-test_transport_api_timeout_unix_SOURCES = \
- test_transport_api_timeout.c
-test_transport_api_timeout_unix_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-test_transport_api_timeout_wlan_SOURCES = \
- test_transport_api_timeout.c
-test_transport_api_timeout_wlan_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-test_transport_api_timeout_bluetooth_SOURCES = \
- test_transport_api_timeout.c
-test_transport_api_timeout_bluetooth_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-test_transport_api_reliability_tcp_nat_SOURCES = \
- test_transport_api_reliability.c
-test_transport_api_reliability_tcp_nat_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-test_transport_api_reliability_bluetooth_SOURCES = \
- test_transport_api_reliability.c
-test_transport_api_reliability_bluetooth_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-test_transport_api_reliability_wlan_SOURCES = \
- test_transport_api_reliability.c
-test_transport_api_reliability_wlan_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-if HAVE_EXPERIMENTAL
-test_transport_api_udp_SOURCES = \
- test_transport_api.c
-test_transport_api_udp_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la  \
- libgnunettransporttesting.la
-
-test_transport_api_timeout_udp_SOURCES = \
- test_transport_api_timeout.c
-test_transport_api_timeout_udp_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-test_transport_api_udp_nat_SOURCES = \
- test_transport_api.c
-test_transport_api_udp_nat_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la  \
- libgnunettransporttesting.la
-endif
-
-test_transport_api_unix_SOURCES = \
- test_transport_api.c
-test_transport_api_unix_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-test_transport_api_unix_abstract_SOURCES = \
- test_transport_api.c
-test_transport_api_unix_abstract_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-# HTTP tests
-test_transport_api_http_SOURCES = \
- test_transport_api.c
-test_transport_api_http_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-test_transport_api_http_reverse_SOURCES = \
- test_transport_api.c
-test_transport_api_http_reverse_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-test_transport_api_timeout_http_SOURCES = \
- test_transport_api_timeout.c
-test_transport_api_timeout_http_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-test_transport_api_reliability_http_SOURCES = \
- test_transport_api_reliability.c
-test_transport_api_reliability_http_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.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 = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/ats/libgnunetats.la \
- $(top_builddir)/src/nt/libgnunetnt.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-test_quota_compliance_http_asymmetric_SOURCES = \
- test_quota_compliance.c
-test_quota_compliance_http_asymmetric_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/ats/libgnunetats.la \
- $(top_builddir)/src/nt/libgnunetnt.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-test_quota_compliance_https_SOURCES = \
- test_quota_compliance.c
-test_quota_compliance_https_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/ats/libgnunetats.la \
- $(top_builddir)/src/nt/libgnunetnt.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-test_quota_compliance_https_asymmetric_SOURCES = \
- test_quota_compliance.c
-test_quota_compliance_https_asymmetric_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/ats/libgnunetats.la \
- $(top_builddir)/src/nt/libgnunetnt.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-# HTTPS tests
-test_transport_api_https_SOURCES = \
- test_transport_api.c
-test_transport_api_https_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la  \
- libgnunettransporttesting.la
-
-test_transport_api_timeout_https_SOURCES = \
- test_transport_api_timeout.c
-test_transport_api_timeout_https_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-
-test_transport_api_reliability_https_SOURCES = \
- test_transport_api_reliability.c
-test_transport_api_reliability_https_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.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 = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-if HAVE_EXPERIMENTAL
-test_transport_api_reliability_udp_SOURCES = \
- test_transport_api_reliability.c
-test_transport_api_reliability_udp_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-endif
-
-if LINUX
-test_transport_api_wlan_SOURCES = \
- test_transport_api.c
-test_transport_api_wlan_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-endif
-
-if LINUX
-if HAVE_LIBBLUETOOTH
-test_transport_api_bluetooth_SOURCES = \
- test_transport_api.c
-test_transport_api_bluetooth_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.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
-
-if HAVE_EXPERIMENTAL
-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
-endif
-
- 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 = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/ats/libgnunetats.la \
- $(top_builddir)/src/nt/libgnunetnt.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-test_quota_compliance_tcp_asymmetric_SOURCES = \
- test_quota_compliance.c
-test_quota_compliance_tcp_asymmetric_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/nt/libgnunetnt.la \
- $(top_builddir)/src/ats/libgnunetats.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-if HAVE_EXPERIMENTAL
-test_quota_compliance_udp_SOURCES = \
- test_quota_compliance.c
-test_quota_compliance_udp_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/ats/libgnunetats.la \
- $(top_builddir)/src/nt/libgnunetnt.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-endif
-
-test_quota_compliance_unix_SOURCES = \
- test_quota_compliance.c
-test_quota_compliance_unix_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/ats/libgnunetats.la \
- $(top_builddir)/src/nt/libgnunetnt.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-test_quota_compliance_unix_asymmetric_SOURCES = \
- test_quota_compliance.c
-test_quota_compliance_unix_asymmetric_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/ats/libgnunetats.la \
- $(top_builddir)/src/nt/libgnunetnt.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-test_quota_compliance_wlan_SOURCES = \
- test_quota_compliance.c
-test_quota_compliance_wlan_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/ats/libgnunetats.la \
- $(top_builddir)/src/nt/libgnunetnt.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-test_quota_compliance_wlan_asymmetric_SOURCES = \
- test_quota_compliance.c
-test_quota_compliance_wlan_asymmetric_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/ats/libgnunetats.la \
- $(top_builddir)/src/nt/libgnunetnt.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-test_quota_compliance_bluetooth_SOURCES = \
- test_quota_compliance.c
-test_quota_compliance_bluetooth_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/ats/libgnunetats.la \
- $(top_builddir)/src/nt/libgnunetnt.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-test_quota_compliance_bluetooth_asymmetric_SOURCES = \
- test_quota_compliance.c
-test_quota_compliance_bluetooth_asymmetric_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/ats/libgnunetats.la \
- $(top_builddir)/src/nt/libgnunetnt.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
-test_transport_api_multi_SOURCES = \
- test_transport_api.c
-test_transport_api_multi_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.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 \
- 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_transport_simple_send_string.sh \
-test_transport_simple_send.sh \
-test_transport_simple_send_broadcast.sh \
-test_transport_udp_backchannel.sh \
-test_transport_simple_send_dv_circle.sh \
-gnunet-transport-certificate-creation.in \
-communicator-unix.conf \
-test_plugin_hostkey \
-test_plugin_hostkey.ecc \
-test_delay \
-template_cfg_peer1.conf\
-template_cfg_peer2.conf\
-test_plugin_transport_data.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_quota_compliance_wlan_peer1.conf\
-test_quota_compliance_wlan_peer2.conf\
-test_quota_compliance_bluetooth_peer1.conf\
-test_quota_compliance_bluetooth_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_quota_compliance_wlan_asymmetric_peer1.conf\
-test_quota_compliance_wlan_asymmetric_peer2.conf\
-test_quota_compliance_bluetooth_asymmetric_peer1.conf\
-test_quota_compliance_bluetooth_asymmetric_peer2.conf\
-test_transport_api_data.conf\
-test_transport_api_blacklisting_tcp_peer1.conf \
-test_transport_api_blacklisting_tcp_peer2.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_restart_1peer_peer1.conf\
-test_transport_api_restart_1peer_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_reliability_bluetooth_peer1.conf\
-test_transport_api_reliability_bluetooth_peer2.conf\
-test_transport_api_manipulation_send_tcp_peer1.conf\
-test_transport_api_manipulation_send_tcp_peer2.conf\
-test_transport_api_manipulation_recv_tcp_peer1.conf\
-test_transport_api_manipulation_recv_tcp_peer2.conf\
-test_transport_api_manipulation_cfg_peer1.conf\
-test_transport_api_manipulation_cfg_peer2.conf\
-test_transport_api_restart_1peer_peer1.conf\
-test_transport_api_restart_1peer_peer2.conf\
-test_transport_api_restart_2peers_peer1.conf\
-test_transport_api_restart_2peers_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_api2_tcp_peer1.conf\
-test_transport_api2_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_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_unix_abstract_peer1.conf \
-test_transport_api_unix_abstract_peer2.conf \
-test_transport_api_timeout_unix_peer1.conf\
-test_transport_api_timeout_unix_peer2.conf\
-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_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_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_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_api_disconnect_tcp_peer1.conf\
-test_transport_api_disconnect_tcp_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_blacklisting_cfg_peer1.conf \
-test_transport_blacklisting_cfg_peer2.conf \
-test_transport_blacklisting_cfg_blp_peer1_full.conf\
-test_transport_blacklisting_cfg_blp_peer1_plugin.conf \
-test_transport_blacklisting_cfg_blp_peer2_full.conf\
-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 \
-perf_tcp_peer1.conf \
-perf_tcp_peer2.conf \
-test_transport_api_slow_ats_peer1.conf \
-test_transport_api_slow_ats_peer2.conf \
-  tcp_connection_legacy.c \
-  tcp_server_mst_legacy.c \
-  tcp_server_legacy.c \
-  tcp_service_legacy.c \
-test_communicator_unix_basic_peer1.conf \
-test_communicator_unix_basic_peer2.conf \
-test_communicator_tcp_basic_peer1.conf \
-test_communicator_tcp_basic_peer2.conf \
-test_communicator_udp_basic_peer1.conf \
-test_communicator_udp_basic_peer2.conf \
-test_communicator_tcp_rekey_peer1.conf \
-test_communicator_tcp_rekey_peer2.conf \
-test_communicator_udp_rekey_peer1.conf \
-test_communicator_udp_rekey_peer2.conf \
-test_communicator_udp_backchannel_peer1.conf \
-test_communicator_udp_backchannel_peer2.conf \
-test_communicator_tcp_bidirect_peer1.conf \
-test_communicator_tcp_bidirect_peer2.conf
diff --git a/src/transport/NOTES b/src/transport/NOTES
deleted file mode 100644
index 41404e1f9..000000000
--- a/src/transport/NOTES
+++ /dev/null
@@ -1,46 +0,0 @@
-KEY DESIGN CHOICES:
- - who decides which connections to keep/create?
-   => higher level session/key management!
- - who enforces things like F2F topology, etc?
-   => higher level session/key management!
- - who tracks all known HELLOs & validates? 
-   => We validate, PEERINFO tracks!
- - who advertises our HELLO?
-   => us! (need background job; previously: advertising)
- - who advertises other peers HELLOs?
-   => higher level (core?)
- - who does bootstrapping?
-   => bootstrap service (external!)
- - who enforces inbound bandwidth limits?
-   => transport-service and plugins! (previously: core); 
-      either by limiting reads (TCP) or discarding packets 
-      (transport-service)
- - who enforces outbound bandwidth limits?
-   => transport_api!
- - who decides outbound bandwidth limits?
-   => other peer, via core (need authenticated limits!)
- - who decides inbound bandwidth limits?
-   => core / apps above core (need trust info)
- - cost function for transports is latency estimate in ms
-   => plugin provides latency data, transport-service
-      selects plugin(s) for transmission
- - who is responsible for fragmentation?
-   => plugins! (may use common shared library)
- - should we require UDP to be reliable?
-   => NO.  There are other places that may (rarely)
-      use messages that we can not fix
- - how do we access the 50% of service that we need for TCP/UDP
-   from service.c without code replication or getting 50%
-   that we do not want (i.e. shutdown, pid-file-writing, etc.)
-   => use GNUNET_SERVICE_start/stop functions!
- - At what level do we manage timeouts? 
-   => At the plugin (TCP connections),
-      transport-service (neighbours) and 
-      core (sessions) level!
-   => All plugins have to disconnect before service-level
-      disconnect occurs
-   => We can have a plugin-connection die, but the session
-      survives!
-   => We can have a session die (no further authenticated
-      communication) even if the plugin thinks it is still
-      up!
diff --git a/src/transport/benchmark.sh b/src/transport/benchmark.sh
deleted file mode 100755
index a29e6ec2d..000000000
--- a/src/transport/benchmark.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-for i in $(seq 1 0)
-do
- echo RUN $i
- ./test_transport_api_reliability_http
-done
-
-for i in $(seq 1 100)
-do
- echo RUN $i
- ./test_transport_api_reliability_https
-done
diff --git a/src/transport/communicator-unix.conf b/src/transport/communicator-unix.conf
deleted file mode 100644
index ad92616c6..000000000
--- a/src/transport/communicator-unix.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[communicator-unix]
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-communicator-unix.sock
diff --git a/src/transport/communicator.h b/src/transport/communicator.h
deleted file mode 100644
index 5ef43597d..000000000
--- a/src/transport/communicator.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2009-2014 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/communicator.h
- * @brief common internal definitions for communicator services
- * @author Christian Grothoff
- */
-#ifndef COMMUNICATOR_H
-#define COMMUNICAOTR_H
-
-#include "gnunet_util_lib.h"
-#include "gnunet_protocols.h"
-
-GNUNET_NETWORK_STRUCT_BEGIN
-
-/**
- * Message used to tell a communicator about a successful
- * key exchange.
- *
- * Note that this style of KX acknowledgement typically only applies
- * for communicators where the underlying network protocol is
- * unidirectional and/or lacks cryptography.  Furthermore, this is
- * just the recommended "generic" style, communicators are always free
- * to implement original designs that better fit their requirements.
- */
-struct GNUNET_TRANSPORT_CommunicatorGenericKXConfirmation
-{
-  /**
-   * Type is #GNUNET_MESSAGE_TYPE_TRANSPORT_COMMUNICATOR_KX_CONFIRMATION
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Timestamp from the original sender which identifies the original KX.
-   */
-  struct GNUNET_TIME_AbsoluteNBO monotonic_time;
-
-  /**
-   * How long does the receiver of the KX believe that the address
-   * on which the KX was received will continue to be valid.
-   */
-  struct GNUNET_TIME_RelativeNBO validity;
-
-  /**
-   * Hash of the shared secret. Specific hash function may depend on
-   * the communicator's protocol details.
-   */
-  struct GNUNET_HashCode token;
-};
-
-
-/**
- * Message used to tell a communicator about the receiver's
- * flow control limits and to acknowledge receipt of certain
- * messages.
- *
- * Note that a sender MAY choose to violate the flow-control
- * limits provided in this message by a receiver, which may
- * result in messages being lost (after all, transport is an
- * unreliable channel).  So if the sender violates these
- * constraints, it should expect that the receive will simply
- * discard the (partially) received "old" messages.
- *
- * This way, if a sender or receiver crashes, there is no protocol
- * violation.
- *
- * Note that this style of flow control typically only applies
- * for communicators where the underlying network protocol does
- * not already implement flow control.  Furthermore, this is
- * just the recommended "generic" style, communicators are always
- * free to implement original designs that better fit their
- * requirements.
- */
-struct GNUNET_TRANSPORT_CommunicatorGenericFCLimits
-{
-  /**
-   * Type is #GNUNET_MESSAGE_TYPE_TRANSPORT_COMMUNICATOR_FC_LIMITS
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Maximum number of messages beyond the acknowledged message
-   * number that can still be transmitted concurrently without
-   * further acknowledgements.
-   */
-  uint32_t msg_window_size;
-
-  /**
-   * Up to which message number were all messages received.
-   */
-  uint64_t msg_cummulative_ack;
-
-  /**
-   * Maximum number of payload bytes beyond the acknowledged
-   * number of bytes can still be transmitted without further
-   * acknowledgements.
-   */
-  uint64_t bytes_window_size;
-
-  /**
-   * Cumulative acknowledgement for number of bytes received.
-   */
-  uint64_t bytes_cummulative_ack;
-
-  /**
-   * Followed by a variable-size bitfield for messages received
-   * beyond @e msg_cummulative_ack. Index at offset 0 must thus
-   * be zero, otherwise @e msg_cummulative_ack should be
-   * increased.  Note that this field can be overall of 0 bytes.
-   * The variable-size bitfield must be a multiple of 64 bits
-   * long.
-   */
-  /* uint64_t msg_selective_ack_field[]; */
-};
-
-
-GNUNET_NETWORK_STRUCT_END
-
-/* end of communicator.h */
-#endif
diff --git a/src/transport/gnunet-communicator-tcp.c b/src/transport/gnunet-communicator-tcp.c
deleted file mode 100644
index be75fa0e8..000000000
--- a/src/transport/gnunet-communicator-tcp.c
+++ /dev/null
@@ -1,3682 +0,0 @@
-/*
-     This file is part of GNUnet
-     Copyright (C) 2010-2014, 2018, 2019 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/gnunet-communicator-tcp.c
- * @brief Transport plugin using TCP.
- * @author Christian Grothoff
- *
- * TODO:
- * - support NAT connection reversal method (#5529)
- * - support other TCP-specific NAT traversal methods (#5531)
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_core_service.h"
-#include "gnunet_peerstore_service.h"
-#include "gnunet_protocols.h"
-#include "gnunet_signatures.h"
-#include "gnunet_constants.h"
-#include "gnunet_nt_lib.h"
-#include "gnunet_nat_service.h"
-#include "gnunet_statistics_service.h"
-#include "gnunet_transport_communication_service.h"
-#include "gnunet_resolver_service.h"
-
-/**
- * How long do we believe our addresses to remain up (before
- * the other peer should revalidate).
- */
-#define ADDRESS_VALIDITY_PERIOD \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 4)
-
-/**
- * How many messages do we keep at most in the queue to the
- * transport service before we start to drop (default,
- * can be changed via the configuration file).
- * Should be _below_ the level of the communicator API, as
- * otherwise we may read messages just to have them dropped
- * by the communicator API.
- */
-#define DEFAULT_MAX_QUEUE_LENGTH 8
-
-/**
- * Size of our IO buffers for ciphertext data. Must be at
- * least UINT_MAX + sizeof (struct TCPBox).
- */
-#define BUF_SIZE (2 * 64 * 1024 + sizeof(struct TCPBox))
-
-/**
- * How often do we rekey based on time (at least)
- */
-#define DEFAULT_REKEY_INTERVAL GNUNET_TIME_UNIT_DAYS
-
-/**
- * How long do we wait until we must have received the initial KX?
- */
-#define PROTO_QUEUE_TIMEOUT GNUNET_TIME_UNIT_MINUTES
-
-/**
- * How often do we rekey based on number of bytes transmitted?
- * (additionally randomized).
- */
-#define REKEY_MAX_BYTES (1024LLU * 1024 * 1024 * 4LLU)
-
-/**
- * Size of the initial key exchange message sent first in both
- * directions.
- */
-#define INITIAL_KX_SIZE                           \
-  (sizeof(struct GNUNET_CRYPTO_EcdhePublicKey)   \
-   + sizeof(struct TCPConfirmation))
-
-/**
- * Size of the initial core key exchange messages.
- */
-#define INITIAL_CORE_KX_SIZE          \
-  (sizeof(struct EphemeralKeyMessage)   \
-   + sizeof(struct PingMessage) \
-   + sizeof(struct PongMessage))
-
-/**
- * Address prefix used by the communicator.
- */
-#define COMMUNICATOR_ADDRESS_PREFIX "tcp"
-
-/**
- * Configuration section used by the communicator.
- */
-#define COMMUNICATOR_CONFIG_SECTION "communicator-tcp"
-
-GNUNET_NETWORK_STRUCT_BEGIN
-
-
-/**
- * Signature we use to verify that the ephemeral key was really chosen by
- * the specified sender.
- */
-struct TcpHandshakeSignature
-{
-  /**
-   * Purpose must be #GNUNET_SIGNATURE_PURPOSE_COMMUNICATOR_TCP_HANDSHAKE
-   */
-  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
-
-  /**
-   * Identity of the inititor of the TCP connection (TCP client).
-   */
-  struct GNUNET_PeerIdentity sender;
-
-  /**
-   * Presumed identity of the target of the TCP connection (TCP server)
-   */
-  struct GNUNET_PeerIdentity receiver;
-
-  /**
-   * Ephemeral key used by the @e sender.
-   */
-  struct GNUNET_CRYPTO_EcdhePublicKey ephemeral;
-
-  /**
-   * Monotonic time of @e sender, to possibly help detect replay attacks
-   * (if receiver persists times by sender).
-   */
-  struct GNUNET_TIME_AbsoluteNBO monotonic_time;
-
-  /**
-   * Challenge value used to protect against replay attack, if there is no stored monotonic time value.
-   */
-  struct GNUNET_CRYPTO_ChallengeNonceP challenge;
-};
-
-/**
- * Signature we use to verify that the ack from the receiver of the ephemeral key was really send by
- * the specified sender.
- */
-struct TcpHandshakeAckSignature
-{
-  /**
-   * Purpose must be #GNUNET_SIGNATURE_PURPOSE_COMMUNICATOR_TCP_HANDSHAKE_ACK
-   */
-  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
-
-  /**
-   * Identity of the inititor of the TCP connection (TCP client).
-   */
-  struct GNUNET_PeerIdentity sender;
-
-  /**
-   * Presumed identity of the target of the TCP connection (TCP server)
-   */
-  struct GNUNET_PeerIdentity receiver;
-
-  /**
-   * Monotonic time of @e sender, to possibly help detect replay attacks
-   * (if receiver persists times by sender).
-   */
-  struct GNUNET_TIME_AbsoluteNBO monotonic_time;
-
-  /**
-   * Challenge value used to protect against replay attack, if there is no stored monotonic time value.
-   */
-  struct GNUNET_CRYPTO_ChallengeNonceP challenge;
-};
-
-/**
- * Encrypted continuation of TCP initial handshake.
- */
-struct TCPConfirmation
-{
-  /**
-   * Sender's identity
-   */
-  struct GNUNET_PeerIdentity sender;
-
-  /**
-   * Sender's signature of type #GNUNET_SIGNATURE_PURPOSE_COMMUNICATOR_TCP_HANDSHAKE
-   */
-  struct GNUNET_CRYPTO_EddsaSignature sender_sig;
-
-  /**
-   * Monotonic time of @e sender, to possibly help detect replay attacks
-   * (if receiver persists times by sender).
-   */
-  struct GNUNET_TIME_AbsoluteNBO monotonic_time;
-
-  /**
-   * Challenge value used to protect against replay attack, if there is no stored monotonic time value.
-   */
-  struct GNUNET_CRYPTO_ChallengeNonceP challenge;
-
-};
-
-/**
- * Ack for the encrypted continuation of TCP initial handshake.
- */
-struct TCPConfirmationAck
-{
-
-
-  /**
-   * Type is #GNUNET_MESSAGE_TYPE_COMMUNICATOR_TCP_CONFIRMATION_ACK.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Sender's identity
-   */
-  struct GNUNET_PeerIdentity sender;
-
-  /**
-   * Sender's signature of type #GNUNET_SIGNATURE_PURPOSE_COMMUNICATOR_TCP_HANDSHAKE_ACK
-   */
-  struct GNUNET_CRYPTO_EddsaSignature sender_sig;
-
-  /**
-   * Monotonic time of @e sender, to possibly help detect replay attacks
-   * (if receiver persists times by sender).
-   */
-  struct GNUNET_TIME_AbsoluteNBO monotonic_time;
-
-  /**
-   * Challenge value used to protect against replay attack, if there is no stored monotonic time value.
-   */
-  struct GNUNET_CRYPTO_ChallengeNonceP challenge;
-
-};
-
-/**
- * TCP message box.  Always sent encrypted!
- */
-struct TCPBox
-{
-  /**
-   * Type is #GNUNET_MESSAGE_TYPE_COMMUNICATOR_TCP_BOX.  Warning: the
-   * header size EXCLUDES the size of the `struct TCPBox`. We usually
-   * never do this, but here the payload may truly be 64k *after* the
-   * TCPBox (as we have no MTU)!!
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * HMAC for the following encrypted message.  Yes, we MUST use
-   * mac-then-encrypt here, as we want to hide the message sizes on
-   * the wire (zero plaintext design!).  Using CTR mode, padding oracle
-   * attacks do not apply.  Besides, due to the use of ephemeral keys
-   * (hopefully with effective replay protection from monotonic time!)
-   * the attacker is limited in using the oracle.
-   */
-  struct GNUNET_ShortHashCode hmac;
-
-  /* followed by as may bytes of payload as indicated in @e header,
-     excluding the TCPBox itself! */
-};
-
-
-/**
- * TCP rekey message box.  Always sent encrypted!  Data after
- * this message will use the new key.
- */
-struct TCPRekey
-{
-  /**
-   * Type is #GNUNET_MESSAGE_TYPE_COMMUNICATOR_TCP_REKEY.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * HMAC for the following encrypted message.  Yes, we MUST use
-   * mac-then-encrypt here, as we want to hide the message sizes on
-   * the wire (zero plaintext design!).  Using CTR mode padding oracle
-   * attacks do not apply.  Besides, due to the use of ephemeral keys
-   * (hopefully with effective replay protection from monotonic time!)
-   * the attacker is limited in using the oracle.
-   */
-  struct GNUNET_ShortHashCode hmac;
-
-  /**
-   * New ephemeral key.
-   */
-  struct GNUNET_CRYPTO_EcdhePublicKey ephemeral;
-
-  /**
-   * Sender's signature of type #GNUNET_SIGNATURE_PURPOSE_COMMUNICATOR_TCP_REKEY
-   */
-  struct GNUNET_CRYPTO_EddsaSignature sender_sig;
-
-  /**
-   * Monotonic time of @e sender, to possibly help detect replay attacks
-   * (if receiver persists times by sender).
-   */
-  struct GNUNET_TIME_AbsoluteNBO monotonic_time;
-};
-
-/**
- * Signature we use to verify that the ephemeral key was really chosen by
- * the specified sender.
- */
-struct TcpRekeySignature
-{
-  /**
-   * Purpose must be #GNUNET_SIGNATURE_PURPOSE_COMMUNICATOR_TCP_REKEY
-   */
-  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
-
-  /**
-   * Identity of the inititor of the TCP connection (TCP client).
-   */
-  struct GNUNET_PeerIdentity sender;
-
-  /**
-   * Presumed identity of the target of the TCP connection (TCP server)
-   */
-  struct GNUNET_PeerIdentity receiver;
-
-  /**
-   * Ephemeral key used by the @e sender.
-   */
-  struct GNUNET_CRYPTO_EcdhePublicKey ephemeral;
-
-  /**
-   * Monotonic time of @e sender, to possibly help detect replay attacks
-   * (if receiver persists times by sender).
-   */
-  struct GNUNET_TIME_AbsoluteNBO monotonic_time;
-};
-
-/**
- * TCP finish. Sender asks for the connection to be closed.
- * Needed/useful in case we drop RST/FIN packets on the GNUnet
- * port due to the possibility of malicious RST/FIN injection.
- */
-struct TCPFinish
-{
-  /**
-   * Type is #GNUNET_MESSAGE_TYPE_COMMUNICATOR_TCP_FINISH.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * HMAC for the following encrypted message.  Yes, we MUST use
-   * mac-then-encrypt here, as we want to hide the message sizes on
-   * the wire (zero plaintext design!).  Using CTR mode padding oracle
-   * attacks do not apply.  Besides, due to the use of ephemeral keys
-   * (hopefully with effective replay protection from monotonic time!)
-   * the attacker is limited in using the oracle.
-   */
-  struct GNUNET_ShortHashCode hmac;
-};
-
-
-GNUNET_NETWORK_STRUCT_END
-
-/**
- * Struct to use as closure.
- */
-struct ListenTask
-{
-  /**
-   * ID of listen task
-   */
-  struct GNUNET_SCHEDULER_Task *listen_task;
-
-  /**
-   * Listen socket.
-   */
-  struct GNUNET_NETWORK_Handle *listen_sock;
-};
-
-/**
- * Handle for a queue.
- */
-struct Queue
-{
-  /**
-   * To whom are we talking to.
-   */
-  struct GNUNET_PeerIdentity target;
-
-  /**
-   * Listen socket.
-   */
-  struct GNUNET_NETWORK_Handle *listen_sock;
-
-  /**
-   * socket that we transmit all data with on this queue
-   */
-  struct GNUNET_NETWORK_Handle *sock;
-
-  /**
-   * cipher for decryption of incoming data.
-   */
-  gcry_cipher_hd_t in_cipher;
-
-  /**
-   * cipher for encryption of outgoing data.
-   */
-  gcry_cipher_hd_t out_cipher;
-
-  /**
-   * Shared secret for HMAC verification on incoming data.
-   */
-  struct GNUNET_HashCode in_hmac;
-
-  /**
-   * Shared secret for HMAC generation on outgoing data, ratcheted after
-   * each operation.
-   */
-  struct GNUNET_HashCode out_hmac;
-
-  /**
-   * Our ephemeral key. Stored here temporarily during rekeying / key
-   * generation.
-   */
-  struct GNUNET_CRYPTO_EcdhePrivateKey ephemeral;
-
-  /**
-   * ID of read task for this connection.
-   */
-  struct GNUNET_SCHEDULER_Task *read_task;
-
-  /**
-   * ID of write task for this connection.
-   */
-  struct GNUNET_SCHEDULER_Task *write_task;
-
-  /**
-   * Address of the other peer.
-   */
-  struct sockaddr *address;
-
-  /**
-   * How many more bytes may we sent with the current @e out_cipher
-   * before we should rekey?
-   */
-  uint64_t rekey_left_bytes;
-
-  /**
-   * Until what time may we sent with the current @e out_cipher
-   * before we should rekey?
-   */
-  struct GNUNET_TIME_Absolute rekey_time;
-
-  /**
-   * Length of the address.
-   */
-  socklen_t address_len;
-
-  /**
-   * Message queue we are providing for the #ch.
-   */
-  struct GNUNET_MQ_Handle *mq;
-
-  /**
-   * handle for this queue with the #ch.
-   */
-  struct GNUNET_TRANSPORT_QueueHandle *qh;
-
-  /**
-   * Number of bytes we currently have in our write queue.
-   */
-  unsigned long long bytes_in_queue;
-
-  /**
-   * Buffer for reading ciphertext from network into.
-   */
-  char cread_buf[BUF_SIZE];
-
-  /**
-   * buffer for writing ciphertext to network.
-   */
-  char cwrite_buf[BUF_SIZE];
-
-  /**
-   * Plaintext buffer for decrypted plaintext.
-   */
-  char pread_buf[UINT16_MAX + 1 + sizeof(struct TCPBox)];
-
-  /**
-   * Plaintext buffer for messages to be encrypted.
-   */
-  char pwrite_buf[UINT16_MAX + 1 + sizeof(struct TCPBox)];
-
-  /**
-   * At which offset in the ciphertext read buffer should we
-   * append more ciphertext for transmission next?
-   */
-  size_t cread_off;
-
-  /**
-   * At which offset in the ciphertext write buffer should we
-   * append more ciphertext from reading next?
-   */
-  size_t cwrite_off;
-
-  /**
-   * At which offset in the plaintext input buffer should we
-   * append more plaintext from decryption next?
-   */
-  size_t pread_off;
-
-  /**
-   * At which offset in the plaintext output buffer should we
-   * append more plaintext for encryption next?
-   */
-  size_t pwrite_off;
-
-  /**
-   * Timeout for this queue.
-   */
-  struct GNUNET_TIME_Absolute timeout;
-
-  /**
-   * How may messages did we pass from this queue to CORE for which we
-   * have yet to receive an acknoweldgement that CORE is done with
-   * them? If "large" (or even just non-zero), we should throttle
-   * reading to provide flow control.  See also #DEFAULT_MAX_QUEUE_LENGTH
-   * and #max_queue_length.
-   */
-  unsigned int backpressure;
-
-  /**
-   * Which network type does this queue use?
-   */
-  enum GNUNET_NetworkType nt;
-
-  /**
-   * The connection status of this queue.
-   */
-  enum GNUNET_TRANSPORT_ConnectionStatus cs;
-
-  /**
-   * Is MQ awaiting a #GNUNET_MQ_impl_send_continue() call?
-   */
-  int mq_awaits_continue;
-
-  /**
-   * Did we enqueue a finish message and are closing down the queue?
-   */
-  int finishing;
-
-  /**
-   * Did we technically destroy this queue, but kept the allocation
-   * around because of @e backpressure not being zero yet? Used
-   * simply to delay the final #GNUNET_free() operation until
-   * #core_read_finished_cb() has been called.
-   */
-  int destroyed;
-
-  /**
-   * #GNUNET_YES if we just rekeyed and must thus possibly
-   * re-decrypt ciphertext.
-   */
-  int rekeyed;
-
-  /**
-   * Monotonic time value for rekey message.
-   */
-  struct GNUNET_TIME_AbsoluteNBO rekey_monotonic_time;
-
-  /**
-   * Monotonic time value for handshake message.
-   */
-  struct GNUNET_TIME_AbsoluteNBO handshake_monotonic_time;
-
-  /**
-   * Monotonic time value for handshake ack message.
-   */
-  struct GNUNET_TIME_AbsoluteNBO handshake_ack_monotonic_time;
-
-  /**
-   * Challenge value used to protect against replay attack, if there is no stored monotonic time value.
-   */
-  struct GNUNET_CRYPTO_ChallengeNonceP challenge;
-
-  /**
-   * Challenge value received. In case of inbound connection we have to remember the value, because we send the challenge back later after we received the GNUNET_MESSAGE_TYPE_COMMUNICATOR_TCP_CONFIRMATION_ACK.
-   */
-  struct GNUNET_CRYPTO_ChallengeNonceP challenge_received;
-
-  /**
-   * Iteration Context for retrieving the monotonic time send with key for rekeying.
-   */
-  struct GNUNET_PEERSTORE_IterateContext *rekey_monotime_get;
-
-  /**
-   * Iteration Context for retrieving the monotonic time send with the handshake.
-   */
-  struct GNUNET_PEERSTORE_IterateContext *handshake_monotime_get;
-
-  /**
-   * Iteration Context for retrieving the monotonic time send with the handshake ack.
-   */
-  struct GNUNET_PEERSTORE_IterateContext *handshake_ack_monotime_get;
-
-  /**
-   * Store Context for retrieving the monotonic time send with key for rekeying.
-   */
-  struct GNUNET_PEERSTORE_StoreContext *rekey_monotime_sc;
-
-  /**
-   * Store Context for retrieving the monotonic time send with the handshake.
-   */
-  struct GNUNET_PEERSTORE_StoreContext *handshake_monotime_sc;
-
-  /**
-   * Store Context for retrieving the monotonic time send with the handshake ack.
-   */
-  struct GNUNET_PEERSTORE_StoreContext *handshake_ack_monotime_sc;
-};
-
-
-/**
- * Handle for an incoming connection where we do not yet have enough
- * information to setup a full queue.
- */
-struct ProtoQueue
-{
-  /**
-   * Kept in a DLL.
-   */
-  struct ProtoQueue *next;
-
-  /**
-   * Kept in a DLL.
-   */
-  struct ProtoQueue *prev;
-
-  /**
-   * Listen socket.
-   */
-  struct GNUNET_NETWORK_Handle *listen_sock;
-
-  /**
-   * socket that we transmit all data with on this queue
-   */
-  struct GNUNET_NETWORK_Handle *sock;
-
-  /**
-   * ID of read task for this connection.
-   */
-  struct GNUNET_SCHEDULER_Task *read_task;
-
-  /**
-   * Address of the other peer.
-   */
-  struct sockaddr *address;
-
-  /**
-   * Length of the address.
-   */
-  socklen_t address_len;
-
-  /**
-   * Timeout for this protoqueue.
-   */
-  struct GNUNET_TIME_Absolute timeout;
-
-  /**
-   * Buffer for reading all the information we need to upgrade from
-   * protoqueue to queue.
-   */
-  char ibuf[INITIAL_KX_SIZE];
-
-  /**
-   * Current offset for reading into @e ibuf.
-   */
-  size_t ibuf_off;
-};
-
-/**
- * In case of port only configuration we like to bind to ipv4 and ipv6 addresses.
- */
-struct PortOnlyIpv4Ipv6
-{
-  /**
-   * Ipv4 address we like to bind to.
-   */
-  struct sockaddr *addr_ipv4;
-
-  /**
-   * Length of ipv4 address.
-   */
-  socklen_t addr_len_ipv4;
-
-  /**
-   * Ipv6 address we like to bind to.
-   */
-  struct sockaddr *addr_ipv6;
-
-  /**
-   * Length of ipv6 address.
-   */
-  socklen_t addr_len_ipv6;
-
-};
-
-/**
- * DLL to store the addresses we like to register at NAT service.
- */
-struct Addresses
-{
-  /**
-   * Kept in a DLL.
-   */
-  struct Addresses *next;
-
-  /**
-   * Kept in a DLL.
-   */
-  struct Addresses *prev;
-
-  /**
-   * Address we like to register at NAT service.
-   */
-  struct sockaddr *addr;
-
-  /**
-   * Length of address we like to register at NAT service.
-   */
-  socklen_t addr_len;
-
-};
-
-
-/**
- * Maximum queue length before we stop reading towards the transport service.
- */
-static unsigned long long max_queue_length;
-
-/**
- * For logging statistics.
- */
-static struct GNUNET_STATISTICS_Handle *stats;
-
-/**
- * Our environment.
- */
-static struct GNUNET_TRANSPORT_CommunicatorHandle *ch;
-
-/**
- * Queues (map from peer identity to `struct Queue`)
- */
-static struct GNUNET_CONTAINER_MultiPeerMap *queue_map;
-
-/**
- * ListenTasks (map from socket to `struct ListenTask`)
- */
-static struct GNUNET_CONTAINER_MultiHashMap *lt_map;
-
-/**
- * Our public key.
- */
-static struct GNUNET_PeerIdentity my_identity;
-
-/**
- * The rekey interval
- */
-static struct GNUNET_TIME_Relative rekey_interval;
-
-/**
- * Our private key.
- */
-static struct GNUNET_CRYPTO_EddsaPrivateKey *my_private_key;
-
-/**
- * Our configuration.
- */
-static const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-/**
- * Network scanner to determine network types.
- */
-static struct GNUNET_NT_InterfaceScanner *is;
-
-/**
- * Connection to NAT service.
- */
-static struct GNUNET_NAT_Handle *nat;
-
-/**
- * Protoqueues DLL head.
- */
-static struct ProtoQueue *proto_head;
-
-/**
- * Protoqueues DLL tail.
- */
-static struct ProtoQueue *proto_tail;
-
-/**
- * Handle for DNS lookup of bindto address
- */
-struct GNUNET_RESOLVER_RequestHandle *resolve_request_handle;
-
-/**
- * Head of DLL with addresses we like to register at NAT servcie.
- */
-struct Addresses *addrs_head;
-
-/**
- * Head of DLL with addresses we like to register at NAT servcie.
- */
-struct Addresses *addrs_tail;
-
-/**
- * Head of DLL with ListenTasks.
- */
-struct ListenTask *lts_head;
-
-/**
- * Head of DLL with ListenTask.
- */
-struct ListenTask *lts_tail;
-
-/**
- * Number of addresses in the DLL for register at NAT service.
- */
-int addrs_lens;
-
-/**
- * Size of data received without KX challenge played back.
- */
-// TODO remove?
-size_t unverified_size;
-
-/**
- * Database for peer's HELLOs.
- */
-static struct GNUNET_PEERSTORE_Handle *peerstore;
-
-/**
- * A flag indicating we are already doing a shutdown.
- */
-int shutdown_running = GNUNET_NO;
-
-/**
- * The port the communicator should be assigned to.
- */
-unsigned int bind_port;
-
-/**
- * We have been notified that our listen socket has something to
- * read. Do the read and reschedule this function to be called again
- * once more is available.
- *
- * @param cls NULL
- */
-static void
-listen_cb (void *cls);
-
-/**
- * Functions with this signature are called whenever we need
- * to close a queue due to a disconnect or failure to
- * establish a connection.
- *
- * @param queue queue to close down
- */
-static void
-queue_destroy (struct Queue *queue)
-{
-  struct ListenTask *lt = NULL;
-  struct GNUNET_HashCode h_sock;
-  int sockfd;
-
-  if (NULL != queue->listen_sock)
-  {
-    sockfd = GNUNET_NETWORK_get_fd (queue->listen_sock);
-    GNUNET_CRYPTO_hash (&sockfd,
-                        sizeof(int),
-                        &h_sock);
-
-    lt = GNUNET_CONTAINER_multihashmap_get (lt_map, &h_sock);
-  }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Disconnecting queue for peer `%s'\n",
-              GNUNET_i2s (&queue->target));
-  if (NULL != queue->rekey_monotime_sc)
-  {
-    GNUNET_PEERSTORE_store_cancel (queue->rekey_monotime_sc);
-    queue->rekey_monotime_sc = NULL;
-  }
-  if (NULL != queue->handshake_monotime_sc)
-  {
-    GNUNET_PEERSTORE_store_cancel (queue->handshake_monotime_sc);
-    queue->handshake_monotime_sc = NULL;
-  }
-  if (NULL != queue->handshake_ack_monotime_sc)
-  {
-    GNUNET_PEERSTORE_store_cancel (queue->handshake_ack_monotime_sc);
-    queue->handshake_ack_monotime_sc = NULL;
-  }
-  if (NULL != queue->rekey_monotime_get)
-  {
-    GNUNET_PEERSTORE_iterate_cancel (queue->rekey_monotime_get);
-    queue->rekey_monotime_get = NULL;
-  }
-  if (NULL != queue->handshake_monotime_get)
-  {
-    GNUNET_PEERSTORE_iterate_cancel (queue->handshake_monotime_get);
-    queue->handshake_monotime_get = NULL;
-  }
-  if (NULL != queue->handshake_ack_monotime_get)
-  {
-    GNUNET_PEERSTORE_iterate_cancel (queue->handshake_ack_monotime_get);
-    queue->handshake_ack_monotime_get = NULL;
-  }
-  if (NULL != queue->qh)
-  {
-    GNUNET_TRANSPORT_communicator_mq_del (queue->qh);
-    queue->qh = NULL;
-  }
-  GNUNET_assert (
-    GNUNET_YES ==
-    GNUNET_CONTAINER_multipeermap_remove (queue_map, &queue->target, queue));
-  GNUNET_STATISTICS_set (stats,
-                         "# queues active",
-                         GNUNET_CONTAINER_multipeermap_size (queue_map),
-                         GNUNET_NO);
-  if (NULL != queue->read_task)
-  {
-    GNUNET_SCHEDULER_cancel (queue->read_task);
-    queue->read_task = NULL;
-  }
-  if (NULL != queue->write_task)
-  {
-    GNUNET_SCHEDULER_cancel (queue->write_task);
-    queue->write_task = NULL;
-  }
-  if (GNUNET_SYSERR == GNUNET_NETWORK_socket_close (queue->sock))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "closing socket failed\n");
-  }
-  gcry_cipher_close (queue->in_cipher);
-  gcry_cipher_close (queue->out_cipher);
-  GNUNET_free (queue->address);
-  if (0 != queue->backpressure)
-    queue->destroyed = GNUNET_YES;
-  else
-    GNUNET_free (queue);
-
-  if (NULL == lt)
-    return;
-
-  if ((! shutdown_running) && (NULL == lt->listen_task))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "add read net listen\n");
-    lt->listen_task = GNUNET_SCHEDULER_add_read_net (
-      GNUNET_TIME_UNIT_FOREVER_REL,
-      lt->listen_sock,
-      &listen_cb,
-      lt);
-  }
-  else
-    GNUNET_free (lt);
-}
-
-
-/**
- * Compute @a mac over @a buf, and ratched the @a hmac_secret.
- *
- * @param[in,out] hmac_secret secret for HMAC calculation
- * @param buf buffer to MAC
- * @param buf_size number of bytes in @a buf
- * @param smac[out] where to write the HMAC
- */
-static void
-calculate_hmac (struct GNUNET_HashCode *hmac_secret,
-                const void *buf,
-                size_t buf_size,
-                struct GNUNET_ShortHashCode *smac)
-{
-  struct GNUNET_HashCode mac;
-
-  GNUNET_CRYPTO_hmac_raw (hmac_secret,
-                          sizeof(struct GNUNET_HashCode),
-                          buf,
-                          buf_size,
-                          &mac);
-  /* truncate to `struct GNUNET_ShortHashCode` */
-  memcpy (smac, &mac, sizeof(struct GNUNET_ShortHashCode));
-  /* ratchet hmac key */
-  GNUNET_CRYPTO_hash (hmac_secret,
-                      sizeof(struct GNUNET_HashCode),
-                      hmac_secret);
-}
-
-
-/**
- * Append a 'finish' message to the outgoing transmission. Once the
- * finish has been transmitted, destroy the queue.
- *
- * @param queue queue to shut down nicely
- */
-static void
-queue_finish (struct Queue *queue)
-{
-  struct TCPFinish fin;
-
-  memset (&fin, 0, sizeof(fin));
-  fin.header.size = htons (sizeof(fin));
-  fin.header.type = htons (GNUNET_MESSAGE_TYPE_COMMUNICATOR_TCP_FINISH);
-  calculate_hmac (&queue->out_hmac, &fin, sizeof(fin), &fin.hmac);
-  /* if there is any message left in pwrite_buf, we
-     overwrite it (possibly dropping the last message
-     from CORE hard here) */
-  memcpy (queue->pwrite_buf, &fin, sizeof(fin));
-  queue->pwrite_off = sizeof(fin);
-  /* This flag will ensure that #queue_write() no longer
-     notifies CORE about the possibility of sending
-     more data, and that #queue_write() will call
-  #queue_destroy() once the @c fin was fully written. */
-  queue->finishing = GNUNET_YES;
-}
-
-
-/**
- * Increment queue timeout due to activity.  We do not immediately
- * notify the monitor here as that might generate excessive
- * signalling.
- *
- * @param queue queue for which the timeout should be rescheduled
- */
-static void
-reschedule_queue_timeout (struct Queue *queue)
-{
-  queue->timeout =
-    GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
-}
-
-
-/**
- * Queue read task. If we hit the timeout, disconnect it
- *
- * @param cls the `struct Queue *` to disconnect
- */
-static void
-queue_read (void *cls);
-
-
-/**
- * Core tells us it is done processing a message that transport
- * received on a queue with status @a success.
- *
- * @param cls a `struct Queue *` where the message originally came from
- * @param success #GNUNET_OK on success
- */
-static void
-core_read_finished_cb (void *cls, int success)
-{
-  struct Queue *queue = cls;
-  if (GNUNET_OK != success)
-    GNUNET_STATISTICS_update (stats,
-                              "# messages lost in communicator API towards CORE",
-                              1,
-                              GNUNET_NO);
-  if (NULL == queue)
-    return;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "backpressure %u\n",
-              queue->backpressure);
-
-  queue->backpressure--;
-  /* handle deferred queue destruction */
-  if ((queue->destroyed) && (0 == queue->backpressure))
-  {
-    GNUNET_free (queue);
-    return;
-  }
-  else if (GNUNET_YES != queue->destroyed)
-  {
-    reschedule_queue_timeout (queue);
-    /* possibly unchoke reading, now that CORE made progress */
-    if (NULL == queue->read_task)
-      queue->read_task =
-        GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_absolute_get_remaining (
-                                         queue->timeout),
-                                       queue->sock,
-                                       &queue_read,
-                                       queue);
-  }
-}
-
-
-/**
- * We received @a plaintext_len bytes of @a plaintext on @a queue.
- * Pass it on to CORE.  If transmission is actually happening,
- * increase backpressure counter.
- *
- * @param queue the queue that received the plaintext
- * @param plaintext the plaintext that was received
- * @param plaintext_len number of bytes of plaintext received
- */
-static void
-pass_plaintext_to_core (struct Queue *queue,
-                        const void *plaintext,
-                        size_t plaintext_len)
-{
-  const struct GNUNET_MessageHeader *hdr = plaintext;
-  int ret;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "pass message from %s to core\n",
-              GNUNET_i2s (&queue->target));
-
-  if (ntohs (hdr->size) != plaintext_len)
-  {
-    /* NOTE: If we ever allow multiple CORE messages in one
-       BOX, this will have to change! */
-    GNUNET_break (0);
-    return;
-  }
-  ret = GNUNET_TRANSPORT_communicator_receive (ch,
-                                               &queue->target,
-                                               hdr,
-                                               ADDRESS_VALIDITY_PERIOD,
-                                               &core_read_finished_cb,
-                                               queue);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "passed to core\n");
-  if (GNUNET_OK == ret)
-    queue->backpressure++;
-  GNUNET_break (GNUNET_NO != ret);  /* backpressure not working!? */
-  if (GNUNET_SYSERR == ret)
-    GNUNET_STATISTICS_update (stats,
-                              "# bytes lost due to CORE not running",
-                              plaintext_len,
-                              GNUNET_NO);
-}
-
-
-/**
- * Setup @a cipher based on shared secret @a dh and decrypting
- * peer @a pid.
- *
- * @param dh shared secret
- * @param pid decrypting peer's identity
- * @param cipher[out] cipher to initialize
- * @param hmac_key[out] HMAC key to initialize
- */
-static void
-setup_cipher (const struct GNUNET_HashCode *dh,
-              const struct GNUNET_PeerIdentity *pid,
-              gcry_cipher_hd_t *cipher,
-              struct GNUNET_HashCode *hmac_key)
-{
-  char key[256 / 8];
-  char ctr[128 / 8];
-
-  GNUNET_assert (0 == gcry_cipher_open (cipher,
-                                        GCRY_CIPHER_AES256 /* low level: go for speed */,
-                                        GCRY_CIPHER_MODE_CTR,
-                                        0 /* flags */));
-  GNUNET_assert (GNUNET_YES == GNUNET_CRYPTO_kdf (key,
-                                                  sizeof(key),
-                                                  "TCP-key",
-                                                  strlen ("TCP-key"),
-                                                  dh,
-                                                  sizeof(*dh),
-                                                  pid,
-                                                  sizeof(*pid),
-                                                  NULL,
-                                                  0));
-  GNUNET_assert (0 == gcry_cipher_setkey (*cipher, key, sizeof(key)));
-  GNUNET_assert (GNUNET_YES == GNUNET_CRYPTO_kdf (ctr,
-                                                  sizeof(ctr),
-                                                  "TCP-ctr",
-                                                  strlen ("TCP-ctr"),
-                                                  dh,
-                                                  sizeof(*dh),
-                                                  pid,
-                                                  sizeof(*pid),
-                                                  NULL,
-                                                  0));
-  gcry_cipher_setctr (*cipher, ctr, sizeof(ctr));
-  GNUNET_assert (GNUNET_YES ==
-                 GNUNET_CRYPTO_kdf (hmac_key,
-                                    sizeof(struct GNUNET_HashCode),
-                                    "TCP-hmac",
-                                    strlen ("TCP-hmac"),
-                                    dh,
-                                    sizeof(*dh),
-                                    pid,
-                                    sizeof(*pid),
-                                    NULL,
-                                    0));
-}
-
-
-/**
- * Callback called when peerstore store operation for rekey monotime value is finished.
- * @param cls Queue context the store operation was executed.
- * @param success Store operation was successful (GNUNET_OK) or not.
- */
-static void
-rekey_monotime_store_cb (void *cls, int success)
-{
-  struct Queue *queue = cls;
-  if (GNUNET_OK != success)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to store rekey monotonic time in PEERSTORE!\n");
-  }
-  queue->rekey_monotime_sc = NULL;
-}
-
-
-/**
- * Callback called by peerstore when records for GNUNET_PEERSTORE_TRANSPORT_TCP_COMMUNICATOR_REKEY
- * where found.
- * @param cls Queue context the store operation was executed.
- * @param record The record found or NULL if there is no record left.
- * @param emsg Message from peerstore.
- */
-static void
-rekey_monotime_cb (void *cls,
-                   const struct GNUNET_PEERSTORE_Record *record,
-                   const char *emsg)
-{
-  struct Queue *queue = cls;
-  struct GNUNET_TIME_AbsoluteNBO *mtbe;
-  struct GNUNET_TIME_Absolute mt;
-  const struct GNUNET_PeerIdentity *pid;
-  struct GNUNET_TIME_AbsoluteNBO *rekey_monotonic_time;
-
-  (void) emsg;
-
-  rekey_monotonic_time = &queue->rekey_monotonic_time;
-  pid = &queue->target;
-  if (NULL == record)
-  {
-    queue->rekey_monotime_get = NULL;
-    return;
-  }
-  if (sizeof(*mtbe) != record->value_size)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  mtbe = record->value;
-  mt = GNUNET_TIME_absolute_ntoh (*mtbe);
-  if (mt.abs_value_us > GNUNET_TIME_absolute_ntoh (
-        queue->rekey_monotonic_time).abs_value_us)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Queue from %s dropped, rekey monotime in the past\n",
-                GNUNET_i2s (&queue->target));
-    GNUNET_break (0);
-    queue_finish (queue);
-    return;
-  }
-  queue->rekey_monotime_sc = GNUNET_PEERSTORE_store (peerstore,
-                                                     "transport_tcp_communicator",
-                                                     pid,
-                                                     GNUNET_PEERSTORE_TRANSPORT_TCP_COMMUNICATOR_REKEY,
-                                                     rekey_monotonic_time,
-                                                     sizeof(*
-                                                            rekey_monotonic_time),
-                                                     GNUNET_TIME_UNIT_FOREVER_ABS,
-                                                     GNUNET_PEERSTORE_STOREOPTION_REPLACE,
-                                                     &rekey_monotime_store_cb,
-                                                     queue);
-}
-
-
-/**
- * Setup cipher of @a queue for decryption.
- *
- * @param ephemeral ephemeral key we received from the other peer
- * @param queue[in,out] queue to initialize decryption cipher for
- */
-static void
-setup_in_cipher (const struct GNUNET_CRYPTO_EcdhePublicKey *ephemeral,
-                 struct Queue *queue)
-{
-  struct GNUNET_HashCode dh;
-
-  GNUNET_CRYPTO_eddsa_ecdh (my_private_key, ephemeral, &dh);
-  setup_cipher (&dh, &my_identity, &queue->in_cipher, &queue->in_hmac);
-}
-
-
-/**
- * Handle @a rekey message on @a queue. The message was already
- * HMAC'ed, but we should additionally still check the signature.
- * Then we need to stop the old cipher and start afresh.
- *
- * @param queue the queue @a rekey was received on
- * @param rekey the rekey message
- */
-static void
-do_rekey (struct Queue *queue, const struct TCPRekey *rekey)
-{
-  struct TcpRekeySignature thp;
-
-  thp.purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_COMMUNICATOR_TCP_REKEY);
-  thp.purpose.size = htonl (sizeof(thp));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "do_rekey size %u\n",
-              thp.purpose.size);
-  thp.sender = queue->target;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "sender %s\n",
-              GNUNET_p2s (&thp.sender.public_key));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "sender %s\n",
-              GNUNET_p2s (&queue->target.public_key));
-  thp.receiver = my_identity;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "receiver %s\n",
-              GNUNET_p2s (&thp.receiver.public_key));
-  thp.ephemeral = rekey->ephemeral;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "ephemeral %s\n",
-              GNUNET_e2s (&thp.ephemeral));
-  thp.monotonic_time = rekey->monotonic_time;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "time %s\n",
-              GNUNET_STRINGS_absolute_time_to_string (
-                GNUNET_TIME_absolute_ntoh (thp.monotonic_time)));
-  GNUNET_assert (ntohl ((&thp)->purpose.size) == sizeof (*(&thp)));
-  if (GNUNET_OK !=
-      GNUNET_CRYPTO_eddsa_verify (GNUNET_SIGNATURE_PURPOSE_COMMUNICATOR_TCP_REKEY,
-                                  &thp,
-                                  &rekey->sender_sig,
-                                  &queue->target.public_key))
-  {
-    GNUNET_break (0);
-    queue_finish (queue);
-    return;
-  }
-  queue->rekey_monotonic_time = rekey->monotonic_time;
-  queue->rekey_monotime_get = GNUNET_PEERSTORE_iterate (peerstore,
-                                                        "transport_tcp_communicator",
-                                                        &queue->target,
-                                                        GNUNET_PEERSTORE_TRANSPORT_TCP_COMMUNICATOR_REKEY,
-                                                        &rekey_monotime_cb,
-                                                        queue);
-  gcry_cipher_close (queue->in_cipher);
-  queue->rekeyed = GNUNET_YES;
-  setup_in_cipher (&rekey->ephemeral, queue);
-}
-
-
-/**
- * Callback called when peerstore store operation for handshake ack monotime value is finished.
- * @param cls Queue context the store operation was executed.
- * @param success Store operation was successful (GNUNET_OK) or not.
- */
-static void
-handshake_ack_monotime_store_cb (void *cls, int success)
-{
-  struct Queue *queue = cls;
-
-  if (GNUNET_OK != success)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to store handshake ack monotonic time in PEERSTORE!\n");
-  }
-  queue->handshake_ack_monotime_sc = NULL;
-}
-
-
-/**
- * Callback called by peerstore when records for GNUNET_PEERSTORE_TRANSPORT_TCP_COMMUNICATOR_HANDSHAKE_ACK
- * where found.
- * @param cls Queue context the store operation was executed.
- * @param record The record found or NULL if there is no record left.
- * @param emsg Message from peerstore.
- */
-static void
-handshake_ack_monotime_cb (void *cls,
-                           const struct GNUNET_PEERSTORE_Record *record,
-                           const char *emsg)
-{
-  struct Queue *queue = cls;
-  struct GNUNET_TIME_AbsoluteNBO *mtbe;
-  struct GNUNET_TIME_Absolute mt;
-  const struct GNUNET_PeerIdentity *pid;
-  struct GNUNET_TIME_AbsoluteNBO *handshake_ack_monotonic_time;
-
-  (void) emsg;
-
-  handshake_ack_monotonic_time = &queue->handshake_ack_monotonic_time;
-  pid = &queue->target;
-  if (NULL == record)
-  {
-    queue->handshake_ack_monotime_get = NULL;
-    return;
-  }
-  if (sizeof(*mtbe) != record->value_size)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  mtbe = record->value;
-  mt = GNUNET_TIME_absolute_ntoh (*mtbe);
-  if (mt.abs_value_us > GNUNET_TIME_absolute_ntoh (
-        queue->handshake_ack_monotonic_time).abs_value_us)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Queue from %s dropped, handshake ack monotime in the past\n",
-                GNUNET_i2s (&queue->target));
-    GNUNET_break (0);
-    queue_finish (queue);
-    return;
-  }
-  queue->handshake_ack_monotime_sc =
-    GNUNET_PEERSTORE_store (peerstore,
-                            "transport_tcp_communicator",
-                            pid,
-                            GNUNET_PEERSTORE_TRANSPORT_TCP_COMMUNICATOR_HANDSHAKE_ACK,
-                            handshake_ack_monotonic_time,
-                            sizeof(*handshake_ack_monotonic_time),
-                            GNUNET_TIME_UNIT_FOREVER_ABS,
-                            GNUNET_PEERSTORE_STOREOPTION_REPLACE,
-                            &
-                            handshake_ack_monotime_store_cb,
-                            queue);
-}
-
-
-/**
- * Sending challenge with TcpConfirmationAck back to sender of ephemeral key.
- *
- * @param tc The TCPConfirmation originally send.
- * @param queue The queue context.
- */
-static void
-send_challenge (struct GNUNET_CRYPTO_ChallengeNonceP challenge, struct Queue *queue)
-{
-  struct TCPConfirmationAck tca;
-  struct TcpHandshakeAckSignature thas;
-
-  GNUNET_log_from_nocheck (GNUNET_ERROR_TYPE_DEBUG,
-                           "transport",
-                           "sending challenge\n");
-
-  tca.header.type = ntohs (
-    GNUNET_MESSAGE_TYPE_COMMUNICATOR_TCP_CONFIRMATION_ACK);
-  tca.header.size = ntohs (sizeof(tca));
-  tca.challenge = challenge;
-  tca.sender = my_identity;
-  tca.monotonic_time =
-    GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get_monotonic (cfg));
-  thas.purpose.purpose = htonl (
-    GNUNET_SIGNATURE_PURPOSE_COMMUNICATOR_TCP_HANDSHAKE_ACK);
-  thas.purpose.size = htonl (sizeof(thas));
-  thas.sender = my_identity;
-  thas.receiver = queue->target;
-  thas.monotonic_time = tca.monotonic_time;
-  thas.challenge = tca.challenge;
-  GNUNET_CRYPTO_eddsa_sign (my_private_key,
-                            &thas,
-                            &tca.sender_sig);
-  GNUNET_assert (0 ==
-                 gcry_cipher_encrypt (queue->out_cipher,
-                                      &queue->cwrite_buf[queue->cwrite_off],
-                                      sizeof(tca),
-                                      &tca,
-                                      sizeof(tca)));
-  queue->cwrite_off += sizeof(tca);
-  GNUNET_log_from_nocheck (GNUNET_ERROR_TYPE_DEBUG,
-                           "transport",
-                           "sending challenge done\n");
-}
-
-
-/**
- * Setup cipher for outgoing data stream based on target and
- * our ephemeral private key.
- *
- * @param queue queue to setup outgoing (encryption) cipher for
- */
-static void
-setup_out_cipher (struct Queue *queue)
-{
-  struct GNUNET_HashCode dh;
-
-  GNUNET_CRYPTO_ecdh_eddsa (&queue->ephemeral, &queue->target.public_key, &dh);
-  /* we don't need the private key anymore, drop it! */
-  memset (&queue->ephemeral, 0, sizeof(queue->ephemeral));
-  setup_cipher (&dh, &queue->target, &queue->out_cipher, &queue->out_hmac);
-  queue->rekey_time = GNUNET_TIME_relative_to_absolute (rekey_interval);
-  queue->rekey_left_bytes =
-    GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, REKEY_MAX_BYTES);
-}
-
-
-/**
- * Inject a `struct TCPRekey` message into the queue's plaintext
- * buffer.
- *
- * @param queue queue to perform rekeying on
- */
-static void
-inject_rekey (struct Queue *queue)
-{
-  struct TCPRekey rekey;
-  struct TcpRekeySignature thp;
-
-  GNUNET_assert (0 == queue->pwrite_off);
-  memset (&rekey, 0, sizeof(rekey));
-  GNUNET_CRYPTO_ecdhe_key_create (&queue->ephemeral);
-  rekey.header.type = ntohs (GNUNET_MESSAGE_TYPE_COMMUNICATOR_TCP_REKEY);
-  rekey.header.size = ntohs (sizeof(rekey));
-  GNUNET_CRYPTO_ecdhe_key_get_public (&queue->ephemeral, &rekey.ephemeral);
-  rekey.monotonic_time =
-    GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get_monotonic (cfg));
-  thp.purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_COMMUNICATOR_TCP_REKEY);
-  thp.purpose.size = htonl (sizeof(thp));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "inject_rekey size %u\n",
-              thp.purpose.size);
-  thp.sender = my_identity;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "sender %s\n",
-              GNUNET_p2s (&thp.sender.public_key));
-  thp.receiver = queue->target;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "receiver %s\n",
-              GNUNET_p2s (&thp.receiver.public_key));
-  thp.ephemeral = rekey.ephemeral;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "ephemeral %s\n",
-              GNUNET_e2s (&thp.ephemeral));
-  thp.monotonic_time = rekey.monotonic_time;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "time %s\n",
-              GNUNET_STRINGS_absolute_time_to_string (
-                GNUNET_TIME_absolute_ntoh (thp.monotonic_time)));
-  GNUNET_CRYPTO_eddsa_sign (my_private_key,
-                            &thp,
-                            &rekey.sender_sig);
-  calculate_hmac (&queue->out_hmac, &rekey, sizeof(rekey), &rekey.hmac);
-  /* Encrypt rekey message with 'old' cipher */
-  GNUNET_assert (0 ==
-                 gcry_cipher_encrypt (queue->out_cipher,
-                                      &queue->cwrite_buf[queue->cwrite_off],
-                                      sizeof(rekey),
-                                      &rekey,
-                                      sizeof(rekey)));
-  queue->cwrite_off += sizeof(rekey);
-  /* Setup new cipher for successive messages */
-  gcry_cipher_close (queue->out_cipher);
-  setup_out_cipher (queue);
-}
-
-
-/**
- * We have been notified that our socket is ready to write.
- * Then reschedule this function to be called again once more is available.
- *
- * @param cls a `struct Queue`
- */
-static void
-queue_write (void *cls)
-{
-  struct Queue *queue = cls;
-  ssize_t sent;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "In queue write\n");
-  queue->write_task = NULL;
-  if (0 != queue->cwrite_off)
-  {
-    sent = GNUNET_NETWORK_socket_send (queue->sock,
-                                       queue->cwrite_buf,
-                                       queue->cwrite_off);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Sent %lu bytes to TCP queue\n", sent);
-    if ((-1 == sent) && (EAGAIN != errno) && (EINTR != errno))
-    {
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "send");
-      queue_destroy (queue);
-      return;
-    }
-    if (sent > 0)
-    {
-      size_t usent = (size_t) sent;
-      queue->cwrite_off -= usent;
-      memmove (queue->cwrite_buf,
-               &queue->cwrite_buf[usent],
-               queue->cwrite_off);
-      reschedule_queue_timeout (queue);
-    }
-  }
-  /* can we encrypt more? (always encrypt full messages, needed
-     such that #mq_cancel() can work!) */
-  if ((0 < queue->rekey_left_bytes) &&
-      (queue->pwrite_off > 0) &&
-      (queue->cwrite_off + queue->pwrite_off <= BUF_SIZE))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Encrypting %lu bytes\n", queue->pwrite_off);
-    GNUNET_assert (0 ==
-                   gcry_cipher_encrypt (queue->out_cipher,
-                                        &queue->cwrite_buf[queue->cwrite_off],
-                                        queue->pwrite_off,
-                                        queue->pwrite_buf,
-                                        queue->pwrite_off));
-    if (queue->rekey_left_bytes > queue->pwrite_off)
-      queue->rekey_left_bytes -= queue->pwrite_off;
-    else
-      queue->rekey_left_bytes = 0;
-    queue->cwrite_off += queue->pwrite_off;
-    queue->pwrite_off = 0;
-  }
-  // if ((-1 != unverified_size)&& ((0 == queue->pwrite_off) &&
-  if (((0 == queue->pwrite_off) &&
-       ((0 == queue->rekey_left_bytes) ||
-        (0 ==
-         GNUNET_TIME_absolute_get_remaining (
-           queue->rekey_time).rel_value_us))))
-  {
-    inject_rekey (queue);
-  }
-  if ((0 == queue->pwrite_off) && (! queue->finishing) &&
-      (GNUNET_YES == queue->mq_awaits_continue))
-  {
-    queue->mq_awaits_continue = GNUNET_NO;
-    GNUNET_MQ_impl_send_continue (queue->mq);
-  }
-  /* did we just finish writing 'finish'? */
-  if ((0 == queue->cwrite_off) && (GNUNET_YES == queue->finishing))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Finishing queue\n");
-    queue_destroy (queue);
-    return;
-  }
-  /* do we care to write more? */
-  if ((0 < queue->cwrite_off) || (0 < queue->pwrite_off))
-    queue->write_task =
-      GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_UNIT_FOREVER_REL,
-                                      queue->sock,
-                                      &queue_write,
-                                      queue);
-}
-
-
-/**
- * Test if we have received a full message in plaintext.
- * If so, handle it.
- *
- * @param queue queue to process inbound plaintext for
- * @return number of bytes of plaintext handled, 0 for none
- */
-static size_t
-try_handle_plaintext (struct Queue *queue)
-{
-  const struct GNUNET_MessageHeader *hdr =
-    (const struct GNUNET_MessageHeader *) queue->pread_buf;
-  const struct TCPConfirmationAck *tca = (const struct
-                                          TCPConfirmationAck *) queue->pread_buf;
-  const struct TCPBox *box = (const struct TCPBox *) queue->pread_buf;
-  const struct TCPRekey *rekey = (const struct TCPRekey *) queue->pread_buf;
-  const struct TCPFinish *fin = (const struct TCPFinish *) queue->pread_buf;
-  struct TCPRekey rekeyz;
-  struct TCPFinish finz;
-  struct GNUNET_ShortHashCode tmac;
-  uint16_t type;
-  size_t size = 0; /* make compiler happy */
-  struct TcpHandshakeAckSignature thas;
-  const struct GNUNET_CRYPTO_ChallengeNonceP challenge = queue->challenge;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "try handle plaintext!\n");
-
-  if ((sizeof(*hdr) > queue->pread_off))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Handling plaintext, not even a header!\n");
-    return 0; /* not even a header */
-  }
-
-  if ((-1 != unverified_size) && (unverified_size > INITIAL_CORE_KX_SIZE))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Already received data of size %lu bigger than KX size %lu!\n",
-                unverified_size,
-                INITIAL_CORE_KX_SIZE);
-    GNUNET_break_op (0);
-    queue_finish (queue);
-    return 0;
-  }
-
-  type = ntohs (hdr->type);
-  switch (type)
-  {
-  case GNUNET_MESSAGE_TYPE_COMMUNICATOR_TCP_CONFIRMATION_ACK:
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "start processing ack\n");
-    if (sizeof(*tca) > queue->pread_off)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Handling plaintext size of tca greater than pread offset.\n");
-      return 0;
-    }
-    if (ntohs (hdr->size) != sizeof(*tca))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Handling plaintext size does not match message type.\n");
-      GNUNET_break_op (0);
-      queue_finish (queue);
-      return 0;
-    }
-
-    thas.purpose.purpose = htonl (
-      GNUNET_SIGNATURE_PURPOSE_COMMUNICATOR_TCP_HANDSHAKE_ACK);
-    thas.purpose.size = htonl (sizeof(thas));
-    thas.sender = tca->sender;
-    thas.receiver = my_identity;
-    thas.monotonic_time = tca->monotonic_time;
-    thas.challenge = tca->challenge;
-
-    if (GNUNET_SYSERR == GNUNET_CRYPTO_eddsa_verify (
-          GNUNET_SIGNATURE_PURPOSE_COMMUNICATOR_TCP_HANDSHAKE_ACK,
-          &thas,
-          &tca->sender_sig,
-          &tca->sender.public_key))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Verification of signature failed!\n");
-      GNUNET_break (0);
-      queue_finish (queue);
-      return 0;
-    }
-    if (0 != GNUNET_memcmp (&tca->challenge, &challenge))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Challenge in TCPConfirmationAck not correct!\n");
-      GNUNET_break (0);
-      queue_finish (queue);
-      return 0;
-    }
-
-    queue->handshake_ack_monotime_get = GNUNET_PEERSTORE_iterate (peerstore,
-                                                                  "transport_tcp_communicator",
-                                                                  &queue->target,
-                                                                  GNUNET_PEERSTORE_TRANSPORT_TCP_COMMUNICATOR_HANDSHAKE_ACK,
-                                                                  &
-                                                                  handshake_ack_monotime_cb,
-                                                                  queue);
-
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Handling plaintext, ack processed!\n");
-
-    if (GNUNET_TRANSPORT_CS_INBOUND ==     queue->cs)
-    {
-      send_challenge (queue->challenge_received, queue);
-      queue->write_task =
-        GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_UNIT_FOREVER_REL,
-                                        queue->sock,
-                                        &queue_write,
-                                        queue);
-    }
-
-    unverified_size = -1;
-
-    char *foreign_addr;
-
-    switch (queue->address->sa_family)
-    {
-    case AF_INET:
-      GNUNET_asprintf (&foreign_addr,
-                       "%s-%s",
-                       COMMUNICATOR_ADDRESS_PREFIX,
-                       GNUNET_a2s (queue->address, queue->address_len));
-      break;
-
-    case AF_INET6:
-      GNUNET_asprintf (&foreign_addr,
-                       "%s-%s",
-                       COMMUNICATOR_ADDRESS_PREFIX,
-                       GNUNET_a2s (queue->address, queue->address_len));
-      break;
-
-    default:
-      GNUNET_assert (0);
-    }
-
-    queue->qh = GNUNET_TRANSPORT_communicator_mq_add (ch,
-                                                      &queue->target,
-                                                      foreign_addr,
-                                                      UINT16_MAX, /* no MTU */
-                                                      GNUNET_TRANSPORT_QUEUE_LENGTH_UNLIMITED,
-                                                      0, /* Priority */
-                                                      queue->nt,
-                                                      queue->cs,
-                                                      queue->mq);
-
-    GNUNET_free (foreign_addr);
-
-    size = ntohs (hdr->size);
-    break;
-  case GNUNET_MESSAGE_TYPE_COMMUNICATOR_TCP_BOX:
-    /* Special case: header size excludes box itself! */
-    if (ntohs (hdr->size) + sizeof(struct TCPBox) > queue->pread_off)
-      return 0;
-    calculate_hmac (&queue->in_hmac, &box[1], ntohs (hdr->size), &tmac);
-    if (0 != memcmp (&tmac, &box->hmac, sizeof(tmac)))
-    {
-      GNUNET_break_op (0);
-      queue_finish (queue);
-      return 0;
-    }
-    pass_plaintext_to_core (queue, (const void *) &box[1], ntohs (hdr->size));
-    size = ntohs (hdr->size) + sizeof(*box);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Handling plaintext, box processed!\n");
-    break;
-
-  case GNUNET_MESSAGE_TYPE_COMMUNICATOR_TCP_REKEY:
-    if (sizeof(*rekey) > queue->pread_off)
-      return 0;
-    if (ntohs (hdr->size) != sizeof(*rekey))
-    {
-      GNUNET_break_op (0);
-      queue_finish (queue);
-      return 0;
-    }
-    rekeyz = *rekey;
-    memset (&rekeyz.hmac, 0, sizeof(rekeyz.hmac));
-    calculate_hmac (&queue->in_hmac, &rekeyz, sizeof(rekeyz), &tmac);
-    if (0 != memcmp (&tmac, &rekey->hmac, sizeof(tmac)))
-    {
-      GNUNET_break_op (0);
-      queue_finish (queue);
-      return 0;
-    }
-    do_rekey (queue, rekey);
-    size = ntohs (hdr->size);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Handling plaintext, rekey processed!\n");
-    break;
-
-  case GNUNET_MESSAGE_TYPE_COMMUNICATOR_TCP_FINISH:
-    if (sizeof(*fin) > queue->pread_off)
-      return 0;
-    if (ntohs (hdr->size) != sizeof(*fin))
-    {
-      GNUNET_break_op (0);
-      queue_finish (queue);
-      return 0;
-    }
-    finz = *fin;
-    memset (&finz.hmac, 0, sizeof(finz.hmac));
-    calculate_hmac (&queue->in_hmac, &rekeyz, sizeof(rekeyz), &tmac);
-    if (0 != memcmp (&tmac, &fin->hmac, sizeof(tmac)))
-    {
-      GNUNET_break_op (0);
-      queue_finish (queue);
-      return 0;
-    }
-    /* handle FINISH by destroying queue */
-    queue_destroy (queue);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Handling plaintext, finish processed!\n");
-    break;
-
-  default:
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Handling plaintext, nothing processed!\n");
-    GNUNET_break_op (0);
-    queue_finish (queue);
-    return 0;
-  }
-  GNUNET_assert (0 != size);
-  if (-1 != unverified_size)
-    unverified_size += size;
-  return size;
-}
-
-
-/**
- * Queue read task. If we hit the timeout, disconnect it
- *
- * @param cls the `struct Queue *` to disconnect
- */
-static void
-queue_read (void *cls)
-{
-  struct Queue *queue = cls;
-  struct GNUNET_TIME_Relative left;
-  ssize_t rcvd;
-
-  queue->read_task = NULL;
-  rcvd = GNUNET_NETWORK_socket_recv (queue->sock,
-                                     &queue->cread_buf[queue->cread_off],
-                                     BUF_SIZE - queue->cread_off);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received %lu bytes from TCP queue\n", rcvd);
-  GNUNET_log_from_nocheck (GNUNET_ERROR_TYPE_DEBUG,
-                           "transport",
-                           "Received %lu bytes from TCP queue\n", rcvd);
-  if (-1 == rcvd)
-  {
-    if ((EAGAIN != errno) && (EINTR != errno))
-    {
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_DEBUG, "recv");
-      queue_finish (queue);
-      return;
-    }
-    /* try again */
-    left = GNUNET_TIME_absolute_get_remaining (queue->timeout);
-    queue->read_task =
-      GNUNET_SCHEDULER_add_read_net (left, queue->sock, &queue_read, queue);
-    return;
-  }
-  if (0 != rcvd)
-    reschedule_queue_timeout (queue);
-  queue->cread_off += rcvd;
-  while ((queue->pread_off < sizeof(queue->pread_buf)) &&
-         (queue->cread_off > 0))
-  {
-    size_t max = GNUNET_MIN (sizeof(queue->pread_buf) - queue->pread_off,
-                             queue->cread_off);
-    size_t done;
-    size_t total;
-    size_t old_pread_off = queue->pread_off;
-
-    GNUNET_assert (0 ==
-                   gcry_cipher_decrypt (queue->in_cipher,
-                                        &queue->pread_buf[queue->pread_off],
-                                        max,
-                                        queue->cread_buf,
-                                        max));
-    queue->pread_off += max;
-    total = 0;
-    while (0 != (done = try_handle_plaintext (queue)))
-    {
-      /* 'done' bytes of plaintext were used, shift buffer */
-      GNUNET_assert (done <= queue->pread_off);
-      /* NOTE: this memmove() could possibly sometimes be
-         avoided if we pass 'total' into try_handle_plaintext()
-         and use it at an offset into the buffer there! */
-      memmove (queue->pread_buf,
-               &queue->pread_buf[done],
-               queue->pread_off - done);
-      queue->pread_off -= done;
-      total += done;
-      /* The last plaintext was a rekey, abort for now */
-      if (GNUNET_YES == queue->rekeyed)
-        break;
-    }
-    /* when we encounter a rekey message, the decryption above uses the
-       wrong key for everything after the rekey; in that case, we have
-       to re-do the decryption at 'total' instead of at 'max'.
-       However, we have to take into account that the plaintext buffer may have
-       already contained data and not jumped too far ahead in the ciphertext.
-       If there is no rekey and the last message is incomplete (max > total),
-       it is safe to keep the decryption so we shift by 'max' */
-    if (GNUNET_YES == queue->rekeyed)
-    {
-      max = total - old_pread_off;
-      queue->rekeyed = GNUNET_NO;
-      queue->pread_off = 0;
-    }
-    memmove (queue->cread_buf, &queue->cread_buf[max], queue->cread_off - max);
-    queue->cread_off -= max;
-  }
-  if (BUF_SIZE == queue->cread_off)
-    return; /* buffer full, suspend reading */
-  left = GNUNET_TIME_absolute_get_remaining (queue->timeout);
-  if (0 != left.rel_value_us)
-  {
-    if (max_queue_length > queue->backpressure)
-    {
-      /* continue reading */
-      left = GNUNET_TIME_absolute_get_remaining (queue->timeout);
-      queue->read_task =
-        GNUNET_SCHEDULER_add_read_net (left, queue->sock, &queue_read, queue);
-    }
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Queue %p was idle for %s, disconnecting\n",
-              queue,
-              GNUNET_STRINGS_relative_time_to_string (
-                GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
-                GNUNET_YES));
-  queue_finish (queue);
-}
-
-
-/**
- * Convert a `struct sockaddr_in6 to a `struct sockaddr *`
- *
- * @param[out] sock_len set to the length of the address.
- * @param v6 The sockaddr_in6 to be converted.
- * @return The struct sockaddr *.
- */
-static struct sockaddr *
-tcp_address_to_sockaddr_numeric_v6 (socklen_t *sock_len,
-                                    struct sockaddr_in6 v6,
-                                    unsigned int port)
-{
-  struct sockaddr *in;
-
-  v6.sin6_family = AF_INET6;
-  v6.sin6_port = htons ((uint16_t) port);
-#if HAVE_SOCKADDR_IN_SIN_LEN
-  v6.sin6_len = sizeof(sizeof(struct sockaddr_in6));
-#endif
-  v6.sin6_flowinfo = 0;
-  v6.sin6_scope_id = 0;
-  in = GNUNET_memdup (&v6, sizeof(v6));
-  *sock_len = sizeof(struct sockaddr_in6);
-
-  return in;
-}
-
-
-/**
- * Convert a `struct sockaddr_in4 to a `struct sockaddr *`
- *
- * @param[out] sock_len set to the length of the address.
- * @param v4 The sockaddr_in4 to be converted.
- * @return The struct sockaddr *.
- */
-static struct sockaddr *
-tcp_address_to_sockaddr_numeric_v4 (socklen_t *sock_len,
-                                    struct sockaddr_in v4,
-                                    unsigned int port)
-{
-  struct sockaddr *in;
-
-  v4.sin_family = AF_INET;
-  v4.sin_port = htons ((uint16_t) port);
-#if HAVE_SOCKADDR_IN_SIN_LEN
-  v4.sin_len = sizeof(struct sockaddr_in);
-#endif
-  in = GNUNET_memdup (&v4, sizeof(v4));
-  *sock_len = sizeof(struct sockaddr_in);
-  return in;
-}
-
-
-/**
- * Convert TCP bind specification to a `struct PortOnlyIpv4Ipv6  *`
- *
- * @param bindto bind specification to convert.
- * @return The converted bindto specification.
- */
-static struct PortOnlyIpv4Ipv6 *
-tcp_address_to_sockaddr_port_only (const char *bindto, unsigned int *port)
-{
-  struct PortOnlyIpv4Ipv6 *po;
-  struct sockaddr_in *i4;
-  struct sockaddr_in6 *i6;
-  socklen_t sock_len_ipv4;
-  socklen_t sock_len_ipv6;
-
-  /* interpreting value as just a PORT number */
-  if (*port > UINT16_MAX)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "BINDTO specification `%s' invalid: value too large for port\n",
-                bindto);
-    return NULL;
-  }
-
-  po = GNUNET_new (struct PortOnlyIpv4Ipv6);
-
-  if ((GNUNET_NO == GNUNET_NETWORK_test_pf (PF_INET6)) ||
-      (GNUNET_YES ==
-       GNUNET_CONFIGURATION_get_value_yesno (cfg,
-                                             COMMUNICATOR_CONFIG_SECTION,
-                                             "DISABLE_V6")))
-  {
-    i4 = GNUNET_malloc (sizeof(struct sockaddr_in));
-    po->addr_ipv4 = tcp_address_to_sockaddr_numeric_v4 (&sock_len_ipv4, *i4,
-                                                        *port);
-    po->addr_len_ipv4 = sock_len_ipv4;
-  }
-  else
-  {
-
-    i4 = GNUNET_malloc (sizeof(struct sockaddr_in));
-    po->addr_ipv4 = tcp_address_to_sockaddr_numeric_v4 (&sock_len_ipv4, *i4,
-                                                        *port);
-    po->addr_len_ipv4 = sock_len_ipv4;
-
-    i6 = GNUNET_malloc (sizeof(struct sockaddr_in6));
-    po->addr_ipv6 = tcp_address_to_sockaddr_numeric_v6 (&sock_len_ipv6, *i6,
-                                                        *port);
-
-    po->addr_len_ipv6 = sock_len_ipv6;
-
-    GNUNET_free (i6);
-  }
-
-  GNUNET_free (i4);
-
-  return po;
-}
-
-
-/**
- * This Method extracts the address part of the BINDTO string.
- *
- * @param bindto String we extract the address part from.
- * @return The extracted address string.
- */
-static char *
-extract_address (const char *bindto)
-{
-  char *addr;
-  char *start;
-  char *token;
-  char *cp;
-  char *rest = NULL;
-  char *res;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "extract address with bindto %s\n",
-              bindto);
-
-  if (NULL == bindto)
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "bindto is NULL\n");
-
-  cp = GNUNET_strdup (bindto);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "extract address 2\n");
-
-  start = cp;
-  if (('[' == *cp) && (']' == cp[strlen (cp) - 1]))
-  {
-    start++;   /* skip over '['*/
-    cp[strlen (cp) - 1] = '\0';  /* eat ']'*/
-    addr = GNUNET_strdup (start);
-  }
-  else
-  {
-    token = strtok_r (cp, "]", &rest);
-    if (strlen (bindto) == strlen (token))
-    {
-      token = strtok_r (cp, ":", &rest);
-      addr = GNUNET_strdup (token);
-    }
-    else
-    {
-      token++;
-      res = GNUNET_strdup (token);
-      addr = GNUNET_strdup (res);
-    }
-  }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "tcp address: %s\n",
-              addr);
-  GNUNET_free (cp);
-  return addr;
-}
-
-
-/**
- * This Method extracts the port part of the BINDTO string.
- *
- * @param addr_and_port String we extract the port from.
- * @return The extracted port as unsigned int.
- */
-static unsigned int
-extract_port (const char *addr_and_port)
-{
-  unsigned int port;
-  char dummy[2];
-  char *token;
-  char *addr;
-  char *colon;
-  char *cp;
-  char *rest = NULL;
-
-  if (NULL != addr_and_port)
-  {
-    cp = GNUNET_strdup (addr_and_port);
-    token = strtok_r (cp, "]", &rest);
-    if (strlen (addr_and_port) == strlen (token))
-    {
-      colon = strrchr (cp, ':');
-      if (NULL == colon)
-      {
-        GNUNET_free (cp);
-        return 0;
-      }
-      addr = colon;
-      addr++;
-    }
-    else
-    {
-      token = strtok_r (NULL, "]", &rest);
-      if (NULL == token)
-      {
-        GNUNET_free (cp);
-        return 0;
-      }
-      else
-      {
-        addr = token;
-        addr++;
-      }
-    }
-
-
-    if (1 == sscanf (addr, "%u%1s", &port, dummy))
-    {
-      /* interpreting value as just a PORT number */
-      if (port > UINT16_MAX)
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    "Port `%u' invalid: value too large for port\n",
-                    port);
-        GNUNET_free (cp);
-        return 0;
-      }
-    }
-    else
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "BINDTO specification invalid: last ':' not followed by number\n");
-      GNUNET_free (cp);
-      return 0;
-    }
-    GNUNET_free (cp);
-  }
-  else
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "return 0\n");
-    /* interpret missing port as 0, aka pick any free one */
-    port = 0;
-  }
-
-  return port;
-}
-
-
-/**
- * Convert TCP bind specification to a `struct sockaddr *`
- *
- * @param bindto bind specification to convert
- * @param[out] sock_len set to the length of the address
- * @return converted bindto specification
- */
-static struct sockaddr *
-tcp_address_to_sockaddr (const char *bindto, socklen_t *sock_len)
-{
-  struct sockaddr *in;
-  unsigned int port;
-  struct sockaddr_in v4;
-  struct sockaddr_in6 v6;
-  char *start;
-
-  start = extract_address (bindto);
-  // FIXME: check NULL == start
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "start %s\n",
-              start);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "!bindto %s\n",
-              bindto);
-
-
-  if (1 == inet_pton (AF_INET, start, &v4.sin_addr))
-  {
-    // colon = strrchr (cp, ':');
-    port = extract_port (bindto);
-
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "port %u\n",
-                port);
-
-    in = tcp_address_to_sockaddr_numeric_v4 (sock_len, v4, port);
-  }
-  else if (1 == inet_pton (AF_INET6, start, &v6.sin6_addr))
-  {
-    // colon = strrchr (cp, ':');
-    port = extract_port (bindto);
-    in = tcp_address_to_sockaddr_numeric_v6 (sock_len, v6, port);
-  }
-  else
-  {
-    GNUNET_assert (0);
-  }
-
-  GNUNET_free (start);
-  return in;
-}
-
-
-/**
- * Signature of functions implementing the sending functionality of a
- * message queue.
- *
- * @param mq the message queue
- * @param msg the message to send
- * @param impl_state our `struct Queue`
- */
-static void
-mq_send (struct GNUNET_MQ_Handle *mq,
-         const struct GNUNET_MessageHeader *msg,
-         void *impl_state)
-{
-  struct Queue *queue = impl_state;
-  uint16_t msize = ntohs (msg->size);
-  struct TCPBox box;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "In MQ send. Queue finishing: %s; write task running: %s\n",
-              (GNUNET_YES == queue->finishing) ? "yes" : "no",
-              (NULL == queue->write_task) ? "yes" : "no");
-  GNUNET_assert (mq == queue->mq);
-  queue->mq_awaits_continue = GNUNET_YES;
-  if (GNUNET_YES == queue->finishing)
-    return; /* this queue is dying, drop msg */
-  GNUNET_assert (0 == queue->pwrite_off);
-  box.header.type = htons (GNUNET_MESSAGE_TYPE_COMMUNICATOR_TCP_BOX);
-  box.header.size = htons (msize);
-  calculate_hmac (&queue->out_hmac, msg, msize, &box.hmac);
-  memcpy (&queue->pwrite_buf[queue->pwrite_off], &box, sizeof(box));
-  queue->pwrite_off += sizeof(box);
-  memcpy (&queue->pwrite_buf[queue->pwrite_off], msg, msize);
-  queue->pwrite_off += msize;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "%lu bytes of plaintext to send\n", queue->pwrite_off);
-  GNUNET_assert (NULL != queue->sock);
-  if (NULL == queue->write_task)
-    queue->write_task =
-      GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_UNIT_FOREVER_REL,
-                                      queue->sock,
-                                      &queue_write,
-                                      queue);
-}
-
-
-/**
- * Signature of functions implementing the destruction of a message
- * queue.  Implementations must not free @a mq, but should take care
- * of @a impl_state.
- *
- * @param mq the message queue to destroy
- * @param impl_state our `struct Queue`
- */
-static void
-mq_destroy (struct GNUNET_MQ_Handle *mq, void *impl_state)
-{
-  struct Queue *queue = impl_state;
-
-  if (mq == queue->mq)
-  {
-    queue->mq = NULL;
-    queue_finish (queue);
-  }
-}
-
-
-/**
- * Implementation function that cancels the currently sent message.
- *
- * @param mq message queue
- * @param impl_state our `struct Queue`
- */
-static void
-mq_cancel (struct GNUNET_MQ_Handle *mq, void *impl_state)
-{
-  struct Queue *queue = impl_state;
-
-  GNUNET_assert (0 != queue->pwrite_off);
-  queue->pwrite_off = 0;
-}
-
-
-/**
- * Generic error handler, called with the appropriate
- * error code and the same closure specified at the creation of
- * the message queue.
- * Not every message queue implementation supports an error handler.
- *
- * @param cls our `struct Queue`
- * @param error error code
- */
-static void
-mq_error (void *cls, enum GNUNET_MQ_Error error)
-{
-  struct Queue *queue = cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              "MQ error in queue to %s: %d\n",
-              GNUNET_i2s (&queue->target),
-              (int) error);
-  queue_finish (queue);
-}
-
-
-/**
- * Add the given @a queue to our internal data structure.  Setup the
- * MQ processing and inform transport that the queue is ready.  Must
- * be called after the KX for outgoing messages has been bootstrapped.
- *
- * @param queue queue to boot
- */
-static void
-boot_queue (struct Queue *queue)
-{
-  queue->nt =
-    GNUNET_NT_scanner_get_type (is, queue->address, queue->address_len);
-  (void) GNUNET_CONTAINER_multipeermap_put (
-    queue_map,
-    &queue->target,
-    queue,
-    GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-  GNUNET_STATISTICS_set (stats,
-                         "# queues active",
-                         GNUNET_CONTAINER_multipeermap_size (queue_map),
-                         GNUNET_NO);
-  queue->timeout =
-    GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
-  queue->mq = GNUNET_MQ_queue_for_callbacks (&mq_send,
-                                             &mq_destroy,
-                                             &mq_cancel,
-                                             queue,
-                                             NULL,
-                                             &mq_error,
-                                             queue);
-}
-
-
-/**
- * Generate and transmit our ephemeral key and the signature for
- * the initial KX with the other peer.  Must be called first, before
- * any other bytes are ever written to the output buffer.  Note that
- * our cipher must already be initialized when calling thi function.
- * Helper function for #start_initial_kx_out().
- *
- * @param queue queue to do KX for
- * @param epub our public key for the KX
- */
-static void
-transmit_kx (struct Queue *queue,
-             const struct GNUNET_CRYPTO_EcdhePublicKey *epub)
-{
-  struct TcpHandshakeSignature ths;
-  struct TCPConfirmation tc;
-
-  memcpy (queue->cwrite_buf, epub, sizeof(*epub));
-  queue->cwrite_off = sizeof(*epub);
-  /* compute 'tc' and append in encrypted format to cwrite_buf */
-  tc.sender = my_identity;
-  tc.monotonic_time =
-    GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get_monotonic (cfg));
-  GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_NONCE,
-                              &tc.challenge,
-                              sizeof(tc.challenge));
-  ths.purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_COMMUNICATOR_TCP_HANDSHAKE);
-  ths.purpose.size = htonl (sizeof(ths));
-  ths.sender = my_identity;
-  ths.receiver = queue->target;
-  ths.ephemeral = *epub;
-  ths.monotonic_time = tc.monotonic_time;
-  ths.challenge = tc.challenge;
-  GNUNET_CRYPTO_eddsa_sign (my_private_key,
-                            &ths,
-                            &tc.sender_sig);
-  GNUNET_assert (0 ==
-                 gcry_cipher_encrypt (queue->out_cipher,
-                                      &queue->cwrite_buf[queue->cwrite_off],
-                                      sizeof(tc),
-                                      &tc,
-                                      sizeof(tc)));
-  queue->challenge = tc.challenge;
-  queue->cwrite_off += sizeof(tc);
-
-  GNUNET_log_from_nocheck (GNUNET_ERROR_TYPE_DEBUG,
-                           "transport",
-                           "handshake written\n");
-}
-
-
-/**
- * Initialize our key material for outgoing transmissions and
- * inform the other peer about it. Must be called first before
- * any data is sent.
- *
- * @param queue the queue to setup
- */
-static void
-start_initial_kx_out (struct Queue *queue)
-{
-  struct GNUNET_CRYPTO_EcdhePublicKey epub;
-
-  GNUNET_CRYPTO_ecdhe_key_create (&queue->ephemeral);
-  GNUNET_CRYPTO_ecdhe_key_get_public (&queue->ephemeral, &epub);
-  setup_out_cipher (queue);
-  transmit_kx (queue, &epub);
-}
-
-
-/**
- * Callback called when peerstore store operation for handshake monotime is finished.
- * @param cls Queue context the store operation was executed.
- * @param success Store operation was successful (GNUNET_OK) or not.
- */
-static void
-handshake_monotime_store_cb (void *cls, int success)
-{
-  struct Queue *queue = cls;
-  if (GNUNET_OK != success)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to store handshake monotonic time in PEERSTORE!\n");
-  }
-  queue->handshake_monotime_sc = NULL;
-}
-
-
-/**
- * Callback called by peerstore when records for GNUNET_PEERSTORE_TRANSPORT_TCP_COMMUNICATOR_HANDSHAKE
- * where found.
- * @param cls Queue context the store operation was executed.
- * @param record The record found or NULL if there is no record left.
- * @param emsg Message from peerstore.
- */
-static void
-handshake_monotime_cb (void *cls,
-                       const struct GNUNET_PEERSTORE_Record *record,
-                       const char *emsg)
-{
-  struct Queue *queue = cls;
-  struct GNUNET_TIME_AbsoluteNBO *mtbe;
-  struct GNUNET_TIME_Absolute mt;
-  const struct GNUNET_PeerIdentity *pid;
-  struct GNUNET_TIME_AbsoluteNBO *handshake_monotonic_time;
-
-  (void) emsg;
-
-  handshake_monotonic_time = &queue->handshake_monotonic_time;
-  pid = &queue->target;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "tcp handshake with us %s\n",
-              GNUNET_i2s (&my_identity));
-  if (NULL == record)
-  {
-    queue->handshake_monotime_get = NULL;
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "tcp handshake from peer %s\n",
-              GNUNET_i2s (pid));
-  if (sizeof(*mtbe) != record->value_size)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  mtbe = record->value;
-  mt = GNUNET_TIME_absolute_ntoh (*mtbe);
-  if (mt.abs_value_us > GNUNET_TIME_absolute_ntoh (
-        queue->handshake_monotonic_time).abs_value_us)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Queue from %s dropped, handshake monotime in the past\n",
-                GNUNET_i2s (&queue->target));
-    GNUNET_break (0);
-    queue_finish (queue);
-    return;
-  }
-  queue->handshake_monotime_sc = GNUNET_PEERSTORE_store (peerstore,
-                                                         "transport_tcp_communicator",
-                                                         pid,
-                                                         GNUNET_PEERSTORE_TRANSPORT_TCP_COMMUNICATOR_HANDSHAKE,
-                                                         handshake_monotonic_time,
-                                                         sizeof(*
-                                                                handshake_monotonic_time),
-                                                         GNUNET_TIME_UNIT_FOREVER_ABS,
-                                                         GNUNET_PEERSTORE_STOREOPTION_REPLACE,
-                                                         &
-                                                         handshake_monotime_store_cb,
-                                                         queue);
-}
-
-
-/**
- * We have received the first bytes from the other side on a @a queue.
- * Decrypt the @a tc contained in @a ibuf and check the signature.
- * Note that #setup_in_cipher() must have already been called.
- *
- * @param queue queue to decrypt initial bytes from other peer for
- * @param tc[out] where to store the result
- * @param ibuf incoming data, of size
- *        `INITIAL_KX_SIZE`
- * @return #GNUNET_OK if the signature was OK, #GNUNET_SYSERR if not
- */
-static int
-decrypt_and_check_tc (struct Queue *queue,
-                      struct TCPConfirmation *tc,
-                      char *ibuf)
-{
-  struct TcpHandshakeSignature ths;
-  enum GNUNET_GenericReturnValue ret;
-
-  GNUNET_assert (
-    0 ==
-    gcry_cipher_decrypt (queue->in_cipher,
-                         tc,
-                         sizeof(*tc),
-                         &ibuf[sizeof(struct GNUNET_CRYPTO_EcdhePublicKey)],
-                         sizeof(*tc)));
-  ths.purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_COMMUNICATOR_TCP_HANDSHAKE);
-  ths.purpose.size = htonl (sizeof(ths));
-  ths.sender = tc->sender;
-  ths.receiver = my_identity;
-  memcpy (&ths.ephemeral, ibuf, sizeof(struct GNUNET_CRYPTO_EcdhePublicKey));
-  ths.monotonic_time = tc->monotonic_time;
-  ths.challenge = tc->challenge;
-  ret = GNUNET_CRYPTO_eddsa_verify (
-    GNUNET_SIGNATURE_PURPOSE_COMMUNICATOR_TCP_HANDSHAKE,
-    &ths,
-    &tc->sender_sig,
-    &tc->sender.public_key);
-  if (GNUNET_YES == ret)
-    queue->handshake_monotime_get =
-      GNUNET_PEERSTORE_iterate (peerstore,
-                                "transport_tcp_communicator",
-                                &queue->target,
-                                GNUNET_PEERSTORE_TRANSPORT_TCP_COMMUNICATOR_HANDSHAKE,
-                                &handshake_monotime_cb,
-                                queue);
-  return ret;
-}
-
-
-/**
- * Closes socket and frees memory associated with @a pq.
- *
- * @param pq proto queue to free
- */
-static void
-free_proto_queue (struct ProtoQueue *pq)
-{
-  if (NULL != pq->listen_sock)
-  {
-    GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (pq->listen_sock));
-    pq->listen_sock = NULL;
-  }
-  GNUNET_NETWORK_socket_close (pq->sock);
-  GNUNET_free (pq->address);
-  GNUNET_CONTAINER_DLL_remove (proto_head, proto_tail, pq);
-  GNUNET_free (pq);
-}
-
-
-/**
- * Read from the socket of the proto queue until we have enough data
- * to upgrade to full queue.
- *
- * @param cls a `struct ProtoQueue`
- */
-static void
-proto_read_kx (void *cls)
-{
-  struct ProtoQueue *pq = cls;
-  ssize_t rcvd;
-  struct GNUNET_TIME_Relative left;
-  struct Queue *queue;
-  struct TCPConfirmation tc;
-
-  pq->read_task = NULL;
-  left = GNUNET_TIME_absolute_get_remaining (pq->timeout);
-  if (0 == left.rel_value_us)
-  {
-    free_proto_queue (pq);
-    return;
-  }
-  rcvd = GNUNET_NETWORK_socket_recv (pq->sock,
-                                     &pq->ibuf[pq->ibuf_off],
-                                     sizeof(pq->ibuf) - pq->ibuf_off);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received %lu bytes for KX\n", rcvd);
-  GNUNET_log_from_nocheck (GNUNET_ERROR_TYPE_DEBUG,
-                           "transport",
-                           "Received %lu bytes for KX\n", rcvd);
-  if (-1 == rcvd)
-  {
-    if ((EAGAIN != errno) && (EINTR != errno))
-    {
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_DEBUG, "recv");
-      free_proto_queue (pq);
-      return;
-    }
-    /* try again */
-    pq->read_task =
-      GNUNET_SCHEDULER_add_read_net (left, pq->sock, &proto_read_kx, pq);
-    return;
-  }
-  pq->ibuf_off += rcvd;
-  if (pq->ibuf_off > sizeof(pq->ibuf))
-  {
-    /* read more */
-    pq->read_task =
-      GNUNET_SCHEDULER_add_read_net (left, pq->sock, &proto_read_kx, pq);
-    return;
-  }
-  /* we got all the data, let's find out who we are talking to! */
-  queue = GNUNET_new (struct Queue);
-  setup_in_cipher ((const struct GNUNET_CRYPTO_EcdhePublicKey *) pq->ibuf,
-                   queue);
-  if (GNUNET_OK != decrypt_and_check_tc (queue, &tc, pq->ibuf))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Invalid TCP KX received from %s\n",
-                GNUNET_a2s (pq->address, pq->address_len));
-    gcry_cipher_close (queue->in_cipher);
-    GNUNET_free (queue);
-    free_proto_queue (pq);
-    return;
-  }
-  queue->address = pq->address; /* steals reference */
-  queue->address_len = pq->address_len;
-  queue->target = tc.sender;
-  queue->listen_sock = pq->listen_sock;
-  queue->sock = pq->sock;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "created queue with target %s\n",
-              GNUNET_i2s (&queue->target));
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "start kx proto\n");
-
-  start_initial_kx_out (queue);
-  queue->cs = GNUNET_TRANSPORT_CS_INBOUND;
-  boot_queue (queue);
-  queue->read_task =
-    GNUNET_SCHEDULER_add_read_net (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
-                                   queue->sock,
-                                   &queue_read,
-                                   queue);
-  queue->write_task =
-    GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_UNIT_FOREVER_REL,
-                                    queue->sock,
-                                    &queue_write,
-                                    queue);
-  // TODO To early! Move it somewhere else.
-  // send_challenge (tc.challenge, queue);
-  queue->challenge_received = tc.challenge;
-
-  GNUNET_CONTAINER_DLL_remove (proto_head, proto_tail, pq);
-  GNUNET_free (pq);
-}
-
-
-/**
- * We have been notified that our listen socket has something to
- * read. Do the read and reschedule this function to be called again
- * once more is available.
- *
- * @param cls ListenTask with listening socket and task
- */
-static void
-listen_cb (void *cls)
-{
-  struct sockaddr_storage in;
-  socklen_t addrlen;
-  struct GNUNET_NETWORK_Handle *sock;
-  struct ProtoQueue *pq;
-  struct ListenTask *lt;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "listen_cb\n");
-
-  lt = cls;
-
-  lt->listen_task = NULL;
-  GNUNET_assert (NULL != lt->listen_sock);
-  addrlen = sizeof(in);
-  memset (&in, 0, sizeof(in));
-  sock = GNUNET_NETWORK_socket_accept (lt->listen_sock,
-                                       (struct sockaddr*) &in,
-                                       &addrlen);
-  if ((NULL == sock) && ((EMFILE == errno) || (ENFILE == errno)))
-    return; /* system limit reached, wait until connection goes down */
-  lt->listen_task = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
-                                                   lt->listen_sock,
-                                                   &listen_cb,
-                                                   lt);
-  if ((NULL == sock) && ((EAGAIN == errno) || (ENOBUFS == errno)))
-    return;
-  if (NULL == sock)
-  {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "accept");
-    return;
-  }
-  pq = GNUNET_new (struct ProtoQueue);
-  pq->address_len = addrlen;
-  pq->address = GNUNET_memdup (&in, addrlen);
-  pq->timeout = GNUNET_TIME_relative_to_absolute (PROTO_QUEUE_TIMEOUT);
-  pq->sock = sock;
-  pq->read_task = GNUNET_SCHEDULER_add_read_net (PROTO_QUEUE_TIMEOUT,
-                                                 pq->sock,
-                                                 &proto_read_kx,
-                                                 pq);
-  GNUNET_CONTAINER_DLL_insert (proto_head, proto_tail, pq);
-}
-
-
-/**
- * Read from the socket of the queue until we have enough data
- * to initialize the decryption logic and can switch to regular
- * reading.
- *
- * @param cls a `struct Queue`
- */
-static void
-queue_read_kx (void *cls)
-{
-  struct Queue *queue = cls;
-  ssize_t rcvd;
-  struct GNUNET_TIME_Relative left;
-  struct TCPConfirmation tc;
-
-  queue->read_task = NULL;
-  left = GNUNET_TIME_absolute_get_remaining (queue->timeout);
-  if (0 == left.rel_value_us)
-  {
-    queue_destroy (queue);
-    return;
-  }
-  rcvd = GNUNET_NETWORK_socket_recv (queue->sock,
-                                     &queue->cread_buf[queue->cread_off],
-                                     BUF_SIZE - queue->cread_off);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received %lu bytes for KX\n",
-              rcvd);
-  GNUNET_log_from_nocheck (GNUNET_ERROR_TYPE_DEBUG,
-                           "transport",
-                           "Received %lu bytes for KX\n",
-                           rcvd);
-  if (-1 == rcvd)
-  {
-    if ((EAGAIN != errno) && (EINTR != errno))
-    {
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_DEBUG, "recv");
-      queue_destroy (queue);
-      return;
-    }
-    queue->read_task =
-      GNUNET_SCHEDULER_add_read_net (left, queue->sock, &queue_read_kx, queue);
-    return;
-  }
-  queue->cread_off += rcvd;
-  if (queue->cread_off < INITIAL_KX_SIZE)
-  {
-    /* read more */
-    queue->read_task =
-      GNUNET_SCHEDULER_add_read_net (left, queue->sock, &queue_read_kx, queue);
-    return;
-  }
-  /* we got all the data, let's find out who we are talking to! */
-  setup_in_cipher ((const struct GNUNET_CRYPTO_EcdhePublicKey *)
-                   queue->cread_buf,
-                   queue);
-  if (GNUNET_OK != decrypt_and_check_tc (queue, &tc, queue->cread_buf))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Invalid TCP KX received from %s\n",
-                GNUNET_a2s (queue->address, queue->address_len));
-    queue_destroy (queue);
-    return;
-  }
-  if (0 !=
-      memcmp (&tc.sender, &queue->target, sizeof(struct GNUNET_PeerIdentity)))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Invalid sender in TCP KX received from %s\n",
-                GNUNET_a2s (queue->address, queue->address_len));
-    queue_destroy (queue);
-    return;
-  }
-  send_challenge (tc.challenge, queue);
-  queue->write_task =
-    GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_UNIT_FOREVER_REL,
-                                    queue->sock,
-                                    &queue_write,
-                                    queue);
-
-  /* update queue timeout */
-  reschedule_queue_timeout (queue);
-  /* prepare to continue with regular read task immediately */
-  memmove (queue->cread_buf,
-           &queue->cread_buf[INITIAL_KX_SIZE],
-           queue->cread_off - (INITIAL_KX_SIZE));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "cread_off is %lu bytes before adjusting\n",
-              queue->cread_off);
-  queue->cread_off -= INITIAL_KX_SIZE;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "cread_off set to %lu bytes\n",
-              queue->cread_off);
-  queue->read_task = GNUNET_SCHEDULER_add_now (&queue_read, queue);
-}
-
-
-/**
- * Function called by the transport service to initialize a
- * message queue given address information about another peer.
- * If and when the communication channel is established, the
- * communicator must call #GNUNET_TRANSPORT_communicator_mq_add()
- * to notify the service that the channel is now up.  It is
- * the responsibility of the communicator to manage sane
- * retries and timeouts for any @a peer/@a address combination
- * provided by the transport service.  Timeouts and retries
- * do not need to be signalled to the transport service.
- *
- * @param cls closure
- * @param peer identity of the other peer
- * @param address where to send the message, human-readable
- *        communicator-specific format, 0-terminated, UTF-8
- * @return #GNUNET_OK on success, #GNUNET_SYSERR if the provided address is
- * invalid
- */
-static int
-mq_init (void *cls, const struct GNUNET_PeerIdentity *peer, const char *address)
-{
-  struct Queue *queue;
-  const char *path;
-  struct sockaddr *in;
-  socklen_t in_len = 0;
-  struct GNUNET_NETWORK_Handle *sock;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Connecting to %s\n", address);
-  GNUNET_log_from_nocheck (GNUNET_ERROR_TYPE_DEBUG,
-                           "transport",
-                           "Connecting to %s\n", address);
-  if (0 != strncmp (address,
-                    COMMUNICATOR_ADDRESS_PREFIX "-",
-                    strlen (COMMUNICATOR_ADDRESS_PREFIX "-")))
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  path = &address[strlen (COMMUNICATOR_ADDRESS_PREFIX "-")];
-  in = tcp_address_to_sockaddr (path, &in_len);
-
-  if (NULL == in)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to setup TCP socket address\n");
-    return GNUNET_SYSERR;
-  }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "in %s\n",
-              GNUNET_a2s (in, in_len));
-
-  sock = GNUNET_NETWORK_socket_create (in->sa_family, SOCK_STREAM, IPPROTO_TCP);
-  if (NULL == sock)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "socket(%d) failed: %s",
-                in->sa_family,
-                strerror (errno));
-    GNUNET_free (in);
-    return GNUNET_SYSERR;
-  }
-  if ((GNUNET_OK != GNUNET_NETWORK_socket_connect (sock, in, in_len)) &&
-      (errno != EINPROGRESS))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "connect to `%s' failed: %s",
-                address,
-                strerror (errno));
-    GNUNET_NETWORK_socket_close (sock);
-    GNUNET_free (in);
-    return GNUNET_SYSERR;
-  }
-
-  queue = GNUNET_new (struct Queue);
-  queue->target = *peer;
-  queue->address = in;
-  queue->address_len = in_len;
-  queue->sock = sock;
-  queue->cs = GNUNET_TRANSPORT_CS_OUTBOUND;
-  boot_queue (queue);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "booted queue with target %s\n",
-              GNUNET_i2s (&queue->target));
-  // queue->mq_awaits_continue = GNUNET_YES;
-  queue->read_task =
-    GNUNET_SCHEDULER_add_read_net (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
-                                   queue->sock,
-                                   &queue_read_kx,
-                                   queue);
-
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "start kx mq_init\n");
-
-  start_initial_kx_out (queue);
-  queue->write_task =
-    GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_UNIT_FOREVER_REL,
-                                    queue->sock,
-                                    &queue_write,
-                                    queue);
-  return GNUNET_OK;
-}
-
-
-/**
- * Iterator over all ListenTasks to clean up.
- *
- * @param cls NULL
- * @param key unused
- * @param value the ListenTask to cancel.
- * @return #GNUNET_OK to continue to iterate
- */
-static int
-get_lt_delete_it (void *cls,
-                  const struct GNUNET_HashCode *key,
-                  void *value)
-{
-  struct ListenTask *lt = value;
-
-  (void) cls;
-  (void) key;
-  if (NULL != lt->listen_task)
-  {
-    GNUNET_SCHEDULER_cancel (lt->listen_task);
-    lt->listen_task = NULL;
-  }
-  if (NULL != lt->listen_sock)
-  {
-    GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (lt->listen_sock));
-    lt->listen_sock = NULL;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Iterator over all message queues to clean up.
- *
- * @param cls NULL
- * @param target unused
- * @param value the queue to destroy
- * @return #GNUNET_OK to continue to iterate
- */
-static int
-get_queue_delete_it (void *cls,
-                     const struct GNUNET_PeerIdentity *target,
-                     void *value)
-{
-  struct Queue *queue = value;
-
-  (void) cls;
-  (void) target;
-  queue_destroy (queue);
-  return GNUNET_OK;
-}
-
-
-/**
- * Shutdown the UNIX communicator.
- *
- * @param cls NULL (always)
- */
-static void
-do_shutdown (void *cls)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Shutdown %s!\n",
-              shutdown_running ? "running" : "not running");
-
-  if (GNUNET_YES == shutdown_running)
-    return;
-  else
-    shutdown_running = GNUNET_YES;
-
-  while (NULL != proto_head)
-    free_proto_queue (proto_head);
-  if (NULL != nat)
-  {
-    GNUNET_NAT_unregister (nat);
-    nat = NULL;
-  }
-  GNUNET_CONTAINER_multihashmap_iterate (lt_map, &get_lt_delete_it, NULL);
-  GNUNET_CONTAINER_multipeermap_iterate (queue_map, &get_queue_delete_it, NULL);
-  GNUNET_CONTAINER_multipeermap_destroy (queue_map);
-  if (NULL != ch)
-  {
-    GNUNET_TRANSPORT_communicator_address_remove_all (ch);
-    GNUNET_TRANSPORT_communicator_disconnect (ch);
-    ch = NULL;
-  }
-  if (NULL != stats)
-  {
-    GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
-    stats = NULL;
-  }
-  if (NULL != my_private_key)
-  {
-    GNUNET_free (my_private_key);
-    my_private_key = NULL;
-  }
-  if (NULL != is)
-  {
-    GNUNET_NT_scanner_done (is);
-    is = NULL;
-  }
-  if (NULL != peerstore)
-  {
-    GNUNET_PEERSTORE_disconnect (peerstore, GNUNET_NO);
-    peerstore = NULL;
-  }
-  if (NULL != resolve_request_handle)
-  {
-    GNUNET_RESOLVER_request_cancel (resolve_request_handle);
-    resolve_request_handle = NULL;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Shutdown done!\n");
-}
-
-
-/**
- * Function called when the transport service has received an
- * acknowledgement for this communicator (!) via a different return
- * path.
- *
- * Not applicable for TCP.
- *
- * @param cls closure
- * @param sender which peer sent the notification
- * @param msg payload
- */
-static void
-enc_notify_cb (void *cls,
-               const struct GNUNET_PeerIdentity *sender,
-               const struct GNUNET_MessageHeader *msg)
-{
-  (void) cls;
-  (void) sender;
-  (void) msg;
-  GNUNET_break_op (0);
-}
-
-
-/**
- * Signature of the callback passed to #GNUNET_NAT_register() for
- * a function to call whenever our set of 'valid' addresses changes.
- *
- * @param cls closure
- * @param app_ctx[in,out] location where the app can store stuff
- *                  on add and retrieve it on remove
- * @param add_remove #GNUNET_YES to add a new public IP address,
- *                   #GNUNET_NO to remove a previous (now invalid) one
- * @param ac address class the address belongs to
- * @param addr either the previous or the new public IP address
- * @param addrlen actual length of the @a addr
- */
-static void
-nat_address_cb (void *cls,
-                void **app_ctx,
-                int add_remove,
-                enum GNUNET_NAT_AddressClass ac,
-                const struct sockaddr *addr,
-                socklen_t addrlen)
-{
-  char *my_addr;
-  struct GNUNET_TRANSPORT_AddressIdentifier *ai;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "nat address cb %s %s\n",
-              add_remove ? "add" : "remove",
-              GNUNET_a2s (addr, addrlen));
-
-  if (GNUNET_YES == add_remove)
-  {
-    enum GNUNET_NetworkType nt;
-
-    GNUNET_asprintf (&my_addr,
-                     "%s-%s",
-                     COMMUNICATOR_ADDRESS_PREFIX,
-                     GNUNET_a2s (addr, addrlen));
-    nt = GNUNET_NT_scanner_get_type (is, addr, addrlen);
-    ai =
-      GNUNET_TRANSPORT_communicator_address_add (ch,
-                                                 my_addr,
-                                                 nt,
-                                                 GNUNET_TIME_UNIT_FOREVER_REL);
-    GNUNET_free (my_addr);
-    *app_ctx = ai;
-  }
-  else
-  {
-    ai = *app_ctx;
-    GNUNET_TRANSPORT_communicator_address_remove (ai);
-    *app_ctx = NULL;
-  }
-}
-
-
-/**
- * This method adds addresses to the DLL, that are later register at the NAT service.
- */
-static void
-add_addr (struct sockaddr *in, socklen_t in_len)
-{
-
-  struct Addresses *saddrs;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "add address %s\n",
-              GNUNET_a2s (in, in_len));
-
-  saddrs = GNUNET_new (struct Addresses);
-  saddrs->addr = in;
-  saddrs->addr_len = in_len;
-  GNUNET_CONTAINER_DLL_insert (addrs_head, addrs_tail, saddrs);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "after add address %s\n",
-              GNUNET_a2s (in, in_len));
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "add address %s\n",
-              GNUNET_a2s (saddrs->addr, saddrs->addr_len));
-
-  addrs_lens++;
-}
-
-
-/**
- * This method launch network interactions for each address we like to bind to.
- *
- * @param addr The address we will listen to.
- * @param in_len The length of the address we will listen to.
- * @return GNUNET_SYSERR in case of error. GNUNET_OK in case we are successfully listen to the address.
- */
-static int
-init_socket (struct sockaddr *addr,
-             socklen_t in_len)
-{
-  struct sockaddr_storage in_sto;
-  socklen_t sto_len;
-  struct GNUNET_NETWORK_Handle *listen_sock;
-  struct ListenTask *lt;
-  int sockfd;
-  struct GNUNET_HashCode h_sock;
-
-  if (NULL == addr)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Address is NULL.\n");
-    return GNUNET_SYSERR;
-  }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "address %s\n",
-              GNUNET_a2s (addr, in_len));
-
-  listen_sock =
-    GNUNET_NETWORK_socket_create (addr->sa_family, SOCK_STREAM, IPPROTO_TCP);
-  if (NULL == listen_sock)
-  {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket");
-    return GNUNET_SYSERR;
-  }
-
-  if (GNUNET_OK != GNUNET_NETWORK_socket_bind (listen_sock, addr, in_len))
-  {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "bind");
-    GNUNET_NETWORK_socket_close (listen_sock);
-    listen_sock = NULL;
-    return GNUNET_SYSERR;
-  }
-
-  if (GNUNET_OK !=
-      GNUNET_NETWORK_socket_listen (listen_sock,
-                                    5))
-  {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
-                         "listen");
-    GNUNET_NETWORK_socket_close (listen_sock);
-    listen_sock = NULL;
-    return GNUNET_SYSERR;
-  }
-
-  /* We might have bound to port 0, allowing the OS to figure it out;
-     thus, get the real IN-address from the socket */
-  sto_len = sizeof(in_sto);
-
-  if (0 != getsockname (GNUNET_NETWORK_get_fd (listen_sock),
-                        (struct sockaddr *) &in_sto,
-                        &sto_len))
-  {
-    memcpy (&in_sto, addr, in_len);
-    sto_len = in_len;
-  }
-
-  // addr = (struct sockaddr *) &in_sto;
-  in_len = sto_len;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Bound to `%s'\n",
-              GNUNET_a2s ((const struct sockaddr *) &in_sto, sto_len));
-  stats = GNUNET_STATISTICS_create ("C-TCP", cfg);
-
-  if (NULL == is)
-    is = GNUNET_NT_scanner_init ();
-
-  if (NULL == my_private_key)
-    my_private_key = GNUNET_CRYPTO_eddsa_key_create_from_configuration (cfg);
-  if (NULL == my_private_key)
-  {
-    GNUNET_log (
-      GNUNET_ERROR_TYPE_ERROR,
-      _ (
-        "Transport service is lacking key configuration settings. Exiting.\n"));
-    if (NULL != resolve_request_handle)
-      GNUNET_RESOLVER_request_cancel (resolve_request_handle);
-    GNUNET_SCHEDULER_shutdown ();
-    return GNUNET_SYSERR;
-  }
-  GNUNET_CRYPTO_eddsa_key_get_public (my_private_key, &my_identity.public_key);
-  /* start listening */
-
-  lt = GNUNET_new (struct ListenTask);
-  lt->listen_sock = listen_sock;
-
-  lt->listen_task = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
-                                                   listen_sock,
-                                                   &listen_cb,
-                                                   lt);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "creating hash\n");
-  sockfd = GNUNET_NETWORK_get_fd (lt->listen_sock);
-  GNUNET_CRYPTO_hash (&sockfd,
-                      sizeof(int),
-                      &h_sock);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "creating map\n");
-  if (NULL == lt_map)
-    lt_map = GNUNET_CONTAINER_multihashmap_create (2, GNUNET_NO);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "creating map entry\n");
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONTAINER_multihashmap_put (lt_map,
-                                                    &h_sock,
-                                                    lt,
-                                                    GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "map entry created\n");
-
-  if (NULL == queue_map)
-    queue_map = GNUNET_CONTAINER_multipeermap_create (10, GNUNET_NO);
-
-  if (NULL == ch)
-    ch = GNUNET_TRANSPORT_communicator_connect (cfg,
-                                                COMMUNICATOR_CONFIG_SECTION,
-                                                COMMUNICATOR_ADDRESS_PREFIX,
-                                                GNUNET_TRANSPORT_CC_RELIABLE,
-                                                &mq_init,
-                                                NULL,
-                                                &enc_notify_cb,
-                                                NULL);
-
-  if (NULL == ch)
-  {
-    GNUNET_break (0);
-    if (NULL != resolve_request_handle)
-      GNUNET_RESOLVER_request_cancel (resolve_request_handle);
-    GNUNET_SCHEDULER_shutdown ();
-    return GNUNET_SYSERR;
-  }
-
-  add_addr (addr, in_len);
-  return GNUNET_OK;
-
-}
-
-
-/**
- * This method reads from the DLL addrs_head to register them at the NAT service.
- */
-static void
-nat_register ()
-{
-  struct sockaddr **saddrs;
-  socklen_t *saddr_lens;
-  int i;
-  size_t len;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "starting nat register!\n");
-  len = 0;
-  i = 0;
-  saddrs = GNUNET_malloc ((addrs_lens) * sizeof(struct sockaddr *));
-  saddr_lens = GNUNET_malloc ((addrs_lens) * sizeof(socklen_t));
-  for (struct Addresses *pos = addrs_head; NULL != pos; pos = pos->next)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "registering address %s\n",
-                GNUNET_a2s (addrs_head->addr, addrs_head->addr_len));
-
-    saddr_lens[i] = addrs_head->addr_len;
-    len += saddr_lens[i];
-    saddrs[i] = GNUNET_memdup (addrs_head->addr, saddr_lens[i]);
-    i++;
-  }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "registering addresses %lu %lu %lu %lu\n",
-              (addrs_lens) * sizeof(struct sockaddr *),
-              (addrs_lens) * sizeof(socklen_t),
-              len,
-              sizeof(COMMUNICATOR_CONFIG_SECTION));
-  nat = GNUNET_NAT_register (cfg,
-                             COMMUNICATOR_CONFIG_SECTION,
-                             IPPROTO_TCP,
-                             addrs_lens,
-                             (const struct sockaddr **) saddrs,
-                             saddr_lens,
-                             &nat_address_cb,
-                             NULL /* FIXME: support reversal: #5529 */,
-                             NULL /* closure */);
-  for (i = addrs_lens - 1; i >= 0; i--)
-    GNUNET_free (saddrs[i]);
-  GNUNET_free (saddrs);
-  GNUNET_free (saddr_lens);
-
-  if (NULL == nat)
-  {
-    GNUNET_break (0);
-    if (NULL != resolve_request_handle)
-      GNUNET_RESOLVER_request_cancel (resolve_request_handle);
-    GNUNET_SCHEDULER_shutdown ();
-  }
-}
-
-
-/**
- * This method is the callback called by the resolver API, and wraps method init_socket.
- *
- * @param cls The port we will bind to.
- * @param addr The address we will bind to.
- * @param in_len The length of the address we will bind to.
- */
-static void
-init_socket_resolv (void *cls,
-                    const struct sockaddr *addr,
-                    socklen_t in_len)
-{
-  struct sockaddr_in *v4;
-  struct sockaddr_in6 *v6;
-  struct sockaddr *in;
-
-  (void) cls;
-  if (NULL != addr)
-  {
-    if (AF_INET == addr->sa_family)
-    {
-      v4 = (struct sockaddr_in *) addr;
-      in = tcp_address_to_sockaddr_numeric_v4 (&in_len, *v4, bind_port);// _global);
-    }
-    else if (AF_INET6 == addr->sa_family)
-    {
-      v6 = (struct sockaddr_in6 *) addr;
-      in = tcp_address_to_sockaddr_numeric_v6 (&in_len, *v6, bind_port);// _global);
-    }
-    else
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Address family %u not suitable (not AF_INET %u nor AF_INET6 %u \n",
-                  addr->sa_family,
-                  AF_INET,
-                  AF_INET6);
-      return;
-    }
-    init_socket (in, in_len);
-  }
-  else
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Address is NULL. This might be an error or the resolver finished resolving.\n");
-    if (NULL == addrs_head)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Resolver finished resolving, but we do not listen to an address!.\n");
-      return;
-    }
-    nat_register ();
-  }
-}
-
-
-/**
- * Setup communicator and launch network interactions.
- *
- * @param cls NULL (always)
- * @param args remaining command-line arguments
- * @param cfgfile name of the configuration file used (for saving, can be NULL!)
- * @param c configuration
- */
-static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *c)
-{
-  char *bindto;
-  struct sockaddr *in;
-  socklen_t in_len;
-  struct sockaddr_in v4;
-  struct sockaddr_in6 v6;
-  char *start;
-  unsigned int port;
-  char dummy[2];
-  char *rest = NULL;
-  struct PortOnlyIpv4Ipv6 *po;
-  socklen_t addr_len_ipv4;
-  socklen_t addr_len_ipv6;
-
-  (void) cls;
-  cfg = c;
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             COMMUNICATOR_CONFIG_SECTION,
-                                             "BINDTO",
-                                             &bindto))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               COMMUNICATOR_CONFIG_SECTION,
-                               "BINDTO");
-    return;
-  }
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (cfg,
-                                             COMMUNICATOR_CONFIG_SECTION,
-                                             "MAX_QUEUE_LENGTH",
-                                             &max_queue_length))
-    max_queue_length = DEFAULT_MAX_QUEUE_LENGTH;
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_time (cfg,
-                                           COMMUNICATOR_CONFIG_SECTION,
-                                           "REKEY_INTERVAL",
-                                           &rekey_interval))
-    rekey_interval = DEFAULT_REKEY_INTERVAL;
-
-  peerstore = GNUNET_PEERSTORE_connect (cfg);
-  if (NULL == peerstore)
-  {
-    GNUNET_free (bindto);
-    GNUNET_break (0);
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-
-  GNUNET_SCHEDULER_add_shutdown (&do_shutdown, NULL);
-
-  if (1 == sscanf (bindto, "%u%1s", &bind_port, dummy))
-  {
-    po = tcp_address_to_sockaddr_port_only (bindto, &bind_port);
-    addr_len_ipv4 = po->addr_len_ipv4;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "address po %s\n",
-                GNUNET_a2s (po->addr_ipv4, addr_len_ipv4));
-    if (NULL != po->addr_ipv4)
-    {
-      init_socket (po->addr_ipv4, addr_len_ipv4);
-    }
-    if (NULL != po->addr_ipv6)
-    {
-      addr_len_ipv6 = po->addr_len_ipv6;
-      init_socket (po->addr_ipv6, addr_len_ipv6);
-    }
-    GNUNET_free (po);
-    nat_register ();
-    GNUNET_free (bindto);
-    return;
-  }
-
-  start = extract_address (bindto);
-  // FIXME: check for NULL == start...
-  if (1 == inet_pton (AF_INET, start, &v4.sin_addr))
-  {
-    bind_port = extract_port (bindto);
-
-    in = tcp_address_to_sockaddr_numeric_v4 (&in_len, v4, bind_port);
-    init_socket (in, in_len);
-    nat_register ();
-    GNUNET_free (start);
-    GNUNET_free (bindto);
-    return;
-  }
-
-  if (1 == inet_pton (AF_INET6, start, &v6.sin6_addr))
-  {
-    bind_port = extract_port (bindto);
-    in = tcp_address_to_sockaddr_numeric_v6 (&in_len, v6, bind_port);
-    init_socket (in, in_len);
-    nat_register ();
-    GNUNET_free (start);
-    GNUNET_free (bindto);
-    return;
-  }
-
-  bind_port = extract_port (bindto);
-  resolve_request_handle = GNUNET_RESOLVER_ip_get (strtok_r (bindto,
-                                                             ":",
-                                                             &rest),
-                                                   AF_UNSPEC,
-                                                   GNUNET_TIME_UNIT_MINUTES,
-                                                   &init_socket_resolv,
-                                                   &port);
-  GNUNET_free (bindto);
-  GNUNET_free (start);
-}
-
-
-/**
- * The main function for the UNIX communicator.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc, char *const *argv)
-{
-  static const struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-  int ret;
-
-  GNUNET_log_from_nocheck (GNUNET_ERROR_TYPE_DEBUG,
-                           "transport",
-                           "Starting tcp communicator\n");
-  if (GNUNET_OK !=
-      GNUNET_STRINGS_get_utf8_args (argc, argv,
-                                    &argc, &argv))
-    return 2;
-
-  ret = (GNUNET_OK ==
-         GNUNET_PROGRAM_run (argc,
-                             argv,
-                             "gnunet-communicator-tcp",
-                             _ ("GNUnet TCP communicator"),
-                             options,
-                             &run,
-                             NULL))
-        ? 0
-        : 1;
-  GNUNET_free_nz ((void *) argv);
-  return ret;
-}
-
-
-/* end of gnunet-communicator-tcp.c */
diff --git a/src/transport/gnunet-communicator-udp.c b/src/transport/gnunet-communicator-udp.c
deleted file mode 100644
index 70848ff79..000000000
--- a/src/transport/gnunet-communicator-udp.c
+++ /dev/null
@@ -1,3953 +0,0 @@
-/*
-     This file is part of GNUnet
-     Copyright (C) 2010-2014, 2018, 2019 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/gnunet-communicator-udp.c
- * @brief Transport plugin using UDP.
- * @author Christian Grothoff
- *
- * TODO:
- * - consider imposing transmission limits in the absence
- *   of ACKs; or: maybe this should be done at TNG service level?
- *   (at least the receiver might want to enforce limits on
- *    KX/DH operations per sender in here) (#5552)
- * - overall, we should look more into flow control support
- *   (either in backchannel, or general solution in TNG service)
- * - handle addresses discovered from broadcasts (#5551)
- *   (think: what was the story again on address validation?
- *    where is the API for that!?!)
- * - support DNS names in BINDTO option (#5528)
- * - support NAT connection reversal method (#5529)
- * - support other UDP-specific NAT traversal methods (#)
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_protocols.h"
-#include "gnunet_signatures.h"
-#include "gnunet_constants.h"
-#include "gnunet_nt_lib.h"
-#include "gnunet_nat_service.h"
-#include "gnunet_statistics_service.h"
-#include "gnunet_transport_application_service.h"
-#include "gnunet_transport_communication_service.h"
-
-/**
- * How often do we rekey based on time (at least)
- */
-#define DEFAULT_REKEY_TIME_INTERVAL GNUNET_TIME_UNIT_DAYS
-
-/**
- * How long do we wait until we must have received the initial KX?
- */
-#define PROTO_QUEUE_TIMEOUT GNUNET_TIME_UNIT_MINUTES
-
-/**
- * How often do we broadcast our presence on the LAN?
- */
-#define BROADCAST_FREQUENCY GNUNET_TIME_UNIT_MINUTES
-
-/**
- * How often do we scan for changes to our network interfaces?
- */
-#define INTERFACE_SCAN_FREQUENCY \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5)
-
-/**
- * How long do we believe our addresses to remain up (before
- * the other peer should revalidate).
- */
-#define ADDRESS_VALIDITY_PERIOD GNUNET_TIME_UNIT_HOURS
-
-#define WORKING_QUEUE_INTERVALL \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MICROSECONDS,1)
-
-/**
- * AES key size.
- */
-#define AES_KEY_SIZE (256 / 8)
-
-/**
- * AES (GCM) IV size.
- */
-#define AES_IV_SIZE (96 / 8)
-
-/**
- * Size of the GCM tag.
- */
-#define GCM_TAG_SIZE (128 / 8)
-
-#define GENERATE_AT_ONCE 2
-
-/**
- * If we fall below this number of available KCNs,
- * we generate additional ACKs until we reach
- * #KCN_TARGET.
- * Should be large enough that we don't generate ACKs all
- * the time and still have enough time for the ACK to
- * arrive before the sender runs out. So really this
- * should ideally be based on the RTT.
- */
-#define KCN_THRESHOLD 92
-
-/**
- * How many KCNs do we keep around *after* we hit
- * the #KCN_THRESHOLD? Should be larger than
- * #KCN_THRESHOLD so we do not generate just one
- * ACK at the time.
- */
-#define KCN_TARGET 128
-
-/**
- * What is the maximum delta between KCN sequence numbers
- * that we allow. Used to expire 'ancient' KCNs that likely
- * were dropped by the network.  Must be larger than
- * KCN_TARGET (otherwise we generate new KCNs all the time),
- * but not too large (otherwise packet loss may cause
- * sender to fall back to KX needlessly when sender runs
- * out of ACK'ed KCNs due to losses).
- */
-#define MAX_SQN_DELTA 160
-
-/**
- * How many shared master secrets do we keep around
- * at most per sender?  Should be large enough so
- * that we generally have a chance of sending an ACK
- * before the sender already rotated out the master
- * secret.  Generally values around #KCN_TARGET make
- * sense. Might make sense to adapt to RTT if we had
- * a good measurement...
- */
-#define MAX_SECRETS 128000
-
-/**
- * Default value for how often we do rekey based on number of bytes transmitted?
- * (additionally randomized).
- */
-#define DEFAULT_REKEY_MAX_BYTES (1024LLU * 1024 * 1024 * 4LLU)
-
-/**
- * Address prefix used by the communicator.
- */
-
-#define COMMUNICATOR_ADDRESS_PREFIX "udp"
-
-/**
- * Configuration section used by the communicator.
- */
-#define COMMUNICATOR_CONFIG_SECTION "communicator-udp"
-
-GNUNET_NETWORK_STRUCT_BEGIN
-
-
-/**
- * Signature we use to verify that the ephemeral key was really chosen by
- * the specified sender.  If possible, the receiver should respond with
- * a `struct UDPAck` (possibly via backchannel).
- */
-struct UdpHandshakeSignature
-{
-  /**
-   * Purpose must be #GNUNET_SIGNATURE_PURPOSE_COMMUNICATOR_UDP_HANDSHAKE
-   */
-  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
-
-  /**
-   * Identity of the inititor of the UDP connection (UDP client).
-   */
-  struct GNUNET_PeerIdentity sender;
-
-  /**
-   * Presumed identity of the target of the UDP connection (UDP server)
-   */
-  struct GNUNET_PeerIdentity receiver;
-
-  /**
-   * Ephemeral key used by the @e sender.
-   */
-  struct GNUNET_CRYPTO_EcdhePublicKey ephemeral;
-
-  /**
-   * Monotonic time of @e sender, to possibly help detect replay attacks
-   * (if receiver persists times by sender).
-   */
-  struct GNUNET_TIME_AbsoluteNBO monotonic_time;
-};
-
-
-/**
- * "Plaintext" header at beginning of KX message. Followed
- * by encrypted `struct UDPConfirmation`.
- */
-struct InitialKX
-{
-  /**
-   * Ephemeral key for KX.
-   */
-  struct GNUNET_CRYPTO_EcdhePublicKey ephemeral;
-
-  /**
-   * HMAC for the following encrypted message, using GCM.  HMAC uses
-   * key derived from the handshake with sequence number zero.
-   */
-  char gcm_tag[GCM_TAG_SIZE];
-
-  /**
-   * A flag indicating, if the sender is doing rekeying.
-   */
-  int rekeying;
-};
-
-
-/**
- * Encrypted continuation of UDP initial handshake, followed
- * by message header with payload.
- */
-struct UDPConfirmation
-{
-  /**
-   * Sender's identity
-   */
-  struct GNUNET_PeerIdentity sender;
-
-  /**
-   * Sender's signature of type #GNUNET_SIGNATURE_PURPOSE_COMMUNICATOR_UDP_HANDSHAKE
-   */
-  struct GNUNET_CRYPTO_EddsaSignature sender_sig;
-
-  /**
-   * Monotonic time of @e sender, to possibly help detect replay attacks
-   * (if receiver persists times by sender).
-   */
-  struct GNUNET_TIME_AbsoluteNBO monotonic_time;
-
-  /* followed by messages */
-
-  /* padding may follow actual messages */
-};
-
-
-/**
- * UDP key acknowledgement.  May be sent via backchannel. Allows the
- * sender to use `struct UDPBox` with the acknowledge key henceforth.
- */
-struct UDPAck
-{
-  /**
-   * Type is #GNUNET_MESSAGE_TYPE_COMMUNICATOR_UDP_ACK.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Sequence acknowledgement limit. Specifies current maximum sequence
-   * number supported by receiver.
-   */
-  uint32_t sequence_max GNUNET_PACKED;
-
-  /**
-   * Sequence acknowledgement limit. Specifies current maximum sequence
-   * number supported by receiver.
-   */
-  uint32_t acks_available GNUNET_PACKED;
-
-  /**
-   * CMAC of the base key being acknowledged.
-   */
-  struct GNUNET_HashCode cmac;
-};
-
-
-/**
- * Signature we use to verify that the broadcast was really made by
- * the peer that claims to have made it.  Basically, affirms that the
- * peer is really using this IP address (albeit possibly not in _our_
- * LAN).  Makes it difficult for peers in the LAN to claim to
- * be just any global peer -- an attacker must have at least
- * shared a LAN with the peer they're pretending to be here.
- */
-struct UdpBroadcastSignature
-{
-  /**
-   * Purpose must be #GNUNET_SIGNATURE_PURPOSE_COMMUNICATOR_UDP_BROADCAST
-   */
-  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
-
-  /**
-   * Identity of the inititor of the UDP broadcast.
-   */
-  struct GNUNET_PeerIdentity sender;
-
-  /**
-   * Hash of the sender's UDP address.
-   */
-  struct GNUNET_HashCode h_address;
-};
-
-
-/**
- * Broadcast by peer in LAN announcing its presence.  Unusual in that
- * we don't pad these to full MTU, as we cannot prevent being
- * recognized in LAN as GNUnet peers if this feature is enabled
- * anyway.  Also, the entire message is in cleartext.
- */
-struct UDPBroadcast
-{
-  /**
-   * Sender's peer identity.
-   */
-  struct GNUNET_PeerIdentity sender;
-
-  /**
-   * Sender's signature of type
-   * #GNUNET_SIGNATURE_PURPOSE_COMMUNICATOR_UDP_BROADCAST
-   */
-  struct GNUNET_CRYPTO_EddsaSignature sender_sig;
-};
-
-
-/**
- * UDP message box.  Always sent encrypted, only allowed after
- * the receiver sent a `struct UDPAck` for the base key!
- */
-struct UDPBox
-{
-  /**
-   * Key and IV identification code. KDF applied to an acknowledged
-   * base key and a sequence number.  Sequence numbers must be used
-   * monotonically increasing up to the maximum specified in
-   * `struct UDPAck`. Without further `struct UDPAck`s, the sender
-   * must fall back to sending handshakes!
-   */
-  struct GNUNET_ShortHashCode kid;
-
-  /**
-   * 128-bit authentication tag for the following encrypted message,
-   * from GCM.  MAC starts at the @e body_start that follows and
-   * extends until the end of the UDP payload.  If the @e hmac is
-   * wrong, the receiver should check if the message might be a
-   * `struct UdpHandshakeSignature`.
-   */
-  char gcm_tag[GCM_TAG_SIZE];
-
-  /**
-   * A flag indicating, if the sender is doing rekeying.
-   */
-  int rekeying;
-};
-
-/**
- * UDP message box.  Always sent encrypted, only allowed after
- * the receiver sent a `struct UDPAck` for the base key!
- */
-struct UDPRekey
-{
-  /**
-   * Key and IV identification code. KDF applied to an acknowledged
-   * base key and a sequence number.  Sequence numbers must be used
-   * monotonically increasing up to the maximum specified in
-   * `struct UDPAck`. Without further `struct UDPAck`s, the sender
-   * must fall back to sending handshakes!
-   */
-  struct GNUNET_ShortHashCode kid;
-
-  /**
-   * 128-bit authentication tag for the following encrypted message,
-   * from GCM.  MAC starts at the @e body_start that follows and
-   * extends until the end of the UDP payload.  If the @e hmac is
-   * wrong, the receiver should check if the message might be a
-   * `struct UdpHandshakeSignature`.
-   */
-  char gcm_tag[GCM_TAG_SIZE];
-
-  /**
-   * Sender's identity
-   */
-  struct GNUNET_PeerIdentity sender;
-};
-
-GNUNET_NETWORK_STRUCT_END
-
-/**
- * Shared secret we generated for a particular sender or receiver.
- */
-struct SharedSecret;
-
-
-/**
- * Pre-generated "kid" code (key and IV identification code) to
- * quickly derive master key for a `struct UDPBox`.
- */
-struct KeyCacheEntry
-{
-  /**
-   * Kept in a DLL.
-   */
-  struct KeyCacheEntry *next;
-
-  /**
-   * Kept in a DLL.
-   */
-  struct KeyCacheEntry *prev;
-
-  /**
-   * Key and IV identification code. KDF applied to an acknowledged
-   * base key and a sequence number.  Sequence numbers must be used
-   * monotonically increasing up to the maximum specified in
-   * `struct UDPAck`. Without further `struct UDPAck`s, the sender
-   * must fall back to sending handshakes!
-   */
-  struct GNUNET_ShortHashCode kid;
-
-  /**
-   * Corresponding shared secret.
-   */
-  struct SharedSecret *ss;
-
-  /**
-   * Sequence number used to derive this entry from master key.
-   */
-  uint32_t sequence_number;
-};
-
-
-/**
- * Information we track per sender address we have recently been
- * in contact with (decryption from sender).
- */
-struct SenderAddress;
-
-/**
- * Information we track per receiving address we have recently been
- * in contact with (encryption to receiver).
- */
-struct ReceiverAddress;
-
-/**
- * Shared secret we generated for a particular sender or receiver.
- */
-struct SharedSecret
-{
-  /**
-   * Kept in a DLL.
-   */
-  struct SharedSecret *next;
-
-  /**
-   * Kept in a DLL.
-   */
-  struct SharedSecret *prev;
-
-  /**
-   * Kept in a DLL, sorted by sequence number. Only if we are decrypting.
-   */
-  struct KeyCacheEntry *kce_head;
-
-  /**
-   * Kept in a DLL, sorted by sequence number. Only if we are decrypting.
-   */
-  struct KeyCacheEntry *kce_tail;
-
-  /**
-   * Sender we use this shared secret with, or NULL.
-   */
-  struct SenderAddress *sender;
-
-  /**
-   * Receiver we use this shared secret with, or NULL.
-   */
-  struct ReceiverAddress *receiver;
-
-  /**
-   * Master shared secret.
-   */
-  struct GNUNET_HashCode master;
-
-  /**
-   * CMAC is used to identify @e master in ACKs.
-   */
-  struct GNUNET_HashCode cmac;
-
-  /**
-   * Up to which sequence number did we use this @e master already?
-   * (for encrypting only)
-   */
-  uint32_t sequence_used;
-
-  /**
-   * Up to which sequence number did the other peer allow us to use
-   * this key, or up to which number did we allow the other peer to
-   * use this key?
-   */
-  uint32_t sequence_allowed;
-
-  /**
-   * Number of active KCN entries.
-   */
-  unsigned int active_kce_count;
-};
-
-
-/**
- * Information we track per sender address we have recently been
- * in contact with (we decrypt messages from the sender).
- */
-struct SenderAddress
-{
-  /**
-   * Shared secret we use with @e target for rekeying.
-   */
-  struct SharedSecret *ss_rekey;
-
-  /**
-   * Flag indicating sender is initiated rekeying for this receiver.
-   */
-  int rekeying;
-
-  /**
-   * To whom are we talking to.
-   */
-  struct GNUNET_PeerIdentity target;
-
-  /**
-   * Entry in sender expiration heap.
-   */
-  struct GNUNET_CONTAINER_HeapNode *hn;
-
-  /**
-   * Shared secrets we used with @e target, first used is head.
-   */
-  struct SharedSecret *ss_head;
-
-  /**
-   * Shared secrets we used with @e target, last used is tail.
-   */
-  struct SharedSecret *ss_tail;
-
-  /**
-   * Address of the other peer.
-   */
-  struct sockaddr *address;
-
-  /**
-   * Length of the address.
-   */
-  socklen_t address_len;
-
-  /**
-   * Timeout for this sender.
-   */
-  struct GNUNET_TIME_Absolute timeout;
-
-  /**
-   * Length of the DLL at @a ss_head.
-   */
-  unsigned int num_secrets;
-
-  /**
-   * Number of BOX keys from ACKs we have currently
-   * available for this sender.
-   */
-  unsigned int acks_available;
-
-  /**
-   * Which network type does this queue use?
-   */
-  enum GNUNET_NetworkType nt;
-
-  /**
-   * sender_destroy already called on sender.
-   */
-  int sender_destroy_called;
-
-
-  /**
-   * ID of kce working queue task
-   */
-  struct GNUNET_SCHEDULER_Task *kce_task;
-
-  /**
-   * ID of kce rekey working queue task
-   */
-  struct GNUNET_SCHEDULER_Task *kce_task_rekey;
-
-  /**
-   * Is the kce_task finished?
-   */
-  int kce_task_finished;
-};
-
-
-/**
- * Information we track per receiving address we have recently been
- * in contact with (encryption to receiver).
- */
-struct ReceiverAddress
-{
-
-  /**
-   * Shared secret we use with @e target for rekeying.
-   */
-  struct SharedSecret *ss_rekey;
-
-  /**
-   * Acks available when we started rekeying.
-   */
-  unsigned int rekey_acks_available;
-
-  /**
-   * Send bytes for this receiver address.
-   */
-  uint64_t rekey_send_bytes;
-
-  /**
-  * Timeout for this receiver address.
-  */
-  struct GNUNET_TIME_Absolute rekey_timeout;
-
-  /**
-   * Flag indicating sender is initiated rekeying for this receiver.
-   */
-  int rekeying;
-
-  /**
-   * Number of kce we retain for sending the rekeying shared secret.
-   */
-  int number_rekeying_kce;
-
-  /**
-   * To whom are we talking to.
-   */
-  struct GNUNET_PeerIdentity target;
-
-  /**
-   * Shared secrets we received from @e target, first used is head.
-   */
-  struct SharedSecret *ss_head;
-
-  /**
-   * Shared secrets we received with @e target, last used is tail.
-   */
-  struct SharedSecret *ss_tail;
-
-  /**
-   * Address of the receiver in the human-readable format
-   * with the #COMMUNICATOR_ADDRESS_PREFIX.
-   */
-  char *foreign_addr;
-
-  /**
-   * Address of the other peer.
-   */
-  struct sockaddr *address;
-
-  /**
-   * Length of the address.
-   */
-  socklen_t address_len;
-
-  /**
-   * Entry in sender expiration heap.
-   */
-  struct GNUNET_CONTAINER_HeapNode *hn;
-
-  /**
-   * KX message queue we are providing for the #ch.
-   */
-  struct GNUNET_MQ_Handle *kx_mq;
-
-  /**
-   * Default message queue we are providing for the #ch.
-   */
-  struct GNUNET_MQ_Handle *d_mq;
-
-  /**
-   * handle for KX queue with the #ch.
-   */
-  struct GNUNET_TRANSPORT_QueueHandle *kx_qh;
-
-  /**
-   * handle for default queue with the #ch.
-   */
-  struct GNUNET_TRANSPORT_QueueHandle *d_qh;
-
-  /**
-   * Timeout for this receiver address.
-   */
-  struct GNUNET_TIME_Absolute timeout;
-
-  /**
-   * MTU we allowed transport for this receiver's KX queue.
-   */
-  size_t kx_mtu;
-
-  /**
-   * MTU we allowed transport for this receiver's default queue.
-   */
-  size_t d_mtu;
-
-  /**
-   * Length of the DLL at @a ss_head.
-   */
-  unsigned int num_secrets;
-
-  /**
-   * Number of BOX keys from ACKs we have currently
-   * available for this receiver.
-   */
-  unsigned int acks_available;
-
-  /**
-   * Which network type does this queue use?
-   */
-  enum GNUNET_NetworkType nt;
-
-  /**
-   * receiver_destroy already called on receiver.
-   */
-  int receiver_destroy_called;
-};
-
-/**
- * Interface we broadcast our presence on.
- */
-struct BroadcastInterface
-{
-  /**
-   * Kept in a DLL.
-   */
-  struct BroadcastInterface *next;
-
-  /**
-   * Kept in a DLL.
-   */
-  struct BroadcastInterface *prev;
-
-  /**
-   * Task for this broadcast interface.
-   */
-  struct GNUNET_SCHEDULER_Task *broadcast_task;
-
-  /**
-   * Sender's address of the interface.
-   */
-  struct sockaddr *sa;
-
-  /**
-   * Broadcast address to use on the interface.
-   */
-  struct sockaddr *ba;
-
-  /**
-   * Message we broadcast on this interface.
-   */
-  struct UDPBroadcast bcm;
-
-  /**
-   * If this is an IPv6 interface, this is the request
-   * we use to join/leave the group.
-   */
-  struct ipv6_mreq mcreq;
-
-  /**
-   * Number of bytes in @e sa.
-   */
-  socklen_t salen;
-
-  /**
-   * Was this interface found in the last #iface_proc() scan?
-   */
-  int found;
-};
-
-/**
- * The rekey interval
- */
-static struct GNUNET_TIME_Relative rekey_interval;
-
-/**
- * How often we do rekey based on number of bytes transmitted
- */
-static unsigned long long rekey_max_bytes;
-/**
- * Shared secret we finished the last kce working queue for.
- */
-struct SharedSecret *ss_finished;
-
-/**
- * Cache of pre-generated key IDs.
- */
-static struct GNUNET_CONTAINER_MultiShortmap *key_cache;
-
-/**
- * ID of read task
- */
-static struct GNUNET_SCHEDULER_Task *read_task;
-
-/**
- * ID of timeout task
- */
-static struct GNUNET_SCHEDULER_Task *timeout_task;
-
-/**
- * ID of master broadcast task
- */
-static struct GNUNET_SCHEDULER_Task *broadcast_task;
-
-/**
- * For logging statistics.
- */
-static struct GNUNET_STATISTICS_Handle *stats;
-
-/**
- * Our environment.
- */
-static struct GNUNET_TRANSPORT_CommunicatorHandle *ch;
-
-/**
- * Receivers (map from peer identity to `struct ReceiverAddress`)
- */
-static struct GNUNET_CONTAINER_MultiPeerMap *receivers;
-
-/**
- * Senders (map from peer identity to `struct SenderAddress`)
- */
-static struct GNUNET_CONTAINER_MultiPeerMap *senders;
-
-/**
- * Expiration heap for senders (contains `struct SenderAddress`)
- */
-static struct GNUNET_CONTAINER_Heap *senders_heap;
-
-/**
- * Expiration heap for receivers (contains `struct ReceiverAddress`)
- */
-static struct GNUNET_CONTAINER_Heap *receivers_heap;
-
-/**
- * Broadcast interface tasks. Kept in a DLL.
- */
-static struct BroadcastInterface *bi_head;
-
-/**
- * Broadcast interface tasks. Kept in a DLL.
- */
-static struct BroadcastInterface *bi_tail;
-
-/**
- * Our socket.
- */
-static struct GNUNET_NETWORK_Handle *udp_sock;
-
-/**
- * #GNUNET_YES if #udp_sock supports IPv6.
- */
-static int have_v6_socket;
-
-/**
- * Our public key.
- */
-static struct GNUNET_PeerIdentity my_identity;
-
-/**
- * Our private key.
- */
-static struct GNUNET_CRYPTO_EddsaPrivateKey *my_private_key;
-
-/**
- * Our configuration.
- */
-static const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-/**
- * Our handle to report addresses for validation to TRANSPORT.
- */
-static struct GNUNET_TRANSPORT_ApplicationHandle *ah;
-
-/**
- * Network scanner to determine network types.
- */
-static struct GNUNET_NT_InterfaceScanner *is;
-
-/**
- * Connection to NAT service.
- */
-static struct GNUNET_NAT_Handle *nat;
-
-/**
- * Port number to which we are actually bound.
- */
-static uint16_t my_port;
-
-
-/**
- * An interface went away, stop broadcasting on it.
- *
- * @param bi entity to close down
- */
-static void
-bi_destroy (struct BroadcastInterface *bi)
-{
-  if (AF_INET6 == bi->sa->sa_family)
-  {
-    /* Leave the multicast group */
-    if (GNUNET_OK != GNUNET_NETWORK_socket_setsockopt (udp_sock,
-                                                       IPPROTO_IPV6,
-                                                       IPV6_LEAVE_GROUP,
-                                                       &bi->mcreq,
-                                                       sizeof(bi->mcreq)))
-    {
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "setsockopt");
-    }
-  }
-  GNUNET_CONTAINER_DLL_remove (bi_head, bi_tail, bi);
-  GNUNET_SCHEDULER_cancel (bi->broadcast_task);
-  GNUNET_free (bi->sa);
-  GNUNET_free (bi->ba);
-  GNUNET_free (bi);
-}
-
-
-/**
- * Destroys a receiving state due to timeout or shutdown.
- *
- * @param receiver entity to close down
- */
-static void
-receiver_destroy (struct ReceiverAddress *receiver)
-{
-
-  receiver->receiver_destroy_called = GNUNET_YES;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Disconnecting receiver for peer `%s'\n",
-              GNUNET_i2s (&receiver->target));
-  /*if (NULL != (mq = receiver->kx_mq))
-  {
-    receiver->kx_mq = NULL;
-    GNUNET_MQ_destroy (mq);
-    }*/
-  if (NULL != receiver->kx_qh)
-  {
-    GNUNET_TRANSPORT_communicator_mq_del (receiver->kx_qh);
-    receiver->kx_qh = NULL;
-    receiver->kx_mq = NULL;
-  }
-  /*if (NULL != (mq = receiver->d_mq))
-  {
-    receiver->d_mq = NULL;
-    GNUNET_MQ_destroy (mq);
-    }*/
-  if (NULL != receiver->d_qh)
-  {
-    GNUNET_TRANSPORT_communicator_mq_del (receiver->d_qh);
-    receiver->d_qh = NULL;
-  }
-  GNUNET_assert (GNUNET_YES ==
-                 GNUNET_CONTAINER_multipeermap_remove (receivers,
-                                                       &receiver->target,
-                                                       receiver));
-  GNUNET_assert (receiver == GNUNET_CONTAINER_heap_remove_node (receiver->hn));
-  GNUNET_STATISTICS_set (stats,
-                         "# receivers active",
-                         GNUNET_CONTAINER_multipeermap_size (receivers),
-                         GNUNET_NO);
-  GNUNET_free (receiver->address);
-  GNUNET_free (receiver->foreign_addr);
-  GNUNET_free (receiver);
-}
-
-
-/**
- * Free memory used by key cache entry.
- *
- * @param kce the key cache entry
- */
-static void
-kce_destroy (struct KeyCacheEntry *kce)
-{
-  struct SharedSecret *ss = kce->ss;
-
-  ss->active_kce_count--;
-  ss->sender->acks_available--;
-  GNUNET_CONTAINER_DLL_remove (ss->kce_head, ss->kce_tail, kce);
-  GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_multishortmap_remove (key_cache,
-                                                                      &kce->kid,
-                                                                      kce));
-  GNUNET_free (kce);
-}
-
-
-/**
- * Compute @a kid.
- *
- * @param msec master secret for HMAC calculation
- * @param serial number for the @a smac calculation
- * @param kid[out] where to write the key ID
- */
-static void
-get_kid (const struct GNUNET_HashCode *msec,
-         uint32_t serial,
-         struct GNUNET_ShortHashCode *kid)
-{
-  uint32_t sid = htonl (serial);
-
-  GNUNET_CRYPTO_hkdf (kid,
-                      sizeof(*kid),
-                      GCRY_MD_SHA512,
-                      GCRY_MD_SHA256,
-                      &sid,
-                      sizeof(sid),
-                      msec,
-                      sizeof(*msec),
-                      "UDP-KID",
-                      strlen ("UDP-KID"),
-                      NULL,
-                      0);
-}
-
-
-/**
- * Setup key cache entry for sequence number @a seq and shared secret @a ss.
- *
- * @param ss shared secret
- * @param seq sequence number for the key cache entry
- */
-static void
-kce_generate (struct SharedSecret *ss, uint32_t seq)
-{
-  struct KeyCacheEntry *kce;
-
-  GNUNET_assert (0 < seq);
-  kce = GNUNET_new (struct KeyCacheEntry);
-  kce->ss = ss;
-  kce->sequence_number = seq;
-  get_kid (&ss->master, seq, &kce->kid);
-  GNUNET_CONTAINER_DLL_insert (ss->kce_head, ss->kce_tail, kce);
-  ss->active_kce_count++;
-  ss->sender->acks_available++;
-  (void) GNUNET_CONTAINER_multishortmap_put (
-    key_cache,
-    &kce->kid,
-    kce,
-    GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-  GNUNET_STATISTICS_set (stats,
-                         "# KIDs active",
-                         GNUNET_CONTAINER_multishortmap_size (key_cache),
-                         GNUNET_NO);
-}
-
-
-/**
- * Destroy @a ss and associated key cache entries.
- *
- * @param ss shared secret to destroy
- * @param withoutKce If GNUNET_YES shared secrets with kce will not be destroyed.
- */
-static int
-secret_destroy (struct SharedSecret *ss, int withoutKce)
-{
-  struct SenderAddress *sender;
-  struct ReceiverAddress *receiver;
-  struct KeyCacheEntry *kce;
-
-  if (withoutKce && (ss->sequence_allowed > 0))
-    return GNUNET_NO;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "secret %s destroy %u %u\n",
-              GNUNET_h2s (&ss->master),
-              withoutKce,
-              ss->sequence_allowed);
-  if (NULL != (sender = ss->sender))
-  {
-    GNUNET_CONTAINER_DLL_remove (sender->ss_head, sender->ss_tail, ss);
-    sender->num_secrets--;
-  }
-  if (NULL != (receiver = ss->receiver))
-  {
-    GNUNET_CONTAINER_DLL_remove (receiver->ss_head, receiver->ss_tail, ss);
-    receiver->num_secrets--;
-    // Uncomment this for alternativ 1 of backchannel functionality
-    receiver->acks_available -= (ss->sequence_allowed - ss->sequence_used);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "%u receiver->acks_available 3\n",
-                receiver->acks_available);
-    // Until here for alternativ 1
-  }
-  while (NULL != (kce = ss->kce_head))
-    kce_destroy (kce);
-  GNUNET_STATISTICS_update (stats, "# Secrets active", -1, GNUNET_NO);
-  GNUNET_STATISTICS_set (stats,
-                         "# KIDs active",
-                         GNUNET_CONTAINER_multishortmap_size (key_cache),
-                         GNUNET_NO);
-  GNUNET_free (ss);
-  return GNUNET_YES;
-}
-
-
-/**
- * Functions with this signature are called whenever we need
- * to close a sender's state due to timeout.
- *
- * @param sender entity to close down
- */
-static void
-sender_destroy (struct SenderAddress *sender)
-{
-  sender->sender_destroy_called = GNUNET_YES;
-  GNUNET_assert (
-    GNUNET_YES ==
-    GNUNET_CONTAINER_multipeermap_remove (senders, &sender->target, sender));
-  GNUNET_assert (sender == GNUNET_CONTAINER_heap_remove_node (sender->hn));
-  GNUNET_STATISTICS_set (stats,
-                         "# senders active",
-                         GNUNET_CONTAINER_multipeermap_size (senders),
-                         GNUNET_NO);
-  GNUNET_free (sender->address);
-  GNUNET_free (sender);
-}
-
-
-/**
- * Compute @a key and @a iv.
- *
- * @param msec master secret for calculation
- * @param serial number for the @a smac calculation
- * @param key[out] where to write the decryption key
- * @param iv[out] where to write the IV
- */
-static void
-get_iv_key (const struct GNUNET_HashCode *msec,
-            uint32_t serial,
-            char key[AES_KEY_SIZE],
-            char iv[AES_IV_SIZE])
-{
-  uint32_t sid = htonl (serial);
-  char res[AES_KEY_SIZE + AES_IV_SIZE];
-
-  GNUNET_CRYPTO_hkdf (res,
-                      sizeof(res),
-                      GCRY_MD_SHA512,
-                      GCRY_MD_SHA256,
-                      &sid,
-                      sizeof(sid),
-                      msec,
-                      sizeof(*msec),
-                      "UDP-IV-KEY",
-                      strlen ("UDP-IV-KEY"),
-                      NULL,
-                      0);
-  memcpy (key, res, AES_KEY_SIZE);
-  memcpy (iv, &res[AES_KEY_SIZE], AES_IV_SIZE);
-}
-
-
-/**
- * Increment sender timeout due to activity.
- *
- * @param sender address for which the timeout should be rescheduled
- */
-static void
-reschedule_sender_timeout (struct SenderAddress *sender)
-{
-  sender->timeout =
-    GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
-  GNUNET_CONTAINER_heap_update_cost (sender->hn, sender->timeout.abs_value_us);
-}
-
-
-/**
- * Increment receiver timeout due to activity.
- *
- * @param receiver address for which the timeout should be rescheduled
- */
-static void
-reschedule_receiver_timeout (struct ReceiverAddress *receiver)
-{
-  receiver->timeout =
-    GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
-  GNUNET_CONTAINER_heap_update_cost (receiver->hn,
-                                     receiver->timeout.abs_value_us);
-}
-
-
-/**
- * Task run to check #receiver_heap and #sender_heap for timeouts.
- *
- * @param cls unused, NULL
- */
-static void
-check_timeouts (void *cls)
-{
-  struct GNUNET_TIME_Relative st;
-  struct GNUNET_TIME_Relative rt;
-  struct GNUNET_TIME_Relative delay;
-  struct ReceiverAddress *receiver;
-  struct SenderAddress *sender;
-
-  (void) cls;
-  timeout_task = NULL;
-  rt = GNUNET_TIME_UNIT_FOREVER_REL;
-  while (NULL != (receiver = GNUNET_CONTAINER_heap_peek (receivers_heap)))
-  {
-    /* if (GNUNET_YES != receiver->receiver_destroy_called) */
-    /* { */
-    rt = GNUNET_TIME_absolute_get_remaining (receiver->timeout);
-    if (0 != rt.rel_value_us)
-      break;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Receiver timed out\n");
-    receiver_destroy (receiver);
-    // }
-  }
-  st = GNUNET_TIME_UNIT_FOREVER_REL;
-  while (NULL != (sender = GNUNET_CONTAINER_heap_peek (senders_heap)))
-  {
-    if (GNUNET_YES != sender->sender_destroy_called)
-    {
-      st = GNUNET_TIME_absolute_get_remaining (sender->timeout);
-      if (0 != st.rel_value_us)
-        break;
-      sender_destroy (sender);
-    }
-  }
-  delay = GNUNET_TIME_relative_min (rt, st);
-  if (delay.rel_value_us < GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us)
-    timeout_task = GNUNET_SCHEDULER_add_delayed (delay, &check_timeouts, NULL);
-}
-
-
-/**
- * Calculate cmac from master in @a ss.
- *
- * @param ss[in,out] data structure to complete
- */
-static void
-calculate_cmac (struct SharedSecret *ss)
-{
-  GNUNET_CRYPTO_hkdf (&ss->cmac,
-                      sizeof(ss->cmac),
-                      GCRY_MD_SHA512,
-                      GCRY_MD_SHA256,
-                      "CMAC",
-                      strlen ("CMAC"),
-                      &ss->master,
-                      sizeof(ss->master),
-                      "UDP-CMAC",
-                      strlen ("UDP-CMAC"),
-                      NULL,
-                      0);
-}
-
-
-/**
- * We received @a plaintext_len bytes of @a plaintext from a @a sender.
- * Pass it on to CORE.
- *
- * @param queue the queue that received the plaintext
- * @param plaintext the plaintext that was received
- * @param plaintext_len number of bytes of plaintext received
- */
-static void
-pass_plaintext_to_core (struct SenderAddress *sender,
-                        const void *plaintext,
-                        size_t plaintext_len)
-{
-  const struct GNUNET_MessageHeader *hdr = plaintext;
-  const char *pos = plaintext;
-
-  while (ntohs (hdr->size) <= plaintext_len)
-  {
-    GNUNET_STATISTICS_update (stats,
-                              "# bytes given to core",
-                              ntohs (hdr->size),
-                              GNUNET_NO);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Giving %u bytes to TNG\n", ntohs (hdr->size));
-    GNUNET_assert (GNUNET_SYSERR !=
-                   GNUNET_TRANSPORT_communicator_receive (ch,
-                                                          &sender->target,
-                                                          hdr,
-                                                          ADDRESS_VALIDITY_PERIOD,
-                                                          NULL /* no flow control possible */
-                                                          ,
-                                                          NULL));
-    /* move on to next message, if any */
-    plaintext_len -= ntohs (hdr->size);
-    if (plaintext_len < sizeof(*hdr))
-      break;
-    pos += ntohs (hdr->size);
-    hdr = (const struct GNUNET_MessageHeader *) pos;
-    // TODO for now..., we do not actually sen >1msg or have a way of telling
-    // if we are done
-    break;
-  }
-  GNUNET_STATISTICS_update (stats,
-                            "# bytes padding discarded",
-                            plaintext_len,
-                            GNUNET_NO);
-}
-
-
-/**
- * Setup @a cipher based on shared secret @a msec and
- * serial number @a serial.
- *
- * @param msec master shared secret
- * @param serial serial number of cipher to set up
- * @param cipher[out] cipher to initialize
- */
-static void
-setup_cipher (const struct GNUNET_HashCode *msec,
-              uint32_t serial,
-              gcry_cipher_hd_t *cipher)
-{
-  char key[AES_KEY_SIZE];
-  char iv[AES_IV_SIZE];
-  int rc;
-
-  GNUNET_assert (0 ==
-                 gcry_cipher_open (cipher,
-                                   GCRY_CIPHER_AES256 /* low level: go for speed */,
-                                   GCRY_CIPHER_MODE_GCM,
-                                   0 /* flags */));
-  get_iv_key (msec, serial, key, iv);
-  rc = gcry_cipher_setkey (*cipher, key, sizeof(key));
-  GNUNET_assert ((0 == rc) || ((char) rc == GPG_ERR_WEAK_KEY));
-  rc = gcry_cipher_setiv (*cipher, iv, sizeof(iv));
-  GNUNET_assert ((0 == rc) || ((char) rc == GPG_ERR_WEAK_KEY));
-}
-
-
-/**
- * Try to decrypt @a buf using shared secret @a ss and key/iv
- * derived using @a serial.
- *
- * @param ss shared secret
- * @param tag GCM authentication tag
- * @param serial serial number to use
- * @param in_buf input buffer to decrypt
- * @param in_buf_size number of bytes in @a in_buf and available in @a out_buf
- * @param out_buf where to write the result
- * @return #GNUNET_OK on success
- */
-static int
-try_decrypt (const struct SharedSecret *ss,
-             const char tag[GCM_TAG_SIZE],
-             uint32_t serial,
-             const char *in_buf,
-             size_t in_buf_size,
-             char *out_buf)
-{
-  gcry_cipher_hd_t cipher;
-
-  setup_cipher (&ss->master, serial, &cipher);
-  GNUNET_assert (
-    0 ==
-    gcry_cipher_decrypt (cipher, out_buf, in_buf_size, in_buf, in_buf_size));
-  if (0 != gcry_cipher_checktag (cipher, tag, GCM_TAG_SIZE))
-  {
-    gcry_cipher_close (cipher);
-    GNUNET_STATISTICS_update (stats,
-                              "# AEAD authentication failures",
-                              1,
-                              GNUNET_NO);
-    return GNUNET_SYSERR;
-  }
-  gcry_cipher_close (cipher);
-  return GNUNET_OK;
-}
-
-
-/**
- * Setup shared secret for decryption.
- *
- * @param ephemeral ephemeral key we received from the other peer
- * @return new shared secret
- */
-static struct SharedSecret *
-setup_shared_secret_dec (const struct GNUNET_CRYPTO_EcdhePublicKey *ephemeral)
-{
-  struct SharedSecret *ss;
-
-  ss = GNUNET_new (struct SharedSecret);
-  GNUNET_CRYPTO_eddsa_ecdh (my_private_key, ephemeral, &ss->master);
-  return ss;
-}
-
-
-/**
- * Setup shared secret for encryption.
- *
- * @param ephemeral ephemeral key we are sending to the other peer
- * @param receiver[in,out] queue to initialize encryption key for
- * @return new shared secret
- */
-static struct SharedSecret *
-setup_shared_secret_enc (const struct GNUNET_CRYPTO_EcdhePrivateKey *ephemeral,
-                         struct ReceiverAddress *receiver, int add_to_receiver)
-{
-  struct SharedSecret *ss;
-
-  ss = GNUNET_new (struct SharedSecret);
-  GNUNET_CRYPTO_ecdh_eddsa (ephemeral,
-                            &receiver->target.public_key,
-                            &ss->master);
-  calculate_cmac (ss);
-  ss->receiver = receiver;
-  GNUNET_CONTAINER_DLL_insert (receiver->ss_head, receiver->ss_tail, ss);
-  receiver->num_secrets++;
-  GNUNET_STATISTICS_update (stats, "# Secrets active", 1, GNUNET_NO);
-  return ss;
-}
-
-
-/**
- * Setup the MQ for the @a receiver.  If a queue exists,
- * the existing one is destroyed.  Then the MTU is
- * recalculated and a fresh queue is initialized.
- *
- * @param receiver receiver to setup MQ for
- */
-static void
-setup_receiver_mq (struct ReceiverAddress *receiver);
-
-/**
- * Destroying all secrets. Depending on parameter we keep those secrets having a kce.
- *
- * @param ss The secret we will not destroy.
- * @param withoutKce If GNUNET_YES shared secrets with kce will not be destroyed.
- */
-static void
-destroy_all_secrets (struct SharedSecret *ss, int withoutKce)
-{
-  struct SenderAddress *sender;
-  struct ReceiverAddress *receiver;
-  struct SharedSecret *ss_to_destroy;
-  struct SharedSecret *ss_start;
-  struct SharedSecret *pos;
-  int at_least_one_destroyed = GNUNET_NO;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Starting destroy all withoutKce: %u.\n",
-              withoutKce);
-
-  if (NULL != (sender = ss->sender))
-  {
-    ss_start = sender->ss_head;
-  }
-  else if (NULL != (receiver = ss->receiver))
-  {
-    ss_start = receiver->ss_head;
-  }
-  else
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Shared secret has no sender or receiver!\n");
-    return;
-  }
-
-  pos = ss_start;
-  while (NULL != pos)
-  {
-    ss_to_destroy = pos;
-    pos = pos->next;
-
-    if (ss != ss_to_destroy)
-      at_least_one_destroyed = secret_destroy (ss_to_destroy, withoutKce);
-  }
-
-  if ((ss != ss_start) && ! at_least_one_destroyed)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Really destroying all.\n");
-    destroy_all_secrets (ss_start, GNUNET_NO);
-  }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Finished destroy all.\n");
-}
-
-
-static void
-add_acks (struct SharedSecret *ss, int acks_to_add)
-{
-
-  struct ReceiverAddress *receiver = ss->receiver;
-
-  GNUNET_assert (NULL != ss);
-  GNUNET_assert (NULL != receiver);
-
-  if (NULL == receiver->d_qh)
-  {
-    receiver->d_qh =
-      GNUNET_TRANSPORT_communicator_mq_add (ch,
-                                            &receiver->target,
-                                            receiver->foreign_addr,
-                                            receiver->d_mtu,
-                                            acks_to_add,
-                                            1, /* Priority */
-                                            receiver->nt,
-                                            GNUNET_TRANSPORT_CS_OUTBOUND,
-                                            receiver->d_mq);
-  }
-  else
-  {
-    GNUNET_TRANSPORT_communicator_mq_update (ch,
-                                             receiver->d_qh,
-                                             acks_to_add,
-                                             1);
-  }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Tell transport we have %u more acks!\n",
-              acks_to_add);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "%u kce for rekeying.\n",
-              receiver->number_rekeying_kce);
-
-  // Until here for alternativ 1
-
-  /* move ss to head to avoid discarding it anytime soon! */
-
-  GNUNET_CONTAINER_DLL_remove (receiver->ss_head, receiver->ss_tail, ss);
-  GNUNET_CONTAINER_DLL_insert (receiver->ss_head, receiver->ss_tail, ss);
-  destroy_all_secrets (ss, GNUNET_YES);
-}
-
-
-static uint32_t
-reset_rekey_kces (struct ReceiverAddress *receiver,
-                  uint32_t acks_to_add)
-{
-  int needed_for_rekeying;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "%u kce for rekeying and %u acks_to_add\n",
-              receiver->number_rekeying_kce,
-              acks_to_add);
-
-  needed_for_rekeying = (3 - receiver->number_rekeying_kce);
-  if (acks_to_add <= needed_for_rekeying)
-  {
-    receiver->number_rekeying_kce += acks_to_add;
-    acks_to_add = 0;
-  }
-  else
-  {
-    acks_to_add -= (3 - receiver->number_rekeying_kce);
-    receiver->number_rekeying_kce = 3;
-  }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "%u kce for rekeying and %u acks_to_add\n",
-              receiver->number_rekeying_kce,
-              acks_to_add);
-  return acks_to_add;
-}
-
-
-static void
-add_acks_rekey (struct ReceiverAddress *receiver)
-{
-  uint32_t acks_to_add = receiver->ss_rekey->sequence_allowed;
-
-  if (receiver->number_rekeying_kce < 3)
-    acks_to_add = reset_rekey_kces (receiver, acks_to_add);
-  receiver->acks_available = receiver->ss_rekey->sequence_allowed;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "%u receiver->acks_available 4\n",
-              receiver->acks_available);
-  /* add_acks (receiver->ss_rekey, acks_to_add - 3); */
-  if (0 != acks_to_add)
-  {
-    add_acks (receiver->ss_rekey, acks_to_add);
-  }
-  receiver->ss_rekey = NULL;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "# rekeying successful\n");
-  GNUNET_STATISTICS_update (stats,
-                            "# rekeying successful",
-                            1,
-                            GNUNET_NO);
-}
-
-
-/**
- * We received an ACK for @a pid. Check if it is for
- * the receiver in @a value and if so, handle it and
- * return #GNUNET_NO. Otherwise, return #GNUNET_YES.
- *
- * @param cls a `const struct UDPAck`
- * @param pid peer the ACK is from
- * @param value a `struct ReceiverAddress`
- * @return #GNUNET_YES to continue to iterate
- */
-static int
-handle_ack (void *cls, const struct GNUNET_PeerIdentity *pid, void *value)
-{
-  const struct UDPAck *ack = cls;
-  struct ReceiverAddress *receiver = value;
-  uint32_t acks_to_add;
-  uint32_t allowed;
-  // int needed_for_rekeying;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "in handle ack with cmac %s\n",
-              GNUNET_h2s (&ack->cmac));
-
-  if (NULL != receiver->ss_rekey)
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "We have rekey secret with cmac %s \n",
-                GNUNET_h2s (&receiver->ss_rekey->cmac));
-
-  if ((NULL != receiver->ss_rekey) && (0 == memcmp (&ack->cmac,
-                                                    &receiver->ss_rekey->cmac,
-                                                    sizeof(struct
-                                                           GNUNET_HashCode))) )
-  {
-    allowed = ntohl (ack->sequence_max);
-
-    if (allowed > receiver->ss_rekey->sequence_allowed)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "%u > %u (%u %u) for rekey secrect %s\n", allowed,
-                  receiver->ss_rekey->sequence_allowed,
-                  receiver->acks_available,
-                  ack->acks_available,
-                  GNUNET_h2s (&receiver->ss_rekey->master));
-
-      receiver->ss_rekey->sequence_allowed = allowed;
-
-      if (GNUNET_NO == receiver->rekeying)
-        add_acks_rekey (receiver);
-
-      return GNUNET_NO;
-    }
-  }
-
-  (void) pid;
-  for (struct SharedSecret *ss = receiver->ss_head; NULL != ss; ss = ss->next)
-  {
-    if (0 == memcmp (&ack->cmac, &ss->cmac, sizeof(struct GNUNET_HashCode)))
-    {
-
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Found matching mac\n");
-
-      allowed = ntohl (ack->sequence_max);
-
-      if (allowed > ss->sequence_allowed)
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                    "%u > %u (%u %u) for secrect %s\n", allowed,
-                    ss->sequence_allowed,
-                    receiver->acks_available,
-                    ack->acks_available,
-                    GNUNET_h2s (&ss->master));
-        // Uncomment this for alternativ 1 of backchannel functionality
-        acks_to_add = (allowed - ss->sequence_allowed);
-        if ((GNUNET_NO == receiver->rekeying) &&
-            (receiver->number_rekeying_kce < 3) )
-          acks_to_add = reset_rekey_kces (receiver, acks_to_add);
-        /* if ((GNUNET_NO == receiver->rekeying) && */
-        /*     (receiver->number_rekeying_kce < */
-        /*      3) ) */
-        /* { */
-        /*   needed_for_rekeying = (3 - receiver->number_rekeying_kce); */
-        /*   if (acks_to_add <= needed_for_rekeying) */
-        /*   { */
-        /*     receiver->number_rekeying_kce += acks_to_add; */
-        /*     acks_to_add = 0; */
-        /*   } */
-        /*   else */
-        /*   { */
-        /*     acks_to_add -= (3 - receiver->number_rekeying_kce); */
-        /*     receiver->number_rekeying_kce = 3; */
-        /*   } */
-        /* } */
-        /* GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, */
-        /*             "%u kce for rekeying\n", */
-        /*             receiver->number_rekeying_kce); */
-
-        if ((0 != acks_to_add) && (GNUNET_NO == receiver->rekeying))
-        {
-          receiver->acks_available += (allowed - ss->sequence_allowed);
-          ss->sequence_allowed = allowed;
-          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                      "%u receiver->acks_available 5\n",
-                      receiver->acks_available);
-          add_acks (ss, acks_to_add);
-        }
-      }
-      return GNUNET_NO;
-    }
-  }
-  return GNUNET_YES;
-}
-
-
-/**
- * Test if we have received a valid message in plaintext.
- * If so, handle it.
- *
- * @param sender peer to process inbound plaintext for
- * @param buf buffer we received
- * @param buf_size number of bytes in @a buf
- */
-static void
-try_handle_plaintext (struct SenderAddress *sender,
-                      const void *buf,
-                      size_t buf_size)
-{
-  const struct GNUNET_MessageHeader *hdr =
-    (const struct GNUNET_MessageHeader *) buf;
-  const struct UDPAck *ack = (const struct UDPAck *) buf;
-  uint16_t type;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "try_handle_plaintext of size %u (%u %u) and type %u\n",
-              buf_size,
-              ntohs (hdr->size),
-              sizeof(*hdr),
-              ntohs (hdr->type));
-  if (sizeof(*hdr) > buf_size)
-    return; /* not even a header */
-  if (ntohs (hdr->size) > buf_size)
-    return; /* not even a header */
-  type = ntohs (hdr->type);
-  switch (type)
-  {
-  case GNUNET_MESSAGE_TYPE_COMMUNICATOR_UDP_ACK:
-    /* lookup master secret by 'cmac', then update sequence_max */
-    GNUNET_CONTAINER_multipeermap_get_multiple (receivers,
-                                                &sender->target,
-                                                &handle_ack,
-                                                (void *) ack);
-    /* There could be more messages after the ACK, handle those as well */
-    buf += ntohs (hdr->size);
-    buf_size -= ntohs (hdr->size);
-    pass_plaintext_to_core (sender, buf, buf_size);
-    break;
-
-  case GNUNET_MESSAGE_TYPE_COMMUNICATOR_UDP_PAD:
-    /* skip padding */
-    break;
-
-  default:
-    pass_plaintext_to_core (sender, buf, buf_size);
-  }
-}
-
-
-static void
-kce_generate_cb (void *cls)
-{
-  struct SharedSecret *ss = cls;
-
-  ss->sender->kce_task = NULL;
-
-  if (((GNUNET_NO == ss->sender->rekeying) && (ss->sender->acks_available <
-                                               KCN_TARGET) ) ||
-      ((ss->sender->ss_rekey == ss) && (GNUNET_YES == ss->sender->rekeying) &&
-       (ss->sender->acks_available < KCN_TARGET)))
-  {
-
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Precomputing keys for master %s\n",
-                GNUNET_h2s (&(ss->master)));
-
-    for (int i = 0; i < GENERATE_AT_ONCE; i++)
-      kce_generate (ss, ++ss->sequence_allowed);
-
-    if (KCN_TARGET > ss->sender->acks_available)
-    {
-      ss->sender->kce_task = GNUNET_SCHEDULER_add_delayed (
-        WORKING_QUEUE_INTERVALL,
-        kce_generate_cb,
-        ss);
-    }
-    else
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "We have enough keys.\n");
-      ss_finished = ss;
-      ss->sender->kce_task_finished = GNUNET_YES;
-    }
-  }
-
-
-
-}
-
-
-static void
-kce_generate_rekey_cb (void *cls)
-{
-  struct SharedSecret *ss = cls;
-
-  ss->sender->kce_task_rekey = NULL;
-
-  if (NULL == ss->sender->kce_task)
-  {
-
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Precomputing keys for rekey master %s\n",
-                GNUNET_h2s (&(ss->master)));
-
-    for (int i = 0; i < GENERATE_AT_ONCE; i++)
-      kce_generate (ss, ++ss->sequence_allowed);
-
-    ss->sender->kce_task = GNUNET_SCHEDULER_add_delayed (
-      WORKING_QUEUE_INTERVALL,
-      kce_generate_cb,
-      ss);
-    ss->sender->kce_task_rekey = NULL;
-  }
-  else
-  {
-    ss->sender->kce_task_rekey = GNUNET_SCHEDULER_add_delayed (
-      WORKING_QUEUE_INTERVALL,
-      kce_generate_rekey_cb,
-      ss);
-  }
-}
-
-
-/**
- * We established a shared secret with a sender. We should try to send
- * the sender an `struct UDPAck` at the next opportunity to allow the
- * sender to use @a ss longer (assuming we did not yet already
- * recently).
- *
- * @param ss shared secret to generate ACKs for
- * @param initial The SharedSecret came with initial KX.
- */
-static void
-consider_ss_ack (struct SharedSecret *ss, int initial)
-{
-  struct GNUNET_SCHEDULER_Task *kce_task_rekey;
-  struct GNUNET_SCHEDULER_Task *kce_task;
-  int kce_task_finished;
-
-  kce_task_rekey = ss->sender->kce_task_rekey;
-  kce_task_finished = ss->sender->kce_task_finished;
-  kce_task = ss->sender->kce_task;
-
-  GNUNET_assert (NULL != ss->sender);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Considering SS UDPAck %s\n",
-              GNUNET_i2s_full (&ss->sender->target));
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "We have %u acks available.\n",
-              ss->sender->acks_available);
-  /* drop ancient KeyCacheEntries */
-  while ((NULL != ss->kce_head) &&
-         (MAX_SQN_DELTA <
-          ss->kce_head->sequence_number - ss->kce_tail->sequence_number))
-    kce_destroy (ss->kce_tail);
-
-
-  if (GNUNET_NO == initial)
-    kce_generate (ss, ++ss->sequence_allowed);
-
-  /*if (0 == ss->sender->acks_available)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Generating keys\n");
-    while (ss->active_kce_count < KCN_TARGET)
-      kce_generate (ss, ++ss->sequence_allowed);
-      }*/
-
-  if (NULL != kce_task)
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "kce_task is not NULL\n");
-  if (kce_task_finished)
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "kce_task_finished: GNUNET_YES\n");
-  if (initial)
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "initial: GNUNET_YES\n");
-
-  if ( kce_task_finished || (GNUNET_NO == initial))
-  {
-    struct UDPAck ack;
-    struct SharedSecret *ss_tell;
-
-    if (GNUNET_NO != initial)
-      ss_tell = ss_finished;
-    else
-      ss_tell = ss;
-
-    ack.header.type = htons (GNUNET_MESSAGE_TYPE_COMMUNICATOR_UDP_ACK);
-    ack.header.size = htons (sizeof(ack));
-    ack.sequence_max = htonl (ss_tell->sequence_allowed);
-    ack.acks_available = ss->sender->acks_available;
-    ack.cmac = ss_tell->cmac;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Notifying transport of UDPAck %s with initial %u and master %s\n",
-                GNUNET_i2s_full (&ss_tell->sender->target),
-                initial,
-                GNUNET_h2s (&(ss_tell->master)));
-    GNUNET_TRANSPORT_communicator_notify (ch,
-                                          &ss_tell->sender->target,
-                                          COMMUNICATOR_ADDRESS_PREFIX,
-                                          &ack.header);
-    if (GNUNET_NO != initial)
-    {
-      destroy_all_secrets (ss, GNUNET_YES);
-      ss->sender->kce_task_finished = GNUNET_NO;
-    }
-  }
-  else if ((NULL == kce_task) && ((KCN_THRESHOLD >
-                                   ss->sender->acks_available) ||
-                                  (GNUNET_YES == ss->sender->rekeying) ||
-                                  (ss->sender->num_secrets > MAX_SECRETS) ))
-  {
-
-    // kce_generate (ss, ++ss->sequence_allowed);
-    // kce_generate (ss, ++ss->sequence_allowed);
-    // TODO This task must be per sender!
-    kce_task = GNUNET_SCHEDULER_add_delayed (WORKING_QUEUE_INTERVALL,
-                                             kce_generate_cb,
-                                             ss);
-    kce_task_finished = GNUNET_NO;
-
-  }
-  else if ((NULL == kce_task_rekey) && (GNUNET_YES ==
-                                        ss->sender->rekeying) )
-  {
-    kce_task_rekey = GNUNET_SCHEDULER_add_delayed (WORKING_QUEUE_INTERVALL,
-                                                   kce_generate_rekey_cb,
-                                                   ss);
-  }
-}
-
-
-/**
- * We received a @a box with matching @a kce.  Decrypt and process it.
- *
- * @param box the data we received
- * @param box_len number of bytes in @a box
- * @param kce key index to decrypt @a box
- */
-static void
-decrypt_box (const struct UDPBox *box,
-             size_t box_len,
-             struct KeyCacheEntry *kce)
-{
-  struct SharedSecret *ss = kce->ss;
-  char out_buf[box_len - sizeof(*box)];
-
-  GNUNET_assert (NULL != ss->sender);
-  if (GNUNET_OK != try_decrypt (ss,
-                                box->gcm_tag,
-                                kce->sequence_number,
-                                (const char *) &box[1],
-                                sizeof(out_buf),
-                                out_buf))
-  {
-    GNUNET_STATISTICS_update (stats,
-                              "# Decryption failures with valid KCE",
-                              1,
-                              GNUNET_NO);
-    kce_destroy (kce);
-    return;
-  }
-  kce_destroy (kce);
-  GNUNET_STATISTICS_update (stats,
-                            "# bytes decrypted with BOX",
-                            sizeof(out_buf),
-                            GNUNET_NO);
-  GNUNET_STATISTICS_update (stats,
-                            "# messages decrypted with BOX",
-                            1,
-                            GNUNET_NO);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "decrypted UDPBox with kid %s\n",
-              GNUNET_sh2s (&box->kid));
-  try_handle_plaintext (ss->sender, out_buf, sizeof(out_buf));
-  if ((GNUNET_NO == box->rekeying) && (GNUNET_YES == ss->sender->rekeying))
-  {
-    ss->sender->rekeying = GNUNET_NO;
-    ss->sender->ss_rekey = NULL;
-    // destroy_all_secrets (ss, GNUNET_NO);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Receiver stopped rekeying.\n");
-  }
-  else if (GNUNET_NO == box->rekeying)
-    consider_ss_ack (ss, GNUNET_NO);
-  else
-  {
-    ss->sender->rekeying = GNUNET_YES;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Got Box: Receiver doing rekeying.\n");
-  }
-}
-
-
-/**
- * We received a @a rekey with matching @a kce.  Decrypt and process it.
- *
- * @param rekey the data we received
- * @param rekey_len number of bytes in @a rekey
- * @param kce key index to decrypt @a rekey
- */
-static void
-decrypt_rekey (const struct UDPRekey *rekey,
-               size_t rekey_len,
-               struct KeyCacheEntry *kce,
-               struct SenderAddress *sender)
-{
-  struct SharedSecret *ss = kce->ss;
-  struct SharedSecret *ss_rekey;
-  char out_buf[rekey_len - sizeof(*rekey)];
-  struct GNUNET_HashCode *master;
-
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "decrypt_rekey.\n");
-
-  GNUNET_assert (NULL != ss->sender);
-  if (GNUNET_OK != try_decrypt (ss,
-                                rekey->gcm_tag,
-                                kce->sequence_number,
-                                (const char *) &rekey[1],
-                                sizeof(out_buf),
-                                out_buf))
-  {
-    GNUNET_STATISTICS_update (stats,
-                              "# Decryption failures with valid KCE",
-                              1,
-                              GNUNET_NO);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Decryption with kid %s failed\n",
-                GNUNET_sh2s (&rekey->kid));
-    kce_destroy (kce);
-    return;
-  }
-  kce_destroy (kce);
-  GNUNET_STATISTICS_update (stats,
-                            "# bytes decrypted with Rekey",
-                            sizeof(out_buf),
-                            GNUNET_NO);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "decrypted UDPRekey with kid %s\n",
-              GNUNET_sh2s (&rekey->kid));
-  /*cmac = (struct GNUNET_HashCode *) out_buf;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received secret with cmac %s \n",
-              GNUNET_h2s (&cmac));*/
-  // ss_rekey = (struct SharedSecret *) out_buf;
-  master = (struct GNUNET_HashCode *) out_buf;
-  ss_rekey = GNUNET_new (struct SharedSecret);
-  ss_rekey->master = *master;
-  calculate_cmac (ss_rekey);
-  ss_rekey->sender = sender;
-  // ss_rekey->sequence_used = 0;
-  // ss_rekey->sequence_allowed = 0;
-  /* ss_rekey->active_kce_count = 0; */
-  /* ss_rekey->prev = NULL; */
-  /* ss_rekey->next = NULL; */
-  /* GNUNET_assert (ss_rekey->prev == NULL && sender->ss_head != ss_rekey); */
-  /* GNUNET_assert (ss_rekey->next == NULL && sender->ss_tail != ss_rekey); */
-  GNUNET_CONTAINER_DLL_insert (sender->ss_head, sender->ss_tail, ss_rekey);
-  sender->ss_rekey = ss_rekey;
-  sender->num_secrets++;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received secret with cmac %s\n",
-              GNUNET_h2s (&(ss_rekey->cmac)));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received secret with master %s.\n",
-              GNUNET_h2s (&(ss_rekey->master)));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "We have %u sequence_allowed.\n",
-              ss_rekey->sequence_allowed);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "We have a sender %p\n",
-              ss_rekey->sender);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "We have %u acks available.\n",
-              ss_rekey->sender->acks_available);
-  consider_ss_ack (ss_rekey, GNUNET_YES);
-
-}
-
-
-/**
- * Closure for #find_sender_by_address()
- */
-struct SearchContext
-{
-  /**
-   * Address we are looking for.
-   */
-  const struct sockaddr *address;
-
-  /**
-   * Number of bytes in @e address.
-   */
-  socklen_t address_len;
-
-  /**
-   * Return value to set if we found a match.
-   */
-  struct SenderAddress *sender;
-};
-
-
-/**
- * Find existing `struct SenderAddress` by matching addresses.
- *
- * @param cls a `struct SearchContext`
- * @param key ignored, must match already
- * @param value a `struct SenderAddress`
- * @return #GNUNET_YES if not found (continue to search), #GNUNET_NO if found
- */
-static int
-find_sender_by_address (void *cls,
-                        const struct GNUNET_PeerIdentity *key,
-                        void *value)
-{
-  struct SearchContext *sc = cls;
-  struct SenderAddress *sender = value;
-
-  if ((sender->address_len == sc->address_len) &&
-      (0 == memcmp (sender->address, sc->address, sender->address_len)))
-  {
-    sc->sender = sender;
-    return GNUNET_NO;   /* stop iterating! */
-  }
-  return GNUNET_YES;
-}
-
-
-/**
- * Create sender address for @a target.  Note that we
- * might already have one, so a fresh one is only allocated
- * if one does not yet exist for @a address.
- *
- * @param target peer to generate address for
- * @param address target address
- * @param address_len number of bytes in @a address
- * @return data structure to keep track of key material for
- *         decrypting data from @a target
- */
-static struct SenderAddress *
-setup_sender (const struct GNUNET_PeerIdentity *target,
-              const struct sockaddr *address,
-              socklen_t address_len)
-{
-  struct SenderAddress *sender;
-  struct SearchContext sc = { .address = address,
-                              .address_len = address_len,
-                              .sender = NULL };
-
-  GNUNET_CONTAINER_multipeermap_get_multiple (senders,
-                                              target,
-                                              &find_sender_by_address,
-                                              &sc);
-  if (NULL != sc.sender)
-  {
-    reschedule_sender_timeout (sc.sender);
-    return sc.sender;
-  }
-  sender = GNUNET_new (struct SenderAddress);
-  sender->target = *target;
-  sender->address = GNUNET_memdup (address, address_len);
-  sender->address_len = address_len;
-  (void) GNUNET_CONTAINER_multipeermap_put (
-    senders,
-    &sender->target,
-    sender,
-    GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-  GNUNET_STATISTICS_set (stats,
-                         "# senders active",
-                         GNUNET_CONTAINER_multipeermap_size (receivers),
-                         GNUNET_NO);
-  sender->timeout =
-    GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
-  sender->hn = GNUNET_CONTAINER_heap_insert (senders_heap,
-                                             sender,
-                                             sender->timeout.abs_value_us);
-  sender->nt = GNUNET_NT_scanner_get_type (is, address, address_len);
-  if (NULL == timeout_task)
-    timeout_task = GNUNET_SCHEDULER_add_now (&check_timeouts, NULL);
-  return sender;
-}
-
-
-/**
- * Check signature from @a uc against @a ephemeral.
- *
- * @param ephermal key that is signed
- * @param uc signature of claimant
- * @return #GNUNET_OK if signature is valid
- */
-static int
-verify_confirmation (const struct GNUNET_CRYPTO_EcdhePublicKey *ephemeral,
-                     const struct UDPConfirmation *uc)
-{
-  struct UdpHandshakeSignature uhs;
-
-  uhs.purpose.purpose = htonl (
-    GNUNET_SIGNATURE_PURPOSE_COMMUNICATOR_UDP_HANDSHAKE);
-  uhs.purpose.size = htonl (sizeof(uhs));
-  uhs.sender = uc->sender;
-  uhs.receiver = my_identity;
-  uhs.ephemeral = *ephemeral;
-  uhs.monotonic_time = uc->monotonic_time;
-  return GNUNET_CRYPTO_eddsa_verify (
-    GNUNET_SIGNATURE_PURPOSE_COMMUNICATOR_UDP_HANDSHAKE,
-    &uhs,
-    &uc->sender_sig,
-    &uc->sender.public_key);
-}
-
-
-/**
- * Converts @a address to the address string format used by this
- * communicator in HELLOs.
- *
- * @param address the address to convert, must be AF_INET or AF_INET6.
- * @param address_len number of bytes in @a address
- * @return string representation of @a address
- */
-static char *
-sockaddr_to_udpaddr_string (const struct sockaddr *address,
-                            socklen_t address_len)
-{
-  char *ret;
-
-  switch (address->sa_family)
-  {
-  case AF_INET:
-    GNUNET_asprintf (&ret,
-                     "%s-%s",
-                     COMMUNICATOR_ADDRESS_PREFIX,
-                     GNUNET_a2s (address, address_len));
-    break;
-
-  case AF_INET6:
-    GNUNET_asprintf (&ret,
-                     "%s-%s",
-                     COMMUNICATOR_ADDRESS_PREFIX,
-                     GNUNET_a2s (address, address_len));
-    break;
-
-  default:
-    GNUNET_assert (0);
-  }
-  return ret;
-}
-
-
-/**
- * Socket read task.
- *
- * @param cls NULL
- */
-static void
-sock_read (void *cls)
-{
-  struct sockaddr_storage sa;
-  struct sockaddr_in *addr_verify;
-  socklen_t salen = sizeof(sa);
-  char buf[UINT16_MAX];
-  ssize_t rcvd;
-
-  (void) cls;
-  read_task = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
-                                             udp_sock,
-                                             &sock_read,
-                                             NULL);
-  rcvd = GNUNET_NETWORK_socket_recvfrom (udp_sock,
-                                         buf,
-                                         sizeof(buf),
-                                         (struct sockaddr *) &sa,
-                                         &salen);
-  if (-1 == rcvd)
-  {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_DEBUG, "recv");
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Read %lu bytes\n", rcvd);
-
-  if (rcvd > sizeof(struct UDPRekey))
-  {
-    const struct UDPRekey *rekey;
-    const struct UDPBox *box;
-    struct KeyCacheEntry *kce;
-    struct SenderAddress *sender;
-    int do_decrypt = GNUNET_NO;
-
-    rekey = (const struct UDPRekey *) buf;
-    box = (const struct UDPBox *) buf;
-    kce = GNUNET_CONTAINER_multishortmap_get (key_cache, &rekey->kid);
-
-    if ((GNUNET_YES == box->rekeying) || (GNUNET_NO == box->rekeying))
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "UDPRekey has rekeying %u\n",
-                  box->rekeying);
-    else
-      do_decrypt = GNUNET_YES;
-
-    if ((GNUNET_YES == do_decrypt) && (NULL != kce) && (GNUNET_YES ==
-                                                        kce->ss->sender->
-                                                        rekeying))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "UDPRekey with kid %s\n",
-                  GNUNET_sh2s (&rekey->kid));
-      sender = setup_sender (&rekey->sender, (const struct sockaddr *) &sa,
-                             salen);
-
-      if (NULL != sender->ss_rekey)
-        return;
-
-      decrypt_rekey (rekey, (size_t) rcvd, kce, sender);
-      return;
-    }
-  }
-
-  /* first, see if it is a UDPBox */
-  if (rcvd > sizeof(struct UDPBox))
-  {
-    const struct UDPBox *box;
-    struct KeyCacheEntry *kce;
-
-    box = (const struct UDPBox *) buf;
-    kce = GNUNET_CONTAINER_multishortmap_get (key_cache, &box->kid);
-    if (NULL != kce)
-    {
-      decrypt_box (box, (size_t) rcvd, kce);
-      return;
-    }
-  }
-
-  /* next, check if it is a broadcast */
-  if (sizeof(struct UDPBroadcast) == rcvd)
-  {
-    const struct UDPBroadcast *ub;
-    struct UdpBroadcastSignature uhs;
-    struct GNUNET_PeerIdentity sender;
-
-    addr_verify = GNUNET_memdup (&sa, salen);
-    addr_verify->sin_port = 0;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "received UDPBroadcast from %s\n",
-                GNUNET_a2s ((const struct sockaddr *) addr_verify, salen));
-    ub = (const struct UDPBroadcast *) buf;
-    uhs.purpose.purpose = htonl (
-      GNUNET_SIGNATURE_PURPOSE_COMMUNICATOR_UDP_BROADCAST);
-    uhs.purpose.size = htonl (sizeof(uhs));
-    uhs.sender = ub->sender;
-    sender = ub->sender;
-    if (0 == memcmp (&sender, &my_identity, sizeof (struct
-                                                    GNUNET_PeerIdentity)))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Received our own broadcast\n");
-      return;
-    }
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "checking UDPBroadcastSignature for %s\n",
-                GNUNET_i2s (&sender));
-    GNUNET_CRYPTO_hash ((struct sockaddr *) addr_verify, salen, &uhs.h_address);
-    if (GNUNET_OK ==
-        GNUNET_CRYPTO_eddsa_verify (
-          GNUNET_SIGNATURE_PURPOSE_COMMUNICATOR_UDP_BROADCAST,
-          &uhs,
-          &ub->sender_sig,
-          &ub->sender.public_key))
-    {
-      char *addr_s;
-      enum GNUNET_NetworkType nt;
-
-      addr_s =
-        sockaddr_to_udpaddr_string ((const struct sockaddr *) &sa, salen);
-      GNUNET_STATISTICS_update (stats, "# broadcasts received", 1, GNUNET_NO);
-      /* use our own mechanism to determine network type */
-      nt =
-        GNUNET_NT_scanner_get_type (is, (const struct sockaddr *) &sa, salen);
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "validating address %s received from UDPBroadcast\n",
-                  GNUNET_i2s (&sender));
-      GNUNET_TRANSPORT_application_validate (ah, &sender, nt, addr_s);
-      GNUNET_free (addr_s);
-      return;
-    }
-    else
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "VerifyingPeer %s is verifying UDPBroadcast\n",
-                  GNUNET_i2s (&my_identity));
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Verifying UDPBroadcast from %s failed\n",
-                  GNUNET_i2s (&ub->sender));
-    }
-    GNUNET_free (addr_verify);
-    /* continue with KX, mostly for statistics... */
-  }
-
-
-  /* finally, test if it is a KX */
-  if (rcvd < sizeof(struct UDPConfirmation) + sizeof(struct InitialKX))
-  {
-    GNUNET_STATISTICS_update (stats,
-                              "# messages dropped (no kid, too small for KX)",
-                              1,
-                              GNUNET_NO);
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Got KX\n");
-  {
-    const struct InitialKX *kx;
-    struct SharedSecret *ss;
-    char pbuf[rcvd - sizeof(struct InitialKX)];
-    const struct UDPConfirmation *uc;
-    struct SenderAddress *sender;
-
-    kx = (const struct InitialKX *) buf;
-    ss = setup_shared_secret_dec (&kx->ephemeral);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Before DEC\n");
-
-    if (GNUNET_OK != try_decrypt (ss,
-                                  kx->gcm_tag,
-                                  0,
-                                  &buf[sizeof(*kx)],
-                                  sizeof(pbuf),
-                                  pbuf))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Unable to decrypt tag, dropping...\n");
-      GNUNET_free (ss);
-      GNUNET_STATISTICS_update (
-        stats,
-        "# messages dropped (no kid, AEAD decryption failed)",
-        1,
-        GNUNET_NO);
-      return;
-    }
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Before VERIFY\n");
-
-    uc = (const struct UDPConfirmation *) pbuf;
-    if (GNUNET_OK != verify_confirmation (&kx->ephemeral, uc))
-    {
-      GNUNET_break_op (0);
-      GNUNET_free (ss);
-      GNUNET_STATISTICS_update (stats,
-                                "# messages dropped (sender signature invalid)",
-                                1,
-                                GNUNET_NO);
-      return;
-    }
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Before SETUP_SENDER\n");
-
-    calculate_cmac (ss);
-    sender = setup_sender (&uc->sender, (const struct sockaddr *) &sa, salen);
-    ss->sender = sender;
-    GNUNET_CONTAINER_DLL_insert (sender->ss_head, sender->ss_tail, ss);
-    sender->num_secrets++;
-    GNUNET_STATISTICS_update (stats, "# Secrets active", 1, GNUNET_NO);
-    GNUNET_STATISTICS_update (stats,
-                              "# messages decrypted without BOX",
-                              1,
-                              GNUNET_NO);
-    try_handle_plaintext (sender, &uc[1], sizeof(pbuf) - sizeof(*uc));
-    if ((GNUNET_NO == kx->rekeying) && (GNUNET_YES == ss->sender->rekeying))
-    {
-      ss->sender->rekeying = GNUNET_NO;
-      sender->ss_rekey = NULL;
-      // destroy_all_secrets (ss, GNUNET_NO);
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Receiver stopped rekeying.\n");
-    }
-    else if (GNUNET_NO == kx->rekeying)
-      consider_ss_ack (ss, GNUNET_YES);
-    else
-    {
-      ss->sender->rekeying = GNUNET_YES;
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Got KX: Receiver doing rekeying.\n");
-    }
-    /*if (sender->num_secrets > MAX_SECRETS)
-      secret_destroy (sender->ss_tail);*/
-  }
-}
-
-
-/**
- * Convert UDP bind specification to a `struct sockaddr *`
- *
- * @param bindto bind specification to convert
- * @param[out] sock_len set to the length of the address
- * @return converted bindto specification
- */
-static struct sockaddr *
-udp_address_to_sockaddr (const char *bindto, socklen_t *sock_len)
-{
-  struct sockaddr *in;
-  unsigned int port;
-  char dummy[2];
-  char *colon;
-  char *cp;
-
-  if (1 == sscanf (bindto, "%u%1s", &port, dummy))
-  {
-    /* interpreting value as just a PORT number */
-    if (port > UINT16_MAX)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "BINDTO specification `%s' invalid: value too large for port\n",
-                  bindto);
-      return NULL;
-    }
-    if ((GNUNET_NO == GNUNET_NETWORK_test_pf (PF_INET6)) ||
-        (GNUNET_YES ==
-         GNUNET_CONFIGURATION_get_value_yesno (cfg,
-                                               COMMUNICATOR_CONFIG_SECTION,
-                                               "DISABLE_V6")))
-    {
-      struct sockaddr_in *i4;
-
-      i4 = GNUNET_malloc (sizeof(struct sockaddr_in));
-      i4->sin_family = AF_INET;
-      i4->sin_port = htons ((uint16_t) port);
-      *sock_len = sizeof(struct sockaddr_in);
-      in = (struct sockaddr *) i4;
-    }
-    else
-    {
-      struct sockaddr_in6 *i6;
-
-      i6 = GNUNET_malloc (sizeof(struct sockaddr_in6));
-      i6->sin6_family = AF_INET6;
-      i6->sin6_port = htons ((uint16_t) port);
-      *sock_len = sizeof(struct sockaddr_in6);
-      in = (struct sockaddr *) i6;
-    }
-    return in;
-  }
-  cp = GNUNET_strdup (bindto);
-  colon = strrchr (cp, ':');
-  if (NULL != colon)
-  {
-    /* interpret value after colon as port */
-    *colon = '\0';
-    colon++;
-    if (1 == sscanf (colon, "%u%1s", &port, dummy))
-    {
-      /* interpreting value as just a PORT number */
-      if (port > UINT16_MAX)
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    "BINDTO specification `%s' invalid: value too large for port\n",
-                    bindto);
-        GNUNET_free (cp);
-        return NULL;
-      }
-    }
-    else
-    {
-      GNUNET_log (
-        GNUNET_ERROR_TYPE_ERROR,
-        "BINDTO specification `%s' invalid: last ':' not followed by number\n",
-        bindto);
-      GNUNET_free (cp);
-      return NULL;
-    }
-  }
-  else
-  {
-    /* interpret missing port as 0, aka pick any free one */
-    port = 0;
-  }
-  {
-    /* try IPv4 */
-    struct sockaddr_in v4;
-    if (1 == inet_pton (AF_INET, cp, &v4.sin_addr))
-    {
-      v4.sin_family = AF_INET;
-      v4.sin_port = htons ((uint16_t) port);
-#if HAVE_SOCKADDR_IN_SIN_LEN
-      v4.sin_len = sizeof(struct sockaddr_in);
-#endif
-      in = GNUNET_memdup (&v4, sizeof(struct sockaddr_in));
-      *sock_len = sizeof(struct sockaddr_in);
-      GNUNET_free (cp);
-      return in;
-    }
-  }
-  {
-    /* try IPv6 */
-    struct sockaddr_in6 v6;
-    const char *start;
-
-    start = cp;
-    if (('[' == *cp) && (']' == cp[strlen (cp) - 1]))
-    {
-      start++;   /* skip over '[' */
-      cp[strlen (cp) - 1] = '\0';  /* eat ']' */
-    }
-    if (1 == inet_pton (AF_INET6, start, &v6.sin6_addr))
-    {
-      v6.sin6_family = AF_INET6;
-      v6.sin6_port = htons ((uint16_t) port);
-#if HAVE_SOCKADDR_IN_SIN_LEN
-      v6.sin6_len = sizeof(sizeof(struct sockaddr_in6));
-#endif
-      in = GNUNET_memdup (&v6, sizeof(v6));
-      *sock_len = sizeof(v6);
-      GNUNET_free (cp);
-      return in;
-    }
-  }
-  /* #5528 FIXME (feature!): maybe also try getnameinfo()? */
-  GNUNET_free (cp);
-  return NULL;
-}
-
-
-/**
- * Pad @a dgram by @a pad_size using @a out_cipher.
- *
- * @param out_cipher cipher to use
- * @param dgram datagram to pad
- * @param pad_size number of bytes of padding to append
- */
-static void
-do_pad (gcry_cipher_hd_t out_cipher, char *dgram, size_t pad_size)
-{
-  char pad[pad_size];
-
-  GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK, pad, sizeof(pad));
-  if (sizeof(pad) > sizeof(struct GNUNET_MessageHeader))
-  {
-    struct GNUNET_MessageHeader hdr =
-    { .size = htons (sizeof(pad)),
-      .type = htons (GNUNET_MESSAGE_TYPE_COMMUNICATOR_UDP_PAD) };
-
-    memcpy (pad, &hdr, sizeof(hdr));
-  }
-  GNUNET_assert (
-    0 ==
-    gcry_cipher_encrypt (out_cipher, dgram, sizeof(pad), pad, sizeof(pad)));
-}
-
-
-/**
- * Signature of functions implementing the sending functionality of a
- * message queue.
- *
- * @param mq the message queue
- * @param msg the message to send
- * @param impl_state our `struct ReceiverAddress`
- */
-static void
-mq_send_kx (struct GNUNET_MQ_Handle *mq,
-            const struct GNUNET_MessageHeader *msg,
-            void *impl_state)
-{
-  struct ReceiverAddress *receiver = impl_state;
-  uint16_t msize = ntohs (msg->size);
-  struct UdpHandshakeSignature uhs;
-  struct UDPConfirmation uc;
-  struct InitialKX kx;
-  struct GNUNET_CRYPTO_EcdhePrivateKey epriv;
-  char dgram[receiver->kx_mtu + sizeof(uc) + sizeof(kx)];
-  size_t dpos;
-  gcry_cipher_hd_t out_cipher;
-  struct SharedSecret *ss;
-
-  GNUNET_assert (mq == receiver->kx_mq);
-  if (msize > receiver->kx_mtu)
-  {
-    GNUNET_break (0);
-    if (GNUNET_YES != receiver->receiver_destroy_called)
-      receiver_destroy (receiver);
-    return;
-  }
-  reschedule_receiver_timeout (receiver);
-
-  /* setup key material */
-  GNUNET_CRYPTO_ecdhe_key_create (&epriv);
-
-  ss = setup_shared_secret_enc (&epriv, receiver, GNUNET_YES);
-
-  if (receiver->num_secrets > MAX_SECRETS)
-  {
-    destroy_all_secrets (ss, GNUNET_YES);
-  }
-
-  setup_cipher (&ss->master, 0, &out_cipher);
-  /* compute 'uc' */
-  uc.sender = my_identity;
-  uc.monotonic_time =
-    GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get_monotonic (cfg));
-  uhs.purpose.purpose = htonl (
-    GNUNET_SIGNATURE_PURPOSE_COMMUNICATOR_UDP_HANDSHAKE);
-  uhs.purpose.size = htonl (sizeof(uhs));
-  uhs.sender = my_identity;
-  uhs.receiver = receiver->target;
-  GNUNET_CRYPTO_ecdhe_key_get_public (&epriv, &uhs.ephemeral);
-  uhs.monotonic_time = uc.monotonic_time;
-  GNUNET_CRYPTO_eddsa_sign (my_private_key,
-                            &uhs,
-                            &uc.sender_sig);
-  /* Leave space for kx */
-  dpos = sizeof(kx);
-  /* Append encrypted uc to dgram */
-  GNUNET_assert (0 == gcry_cipher_encrypt (out_cipher,
-                                           &dgram[dpos],
-                                           sizeof(uc),
-                                           &uc,
-                                           sizeof(uc)));
-  dpos += sizeof(uc);
-  /* Append encrypted payload to dgram */
-  GNUNET_assert (
-    0 == gcry_cipher_encrypt (out_cipher, &dgram[dpos], msize, msg, msize));
-  dpos += msize;
-  do_pad (out_cipher, &dgram[dpos], sizeof(dgram) - dpos);
-  /* Datagram starts with kx */
-  kx.ephemeral = uhs.ephemeral;
-  GNUNET_assert (
-    0 == gcry_cipher_gettag (out_cipher, kx.gcm_tag, sizeof(kx.gcm_tag)));
-  gcry_cipher_close (out_cipher);
-  if (GNUNET_NO == receiver->rekeying)
-    kx.rekeying = GNUNET_NO;
-  else
-    kx.rekeying = GNUNET_YES;
-  memcpy (dgram, &kx, sizeof(kx));
-  if (-1 == GNUNET_NETWORK_socket_sendto (udp_sock,
-                                          dgram,
-                                          sizeof(dgram),
-                                          receiver->address,
-                                          receiver->address_len))
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "send");
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Sending KX with payload size %u to %s\n",
-              msize,
-              GNUNET_a2s (receiver->address,
-                          receiver->address_len));
-  GNUNET_MQ_impl_send_continue (mq);
-}
-
-
-static void
-check_for_rekeying (struct ReceiverAddress *receiver, struct UDPBox *box)
-{
-
-  struct GNUNET_TIME_Relative rt;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Timeout is %llu\n.",
-              (unsigned long long) receiver->rekey_timeout.abs_value_us);
-
-  if (0 == receiver->rekey_timeout.abs_value_us)
-  {
-    receiver->rekey_timeout = GNUNET_TIME_relative_to_absolute (
-      rekey_interval);
-  }
-  else
-  {
-    rt = GNUNET_TIME_absolute_get_remaining (receiver->rekey_timeout);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Relative time is %llu and timeout is %llu\n.",
-                (unsigned long long) rt.rel_value_us,
-                (unsigned long long) receiver->rekey_timeout.abs_value_us);
-
-    if ((0 == rt.rel_value_us) || (receiver->rekey_send_bytes >
-                                   rekey_max_bytes) )
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Bytes send %llu greater than %llu max bytes\n.",
-                  (unsigned long long) receiver->rekey_send_bytes,
-                  rekey_max_bytes);
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Relative time is %llu and timeout is %llu\n.",
-                  (unsigned long long) rt.rel_value_us,
-                  (unsigned long long) receiver->rekey_timeout.abs_value_us);
-
-      receiver->rekey_timeout.abs_value_us = 0;
-      receiver->rekey_send_bytes = 0;
-      receiver->ss_rekey = NULL;
-      // destroy_all_secrets (ss, GNUNET_NO);
-      receiver->rekeying = GNUNET_YES;
-      receiver->rekey_acks_available = receiver->acks_available;
-      box->rekeying = GNUNET_YES;
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Sender started rekeying.\n");
-      if (GNUNET_YES == box->rekeying)
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                    "Sending rekeying with kid %s\n",
-                    GNUNET_sh2s (&box->kid));
-    }
-  }
-}
-
-
-static void
-send_UDPRekey (struct ReceiverAddress *receiver, struct SharedSecret *ss)
-{
-  uint8_t is_ss_rekey_sequence_allowed_zero = GNUNET_NO;
-  uint8_t is_acks_available_below = GNUNET_NO;
-  uint8_t send_rekey = GNUNET_NO;
-  uint16_t not_below;
-  struct GNUNET_CRYPTO_EcdhePrivateKey epriv;
-  struct UDPRekey *rekey;
-  size_t dpos;
-
-  char rekey_dgram[sizeof(struct UDPRekey) + receiver->d_mtu];
-
-  if (NULL != receiver->ss_rekey)
-  {
-    not_below = (receiver->rekey_acks_available
-                 - (receiver->rekey_acks_available % 3)) / 3;
-    is_ss_rekey_sequence_allowed_zero = (0 ==
-                                         receiver->ss_rekey->sequence_allowed);
-    is_acks_available_below = (receiver->acks_available >= not_below);
-    send_rekey = (0 == (receiver->acks_available - not_below) % not_below) &&
-                 is_acks_available_below && is_ss_rekey_sequence_allowed_zero;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "send_rekey: %u, %u, %u\n",
-                send_rekey,
-                receiver->rekey_acks_available,
-                receiver->acks_available);
-  }
-  else if (NULL == receiver->ss_rekey)
-  {
-    /* setup key material */
-    GNUNET_CRYPTO_ecdhe_key_create (&epriv);
-    receiver->ss_rekey = setup_shared_secret_enc (&epriv, receiver,
-                                                  GNUNET_NO);
-    receiver->ss_rekey->sequence_allowed = 0;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Setup secret with cmac %s\n",
-                GNUNET_h2s (&(receiver->ss_rekey->cmac)));
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Setup secret with master %s.\n",
-                GNUNET_h2s (&(receiver->ss_rekey->master)));
-  }
-
-  if (send_rekey)
-  {
-    GNUNET_assert (0 != receiver->number_rekeying_kce);
-    gcry_cipher_hd_t rekey_out_cipher;
-
-    while (NULL != ss && ss->sequence_used >= ss->sequence_allowed)
-    {
-      ss = ss->prev;
-    }
-
-    if (NULL != ss)
-    {
-      rekey = (struct UDPRekey *) rekey_dgram;
-      rekey->sender = my_identity;
-      ss->sequence_used++;
-      get_kid (&ss->master, ss->sequence_used, &rekey->kid);
-      receiver->number_rekeying_kce--;
-      setup_cipher (&ss->master, ss->sequence_used, &rekey_out_cipher);
-      /* Append encrypted payload to dgram */
-      dpos = sizeof(struct UDPRekey);
-
-      GNUNET_assert (
-        0 == gcry_cipher_encrypt (rekey_out_cipher, &rekey_dgram[dpos],
-                                  sizeof(receiver->ss_rekey->master),
-                                  &(receiver->ss_rekey->master),
-                                  sizeof(receiver->ss_rekey->master)));
-      dpos += sizeof(receiver->ss_rekey->master);
-      /* GNUNET_assert ( */
-      /*   0 == gcry_cipher_encrypt (rekey_out_cipher, &rekey_dgram[dpos], */
-      /*                             /\*sizeof(receiver->ss_rekey->cmac), */
-      /*                             &(receiver->ss_rekey->cmac), */
-      /*                             sizeof(receiver->ss_rekey->cmac))); */
-      /*                             dpos += sizeof(receiver->ss_rekey->cmac);*\/ */
-      /*                             sizeof(receiver->ss_rekey), */
-      /*                             receiver->ss_rekey, */
-      /*                             sizeof(receiver->ss_rekey))); */
-      /* dpos += sizeof(receiver->ss_rekey); */
-      do_pad (rekey_out_cipher, &rekey_dgram[dpos], sizeof(rekey_dgram)
-              - dpos);
-      GNUNET_assert (0 == gcry_cipher_gettag (rekey_out_cipher,
-                                              rekey->gcm_tag,
-                                              sizeof(rekey->gcm_tag)));
-      gcry_cipher_close (rekey_out_cipher);
-
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Sending rekey with kid %s and master %s\n",
-                  GNUNET_sh2s (&rekey->kid),
-                  GNUNET_h2s (&(receiver->ss_rekey->master)));
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Sending rekey with cmac %s\n",
-                  GNUNET_h2s (&(receiver->ss_rekey->cmac)));
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "%u rekey kces left.\n",
-                  receiver->number_rekeying_kce);
-
-      if (-1 == GNUNET_NETWORK_socket_sendto (udp_sock,
-                                              rekey_dgram,
-                                              sizeof(rekey_dgram),
-                                              receiver->address,
-                                              receiver->address_len))
-        GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "send");
-
-      receiver->acks_available--;
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "%u receiver->acks_available 1\n",
-                  receiver->acks_available);
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Sending UDPRekey to %s\n", GNUNET_a2s (receiver->address,
-                                                          receiver->
-                                                          address_len));
-    }
-  }
-}
-
-
-/**
- * Signature of functions implementing the sending functionality of a
- * message queue.
- *
- * @param mq the message queue
- * @param msg the message to send
- * @param impl_state our `struct ReceiverAddress`
- */
-static void
-mq_send_d (struct GNUNET_MQ_Handle *mq,
-           const struct GNUNET_MessageHeader *msg,
-           void *impl_state)
-{
-  struct ReceiverAddress *receiver = impl_state;
-  uint16_t msize = ntohs (msg->size);
-
-  GNUNET_assert (mq == receiver->d_mq);
-  if ((msize > receiver->d_mtu) ||
-      (0 == receiver->acks_available))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "msize: %u, mtu: %lu, acks: %u\n",
-                msize,
-                receiver->d_mtu,
-                receiver->acks_available);
-
-    GNUNET_break (0);
-    if (GNUNET_YES != receiver->receiver_destroy_called)
-      receiver_destroy (receiver);
-    return;
-  }
-  reschedule_receiver_timeout (receiver);
-
-  /* begin "BOX" encryption method, scan for ACKs from tail! */
-  for (struct SharedSecret *ss = receiver->ss_tail; NULL != ss; ss = ss->prev)
-  {
-    if (0 < ss->sequence_used)
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Trying to send UDPBox with shared secrect %s sequence_used %u and ss->sequence_allowed %u\n",
-                  GNUNET_h2s (&ss->master),
-                  ss->sequence_used,
-                  ss->sequence_allowed);
-    // Uncomment this for alternativ 1 of backchannel functionality
-    if (ss->sequence_used >= ss->sequence_allowed)
-    // Until here for alternativ 1
-    // Uncomment this for alternativ 2 of backchannel functionality
-    // if (0 == ss->sequence_allowed)
-    // Until here for alternativ 2
-    {
-      continue;
-    }
-    char dgram[sizeof(struct UDPBox) + receiver->d_mtu];
-    struct UDPBox *box;
-    gcry_cipher_hd_t out_cipher;
-    size_t dpos;
-
-    box = (struct UDPBox *) dgram;
-    ss->sequence_used++;
-    get_kid (&ss->master, ss->sequence_used, &box->kid);
-    setup_cipher (&ss->master, ss->sequence_used, &out_cipher);
-    /* Append encrypted payload to dgram */
-    dpos = sizeof(struct UDPBox);
-    GNUNET_assert (
-      0 == gcry_cipher_encrypt (out_cipher, &dgram[dpos], msize, msg, msize));
-    dpos += msize;
-    do_pad (out_cipher, &dgram[dpos], sizeof(dgram) - dpos);
-    GNUNET_assert (0 == gcry_cipher_gettag (out_cipher,
-                                            box->gcm_tag,
-                                            sizeof(box->gcm_tag)));
-    gcry_cipher_close (out_cipher);
-
-    receiver->rekey_send_bytes += sizeof(struct UDPBox) + receiver->d_mtu;
-
-    if (GNUNET_NO == receiver->rekeying)
-      box->rekeying = GNUNET_NO;
-    else
-      box->rekeying = GNUNET_YES;
-
-    if (-1 == GNUNET_NETWORK_socket_sendto (udp_sock,
-                                            dgram,
-                                            sizeof(dgram),
-                                            receiver->address,
-                                            receiver->address_len))
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "send");
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Sending UDPBox with payload size %u, %u acks left\n",
-                msize,
-                receiver->acks_available);
-    GNUNET_MQ_impl_send_continue (mq);
-    receiver->acks_available--;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "%u receiver->acks_available 2\n",
-                receiver->acks_available);
-    check_for_rekeying (receiver, box);
-    if (0 == receiver->acks_available - receiver->number_rekeying_kce)
-    {
-      /* We have no more ACKs */
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "No more acks\n");
-      if (GNUNET_YES == receiver->rekeying)
-      {
-        receiver->rekeying = GNUNET_NO;
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                    "Sender stopped rekeying\n");
-
-        if ((NULL != receiver->ss_rekey) && (0 <
-                                             receiver->ss_rekey->
-                                             sequence_allowed) )
-          add_acks_rekey (receiver);
-      }
-    }
-    else if ((GNUNET_YES == receiver->rekeying)  )
-    {
-      send_UDPRekey (receiver, ss);
-    }
-
-    return;
-  }
-}
-
-
-/**
- * Signature of functions implementing the destruction of a message
- * queue.  Implementations must not free @a mq, but should take care
- * of @a impl_state.
- *
- * @param mq the message queue to destroy
- * @param impl_state our `struct ReceiverAddress`
- */
-static void
-mq_destroy_d (struct GNUNET_MQ_Handle *mq, void *impl_state)
-{
-  struct ReceiverAddress *receiver = impl_state;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Default MQ destroyed\n");
-  if (mq == receiver->d_mq)
-  {
-    receiver->d_mq = NULL;
-    if (GNUNET_YES != receiver->receiver_destroy_called)
-      receiver_destroy (receiver);
-  }
-}
-
-
-/**
- * Signature of functions implementing the destruction of a message
- * queue.  Implementations must not free @a mq, but should take care
- * of @a impl_state.
- *
- * @param mq the message queue to destroy
- * @param impl_state our `struct ReceiverAddress`
- */
-static void
-mq_destroy_kx (struct GNUNET_MQ_Handle *mq, void *impl_state)
-{
-  struct ReceiverAddress *receiver = impl_state;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "KX MQ destroyed\n");
-  if (mq == receiver->kx_mq)
-  {
-    receiver->kx_mq = NULL;
-    if (GNUNET_YES != receiver->receiver_destroy_called)
-      receiver_destroy (receiver);
-  }
-}
-
-
-/**
- * Implementation function that cancels the currently sent message.
- *
- * @param mq message queue
- * @param impl_state our `struct RecvierAddress`
- */
-static void
-mq_cancel (struct GNUNET_MQ_Handle *mq, void *impl_state)
-{
-  /* Cancellation is impossible with UDP; bail */
-  GNUNET_assert (0);
-}
-
-
-/**
- * Generic error handler, called with the appropriate
- * error code and the same closure specified at the creation of
- * the message queue.
- * Not every message queue implementation supports an error handler.
- *
- * @param cls our `struct ReceiverAddress`
- * @param error error code
- */
-static void
-mq_error (void *cls, enum GNUNET_MQ_Error error)
-{
-  struct ReceiverAddress *receiver = cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              "MQ error in queue to %s: %d\n",
-              GNUNET_i2s (&receiver->target),
-              (int) error);
-  receiver_destroy (receiver);
-}
-
-
-/**
- * Setup the MQ for the @a receiver.  If a queue exists,
- * the existing one is destroyed.  Then the MTU is
- * recalculated and a fresh queue is initialized.
- *
- * @param receiver receiver to setup MQ for
- */
-static void
-setup_receiver_mq (struct ReceiverAddress *receiver)
-{
-  size_t base_mtu;
-
-  /*if (NULL != receiver->kx_qh)
-    {
-    GNUNET_TRANSPORT_communicator_mq_del (receiver->kx_qh);
-    receiver->kx_qh = NULL;
-    }
-    if (NULL != receiver->d_qh)
-    {
-    GNUNET_TRANSPORT_communicator_mq_del (receiver->d_qh);
-    receiver->d_qh = NULL;
-    }*/
-  // GNUNET_assert (NULL == receiver->mq);
-  switch (receiver->address->sa_family)
-  {
-  case AF_INET:
-    base_mtu = 1480     /* Ethernet MTU, 1500 - Ethernet header - VLAN tag */
-               - sizeof(struct GNUNET_TUN_IPv4Header) /* 20 */
-               - sizeof(struct GNUNET_TUN_UdpHeader) /* 8 */;
-    break;
-
-  case AF_INET6:
-    base_mtu = 1280     /* Minimum MTU required by IPv6 */
-               - sizeof(struct GNUNET_TUN_IPv6Header) /* 40 */
-               - sizeof(struct GNUNET_TUN_UdpHeader) /* 8 */;
-    break;
-
-  default:
-    GNUNET_assert (0);
-    break;
-  }
-  /* MTU based on full KX messages */
-  receiver->kx_mtu = base_mtu - sizeof(struct InitialKX)   /* 48 */
-                     - sizeof(struct UDPConfirmation); /* 104 */
-  /* MTU based on BOXed messages */
-  receiver->d_mtu = base_mtu - sizeof(struct UDPBox);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Setting up MQs and QHs\n");
-  /* => Effective MTU for CORE will range from 1080 (IPv6 + KX) to
-     1404 (IPv4 + Box) bytes, depending on circumstances... */
-  if (NULL == receiver->kx_mq)
-    receiver->kx_mq = GNUNET_MQ_queue_for_callbacks (&mq_send_kx,
-                                                     &mq_destroy_kx,
-                                                     &mq_cancel,
-                                                     receiver,
-                                                     NULL,
-                                                     &mq_error,
-                                                     receiver);
-  if (NULL == receiver->d_mq)
-    receiver->d_mq = GNUNET_MQ_queue_for_callbacks (&mq_send_d,
-                                                    &mq_destroy_d,
-                                                    &mq_cancel,
-                                                    receiver,
-                                                    NULL,
-                                                    &mq_error,
-                                                    receiver);
-
-  receiver->kx_qh =
-    GNUNET_TRANSPORT_communicator_mq_add (ch,
-                                          &receiver->target,
-                                          receiver->foreign_addr,
-                                          receiver->kx_mtu,
-                                          GNUNET_TRANSPORT_QUEUE_LENGTH_UNLIMITED,
-                                          0, /* Priority */
-                                          receiver->nt,
-                                          GNUNET_TRANSPORT_CS_OUTBOUND,
-                                          receiver->kx_mq);
-}
-
-
-/**
- * Function called by the transport service to initialize a
- * message queue given address information about another peer.
- * If and when the communication channel is established, the
- * communicator must call #GNUNET_TRANSPORT_communicator_mq_add()
- * to notify the service that the channel is now up.  It is
- * the responsibility of the communicator to manage sane
- * retries and timeouts for any @a peer/@a address combination
- * provided by the transport service.  Timeouts and retries
- * do not need to be signalled to the transport service.
- *
- * @param cls closure
- * @param peer identity of the other peer
- * @param address where to send the message, human-readable
- *        communicator-specific format, 0-terminated, UTF-8
- * @return #GNUNET_OK on success, #GNUNET_SYSERR if the provided address is
- * invalid
- */
-static int
-mq_init (void *cls, const struct GNUNET_PeerIdentity *peer, const char *address)
-{
-  struct ReceiverAddress *receiver;
-  const char *path;
-  struct sockaddr *in;
-  socklen_t in_len;
-
-  if (0 != strncmp (address,
-                    COMMUNICATOR_ADDRESS_PREFIX "-",
-                    strlen (COMMUNICATOR_ADDRESS_PREFIX "-")))
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  path = &address[strlen (COMMUNICATOR_ADDRESS_PREFIX "-")];
-  in = udp_address_to_sockaddr (path, &in_len);
-
-  receiver = GNUNET_new (struct ReceiverAddress);
-  receiver->address = in;
-  receiver->address_len = in_len;
-  receiver->target = *peer;
-  receiver->nt = GNUNET_NT_scanner_get_type (is, in, in_len);
-  (void) GNUNET_CONTAINER_multipeermap_put (
-    receivers,
-    &receiver->target,
-    receiver,
-    GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Added %s to receivers\n",
-              GNUNET_i2s_full (&receiver->target));
-  receiver->timeout =
-    GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
-  receiver->hn = GNUNET_CONTAINER_heap_insert (receivers_heap,
-                                               receiver,
-                                               receiver->timeout.abs_value_us);
-  GNUNET_STATISTICS_set (stats,
-                         "# receivers active",
-                         GNUNET_CONTAINER_multipeermap_size (receivers),
-                         GNUNET_NO);
-  receiver->foreign_addr =
-    sockaddr_to_udpaddr_string (receiver->address, receiver->address_len);
-  setup_receiver_mq (receiver);
-  if (NULL == timeout_task)
-    timeout_task = GNUNET_SCHEDULER_add_now (&check_timeouts, NULL);
-  return GNUNET_OK;
-}
-
-
-/**
- * Iterator over all receivers to clean up.
- *
- * @param cls NULL
- * @param target unused
- * @param value the queue to destroy
- * @return #GNUNET_OK to continue to iterate
- */
-static int
-get_receiver_delete_it (void *cls,
-                        const struct GNUNET_PeerIdentity *target,
-                        void *value)
-{
-  struct ReceiverAddress *receiver = value;
-
-  (void) cls;
-  (void) target;
-  receiver_destroy (receiver);
-  return GNUNET_OK;
-}
-
-
-/**
- * Iterator over all senders to clean up.
- *
- * @param cls NULL
- * @param target unused
- * @param value the queue to destroy
- * @return #GNUNET_OK to continue to iterate
- */
-static int
-get_sender_delete_it (void *cls,
-                      const struct GNUNET_PeerIdentity *target,
-                      void *value)
-{
-  struct SenderAddress *sender = value;
-
-  (void) cls;
-  (void) target;
-
-  if (NULL != sender->kce_task_rekey)
-  {
-    GNUNET_SCHEDULER_cancel (sender->kce_task_rekey);
-    sender->kce_task_rekey = NULL;
-  }
-  if (NULL != sender->kce_task)
-  {
-    GNUNET_SCHEDULER_cancel (sender->kce_task);
-    sender->kce_task = NULL;
-  }
-
-  sender_destroy (sender);
-  return GNUNET_OK;
-}
-
-
-/**
- * Shutdown the UNIX communicator.
- *
- * @param cls NULL (always)
- */
-static void
-do_shutdown (void *cls)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "do_shutdown\n");
-  if (NULL != nat)
-  {
-    GNUNET_NAT_unregister (nat);
-    nat = NULL;
-  }
-  while (NULL != bi_head)
-    bi_destroy (bi_head);
-  if (NULL != broadcast_task)
-  {
-    GNUNET_SCHEDULER_cancel (broadcast_task);
-    broadcast_task = NULL;
-  }
-  if (NULL != timeout_task)
-  {
-    GNUNET_SCHEDULER_cancel (timeout_task);
-    timeout_task = NULL;
-  }
-  if (NULL != read_task)
-  {
-    GNUNET_SCHEDULER_cancel (read_task);
-    read_task = NULL;
-  }
-  if (NULL != udp_sock)
-  {
-    GNUNET_break (GNUNET_OK ==
-                  GNUNET_NETWORK_socket_close (udp_sock));
-    udp_sock = NULL;
-  }
-  GNUNET_CONTAINER_multipeermap_iterate (receivers,
-                                         &get_receiver_delete_it,
-                                         NULL);
-  GNUNET_CONTAINER_multipeermap_destroy (receivers);
-  GNUNET_CONTAINER_multipeermap_iterate (senders,
-                                         &get_sender_delete_it,
-                                         NULL);
-  GNUNET_CONTAINER_multipeermap_destroy (senders);
-  GNUNET_CONTAINER_multishortmap_destroy (key_cache);
-  GNUNET_CONTAINER_heap_destroy (senders_heap);
-  GNUNET_CONTAINER_heap_destroy (receivers_heap);
-  if (NULL != timeout_task)
-  {
-    GNUNET_SCHEDULER_cancel (timeout_task);
-    timeout_task = NULL;
-  }
-  if (NULL != ch)
-  {
-    GNUNET_TRANSPORT_communicator_disconnect (ch);
-    ch = NULL;
-  }
-  if (NULL != ah)
-  {
-    GNUNET_TRANSPORT_application_done (ah);
-    ah = NULL;
-  }
-  if (NULL != stats)
-  {
-    GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
-    stats = NULL;
-  }
-  if (NULL != my_private_key)
-  {
-    GNUNET_free (my_private_key);
-    my_private_key = NULL;
-  }
-  if (NULL != is)
-  {
-    GNUNET_NT_scanner_done (is);
-    is = NULL;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "do_shutdown finished\n");
-}
-
-
-/**
- * Function called when the transport service has received a
- * backchannel message for this communicator (!) via a different return
- * path. Should be an acknowledgement.
- *
- * @param cls closure, NULL
- * @param sender which peer sent the notification
- * @param msg payload
- */
-static void
-enc_notify_cb (void *cls,
-               const struct GNUNET_PeerIdentity *sender,
-               const struct GNUNET_MessageHeader *msg)
-{
-  const struct UDPAck *ack;
-
-  (void) cls;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Storing UDPAck received from backchannel from %s\n",
-              GNUNET_i2s_full (sender));
-  if ((ntohs (msg->type) != GNUNET_MESSAGE_TYPE_COMMUNICATOR_UDP_ACK) ||
-      (ntohs (msg->size) != sizeof(struct UDPAck)))
-  {
-    GNUNET_break_op (0);
-    return;
-  }
-  ack = (const struct UDPAck *) msg;
-  GNUNET_CONTAINER_multipeermap_get_multiple (receivers,
-                                              sender,
-                                              &handle_ack,
-                                              (void *) ack);
-}
-
-
-/**
- * Signature of the callback passed to #GNUNET_NAT_register() for
- * a function to call whenever our set of 'valid' addresses changes.
- *
- * @param cls closure
- * @param app_ctx[in,out] location where the app can store stuff
- *                  on add and retrieve it on remove
- * @param add_remove #GNUNET_YES to add a new public IP address,
- *                   #GNUNET_NO to remove a previous (now invalid) one
- * @param ac address class the address belongs to
- * @param addr either the previous or the new public IP address
- * @param addrlen actual length of the @a addr
- */
-static void
-nat_address_cb (void *cls,
-                void **app_ctx,
-                int add_remove,
-                enum GNUNET_NAT_AddressClass ac,
-                const struct sockaddr *addr,
-                socklen_t addrlen)
-{
-  char *my_addr;
-  struct GNUNET_TRANSPORT_AddressIdentifier *ai;
-
-  if (GNUNET_YES == add_remove)
-  {
-    enum GNUNET_NetworkType nt;
-
-    GNUNET_asprintf (&my_addr,
-                     "%s-%s",
-                     COMMUNICATOR_ADDRESS_PREFIX,
-                     GNUNET_a2s (addr, addrlen));
-    nt = GNUNET_NT_scanner_get_type (is, addr, addrlen);
-    ai =
-      GNUNET_TRANSPORT_communicator_address_add (ch,
-                                                 my_addr,
-                                                 nt,
-                                                 GNUNET_TIME_UNIT_FOREVER_REL);
-    GNUNET_free (my_addr);
-    *app_ctx = ai;
-  }
-  else
-  {
-    ai = *app_ctx;
-    GNUNET_TRANSPORT_communicator_address_remove (ai);
-    *app_ctx = NULL;
-  }
-}
-
-
-/**
- * Broadcast our presence on one of our interfaces.
- *
- * @param cls a `struct BroadcastInterface`
- */
-static void
-ifc_broadcast (void *cls)
-{
-  struct BroadcastInterface *bi = cls;
-  struct GNUNET_TIME_Relative delay;
-
-  delay = BROADCAST_FREQUENCY;
-  delay.rel_value_us =
-    GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, delay.rel_value_us);
-  bi->broadcast_task =
-    GNUNET_SCHEDULER_add_delayed (delay, &ifc_broadcast, bi);
-
-  switch (bi->sa->sa_family)
-  {
-  case AF_INET: {
-      static int yes = 1;
-      static int no = 0;
-      ssize_t sent;
-
-      if (GNUNET_OK !=
-          GNUNET_NETWORK_socket_setsockopt (udp_sock,
-                                            SOL_SOCKET,
-                                            SO_BROADCAST,
-                                            &yes,
-                                            sizeof(int)))
-        GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
-                             "setsockopt");
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "creating UDPBroadcast from %s\n",
-                  GNUNET_i2s (&(bi->bcm.sender)));
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "sending UDPBroadcast to add %s\n",
-                  GNUNET_a2s (bi->ba, bi->salen));
-      sent = GNUNET_NETWORK_socket_sendto (udp_sock,
-                                           &bi->bcm,
-                                           sizeof(bi->bcm),
-                                           bi->ba,
-                                           bi->salen);
-      if (-1 == sent)
-        GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
-                             "sendto");
-      if (GNUNET_OK != GNUNET_NETWORK_socket_setsockopt (udp_sock,
-                                                         SOL_SOCKET,
-                                                         SO_BROADCAST,
-                                                         &no,
-                                                         sizeof(int)))
-        GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
-                             "setsockopt");
-      break;
-    }
-
-  case AF_INET6: {
-      ssize_t sent;
-      struct sockaddr_in6 dst;
-
-      dst.sin6_family = AF_INET6;
-      dst.sin6_port = htons (my_port);
-      dst.sin6_addr = bi->mcreq.ipv6mr_multiaddr;
-      dst.sin6_scope_id = ((struct sockaddr_in6 *) bi->ba)->sin6_scope_id;
-
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "sending UDPBroadcast\n");
-      sent = GNUNET_NETWORK_socket_sendto (udp_sock,
-                                           &bi->bcm,
-                                           sizeof(bi->bcm),
-                                           (const struct sockaddr *) &dst,
-                                           sizeof(dst));
-      if (-1 == sent)
-        GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "sendto");
-      break;
-    }
-
-  default:
-    GNUNET_break (0);
-    break;
-  }
-}
-
-
-/**
- * Callback function invoked for each interface found.
- * Activates/deactivates broadcast interfaces.
- *
- * @param cls NULL
- * @param name name of the interface (can be NULL for unknown)
- * @param isDefault is this presumably the default interface
- * @param addr address of this interface (can be NULL for unknown or unassigned)
- * @param broadcast_addr the broadcast address (can be NULL for unknown or
- * unassigned)
- * @param netmask the network mask (can be NULL for unknown or unassigned)
- * @param addrlen length of the address
- * @return #GNUNET_OK to continue iteration, #GNUNET_SYSERR to abort
- */
-static int
-iface_proc (void *cls,
-            const char *name,
-            int isDefault,
-            const struct sockaddr *addr,
-            const struct sockaddr *broadcast_addr,
-            const struct sockaddr *netmask,
-            socklen_t addrlen)
-{
-  struct BroadcastInterface *bi;
-  enum GNUNET_NetworkType network;
-  struct UdpBroadcastSignature ubs;
-
-  (void) cls;
-  (void) netmask;
-  if (NULL == addr)
-    return GNUNET_YES; /* need to know our address! */
-  network = GNUNET_NT_scanner_get_type (is, addr, addrlen);
-  if (GNUNET_NT_LOOPBACK == network)
-  {
-    /* Broadcasting on loopback does not make sense */
-    return GNUNET_YES;
-  }
-  for (bi = bi_head; NULL != bi; bi = bi->next)
-  {
-    if ((bi->salen == addrlen) && (0 == memcmp (addr, bi->sa, addrlen)))
-    {
-      bi->found = GNUNET_YES;
-      return GNUNET_OK;
-    }
-  }
-
-  if ((AF_INET6 == addr->sa_family) && (NULL == broadcast_addr))
-    return GNUNET_OK; /* broadcast_addr is required for IPv6! */
-  if ((AF_INET6 == addr->sa_family) && (GNUNET_YES != have_v6_socket))
-    return GNUNET_OK; /* not using IPv6 */
-
-  bi = GNUNET_new (struct BroadcastInterface);
-  bi->sa = GNUNET_memdup (addr,
-                          addrlen);
-  if ( (NULL != broadcast_addr) &&
-       (addrlen == sizeof (struct sockaddr_in)) )
-  {
-    struct sockaddr_in *ba;
-
-    ba = GNUNET_memdup (broadcast_addr,
-                        addrlen);
-    ba->sin_port = htons (2086); /* always GNUnet port, ignore configuration! */
-    bi->ba = (struct sockaddr *) ba;
-  }
-  bi->salen = addrlen;
-  bi->found = GNUNET_YES;
-  bi->bcm.sender = my_identity;
-  ubs.purpose.purpose = htonl (
-    GNUNET_SIGNATURE_PURPOSE_COMMUNICATOR_UDP_BROADCAST);
-  ubs.purpose.size = htonl (sizeof(ubs));
-  ubs.sender = my_identity;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "creating UDPBroadcastSignature for %s\n",
-              GNUNET_a2s (addr, addrlen));
-  GNUNET_CRYPTO_hash (addr, addrlen, &ubs.h_address);
-  GNUNET_CRYPTO_eddsa_sign (my_private_key,
-                            &ubs,
-                            &bi->bcm.sender_sig);
-  if (NULL != bi->ba)
-  {
-    bi->broadcast_task = GNUNET_SCHEDULER_add_now (&ifc_broadcast, bi);
-    GNUNET_CONTAINER_DLL_insert (bi_head, bi_tail, bi);
-  }
-  if ((AF_INET6 == addr->sa_family) && (NULL != broadcast_addr))
-  {
-    /* Create IPv6 multicast request */
-    const struct sockaddr_in6 *s6 =
-      (const struct sockaddr_in6 *) broadcast_addr;
-
-    GNUNET_assert (
-      1 == inet_pton (AF_INET6, "FF05::13B", &bi->mcreq.ipv6mr_multiaddr));
-
-    /* http://tools.ietf.org/html/rfc2553#section-5.2:
-     *
-     * IPV6_JOIN_GROUP
-     *
-     * Join a multicast group on a specified local interface.  If the
-     * interface index is specified as 0, the kernel chooses the local
-     * interface.  For example, some kernels look up the multicast
-     * group in the normal IPv6 routing table and using the resulting
-     * interface; we do this for each interface, so no need to use
-     * zero (anymore...).
-     */bi->mcreq.ipv6mr_interface = s6->sin6_scope_id;
-
-    /* Join the multicast group */
-    if (GNUNET_OK != GNUNET_NETWORK_socket_setsockopt (udp_sock,
-                                                       IPPROTO_IPV6,
-                                                       IPV6_JOIN_GROUP,
-                                                       &bi->mcreq,
-                                                       sizeof(bi->mcreq)))
-    {
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "setsockopt");
-    }
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Scan interfaces to broadcast our presence on the LAN.
- *
- * @param cls NULL, unused
- */
-static void
-do_broadcast (void *cls)
-{
-  struct BroadcastInterface *bin;
-
-  (void) cls;
-  for (struct BroadcastInterface *bi = bi_head; NULL != bi; bi = bi->next)
-    bi->found = GNUNET_NO;
-  GNUNET_OS_network_interfaces_list (&iface_proc, NULL);
-  for (struct BroadcastInterface *bi = bi_head; NULL != bi; bi = bin)
-  {
-    bin = bi->next;
-    if (GNUNET_NO == bi->found)
-      bi_destroy (bi);
-  }
-  broadcast_task = GNUNET_SCHEDULER_add_delayed (INTERFACE_SCAN_FREQUENCY,
-                                                 &do_broadcast,
-                                                 NULL);
-}
-
-
-/**
- * Setup communicator and launch network interactions.
- *
- * @param cls NULL (always)
- * @param args remaining command-line arguments
- * @param cfgfile name of the configuration file used (for saving, can be NULL!)
- * @param c configuration
- */
-static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *c)
-{
-  char *bindto;
-  struct sockaddr *in;
-  socklen_t in_len;
-  struct sockaddr_storage in_sto;
-  socklen_t sto_len;
-
-  (void) cls;
-  cfg = c;
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             COMMUNICATOR_CONFIG_SECTION,
-                                             "BINDTO",
-                                             &bindto))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               COMMUNICATOR_CONFIG_SECTION,
-                               "BINDTO");
-    return;
-  }
-
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_time (cfg,
-                                           COMMUNICATOR_CONFIG_SECTION,
-                                           "REKEY_INTERVAL",
-                                           &rekey_interval))
-    rekey_interval = DEFAULT_REKEY_TIME_INTERVAL;
-
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_size (cfg,
-                                           COMMUNICATOR_CONFIG_SECTION,
-                                           "REKEY_MAX_BYTES",
-                                           &rekey_max_bytes))
-    rekey_max_bytes = DEFAULT_REKEY_MAX_BYTES;
-
-  in = udp_address_to_sockaddr (bindto, &in_len);
-  if (NULL == in)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to setup UDP socket address with path `%s'\n",
-                bindto);
-    GNUNET_free (bindto);
-    return;
-  }
-  udp_sock =
-    GNUNET_NETWORK_socket_create (in->sa_family,
-                                  SOCK_DGRAM,
-                                  IPPROTO_UDP);
-  if (NULL == udp_sock)
-  {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket");
-    GNUNET_free (in);
-    GNUNET_free (bindto);
-    return;
-  }
-  if (AF_INET6 == in->sa_family)
-    have_v6_socket = GNUNET_YES;
-  if (GNUNET_OK !=
-      GNUNET_NETWORK_socket_bind (udp_sock,
-                                  in,
-                                  in_len))
-  {
-    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
-                              "bind",
-                              bindto);
-    GNUNET_NETWORK_socket_close (udp_sock);
-    udp_sock = NULL;
-    GNUNET_free (in);
-    GNUNET_free (bindto);
-    return;
-  }
-
-  /* We might have bound to port 0, allowing the OS to figure it out;
-     thus, get the real IN-address from the socket */
-  sto_len = sizeof(in_sto);
-  if (0 != getsockname (GNUNET_NETWORK_get_fd (udp_sock),
-                        (struct sockaddr *) &in_sto,
-                        &sto_len))
-  {
-    memcpy (&in_sto, in, in_len);
-    sto_len = in_len;
-  }
-  GNUNET_free (in);
-  GNUNET_free (bindto);
-  in = (struct sockaddr *) &in_sto;
-  in_len = sto_len;
-  GNUNET_log_from_nocheck (GNUNET_ERROR_TYPE_DEBUG,
-                           "transport",
-                           "Bound to `%s'\n",
-                           GNUNET_a2s ((const struct sockaddr *) &in_sto,
-                                       sto_len));
-  switch (in->sa_family)
-  {
-  case AF_INET:
-    my_port = ntohs (((struct sockaddr_in *) in)->sin_port);
-    break;
-
-  case AF_INET6:
-    my_port = ntohs (((struct sockaddr_in6 *) in)->sin6_port);
-    break;
-
-  default:
-    GNUNET_break (0);
-    my_port = 0;
-  }
-  stats = GNUNET_STATISTICS_create ("C-UDP", cfg);
-  senders = GNUNET_CONTAINER_multipeermap_create (32, GNUNET_YES);
-  receivers = GNUNET_CONTAINER_multipeermap_create (32, GNUNET_YES);
-  senders_heap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
-  receivers_heap =
-    GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
-  key_cache = GNUNET_CONTAINER_multishortmap_create (1024, GNUNET_YES);
-  GNUNET_SCHEDULER_add_shutdown (&do_shutdown, NULL);
-  is = GNUNET_NT_scanner_init ();
-  my_private_key = GNUNET_CRYPTO_eddsa_key_create_from_configuration (cfg);
-  if (NULL == my_private_key)
-  {
-    GNUNET_log (
-      GNUNET_ERROR_TYPE_ERROR,
-      _ (
-        "Transport service is lacking key configuration settings. Exiting.\n"));
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-  GNUNET_CRYPTO_eddsa_key_get_public (my_private_key, &my_identity.public_key);
-  /* start reading */
-  read_task = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
-                                             udp_sock,
-                                             &sock_read,
-                                             NULL);
-  ch = GNUNET_TRANSPORT_communicator_connect (cfg,
-                                              COMMUNICATOR_CONFIG_SECTION,
-                                              COMMUNICATOR_ADDRESS_PREFIX,
-                                              GNUNET_TRANSPORT_CC_UNRELIABLE,
-                                              &mq_init,
-                                              NULL,
-                                              &enc_notify_cb,
-                                              NULL);
-  if (NULL == ch)
-  {
-    GNUNET_break (0);
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-  ah = GNUNET_TRANSPORT_application_init (cfg);
-  if (NULL == ah)
-  {
-    GNUNET_break (0);
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-  /* start broadcasting */
-  if (GNUNET_YES !=
-      GNUNET_CONFIGURATION_get_value_yesno (cfg,
-                                            COMMUNICATOR_CONFIG_SECTION,
-                                            "DISABLE_BROADCAST"))
-  {
-    broadcast_task = GNUNET_SCHEDULER_add_now (&do_broadcast, NULL);
-  }
-  nat = GNUNET_NAT_register (cfg,
-                             COMMUNICATOR_CONFIG_SECTION,
-                             IPPROTO_UDP,
-                             1 /* one address */,
-                             (const struct sockaddr **) &in,
-                             &in_len,
-                             &nat_address_cb,
-                             NULL /* FIXME: support reversal: #5529 */,
-                             NULL /* closure */);
-}
-
-
-/**
- * The main function for the UNIX communicator.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc, char *const *argv)
-{
-  static const struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-  int ret;
-
-  GNUNET_log_from_nocheck (GNUNET_ERROR_TYPE_DEBUG,
-                           "transport",
-                           "Starting udp communicator\n");
-  if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
-    return 2;
-
-  ret = (GNUNET_OK == GNUNET_PROGRAM_run (argc,
-                                          argv,
-                                          "gnunet-communicator-udp",
-                                          _ ("GNUnet UDP communicator"),
-                                          options,
-                                          &run,
-                                          NULL))
-        ? 0
-        : 1;
-  GNUNET_free_nz ((void *) argv);
-  return ret;
-}
-
-
-/* end of gnunet-communicator-udp.c */
diff --git a/src/transport/gnunet-communicator-unix.c b/src/transport/gnunet-communicator-unix.c
deleted file mode 100644
index d7e18f87a..000000000
--- a/src/transport/gnunet-communicator-unix.c
+++ /dev/null
@@ -1,1167 +0,0 @@
-/*
-     This file is part of GNUnet
-     Copyright (C) 2010-2014, 2018 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/gnunet-communicator-unix.c
- * @brief Transport plugin using unix domain sockets (!)
- *        Clearly, can only be used locally on Unix/Linux hosts...
- *        ONLY INTENDED FOR TESTING!!!
- * @author Christian Grothoff
- * @author Nathan Evans
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_protocols.h"
-#include "gnunet_constants.h"
-#include "gnunet_nt_lib.h"
-#include "gnunet_statistics_service.h"
-#include "gnunet_transport_communication_service.h"
-
-/**
- * How many messages do we keep at most in the queue to the
- * transport service before we start to drop (default,
- * can be changed via the configuration file).
- * Should be _below_ the level of the communicator API, as
- * otherwise we may read messages just to have them dropped
- * by the communicator API.
- */
-#define DEFAULT_MAX_QUEUE_LENGTH 8000
-
-/**
- * Address prefix used by the communicator.
- */
-#define COMMUNICATOR_ADDRESS_PREFIX "unix"
-
-/**
- * Configuration section used by the communicator.
- */
-#define COMMUNICATOR_CONFIG_SECTION "communicator-unix"
-
-/**
- * Our MTU.
- */
-#ifndef DARWIN
-#define UNIX_MTU UINT16_MAX
-#else
-#define UNIX_MTU 2048
-#endif
-
-GNUNET_NETWORK_STRUCT_BEGIN
-
-/**
- * UNIX Message-Packet header.
- */
-struct UNIXMessage
-{
-  /**
-   * Message header.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * What is the identity of the sender (GNUNET_hash of public key)
-   */
-  struct GNUNET_PeerIdentity sender;
-};
-
-GNUNET_NETWORK_STRUCT_END
-
-
-/**
- * Handle for a queue.
- */
-struct Queue
-{
-  /**
-   * Queues with pending messages (!) are kept in a DLL.
-   */
-  struct Queue *next;
-
-  /**
-   * Queues with pending messages (!) are kept in a DLL.
-   */
-  struct Queue *prev;
-
-  /**
-   * To whom are we talking to.
-   */
-  struct GNUNET_PeerIdentity target;
-
-  /**
-   * Address of the other peer.
-   */
-  struct sockaddr_un *address;
-
-  /**
-   * Length of the address.
-   */
-  socklen_t address_len;
-
-  /**
-   * Message currently scheduled for transmission, non-NULL if and only
-   * if this queue is in the #queue_head DLL.
-   */
-  struct UNIXMessage *msg;
-
-  /**
-   * Message queue we are providing for the #ch.
-   */
-  struct GNUNET_MQ_Handle *mq;
-
-  /**
-   * handle for this queue with the #ch.
-   */
-  struct GNUNET_TRANSPORT_QueueHandle *qh;
-
-  /**
-   * Number of bytes we currently have in our write queue.
-   */
-  unsigned long long bytes_in_queue;
-
-  /**
-   * Timeout for this queue.
-   */
-  struct GNUNET_TIME_Absolute timeout;
-
-  /**
-   * Queue timeout task.
-   */
-  struct GNUNET_SCHEDULER_Task *timeout_task;
-};
-
-/**
- * My Peer Identity
- */
-static struct GNUNET_PeerIdentity my_identity;
-
-/**
- * ID of read task
- */
-static struct GNUNET_SCHEDULER_Task *read_task;
-
-/**
- * ID of write task
- */
-static struct GNUNET_SCHEDULER_Task *write_task;
-
-/**
- * Number of messages we currently have in our queues towards the transport service.
- */
-static unsigned long long delivering_messages;
-
-/**
- * Maximum queue length before we stop reading towards the transport service.
- */
-static unsigned long long max_queue_length;
-
-/**
- * For logging statistics.
- */
-static struct GNUNET_STATISTICS_Handle *stats;
-
-/**
- * Our environment.
- */
-static struct GNUNET_TRANSPORT_CommunicatorHandle *ch;
-
-/**
- * Queues (map from peer identity to `struct Queue`)
- */
-static struct GNUNET_CONTAINER_MultiPeerMap *queue_map;
-
-/**
- * Head of queue of messages to transmit.
- */
-static struct Queue *queue_head;
-
-/**
- * Tail of queue of messages to transmit.
- */
-static struct Queue *queue_tail;
-
-/**
- * socket that we transmit all data with
- */
-static struct GNUNET_NETWORK_Handle *unix_sock;
-
-/**
- * Handle to the operation that publishes our address.
- */
-static struct GNUNET_TRANSPORT_AddressIdentifier *ai;
-
-
-/**
- * Functions with this signature are called whenever we need
- * to close a queue due to a disconnect or failure to
- * establish a connection.
- *
- * @param queue queue to close down
- */
-static void
-queue_destroy (struct Queue *queue)
-{
-  struct GNUNET_MQ_Handle *mq;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Disconnecting queue for peer `%s'\n",
-              GNUNET_i2s (&queue->target));
-  if (0 != queue->bytes_in_queue)
-  {
-    GNUNET_CONTAINER_DLL_remove (queue_head, queue_tail, queue);
-    queue->bytes_in_queue = 0;
-  }
-  if (NULL != (mq = queue->mq))
-  {
-    queue->mq = NULL;
-    GNUNET_MQ_destroy (mq);
-  }
-  GNUNET_assert (
-    GNUNET_YES ==
-    GNUNET_CONTAINER_multipeermap_remove (queue_map, &queue->target, queue));
-  GNUNET_STATISTICS_set (stats,
-                         "# queues active",
-                         GNUNET_CONTAINER_multipeermap_size (queue_map),
-                         GNUNET_NO);
-  if (NULL != queue->timeout_task)
-  {
-    GNUNET_SCHEDULER_cancel (queue->timeout_task);
-    queue->timeout_task = NULL;
-  }
-  GNUNET_free (queue->address);
-  GNUNET_free (queue);
-}
-
-
-/**
- * Queue was idle for too long, so disconnect it
- *
- * @param cls the `struct Queue *` to disconnect
- */
-static void
-queue_timeout (void *cls)
-{
-  struct Queue *queue = cls;
-  struct GNUNET_TIME_Relative left;
-
-  queue->timeout_task = NULL;
-  left = GNUNET_TIME_absolute_get_remaining (queue->timeout);
-  if (0 != left.rel_value_us)
-  {
-    /* not actually our turn yet, but let's at least update
-       the monitor, it may think we're about to die ... */
-    queue->timeout_task =
-      GNUNET_SCHEDULER_add_delayed (left, &queue_timeout, queue);
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Queue %p was idle for %s, disconnecting\n",
-              queue,
-              GNUNET_STRINGS_relative_time_to_string (
-                GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
-                GNUNET_YES));
-  queue_destroy (queue);
-}
-
-
-/**
- * Increment queue timeout due to activity.  We do not immediately
- * notify the monitor here as that might generate excessive
- * signalling.
- *
- * @param queue queue for which the timeout should be rescheduled
- */
-static void
-reschedule_queue_timeout (struct Queue *queue)
-{
-  GNUNET_assert (NULL != queue->timeout_task);
-  queue->timeout =
-    GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
-}
-
-
-/**
- * Convert unix path to a `struct sockaddr_un *`
- *
- * @param unixpath path to convert
- * @param[out] sock_len set to the length of the address
- * @param is_abstract is this an abstract @a unixpath
- * @return converted unix path
- */
-static struct sockaddr_un *
-unix_address_to_sockaddr (const char *unixpath, socklen_t *sock_len)
-{
-  struct sockaddr_un *un;
-  size_t slen;
-
-  GNUNET_assert (0 < strlen (unixpath));   /* sanity check */
-  un = GNUNET_new (struct sockaddr_un);
-  un->sun_family = AF_UNIX;
-  slen = strlen (unixpath);
-  if (slen >= sizeof(un->sun_path))
-    slen = sizeof(un->sun_path) - 1;
-  GNUNET_memcpy (un->sun_path, unixpath, slen);
-  un->sun_path[slen] = '\0';
-  slen = sizeof(struct sockaddr_un);
-#if HAVE_SOCKADDR_UN_SUN_LEN
-  un->sun_len = (u_char) slen;
-#endif
-  (*sock_len) = slen;
-  if ('@' == un->sun_path[0])
-    un->sun_path[0] = '\0';
-  return un;
-}
-
-
-/**
- * Closure to #lookup_queue_it().
- */
-struct LookupCtx
-{
-  /**
-   * Location to store the queue, if found.
-   */
-  struct Queue *res;
-
-  /**
-   * Address we are looking for.
-   */
-  const struct sockaddr_un *un;
-
-  /**
-   * Number of bytes in @a un
-   */
-  socklen_t un_len;
-};
-
-
-/**
- * Function called to find a queue by address.
- *
- * @param cls the `struct LookupCtx *`
- * @param key peer we are looking for (unused)
- * @param value a queue
- * @return #GNUNET_YES if not found (continue looking), #GNUNET_NO on success
- */
-static int
-lookup_queue_it (void *cls, const struct GNUNET_PeerIdentity *key, void *value)
-{
-  struct LookupCtx *lctx = cls;
-  struct Queue *queue = value;
-
-  if ((queue->address_len == lctx->un_len) &&
-      (0 == memcmp (lctx->un, queue->address, queue->address_len)))
-  {
-    lctx->res = queue;
-    return GNUNET_NO;
-  }
-  return GNUNET_YES;
-}
-
-
-/**
- * Find an existing queue by address.
- *
- * @param plugin the plugin
- * @param address the address to find
- * @return NULL if queue was not found
- */
-static struct Queue *
-lookup_queue (const struct GNUNET_PeerIdentity *peer,
-              const struct sockaddr_un *un,
-              socklen_t un_len)
-{
-  struct LookupCtx lctx;
-
-  lctx.un = un;
-  lctx.un_len = un_len;
-  lctx.res = NULL;
-  GNUNET_CONTAINER_multipeermap_get_multiple (queue_map,
-                                              peer,
-                                              &lookup_queue_it,
-                                              &lctx);
-  return lctx.res;
-}
-
-
-/**
- * We have been notified that our socket is ready to write.
- * Then reschedule this function to be called again once more is available.
- *
- * @param cls NULL
- */
-static void
-select_write_cb (void *cls)
-{
-  struct Queue *queue = queue_tail;
-  const struct GNUNET_MessageHeader *msg = &queue->msg->header;
-  size_t msg_size = ntohs (msg->size);
-  ssize_t sent;
-
-  /* take queue of the ready list */
-  write_task = NULL;
-resend:
-  /* Send the data */
-  sent = GNUNET_NETWORK_socket_sendto (unix_sock,
-                                       msg,
-                                       msg_size,
-                                       (const struct sockaddr *) queue->address,
-                                       queue->address_len);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "UNIX transmitted message to %s (%d/%u: %s)\n",
-              GNUNET_i2s (&queue->target),
-              (int) sent,
-              (unsigned int) msg_size,
-              (sent < 0) ? strerror (errno) : "ok");
-  if (-1 != sent)
-  {
-    GNUNET_CONTAINER_DLL_remove (queue_head, queue_tail, queue);
-    if (NULL != queue_head)
-      write_task = GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_UNIT_FOREVER_REL,
-                                                   unix_sock,
-                                                   &select_write_cb,
-                                                   NULL);
-
-    /* send 'msg' */
-    GNUNET_free (queue->msg);
-    queue->msg = NULL;
-    GNUNET_MQ_impl_send_continue (queue->mq);
-    GNUNET_STATISTICS_update (stats,
-                              "# bytes sent",
-                              (long long) sent,
-                              GNUNET_NO);
-    reschedule_queue_timeout (queue);
-    return;   /* all good */
-  }
-  GNUNET_STATISTICS_update (stats,
-                            "# network transmission failures",
-                            1,
-                            GNUNET_NO);
-  write_task = GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_UNIT_FOREVER_REL,
-                                               unix_sock,
-                                               &select_write_cb,
-                                               NULL);
-  switch (errno)
-  {
-  case EAGAIN:
-  case ENOBUFS:
-    /* We should retry later... */
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_DEBUG, "send");
-    return;
-
-  case EMSGSIZE: {
-      socklen_t size = 0;
-      socklen_t len = sizeof(size);
-
-      GNUNET_NETWORK_socket_getsockopt (unix_sock,
-                                        SOL_SOCKET,
-                                        SO_SNDBUF,
-                                        &size,
-                                        &len);
-      if (size > ntohs (msg->size))
-      {
-        /* Buffer is bigger than message:  error, no retry
-         * This should never happen!*/
-        GNUNET_break (0);
-        return;
-      }
-      GNUNET_log (
-        GNUNET_ERROR_TYPE_WARNING,
-        "Trying to increase socket buffer size from %u to %u for message size %u\n",
-        (unsigned int) size,
-        (unsigned int) ((msg_size / 1000) + 2) * 1000,
-        (unsigned int) msg_size);
-      size = ((msg_size / 1000) + 2) * 1000;
-      if (GNUNET_OK == GNUNET_NETWORK_socket_setsockopt (unix_sock,
-                                                         SOL_SOCKET,
-                                                         SO_SNDBUF,
-                                                         &size,
-                                                         sizeof(size)))
-        goto resend; /* Increased buffer size, retry sending */
-      /* Ok, then just try very modest increase */
-      size = msg_size;
-      if (GNUNET_OK == GNUNET_NETWORK_socket_setsockopt (unix_sock,
-                                                         SOL_SOCKET,
-                                                         SO_SNDBUF,
-                                                         &size,
-                                                         sizeof(size)))
-        goto resend; /* Increased buffer size, retry sending */
-      /* Could not increase buffer size: error, no retry */
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "setsockopt");
-      return;
-    }
-
-  default:
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "send");
-    return;
-  }
-}
-
-
-/**
- * Signature of functions implementing the sending functionality of a
- * message queue.
- *
- * @param mq the message queue
- * @param msg the message to send
- * @param impl_state our `struct Queue`
- */
-static void
-mq_send (struct GNUNET_MQ_Handle *mq,
-         const struct GNUNET_MessageHeader *msg,
-         void *impl_state)
-{
-  struct Queue *queue = impl_state;
-  size_t msize = ntohs (msg->size);
-
-  GNUNET_assert (mq == queue->mq);
-  GNUNET_assert (NULL == queue->msg);
-  // Convert to UNIXMessage
-  queue->msg = GNUNET_malloc (msize + sizeof (struct UNIXMessage));
-  queue->msg->header.size = htons (msize + sizeof (struct UNIXMessage));
-  queue->msg->sender = my_identity;
-  memcpy (&queue->msg[1], msg, msize);
-  GNUNET_CONTAINER_DLL_insert (queue_head, queue_tail, queue);
-  GNUNET_assert (NULL != unix_sock);
-  if (NULL == write_task)
-    write_task = GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_UNIT_FOREVER_REL,
-                                                 unix_sock,
-                                                 &select_write_cb,
-                                                 NULL);
-}
-
-
-/**
- * Signature of functions implementing the destruction of a message
- * queue.  Implementations must not free @a mq, but should take care
- * of @a impl_state.
- *
- * @param mq the message queue to destroy
- * @param impl_state our `struct Queue`
- */
-static void
-mq_destroy (struct GNUNET_MQ_Handle *mq, void *impl_state)
-{
-  struct Queue *queue = impl_state;
-
-  if (mq == queue->mq)
-  {
-    queue->mq = NULL;
-    queue_destroy (queue);
-  }
-}
-
-
-/**
- * Implementation function that cancels the currently sent message.
- *
- * @param mq message queue
- * @param impl_state our `struct Queue`
- */
-static void
-mq_cancel (struct GNUNET_MQ_Handle *mq, void *impl_state)
-{
-  struct Queue *queue = impl_state;
-
-  GNUNET_assert (NULL != queue->msg);
-  queue->msg = NULL;
-  GNUNET_CONTAINER_DLL_remove (queue_head, queue_tail, queue);
-  GNUNET_assert (NULL != write_task);
-  if (NULL == queue_head)
-  {
-    GNUNET_SCHEDULER_cancel (write_task);
-    write_task = NULL;
-  }
-}
-
-
-/**
- * Generic error handler, called with the appropriate
- * error code and the same closure specified at the creation of
- * the message queue.
- * Not every message queue implementation supports an error handler.
- *
- * @param cls our `struct Queue`
- * @param error error code
- */
-static void
-mq_error (void *cls, enum GNUNET_MQ_Error error)
-{
-  struct Queue *queue = cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              "UNIX MQ error in queue to %s: %d\n",
-              GNUNET_i2s (&queue->target),
-              (int) error);
-  queue_destroy (queue);
-}
-
-
-/**
- * Creates a new outbound queue the transport service will use to send
- * data to another peer.
- *
- * @param peer the target peer
- * @param cs inbound or outbound queue
- * @param un the address
- * @param un_len number of bytes in @a un
- * @return the queue or NULL of max connections exceeded
- */
-static struct Queue *
-setup_queue (const struct GNUNET_PeerIdentity *target,
-             enum GNUNET_TRANSPORT_ConnectionStatus cs,
-             const struct sockaddr_un *un,
-             socklen_t un_len)
-{
-  struct Queue *queue;
-
-  queue = GNUNET_new (struct Queue);
-  queue->target = *target;
-  queue->address = GNUNET_memdup (un, un_len);
-  queue->address_len = un_len;
-  (void) GNUNET_CONTAINER_multipeermap_put (
-    queue_map,
-    &queue->target,
-    queue,
-    GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-  GNUNET_STATISTICS_set (stats,
-                         "# queues active",
-                         GNUNET_CONTAINER_multipeermap_size (queue_map),
-                         GNUNET_NO);
-  queue->timeout =
-    GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
-  queue->timeout_task =
-    GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
-                                  &queue_timeout,
-                                  queue);
-  queue->mq = GNUNET_MQ_queue_for_callbacks (&mq_send,
-                                             &mq_destroy,
-                                             &mq_cancel,
-                                             queue,
-                                             NULL,
-                                             &mq_error,
-                                             queue);
-  {
-    char *foreign_addr;
-
-    if ('\0' == un->sun_path[0])
-      GNUNET_asprintf (&foreign_addr,
-                       "%s-@%s",
-                       COMMUNICATOR_ADDRESS_PREFIX,
-                       &un->sun_path[1]);
-    else
-      GNUNET_asprintf (&foreign_addr,
-                       "%s-%s",
-                       COMMUNICATOR_ADDRESS_PREFIX,
-                       un->sun_path);
-    queue->qh = GNUNET_TRANSPORT_communicator_mq_add (ch,
-                                                      &queue->target,
-                                                      foreign_addr,
-                                                      UNIX_MTU - sizeof (struct
-                                                                         UNIXMessage),
-                                                      GNUNET_TRANSPORT_QUEUE_LENGTH_UNLIMITED,
-                                                      0,
-                                                      GNUNET_NT_LOOPBACK,
-                                                      cs,
-                                                      queue->mq);
-    GNUNET_free (foreign_addr);
-  }
-  return queue;
-}
-
-
-/**
- * We have been notified that our socket has something to read. Do the
- * read and reschedule this function to be called again once more is
- * available.
- *
- * @param cls NULL
- */
-static void
-select_read_cb (void *cls);
-
-
-/**
- * Function called when message was successfully passed to
- * transport service.  Continue read activity.
- *
- * @param cls NULL
- * @param success #GNUNET_OK on success
- */
-static void
-receive_complete_cb (void *cls, int success)
-{
-  (void) cls;
-  delivering_messages--;
-  if (GNUNET_OK != success)
-    GNUNET_STATISTICS_update (stats,
-                              "# transport transmission failures",
-                              1,
-                              GNUNET_NO);
-  if ((NULL == read_task) && (delivering_messages < max_queue_length) &&
-      (NULL != unix_sock))
-    read_task = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
-                                               unix_sock,
-                                               &select_read_cb,
-                                               NULL);
-}
-
-
-/**
- * We have been notified that our socket has something to read. Do the
- * read and reschedule this function to be called again once more is
- * available.
- *
- * @param cls NULL
- */
-static void
-select_read_cb (void *cls)
-{
-  char buf[65536] GNUNET_ALIGN;
-  struct Queue *queue;
-  const struct UNIXMessage *msg;
-  struct sockaddr_un un;
-  socklen_t addrlen;
-  ssize_t ret;
-  uint16_t msize;
-
-  GNUNET_assert (NULL != unix_sock);
-  read_task = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
-                                             unix_sock,
-                                             &select_read_cb,
-                                             NULL);
-  addrlen = sizeof(un);
-  memset (&un, 0, sizeof(un));
-  ret = GNUNET_NETWORK_socket_recvfrom (unix_sock,
-                                        buf,
-                                        sizeof(buf),
-                                        (struct sockaddr *) &un,
-                                        &addrlen);
-  if ((-1 == ret) && ((EAGAIN == errno) || (ENOBUFS == errno)))
-    return;
-  if (-1 == ret)
-  {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "recvfrom");
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Read %d bytes from socket %s\n",
-              (int) ret,
-              un.sun_path);
-  GNUNET_assert (AF_UNIX == (un.sun_family));
-  msg = (struct UNIXMessage *) buf;
-  msize = ntohs (msg->header.size);
-  if ((msize < sizeof(struct UNIXMessage)) || (msize > ret))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Wrong message size: %d bytes\n",
-                msize);
-    GNUNET_break_op (0);
-    return;
-  }
-  queue = lookup_queue (&msg->sender, &un, addrlen);
-  if (NULL == queue)
-    queue =
-      setup_queue (&msg->sender, GNUNET_TRANSPORT_CS_INBOUND, &un, addrlen);
-  else
-    reschedule_queue_timeout (queue);
-  if (NULL == queue)
-  {
-    GNUNET_log (
-      GNUNET_ERROR_TYPE_ERROR,
-      _ (
-        "Maximum number of UNIX connections exceeded, dropping incoming message\n"));
-    return;
-  }
-
-  {
-    uint16_t tsize = msize - sizeof(struct UNIXMessage);
-
-    const struct GNUNET_MessageHeader *currhdr;
-    struct GNUNET_MessageHeader al_hdr;
-
-    currhdr = (const struct GNUNET_MessageHeader *) &msg[1];
-    /* ensure aligned access */
-    memcpy (&al_hdr, currhdr, sizeof(al_hdr));
-    if ((tsize < sizeof(struct GNUNET_MessageHeader)) ||
-        (tsize != ntohs (al_hdr.size)))
-    {
-      GNUNET_break_op (0);
-      return;
-    }
-    ret = GNUNET_TRANSPORT_communicator_receive (ch,
-                                                 &msg->sender,
-                                                 currhdr,
-                                                 GNUNET_TIME_UNIT_FOREVER_REL,
-                                                 &receive_complete_cb,
-                                                 NULL);
-    if (GNUNET_SYSERR == ret)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Transport not up!\n");
-      return;   /* transport not up */
-    }
-    if (GNUNET_NO == ret)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Error sending message to transport\n");
-      return;
-    }
-    delivering_messages++;
-  }
-  if (delivering_messages >= max_queue_length)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Back pressure %llu\n", delivering_messages);
-
-    /* we should try to apply 'back pressure' */
-    GNUNET_SCHEDULER_cancel (read_task);
-    read_task = NULL;
-  }
-}
-
-
-/**
- * Function called by the transport service to initialize a
- * message queue given address information about another peer.
- * If and when the communication channel is established, the
- * communicator must call #GNUNET_TRANSPORT_communicator_mq_add()
- * to notify the service that the channel is now up.  It is
- * the responsibility of the communicator to manage sane
- * retries and timeouts for any @a peer/@a address combination
- * provided by the transport service.  Timeouts and retries
- * do not need to be signalled to the transport service.
- *
- * @param cls closure
- * @param peer identity of the other peer
- * @param address where to send the message, human-readable
- *        communicator-specific format, 0-terminated, UTF-8
- * @return #GNUNET_OK on success, #GNUNET_SYSERR if the provided address is invalid
- */
-static int
-mq_init (void *cls, const struct GNUNET_PeerIdentity *peer, const char *address)
-{
-  struct Queue *queue;
-  const char *path;
-  struct sockaddr_un *un;
-  socklen_t un_len;
-
-  (void) cls;
-  if (0 != strncmp (address,
-                    COMMUNICATOR_ADDRESS_PREFIX "-",
-                    strlen (COMMUNICATOR_ADDRESS_PREFIX "-")))
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  path = &address[strlen (COMMUNICATOR_ADDRESS_PREFIX "-")];
-  un = unix_address_to_sockaddr (path, &un_len);
-  queue = lookup_queue (peer, un, un_len);
-  if (NULL != queue)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Address `%s' for %s ignored, queue exists\n",
-                path,
-                GNUNET_i2s (peer));
-    GNUNET_free (un);
-    return GNUNET_OK;
-  }
-  queue = setup_queue (peer, GNUNET_TRANSPORT_CS_OUTBOUND, un, un_len);
-  GNUNET_free (un);
-  if (NULL == queue)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Failed to setup queue to %s at `%s'\n",
-                GNUNET_i2s (peer),
-                path);
-    return GNUNET_NO;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Iterator over all message queues to clean up.
- *
- * @param cls NULL
- * @param target unused
- * @param value the queue to destroy
- * @return #GNUNET_OK to continue to iterate
- */
-static int
-get_queue_delete_it (void *cls,
-                     const struct GNUNET_PeerIdentity *target,
-                     void *value)
-{
-  struct Queue *queue = value;
-
-  (void) cls;
-  (void) target;
-  queue_destroy (queue);
-  return GNUNET_OK;
-}
-
-
-/**
- * Shutdown the UNIX communicator.
- *
- * @param cls NULL (always)
- */
-static void
-do_shutdown (void *cls)
-{
-  if (NULL != read_task)
-  {
-    GNUNET_SCHEDULER_cancel (read_task);
-    read_task = NULL;
-  }
-  if (NULL != write_task)
-  {
-    GNUNET_SCHEDULER_cancel (write_task);
-    write_task = NULL;
-  }
-  if (NULL != unix_sock)
-  {
-    GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (unix_sock));
-    unix_sock = NULL;
-  }
-  GNUNET_CONTAINER_multipeermap_iterate (queue_map, &get_queue_delete_it, NULL);
-  GNUNET_CONTAINER_multipeermap_destroy (queue_map);
-  if (NULL != ai)
-  {
-    GNUNET_TRANSPORT_communicator_address_remove (ai);
-    ai = NULL;
-  }
-  if (NULL != ch)
-  {
-    GNUNET_TRANSPORT_communicator_disconnect (ch);
-    ch = NULL;
-  }
-  if (NULL != stats)
-  {
-    GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
-    stats = NULL;
-  }
-}
-
-
-/**
- * Function called when the transport service has received an
- * acknowledgement for this communicator (!) via a different return
- * path.
- *
- * Not applicable for UNIX.
- *
- * @param cls closure
- * @param sender which peer sent the notification
- * @param msg payload
- */
-static void
-enc_notify_cb (void *cls,
-               const struct GNUNET_PeerIdentity *sender,
-               const struct GNUNET_MessageHeader *msg)
-{
-  (void) cls;
-  (void) sender;
-  (void) msg;
-  GNUNET_break_op (0);
-}
-
-
-/**
- * Setup communicator and launch network interactions.
- *
- * @param cls NULL (always)
- * @param args remaining command-line arguments
- * @param cfgfile name of the configuration file used (for saving, can be NULL!)
- * @param cfg configuration
- */
-static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  char *unix_socket_path;
-  struct sockaddr_un *un;
-  socklen_t un_len;
-  char *my_addr;
-  struct GNUNET_CRYPTO_EddsaPrivateKey *my_private_key;
-
-  (void) cls;
-  delivering_messages = 0;
-
-  my_private_key = GNUNET_CRYPTO_eddsa_key_create_from_configuration (cfg);
-  if (NULL == my_private_key)
-  {
-    GNUNET_log (
-      GNUNET_ERROR_TYPE_ERROR,
-      _ (
-        "UNIX communicator is lacking key configuration settings. Exiting.\n"));
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-  GNUNET_CRYPTO_eddsa_key_get_public (my_private_key, &my_identity.public_key);
-
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_filename (cfg,
-                                               COMMUNICATOR_CONFIG_SECTION,
-                                               "UNIXPATH",
-                                               &unix_socket_path))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               COMMUNICATOR_CONFIG_SECTION,
-                               "UNIXPATH");
-    return;
-  }
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (cfg,
-                                             COMMUNICATOR_CONFIG_SECTION,
-                                             "MAX_QUEUE_LENGTH",
-                                             &max_queue_length))
-    max_queue_length = DEFAULT_MAX_QUEUE_LENGTH;
-
-  un = unix_address_to_sockaddr (unix_socket_path, &un_len);
-  if (NULL == un)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to setup UNIX domain socket address with path `%s'\n",
-                unix_socket_path);
-    GNUNET_free (unix_socket_path);
-    return;
-  }
-  unix_sock = GNUNET_NETWORK_socket_create (AF_UNIX, SOCK_DGRAM, 0);
-  if (NULL == unix_sock)
-  {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket");
-    GNUNET_free (un);
-    GNUNET_free (unix_socket_path);
-    return;
-  }
-  if (('\0' != un->sun_path[0]) &&
-      (GNUNET_OK != GNUNET_DISK_directory_create_for_file (un->sun_path)))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _ ("Cannot create path to `%s'\n"),
-                un->sun_path);
-    GNUNET_NETWORK_socket_close (unix_sock);
-    unix_sock = NULL;
-    GNUNET_free (un);
-    GNUNET_free (unix_socket_path);
-    return;
-  }
-  if (GNUNET_OK != GNUNET_NETWORK_socket_bind (unix_sock,
-                                               (const struct sockaddr *) un,
-                                               un_len))
-  {
-    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "bind", un->sun_path);
-    GNUNET_NETWORK_socket_close (unix_sock);
-    unix_sock = NULL;
-    GNUNET_free (un);
-    GNUNET_free (unix_socket_path);
-    return;
-  }
-  GNUNET_free (un);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Bound to `%s'\n", unix_socket_path);
-  stats = GNUNET_STATISTICS_create ("C-UNIX", cfg);
-  GNUNET_SCHEDULER_add_shutdown (&do_shutdown, NULL);
-  read_task = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
-                                             unix_sock,
-                                             &select_read_cb,
-                                             NULL);
-  queue_map = GNUNET_CONTAINER_multipeermap_create (10, GNUNET_NO);
-  ch = GNUNET_TRANSPORT_communicator_connect (cfg,
-                                              COMMUNICATOR_CONFIG_SECTION,
-                                              COMMUNICATOR_ADDRESS_PREFIX,
-                                              GNUNET_TRANSPORT_CC_RELIABLE,
-                                              &mq_init,
-                                              NULL,
-                                              &enc_notify_cb,
-                                              NULL);
-  if (NULL == ch)
-  {
-    GNUNET_break (0);
-    GNUNET_SCHEDULER_shutdown ();
-    GNUNET_free (unix_socket_path);
-    return;
-  }
-  GNUNET_asprintf (&my_addr,
-                   "%s-%s",
-                   COMMUNICATOR_ADDRESS_PREFIX,
-                   unix_socket_path);
-  GNUNET_free (unix_socket_path);
-  ai = GNUNET_TRANSPORT_communicator_address_add (ch,
-                                                  my_addr,
-                                                  GNUNET_NT_LOOPBACK,
-                                                  GNUNET_TIME_UNIT_FOREVER_REL);
-  GNUNET_free (my_addr);
-}
-
-
-/**
- * The main function for the UNIX communicator.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc, char *const *argv)
-{
-  static const struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-  int ret;
-
-  if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
-    return 2;
-
-  ret = (GNUNET_OK ==
-         GNUNET_PROGRAM_run (argc,
-                             argv,
-                             "gnunet-communicator-unix",
-                             _ ("GNUnet UNIX domain socket communicator"),
-                             options,
-                             &run,
-                             NULL))
-        ? 0
-        : 1;
-  GNUNET_free_nz ((void *) argv);
-  return ret;
-}
-
-
-#if defined(__linux__) && defined(__GLIBC__)
-#include <malloc.h>
-
-/**
- * MINIMIZE heap size (way below 128k) since this process doesn't need much.
- */
-void __attribute__ ((constructor))
-GNUNET_ARM_memory_init ()
-{
-  mallopt (M_TRIM_THRESHOLD, 4 * 1024);
-  mallopt (M_TOP_PAD, 1 * 1024);
-  malloc_trim (0);
-}
-
-
-#endif
-
-/* end of gnunet-communicator-unix.c */
diff --git a/src/transport/gnunet-helper-transport-bluetooth.c b/src/transport/gnunet-helper-transport-bluetooth.c
deleted file mode 100644
index 019f3914f..000000000
--- a/src/transport/gnunet-helper-transport-bluetooth.c
+++ /dev/null
@@ -1,2285 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2010, 2011, 2012 GNUnet e.V.
-   Copyright (C) 2007, 2008, Andy Green <andy@warmcat.com>
-   Copyright (C) 2009 Thomas d'Otreppe
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-#include "gnunet_config.h"
-
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
-#include <bluetooth/rfcomm.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
-#include <errno.h>
-#include <linux/if.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "plugin_transport_wlan.h"
-#include "gnunet_protocols.h"
-
-
-/**
- * Maximum number of ports assignable for RFCOMMM protocol.
- */
-#define MAX_PORTS 30
-
-/**
- * Maximum size of a message allowed in either direction
- * (used for our receive and sent buffers).
- */
-#define MAXLINE 4096
-
-
-/**
- * Maximum number of loops without inquiring for new devices.
- */
-#define MAX_LOOPS 5
-
-/**
- * In bluez library, the maximum name length of a device is 8
- */
-#define BLUEZ_DEVNAME_SIZE  8
-
-/**
- * struct for storing the information of the hardware.  There is only
- * one of these.
- */
-struct HardwareInfos
-{
-  /**
-   * Name of the interface, not necessarily 0-terminated (!).
-   */
-  char iface[IFNAMSIZ];
-
-  /**
-   * file descriptor for the rfcomm socket
-   */
-  int fd_rfcomm;
-
-  /**
-   * MAC address of our own bluetooth interface.
-   */
-  struct GNUNET_TRANSPORT_WLAN_MacAddress pl_mac;
-
-  /**
-   * SDP session
-   */
-  sdp_session_t *session;
-};
-
-/**
- * IO buffer used for buffering data in transit (to wireless or to stdout).
- */
-struct SendBuffer
-{
-  /**
-   * How many bytes of data are stored in 'buf' for transmission right now?
-   * Data always starts at offset 0 and extends to 'size'.
-   */
-  size_t size;
-
-  /**
-   * How many bytes that were stored in 'buf' did we already write to the
-   * destination?  Always smaller than 'size'.
-   */
-  size_t pos;
-
-  /**
-   * Buffered data; twice the maximum allowed message size as we add some
-   * headers.
-   */
-  char buf[MAXLINE * 2];
-};
-
-#ifdef __linux__
-/**
- * Devices buffer used to keep a list with all the discoverable devices in
- * order to send them HELLO messages one by one when it receive a broadcast message.
- */
-struct BroadcastMessages
-{
-  /* List with the discoverable devices' addresses */
-  bdaddr_t devices[MAX_PORTS];
-
-  /* List with the open sockets */
-  int fds[MAX_PORTS];
-
-
-  /* The number of the devices */
-  int size;
-
-  /* The current position */
-  int pos;
-
-  /* The device id */
-  int dev_id;
-};
-
-/**
- * Address used to identify the broadcast messages.
- */
-static struct GNUNET_TRANSPORT_WLAN_MacAddress broadcast_address = { { 255, 255,
-                                                                       255, 255,
-                                                                       255,
-                                                                       255 } };
-
-/**
- * Buffer with the discoverable devices.
- */
-static struct BroadcastMessages neighbours;
-
-static int searching_devices_count = 0;
-#endif
-
-/**
- * Buffer for data read from stdin to be transmitted to the bluetooth device
- */
-static struct SendBuffer write_pout;
-
-/**
- * Buffer for data read from the bluetooth device to be transmitted to stdout.
- */
-static struct SendBuffer write_std;
-
-
-/* ****** this are the same functions as the ones used in gnunet-helper-transport-wlan.c ****** */
-
-/**
- * To what multiple do we align messages?  8 byte should suffice for everyone
- * for now.
- */
-#define ALIGN_FACTOR 8
-
-/**
- * Smallest supported message.
- */
-#define MIN_BUFFER_SIZE sizeof(struct GNUNET_MessageHeader)
-
-
-/**
- * Functions with this signature are called whenever a
- * complete message is received by the tokenizer.
- *
- * @param cls closure
- * @param message the actual message
- */
-typedef void (*MessageTokenizerCallback) (void *cls,
-                                          const struct
-                                          GNUNET_MessageHeader *
-                                          message);
-
-/**
- * Handle to a message stream tokenizer.
- */
-struct MessageStreamTokenizer
-{
-  /**
-   * Function to call on completed messages.
-   */
-  MessageTokenizerCallback cb;
-
-  /**
-   * Closure for cb.
-   */
-  void *cb_cls;
-
-  /**
-   * Size of the buffer (starting at 'hdr').
-   */
-  size_t curr_buf;
-
-  /**
-   * How many bytes in buffer have we already processed?
-   */
-  size_t off;
-
-  /**
-   * How many bytes in buffer are valid right now?
-   */
-  size_t pos;
-
-  /**
-   * Beginning of the buffer.  Typed like this to force alignment.
-   */
-  struct GNUNET_MessageHeader *hdr;
-};
-
-
-/**
- * Create a message stream tokenizer.
- *
- * @param cb function to call on completed messages
- * @param cb_cls closure for cb
- * @return handle to tokenizer
- */
-static struct MessageStreamTokenizer *
-mst_create (MessageTokenizerCallback cb,
-            void *cb_cls)
-{
-  struct MessageStreamTokenizer *ret;
-
-  ret = malloc (sizeof(struct MessageStreamTokenizer));
-  if (NULL == ret)
-  {
-    fprintf (stderr, "Failed to allocate buffer for tokenizer\n");
-    exit (1);
-  }
-  ret->hdr = malloc (MIN_BUFFER_SIZE);
-  if (NULL == ret->hdr)
-  {
-    fprintf (stderr, "Failed to allocate buffer for alignment\n");
-    exit (1);
-  }
-  ret->curr_buf = MIN_BUFFER_SIZE;
-  ret->cb = cb;
-  ret->cb_cls = cb_cls;
-  ret->pos = 0;
-
-  return ret;
-}
-
-
-/**
- * Add incoming data to the receive buffer and call the
- * callback for all complete messages.
- *
- * @param mst tokenizer to use
- * @param buf input data to add
- * @param size number of bytes in buf
- * @return GNUNET_OK if we are done processing (need more data)
- *         GNUNET_SYSERR if the data stream is corrupt
- */
-static int
-mst_receive (struct MessageStreamTokenizer *mst,
-             const char *buf, size_t size)
-{
-  const struct GNUNET_MessageHeader *hdr;
-  size_t delta;
-  uint16_t want;
-  char *ibuf;
-  int need_align;
-  unsigned long offset;
-  int ret;
-
-  ret = GNUNET_OK;
-  ibuf = (char *) mst->hdr;
-  while (mst->pos > 0)
-  {
-do_align:
-    if (mst->pos < mst->off)
-    {
-      // fprintf (stderr, "We processed too many bytes!\n");
-      return GNUNET_SYSERR;
-    }
-    if ((mst->curr_buf - mst->off < sizeof(struct GNUNET_MessageHeader)) ||
-        (0 != (mst->off % ALIGN_FACTOR)))
-    {
-      /* need to align or need more space */
-      mst->pos -= mst->off;
-      memmove (ibuf, &ibuf[mst->off], mst->pos);
-      mst->off = 0;
-    }
-    if (mst->pos - mst->off < sizeof(struct GNUNET_MessageHeader))
-    {
-      delta =
-        GNUNET_MIN (sizeof(struct GNUNET_MessageHeader)
-                    - (mst->pos - mst->off), size);
-      GNUNET_memcpy (&ibuf[mst->pos], buf, delta);
-      mst->pos += delta;
-      buf += delta;
-      size -= delta;
-    }
-    if (mst->pos - mst->off < sizeof(struct GNUNET_MessageHeader))
-    {
-      // FIXME should I reset ??
-      // mst->off = 0;
-      // mst->pos = 0;
-      return GNUNET_OK;
-    }
-    hdr = (const struct GNUNET_MessageHeader *) &ibuf[mst->off];
-    want = ntohs (hdr->size);
-    if (want < sizeof(struct GNUNET_MessageHeader))
-    {
-      fprintf (stderr,
-               "Received invalid message from stdin\n");
-      return GNUNET_SYSERR;
-    }
-    if ((mst->curr_buf - mst->off < want) &&
-        (mst->off > 0))
-    {
-      /* need more space */
-      mst->pos -= mst->off;
-      memmove (ibuf, &ibuf[mst->off], mst->pos);
-      mst->off = 0;
-    }
-    if (want > mst->curr_buf)
-    {
-      if (mst->off != 0)
-      {
-        fprintf (stderr, "Error! We should proceeded 0 bytes\n");
-        return GNUNET_SYSERR;
-      }
-      mst->hdr = realloc (mst->hdr, want);
-      if (NULL == mst->hdr)
-      {
-        fprintf (stderr, "Failed to allocate buffer for alignment\n");
-        exit (1);
-      }
-      ibuf = (char *) mst->hdr;
-      mst->curr_buf = want;
-    }
-    hdr = (const struct GNUNET_MessageHeader *) &ibuf[mst->off];
-    if (mst->pos - mst->off < want)
-    {
-      delta = GNUNET_MIN (want - (mst->pos - mst->off), size);
-      if (mst->pos + delta > mst->curr_buf)
-      {
-        fprintf (stderr, "The size of the buffer will be exceeded!\n");
-        return GNUNET_SYSERR;
-      }
-      GNUNET_memcpy (&ibuf[mst->pos], buf, delta);
-      mst->pos += delta;
-      buf += delta;
-      size -= delta;
-    }
-    if (mst->pos - mst->off < want)
-    {
-      // FIXME should I use this?
-      // mst->off = 0;
-      // mst->pos = 0;
-      return GNUNET_OK;
-    }
-    mst->cb (mst->cb_cls, hdr);
-    mst->off += want;
-    if (mst->off == mst->pos)
-    {
-      /* reset to beginning of buffer, it's free right now! */
-      mst->off = 0;
-      mst->pos = 0;
-    }
-  }
-  if (0 != mst->pos)
-  {
-    fprintf (stderr,
-             "There should some valid bytes in the buffer on this stage\n");
-    return GNUNET_SYSERR;
-  }
-  while (size > 0)
-  {
-    if (size < sizeof(struct GNUNET_MessageHeader))
-      break;
-    offset = (unsigned long) buf;
-    need_align = (0 != offset % ALIGN_FACTOR) ? GNUNET_YES : GNUNET_NO;
-    if (GNUNET_NO == need_align)
-    {
-      /* can try to do zero-copy and process directly from original buffer */
-      hdr = (const struct GNUNET_MessageHeader *) buf;
-      want = ntohs (hdr->size);
-      if (want < sizeof(struct GNUNET_MessageHeader))
-      {
-        fprintf (stderr,
-                 "Received invalid message from stdin\n");
-        // exit (1);
-        mst->off = 0;
-        return GNUNET_SYSERR;
-      }
-      if (size < want)
-        break;                  /* or not, buffer incomplete, so copy to private buffer... */
-      mst->cb (mst->cb_cls, hdr);
-      buf += want;
-      size -= want;
-    }
-    else
-    {
-      /* need to copy to private buffer to align;
-       * yes, we go a bit more spaghetti than usual here */
-      goto do_align;
-    }
-  }
-  if (size > 0)
-  {
-    if (size + mst->pos > mst->curr_buf)
-    {
-      mst->hdr = realloc (mst->hdr, size + mst->pos);
-      if (NULL == mst->hdr)
-      {
-        fprintf (stderr, "Failed to allocate buffer for alignment\n");
-        exit (1);
-      }
-      ibuf = (char *) mst->hdr;
-      mst->curr_buf = size + mst->pos;
-    }
-    if (mst->pos + size > mst->curr_buf)
-    {
-      fprintf (stderr,
-               "Assertion failed\n");
-      exit (1);
-    }
-    GNUNET_memcpy (&ibuf[mst->pos], buf, size);
-    mst->pos += size;
-  }
-  return ret;
-}
-
-
-/**
- * Destroys a tokenizer.
- *
- * @param mst tokenizer to destroy
- */
-static void
-mst_destroy (struct MessageStreamTokenizer *mst)
-{
-  free (mst->hdr);
-  free (mst);
-}
-
-
-/**
- * Calculate crc32, the start of the calculation
- *
- * @param buf buffer to calc the crc
- * @param len len of the buffer
- * @return crc sum
- */
-static unsigned long
-calc_crc_osdep (const unsigned char *buf, size_t len)
-{
-  static const unsigned long int crc_tbl_osdep[256] = {
-    0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F,
-    0xE963A535, 0x9E6495A3,
-    0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD,
-    0xE7B82D07, 0x90BF1D91,
-    0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB,
-    0xF4D4B551, 0x83D385C7,
-    0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9,
-    0xFA0F3D63, 0x8D080DF5,
-    0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447,
-    0xD20D85FD, 0xA50AB56B,
-    0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75,
-    0xDCD60DCF, 0xABD13D59,
-    0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423,
-    0xCFBA9599, 0xB8BDA50F,
-    0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11,
-    0xC1611DAB, 0xB6662D3D,
-    0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F,
-    0x9FBFE4A5, 0xE8B8D433,
-    0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D,
-    0x91646C97, 0xE6635C01,
-    0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B,
-    0x8208F4C1, 0xF50FC457,
-    0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49,
-    0x8CD37CF3, 0xFBD44C65,
-    0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7,
-    0xA4D1C46D, 0xD3D6F4FB,
-    0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5,
-    0xAA0A4C5F, 0xDD0D7CC9,
-    0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3,
-    0xB966D409, 0xCE61E49F,
-    0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81,
-    0xB7BD5C3B, 0xC0BA6CAD,
-    0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF,
-    0x04DB2615, 0x73DC1683,
-    0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D,
-    0x0A00AE27, 0x7D079EB1,
-    0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB,
-    0x196C3671, 0x6E6B06E7,
-    0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9,
-    0x17B7BE43, 0x60B08ED5,
-    0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767,
-    0x3FB506DD, 0x48B2364B,
-    0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55,
-    0x316E8EEF, 0x4669BE79,
-    0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703,
-    0x220216B9, 0x5505262F,
-    0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31,
-    0x2CD99E8B, 0x5BDEAE1D,
-    0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F,
-    0x72076785, 0x05005713,
-    0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D,
-    0x7CDCEFB7, 0x0BDBDF21,
-    0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B,
-    0x6FB077E1, 0x18B74777,
-    0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69,
-    0x616BFFD3, 0x166CCF45,
-    0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7,
-    0x4969474D, 0x3E6E77DB,
-    0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5,
-    0x47B2CF7F, 0x30B5FFE9,
-    0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693,
-    0x54DE5729, 0x23D967BF,
-    0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1,
-    0x5A05DF1B, 0x2D02EF8D
-  };
-
-  unsigned long crc = 0xFFFFFFFF;
-
-  for (; len > 0; len--, buf++)
-    crc = crc_tbl_osdep[(crc ^ *buf) & 0xFF] ^ (crc >> 8);
-  return(~crc);
-}
-
-
-/**
- * Calculate and check crc of the bluetooth packet
- *
- * @param buf buffer of the packet, with len + 4 bytes of data,
- *            the last 4 bytes being the checksum
- * @param len length of the payload in data
- * @return 0 on success (checksum matches), 1 on error
- */
-static int
-check_crc_buf_osdep (const unsigned char *buf, size_t len)
-{
-  unsigned long crc;
-
-  crc = calc_crc_osdep (buf, len);
-  buf += len;
-  if ((((crc) & 0xFF) == buf[0]) && (((crc >> 8) & 0xFF) == buf[1]) &&
-      ( ((crc >> 16) & 0xFF) == buf[2]) && ( ((crc >> 24) & 0xFF) == buf[3]) )
-    return 0;
-  return 1;
-}
-
-
-/* ************** end of clone  ***************** */
-#ifdef __linux__
-/**
- * Function for assigning a port number
- *
- * @param socket the socket used to bind
- * @param addr pointer to the rfcomm address
- * @return 0 on success
- */
-static int
-bind_socket (int socket, struct sockaddr_rc *addr)
-{
-  int port, status;
-
-  /* Bind every possible port (from 0 to 30) and stop when binding doesn't fail */
-  // FIXME : it should start from port 1, but on my computer it doesn't work :)
-  for (port = 3; port <= 30; port++)
-  {
-    addr->rc_channel = port;
-    status = bind (socket, (struct sockaddr *) addr, sizeof(struct
-                                                            sockaddr_rc));
-    if (status == 0)
-      return 0;
-  }
-
-  return -1;
-}
-
-
-#endif
-
-/**
- * Function used for creating the service record and registering it.
- *
- * @param dev pointer to the device struct
- * @param rc_channel the rfcomm channel
- * @return 0 on success
- */
-static int
-register_service (struct HardwareInfos *dev, int rc_channel)
-{
-  /**
-   * 1. initializations
-   * 2. set the service ID, class, profile information
-   * 3. make the service record publicly browsable
-   * 4. register the RFCOMM channel
-   * 5. set the name, provider and description
-   * 6. register the service record to the local SDP server
-   * 7. cleanup
-   */uint8_t svc_uuid_int[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                             dev->pl_mac.mac[5], dev->pl_mac.mac[4],
-                             dev->pl_mac.mac[3],
-                             dev->pl_mac.mac[2], dev->pl_mac.mac[1],
-                             dev->pl_mac.mac[0] };
-  const char *service_dsc = "Bluetooth plugin services";
-  const char *service_prov = "GNUnet provider";
-  uuid_t root_uuid, rfcomm_uuid, svc_uuid;
-  sdp_list_t *root_list = 0, *rfcomm_list = 0, *proto_list = 0,
-             *access_proto_list = 0, *svc_list = 0;
-  sdp_record_t *record = 0;
-  sdp_data_t *channel = 0;
-
-  record = sdp_record_alloc ();
-
-  /* Set the general service ID */
-  sdp_uuid128_create (&svc_uuid, &svc_uuid_int);
-  svc_list = sdp_list_append (0, &svc_uuid);
-  sdp_set_service_classes (record, svc_list);
-  sdp_set_service_id (record, svc_uuid);
-
-  /* Make the service record publicly browsable */
-  sdp_uuid16_create (&root_uuid, PUBLIC_BROWSE_GROUP);
-  root_list = sdp_list_append (0, &root_uuid);
-  sdp_set_browse_groups (record, root_list);
-
-  /* Register the RFCOMM channel */
-  sdp_uuid16_create (&rfcomm_uuid, RFCOMM_UUID);
-  channel = sdp_data_alloc (SDP_UINT8, &rc_channel);
-  rfcomm_list = sdp_list_append (0, &rfcomm_uuid);
-  sdp_list_append (rfcomm_list, channel);
-  proto_list = sdp_list_append (0, rfcomm_list);
-
-  /* Set protocol information */
-  access_proto_list = sdp_list_append (0, proto_list);
-  sdp_set_access_protos (record, access_proto_list);
-
-  /* Set the name, provider, and description */
-  sdp_set_info_attr (record, dev->iface, service_prov, service_dsc);
-
-  /* Connect to the local SDP server */
-  dev->session = sdp_connect (BDADDR_ANY, BDADDR_LOCAL, SDP_RETRY_IF_BUSY);
-
-  if (! dev->session)
-  {
-    fprintf (stderr,
-             "Failed to connect to the SDP server on interface `%.*s': %s\n",
-             IFNAMSIZ, dev->iface, strerror (errno));
-    // FIXME exit?
-    return 1;
-  }
-
-  /* Register the service record */
-  if (sdp_record_register (dev->session, record, 0) < 0)
-  {
-    fprintf (stderr,
-             "Failed to register a service record on interface `%.*s': %s\n",
-             IFNAMSIZ, dev->iface, strerror (errno));
-    // FIXME exit?
-    return 1;
-  }
-
-  /* Cleanup */
-  sdp_data_free (channel);
-  sdp_list_free (root_list, 0);
-  sdp_list_free (rfcomm_list, 0);
-  sdp_list_free (proto_list, 0);
-  sdp_list_free (access_proto_list, 0);
-  sdp_list_free (svc_list, 0);
-  sdp_record_free (record);
-
-  return 0;
-}
-
-
-/**
- * Function used for searching and browsing for a service. This will return the
- * port number on which the service is running.
- *
- * @param dev pointer to the device struct
- * @param dest target address
- * @return channel
- */
-static int
-get_channel (struct HardwareInfos *dev, bdaddr_t dest)
-{
-  /**
-   * 1. detect all nearby devices
-   * 2. for each device:
-   * 2.1. connect to the SDP server running
-   * 2.2. get a list of service records with the specific UUID
-   * 2.3. for each service record get a list of the protocol sequences and get
-   *       the port number
-   */uint8_t svc_uuid_int[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                             dest.b[5], dest.b[4], dest.b[3],
-                             dest.b[2], dest.b[1], dest.b[0] };
-  sdp_session_t *session = 0;
-  sdp_list_t *search_list = 0, *attrid_list = 0, *response_list = 0, *it = 0;
-  uuid_t svc_uuid;
-  uint32_t range = 0x0000ffff;
-  int channel = -1;
-
-  /* Connect to the local SDP server */
-  session = sdp_connect (BDADDR_ANY, &dest, 0);
-  if (! session)
-  {
-    fprintf (stderr,
-             "Failed to connect to the SDP server on interface `%.*s': %s\n",
-             IFNAMSIZ, dev->iface, strerror (errno));
-    return -1;
-  }
-
-  sdp_uuid128_create (&svc_uuid, &svc_uuid_int);
-  search_list = sdp_list_append (0, &svc_uuid);
-  attrid_list = sdp_list_append (0, &range);
-
-  if (sdp_service_search_attr_req (session, search_list,
-                                   SDP_ATTR_REQ_RANGE, attrid_list,
-                                   &response_list) == 0)
-  {
-    for (it = response_list; it; it = it->next)
-    {
-      sdp_record_t *record = (sdp_record_t *) it->data;
-      sdp_list_t *proto_list = 0;
-      if (sdp_get_access_protos (record, &proto_list) == 0)
-      {
-        channel = sdp_get_proto_port (proto_list, RFCOMM_UUID);
-        sdp_list_free (proto_list, 0);
-      }
-      sdp_record_free (record);
-    }
-  }
-
-  sdp_list_free (search_list, 0);
-  sdp_list_free (attrid_list, 0);
-  sdp_list_free (response_list, 0);
-
-  sdp_close (session);
-
-  if (-1 == channel)
-    fprintf (stderr,
-             "Failed to find the listening channel for interface `%.*s': %s\n",
-             IFNAMSIZ,
-             dev->iface,
-             strerror (errno));
-
-  return channel;
-}
-
-
-/**
- * Read from the socket and put the result into the buffer for transmission to 'stdout'.
- *
- * @param sock file descriptor for reading
- * @param buf buffer to read to; first bytes will be the 'struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame',
- *            followed by the actual payload
- * @param buf_size size of the buffer
- * @param ri where to write radiotap_rx info
- * @return number of bytes written to 'buf'
- */
-static ssize_t
-read_from_the_socket (void *sock,
-                      unsigned char *buf, size_t buf_size,
-                      struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage *ri)
-{
-  unsigned char tmpbuf[buf_size];
-  ssize_t count;
-  count = read (*((int *) sock), tmpbuf, buf_size);
-
-  if (0 > count)
-  {
-    if (EAGAIN == errno)
-      return 0;
-
-    fprintf (stderr, "Failed to read from the HCI socket: %s\n", strerror (
-               errno));
-
-    return -1;
-  }
-
-  #ifdef __linux__
-  /* Get the channel used */
-  int len;
-  struct sockaddr_rc rc_addr = { 0 };
-
-  memset (&rc_addr, 0, sizeof(rc_addr));
-  len = sizeof(rc_addr);
-  if (0 > getsockname (*((int *) sock), (struct sockaddr *) &rc_addr,
-                       (socklen_t *) &len))
-  {
-    fprintf (stderr, "getsockname() call failed : %s\n", strerror (errno));
-    return -1;
-  }
-
-  memset (ri, 0, sizeof(*ri));
-  ri->ri_channel = rc_addr.rc_channel;
-  #endif
-
-  /* Detect CRC32 at the end */
-  if (0 == check_crc_buf_osdep (tmpbuf, count - sizeof(uint32_t)))
-  {
-    count -= sizeof(uint32_t);
-  }
-
-  GNUNET_memcpy (buf, tmpbuf, count);
-
-  return count;
-}
-
-
-/**
- * Open the bluetooth interface for reading/writing
- *
- * @param dev pointer to the device struct
- * @return 0 on success, non-zero on error
- */
-static int
-open_device (struct HardwareInfos *dev)
-{
-  int i, dev_id = -1, fd_hci;
-  struct
-  {
-    struct hci_dev_list_req list;
-    struct hci_dev_req dev[HCI_MAX_DEV];
-  } request;                                // used for detecting the local devices
-  struct sockaddr_rc rc_addr = { 0 };      // used for binding
-
-  /* Initialize the neighbour structure */
-  neighbours.dev_id = -1;
-  for (i = 0; i < MAX_PORTS; i++)
-    neighbours.fds[i] = -1;
-
-  /* Open a HCI socket */
-  fd_hci = socket (AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);
-
-  if (fd_hci < 0)
-  {
-    fprintf (stderr,
-             "Failed to create HCI socket: %s\n",
-             strerror (errno));
-    return -1;
-  }
-
-  memset (&request, 0, sizeof(request));
-  request.list.dev_num = HCI_MAX_DEV;
-
-  if (ioctl (fd_hci, HCIGETDEVLIST, (void *) &request) < 0)
-  {
-    fprintf (stderr,
-             "ioctl(HCIGETDEVLIST) on interface `%.*s' failed: %s\n",
-             IFNAMSIZ,
-             dev->iface,
-             strerror (errno));
-    (void) close (fd_hci);
-    return 1;
-  }
-
-  /* Search for a device with dev->iface name */
-  for (i = 0; i < request.list.dev_num; i++)
-  {
-    struct hci_dev_info dev_info;
-
-    memset (&dev_info, 0, sizeof(struct hci_dev_info));
-    dev_info.dev_id = request.dev[i].dev_id;
-    strncpy (dev_info.name, dev->iface, BLUEZ_DEVNAME_SIZE);
-
-    if (ioctl (fd_hci, HCIGETDEVINFO, (void *) &dev_info))
-    {
-      fprintf (stderr,
-               "ioctl(HCIGETDEVINFO) on interface `%.*s' failed: %s\n",
-               IFNAMSIZ,
-               dev->iface,
-               strerror (errno));
-      (void) close (fd_hci);
-      return 1;
-    }
-
-    if (strncmp (dev_info.name, dev->iface, BLUEZ_DEVNAME_SIZE) == 0)
-    {
-      dev_id = dev_info.dev_id;     // the device was found
-      /**
-       * Copy the MAC address to the device structure
-       */
-      GNUNET_memcpy (&dev->pl_mac, &dev_info.bdaddr, sizeof(bdaddr_t));
-
-      /* Check if the interface is up */
-      if (hci_test_bit (HCI_UP, (void *) &dev_info.flags) == 0)
-      {
-        /* Bring the interface up */
-        if (ioctl (fd_hci, HCIDEVUP, dev_info.dev_id))
-        {
-          fprintf (stderr,
-                   "ioctl(HCIDEVUP) on interface `%.*s' failed: %s\n",
-                   IFNAMSIZ,
-                   dev->iface,
-                   strerror (errno));
-          (void) close (fd_hci);
-          return 1;
-        }
-      }
-
-      /* Check if the device is discoverable */
-      if ((hci_test_bit (HCI_PSCAN, (void *) &dev_info.flags) == 0) ||
-          (hci_test_bit (HCI_ISCAN, (void *) &dev_info.flags) == 0) )
-      {
-        /* Set interface Page Scan and Inqury Scan ON */
-        struct hci_dev_req dev_req;
-
-        memset (&dev_req, 0, sizeof(dev_req));
-        dev_req.dev_id = dev_info.dev_id;
-        dev_req.dev_opt = SCAN_PAGE | SCAN_INQUIRY;
-
-        if (ioctl (fd_hci, HCISETSCAN, (unsigned long) &dev_req))
-        {
-          fprintf (stderr,
-                   "ioctl(HCISETSCAN) on interface `%.*s' failed: %s\n",
-                   IFNAMSIZ,
-                   dev->iface,
-                   strerror (errno));
-          (void) close (fd_hci);
-          return 1;
-        }
-      }
-      break;
-    }
-  }
-
-  /* Check if the interface was not found */
-  if (-1 == dev_id)
-  {
-    fprintf (stderr,
-             "The interface %s was not found\n",
-             dev->iface);
-    (void) close (fd_hci);
-    return 1;
-  }
-
-  /* Close the hci socket */
-  (void) close (fd_hci);
-
-
-  /* Bind the rfcomm socket to the interface */
-  memset (&rc_addr, 0, sizeof(rc_addr));
-  rc_addr.rc_family = AF_BLUETOOTH;
-  rc_addr.rc_bdaddr = *BDADDR_ANY;
-
-  if (bind_socket (dev->fd_rfcomm, &rc_addr) != 0)
-  {
-    fprintf (stderr,
-             "Failed to bind interface `%.*s': %s\n",
-             IFNAMSIZ,
-             dev->iface,
-             strerror (errno));
-    return 1;
-  }
-
-  /* Register a SDP service */
-  if (register_service (dev, rc_addr.rc_channel) != 0)
-  {
-    fprintf (stderr,
-             "Failed to register a service on interface `%.*s': %s\n",
-             IFNAMSIZ,
-             dev->iface, strerror (errno));
-    return 1;
-  }
-
-  /* Switch socket in listening mode */
-  if (listen (dev->fd_rfcomm, 5) == -1)    // FIXME: probably we need a bigger number
-  {
-    fprintf (stderr, "Failed to listen on socket for interface `%.*s': %s\n",
-             IFNAMSIZ,
-             dev->iface, strerror (errno));
-    return 1;
-  }
-
-  return 0;
-}
-
-
-/**
- * Set the header to sane values to make attacks more difficult
- *
- * @param taIeeeHeader pointer to the header of the packet
- * @param dev pointer to the Hardware_Infos struct
- *
- **** copy from gnunet-helper-transport-wlan.c ****
- */
-static void
-mac_set (struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame *taIeeeHeader,
-         const struct HardwareInfos *dev)
-{
-  taIeeeHeader->frame_control = htons (IEEE80211_FC0_TYPE_DATA);
-  taIeeeHeader->addr3 = mac_bssid_gnunet;
-  taIeeeHeader->addr2 = dev->pl_mac;
-}
-
-
-#ifdef __linux__
-/**
- * Test if the given interface name really corresponds to a bluetooth
- * device.
- *
- * @param iface name of the interface
- * @return 0 on success, 1 on error
- **** similar with the one from gnunet-helper-transport-wlan.c ****
- */
-static int
-test_bluetooth_interface (const char *iface)
-{
-  char strbuf[512];
-  struct stat sbuf;
-  int ret;
-
-  ret = snprintf (strbuf, sizeof(strbuf),
-                  "/sys/class/bluetooth/%s/subsystem",
-                  iface);
-  if ((ret < 0) || (ret >= sizeof(strbuf)) || (0 != stat (strbuf, &sbuf)))
-  {
-    fprintf (stderr,
-             "Did not find 802.15.1 interface `%s'. Exiting.\n",
-             iface);
-    exit (1);
-  }
-  return 0;
-}
-
-
-#endif
-
-/**
- * Test incoming packets mac for being our own.
- *
- * @param taIeeeHeader buffer of the packet
- * @param dev the Hardware_Infos struct
- * @return 0 if mac belongs to us, 1 if mac is for another target
- *
- **** same as the one from gnunet-helper-transport-wlan.c ****
- */
-static int
-mac_test (const struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame *taIeeeHeader,
-          const struct HardwareInfos *dev)
-{
-  static struct GNUNET_TRANSPORT_WLAN_MacAddress all_zeros;
-
-  if ((0 == memcmp (&taIeeeHeader->addr3, &all_zeros, MAC_ADDR_SIZE)) ||
-      (0 == memcmp (&taIeeeHeader->addr1, &all_zeros, MAC_ADDR_SIZE)))
-    return 0; /* some drivers set no Macs, then assume it is all for us! */
-
-  if (0 != memcmp (&taIeeeHeader->addr3, &mac_bssid_gnunet, MAC_ADDR_SIZE))
-    return 1; /* not a GNUnet ad-hoc package */
-  if ((0 == memcmp (&taIeeeHeader->addr1, &dev->pl_mac, MAC_ADDR_SIZE)) ||
-      (0 == memcmp (&taIeeeHeader->addr1, &bc_all_mac, MAC_ADDR_SIZE)))
-    return 0; /* for us, or broadcast */
-  return 1; /* not for us */
-}
-
-
-/**
- * Process data from the stdin. Takes the message, forces the sender MAC to be correct
- * and puts it into our buffer for transmission to the receiver.
- *
- * @param cls pointer to the device struct ('struct HardwareInfos*')
- * @param hdr pointer to the start of the packet
- *
- **** same as the one from gnunet-helper-transport-wlan.c ****
- */
-static void
-stdin_send_hw (void *cls, const struct GNUNET_MessageHeader *hdr)
-{
-  struct HardwareInfos *dev = cls;
-  const struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage *header;
-  struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame *blueheader;
-  size_t sendsize;
-
-  sendsize = ntohs (hdr->size);
-  if ((sendsize <
-       sizeof(struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage)) ||
-      (GNUNET_MESSAGE_TYPE_WLAN_DATA_TO_HELPER != ntohs (hdr->type)))
-  {
-    fprintf (stderr, "Received malformed message\n");
-    exit (1);
-  }
-  sendsize -= (sizeof(struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage)
-               - sizeof(struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame));
-  if (MAXLINE < sendsize)
-  {
-    fprintf (stderr, "Packet too big for buffer\n");
-    exit (1);
-  }
-  header = (const struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage *) hdr;
-  GNUNET_memcpy (&write_pout.buf, &header->frame, sendsize);
-  blueheader = (struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame *) &write_pout.buf;
-
-  /* payload contains MAC address, but we don't trust it, so we'll
-   * overwrite it with OUR MAC address to prevent mischief */
-  mac_set (blueheader, dev);
-  GNUNET_memcpy (&blueheader->addr1, &header->frame.addr1,
-                 sizeof(struct GNUNET_TRANSPORT_WLAN_MacAddress));
-  write_pout.size = sendsize;
-}
-
-
-#ifdef __linux__
-/**
- * Broadcast a HELLO message for peer discovery
- *
- * @param dev pointer to the device struct
- * @param dev pointer to the socket which was added to the set
- * @return 0 on success
- */
-static int
-send_broadcast (struct HardwareInfos *dev, int *sendsocket)
-{
-  int new_device = 0;
-  int loops = 0;
-
-search_for_devices:
-  if (((neighbours.size == neighbours.pos) && (new_device == 1)) ||
-      (neighbours.size == 0) )
-  {
-inquiry_devices:      // skip the conditions and force a inquiry for new devices
-    {
-      /**
-       * It means that I sent HELLO messages to all the devices from the list and I should search
-       * for new ones or that this is the first time when I do a search.
-       */
-      inquiry_info *devices = NULL;
-      int i, responses, max_responses = MAX_PORTS;
-
-      /* sanity checks */
-      if (neighbours.size >= MAX_PORTS)
-      {
-        fprintf (stderr,
-                 "%.*s reached the top limit for the discovarable devices\n",
-                 IFNAMSIZ,
-                 dev->iface);
-        return 2;
-      }
-
-      /* Get the device id */
-      if (neighbours.dev_id == -1)
-      {
-        char addr[19] = { 0 };     // the device MAC address
-
-        ba2str ((bdaddr_t *) &dev->pl_mac, addr);
-        neighbours.dev_id = hci_devid (addr);
-        if (neighbours.dev_id < 0)
-        {
-          fprintf (stderr,
-                   "Failed to get the device id for interface %.*s : %s\n",
-                   IFNAMSIZ,
-                   dev->iface, strerror (errno));
-          return 1;
-        }
-      }
-
-      devices = malloc (max_responses * sizeof(inquiry_info));
-      if (devices == NULL)
-      {
-        fprintf (stderr,
-                 "Failed to allocate memory for inquiry info list on interface %.*s\n",
-                 IFNAMSIZ,
-                 dev->iface);
-        return 1;
-      }
-
-      responses = hci_inquiry (neighbours.dev_id, 8, max_responses, NULL,
-                               &devices, IREQ_CACHE_FLUSH);
-      if (responses < 0)
-      {
-        fprintf (stderr, "Failed to inquiry on interface %.*s\n", IFNAMSIZ,
-                 dev->iface);
-        return 1;
-      }
-
-      fprintf (stderr, "LOG : Found %d devices\n", responses);  // FIXME delete it after debugging stage
-
-      if (responses == 0)
-      {
-        fprintf (stderr, "LOG : No devices discoverable\n");
-        return 1;
-      }
-
-      for (i = 0; i < responses; i++)
-      {
-        int j;
-        int found = 0;
-
-        /* sanity check */
-        if (i >= MAX_PORTS)
-        {
-          fprintf (stderr,
-                   "%.*s reached the top limit for the discoverable devices (after inquiry)\n",
-                   IFNAMSIZ,
-                   dev->iface);
-          return 2;
-        }
-
-        /* Search if the address already exists on the list */
-        for (j = 0; j < neighbours.size; j++)
-        {
-          if (memcmp (&(devices + i)->bdaddr, &(neighbours.devices[j]),
-                      sizeof(bdaddr_t)) == 0)
-          {
-            found = 1;
-            fprintf (stderr, "LOG : the device already exists on the list\n");        // FIXME debugging message
-            break;
-          }
-        }
-
-        if (found == 0)
-        {
-          char addr[19] = { 0 };
-
-          ba2str (&(devices + i)->bdaddr, addr);
-          fprintf (stderr, "LOG : %s was added to the list\n", addr);      // FIXME debugging message
-          GNUNET_memcpy (&(neighbours.devices[neighbours.size++]), &(devices
-                                                                     + i)->
-                         bdaddr, sizeof(bdaddr_t));
-        }
-      }
-
-      free (devices);
-    }
-  }
-
-  int connection_successful = 0;
-  struct sockaddr_rc addr_rc = { 0 };
-  int errno_copy = 0;
-  addr_rc.rc_family = AF_BLUETOOTH;
-
-  /* Try to connect to a new device from the list */
-  while (neighbours.pos < neighbours.size)
-  {
-    /* Check if we are already connected to this device */
-    if (neighbours.fds[neighbours.pos] == -1)
-    {
-      memset (&addr_rc.rc_bdaddr, 0, sizeof(addr_rc.rc_bdaddr));
-      GNUNET_memcpy (&addr_rc.rc_bdaddr, &(neighbours.devices[neighbours.pos]),
-                     sizeof(addr_rc.rc_bdaddr));
-
-      addr_rc.rc_channel = get_channel (dev, addr_rc.rc_bdaddr);
-
-      *sendsocket = socket (AF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
-      if ((-1 < *sendsocket) &&
-          (0 == connect (*sendsocket,
-                         (struct sockaddr *) &addr_rc,
-                         sizeof(addr_rc))))
-      {
-        neighbours.fds[neighbours.pos++] = *sendsocket;
-        connection_successful = 1;
-        char addr[19] = { 0 };
-        ba2str (&(neighbours.devices[neighbours.pos - 1]), addr);
-        fprintf (stderr, "LOG : Connected to %s\n", addr);
-        break;
-      }
-      else
-      {
-        char addr[19] = { 0 };
-        errno_copy = errno;       // Save a copy for later
-
-        if (-1 != *sendsocket)
-        {
-          (void) close (*sendsocket);
-          *sendsocket = -1;
-        }
-        ba2str (&(neighbours.devices[neighbours.pos]), addr);
-        fprintf (stderr,
-                 "LOG : Couldn't connect on device %s, error : %s\n",
-                 addr,
-                 strerror (errno));
-        if (errno != ECONNREFUSED)       // FIXME be sure that this works
-        {
-          fprintf (stderr, "LOG : Removes %d device from the list\n",
-                   neighbours.pos);
-          /* Remove the device from the list */
-          GNUNET_memcpy (&neighbours.devices[neighbours.pos],
-                         &neighbours.devices[neighbours.size - 1],
-                         sizeof(bdaddr_t));
-          memset (&neighbours.devices[neighbours.size - 1], 0,
-                  sizeof(bdaddr_t));
-          neighbours.fds[neighbours.pos] = neighbours.fds[neighbours.size - 1];
-          neighbours.fds[neighbours.size - 1] = -1;
-          neighbours.size -= 1;
-        }
-
-        neighbours.pos += 1;
-
-        if (neighbours.pos >= neighbours.size)
-          neighbours.pos = 0;
-
-        loops += 1;
-
-        if (loops == MAX_LOOPS)       // don't get stuck trying to connect to one device
-          return 1;
-      }
-    }
-    else
-    {
-      fprintf (stderr, "LOG : Search for a new device\n");    // FIXME debugging message
-      neighbours.pos += 1;
-    }
-  }
-
-  /* Cycle on the list */
-  if (neighbours.pos == neighbours.size)
-  {
-    neighbours.pos = 0;
-    searching_devices_count += 1;
-
-    if (searching_devices_count == MAX_LOOPS)
-    {
-      fprintf (stderr, "LOG : Force to inquiry for new devices\n");
-      searching_devices_count = 0;
-      goto inquiry_devices;
-    }
-  }
-  /* If a new device wasn't found, search an old one */
-  if (connection_successful == 0)
-  {
-    int loop_check = neighbours.pos;
-    while (neighbours.fds[neighbours.pos] == -1)
-    {
-      if (neighbours.pos == neighbours.size)
-        neighbours.pos = 0;
-
-      if (neighbours.pos == loop_check)
-      {
-        if (errno_copy == ECONNREFUSED)
-        {
-          fprintf (stderr, "LOG : No device found. Go back and search again\n");        // FIXME debugging message
-          new_device = 1;
-          loops += 1;
-          goto search_for_devices;
-        }
-        else
-        {
-          return 1;         // Skip the broadcast message
-        }
-      }
-
-      neighbours.pos += 1;
-    }
-
-    *sendsocket = neighbours.fds[neighbours.pos++];
-  }
-
-  return 0;
-}
-
-
-#endif
-
-/**
- * Main function of the helper.  This code accesses a bluetooth interface
- * forwards traffic in both directions between the bluetooth interface and
- * stdin/stdout of this process.  Error messages are written to stderr.
- *
- * @param argc number of arguments, must be 2
- * @param argv arguments only argument is the name of the interface (e.g. 'hci0')
- * @return 0 on success (never happens, as we don't return unless aborted), 1 on error
- *
- **** similar to gnunet-helper-transport-wlan.c ****
- */
-int
-main (int argc, char *argv[])
-{
-#ifdef __linux__
-  struct HardwareInfos dev;
-  char readbuf[MAXLINE];
-  int maxfd;
-  fd_set rfds;
-  fd_set wfds;
-  int stdin_open;
-  struct MessageStreamTokenizer *stdin_mst;
-  int raw_eno, i;
-  int crt_rfds = 0, rfds_list[MAX_PORTS];
-  int broadcast, sendsocket;
-
-  /* Assert privs so we can modify the firewall rules! */
-  {
-#ifdef HAVE_SETRESUID
-    uid_t uid = getuid ();
-
-    if (0 != setresuid (uid, 0, 0))
-    {
-      fprintf (stderr,
-               "Failed to setresuid to root: %s\n",
-               strerror (errno));
-      return 254;
-    }
-#else
-    if (0 != seteuid (0))
-    {
-      fprintf (stderr,
-               "Failed to seteuid back to root: %s\n", strerror (errno));
-      return 254;
-    }
-#endif
-  }
-
-  /* Make use of SGID capabilities on POSIX */
-  memset (&dev, 0, sizeof(dev));
-  dev.fd_rfcomm = socket (AF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
-  raw_eno = errno;   /* remember for later */
-
-  /* Now that we've dropped root rights, we can do error checking */
-  if (2 != argc)
-  {
-    fprintf (stderr,
-             "You must specify the name of the interface as the first \
-                        and only argument to this program.\n");
-    if (-1 != dev.fd_rfcomm)
-      (void) close (dev.fd_rfcomm);
-    return 1;
-  }
-
-  if (-1 == dev.fd_rfcomm)
-  {
-    fprintf (stderr, "Failed to create a RFCOMM socket: %s\n", strerror (
-               raw_eno));
-    return 1;
-  }
-  if (dev.fd_rfcomm >= FD_SETSIZE)
-  {
-    fprintf (stderr, "File descriptor too large for select (%d > %d)\n",
-             dev.fd_rfcomm, FD_SETSIZE);
-    (void) close (dev.fd_rfcomm);
-    return 1;
-  }
-  if (0 != test_bluetooth_interface (argv[1]))
-  {
-    (void) close (dev.fd_rfcomm);
-    return 1;
-  }
-  strncpy (dev.iface, argv[1], IFNAMSIZ);
-  if (0 != open_device (&dev))
-  {
-    (void) close (dev.fd_rfcomm);
-    return 1;
-  }
-
-  /* Drop privs */
-  {
-    uid_t uid = getuid ();
-  #ifdef HAVE_SETRESUID
-    if (0 != setresuid (uid, uid, uid))
-    {
-      fprintf (stderr, "Failed to setresuid: %s\n", strerror (errno));
-      if (-1 != dev.fd_rfcomm)
-        (void) close (dev.fd_rfcomm);
-      return 1;
-    }
-  #else
-    if (0 != (setuid (uid) | seteuid (uid)))
-    {
-      fprintf (stderr, "Failed to setuid: %s\n", strerror (errno));
-      if (-1 != dev.fd_rfcomm)
-        (void) close (dev.fd_rfcomm);
-      return 1;
-    }
-  #endif
-  }
-
-  /* Send MAC address of the bluetooth interface to STDOUT first */
-  {
-    struct GNUNET_TRANSPORT_WLAN_HelperControlMessage macmsg;
-
-    macmsg.hdr.size = htons (sizeof(macmsg));
-    macmsg.hdr.type = htons (GNUNET_MESSAGE_TYPE_WLAN_HELPER_CONTROL);
-    GNUNET_memcpy (&macmsg.mac, &dev.pl_mac, sizeof(struct
-                                                    GNUNET_TRANSPORT_WLAN_MacAddress));
-    GNUNET_memcpy (write_std.buf, &macmsg, sizeof(macmsg));
-    write_std.size = sizeof(macmsg);
-  }
-
-
-  stdin_mst = mst_create (&stdin_send_hw, &dev);
-  stdin_open = 1;
-
-  /**
-   * TODO : I should make the time out of a mac endpoint smaller and check if the rate
-   * from get_wlan_header (plugin_transport_bluetooth.c) is correct.
-   */
-  while (1)
-  {
-    maxfd = -1;
-    broadcast = 0;
-    sendsocket = -1;
-
-    FD_ZERO (&rfds);
-    if ((0 == write_pout.size) && (1 == stdin_open))
-    {
-      FD_SET (STDIN_FILENO, &rfds);
-      maxfd = MAX (maxfd, STDIN_FILENO);
-    }
-    if (0 == write_std.size)
-    {
-      FD_SET (dev.fd_rfcomm, &rfds);
-      maxfd = MAX (maxfd, dev.fd_rfcomm);
-    }
-
-    for (i = 0; i < crt_rfds; i++)    // it can receive messages from multiple devices
-    {
-      FD_SET (rfds_list[i], &rfds);
-      maxfd = MAX (maxfd, rfds_list[i]);
-    }
-    FD_ZERO (&wfds);
-    if (0 < write_std.size)
-    {
-      FD_SET (STDOUT_FILENO, &wfds);
-      maxfd = MAX (maxfd, STDOUT_FILENO);
-    }
-    if (0 < write_pout.size)   // it can send messages only to one device per loop
-    {
-      struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame *frame;
-      /* Get the destination address */
-      frame = (struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame *) write_pout.buf;
-
-      if (memcmp (&frame->addr1, &dev.pl_mac,
-                  sizeof(struct GNUNET_TRANSPORT_WLAN_MacAddress)) == 0)
-      {
-        broadcast = 1;
-        memset (&write_pout, 0, sizeof(write_pout));      // clear the buffer
-      }
-      else if (memcmp (&frame->addr1, &broadcast_address,
-                       sizeof(struct GNUNET_TRANSPORT_WLAN_MacAddress)) == 0)
-      {
-        fprintf (stderr, "LOG : %s has a broadcast message (pos %d, size %d)\n",
-                 dev.iface, neighbours.pos, neighbours.size);                                                                      // FIXME: debugging message
-
-        if (send_broadcast (&dev, &sendsocket) != 0)      // if the searching wasn't successful don't get stuck on the select stage
-        {
-          broadcast = 1;
-          memset (&write_pout, 0, sizeof(write_pout));        // remove the message
-          fprintf (stderr,
-                   "LOG : Skipping the broadcast message (pos %d, size %d)\n",
-                   neighbours.pos, neighbours.size);
-        }
-        else
-        {
-          FD_SET (sendsocket, &wfds);
-          maxfd = MAX (maxfd, sendsocket);
-        }
-      }
-      else
-      {
-        int found = 0;
-        int pos = 0;
-        /* Search if the address already exists on the list */
-        for (i = 0; i < neighbours.size; i++)
-        {
-          if (memcmp (&frame->addr1, &(neighbours.devices[i]),
-                      sizeof(bdaddr_t)) == 0)
-          {
-            pos = i;
-            if (neighbours.fds[i] != -1)
-            {
-              found = 1;             // save the position where it was found
-              FD_SET (neighbours.fds[i], &wfds);
-              maxfd = MAX (maxfd, neighbours.fds[i]);
-              sendsocket = neighbours.fds[i];
-              fprintf (stderr, "LOG: the address was found in the list\n");
-              break;
-            }
-          }
-        }
-        if (found == 0)
-        {
-          int status;
-          struct sockaddr_rc addr = { 0 };
-
-          fprintf (stderr,
-                   "LOG : %s has a new message for %.2X:%.2X:%.2X:%.2X:%.2X:%.2X which isn't on the broadcast list\n",
-                   dev.iface,
-                   frame->addr1.mac[5], frame->addr1.mac[4],
-                   frame->addr1.mac[3],
-                   frame->addr1.mac[2], frame->addr1.mac[1],
-                   frame->addr1.mac[0]);                                                  // FIXME: debugging message
-
-          sendsocket = socket (AF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
-
-          if (sendsocket < 0)
-          {
-            fprintf (stderr,
-                     "Failed to create a RFCOMM socket (sending stage): %s\n",
-                     strerror (errno));
-            return -1;
-          }
-
-          GNUNET_memcpy (&addr.rc_bdaddr, &frame->addr1, sizeof(bdaddr_t));
-          addr.rc_family = AF_BLUETOOTH;
-          addr.rc_channel = get_channel (&dev, addr.rc_bdaddr);
-
-          int tries = 0;
-connect_retry:
-          status = connect (sendsocket, (struct sockaddr *) &addr,
-                            sizeof(addr));
-          if ((0 != status) && (errno != EAGAIN) )
-          {
-            if ((errno == ECONNREFUSED) && (tries < 2) )
-            {
-              fprintf (stderr, "LOG : %.*s failed to connect. Trying again!\n",
-                       IFNAMSIZ, dev.iface);
-              tries++;
-              goto connect_retry;
-            }
-            else if (errno == EBADF)
-            {
-              fprintf (stderr, "LOG : %s failed to connect : %s. Skip it!\n",
-                       dev.iface, strerror (errno));
-              memset (&write_pout, 0, sizeof(write_pout));
-              broadcast = 1;
-            }
-            else
-            {
-              fprintf (stderr,
-                       "LOG : %s failed to connect : %s. Try again later!\n",
-                       dev.iface,
-                       strerror (errno));
-              memset (&write_pout, 0, sizeof(write_pout));
-              broadcast = 1;
-            }
-          }
-          else
-          {
-            FD_SET (sendsocket, &wfds);
-            maxfd = MAX (maxfd, sendsocket);
-            fprintf (stderr, "LOG : Connection successful\n");
-            if (pos != 0)           // save the socket
-            {
-              neighbours.fds[pos] = sendsocket;
-            }
-            else
-            {
-              /* Add the new device to the discovered devices list */
-              if (neighbours.size < MAX_PORTS)
-              {
-                neighbours.fds[neighbours.size] = sendsocket;
-                GNUNET_memcpy (&(neighbours.devices[neighbours.size++]),
-                               &addr.rc_bdaddr, sizeof(bdaddr_t));
-              }
-              else
-              {
-                fprintf (stderr,
-                         "The top limit for the discovarable devices' list was reached\n");
-              }
-            }
-          }
-        }
-      }
-    }
-
-    if (broadcast == 0)
-    {
-      /* Select a fd which is ready for action :) */
-      {
-        int retval = select (maxfd + 1, &rfds, &wfds, NULL, NULL);
-        if ((-1 == retval) && (EINTR == errno))
-          continue;
-        if ((0 > retval) && (errno != EBADF) ) // we handle BADF errors later
-        {
-          fprintf (stderr, "select failed: %s\n", strerror (errno));
-          break;
-        }
-      }
-      if (FD_ISSET (STDOUT_FILENO, &wfds))
-      {
-        ssize_t ret =
-          write (STDOUT_FILENO, write_std.buf + write_std.pos,
-                 write_std.size - write_std.pos);
-        if (0 > ret)
-        {
-          fprintf (stderr, "Failed to write to STDOUT: %s\n", strerror (errno));
-          break;
-        }
-        write_std.pos += ret;
-        if (write_std.pos == write_std.size)
-        {
-          write_std.pos = 0;
-          write_std.size = 0;
-        }
-        fprintf (stderr, "LOG : %s sends a message to STDOUT\n", dev.iface);      // FIXME: debugging message
-      }
-      if (-1 != sendsocket)
-      {
-        if (FD_ISSET (sendsocket, &wfds))
-        {
-          ssize_t ret = write (sendsocket,
-                               write_pout.buf + write_std.pos,
-                               write_pout.size - write_pout.pos);
-          if (0 > ret)         // FIXME should I first check the error type?
-          {
-            fprintf (stderr,
-                     "Failed to write to bluetooth device: %s. Closing the socket!\n",
-                     strerror (errno));
-            for (i = 0; i < neighbours.size; i++)
-            {
-              if (neighbours.fds[i] == sendsocket)
-              {
-                (void) close (sendsocket);
-                neighbours.fds[i] = -1;
-                break;
-              }
-            }
-            /* Remove the message */
-            memset (&write_pout.buf + write_std.pos, 0, (write_pout.size
-                                                         - write_pout.pos));
-            write_pout.pos = 0;
-            write_pout.size = 0;
-          }
-          else
-          {
-            write_pout.pos += ret;
-            if ((write_pout.pos != write_pout.size) && (0 != ret))
-            {
-              /* We should not get partial sends with packet-oriented devices... */
-              fprintf (stderr, "Write error, partial send: %u/%u\n",
-                       (unsigned int) write_pout.pos,
-                       (unsigned int) write_pout.size);
-              break;
-            }
-
-            if (write_pout.pos == write_pout.size)
-            {
-              write_pout.pos = 0;
-              write_pout.size = 0;
-            }
-            fprintf (stderr, "LOG : %s sends a message to a DEVICE\n",
-                     dev.iface);                                                            // FIXME: debugging message
-          }
-        }
-      }
-      for (i = 0; i <= maxfd; i++)
-      {
-        if (FD_ISSET (i, &rfds))
-        {
-          if (i == STDIN_FILENO)
-          {
-            ssize_t ret =
-              read (i, readbuf, sizeof(readbuf));
-            if (0 > ret)
-            {
-              fprintf (stderr,
-                       "Read error from STDIN: %s\n",
-                       strerror (errno));
-              break;
-            }
-            if (0 == ret)
-            {
-              /* stop reading... */
-              stdin_open = 0;
-            }
-            else
-            {
-              mst_receive (stdin_mst, readbuf, ret);
-              fprintf (stderr, "LOG : %s receives a message from STDIN\n",
-                       dev.iface);                                                                // FIXME: debugging message
-            }
-          }
-          else if (i == dev.fd_rfcomm)
-          {
-            int readsocket;
-            struct sockaddr_rc addr = { 0 };
-            unsigned int opt = sizeof(addr);
-
-            readsocket = accept (dev.fd_rfcomm, (struct sockaddr *) &addr,
-                                 &opt);
-            fprintf (stderr, "LOG : %s accepts a message\n", dev.iface);          // FIXME: debugging message
-            if (readsocket == -1)
-            {
-              fprintf (stderr,
-                       "Failed to accept a connection on interface: %.*s\n",
-                       IFNAMSIZ,
-                       strerror (errno));
-              break;
-            }
-            else
-            {
-              FD_SET (readsocket, &rfds);
-              maxfd = MAX (maxfd, readsocket);
-
-              if (crt_rfds < MAX_PORTS)
-                rfds_list[crt_rfds++] = readsocket;
-              else
-              {
-                fprintf (stderr,
-                         "The limit for the read file descriptors list was \
-                                  reached\n");
-                break;
-              }
-            }
-          }
-          else
-          {
-            struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage *rrm;
-            ssize_t ret;
-            fprintf (stderr, "LOG : %s reads something from the socket\n",
-                     dev.iface);                                                               // FIXME : debugging message
-            rrm = (struct
-                   GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage *) write_std.buf;
-            ret =
-              read_from_the_socket ((void *) &i, (unsigned char *) &rrm->frame,
-                                    sizeof(write_std.buf)
-                                    - sizeof(struct
-                                             GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage)
-                                    + sizeof(struct
-                                             GNUNET_TRANSPORT_WLAN_Ieee80211Frame),
-                                    rrm);
-            if (0 >= ret)
-            {
-              int j;
-              FD_CLR (i, &rfds);
-              close (i);
-              /* Remove the socket from the list */
-              for (j = 0; j < crt_rfds; j++)
-              {
-                if (rfds_list[j] == i)
-                {
-                  rfds_list[j] ^= rfds_list[crt_rfds - 1];
-                  rfds_list[crt_rfds - 1] ^= rfds_list[j];
-                  rfds_list[j] ^= rfds_list[crt_rfds - 1];
-                  crt_rfds -= 1;
-                  break;
-                }
-              }
-
-              fprintf (stderr, "Read error from raw socket: %s\n", strerror (
-                         errno));
-              break;
-            }
-            if ((0 < ret) && (0 == mac_test (&rrm->frame, &dev)))
-            {
-              write_std.size = ret
-                               + sizeof(struct
-                                        GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage)
-                               - sizeof(struct
-                                        GNUNET_TRANSPORT_WLAN_Ieee80211Frame);
-              rrm->header.size = htons (write_std.size);
-              rrm->header.type = htons (
-                GNUNET_MESSAGE_TYPE_WLAN_DATA_FROM_HELPER);
-            }
-          }
-        }
-      }
-    }
-  }
-  /* Error handling, try to clean up a bit at least */
-  mst_destroy (stdin_mst);
-  stdin_mst = NULL;
-  sdp_close (dev.session);
-  (void) close (dev.fd_rfcomm);
-  if (-1 != sendsocket)
-    (void) close (sendsocket);
-
-  for (i = 0; i < crt_rfds; i++)
-    (void) close (rfds_list[i]);
-
-  for (i = 0; i < neighbours.size; i++)
-    (void) close (neighbours.fds[i]);
-  #else
-  struct HardwareInfos dev;
-  struct GNUNET_NETWORK_Handle *sendsocket;
-  struct GNUNET_NETWORK_FDSet *rfds;
-  struct GNUNET_NETWORK_FDSet *wfds;
-  struct GNUNET_NETWORK_Handle *rfds_list[MAX_PORTS];
-  char readbuf[MAXLINE] = { 0 };
-  SOCKADDR_BTH acc_addr = { 0 };
-  int addr_len = sizeof(SOCKADDR_BTH);
-  int broadcast, i, stdin_open, crt_rfds = 0;
-  HANDLE stdin_handle = GetStdHandle (STD_INPUT_HANDLE);
-  HANDLE stdout_handle = GetStdHandle (STD_OUTPUT_HANDLE);
-  struct MessageStreamTokenizer *stdin_mst;
-
-  /* check the handles */
-  if (stdin_handle == INVALID_HANDLE_VALUE)
-  {
-    fprintf (stderr, "Failed to get the stdin handle\n");
-    ExitProcess (2);
-  }
-
-  if (stdout_handle == INVALID_HANDLE_VALUE)
-  {
-    fprintf (stderr, "Failed to get the stdout handle\n");
-    ExitProcess (2);
-  }
-
-  /* initialize windows sockets */
-  initialize_windows_sockets ();
-
-  // /* test bluetooth socket family support */ --> it return false because the GNUNET_NETWORK_test_pf should also receive the type of socket (BTHPROTO_RFCOMM)
-  // if (GNUNET_NETWORK_test_pf (AF_BTH) != GNUNET_OK)
-  // {
-  //   fprintf (stderr, "AF_BTH family is not supported\n");
-  //   ExitProcess (2);
-  // }
-
-  /* create the socket */
-  dev.handle = GNUNET_NETWORK_socket_create (AF_BTH, SOCK_STREAM,
-                                             BTHPROTO_RFCOMM);
-  if (dev.handle == NULL)
-  {
-    fprintf (stderr, "Failed to create RFCOMM socket: ");
-    print_last_error ();
-    ExitProcess (2);
-  }
-
-
-  if (open_device (&dev) == -1)
-  {
-    fprintf (stderr, "Failed to open the device\n");
-    print_last_error ();
-    if (GNUNET_NETWORK_socket_close (dev.handle) != GNUNET_OK)
-    {
-      fprintf (stderr, "Failed to close the socket!\n");
-      print_last_error ();
-    }
-    ExitProcess (2);
-  }
-
-  if (GNUNET_OK != GNUNET_NETWORK_socket_set_blocking (dev.handle, 1))
-  {
-    fprintf (stderr, "Failed to change the socket mode\n");
-    ExitProcess (2);
-  }
-
-  memset (&write_std, 0, sizeof(write_std));
-  memset (&write_pout, 0, sizeof(write_pout));
-  stdin_open = 1;
-
-  rfds = GNUNET_NETWORK_fdset_create ();
-  wfds = GNUNET_NETWORK_fdset_create ();
-
-  /* Send MAC address of the bluetooth interface to STDOUT first */
-  {
-    struct GNUNET_TRANSPORT_WLAN_HelperControlMessage macmsg;
-
-    macmsg.hdr.size = htons (sizeof(macmsg));
-    macmsg.hdr.type = htons (GNUNET_MESSAGE_TYPE_WLAN_HELPER_CONTROL);
-    GNUNET_memcpy (&macmsg.mac, &dev.pl_mac, sizeof(struct
-                                                    GNUNET_TRANSPORT_WLAN_MacAddress_Copy));
-    GNUNET_memcpy (write_std.buf, &macmsg, sizeof(macmsg));
-    write_std.size = sizeof(macmsg);
-  }
-
-
-  stdin_mst = mst_create (&stdin_send_hw, &dev);
-  stdin_open = 1;
-
-  int pos = 0;
-  int stdin_pos = -1;
-  int stdout_pos = -1;
-  while (1)
-  {
-    broadcast = 0;
-    pos = 0;
-    stdin_pos = -1;
-    stdout_pos = -1;
-    sendsocket = NULL;   // FIXME ???memleaks
-
-    GNUNET_NETWORK_fdset_zero (rfds);
-    if ((0 == write_pout.size) && (1 == stdin_open))
-    {
-      stdin_pos = pos;
-      pos += 1;
-      GNUNET_NETWORK_fdset_handle_set (rfds, (struct
-                                              GNUNET_DISK_FileHandle*) &
-                                       stdin_handle);
-    }
-
-    if (0 == write_std.size)
-    {
-      pos += 1;
-      GNUNET_NETWORK_fdset_set (rfds, dev.handle);
-    }
-
-    for (i = 0; i < crt_rfds; i++)
-    {
-      pos += 1;
-      GNUNET_NETWORK_fdset_set (rfds, rfds_list[i]);
-    }
-
-    GNUNET_NETWORK_fdset_zero (wfds);
-    if (0 < write_std.size)
-    {
-      stdout_pos = pos;
-      GNUNET_NETWORK_fdset_handle_set (wfds, (struct
-                                              GNUNET_DISK_FileHandle*) &
-                                       stdout_handle);
-      // printf ("%s\n", write_std.buf);
-      // memset (write_std.buf, 0, write_std.size);
-      // write_std.size = 0;
-    }
-
-    if (0 < write_pout.size)
-    {
-      if (strcmp (argv[1], "ff:ff:ff:ff:ff:ff") == 0)
-      {
-        fprintf (stderr, "LOG: BROADCAST! Skipping the message\n");
-        // skip the message
-        broadcast = 1;
-        memset (write_pout.buf, 0, write_pout.size);
-        write_pout.size = 0;
-      }
-      else
-      {
-        SOCKADDR_BTH addr;
-        fprintf (stderr, "LOG : has a new message for %s\n", argv[1]);
-        sendsocket = GNUNET_NETWORK_socket_create (AF_BTH, SOCK_STREAM,
-                                                   BTHPROTO_RFCOMM);
-
-        if (sendsocket == NULL)
-        {
-          fprintf (stderr, "Failed to create RFCOMM socket: \n");
-          print_last_error ();
-          ExitProcess (2);
-        }
-
-        memset (&addr, 0, sizeof(addr));
-        // addr.addressFamily = AF_BTH;
-        if (SOCKET_ERROR ==
-            WSAStringToAddress (argv[1], AF_BTH, NULL, (LPSOCKADDR) &addr,
-                                &addr_len))
-        {
-          fprintf (stderr, "Failed to translate the address: ");
-          print_last_error ();
-          ExitProcess (2);
-        }
-        addr.port = get_channel (argv[1]);
-        if (addr.port == -1)
-        {
-          fprintf (stderr,
-                   "Couldn't find the sdp service for the address: %s\n",
-                   argv[1]);
-          memset (write_pout.buf, 0, write_pout.size);
-          write_pout.size = 0;
-          broadcast = 1;         // skipping the select part
-        }
-        else
-        {
-          if (GNUNET_OK != GNUNET_NETWORK_socket_connect (sendsocket,
-                                                          (LPSOCKADDR) &addr,
-                                                          addr_len))
-          {
-            fprintf (stderr, "Failed to connect: ");
-            print_last_error ();
-            ExitProcess (2);
-          }
-
-          if (GNUNET_OK != GNUNET_NETWORK_socket_set_blocking (sendsocket, 1))
-          {
-            fprintf (stderr, "Failed to change the socket mode\n");
-            ExitProcess (2);
-          }
-
-          GNUNET_NETWORK_fdset_set (wfds, sendsocket);
-        }
-      }
-    }
-
-    if (broadcast == 0)
-    {
-      int retval = GNUNET_NETWORK_socket_select (rfds, wfds, NULL,
-                                                 GNUNET_TIME_relative_get_forever_ ());
-      if (retval < 0)
-      {
-        fprintf (stderr, "Select error\n");
-        ExitProcess (2);
-      }
-      // if (GNUNET_NETWORK_fdset_isset (wfds, (struct GNUNET_NETWORK_Handle*)&stdout_handle))
-      if (retval == stdout_pos)
-      {
-        fprintf (stderr, "LOG : sends a message to STDOUT\n");      // FIXME: debugging message
-        // ssize_t ret;
-        // ret = GNUNET_NETWORK_socket_send ((struct GNUNET_NETWORK_Handle *)&stdout_handle,  write_std.buf + write_std.pos, write_std.size - write_std.pos);
-        // ret = write (STDOUT_FILENO, write_std.buf + write_std.pos,  write_std.size - write_std.pos);
-        DWORD ret;
-        if (FALSE == WriteFile (stdout_handle, write_std.buf + write_std.pos,
-                                write_std.size - write_std.pos, &ret, NULL))
-        {
-          fprintf (stderr, "Failed to write to STDOUT: ");
-          print_last_error ();
-          break;
-        }
-
-        if (ret <= 0)
-        {
-          fprintf (stderr, "Failed to write to STDOUT\n");
-          ExitProcess (2);
-        }
-
-        write_std.pos += ret;
-        if (write_std.pos == write_std.size)
-        {
-          write_std.pos = 0;
-          write_std.size = 0;
-        }
-      }
-      if (sendsocket != NULL)
-      {
-        if (GNUNET_NETWORK_fdset_isset (wfds, sendsocket))
-        {
-          ssize_t ret;
-          ret = GNUNET_NETWORK_socket_send (sendsocket, write_pout.buf
-                                            + write_pout.pos,
-                                            write_pout.size - write_pout.pos);
-
-          if (GNUNET_SYSERR == ret)
-          {
-            fprintf (stderr,
-                     "Failed to send to the socket. Closing the socket. Error: \n");
-            print_last_error ();
-            if (GNUNET_NETWORK_socket_close (sendsocket) != GNUNET_OK)
-            {
-              fprintf (stderr, "Failed to close the sendsocket!\n");
-              print_last_error ();
-            }
-            ExitProcess (2);
-          }
-          else
-          {
-            write_pout.pos += ret;
-            if ((write_pout.pos != write_pout.size) && (0 != ret))
-            {
-              /* we should not get partial sends with packet-oriented devices... */
-              fprintf (stderr, "Write error, partial send: %u/%u\n",
-                       (unsigned int) write_pout.pos,
-                       (unsigned int) write_pout.size);
-              break;
-            }
-
-            if (write_pout.pos == write_pout.size)
-            {
-              write_pout.pos = 0;
-              write_pout.size = 0;
-            }
-            fprintf (stderr, "LOG : sends a message to a DEVICE\n");          // FIXME: debugging message
-          }
-        }
-      }
-
-      // if (GNUNET_NETWORK_fdset_isset (rfds, (struct GNUNET_NETWORK_Handle*)&stdin_handle))
-      if (retval == stdin_pos)
-      {
-        // ssize_t ret;
-        // ret = GNUNET_NETWORK_socket_recv ((struct GNUNET_NETWORK_Handle *)&stdin_handle, readbuf, sizeof (write_pout.buf));
-        // ret = read (STDIN_FILENO, readbuf, sizeof (readbuf));
-        DWORD ret;
-        if (FALSE == ReadFile (stdin_handle, readbuf, sizeof(readbuf), &ret,
-                               NULL))                                                    /* do nothing asynchronous */
-        {
-          fprintf (stderr, "Read error from STDIN: ");
-          print_last_error ();
-          break;
-        }
-        if (0 == ret)
-        {
-          /* stop reading... */
-          stdin_open = 0;
-        }
-        else
-        {
-          mst_receive (stdin_mst, readbuf, ret);
-          fprintf (stderr, "LOG : receives a message from STDIN\n");        // FIXME: debugging message
-        }
-      }
-      else if (GNUNET_NETWORK_fdset_isset (rfds, dev.handle))
-      {
-        fprintf (stderr, "LOG: accepting connection\n");
-        struct GNUNET_NETWORK_Handle *readsocket;
-        readsocket = GNUNET_NETWORK_socket_accept (dev.handle,
-                                                   (LPSOCKADDR) &acc_addr,
-                                                   &addr_len);
-        if (readsocket == NULL)
-        {
-          fprintf (stderr, "Accept error %d: ", GetLastError ());
-          print_last_error ();
-          ExitProcess (2);
-        }
-        else
-        {
-          if (GNUNET_OK != GNUNET_NETWORK_socket_set_blocking (readsocket, 1))
-          {
-            fprintf (stderr, "Failed to change the socket mode\n");
-            ExitProcess (2);
-          }
-          GNUNET_NETWORK_fdset_set (rfds, readsocket);
-
-          if (crt_rfds < MAX_PORTS)
-            rfds_list[crt_rfds++] = readsocket;
-          else
-          {
-            fprintf (stderr,
-                     "The limit for the read file descriptors list was reached\n");
-            break;
-          }
-        }
-      }
-      else
-        for (i = 0; i < crt_rfds; i++)
-        {
-          if (GNUNET_NETWORK_fdset_isset (rfds, rfds_list[i]))
-          {
-            struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage *rrm;
-            ssize_t ret;
-            fprintf (stderr, "LOG: reading something from the socket\n");       // FIXME : debugging message
-            rrm = (struct
-                   GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage *) write_std.buf;
-            ret = read_from_the_socket (rfds_list[i], (unsigned
-                                                       char *) &rrm->frame,
-                                        sizeof(write_std.buf)
-                                        - sizeof(struct
-                                                 GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage)
-                                        + sizeof(struct
-                                                 GNUNET_TRANSPORT_WLAN_Ieee80211Frame),
-                                        rrm);
-            if (0 >= ret)
-            {
-              // TODO remove the socket from the list
-              if (GNUNET_NETWORK_socket_close (rfds_list[i]) != GNUNET_OK)
-              {
-                fprintf (stderr, "Failed to close the sendsocket!\n");
-                print_last_error ();
-              }
-
-              fprintf (stderr, "Read error from raw socket: ");
-              print_last_error ();
-              break;
-            }
-            if ((0 < ret) && (0 == mac_test (&rrm->frame, &dev)))
-            {
-              write_std.size = ret
-                               + sizeof(struct
-                                        GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage)
-                               - sizeof(struct
-                                        GNUNET_TRANSPORT_WLAN_Ieee80211Frame);
-              rrm->header.size = htons (write_std.size);
-              rrm->header.type = htons (
-                GNUNET_MESSAGE_TYPE_WLAN_DATA_FROM_HELPER);
-            }
-            break;
-          }
-        }
-    }
-  }
-
-  mst_destroy (stdin_mst);
-  stdin_mst = NULL;
-
-  if (GNUNET_NETWORK_socket_close (dev.handle) != GNUNET_OK)
-  {
-    fprintf (stderr, "Failed to close the socket!\n");
-    print_last_error ();
-  }
-
-  for (i = 0; i < crt_rfds; i++)
-  {
-    if (GNUNET_NETWORK_socket_close (rfds_list[i]) != GNUNET_OK)
-    {
-      fprintf (stderr, "Failed to close the socket!\n");
-      print_last_error ();
-    }
-  }
-
-  WSACleanup ();
-  #endif
-  return 1;                     /* we never exit 'normally' */
-}
diff --git a/src/transport/gnunet-helper-transport-wlan-dummy.c b/src/transport/gnunet-helper-transport-wlan-dummy.c
deleted file mode 100644
index ab77f5c68..000000000
--- a/src/transport/gnunet-helper-transport-wlan-dummy.c
+++ /dev/null
@@ -1,520 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2010, 2012 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport/gnunet-helper-transport-wlan-dummy.c
- * @brief helper for the testcases for plugin_transport_wlan.c
- * @author David Brodski
- */
-#include "platform.h"
-#include "gnunet_protocols.h"
-#include "gnunet_util_lib.h"
-#include "plugin_transport_wlan.h"
-
-/**
- * Name of the fifo to use for IPC with the other dummy process.
- */
-#define FIFO_FILE1 "/tmp/test-transport/api-wlan-p1/WLAN_FIFO_in"
-
-/**
- * Name of the fifo to use for IPC with the other dummy process.
- */
-#define FIFO_FILE2 "/tmp/test-transport/api-wlan-p1/WLAN_FIFO_out"
-
-/**
- * Maximum size of a message allowed in either direction
- * (used for our receive and sent buffers).
- */
-#define MAXLINE 4096
-
-
-/**
- * IO buffer used for buffering data in transit.
- */
-struct SendBuffer
-{
-  /**
-   * How many bytes that were stored in 'buf' did we already write to the
-   * destination?  Always smaller than 'size'.
-   */
-  size_t pos;
-
-  /**
-   * How many bytes of data are stored in 'buf' for transmission right now?
-   * Data always starts at offset 0 and extends to 'size'.
-   */
-  size_t size;
-
-  /**
-   * Buffered data; twice the maximum allowed message size as we add some
-   * headers.
-   */
-  char buf[MAXLINE * 2];
-};
-
-
-/**
- * Flag set to 1 if we are to terminate, otherwise 0.
- */
-static int closeprog;
-
-
-/**
- * We're being killed, clean up.
- *
- * @param sig killing signal
- */
-static void
-sigfunc (int sig)
-{
-  closeprog = 1;
-  (void) unlink (FIFO_FILE1);
-  (void) unlink (FIFO_FILE2);
-}
-
-
-/**
- * Create control message for plugin
- *
- * @param buffer pointer to buffer for the message
- * @param mac pointer to the mac address
- * @return number of bytes written
- */
-static int
-send_mac_to_plugin (char *buffer, struct GNUNET_TRANSPORT_WLAN_MacAddress *mac)
-{
-  struct GNUNET_TRANSPORT_WLAN_HelperControlMessage macmsg;
-
-  GNUNET_memcpy (&macmsg.mac,
-                 (char *) mac,
-                 sizeof(struct GNUNET_TRANSPORT_WLAN_MacAddress));
-  macmsg.hdr.size =
-    htons (sizeof(struct GNUNET_TRANSPORT_WLAN_HelperControlMessage));
-  macmsg.hdr.type = htons (GNUNET_MESSAGE_TYPE_WLAN_HELPER_CONTROL);
-  GNUNET_memcpy (buffer,
-                 &macmsg,
-                 sizeof(struct GNUNET_TRANSPORT_WLAN_HelperControlMessage));
-  return sizeof(struct GNUNET_TRANSPORT_WLAN_HelperControlMessage);
-}
-
-
-/**
- * We got a message from the FIFO, check it, convert the message
- * type to the output forward and copy it to the buffer for stdout.
- *
- * @param cls the 'struct SendBuffer' to copy the converted message to
- * @param hdr inbound message from the FIFO
- * @return #GNUNET_OK on success,
- *    #GNUNET_NO to stop further processing (no error)
- *    #GNUNET_SYSERR to stop further processing with error
- */
-static int
-stdin_send (void *cls, const struct GNUNET_MessageHeader *hdr)
-{
-  struct SendBuffer *write_pout = cls;
-  const struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage *in;
-  size_t payload_size;
-  struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage newheader;
-  uint16_t sendsize;
-
-  sendsize = ntohs (hdr->size);
-  in = (const struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage *) hdr;
-  if ((GNUNET_MESSAGE_TYPE_WLAN_DATA_TO_HELPER != ntohs (hdr->type)) ||
-      (sizeof(struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage) > sendsize))
-  {
-    fprintf (stderr, "%s", "Received malformed message\n");
-    exit (1);
-  }
-  payload_size =
-    sendsize - sizeof(struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage);
-  if ((payload_size
-       + sizeof(struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage)
-       + write_pout->size) > MAXLINE * 2)
-  {
-    fprintf (stderr, "%s", "Packet too big for buffer\n");
-    exit (1);
-  }
-  memset (&newheader, 0, sizeof(newheader));
-  newheader.header.size = htons (payload_size + sizeof(newheader));
-  newheader.header.type = htons (GNUNET_MESSAGE_TYPE_WLAN_DATA_FROM_HELPER);
-  newheader.frame = in->frame;
-  GNUNET_memcpy (write_pout->buf + write_pout->size,
-                 &newheader,
-                 sizeof(newheader));
-  write_pout->size += sizeof(newheader);
-  GNUNET_memcpy (write_pout->buf + write_pout->size, &in[1], payload_size);
-  write_pout->size += payload_size;
-  return GNUNET_OK;
-}
-
-
-/**
- * We read a full message from stdin.  Copy it to our send buffer.
- *
- * @param cls the 'struct SendBuffer' to copy to
- * @param hdr the message we received to copy to the buffer
- * @return #GNUNET_OK on success,
- *    #GNUNET_NO to stop further processing (no error)
- *    #GNUNET_SYSERR to stop further processing with error
- */
-static int
-file_in_send (void *cls, const struct GNUNET_MessageHeader *hdr)
-{
-  struct SendBuffer *write_std = cls;
-  uint16_t sendsize;
-
-  sendsize = ntohs (hdr->size);
-  if ((sendsize + write_std->size) > MAXLINE * 2)
-  {
-    fprintf (stderr, "%s", "Packet too big for buffer\n");
-    exit (1);
-  }
-  GNUNET_memcpy (write_std->buf + write_std->size, hdr, sendsize);
-  write_std->size += sendsize;
-  return GNUNET_OK;
-}
-
-
-/**
- * Main function of a program that pretends to be a WLAN card.
- *
- * @param argc should be 2
- * @param argv either '1' or '2', depending on which of the two cards this dummy is to emulate
- * @return 1 on error, 0 if terminated normally via signal
- */
-int
-main (int argc, char *argv[])
-{
-  struct stat st;
-  int erg;
-  FILE *fpin = NULL;
-  FILE *fpout = NULL;
-  int fdpin;
-  int fdpout;
-  char readbuf[MAXLINE];
-  int readsize;
-  struct SendBuffer write_std;
-  struct SendBuffer write_pout;
-  int ret;
-  int maxfd;
-  fd_set rfds;
-  fd_set wfds;
-  struct timeval tv;
-  int retval;
-  struct GNUNET_MessageStreamTokenizer *stdin_mst = NULL;
-  struct GNUNET_MessageStreamTokenizer *file_in_mst = NULL;
-  struct GNUNET_TRANSPORT_WLAN_MacAddress macaddr;
-  int first;
-
-  if ((2 != argc) ||
-      ((0 != strcmp (argv[1], "1")) && (0 != strcmp (argv[1], "2"))))
-  {
-    fprintf (
-      stderr,
-      "%s",
-      "This program must be started with the operating mode (1 or 2) as the only argument.\n");
-    return 1;
-  }
-
-  /* make the fifos if needed */
-  umask (0);
-  if ((GNUNET_OK != GNUNET_DISK_directory_create_for_file (FIFO_FILE1)) ||
-      (GNUNET_OK != GNUNET_DISK_directory_create_for_file (FIFO_FILE2)))
-  {
-    fprintf (stderr, "Failed to create directory for file `%s'\n", FIFO_FILE1);
-    return 1;
-  }
-  if (0 == strcmp (argv[1], "1"))
-  {
-    if (0 != stat (FIFO_FILE1, &st))
-    {
-      erg = mkfifo (FIFO_FILE1, 0666);
-      if ((0 != erg) && (EEXIST != errno))
-        fprintf (stderr,
-                 "Error in mkfifo(%s): %s\n",
-                 FIFO_FILE1,
-                 strerror (errno));
-    }
-  }
-  else
-  {
-    if (0 != stat (FIFO_FILE2, &st))
-    {
-      GNUNET_break (0 == (erg = mkfifo (FIFO_FILE2, 0666)));
-      if ((0 != erg) && (EEXIST != errno))
-        fprintf (stderr,
-                 "Error in mkfifo(%s): %s\n",
-                 FIFO_FILE2,
-                 strerror (errno));
-    }
-  }
-
-  if (0 == strcmp (argv[1], "1"))
-  {
-    first = 1;
-    fpin = fopen (FIFO_FILE1, "r");
-    if (NULL == fpin)
-    {
-      fprintf (stderr,
-               "fopen of read FIFO_FILE1 failed: %s\n",
-               strerror (errno));
-      goto end;
-    }
-    if (NULL == (fpout = fopen (FIFO_FILE2, "w")))
-    {
-      GNUNET_break (0 == mkfifo (FIFO_FILE2, 0666));
-      fpout = fopen (FIFO_FILE2, "w");
-    }
-    if (NULL == fpout)
-    {
-      fprintf (stderr,
-               "fopen of write FIFO_FILE2 failed: %s\n",
-               strerror (errno));
-      goto end;
-    }
-  }
-  else
-  {
-    first = 0;
-    if (NULL == (fpout = fopen (FIFO_FILE1, "w")))
-    {
-      GNUNET_break (0 == mkfifo (FIFO_FILE1, 0666));
-      fpout = fopen (FIFO_FILE1, "w");
-    }
-    if (NULL == fpout)
-    {
-      fprintf (stderr,
-               "fopen of write FIFO_FILE1 failed: %s\n",
-               strerror (errno));
-      goto end;
-    }
-    fpin = fopen (FIFO_FILE2, "r");
-    if (NULL == fpin)
-    {
-      fprintf (stderr,
-               "fopen of read FIFO_FILE2 failed: %s\n",
-               strerror (errno));
-      goto end;
-    }
-  }
-
-  fdpin = fileno (fpin);
-  GNUNET_assert (fpin >= 0);
-  if (fdpin >= FD_SETSIZE)
-  {
-    fprintf (stderr,
-             "File fdpin number too large (%d > %u)\n",
-             fdpin,
-             (unsigned int) FD_SETSIZE);
-    goto end;
-  }
-
-  fdpout = fileno (fpout);
-  GNUNET_assert (fdpout >= 0);
-
-  if (fdpout >= FD_SETSIZE)
-  {
-    fprintf (stderr,
-             "File fdpout number too large (%d > %u)\n",
-             fdpout,
-             (unsigned int) FD_SETSIZE);
-    goto end;
-  }
-
-  signal (SIGINT, &sigfunc);
-  signal (SIGTERM, &sigfunc);
-  signal (GNUNET_TERM_SIG, &sigfunc);
-
-  write_std.size = 0;
-  write_std.pos = 0;
-  write_pout.size = 0;
-  write_pout.pos = 0;
-  stdin_mst = GNUNET_MST_create (&stdin_send, &write_pout);
-  file_in_mst = GNUNET_MST_create (&file_in_send, &write_std);
-
-  /* Send 'random' mac address */
-  macaddr.mac[0] = 0x13;
-  macaddr.mac[1] = 0x22;
-  macaddr.mac[2] = 0x33;
-  macaddr.mac[3] = 0x44;
-  macaddr.mac[4] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 256);
-  macaddr.mac[5] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, 256);
-  write_std.size = send_mac_to_plugin (write_std.buf, &macaddr);
-
-  while (0 == closeprog)
-  {
-    maxfd = -1;
-    tv.tv_sec = 5;
-    tv.tv_usec = 0;
-
-    FD_ZERO (&rfds);
-    FD_ZERO (&wfds);
-    /* if output queue is empty, read */
-    if (0 == write_pout.size)
-    {
-      FD_SET (STDIN_FILENO, &rfds);
-      maxfd = MAX (STDIN_FILENO, maxfd);
-    }
-    if (0 == write_std.size)
-    {
-      FD_SET (fdpin, &rfds);
-      maxfd = MAX (fdpin, maxfd);
-    }
-
-    /* if there is something to write, try to write */
-    if (0 < write_std.size)
-    {
-      FD_SET (STDOUT_FILENO, &wfds);
-      maxfd = MAX (maxfd, STDOUT_FILENO);
-    }
-    if (0 < write_pout.size)
-    {
-      FD_SET (fdpout, &wfds);
-      maxfd = MAX (maxfd, fdpout);
-    }
-
-    retval = select (maxfd + 1, &rfds, &wfds, NULL, &tv);
-    if ((-1 == retval) && (EINTR == errno))
-      continue;
-    if (0 > retval)
-    {
-      fprintf (stderr, "select failed: %s\n", strerror (errno));
-      closeprog = 1;
-      break;
-    }
-
-    if (FD_ISSET (STDOUT_FILENO, &wfds))
-    {
-      ret = write (STDOUT_FILENO,
-                   write_std.buf + write_std.pos,
-                   write_std.size - write_std.pos);
-      if (0 > ret)
-      {
-        closeprog = 1;
-        fprintf (stderr,
-                 "Write ERROR to STDOUT_FILENO: %s\n",
-                 strerror (errno));
-        break;
-      }
-      else
-      {
-        write_std.pos += ret;
-        /* check if finished writing */
-        if (write_std.pos == write_std.size)
-        {
-          write_std.pos = 0;
-          write_std.size = 0;
-        }
-      }
-    }
-
-    if (FD_ISSET (fdpout, &wfds))
-    {
-      ret = write (fdpout,
-                   write_pout.buf + write_pout.pos,
-                   write_pout.size - write_pout.pos);
-
-      if (0 > ret)
-      {
-        closeprog = 1;
-        fprintf (stderr,
-                 "Write ERROR to fdpout failed: %s\n",
-                 strerror (errno));
-      }
-      else
-      {
-        write_pout.pos += ret;
-        /* check if finished writing */
-        if (write_pout.pos == write_pout.size)
-        {
-          write_pout.pos = 0;
-          write_pout.size = 0;
-        }
-      }
-    }
-
-    if (FD_ISSET (STDIN_FILENO, &rfds))
-    {
-      readsize = read (STDIN_FILENO, readbuf, sizeof(readbuf));
-
-      if (0 > readsize)
-      {
-        closeprog = 1;
-        fprintf (stderr,
-                 "Error reading from STDIN_FILENO: %s\n",
-                 strerror (errno));
-      }
-      else if (0 < readsize)
-      {
-        GNUNET_MST_from_buffer (stdin_mst,
-                                readbuf,
-                                readsize,
-                                GNUNET_NO,
-                                GNUNET_NO);
-      }
-      else
-      {
-        /* eof */
-        closeprog = 1;
-      }
-    }
-
-    if (FD_ISSET (fdpin, &rfds))
-    {
-      readsize = read (fdpin, readbuf, sizeof(readbuf));
-      if (0 > readsize)
-      {
-        closeprog = 1;
-        fprintf (stderr, "Error reading from fdpin: %s\n", strerror (errno));
-        break;
-      }
-      else if (0 < readsize)
-      {
-        GNUNET_MST_from_buffer (file_in_mst,
-                                readbuf,
-                                readsize,
-                                GNUNET_NO,
-                                GNUNET_NO);
-      }
-      else
-      {
-        /* eof */
-        closeprog = 1;
-      }
-    }
-  }
-
-end:
-  /* clean up */
-  if (NULL != stdin_mst)
-    GNUNET_MST_destroy (stdin_mst);
-  if (NULL != file_in_mst)
-    GNUNET_MST_destroy (file_in_mst);
-
-  if (NULL != fpout)
-    fclose (fpout);
-  if (NULL != fpin)
-    fclose (fpin);
-  if (1 == first)
-  {
-    (void) unlink (FIFO_FILE1);
-    (void) unlink (FIFO_FILE2);
-  }
-  return 0;
-}
diff --git a/src/transport/gnunet-helper-transport-wlan.c b/src/transport/gnunet-helper-transport-wlan.c
deleted file mode 100644
index 72dd8b594..000000000
--- a/src/transport/gnunet-helper-transport-wlan.c
+++ /dev/null
@@ -1,2184 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2010, 2011, 2012 GNUnet e.V.
-   Copyright (c) 2007, 2008, Andy Green <andy@warmcat.com>
-   Copyright Copyright (C) 2009 Thomas d'Otreppe
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file src/transport/gnunet-helper-transport-wlan.c
- * @brief mediator between the wlan interface and gnunet; must run as root (SUID will do)
- *        This code will work under GNU/Linux only.
- * @author David Brodski
- * @author Christian Grothoff
- *
- * This program will allow receiving and sending traffic from the WLAN
- * interface.  It will force traffic to be in 'ad-hoc' mode, use the
- * proper MAC address of the WLAN interface and use a GNUnet-specific
- * SSID (and a GNUnet-specific SNAP header).  It only takes a single
- * argument, which is the name of the WLAN interface to use.  The
- * program detects if the interface is not a WLAN interface and exits
- * with an error in that case.
- *
- * Once initialized, the program will first send a 'struct
- * GNUNET_TRANSPORT_WLAN_HelperControlMessage' to 'stdout'.  That
- * message contains the MAC address of the WLAN interface.  It will
- * then read messages from the WLAN interface and send them together
- * with performance information as 'struct
- * GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage' messages to 'stdout'.
- * Furthermore, it will read a stream of messages from 'stdin' that
- * have the format from 'struct
- * GNUNET_TRANSPORT_WLAN_RadiotapSendMessage'.  Those messages will
- * then be sent via the WLAN interface; however, the sender MAC
- * address will be forced to be the correct address from our WLAN
- * card.  If 'stdin' closes, receiving from the WLAN interface will
- * continue.  If 'stdout' causes a SIGPIPE, the process dies from the
- * signal.  Errors cause an error message to be reported to 'stderr',
- * in most cases the process also exits (with status code '1').  The
- * program never terminates normally; it is safe to kill the
- * process with SIGTERM or SIGKILL at any time.
- *
- * Since it uses RAW sockets, the binary must be installed SUID or run
- * as 'root'.  In order to keep the security risk of the resulting
- * SUID binary minimal, the program ONLY opens the RAW socket with
- * root privileges, then drops them and only then starts to process
- * command line arguments.  The code also does not link against any
- * shared libraries (except libc) and is strictly minimal (except for
- * checking for errors).  The following list of people have reviewed
- * this code and considered it safe since the last modification (if
- * you reviewed it, please have your name added to the list):
- *
- * - Christian Grothoff (Apr 3rd 2012)
- */
-
-/*-
- * we use our local copy of ieee80211_radiotap.h
- *
- * - since we can't support extensions we don't understand
- * - since linux does not include it in userspace headers
- *
- * Portions of this code were taken from the ieee80211_radiotap.h header,
- * which is
- *
- * Copyright (c) 2003, 2004 David Young.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DAVID
- * YOUNG BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- */
-
-/*
- * Modifications to fit into the linux IEEE 802.11 stack,
- * Mike Kershaw (dragorn@kismetwireless.net)
- */
-/*
- * parts taken from aircrack-ng, parts changend.
- */
-#include "gnunet_config.h"
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <netpacket/packet.h>
-#include <linux/if_ether.h>
-#include <linux/if.h>
-#include <linux/wireless.h>
-#include <netinet/in.h>
-#include <linux/if_tun.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <dirent.h>
-#include <sys/param.h>
-#include <unistd.h>
-#include <stdint.h>
-
-#include "gnunet_protocols.h"
-#include "plugin_transport_wlan.h"
-
-/**
- * Packet format type for the messages we receive from
- * the kernel.  This is for Ethernet 10Mbps format (no
- * performance information included).
- */
-#define ARPHRD_ETHER        1
-
-
-/**
- * Packet format type for the messages we receive from
- * the kernel.  This is for plain messages (with no
- * performance information included).
- */
-#define ARPHRD_IEEE80211        801
-
-
-/**
- * Packet format type for the messages we receive from
- * the kernel.  This is for the PRISM format.
- */
-#define ARPHRD_IEEE80211_PRISM  802
-
-/**
- * Packet format type for the messages we receive from
- * the kernel.  This is for messages with a
- * 'struct Ieee80211RadiotapHeader' (see below).
- */
-#define ARPHRD_IEEE80211_FULL   803
-
-
-/**
- * Maximum size of a message allowed in either direction
- * (used for our receive and sent buffers).
- */
-#define MAXLINE 4096
-
-
-/* ********* structure of messages of type ARPHRD_IEEE80211_PRISM *********** */
-
-/**
- * Device name length in PRISM frames.
- * (In the kernel, this is "WLAN_DEVNAMELEN_MAX")
- */
-#define PRISM_DEVICE_NAME_LENGTH 16
-
-/**
- * Monitor Frame (indicator that we have a 'struct PrismHeader').
- */
-#define PRISM_MSGCODE_MONITOR 0x0041
-
-/**
- * Mac time element.  In micro-seconds.
- * Drivers appear to use a 64bit counter to hold mactime internal
- * the then fill the prism header with the lower 32 bits
- */
-#define PRISM_DID_MACTIME 0x2041
-
-/**
- * Channel element
- */
-#define PRISM_DID_CHANNEL 0x3041
-
-/**
- * Signal element.  Should be the signal strength in dbm, some people
- * suggest that instead "100 - (strength in dbm)" is used (to make this
- * a positive integer).
- */
-#define PRISM_DID_SIGNAL 0x6041
-
-/**
- * Noise element
- */
-#define PRISM_DID_NOISE 0x7041
-
-/**
- * Rate element, in units/multiples of 500Khz
- */
-#define PRISM_DID_RATE 0x8041
-
-
-/**
- * Value is set (supplied)
- */
-#define PRISM_STATUS_OK 0
-
-/**
- * Value not supplied.
- */
-#define PRISM_STATUS_NO_VALUE 1
-
-
-/**
- * Values in the 'struct PrismHeader'.  All in host byte order (!).
- */
-struct PrismValue
-{
-  /**
-   * This has a different ID for each parameter, see
-   * PRISM_DID_* constants.
-   */
-  uint32_t did;
-
-  /**
-   * See PRISM_STATUS_*-constants.  Note that they are unusual: 0 = set;  1 = not set
-   */
-  uint16_t status;
-
-  /**
-   * length of data (which is always a uint32_t, but presumably this can be used
-   * to specify that fewer bytes are used (with values in 'len' from 0-4).  We
-   * ignore this field.
-   */
-  uint16_t len;
-
-  /**
-   * The data value
-   */
-  uint32_t data;
-} __attribute__ ((packed));
-
-
-/**
- * Prism header format ('struct p80211msg' in Linux).  All in host byte order (!).
- */
-struct PrismHeader
-{
-  /**
-   * We expect this to be a PRISM_MSGCODE_*.
-   */
-  uint32_t msgcode;
-
-  /**
-   * The length of the entire header.
-   */
-  uint32_t msglen;
-
-  /**
-   * Name of the device that captured the packet.
-   */
-  char devname[PRISM_DEVICE_NAME_LENGTH];
-
-  /* followed by 'struct PrismValue's.  Documentation suggests that these
-     are typically the hosttime, mactime, channel, rssi, sq, signal, noise,
-     rate, istx and frmlen values, but documentation is sparse.  So we
-     will use the 'did' fields to find out what we actually got. */
-} __attribute__ ((packed));
-
-
-/* ******  end of structure of messages of type ARPHRD_IEEE80211_PRISM ******* */
-
-/* ********** structure of messages of type ARPHRD_IEEE80211_FULL *********** */
-
-/**
- * Bits in the 'it_present' bitmask from the 'struct
- * Ieee80211RadiotapHeader'.  For each value, we give the name, data
- * type, unit and then a description below.  Note that the actual size
- * of the extension can be bigger as arguments must be padded so that
- * args of a given length must begin at a boundary of that length.
- * However, note that compound args are allowed (eg, 2 x uint16_t for
- * IEEE80211_RADIOTAP_CHANNEL) so total argument length is not a
- * reliable indicator of alignment requirement.  See also
- * 'man 9 ieee80211_radiotap'.
- */
-enum RadiotapType
-{
-  /**
-   * IEEE80211_RADIOTAP_TSFT              __le64       microseconds
-   *
-   *      Value in microseconds of the MAC's 64-bit 802.11 Time
-   *      Synchronization Function timer when the first bit of the
-   *      MPDU arrived at the MAC. For received frames, only.
-   */
-  IEEE80211_RADIOTAP_TSFT = 0,
-
-  /**
-   * IEEE80211_RADIOTAP_FLAGS             uint8_t           bitmap
-   *
-   *      Properties of transmitted and received frames. See flags
-   *      defined below.
-   */
-  IEEE80211_RADIOTAP_FLAGS = 1,
-
-  /**
-   * IEEE80211_RADIOTAP_RATE              uint8_t           500kb/s
-   *
-   *      Tx/Rx data rate
-   */
-  IEEE80211_RADIOTAP_RATE = 2,
-
-  /**
-   * IEEE80211_RADIOTAP_CHANNEL           2 x __le16   MHz, bitmap
-   *
-   *      Tx/Rx frequency in MHz, followed by flags (see below).
-   */
-  IEEE80211_RADIOTAP_CHANNEL = 3,
-  /**
-   * IEEE80211_RADIOTAP_FHSS              __le16       see below
-   *
-   *      For frequency-hopping radios, the hop set (first byte)
-   *      and pattern (second byte).
-   */
-  IEEE80211_RADIOTAP_FHSS = 4,
-
-  /**
-   * IEEE80211_RADIOTAP_DBM_ANTSIGNAL     s8           decibels from
-   *                                                   one milliwatt (dBm)
-   *
-   *      RF signal power at the antenna, decibel difference from
-   *      one milliwatt.
-   */
-  IEEE80211_RADIOTAP_DBM_ANTSIGNAL = 5,
-
-  /**
-   * IEEE80211_RADIOTAP_DBM_ANTNOISE      s8           decibels from
-   *                                                   one milliwatt (dBm)
-   *
-   *      RF noise power at the antenna, decibel difference from one
-   *      milliwatt.
-   */
-  IEEE80211_RADIOTAP_DBM_ANTNOISE = 6,
-
-  /**
-   * IEEE80211_RADIOTAP_LOCK_QUALITY      __le16       unitless
-   *
-   *      Quality of Barker code lock. Unitless. Monotonically
-   *      nondecreasing with "better" lock strength. Called "Signal
-   *      Quality" in datasheets.  (Is there a standard way to measure
-   *      this?)
-   */
-  IEEE80211_RADIOTAP_LOCK_QUALITY = 7,
-
-  /**
-   * IEEE80211_RADIOTAP_TX_ATTENUATION    __le16       unitless
-   *
-   *      Transmit power expressed as unitless distance from max
-   *      power set at factory calibration.  0 is max power.
-   *      Monotonically nondecreasing with lower power levels.
-   */
-  IEEE80211_RADIOTAP_TX_ATTENUATION = 8,
-
-  /**
-   * IEEE80211_RADIOTAP_DB_TX_ATTENUATION __le16       decibels (dB)
-   *
-   *      Transmit power expressed as decibel distance from max power
-   *      set at factory calibration.  0 is max power.  Monotonically
-   *      nondecreasing with lower power levels.
-   */
-  IEEE80211_RADIOTAP_DB_TX_ATTENUATION = 9,
-
-  /**
-   * IEEE80211_RADIOTAP_DBM_TX_POWER      s8           decibels from
-   *                                                   one milliwatt (dBm)
-   *
-   *      Transmit power expressed as dBm (decibels from a 1 milliwatt
-   *      reference). This is the absolute power level measured at
-   *      the antenna port.
-   */
-  IEEE80211_RADIOTAP_DBM_TX_POWER = 10,
-
-  /**
-   * IEEE80211_RADIOTAP_ANTENNA           uint8_t           antenna index
-   *
-   *      Unitless indication of the Rx/Tx antenna for this packet.
-   *      The first antenna is antenna 0.
-   */
-  IEEE80211_RADIOTAP_ANTENNA = 11,
-
-  /**
-   * IEEE80211_RADIOTAP_DB_ANTSIGNAL      uint8_t           decibel (dB)
-   *
-   *      RF signal power at the antenna, decibel difference from an
-   *      arbitrary, fixed reference.
-   */
-  IEEE80211_RADIOTAP_DB_ANTSIGNAL = 12,
-
-  /**
-   * IEEE80211_RADIOTAP_DB_ANTNOISE       uint8_t           decibel (dB)
-   *
-   *      RF noise power at the antenna, decibel difference from an
-   *      arbitrary, fixed reference point.
-   */
-  IEEE80211_RADIOTAP_DB_ANTNOISE = 13,
-
-  /**
-   * IEEE80211_RADIOTAP_RX_FLAGS          __le16       bitmap
-   *
-   *     Properties of received frames. See flags defined below.
-   */
-  IEEE80211_RADIOTAP_RX_FLAGS = 14,
-
-  /**
-   * IEEE80211_RADIOTAP_TX_FLAGS          __le16       bitmap
-   *
-   *     Properties of transmitted frames. See flags defined below.
-   */
-  IEEE80211_RADIOTAP_TX_FLAGS = 15,
-
-  /**
-   * IEEE80211_RADIOTAP_RTS_RETRIES       uint8_t           data
-   *
-   *     Number of rts retries a transmitted frame used.
-   */
-  IEEE80211_RADIOTAP_RTS_RETRIES = 16,
-
-  /**
-   * IEEE80211_RADIOTAP_DATA_RETRIES      uint8_t           data
-   *
-   *     Number of unicast retries a transmitted frame used.
-   */
-  IEEE80211_RADIOTAP_DATA_RETRIES = 17,
-
-  /**
-   * Extension bit, used to indicate that more bits are needed for
-   * the bitmask.
-   */
-  IEEE80211_RADIOTAP_EXT = 31
-};
-
-/**
- * Bitmask indicating an extension of the bitmask is used.
- * (Mask corresponding to IEEE80211_RADIOTAP_EXT).
- */
-#define IEEE80211_RADIOTAP_PRESENT_EXTEND_MASK (1 << IEEE80211_RADIOTAP_EXT)
-
-
-/**
- * Bit in IEEE80211_RADIOTAP_FLAGS (which we might get
- * as part of a 'struct Ieee80211RadiotapHeader' extension
- * if the IEEE80211_RADIOTAP_FLAGS bit is set in
- * 'it_present').  The radiotap flags are an 8-bit field.
- *
- * Frame was sent/received during CFP (Contention Free Period)
- */
-#define IEEE80211_RADIOTAP_F_CFP        0x01
-
-/**
- * Bit in IEEE80211_RADIOTAP_FLAGS (which we might get
- * as part of a 'struct Ieee80211RadiotapHeader' extension
- * if the IEEE80211_RADIOTAP_FLAGS bit is set in
- * 'it_present').  The radiotap flags are an 8-bit field.
- *
- * Frame was sent/received with short preamble
- */
-#define IEEE80211_RADIOTAP_F_SHORTPRE   0x02
-
-/**
- * Bit in IEEE80211_RADIOTAP_FLAGS (which we might get
- * as part of a 'struct Ieee80211RadiotapHeader' extension
- * if the IEEE80211_RADIOTAP_FLAGS bit is set in
- * 'it_present').  The radiotap flags are an 8-bit field.
- *
- * Frame was sent/received with WEP encryption
- */
-#define IEEE80211_RADIOTAP_F_WEP        0x04
-
-/**
- * Bit in IEEE80211_RADIOTAP_FLAGS (which we might get
- * as part of a 'struct Ieee80211RadiotapHeader' extension
- * if the IEEE80211_RADIOTAP_FLAGS bit is set in
- * 'it_present').  The radiotap flags are an 8-bit field.
- *
- * Frame was sent/received with fragmentation
- */
-#define IEEE80211_RADIOTAP_F_FRAG       0x08
-
-/**
- * Bit in IEEE80211_RADIOTAP_FLAGS (which we might get
- * as part of a 'struct Ieee80211RadiotapHeader' extension
- * if the IEEE80211_RADIOTAP_FLAGS bit is set in
- * 'it_present').  The radiotap flags are an 8-bit field.
- *
- * Frame includes FCS (CRC at the end that needs to be removeD).
- */
-#define IEEE80211_RADIOTAP_F_FCS        0x10
-
-/**
- * Bit in IEEE80211_RADIOTAP_FLAGS (which we might get
- * as part of a 'struct Ieee80211RadiotapHeader' extension
- * if the IEEE80211_RADIOTAP_FLAGS bit is set in
- * 'it_present').  The radiotap flags are an 8-bit field.
- *
- * Frame has padding between 802.11 header and payload
- * (to 32-bit boundary)
- */
-#define IEEE80211_RADIOTAP_F_DATAPAD    0x20
-
-
-/**
- * For IEEE80211_RADIOTAP_RX_FLAGS:
- * frame failed crc check
- */
-#define IEEE80211_RADIOTAP_F_RX_BADFCS  0x0001
-
-/**
- * For IEEE80211_RADIOTAP_TX_FLAGS ('txflags' in 'struct RadiotapTransmissionHeader'):
- * failed due to excessive retries
- */
-#define IEEE80211_RADIOTAP_F_TX_FAIL    0x0001
-
-/**
- * For IEEE80211_RADIOTAP_TX_FLAGS ('txflags' in 'struct RadiotapTransmissionHeader'):
- * used cts 'protection'
- */
-#define IEEE80211_RADIOTAP_F_TX_CTS     0x0002
-
-/**
- * For IEEE80211_RADIOTAP_TX_FLAGS ('txflags' in 'struct RadiotapTransmissionHeader'):
- * used rts/cts handshake
- */
-#define IEEE80211_RADIOTAP_F_TX_RTS     0x0004
-
-/**
- * For IEEE80211_RADIOTAP_TX_FLAGS ('txflags' in 'struct RadiotapTransmissionHeader'):
- * frame should not be ACKed
- */
-#define IEEE80211_RADIOTAP_F_TX_NOACK   0x0008
-
-/**
- * For IEEE80211_RADIOTAP_TX_FLAGS ('txflags' in 'struct RadiotapTransmissionHeader'):
- * sequence number handled by userspace
- */
-#define IEEE80211_RADIOTAP_F_TX_NOSEQ   0x0010
-
-
-/**
- * Generic header for radiotap messages (receiving and sending).  A
- * bit mask (it_present) determines which specific records follow.
- *
- * I am trying to describe precisely what the application programmer
- * should expect in the following, and for that reason I tell the
- * units and origin of each measurement (where it applies), or else I
- * use sufficiently weaselly language ("is a monotonically nondecreasing
- * function of...") that I cannot set false expectations for lawyerly
- * readers.
- *
- * The radio capture header precedes the 802.11 header.
- * All data in the header is little endian on all platforms.
- */
-struct Ieee80211RadiotapHeader
-{
-  /**
-   * Version 0. Only increases for drastic changes, introduction of
-   * compatible new fields does not count.
-   */
-  uint8_t it_version;
-
-  /**
-   * Padding.  Set to 0.
-   */
-  uint8_t it_pad;
-
-  /**
-   * length of the whole header in bytes, including it_version,
-   * it_pad, it_len, and data fields.
-   */
-  uint16_t it_len;
-
-  /**
-   * A bitmap telling which fields are present. Set bit 31
-   * (0x80000000) to extend the bitmap by another 32 bits.  Additional
-   * extensions are made by setting bit 31.
-   */
-  uint32_t it_present;
-};
-
-
-/**
- * Format of the header we need to prepend to messages to be sent to the
- * Kernel.
- */
-struct RadiotapTransmissionHeader
-{
-  /**
-   * First we begin with the 'generic' header we also get when receiving
-   * messages.
-   */
-  struct Ieee80211RadiotapHeader header;
-
-  /**
-   * Transmission rate (we use 0, kernel makes up its mind anyway).
-   */
-  uint8_t rate;
-
-  /**
-   * Padding (we use 0).  There is a requirement to pad args, so that
-   * args of a given length must begin at a boundary of that length.
-   * As our next argument is the 'it_len' with 2 bytes, we need 1 byte
-   * of padding.
-   */
-  uint8_t pad1;
-
-  /**
-   * Transmission flags from on the IEEE80211_RADIOTAP_F_TX_* constant family.
-   */
-  uint16_t txflags;
-};
-
-/**
- * The above 'struct RadiotapTransmissionHeader' should have the
- * following value for 'header.it_present' based on the presence of
- * the 'rate' and 'txflags' in the overall struct.
- */
-#define IEEE80211_RADIOTAP_OUR_TRANSMISSION_HEADER_MASK ((1 \
-                                                          << \
-                                                          IEEE80211_RADIOTAP_RATE) \
-                                                         | (1 \
-                                                            << \
-                                                            IEEE80211_RADIOTAP_TX_FLAGS))
-
-
-/**
- * struct Ieee80211RadiotapHeaderIterator - tracks walk through present radiotap arguments
- * in the radiotap header.  Used when we parse radiotap packets received from the kernel.
- */
-struct Ieee80211RadiotapHeaderIterator
-{
-  /**
-   * pointer to the radiotap header we are walking through
-   */
-  const struct Ieee80211RadiotapHeader *rtheader;
-
-  /**
-   * pointer to current radiotap arg
-   */
-  const uint8_t *this_arg;
-
-  /**
-   * internal next argument pointer
-   */
-  const uint8_t *arg;
-
-  /**
-   * internal pointer to next present uint32_t (if IEEE80211_RADIOTAP_EXT is used).
-   */
-  const uint32_t *next_bitmap;
-
-  /**
-   * length of radiotap header in host byte ordering
-   */
-  size_t max_length;
-
-  /**
-   * internal shifter for current uint32_t bitmap, (it_present in host byte order),
-   * If bit 0 is set, the 'arg_index' argument is present.
-   */
-  uint32_t bitmap_shifter;
-
-  /**
-   * IEEE80211_RADIOTAP_... index of current arg
-   */
-  unsigned int this_arg_index;
-
-  /**
-   * internal next argument index
-   */
-  unsigned int arg_index;
-};
-
-
-/* ************** end of structure of ARPHRD_IEEE80211_FULL ************** */
-
-/* ************************** our globals ******************************* */
-
-/**
- * struct for storing the information of the hardware.  There is only
- * one of these.
- */
-struct HardwareInfos
-{
-  /**
-   * file descriptor for the raw socket
-   */
-  int fd_raw;
-
-  /**
-   * Which format has the header that we're getting when receiving packets?
-   * Some  ARPHRD_IEEE80211_XXX-value.
-   */
-  int arptype_in;
-
-  /**
-   * Name of the interface, not necessarily 0-terminated (!).
-   */
-  char iface[IFNAMSIZ];
-
-  /**
-   * MAC address of our own WLAN interface.
-   */
-  struct GNUNET_TRANSPORT_WLAN_MacAddress pl_mac;
-};
-
-
-/**
- * IO buffer used for buffering data in transit (to wireless or to stdout).
- */
-struct SendBuffer
-{
-  /**
-   * How many bytes of data are stored in 'buf' for transmission right now?
-   * Data always starts at offset 0 and extends to 'size'.
-   */
-  size_t size;
-
-  /**
-   * How many bytes that were stored in 'buf' did we already write to the
-   * destination?  Always smaller than 'size'.
-   */
-  size_t pos;
-
-  /**
-   * Buffered data; twice the maximum allowed message size as we add some
-   * headers.
-   */
-  char buf[MAXLINE * 2];
-};
-
-
-/**
- * Buffer for data read from stdin to be transmitted to the wirless card.
- */
-static struct SendBuffer write_pout;
-
-/**
- * Buffer for data read from the wireless card to be transmitted to stdout.
- */
-static struct SendBuffer write_std;
-
-
-/* *********** specialized version of server_mst.c begins here ********** */
-
-/**
- * To what multiple do we align messages?  8 byte should suffice for everyone
- * for now.
- */
-#define ALIGN_FACTOR 8
-
-/**
- * Smallest supported message.
- */
-#define MIN_BUFFER_SIZE sizeof(struct GNUNET_MessageHeader)
-
-
-/**
- * Functions with this signature are called whenever a
- * complete message is received by the tokenizer.
- *
- * @param cls closure
- * @param message the actual message
- */
-typedef void (*MessageTokenizerCallback) (void *cls,
-                                          const struct
-                                          GNUNET_MessageHeader *
-                                          message);
-
-/**
- * Handle to a message stream tokenizer.
- */
-struct MessageStreamTokenizer
-{
-  /**
-   * Function to call on completed messages.
-   */
-  MessageTokenizerCallback cb;
-
-  /**
-   * Closure for cb.
-   */
-  void *cb_cls;
-
-  /**
-   * Size of the buffer (starting at 'hdr').
-   */
-  size_t curr_buf;
-
-  /**
-   * How many bytes in buffer have we already processed?
-   */
-  size_t off;
-
-  /**
-   * How many bytes in buffer are valid right now?
-   */
-  size_t pos;
-
-  /**
-   * Beginning of the buffer.  Typed like this to force alignment.
-   */
-  struct GNUNET_MessageHeader *hdr;
-};
-
-
-/**
- * Create a message stream tokenizer.
- *
- * @param cb function to call on completed messages
- * @param cb_cls closure for cb
- * @return handle to tokenizer
- */
-static struct MessageStreamTokenizer *
-mst_create (MessageTokenizerCallback cb,
-            void *cb_cls)
-{
-  struct MessageStreamTokenizer *ret;
-
-  ret = malloc (sizeof(struct MessageStreamTokenizer));
-  if (NULL == ret)
-  {
-    fprintf (stderr, "Failed to allocate buffer for tokenizer\n");
-    exit (1);
-  }
-  ret->hdr = malloc (MIN_BUFFER_SIZE);
-  if (NULL == ret->hdr)
-  {
-    fprintf (stderr, "Failed to allocate buffer for alignment\n");
-    exit (1);
-  }
-  ret->curr_buf = MIN_BUFFER_SIZE;
-  ret->cb = cb;
-  ret->cb_cls = cb_cls;
-  return ret;
-}
-
-
-/**
- * Add incoming data to the receive buffer and call the
- * callback for all complete messages.
- *
- * @param mst tokenizer to use
- * @param buf input data to add
- * @param size number of bytes in buf
- * @return GNUNET_OK if we are done processing (need more data)
- *         GNUNET_SYSERR if the data stream is corrupt
- */
-static int
-mst_receive (struct MessageStreamTokenizer *mst,
-             const char *buf, size_t size)
-{
-  const struct GNUNET_MessageHeader *hdr;
-  size_t delta;
-  uint16_t want;
-  char *ibuf;
-  int need_align;
-  unsigned long offset;
-  int ret;
-
-  ret = GNUNET_OK;
-  ibuf = (char *) mst->hdr;
-  while (mst->pos > 0)
-  {
-do_align:
-    if ((mst->curr_buf - mst->off < sizeof(struct GNUNET_MessageHeader)) ||
-        (0 != (mst->off % ALIGN_FACTOR)))
-    {
-      /* need to align or need more space */
-      mst->pos -= mst->off;
-      memmove (ibuf, &ibuf[mst->off], mst->pos);
-      mst->off = 0;
-    }
-    if (mst->pos - mst->off < sizeof(struct GNUNET_MessageHeader))
-    {
-      delta =
-        GNUNET_MIN (sizeof(struct GNUNET_MessageHeader)
-                    - (mst->pos - mst->off), size);
-      GNUNET_memcpy (&ibuf[mst->pos], buf, delta);
-      mst->pos += delta;
-      buf += delta;
-      size -= delta;
-    }
-    if (mst->pos - mst->off < sizeof(struct GNUNET_MessageHeader))
-    {
-      return GNUNET_OK;
-    }
-    hdr = (const struct GNUNET_MessageHeader *) &ibuf[mst->off];
-    want = ntohs (hdr->size);
-    if (want < sizeof(struct GNUNET_MessageHeader))
-    {
-      fprintf (stderr,
-               "Received invalid message from stdin\n");
-      exit (1);
-    }
-    if (mst->curr_buf - mst->off < want)
-    {
-      /* need more space */
-      mst->pos -= mst->off;
-      memmove (ibuf, &ibuf[mst->off], mst->pos);
-      mst->off = 0;
-    }
-    if (want > mst->curr_buf)
-    {
-      mst->hdr = realloc (mst->hdr, want);
-      if (NULL == mst->hdr)
-      {
-        fprintf (stderr, "Failed to allocate buffer for alignment\n");
-        exit (1);
-      }
-      ibuf = (char *) mst->hdr;
-      mst->curr_buf = want;
-    }
-    hdr = (const struct GNUNET_MessageHeader *) &ibuf[mst->off];
-    if (mst->pos - mst->off < want)
-    {
-      delta = GNUNET_MIN (want - (mst->pos - mst->off), size);
-      GNUNET_memcpy (&ibuf[mst->pos], buf, delta);
-      mst->pos += delta;
-      buf += delta;
-      size -= delta;
-    }
-    if (mst->pos - mst->off < want)
-    {
-      return GNUNET_OK;
-    }
-    mst->cb (mst->cb_cls, hdr);
-    mst->off += want;
-    if (mst->off == mst->pos)
-    {
-      /* reset to beginning of buffer, it's free right now! */
-      mst->off = 0;
-      mst->pos = 0;
-    }
-  }
-  while (size > 0)
-  {
-    if (size < sizeof(struct GNUNET_MessageHeader))
-      break;
-    offset = (unsigned long) buf;
-    need_align = (0 != offset % ALIGN_FACTOR) ? GNUNET_YES : GNUNET_NO;
-    if (GNUNET_NO == need_align)
-    {
-      /* can try to do zero-copy and process directly from original buffer */
-      hdr = (const struct GNUNET_MessageHeader *) buf;
-      want = ntohs (hdr->size);
-      if (want < sizeof(struct GNUNET_MessageHeader))
-      {
-        fprintf (stderr,
-                 "Received invalid message from stdin\n");
-        exit (1);
-      }
-      if (size < want)
-        break;                  /* or not, buffer incomplete, so copy to private buffer... */
-      mst->cb (mst->cb_cls, hdr);
-      buf += want;
-      size -= want;
-    }
-    else
-    {
-      /* need to copy to private buffer to align;
-       * yes, we go a bit more spaghetti than usual here */
-      goto do_align;
-    }
-  }
-  if (size > 0)
-  {
-    if (size + mst->pos > mst->curr_buf)
-    {
-      mst->hdr = realloc (mst->hdr, size + mst->pos);
-      if (NULL == mst->hdr)
-      {
-        fprintf (stderr, "Failed to allocate buffer for alignment\n");
-        exit (1);
-      }
-      ibuf = (char *) mst->hdr;
-      mst->curr_buf = size + mst->pos;
-    }
-    if (mst->pos + size > mst->curr_buf)
-    {
-      fprintf (stderr,
-               "Assertion failed\n");
-      exit (1);
-    }
-    GNUNET_memcpy (&ibuf[mst->pos], buf, size);
-    mst->pos += size;
-  }
-  return ret;
-}
-
-
-/**
- * Destroys a tokenizer.
- *
- * @param mst tokenizer to destroy
- */
-static void
-mst_destroy (struct MessageStreamTokenizer *mst)
-{
-  free (mst->hdr);
-  free (mst);
-}
-
-
-/* *****************  end of server_mst.c clone ***************** **/
-
-
-/* ************** code for handling of ARPHRD_IEEE80211_FULL ************** */
-
-/**
- * Radiotap header iteration
- *
- * call __ieee80211_radiotap_iterator_init() to init a semi-opaque iterator
- * struct Ieee80211RadiotapHeaderIterator (no need to init the struct beforehand)
- * then loop calling __ieee80211_radiotap_iterator_next()... it returns -1
- * if there are no more args in the header, or the next argument type index
- * that is present.  The iterator's this_arg member points to the start of the
- * argument associated with the current argument index that is present,
- * which can be found in the iterator's this_arg_index member.  This arg
- * index corresponds to the IEEE80211_RADIOTAP_... defines.
- *
- * @param iterator iterator to initialize
- * @param radiotap_header message to parse
- * @param max_length number of valid bytes in radiotap_header
- * @return 0 on success, -1 on error
- */
-static int
-ieee80211_radiotap_iterator_init (struct
-                                  Ieee80211RadiotapHeaderIterator *iterator,
-                                  const struct
-                                  Ieee80211RadiotapHeader *radiotap_header,
-                                  size_t max_length)
-{
-  if ((iterator == NULL) ||
-      (radiotap_header == NULL))
-    return -1;
-
-  /* Linux only supports version 0 radiotap format */
-  if (0 != radiotap_header->it_version)
-    return -1;
-
-  /* sanity check for allowed length and radiotap length field */
-  if ((max_length < sizeof(struct Ieee80211RadiotapHeader)) ||
-      (max_length < (GNUNET_le16toh (radiotap_header->it_len))))
-    return -1;
-
-  memset (iterator, 0, sizeof(struct Ieee80211RadiotapHeaderIterator));
-  iterator->rtheader = radiotap_header;
-  iterator->max_length = GNUNET_le16toh (radiotap_header->it_len);
-  iterator->bitmap_shifter = GNUNET_le32toh (radiotap_header->it_present);
-  iterator->arg = ((uint8_t *) radiotap_header) + sizeof(struct
-                                                         Ieee80211RadiotapHeader);
-
-  /* find payload start allowing for extended bitmap(s) */
-  if (0 != (iterator->bitmap_shifter & IEEE80211_RADIOTAP_PRESENT_EXTEND_MASK))
-  {
-    while (GNUNET_le32toh (*((uint32_t *) iterator->arg))
-           & IEEE80211_RADIOTAP_PRESENT_EXTEND_MASK)
-    {
-      iterator->arg += sizeof(uint32_t);
-      /*
-       * check for insanity where the present bitmaps
-       * keep claiming to extend up to or even beyond the
-       * stated radiotap header length
-       */if (iterator->arg - ((uint8_t *) iterator->rtheader) >
-          iterator->max_length)
-        return -1;
-    }
-    iterator->arg += sizeof(uint32_t);
-    /*
-     * no need to check again for blowing past stated radiotap
-     * header length, because ieee80211_radiotap_iterator_next
-     * checks it before it is dereferenced
-     */}
-  /* we are all initialized happily */
-  return 0;
-}
-
-
-/**
- * Returns the next radiotap parser iterator arg.
- *
- * This function returns the next radiotap arg index (IEEE80211_RADIOTAP_...)
- * and sets iterator->this_arg to point to the payload for the arg.  It takes
- * care of alignment handling and extended present fields.  interator->this_arg
- * can be changed by the caller.  The args pointed to are in little-endian
- * format.
- *
- * @param iterator: radiotap_iterator to move to next arg (if any)
- * @return next present arg index on success or -1 if no more or error
- */
-static int
-ieee80211_radiotap_iterator_next (struct
-                                  Ieee80211RadiotapHeaderIterator *iterator)
-{
-  /*
-   * small length lookup table for all radiotap types we heard of
-   * starting from b0 in the bitmap, so we can walk the payload
-   * area of the radiotap header
-   *
-   * There is a requirement to pad args, so that args
-   * of a given length must begin at a boundary of that length
-   * -- but note that compound args are allowed (eg, 2 x uint16_t
-   * for IEEE80211_RADIOTAP_CHANNEL) so total arg length is not
-   * a reliable indicator of alignment requirement.
-   *
-   * upper nybble: content alignment for arg
-   * lower nybble: content length for arg
-   */static const uint8_t rt_sizes[] = {
-    [IEEE80211_RADIOTAP_TSFT] = 0x88,
-    [IEEE80211_RADIOTAP_FLAGS] = 0x11,
-    [IEEE80211_RADIOTAP_RATE] = 0x11,
-    [IEEE80211_RADIOTAP_CHANNEL] = 0x24,
-    [IEEE80211_RADIOTAP_FHSS] = 0x22,
-    [IEEE80211_RADIOTAP_DBM_ANTSIGNAL] = 0x11,
-    [IEEE80211_RADIOTAP_DBM_ANTNOISE] = 0x11,
-    [IEEE80211_RADIOTAP_LOCK_QUALITY] = 0x22,
-    [IEEE80211_RADIOTAP_TX_ATTENUATION] = 0x22,
-    [IEEE80211_RADIOTAP_DB_TX_ATTENUATION] = 0x22,
-    [IEEE80211_RADIOTAP_DBM_TX_POWER] = 0x11,
-    [IEEE80211_RADIOTAP_ANTENNA] = 0x11,
-    [IEEE80211_RADIOTAP_DB_ANTSIGNAL] = 0x11,
-    [IEEE80211_RADIOTAP_DB_ANTNOISE] = 0x11,
-    [IEEE80211_RADIOTAP_TX_FLAGS] = 0x22,
-    [IEEE80211_RADIOTAP_RX_FLAGS] = 0x22,
-    [IEEE80211_RADIOTAP_RTS_RETRIES] = 0x11,
-    [IEEE80211_RADIOTAP_DATA_RETRIES] = 0x11
-                                        /*
-                                         * add more here as they are defined in
-                                         * include/net/ieee80211_radiotap.h
-                                         */
-  };
-
-  /*
-   * for every radiotap entry we can at
-   * least skip (by knowing the length)...
-   */
-  while (iterator->arg_index < sizeof(rt_sizes))
-  {
-    int hit = (0 != (iterator->bitmap_shifter & 1));
-
-    if (hit)
-    {
-      unsigned int wanted_alignment;
-      unsigned int unalignment;
-      /*
-       * arg is present, account for alignment padding
-       *  8-bit args can be at any alignment
-       * 16-bit args must start on 16-bit boundary
-       * 32-bit args must start on 32-bit boundary
-       * 64-bit args must start on 64-bit boundary
-       *
-       * note that total arg size can differ from alignment of
-       * elements inside arg, so we use upper nybble of length table
-       * to base alignment on.  First, 'wanted_alignment' is set to be
-       * 1 for 8-bit, 2 for 16-bit, 4 for 32-bit and 8 for 64-bit
-       * arguments.  Then, we calculate the 'unalignment' (how many
-       * bytes we are over by taking the difference of 'arg' and the
-       * overall starting point modulo the desired alignment.  As
-       * desired alignments are powers of two, we can do modulo with
-       * binary "&" (and also avoid the possibility of a division by
-       * zero if the 'rt_sizes' table contains bogus entries).
-       *
-       * also note: these alignments are relative to the start of the
-       * radiotap header.  There is no guarantee that the radiotap
-       * header itself is aligned on any kind of boundary, thus we
-       * need to really look at the delta here.
-       */wanted_alignment = rt_sizes[iterator->arg_index] >> 4;
-      unalignment = (((void *) iterator->arg) - ((void *) iterator->rtheader))
-                    & (wanted_alignment - 1);
-      if (0 != unalignment)
-      {
-        /* need padding (by 'wanted_alignment - unalignment') */
-        iterator->arg_index += wanted_alignment - unalignment;
-      }
-
-      /*
-       * this is what we will return to user, but we need to
-       * move on first so next call has something fresh to test
-       */
-      iterator->this_arg_index = iterator->arg_index;
-      iterator->this_arg = iterator->arg;
-
-      /* internally move on the size of this arg (using lower nybble from
-         the table) */
-      iterator->arg += rt_sizes[iterator->arg_index] & 0x0f;
-
-      /*
-       * check for insanity where we are given a bitmap that
-       * claims to have more arg content than the length of the
-       * radiotap section.  We will normally end up equalling this
-       * max_length on the last arg, never exceeding it.
-       */if ((((void *) iterator->arg) - ((void *) iterator->rtheader)) >
-          iterator->max_length)
-        return -1;
-    }
-
-    /* Now, move on to next bit / next entry */
-    iterator->arg_index++;
-
-    if (0 == (iterator->arg_index % 32))
-    {
-      /* completed current uint32_t bitmap */
-      if (0 != (iterator->bitmap_shifter & 1))
-      {
-        /* bit 31 was set, there is more; move to next uint32_t bitmap */
-        iterator->bitmap_shifter = GNUNET_le32toh (*iterator->next_bitmap);
-        iterator->next_bitmap++;
-      }
-      else
-      {
-        /* no more bitmaps: end (by setting arg_index to high, unsupported value) */
-        iterator->arg_index = sizeof(rt_sizes);
-      }
-    }
-    else
-    {
-      /* just try the next bit (while loop will move on) */
-      iterator->bitmap_shifter >>= 1;
-    }
-
-    /* if we found a valid arg earlier, return it now */
-    if (hit)
-      return iterator->this_arg_index;
-  }
-
-  /* we don't know how to handle any more args (or there are no more),
-     so we're done (this is not an error) */
-  return -1;
-}
-
-
-/**
- * Calculate crc32, the start of the calculation
- *
- * @param buf buffer to calc the crc
- * @param len len of the buffer
- * @return crc sum
- */
-static unsigned long
-calc_crc_osdep (const unsigned char *buf, size_t len)
-{
-  static const unsigned long int crc_tbl_osdep[256] = {
-    0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F,
-    0xE963A535, 0x9E6495A3,
-    0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD,
-    0xE7B82D07, 0x90BF1D91,
-    0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB,
-    0xF4D4B551, 0x83D385C7,
-    0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9,
-    0xFA0F3D63, 0x8D080DF5,
-    0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447,
-    0xD20D85FD, 0xA50AB56B,
-    0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75,
-    0xDCD60DCF, 0xABD13D59,
-    0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423,
-    0xCFBA9599, 0xB8BDA50F,
-    0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11,
-    0xC1611DAB, 0xB6662D3D,
-    0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F,
-    0x9FBFE4A5, 0xE8B8D433,
-    0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D,
-    0x91646C97, 0xE6635C01,
-    0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B,
-    0x8208F4C1, 0xF50FC457,
-    0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49,
-    0x8CD37CF3, 0xFBD44C65,
-    0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7,
-    0xA4D1C46D, 0xD3D6F4FB,
-    0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5,
-    0xAA0A4C5F, 0xDD0D7CC9,
-    0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3,
-    0xB966D409, 0xCE61E49F,
-    0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81,
-    0xB7BD5C3B, 0xC0BA6CAD,
-    0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF,
-    0x04DB2615, 0x73DC1683,
-    0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D,
-    0x0A00AE27, 0x7D079EB1,
-    0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB,
-    0x196C3671, 0x6E6B06E7,
-    0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9,
-    0x17B7BE43, 0x60B08ED5,
-    0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767,
-    0x3FB506DD, 0x48B2364B,
-    0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55,
-    0x316E8EEF, 0x4669BE79,
-    0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703,
-    0x220216B9, 0x5505262F,
-    0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31,
-    0x2CD99E8B, 0x5BDEAE1D,
-    0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F,
-    0x72076785, 0x05005713,
-    0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D,
-    0x7CDCEFB7, 0x0BDBDF21,
-    0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B,
-    0x6FB077E1, 0x18B74777,
-    0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69,
-    0x616BFFD3, 0x166CCF45,
-    0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7,
-    0x4969474D, 0x3E6E77DB,
-    0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5,
-    0x47B2CF7F, 0x30B5FFE9,
-    0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693,
-    0x54DE5729, 0x23D967BF,
-    0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1,
-    0x5A05DF1B, 0x2D02EF8D
-  };
-
-  unsigned long crc = 0xFFFFFFFF;
-
-  for (; len > 0; len--, buf++)
-    crc = crc_tbl_osdep[(crc ^ *buf) & 0xFF] ^ (crc >> 8);
-  return(~crc);
-}
-
-
-/**
- * Calculate and check crc of the wlan packet
- *
- * @param buf buffer of the packet, with len + 4 bytes of data,
- *            the last 4 bytes being the checksum
- * @param len length of the payload in data
- * @return 0 on success (checksum matches), 1 on error
- */
-static int
-check_crc_buf_osdep (const unsigned char *buf, size_t len)
-{
-  unsigned long crc;
-
-  crc = calc_crc_osdep (buf, len);
-  buf += len;
-  if ((((crc) & 0xFF) == buf[0]) && (((crc >> 8) & 0xFF) == buf[1]) &&
-      ( ((crc >> 16) & 0xFF) == buf[2]) && ( ((crc >> 24) & 0xFF) == buf[3]) )
-    return 0;
-  return 1;
-}
-
-
-/* ************end of code for handling of ARPHRD_IEEE80211_FULL ************** */
-
-
-/* ************beginning of code for reading packets from kernel ************** */
-
-/**
- * Return the channel from the frequency (in Mhz)
- *
- * @param frequency of the channel
- * @return number of the channel
- */
-static int
-get_channel_from_frequency (int32_t frequency)
-{
-  if ((frequency >= 2412) && (frequency <= 2472))
-    return (frequency - 2407) / 5;
-  if (frequency == 2484)
-    return 14;
-  if ((frequency >= 5000) && (frequency <= 6100))
-    return (frequency - 5000) / 5;
-  return -1;
-}
-
-
-/**
- * Get the channel used by our WLAN interface.
- *
- * @param dev pointer to the dev struct of the card
- * @return channel number, -1 on error
- */
-static int
-linux_get_channel (const struct HardwareInfos *dev)
-{
-  struct iwreq wrq;
-  int32_t frequency;
-
-  memset (&wrq, 0, sizeof(struct iwreq));
-  strncpy (wrq.ifr_name, dev->iface, IFNAMSIZ);
-  if (0 > ioctl (dev->fd_raw, SIOCGIWFREQ, &wrq))
-    return -1;
-  frequency = wrq.u.freq.m; /* 'iw_freq' defines 'm' as '__s32', so we keep it signed */
-  if (100000000 < frequency)
-    frequency /= 100000;
-  else if (1000000 < frequency)
-    frequency /= 1000;
-  if (1000 < frequency)
-    return get_channel_from_frequency (frequency);
-  return frequency;
-}
-
-
-/**
- * Read from the raw socket (the wlan card), parse the packet and
- * put the result into the buffer for transmission to 'stdout'.
- *
- * @param dev pointer to the struct of the wlan card
- * @param buf buffer to read to; first bytes will be the 'struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame',
- *            followed by the actual payload
- * @param buf_size size of the buffer
- * @param ri where to write radiotap_rx info
- * @return number of bytes written to 'buf'
- */
-static ssize_t
-linux_read (struct HardwareInfos *dev,
-            unsigned char *buf, size_t buf_size,
-            struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage *ri)
-{
-  unsigned char tmpbuf[buf_size];
-  ssize_t caplen;
-  size_t n;
-  int got_signal = 0;
-  int got_noise = 0;
-  int got_channel = 0;
-  int fcs_removed = 0;
-
-  caplen = read (dev->fd_raw, tmpbuf, buf_size);
-  if (0 > caplen)
-  {
-    if (EAGAIN == errno)
-      return 0;
-    fprintf (stderr, "Failed to read from RAW socket: %s\n", strerror (errno));
-    return -1;
-  }
-
-  memset (ri, 0, sizeof(*ri));
-  switch (dev->arptype_in)
-  {
-  case ARPHRD_IEEE80211_PRISM:
-    {
-      const struct PrismHeader *ph;
-
-      ph = (const struct PrismHeader*) tmpbuf;
-      n = ph->msglen;
-      if ((n < 8) || (n >= caplen))
-        return 0; /* invalid format */
-      if ((PRISM_MSGCODE_MONITOR == ph->msgcode) &&
-          (n >= sizeof(struct PrismHeader)))
-      {
-        const char *pos;
-        size_t left;
-        struct PrismValue pv;
-
-        left = n - sizeof(struct PrismHeader);
-        pos = (const char *) &ph[1];
-        while (left > sizeof(struct PrismValue))
-        {
-          left -= sizeof(struct PrismValue);
-          GNUNET_memcpy (&pv, pos, sizeof(struct PrismValue));
-          pos += sizeof(struct PrismValue);
-
-          switch (pv.did)
-          {
-          case PRISM_DID_NOISE:
-            if (PRISM_STATUS_OK == pv.status)
-            {
-              ri->ri_noise = pv.data;
-              /* got_noise = 1; */
-            }
-            break;
-
-          case PRISM_DID_RATE:
-            if (PRISM_STATUS_OK == pv.status)
-              ri->ri_rate = pv.data * 500000;
-            break;
-
-          case PRISM_DID_CHANNEL:
-            if (PRISM_STATUS_OK == pv.status)
-            {
-              ri->ri_channel = pv.data;
-              got_channel = 1;
-            }
-            break;
-
-          case PRISM_DID_MACTIME:
-            if (PRISM_STATUS_OK == pv.status)
-              ri->ri_mactime = pv.data;
-            break;
-
-          case PRISM_DID_SIGNAL:
-            if (PRISM_STATUS_OK == pv.status)
-            {
-              ri->ri_power = pv.data;
-              /* got_signal = 1; */
-            }
-            break;
-          }
-        }
-      }
-      if ((n < 8) || (n >= caplen))
-        return 0; /* invalid format */
-    }
-    break;
-
-  case ARPHRD_IEEE80211_FULL:
-    {
-      struct Ieee80211RadiotapHeaderIterator iterator;
-      struct Ieee80211RadiotapHeader *rthdr;
-
-      memset (&iterator, 0, sizeof(iterator));
-      rthdr = (struct Ieee80211RadiotapHeader *) tmpbuf;
-      n = GNUNET_le16toh (rthdr->it_len);
-      if ((n < sizeof(struct Ieee80211RadiotapHeader)) || (n >= caplen))
-        return 0; /* invalid 'it_len' */
-      if (0 != ieee80211_radiotap_iterator_init (&iterator, rthdr, caplen))
-        return 0;
-      /* go through the radiotap arguments we have been given by the driver */
-      while (0 <= ieee80211_radiotap_iterator_next (&iterator))
-      {
-        switch (iterator.this_arg_index)
-        {
-        case IEEE80211_RADIOTAP_TSFT:
-          ri->ri_mactime = GNUNET_le64toh (*((uint64_t *) iterator.this_arg));
-          break;
-
-        case IEEE80211_RADIOTAP_DBM_ANTSIGNAL:
-          if (! got_signal)
-          {
-            ri->ri_power = *((int8_t *) iterator.this_arg);
-            got_signal = 1;
-          }
-          break;
-
-        case IEEE80211_RADIOTAP_DB_ANTSIGNAL:
-          if (! got_signal)
-          {
-            ri->ri_power = *((int8_t *) iterator.this_arg);
-            got_signal = 1;
-          }
-          break;
-
-        case IEEE80211_RADIOTAP_DBM_ANTNOISE:
-          if (! got_noise)
-          {
-            ri->ri_noise = *((int8_t *) iterator.this_arg);
-            got_noise = 1;
-          }
-          break;
-
-        case IEEE80211_RADIOTAP_DB_ANTNOISE:
-          if (! got_noise)
-          {
-            ri->ri_noise = *((int8_t *) iterator.this_arg);
-            got_noise = 1;
-          }
-          break;
-
-        case IEEE80211_RADIOTAP_ANTENNA:
-          ri->ri_antenna = *iterator.this_arg;
-          break;
-
-        case IEEE80211_RADIOTAP_CHANNEL:
-          ri->ri_channel = *iterator.this_arg;
-          got_channel = 1;
-          break;
-
-        case IEEE80211_RADIOTAP_RATE:
-          ri->ri_rate = (*iterator.this_arg) * 500000;
-          break;
-
-        case IEEE80211_RADIOTAP_FLAGS:
-          {
-            uint8_t flags = *iterator.this_arg;
-            /* is the CRC visible at the end? if so, remove */
-            if (0 != (flags & IEEE80211_RADIOTAP_F_FCS))
-            {
-              fcs_removed = 1;
-              caplen -= sizeof(uint32_t);
-            }
-            break;
-          }
-
-        case IEEE80211_RADIOTAP_RX_FLAGS:
-          {
-            uint16_t flags = ntohs (*((uint16_t *) iterator.this_arg));
-            if (0 != (flags & IEEE80211_RADIOTAP_F_RX_BADFCS))
-              return 0;
-          }
-          break;
-        }     /* end of 'switch' */
-      }   /* end of the 'while' loop */
-    }
-    break;
-
-  case ARPHRD_IEEE80211:
-    n = 0;   /* no header */
-    break;
-
-  case ARPHRD_ETHER:
-    {
-      if (sizeof(struct GNUNET_TRANSPORT_WLAN_Ieee8023Frame) > caplen)
-        return 0; /* invalid */
-      GNUNET_memcpy (&buf[sizeof(struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame)],
-                     tmpbuf + sizeof(struct
-                                     GNUNET_TRANSPORT_WLAN_Ieee8023Frame),
-                     caplen - sizeof(struct
-                                     GNUNET_TRANSPORT_WLAN_Ieee8023Frame)
-                     - 4 /* 4 byte FCS */);
-      return caplen - sizeof(struct GNUNET_TRANSPORT_WLAN_Ieee8023Frame) - 4;
-    }
-
-  default:
-    errno = ENOTSUP;   /* unsupported format */
-    return -1;
-  }
-  caplen -= n;
-  if (! got_channel)
-    ri->ri_channel = linux_get_channel (dev);
-
-  /* detect CRC32 at the end, even if the flag wasn't set and remove it */
-  if ((0 == fcs_removed) &&
-      (0 == check_crc_buf_osdep (tmpbuf + n, caplen - sizeof(uint32_t))))
-  {
-    /* NOTE: this heuristic can of course fail if there happens to
-       be a matching checksum at the end. Would be good to have
-       some data to see how often this heuristic actually works. */
-    caplen -= sizeof(uint32_t);
-  }
-  /* copy payload to target buffer */
-  GNUNET_memcpy (buf, tmpbuf + n, caplen);
-  return caplen;
-}
-
-
-/* ************end of code for reading packets from kernel ************** */
-
-/* ************other helper functions for main start here ************** */
-
-
-/**
- * Open the wireless network interface for reading/writing.
- *
- * @param dev pointer to the device struct
- * @return 0 on success
- */
-static int
-open_device_raw (struct HardwareInfos *dev)
-{
-  struct ifreq ifr;
-  struct iwreq wrq;
-  struct packet_mreq mr;
-  struct sockaddr_ll sll;
-
-  /* find the interface index */
-  memset (&ifr, 0, sizeof(ifr));
-  strncpy (ifr.ifr_name, dev->iface, IFNAMSIZ);
-  if (-1 == ioctl (dev->fd_raw, SIOCGIFINDEX, &ifr))
-  {
-    fprintf (stderr, "ioctl(SIOCGIFINDEX) on interface `%.*s' failed: %s\n",
-             IFNAMSIZ, dev->iface, strerror (errno));
-    return 1;
-  }
-
-  /* lookup the hardware type */
-  memset (&sll, 0, sizeof(sll));
-  sll.sll_family = AF_PACKET;
-  sll.sll_ifindex = ifr.ifr_ifindex;
-  sll.sll_protocol = htons (ETH_P_ALL);
-  if (-1 == ioctl (dev->fd_raw, SIOCGIFHWADDR, &ifr))
-  {
-    fprintf (stderr, "ioctl(SIOCGIFHWADDR) on interface `%.*s' failed: %s\n",
-             IFNAMSIZ, dev->iface, strerror (errno));
-    return 1;
-  }
-  if (((ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211) &&
-       (ifr.ifr_hwaddr.sa_family != ARPHRD_ETHER) &&
-       (ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211_PRISM) &&
-       (ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211_FULL)))
-  {
-    fprintf (stderr,
-             "Error: interface `%.*s' is not using a supported hardware address family (got %d)\n",
-             IFNAMSIZ, dev->iface,
-             ifr.ifr_hwaddr.sa_family);
-    return 1;
-  }
-
-  /* lookup iw mode */
-  memset (&wrq, 0, sizeof(struct iwreq));
-  strncpy (wrq.ifr_name, dev->iface, IFNAMSIZ);
-  if (-1 == ioctl (dev->fd_raw, SIOCGIWMODE, &wrq))
-  {
-    /* most probably not supported (ie for rtap ipw interface) *
-    * so just assume its correctly set...                     */
-    wrq.u.mode = IW_MODE_MONITOR;
-  }
-
-  if ((wrq.u.mode != IW_MODE_MONITOR) &&
-      (wrq.u.mode != IW_MODE_ADHOC))
-  {
-    fprintf (stderr,
-             "Error: interface `%.*s' is not in monitor or ad-hoc mode (got %d)\n",
-             IFNAMSIZ, dev->iface,
-             wrq.u.mode);
-    return 1;
-  }
-
-  /* Is interface st to up, broadcast & running ? */
-  if ((ifr.ifr_flags | IFF_UP | IFF_BROADCAST | IFF_RUNNING) != ifr.ifr_flags)
-  {
-    /* Bring interface up */
-    ifr.ifr_flags |= IFF_UP | IFF_BROADCAST | IFF_RUNNING;
-
-    if (-1 == ioctl (dev->fd_raw, SIOCSIFFLAGS, &ifr))
-    {
-      fprintf (stderr, "ioctl(SIOCSIFFLAGS) on interface `%.*s' failed: %s\n",
-               IFNAMSIZ, dev->iface, strerror (errno));
-      return 1;
-    }
-  }
-
-  /* bind the raw socket to the interface */
-  if (-1 == bind (dev->fd_raw, (struct sockaddr *) &sll, sizeof(sll)))
-  {
-    fprintf (stderr, "Failed to bind interface `%.*s': %s\n", IFNAMSIZ,
-             dev->iface, strerror (errno));
-    return 1;
-  }
-
-  /* lookup the hardware type */
-  if (-1 == ioctl (dev->fd_raw, SIOCGIFHWADDR, &ifr))
-  {
-    fprintf (stderr, "ioctl(SIOCGIFHWADDR) on interface `%.*s' failed: %s\n",
-             IFNAMSIZ, dev->iface, strerror (errno));
-    return 1;
-  }
-
-  GNUNET_memcpy (&dev->pl_mac, ifr.ifr_hwaddr.sa_data, MAC_ADDR_SIZE);
-  dev->arptype_in = ifr.ifr_hwaddr.sa_family;
-  if ((ifr.ifr_hwaddr.sa_family != ARPHRD_ETHER) &&
-      (ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211) &&
-      (ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211_PRISM) &&
-      (ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211_FULL))
-  {
-    fprintf (stderr, "Unsupported hardware link type %d on interface `%.*s'\n",
-             ifr.ifr_hwaddr.sa_family, IFNAMSIZ, dev->iface);
-    return 1;
-  }
-
-  /* enable promiscuous mode */
-  memset (&mr, 0, sizeof(mr));
-  mr.mr_ifindex = sll.sll_ifindex;
-  mr.mr_type = PACKET_MR_PROMISC;
-  if (0 !=
-      setsockopt (dev->fd_raw, SOL_PACKET, PACKET_ADD_MEMBERSHIP, &mr,
-                  sizeof(mr)))
-  {
-    fprintf (stderr,
-             "Failed to enable promiscuous mode on interface `%.*s'\n",
-             IFNAMSIZ,
-             dev->iface);
-    return 1;
-  }
-  return 0;
-}
-
-
-/**
- * Test if the given interface name really corresponds to a wireless
- * device.
- *
- * @param iface name of the interface
- * @return 0 on success, 1 on error
- */
-static int
-test_wlan_interface (const char *iface)
-{
-  char strbuf[512];
-  struct stat sbuf;
-  int ret;
-
-  ret = snprintf (strbuf, sizeof(strbuf),
-                  "/sys/class/net/%s/phy80211/subsystem",
-                  iface);
-  if ((ret < 0) || (ret >= sizeof(strbuf)) || (0 != stat (strbuf, &sbuf)))
-  {
-    fprintf (stderr,
-             "Did not find 802.11 interface `%s'. Exiting.\n",
-             iface);
-    exit (1);
-  }
-  return 0;
-}
-
-
-/**
- * Test incoming packets mac for being our own.
- *
- * @param taIeeeHeader buffer of the packet
- * @param dev the Hardware_Infos struct
- * @return 0 if mac belongs to us, 1 if mac is for another target
- */
-static int
-mac_test (const struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame *taIeeeHeader,
-          const struct HardwareInfos *dev)
-{
-  static struct GNUNET_TRANSPORT_WLAN_MacAddress all_zeros;
-
-  if ((0 == memcmp (&taIeeeHeader->addr3, &all_zeros, MAC_ADDR_SIZE)) ||
-      (0 == memcmp (&taIeeeHeader->addr1, &all_zeros, MAC_ADDR_SIZE)))
-    return 0; /* some drivers set no Macs, then assume it is all for us! */
-
-  if (0 != memcmp (&taIeeeHeader->addr3, &mac_bssid_gnunet, MAC_ADDR_SIZE))
-    return 1; /* not a GNUnet ad-hoc package */
-  if ((0 == memcmp (&taIeeeHeader->addr1, &dev->pl_mac, MAC_ADDR_SIZE)) ||
-      (0 == memcmp (&taIeeeHeader->addr1, &bc_all_mac, MAC_ADDR_SIZE)))
-    return 0; /* for us, or broadcast */
-  return 1; /* not for us */
-}
-
-
-/**
- * Set the wlan header to sane values to make attacks more difficult
- *
- * @param taIeeeHeader pointer to the header of the packet
- * @param dev pointer to the Hardware_Infos struct
- */
-static void
-mac_set (struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame *taIeeeHeader,
-         const struct HardwareInfos *dev)
-{
-  taIeeeHeader->frame_control = htons (IEEE80211_FC0_TYPE_DATA);
-  taIeeeHeader->addr2 = dev->pl_mac;
-  taIeeeHeader->addr3 = mac_bssid_gnunet;
-}
-
-
-/**
- * Process data from the stdin.  Takes the message, prepends the
- * radiotap transmission header, forces the sender MAC to be correct
- * and puts it into our buffer for transmission to the kernel.
- *
- * @param cls pointer to the device struct ('struct HardwareInfos*')
- * @param hdr pointer to the start of the packet
- */
-static void
-stdin_send_hw (void *cls, const struct GNUNET_MessageHeader *hdr)
-{
-  struct HardwareInfos *dev = cls;
-  const struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage *header;
-  struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame *wlanheader;
-  size_t sendsize;
-  struct RadiotapTransmissionHeader rtheader;
-  struct GNUNET_TRANSPORT_WLAN_Ieee8023Frame etheader;
-
-  sendsize = ntohs (hdr->size);
-  if ((sendsize <
-       sizeof(struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage)) ||
-      (GNUNET_MESSAGE_TYPE_WLAN_DATA_TO_HELPER != ntohs (hdr->type)))
-  {
-    fprintf (stderr, "Received malformed message\n");
-    exit (1);
-  }
-  sendsize -= (sizeof(struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage)
-               - sizeof(struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame));
-  if (MAXLINE < sendsize)
-  {
-    fprintf (stderr, "Packet too big for buffer\n");
-    exit (1);
-  }
-  header = (const struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage *) hdr;
-  switch (dev->arptype_in)
-  {
-  case ARPHRD_IEEE80211_PRISM:
-  case ARPHRD_IEEE80211_FULL:
-  case ARPHRD_IEEE80211:
-    rtheader.header.it_version = 0;
-    rtheader.header.it_pad = 0;
-    rtheader.header.it_len = GNUNET_htole16 (sizeof(rtheader));
-    rtheader.header.it_present = GNUNET_htole16 (
-      IEEE80211_RADIOTAP_OUR_TRANSMISSION_HEADER_MASK);
-    rtheader.rate = header->rate;
-    rtheader.pad1 = 0;
-    rtheader.txflags = GNUNET_htole16 (IEEE80211_RADIOTAP_F_TX_NOACK
-                                       | IEEE80211_RADIOTAP_F_TX_NOSEQ);
-    GNUNET_memcpy (write_pout.buf, &rtheader, sizeof(rtheader));
-    GNUNET_memcpy (&write_pout.buf[sizeof(rtheader)], &header->frame, sendsize);
-    wlanheader = (struct
-                  GNUNET_TRANSPORT_WLAN_Ieee80211Frame *) &write_pout.buf[sizeof(
-                                                                            rtheader)
-                 ];
-
-    /* payload contains MAC address, but we don't trust it, so we'll
-     * overwrite it with OUR MAC address to prevent mischief */
-    mac_set (wlanheader, dev);
-    write_pout.size = sendsize + sizeof(rtheader);
-    break;
-
-  case ARPHRD_ETHER:
-    etheader.dst = header->frame.addr1;
-    /* etheader.src = header->frame.addr2; --- untrusted input */
-    etheader.src = dev->pl_mac;
-    etheader.type = htons (ETH_P_IP);
-    GNUNET_memcpy (write_pout.buf, &etheader, sizeof(etheader));
-    GNUNET_memcpy (&write_pout.buf[sizeof(etheader)], &header[1], sendsize
-                   - sizeof(struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame));
-    write_pout.size = sendsize - sizeof(struct
-                                        GNUNET_TRANSPORT_WLAN_Ieee80211Frame)
-                      + sizeof(etheader);
-    break;
-
-  default:
-    fprintf (stderr,
-             "Unsupported ARPTYPE!\n");
-    break;
-  }
-}
-
-
-/**
- * Main function of the helper.  This code accesses a WLAN interface
- * in monitoring mode (layer 2) and then forwards traffic in both
- * directions between the WLAN interface and stdin/stdout of this
- * process.  Error messages are written to stdout.
- *
- * @param argc number of arguments, must be 2
- * @param argv arguments only argument is the name of the interface (e.g. 'mon0')
- * @return 0 on success (never happens, as we don't return unless aborted), 1 on error
- */
-int
-main (int argc, char *argv[])
-{
-  struct HardwareInfos dev;
-  char readbuf[MAXLINE];
-  int maxfd;
-  fd_set rfds;
-  fd_set wfds;
-  int stdin_open;
-  struct MessageStreamTokenizer *stdin_mst;
-  int raw_eno;
-
-  /* assert privs so we can modify the firewall rules! */
-  {
-#ifdef HAVE_SETRESUID
-    uid_t uid = getuid ();
-
-    if (0 != setresuid (uid, 0, 0))
-    {
-      fprintf (stderr,
-               "Failed to setresuid to root: %s\n",
-               strerror (errno));
-      return 254;
-    }
-#else
-    if (0 != seteuid (0))
-    {
-      fprintf (stderr,
-               "Failed to seteuid back to root: %s\n", strerror (errno));
-      return 254;
-    }
-#endif
-  }
-
-  /* make use of SGID capabilities on POSIX */
-  memset (&dev, 0, sizeof(dev));
-  dev.fd_raw = socket (PF_PACKET, SOCK_RAW, htons (ETH_P_ALL));
-  raw_eno = errno; /* remember for later */
-
-  /* now that we've dropped root rights, we can do error checking */
-  if (2 != argc)
-  {
-    fprintf (stderr,
-             "You must specify the name of the interface as the first and only argument to this program.\n");
-    if (-1 != dev.fd_raw)
-      (void) close (dev.fd_raw);
-    return 1;
-  }
-
-  if (-1 == dev.fd_raw)
-  {
-    fprintf (stderr, "Failed to create raw socket: %s\n", strerror (raw_eno));
-    return 1;
-  }
-  if (dev.fd_raw >= FD_SETSIZE)
-  {
-    fprintf (stderr, "File descriptor too large for select (%d > %d)\n",
-             dev.fd_raw, FD_SETSIZE);
-    (void) close (dev.fd_raw);
-    return 1;
-  }
-  if (0 != test_wlan_interface (argv[1]))
-  {
-    (void) close (dev.fd_raw);
-    return 1;
-  }
-  memcpy (dev.iface, argv[1], IFNAMSIZ);
-  if (0 != open_device_raw (&dev))
-  {
-    (void) close (dev.fd_raw);
-    return 1;
-  }
-
-  /* drop privs */
-  {
-    uid_t uid = getuid ();
-#ifdef HAVE_SETRESUID
-    if (0 != setresuid (uid, uid, uid))
-    {
-      fprintf (stderr, "Failed to setresuid: %s\n", strerror (errno));
-      if (-1 != dev.fd_raw)
-        (void) close (dev.fd_raw);
-      return 1;
-    }
-#else
-    if (0 != (setuid (uid) | seteuid (uid)))
-    {
-      fprintf (stderr, "Failed to setuid: %s\n", strerror (errno));
-      if (-1 != dev.fd_raw)
-        (void) close (dev.fd_raw);
-      return 1;
-    }
-#endif
-  }
-
-
-  /* send MAC address of the WLAN interface to STDOUT first */
-  {
-    struct GNUNET_TRANSPORT_WLAN_HelperControlMessage macmsg;
-
-    macmsg.hdr.size = htons (sizeof(macmsg));
-    macmsg.hdr.type = htons (GNUNET_MESSAGE_TYPE_WLAN_HELPER_CONTROL);
-    GNUNET_memcpy (&macmsg.mac, &dev.pl_mac, sizeof(struct
-                                                    GNUNET_TRANSPORT_WLAN_MacAddress));
-    GNUNET_memcpy (write_std.buf, &macmsg, sizeof(macmsg));
-    write_std.size = sizeof(macmsg);
-  }
-
-  stdin_mst = mst_create (&stdin_send_hw, &dev);
-  stdin_open = 1;
-  while (1)
-  {
-    maxfd = -1;
-    FD_ZERO (&rfds);
-    if ((0 == write_pout.size) && (1 == stdin_open))
-    {
-      FD_SET (STDIN_FILENO, &rfds);
-      maxfd = MAX (maxfd, STDIN_FILENO);
-    }
-    if (0 == write_std.size)
-    {
-      FD_SET (dev.fd_raw, &rfds);
-      maxfd = MAX (maxfd, dev.fd_raw);
-    }
-    FD_ZERO (&wfds);
-    if (0 < write_std.size)
-    {
-      FD_SET (STDOUT_FILENO, &wfds);
-      maxfd = MAX (maxfd, STDOUT_FILENO);
-    }
-    if (0 < write_pout.size)
-    {
-      FD_SET (dev.fd_raw, &wfds);
-      maxfd = MAX (maxfd, dev.fd_raw);
-    }
-    {
-      int retval = select (maxfd + 1, &rfds, &wfds, NULL, NULL);
-      if ((-1 == retval) && (EINTR == errno))
-        continue;
-      if (0 > retval)
-      {
-        fprintf (stderr, "select failed: %s\n", strerror (errno));
-        break;
-      }
-    }
-    if (FD_ISSET (STDOUT_FILENO, &wfds))
-    {
-      ssize_t ret =
-        write (STDOUT_FILENO, write_std.buf + write_std.pos,
-               write_std.size - write_std.pos);
-      if (0 > ret)
-      {
-        fprintf (stderr, "Failed to write to STDOUT: %s\n", strerror (errno));
-        break;
-      }
-      write_std.pos += ret;
-      if (write_std.pos == write_std.size)
-      {
-        write_std.pos = 0;
-        write_std.size = 0;
-      }
-    }
-    if (FD_ISSET (dev.fd_raw, &wfds))
-    {
-      ssize_t ret =
-        write (dev.fd_raw, write_pout.buf + write_pout.pos,
-               write_pout.size - write_pout.pos);
-      if (0 > ret)
-      {
-        fprintf (stderr, "Failed to write to WLAN device: %s\n",
-                 strerror (errno));
-        break;
-      }
-      write_pout.pos += ret;
-      if ((write_pout.pos != write_pout.size) && (0 != ret))
-      {
-        /* we should not get partial sends with packet-oriented devices... */
-        fprintf (stderr, "Write error, partial send: %u/%u\n",
-                 (unsigned int) write_pout.pos,
-                 (unsigned int) write_pout.size);
-        break;
-      }
-      if (write_pout.pos == write_pout.size)
-      {
-        write_pout.pos = 0;
-        write_pout.size = 0;
-      }
-    }
-
-    if (FD_ISSET (STDIN_FILENO, &rfds))
-    {
-      ssize_t ret =
-        read (STDIN_FILENO, readbuf, sizeof(readbuf));
-      if (0 > ret)
-      {
-        fprintf (stderr, "Read error from STDIN: %s\n", strerror (errno));
-        break;
-      }
-      if (0 == ret)
-      {
-        /* stop reading... */
-        stdin_open = 0;
-      }
-      mst_receive (stdin_mst, readbuf, ret);
-    }
-
-    if (FD_ISSET (dev.fd_raw, &rfds))
-    {
-      struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage *rrm;
-      ssize_t ret;
-
-      rrm = (struct
-             GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage *) write_std.buf;
-      ret =
-        linux_read (&dev, (unsigned char *) &rrm->frame,
-                    sizeof(write_std.buf)
-                    - sizeof(struct
-                             GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage)
-                    + sizeof(struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame),
-                    rrm);
-      if (0 > ret)
-      {
-        fprintf (stderr, "Read error from raw socket: %s\n", strerror (errno));
-        break;
-      }
-      if ((0 < ret) && (0 == mac_test (&rrm->frame, &dev)))
-      {
-        write_std.size = ret
-                         + sizeof(struct
-                                  GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage)
-                         - sizeof(struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame);
-        rrm->header.size = htons (write_std.size);
-        rrm->header.type = htons (GNUNET_MESSAGE_TYPE_WLAN_DATA_FROM_HELPER);
-      }
-    }
-  }
-  /* Error handling, try to clean up a bit at least */
-  mst_destroy (stdin_mst);
-  (void) close (dev.fd_raw);
-  return 1;                     /* we never exit 'normally' */
-}
-
-
-/* end of gnunet-helper-transport-wlan.c */
diff --git a/src/transport/gnunet-service-tng.c b/src/transport/gnunet-service-tng.c
deleted file mode 100644
index 18ec0aa0b..000000000
--- a/src/transport/gnunet-service-tng.c
+++ /dev/null
@@ -1,11152 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2010-2016, 2018, 2019 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport/gnunet-service-tng.c
- * @brief main for gnunet-service-tng
- * @author Christian Grothoff
- *
- * TODO:
- * Implement next:
- * - review retransmission logic, right now there is no smartness there!
- *   => congestion control, etc [PERFORMANCE-BASICS]
- *
- * Optimizations-Statistics:
- * - Track ACK losses based on ACK-counter [ROUTING]
- * - Need to track total bandwidth per VirtualLink and adjust how frequently
- *   we send FC messages based on bandwidth-delay-product (and relation
- *   to the window size!). See OPTIMIZE-FC-BDP.
- * - Consider more statistics in #check_connection_quality() [FIXME-CONQ-STATISTICS]
- * - Adapt available_fc_window_size, using larger values for high-bandwidth
- *   and high-latency links *if* we have the RAM [GOODPUT / utilization / stalls]
- * - Set last_window_consum_limit promise properly based on
- *   latency and bandwidth of the respective connection [GOODPUT / utilization / stalls]
- *
- * Optimizations-DV:
- * - When forwarding DV learn messages, if a peer is reached that
- *   has a *bidirectional* link to the origin beyond 1st hop,
- *   do NOT forward it to peers _other_ than the origin, as
- *   there is clearly a better path directly from the origin to
- *   whatever else we could reach.
- * - When we passively learned DV (with unconfirmed freshness), we
- *   right now add the path to our list but with a zero path_valid_until
- *   time and only use it for unconfirmed routes.  However, we could consider
- *   triggering an explicit validation mechanism ourselves, specifically routing
- *   a challenge-response message over the path [ROUTING]
- * = if available, try to confirm unconfirmed DV paths when trying to establish
- *   virtual link for a `struct IncomingRequest`. (i.e. if DVH is
- *   unconfirmed, incoming requests cause us to try to validate a passively
- *   learned path (requires new message type!))
- *
- * Optimizations-Fragmentation:
- * - Fragments send over a reliable channel could do without the
- *   AcknowledgementUUIDP altogether, as they won't be acked! [BANDWIDTH]
- *   (-> have 2nd type of acknowledgment message; low priority, as we
- *       do not have an MTU-limited *reliable* communicator) [FIXME-FRAG-REL-UUID]
- * - if messages are below MTU, consider adding ACKs and other stuff
- *   to the same transmission to avoid tiny messages (requires planning at
- *   receiver, and additional MST-style demultiplex at receiver!) [PACKET COUNT]
- *
- * Optimizations-internals:
- * - queue_send_msg by API design has to make a copy
- *   of the payload, and route_message on top of that requires a malloc/free.
- *   Change design to approximate "zero" copy better... [CPU]
- * - could avoid copying body of message into each fragment and keep
- *   fragments as just pointers into the original message and only
- *   fully build fragments just before transmission (optimization, should
- *   reduce CPU and memory use) [CPU, MEMORY]
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_statistics_service.h"
-#include "gnunet_transport_monitor_service.h"
-#include "gnunet_peerstore_service.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_signatures.h"
-#include "transport.h"
-
-/**
- * Maximum number of FC retransmissions for a runing retransmission task.
- */
-#define MAX_FC_RETRANSMIT_COUNT 1000
-
-/**
- * Maximum number of messages we acknowledge together in one
- * cumulative ACK.  Larger values may save a bit of bandwidth.
- */
-#define MAX_CUMMULATIVE_ACKS 64
-
-/**
- * What is the 1:n chance that we send a Flow control response when
- * receiving a flow control message that did not change anything for
- * us? Basically, this is used in the case where both peers are stuck
- * on flow control (no window changes), but one might continue sending
- * flow control messages to the other peer as the first FC message
- * when things stalled got lost, and then subsequently the other peer
- * does *usually* not respond as nothing changed.  So to ensure that
- * eventually the FC messages stop, we do send with 1/8th probability
- * an FC message even if nothing changed.  That prevents one peer
- * being stuck in sending (useless) FC messages "forever".
- */
-#define FC_NO_CHANGE_REPLY_PROBABILITY 8
-
-/**
- * What is the size we assume for a read operation in the
- * absence of an MTU for the purpose of flow control?
- */
-#define IN_PACKET_SIZE_WITHOUT_MTU 128
-
-/**
- * Number of slots we keep of historic data for computation of
- * goodput / message loss ratio.
- */
-#define GOODPUT_AGING_SLOTS 4
-
-/**
- * How big is the flow control window size by default;
- * limits per-neighbour RAM utilization.
- */
-#define DEFAULT_WINDOW_SIZE (128 * 1024)
-
-/**
- * For how many incoming connections do we try to create a
- * virtual link for (at the same time!).  This does NOT
- * limit the number of incoming connections, just the number
- * for which we are actively trying to find working addresses
- * in the absence (!) of our own applications wanting the
- * link to go up.
- */
-#define MAX_INCOMING_REQUEST 16
-
-/**
- * Maximum number of peers we select for forwarding DVInit
- * messages at the same time (excluding initiator).
- */
-#define MAX_DV_DISCOVERY_SELECTION 16
-
-/**
- * Window size. How many messages to the same target do we pass
- * to CORE without a RECV_OK in between? Small values limit
- * thoughput, large values will increase latency.
- *
- * FIXME-OPTIMIZE: find out what good values are experimentally,
- * maybe set adaptively (i.e. to observed available bandwidth).
- */
-#define RECV_WINDOW_SIZE 4
-
-/**
- * Minimum number of hops we should forward DV learn messages
- * even if they are NOT useful for us in hope of looping
- * back to the initiator?
- *
- * FIXME: allow initiator some control here instead?
- */
-#define MIN_DV_PATH_LENGTH_FOR_INITIATOR 3
-
-/**
- * Maximum DV distance allowed ever.
- */
-#define MAX_DV_HOPS_ALLOWED 16
-
-/**
- * Maximum number of DV learning activities we may
- * have pending at the same time.
- */
-#define MAX_DV_LEARN_PENDING 64
-
-/**
- * Maximum number of DV paths we keep simultaneously to the same target.
- */
-#define MAX_DV_PATHS_TO_TARGET 3
-
-/**
- * If a queue delays the next message by more than this number
- * of seconds we log a warning. Note: this is for testing,
- * the value chosen here might be too aggressively low!
- */
-#define DELAY_WARN_THRESHOLD \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
-
-/**
- * If a DVBox could not be forwarded after this number of
- * seconds we drop it.
- */
-#define DV_FORWARD_TIMEOUT \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
-
-/**
- * Default value for how long we wait for reliability ack.
- */
-#define DEFAULT_ACK_WAIT_DURATION \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
-
-/**
- * We only consider queues as "quality" connections when
- * suppressing the generation of DV initiation messages if
- * the latency of the queue is below this threshold.
- */
-#define DV_QUALITY_RTT_THRESHOLD \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
-
-/**
- * How long do we consider a DV path valid if we see no
- * further updates on it? Note: the value chosen here might be too low!
- */
-#define DV_PATH_VALIDITY_TIMEOUT \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5)
-
-/**
- * How long do we cache backchannel (struct Backtalker) information
- * after a backchannel goes inactive?
- */
-#define BACKCHANNEL_INACTIVITY_TIMEOUT \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5)
-
-/**
- * How long before paths expire would we like to (re)discover DV paths? Should
- * be below #DV_PATH_VALIDITY_TIMEOUT.
- */
-#define DV_PATH_DISCOVERY_FREQUENCY \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 4)
-
-/**
- * How long are ephemeral keys valid?
- */
-#define EPHEMERAL_VALIDITY \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 4)
-
-/**
- * How long do we keep partially reassembled messages around before giving up?
- */
-#define REASSEMBLY_EXPIRATION \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 4)
-
-/**
- * What is the fastest rate at which we send challenges *if* we keep learning
- * an address (gossip, DHT, etc.)?
- */
-#define FAST_VALIDATION_CHALLENGE_FREQ \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 1)
-
-/**
- * What is the slowest rate at which we send challenges?
- */
-#define MAX_VALIDATION_CHALLENGE_FREQ \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_DAYS, 1)
-
-/**
- * How long until we forget about historic accumulators and thus
- * reset the ACK counter? Should exceed the maximum time an
- * active connection experiences without an ACK.
- */
-#define ACK_CUMMULATOR_TIMEOUT \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 4)
-
-/**
- * What is the non-randomized base frequency at which we
- * would initiate DV learn messages?
- */
-#define DV_LEARN_BASE_FREQUENCY GNUNET_TIME_UNIT_MINUTES
-
-/**
- * How many good connections (confirmed, bi-directional, not DV)
- * do we need to have to suppress initiating DV learn messages?
- */
-#define DV_LEARN_QUALITY_THRESHOLD 100
-
-/**
- * When do we forget an invalid address for sure?
- */
-#define MAX_ADDRESS_VALID_UNTIL \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MONTHS, 1)
-
-/**
- * How long do we consider an address valid if we just checked?
- */
-#define ADDRESS_VALIDATION_LIFETIME \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 4)
-
-/**
- * What is the maximum frequency at which we do address validation?
- * A random value between 0 and this value is added when scheduling
- * the #validation_task (both to ensure we do not validate too often,
- * and to randomize a bit).
- */
-#define MIN_DELAY_ADDRESS_VALIDATION GNUNET_TIME_UNIT_MILLISECONDS
-
-/**
- * How many network RTTs before an address validation expires should we begin
- * trying to revalidate? (Note that the RTT used here is the one that we
- * experienced during the last validation, not necessarily the latest RTT
- * observed).
- */
-#define VALIDATION_RTT_BUFFER_FACTOR 3
-
-/**
- * How many messages can we have pending for a given communicator
- * process before we start to throttle that communicator?
- *
- * Used if a communicator might be CPU-bound and cannot handle the traffic.
- */
-#define COMMUNICATOR_TOTAL_QUEUE_LIMIT 512
-
-/**
- * How many messages can we have pending for a given queue (queue to
- * a particular peer via a communicator) process before we start to
- * throttle that queue?
- */
-#define QUEUE_LENGTH_LIMIT 32
-
-
-GNUNET_NETWORK_STRUCT_BEGIN
-
-/**
- * Unique identifier we attach to a message.
- */
-struct MessageUUIDP
-{
-  /**
-   * Unique value, generated by incrementing the
-   * `message_uuid_ctr` of `struct Neighbour`.
-   */
-  uint64_t uuid GNUNET_PACKED;
-};
-
-
-/**
- * Unique identifier to map an acknowledgement to a transmission.
- */
-struct AcknowledgementUUIDP
-{
-  /**
-   * The UUID value.
-   */
-  struct GNUNET_Uuid value;
-};
-
-/**
- * Outer layer of an encapsulated backchannel message.
- */
-struct TransportBackchannelEncapsulationMessage
-{
-  /**
-   * Type is #GNUNET_MESSAGE_TYPE_TRANSPORT_BACKCHANNEL_ENCAPSULATION.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /* Followed by *another* message header which is the message to
-     the communicator */
-
-  /* Followed by a 0-terminated name of the communicator */
-};
-
-
-/**
- * Body by which a peer confirms that it is using an ephemeral key.
- */
-struct EphemeralConfirmationPS
-{
-  /**
-   * Purpose is #GNUNET_SIGNATURE_PURPOSE_TRANSPORT_EPHEMERAL
-   */
-  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
-
-  /**
-   * How long is this signature over the ephemeral key valid?
-   *
-   * Note that the receiver MUST IGNORE the absolute time, and only interpret
-   * the value as a mononic time and reject "older" values than the last one
-   * observed.  This is necessary as we do not want to require synchronized
-   * clocks and may not have a bidirectional communication channel.
-   *
-   * Even with this, there is no real guarantee against replay achieved here,
-   * unless the latest timestamp is persisted.  While persistence should be
-   * provided via PEERSTORE, we do not consider the mechanism reliable!  Thus,
-   * communicators must protect against replay attacks when using backchannel
-   * communication!
-   */
-  struct GNUNET_TIME_AbsoluteNBO sender_monotonic_time;
-
-  /**
-   * Target's peer identity.
-   */
-  struct GNUNET_PeerIdentity target;
-
-  /**
-   * Ephemeral key setup by the sender for @e target, used
-   * to encrypt the payload.
-   */
-  struct GNUNET_CRYPTO_EcdhePublicKey ephemeral_key;
-};
-
-
-/**
- * Plaintext of the variable-size payload that is encrypted
- * within a `struct TransportBackchannelEncapsulationMessage`
- */
-struct TransportDVBoxPayloadP
-{
-  /**
-   * Sender's peer identity.
-   */
-  struct GNUNET_PeerIdentity sender;
-
-  /**
-   * Signature of the sender over an
-   * #GNUNET_SIGNATURE_PURPOSE_TRANSPORT_EPHEMERAL.
-   */
-  struct GNUNET_CRYPTO_EddsaSignature sender_sig;
-
-  /**
-   * Current monotonic time of the sending transport service.  Used to
-   * detect replayed messages.  Note that the receiver should remember
-   * a list of the recently seen timestamps and only reject messages
-   * if the timestamp is in the list, or the list is "full" and the
-   * timestamp is smaller than the lowest in the list.
-   *
-   * Like the @e ephemeral_validity, the list of timestamps per peer should be
-   * persisted to guard against replays after restarts.
-   */
-  struct GNUNET_TIME_AbsoluteNBO monotonic_time;
-
-  /* Followed by a `struct GNUNET_MessageHeader` with a message
-     for the target peer */
-};
-
-
-/**
- * Outer layer of an encapsulated unfragmented application message sent
- * over an unreliable channel.
- */
-struct TransportReliabilityBoxMessage
-{
-  /**
-   * Type is #GNUNET_MESSAGE_TYPE_TRANSPORT_RELIABILITY_BOX
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Number of messages still to be sent before a commulative
-   * ACK is requested.  Zero if an ACK is requested immediately.
-   * In NBO.  Note that the receiver may send the ACK faster
-   * if it believes that is reasonable.
-   */
-  uint32_t ack_countdown GNUNET_PACKED;
-
-  /**
-   * Unique ID of the message used for signalling receipt of
-   * messages sent over possibly unreliable channels.  Should
-   * be a random.
-   */
-  struct AcknowledgementUUIDP ack_uuid;
-};
-
-
-/**
- * Acknowledgement payload.
- */
-struct TransportCummulativeAckPayloadP
-{
-  /**
-   * How long was the ACK delayed for generating cumulative ACKs?
-   * Used to calculate the correct network RTT by taking the receipt
-   * time of the ack minus the transmission time of the sender minus
-   * this value.
-   */
-  struct GNUNET_TIME_RelativeNBO ack_delay;
-
-  /**
-   * UUID of a message being acknowledged.
-   */
-  struct AcknowledgementUUIDP ack_uuid;
-};
-
-
-/**
- * Confirmation that the receiver got a
- * #GNUNET_MESSAGE_TYPE_TRANSPORT_RELIABILITY_BOX. Note that the
- * confirmation may be transmitted over a completely different queue,
- * so ACKs are identified by a combination of PID of sender and
- * message UUID, without the queue playing any role!
- */
-struct TransportReliabilityAckMessage
-{
-  /**
-   * Type is #GNUNET_MESSAGE_TYPE_TRANSPORT_RELIABILITY_ACK
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Counter of ACKs transmitted by the sender to us. Incremented
-   * by one for each ACK, used to detect how many ACKs were lost.
-   */
-  uint32_t ack_counter GNUNET_PACKED;
-
-  /* followed by any number of `struct TransportCummulativeAckPayloadP`
-     messages providing ACKs */
-};
-
-
-/**
- * Outer layer of an encapsulated fragmented application message.
- */
-struct TransportFragmentBoxMessage
-{
-  /**
-   * Type is #GNUNET_MESSAGE_TYPE_TRANSPORT_FRAGMENT
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Offset of this fragment in the overall message.
-   */
-  uint16_t frag_off GNUNET_PACKED;
-
-  /**
-   * Total size of the message that is being fragmented.
-   */
-  uint16_t msg_size GNUNET_PACKED;
-
-  /**
-   * Unique ID of this fragment (and fragment transmission!). Will
-   * change even if a fragment is retransmitted to make each
-   * transmission attempt unique! If a client receives a duplicate
-   * fragment (same @e frag_off for same @a msg_uuid, it must send
-   * #GNUNET_MESSAGE_TYPE_TRANSPORT_RELIABILITY_ACK immediately.
-   */
-  struct AcknowledgementUUIDP ack_uuid;
-
-  /**
-   * Original message ID for of the message that all the fragments
-   * belong to.  Must be the same for all fragments.
-   */
-  struct MessageUUIDP msg_uuid;
-};
-
-
-/**
- * Content signed by the initator during DV learning.
- *
- * The signature is required to prevent DDoS attacks. A peer sending out this
- * message is potentially generating a lot of traffic that will go back to the
- * initator, as peers receiving this message will try to let the initiator
- * know that they got the message.
- *
- * Without this signature, an attacker could abuse this mechanism for traffic
- * amplification, sending a lot of traffic to a peer by putting out this type
- * of message with the victim's peer identity.
- *
- * Even with just a signature, traffic amplification would be possible via
- * replay attacks. The @e monotonic_time limits such replay attacks, as every
- * potential amplificator will check the @e monotonic_time and only respond
- * (at most) once per message.
- */
-struct DvInitPS
-{
-  /**
-   * Purpose is #GNUNET_SIGNATURE_PURPOSE_TRANSPORT_DV_INITIATOR
-   */
-  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
-
-  /**
-   * Time at the initiator when generating the signature.
-   *
-   * Note that the receiver MUST IGNORE the absolute time, and only interpret
-   * the value as a mononic time and reject "older" values than the last one
-   * observed.  This is necessary as we do not want to require synchronized
-   * clocks and may not have a bidirectional communication channel.
-   *
-   * Even with this, there is no real guarantee against replay achieved here,
-   * unless the latest timestamp is persisted.  Persistence should be
-   * provided via PEERSTORE if possible.
-   */
-  struct GNUNET_TIME_AbsoluteNBO monotonic_time;
-
-  /**
-   * Challenge value used by the initiator to re-identify the path.
-   */
-  struct GNUNET_CRYPTO_ChallengeNonceP challenge;
-};
-
-
-/**
- * Content signed by each peer during DV learning.
- *
- * This assues the initiator of the DV learning operation that the hop from @e
- * pred via the signing peer to @e succ actually exists.  This makes it
- * impossible for an adversary to supply the network with bogus routes.
- *
- * The @e challenge is included to provide replay protection for the
- * initiator. This way, the initiator knows that the hop existed after the
- * original @e challenge was first transmitted, providing a freshness metric.
- *
- * Peers other than the initiator that passively learn paths by observing
- * these messages do NOT benefit from this. Here, an adversary may indeed
- * replay old messages.  Thus, passively learned paths should always be
- * immediately marked as "potentially stale".
- */
-struct DvHopPS
-{
-  /**
-   * Purpose is #GNUNET_SIGNATURE_PURPOSE_TRANSPORT_DV_HOP
-   */
-  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
-
-  /**
-   * Identity of the previous peer on the path.
-   */
-  struct GNUNET_PeerIdentity pred;
-
-  /**
-   * Identity of the next peer on the path.
-   */
-  struct GNUNET_PeerIdentity succ;
-
-  /**
-   * Challenge value used by the initiator to re-identify the path.
-   */
-  struct GNUNET_CRYPTO_ChallengeNonceP challenge;
-};
-
-
-/**
- * An entry describing a peer on a path in a
- * `struct TransportDVLearnMessage` message.
- */
-struct DVPathEntryP
-{
-  /**
-   * Identity of a peer on the path.
-   */
-  struct GNUNET_PeerIdentity hop;
-
-  /**
-   * Signature of this hop over the path, of purpose
-   * #GNUNET_SIGNATURE_PURPOSE_TRANSPORT_DV_HOP
-   */
-  struct GNUNET_CRYPTO_EddsaSignature hop_sig;
-};
-
-
-/**
- * Internal message used by transport for distance vector learning.
- * If @e num_hops does not exceed the threshold, peers should append
- * themselves to the peer list and flood the message (possibly only
- * to a subset of their neighbours to limit discoverability of the
- * network topology).  To the extend that the @e bidirectional bits
- * are set, peers may learn the inverse paths even if they did not
- * initiate.
- *
- * Unless received on a bidirectional queue and @e num_hops just
- * zero, peers that can forward to the initator should always try to
- * forward to the initiator.
- */
-struct TransportDVLearnMessage
-{
-  /**
-   * Type is #GNUNET_MESSAGE_TYPE_TRANSPORT_DV_LEARN
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Number of hops this messages has travelled, in NBO. Zero if
-   * sent by initiator.
-   */
-  uint16_t num_hops GNUNET_PACKED;
-
-  /**
-   * Bitmask of the last 16 hops indicating whether they are confirmed
-   * available (without DV) in both directions or not, in NBO.  Used
-   * to possibly instantly learn a path in both directions.  Each peer
-   * should shift this value by one to the left, and then set the
-   * lowest bit IF the current sender can be reached from it (without
-   * DV routing).
-   */
-  uint16_t bidirectional GNUNET_PACKED;
-
-  /**
-   * Peers receiving this message and delaying forwarding to other
-   * peers for any reason should increment this value by the non-network
-   * delay created by the peer.
-   */
-  struct GNUNET_TIME_RelativeNBO non_network_delay;
-
-  /**
-   * Time at the initiator when generating the signature.
-   *
-   * Note that the receiver MUST IGNORE the absolute time, and only interpret
-   * the value as a mononic time and reject "older" values than the last one
-   * observed.  This is necessary as we do not want to require synchronized
-   * clocks and may not have a bidirectional communication channel.
-   *
-   * Even with this, there is no real guarantee against replay achieved here,
-   * unless the latest timestamp is persisted.  Persistence should be
-   * provided via PEERSTORE if possible.
-   */
-  struct GNUNET_TIME_AbsoluteNBO monotonic_time;
-
-  /**
-   * Signature of this hop over the path, of purpose
-   * #GNUNET_SIGNATURE_PURPOSE_TRANSPORT_DV_INITIATOR
-   */
-  struct GNUNET_CRYPTO_EddsaSignature init_sig;
-
-  /**
-   * Identity of the peer that started this learning activity.
-   */
-  struct GNUNET_PeerIdentity initiator;
-
-  /**
-   * Challenge value used by the initiator to re-identify the path.
-   */
-  struct GNUNET_CRYPTO_ChallengeNonceP challenge;
-
-  /* Followed by @e num_hops `struct DVPathEntryP` values,
-     excluding the initiator of the DV trace; the last entry is the
-     current sender; the current peer must not be included. */
-};
-
-
-/**
- * Outer layer of an encapsulated message send over multiple hops.
- * The path given only includes the identities of the subsequent
- * peers, i.e. it will be empty if we are the receiver. Each
- * forwarding peer should scan the list from the end, and if it can,
- * forward to the respective peer. The list should then be shortened
- * by all the entries up to and including that peer.  Each hop should
- * also increment @e total_hops to allow the receiver to get a precise
- * estimate on the number of hops the message travelled.  Senders must
- * provide a learned path that thus should work, but intermediaries
- * know of a shortcut, they are allowed to send the message via that
- * shortcut.
- *
- * If a peer finds itself still on the list, it must drop the message.
- *
- * The payload of the box can only be decrypted and verified by the
- * ultimate receiver. Intermediaries do not learn the sender's
- * identity and the path the message has taken.  However, the first
- * hop does learn the sender as @e total_hops would be zero and thus
- * the predecessor must be the origin (so this is not really useful
- * for anonymization).
- */
-struct TransportDVBoxMessage
-{
-  /**
-   * Type is #GNUNET_MESSAGE_TYPE_TRANSPORT_DV_BOX
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Flag if the payload is a control message. In NBO.
-   */
-  unsigned int without_fc;
-
-  /**
-   * Number of total hops this messages travelled. In NBO.
-   * @e origin sets this to zero, to be incremented at
-   * each hop.  Peers should limit the @e total_hops value
-   * they accept from other peers.
-   */
-  uint16_t total_hops GNUNET_PACKED;
-
-  /**
-   * Number of hops this messages includes. In NBO.  Reduced by one
-   * or more at each hop.  Peers should limit the @e num_hops value
-   * they accept from other peers.
-   */
-  uint16_t num_hops GNUNET_PACKED;
-
-  /**
-   * Ephemeral key setup by the sender for target, used to encrypt the
-   * payload.  Intermediaries must not change this value.
-   */
-  struct GNUNET_CRYPTO_EcdhePublicKey ephemeral_key;
-
-  /**
-   * We use an IV here as the @e ephemeral_key is re-used for
-   * #EPHEMERAL_VALIDITY time to avoid re-signing it all the time.
-   * Intermediaries must not change this value.
-   */
-  struct GNUNET_ShortHashCode iv;
-
-  /**
-   * HMAC over the ciphertext of the encrypted, variable-size body
-   * that follows.  Verified via DH of target and @e ephemeral_key.
-   * Intermediaries must not change this value.
-   */
-  struct GNUNET_HashCode hmac;
-
-  /**
-   * Size this msg had initially. This is needed to calculate the hmac at the target.
-   * The header size can not be used for that, because the box size is getting smaller at each hop.
-   */
-  /**
-   * The length of the struct (in bytes, including the length field itself),
-   * in big-endian format.
-   */
-  uint16_t orig_size GNUNET_PACKED;
-
-  /* Followed by @e num_hops `struct GNUNET_PeerIdentity` values;
-     excluding the @e origin and the current peer, the last must be
-     the ultimate target; if @e num_hops is zero, the receiver of this
-     message is the ultimate target. */
-
-  /* Followed by encrypted, variable-size payload, which
-     must begin with a `struct TransportDVBoxPayloadP` */
-
-  /* Followed by the actual message, which itself must not be a
-     a DV_LEARN or DV_BOX message! */
-};
-
-
-/**
- * Message send to another peer to validate that it can indeed
- * receive messages at a particular address.
- */
-struct TransportValidationChallengeMessage
-{
-  /**
-   * Type is #GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_VALIDATION_CHALLENGE
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Always zero.
-   */
-  uint32_t reserved GNUNET_PACKED;
-
-  /**
-   * Challenge to be signed by the receiving peer.
-   */
-  struct GNUNET_CRYPTO_ChallengeNonceP challenge;
-
-  /**
-   * Timestamp of the sender, to be copied into the reply to allow
-   * sender to calculate RTT.  Must be monotonically increasing!
-   */
-  struct GNUNET_TIME_AbsoluteNBO sender_time;
-};
-
-
-/**
- * Message signed by a peer to confirm that it can indeed
- * receive messages at a particular address.
- */
-struct TransportValidationPS
-{
-  /**
-   * Purpose is #GNUNET_SIGNATURE_PURPOSE_TRANSPORT_CHALLENGE
-   */
-  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
-
-  /**
-   * How long does the sender believe the address on
-   * which the challenge was received to remain valid?
-   */
-  struct GNUNET_TIME_RelativeNBO validity_duration;
-
-  /**
-   * Challenge signed by the receiving peer.
-   */
-  struct GNUNET_CRYPTO_ChallengeNonceP challenge;
-};
-
-
-/**
- * Message  send to a peer to respond to a
- * #GNUNET_MESSAGE_TYPE_ADDRESS_VALIDATION_CHALLENGE
- */
-struct TransportValidationResponseMessage
-{
-  /**
-   * Type is #GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_VALIDATION_RESPONSE
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Always zero.
-   */
-  uint32_t reserved GNUNET_PACKED;
-
-  /**
-   * The peer's signature matching the
-   * #GNUNET_SIGNATURE_PURPOSE_TRANSPORT_CHALLENGE purpose.
-   */
-  struct GNUNET_CRYPTO_EddsaSignature signature;
-
-  /**
-   * The challenge that was signed by the receiving peer.
-   */
-  struct GNUNET_CRYPTO_ChallengeNonceP challenge;
-
-  /**
-   * Original timestamp of the sender (was @code{sender_time}),
-   * copied into the reply to allow sender to calculate RTT.
-   */
-  struct GNUNET_TIME_AbsoluteNBO origin_time;
-
-  /**
-   * How long does the sender believe this address to remain
-   * valid?
-   */
-  struct GNUNET_TIME_RelativeNBO validity_duration;
-};
-
-
-/**
- * Message for Transport-to-Transport Flow control. Specifies the size
- * of the flow control window, including how much we believe to have
- * consumed (at transmission time), how much we believe to be allowed
- * (at transmission time), and how much the other peer is allowed to
- * send to us, and how much data we already received from the other
- * peer.
- */
-struct TransportFlowControlMessage
-{
-  /**
-   * Type is #GNUNET_MESSAGE_TYPE_TRANSPORT_FLOW_CONTROL
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Sequence number of the flow control message. Incremented by one
-   * for each message.  Starts at zero when a virtual link goes up.
-   * Used to detect one-sided connection drops. On wrap-around, the
-   * flow control counters will be reset as if the connection had
-   * dropped.
-   */
-  uint32_t seq GNUNET_PACKED;
-
-  /**
-   * Flow control window size in bytes, in NBO.
-   * The receiver can send this many bytes at most.
-   */
-  uint64_t inbound_window_size GNUNET_PACKED;
-
-  /**
-   * How many bytes has the sender sent that count for flow control at
-   * this time.  Used to allow the receiver to estimate the packet
-   * loss rate.
-   */
-  uint64_t outbound_sent GNUNET_PACKED;
-
-  /**
-   * Latest flow control window size we learned from the other peer,
-   * in bytes, in NBO.  We are limited to sending at most this many
-   * bytes to the other peer.  May help the other peer detect when
-   * flow control messages were lost and should thus be retransmitted.
-   * In particular, if the delta to @e outbound_sent is too small,
-   * this signals that we are stalled.
-   */
-  uint64_t outbound_window_size GNUNET_PACKED;
-
-  /**
-   * Timestamp of the sender.  Must be monotonically increasing!
-   * Used to enable receiver to ignore out-of-order packets in
-   * combination with the @e seq. Note that @e seq will go down
-   * (back to zero) whenever either side believes the connection
-   * was dropped, allowing the peers to detect that they need to
-   * reset the counters for the number of bytes sent!
-   */
-  struct GNUNET_TIME_AbsoluteNBO sender_time;
-};
-
-
-GNUNET_NETWORK_STRUCT_END
-
-
-/**
- * What type of client is the `struct TransportClient` about?
- */
-enum ClientType
-{
-  /**
-   * We do not know yet (client is fresh).
-   */
-  CT_NONE = 0,
-
-  /**
-   * Is the CORE service, we need to forward traffic to it.
-   */
-  CT_CORE = 1,
-
-  /**
-   * It is a monitor, forward monitor data.
-   */
-  CT_MONITOR = 2,
-
-  /**
-   * It is a communicator, use for communication.
-   */
-  CT_COMMUNICATOR = 3,
-
-  /**
-   * "Application" telling us where to connect (i.e. TOPOLOGY, DHT or CADET).
-   */
-  CT_APPLICATION = 4
-};
-
-
-/**
- * Which transmission options are allowable for transmission?
- * Interpreted bit-wise!
- */
-enum RouteMessageOptions
-{
-  /**
-   * Only confirmed, non-DV direct neighbours.
-   */
-  RMO_NONE = 0,
-
-  /**
-   * We are allowed to use DV routing for this @a hdr
-   */
-  RMO_DV_ALLOWED = 1,
-
-  /**
-   * We are allowed to use unconfirmed queues or DV routes for this message
-   */
-  RMO_UNCONFIRMED_ALLOWED = 2,
-
-  /**
-   * Reliable and unreliable, DV and non-DV are all acceptable.
-   */
-  RMO_ANYTHING_GOES = (RMO_DV_ALLOWED | RMO_UNCONFIRMED_ALLOWED),
-
-  /**
-   * If we have multiple choices, it is OK to send this message
-   * over multiple channels at the same time to improve loss tolerance.
-   * (We do at most 2 transmissions.)
-   */
-  RMO_REDUNDANT = 4
-};
-
-
-/**
- * When did we launch this DV learning activity?
- */
-struct LearnLaunchEntry
-{
-  /**
-   * Kept (also) in a DLL sorted by launch time.
-   */
-  struct LearnLaunchEntry *prev;
-
-  /**
-   * Kept (also) in a DLL sorted by launch time.
-   */
-  struct LearnLaunchEntry *next;
-
-  /**
-   * Challenge that uniquely identifies this activity.
-   */
-  struct GNUNET_CRYPTO_ChallengeNonceP challenge;
-
-  /**
-   * When did we transmit the DV learn message (used to calculate RTT) and
-   * determine freshness of paths learned via this operation.
-   */
-  struct GNUNET_TIME_Absolute launch_time;
-};
-
-
-/**
- * Information we keep per #GOODPUT_AGING_SLOTS about historic
- * (or current) transmission performance.
- */
-struct TransmissionHistoryEntry
-{
-  /**
-   * Number of bytes actually sent in the interval.
-   */
-  uint64_t bytes_sent;
-
-  /**
-   * Number of bytes received and acknowledged by the other peer in
-   * the interval.
-   */
-  uint64_t bytes_received;
-};
-
-
-/**
- * Performance data for a transmission possibility.
- */
-struct PerformanceData
-{
-  /**
-   * Weighted average for the RTT.
-   */
-  struct GNUNET_TIME_Relative aged_rtt;
-
-  /**
-   * Historic performance data, using a ring buffer of#GOODPUT_AGING_SLOTS
-   * entries.
-   */
-  struct TransmissionHistoryEntry the[GOODPUT_AGING_SLOTS];
-
-  /**
-   * What was the last age when we wrote to @e the? Used to clear
-   * old entries when the age advances.
-   */
-  unsigned int last_age;
-};
-
-
-/**
- * Client connected to the transport service.
- */
-struct TransportClient;
-
-/**
- * A neighbour that at least one communicator is connected to.
- */
-struct Neighbour;
-
-/**
- * Entry in our #dv_routes table, representing a (set of) distance
- * vector routes to a particular peer.
- */
-struct DistanceVector;
-
-/**
- * A queue is a message queue provided by a communicator
- * via which we can reach a particular neighbour.
- */
-struct Queue;
-
-/**
- * Message awaiting transmission. See detailed comments below.
- */
-struct PendingMessage;
-
-/**
- * One possible hop towards a DV target.
- */
-struct DistanceVectorHop;
-
-/**
- * A virtual link is another reachable peer that is known to CORE.  It
- * can be either a `struct Neighbour` with at least one confirmed
- * `struct Queue`, or a `struct DistanceVector` with at least one
- * confirmed `struct DistanceVectorHop`.  With a virtual link we track
- * data that is per neighbour that is not specific to how the
- * connectivity is established.
- */
-struct VirtualLink;
-
-
-/**
- * Context from #handle_incoming_msg().  Closure for many
- * message handlers below.
- */
-struct CommunicatorMessageContext
-{
-  /**
-   * Kept in a DLL of `struct VirtualLink` if waiting for CORE
-   * flow control to unchoke.
-   */
-  struct CommunicatorMessageContext *next;
-
-  /**
-   * Kept in a DLL of `struct VirtualLink` if waiting for CORE
-   * flow control to unchoke.
-   */
-  struct CommunicatorMessageContext *prev;
-
-  /**
-   * Which communicator provided us with the message.
-   */
-  struct TransportClient *tc;
-
-  /**
-   * Additional information for flow control and about the sender.
-   */
-  struct GNUNET_TRANSPORT_IncomingMessage im;
-
-  /**
-   * Number of hops the message has travelled (if DV-routed).
-   * FIXME: make use of this in ACK handling!
-   */
-  uint16_t total_hops;
-};
-
-
-/**
- * Closure for #core_env_sent_cb.
- */
-struct CoreSentContext
-{
-  /**
-   * Kept in a DLL to clear @e vl in case @e vl is lost.
-   */
-  struct CoreSentContext *next;
-
-  /**
-   * Kept in a DLL to clear @e vl in case @e vl is lost.
-   */
-  struct CoreSentContext *prev;
-
-  /**
-   * Virtual link this is about.
-   */
-  struct VirtualLink *vl;
-
-  /**
-   * How big was the message.
-   */
-  uint16_t size;
-
-  /**
-   * By how much should we increment @e vl's
-   * incoming_fc_window_size_used once we are done sending to CORE?
-   * Use to ensure we do not increment twice if there is more than one
-   * CORE client.
-   */
-  uint16_t isize;
-};
-
-
-/**
- * Information we keep for a message that we are reassembling.
- */
-struct ReassemblyContext
-{
-  /**
-   * Original message ID for of the message that all the fragments
-   * belong to.
-   */
-  struct MessageUUIDP msg_uuid;
-
-  /**
-   * Which neighbour is this context for?
-   */
-  struct VirtualLink *virtual_link;
-
-  /**
-   * Entry in the reassembly heap (sorted by expiration).
-   */
-  struct GNUNET_CONTAINER_HeapNode *hn;
-
-  /**
-   * Bitfield with @e msg_size bits representing the positions
-   * where we have received fragments.  When we receive a fragment,
-   * we check the bits in @e bitfield before incrementing @e msg_missing.
-   *
-   * Allocated after the reassembled message.
-   */
-  uint8_t *bitfield;
-
-  /**
-   * At what time will we give up reassembly of this message?
-   */
-  struct GNUNET_TIME_Absolute reassembly_timeout;
-
-  /**
-   * Time we received the last fragment.  @e avg_ack_delay must be
-   * incremented by now - @e last_frag multiplied by @e num_acks.
-   */
-  struct GNUNET_TIME_Absolute last_frag;
-
-  /**
-   * How big is the message we are reassembling in total?
-   */
-  uint16_t msg_size;
-
-  /**
-   * How many bytes of the message are still missing?  Defragmentation
-   * is complete when @e msg_missing == 0.
-   */
-  uint16_t msg_missing;
-
-  /* Followed by @e msg_size bytes of the (partially) defragmented original
-   * message */
-
-  /* Followed by @e bitfield data */
-};
-
-
-/**
- * A virtual link is another reachable peer that is known to CORE.  It
- * can be either a `struct Neighbour` with at least one confirmed
- * `struct Queue`, or a `struct DistanceVector` with at least one
- * confirmed `struct DistanceVectorHop`.  With a virtual link we track
- * data that is per neighbour that is not specific to how the
- * connectivity is established.
- */
-struct VirtualLink
-{
-  /**
-   * Identity of the peer at the other end of the link.
-   */
-  struct GNUNET_PeerIdentity target;
-
-  /**
-   * Map with `struct ReassemblyContext` structs for fragments under
-   * reassembly. May be NULL if we currently have no fragments from
-   * this @e pid (lazy initialization).
-   */
-  struct GNUNET_CONTAINER_MultiHashMap32 *reassembly_map;
-
-  /**
-   * Heap with `struct ReassemblyContext` structs for fragments under
-   * reassembly. May be NULL if we currently have no fragments from
-   * this @e pid (lazy initialization).
-   */
-  struct GNUNET_CONTAINER_Heap *reassembly_heap;
-
-  /**
-   * Task to free old entries from the @e reassembly_heap and @e reassembly_map.
-   */
-  struct GNUNET_SCHEDULER_Task *reassembly_timeout_task;
-
-  /**
-   * Communicators blocked for receiving on @e target as we are waiting
-   * on the @e core_recv_window to increase.
-   */
-  struct CommunicatorMessageContext *cmc_head;
-
-  /**
-   * Communicators blocked for receiving on @e target as we are waiting
-   * on the @e core_recv_window to increase.
-   */
-  struct CommunicatorMessageContext *cmc_tail;
-
-  /**
-   * Head of list of messages pending for this VL.
-   */
-  struct PendingMessage *pending_msg_head;
-
-  /**
-   * Tail of list of messages pending for this VL.
-   */
-  struct PendingMessage *pending_msg_tail;
-
-  /**
-   * Kept in a DLL to clear @e vl in case @e vl is lost.
-   */
-  struct CoreSentContext *csc_tail;
-
-  /**
-   * Kept in a DLL to clear @e vl in case @e vl is lost.
-   */
-  struct CoreSentContext *csc_head;
-
-  /**
-   * Task scheduled to possibly notfiy core that this peer is no
-   * longer counting as confirmed.  Runs the #core_visibility_check(),
-   * which checks that some DV-path or a queue exists that is still
-   * considered confirmed.
-   */
-  struct GNUNET_SCHEDULER_Task *visibility_task;
-
-  /**
-   * Task scheduled to periodically retransmit FC messages (in
-   * case one got lost).
-   */
-  struct GNUNET_SCHEDULER_Task *fc_retransmit_task;
-
-  /**
-   * Number of FC retransmissions for this running task.
-   */
-  unsigned int fc_retransmit_count;
-
-  /**
-   * Is this VirtualLink confirmed.
-   * A unconfirmed VirtualLink might exist, if we got a FC from that target.
-   */
-  unsigned int confirmed;
-
-  /**
-   * Neighbour used by this virtual link, NULL if @e dv is used.
-   */
-  struct Neighbour *n;
-
-  /**
-   * Distance vector used by this virtual link, NULL if @e n is used.
-   */
-  struct DistanceVector *dv;
-
-  /**
-   * Sender timestamp of @e n_challenge, used to generate out-of-order
-   * challenges (as sender's timestamps must be monotonically
-   * increasing).  FIXME: where do we need this?
-   */
-  struct GNUNET_TIME_Absolute n_challenge_time;
-
-  /**
-   * When did we last send a
-   * #GNUNET_MESSAGE_TYPE_TRANSPORT_FLOW_CONTROL message?
-   * Used to determine whether it is time to re-transmit the message.
-   */
-  struct GNUNET_TIME_Absolute last_fc_transmission;
-
-  /**
-   * Sender timestamp of the last
-   * #GNUNET_MESSAGE_TYPE_TRANSPORT_FLOW_CONTROL message we have
-   * received.  Note that we do not persist this monotonic time as we
-   * do not really have to worry about ancient flow control window
-   * sizes after restarts.
-   */
-  struct GNUNET_TIME_Absolute last_fc_timestamp;
-
-  /**
-   * Expected RTT from the last FC transmission. (Zero if the last
-   * attempt failed, but could theoretically be zero even on success.)
-   */
-  struct GNUNET_TIME_Relative last_fc_rtt;
-
-  /**
-   * Used to generate unique UUIDs for messages that are being
-   * fragmented.
-   */
-  uint64_t message_uuid_ctr;
-
-  /**
-   * Memory allocated for this virtual link.  Expresses how much RAM
-   * we are willing to allocate to this virtual link.  OPTIMIZE-ME:
-   * Can be adapted to dedicate more RAM to links that need it, while
-   * sticking to some overall RAM limit.  For now, set to
-   * #DEFAULT_WINDOW_SIZE.
-   */
-  uint64_t available_fc_window_size;
-
-  /**
-   * Memory actually used to buffer packets on this virtual link.
-   * Expresses how much RAM we are currently using for virtual link.
-   * Note that once CORE is done with a packet, we decrement the value
-   * here.
-   */
-  uint64_t incoming_fc_window_size_ram;
-
-  /**
-   * Last flow control window size we provided to the other peer, in
-   * bytes.  We are allowing the other peer to send this
-   * many bytes.
-   */
-  uint64_t incoming_fc_window_size;
-
-  /**
-   * How much of the window did the other peer successfully use (and
-   * we already passed it on to CORE)? Must be below @e
-   * incoming_fc_window_size.   We should effectively signal the
-   * other peer that the window is this much bigger at the next
-   * opportunity / challenge.
-   */
-  uint64_t incoming_fc_window_size_used;
-
-  /**
-   * What is our current estimate on the message loss rate for the sender?
-   * Based on the difference between how much the sender sent according
-   * to the last #GNUNET_MESSAGE_TYPE_TRANSPORT_FLOW_CONTROL message
-   * (@e outbound_sent field) and how much we actually received at that
-   * time (@e incoming_fc_window_size_used).  This delta is then
-   * added onto the @e incoming_fc_window_size when determining the
-   * @e outbound_window_size we send to the other peer.  Initially zero.
-   * May be negative if we (due to out-of-order delivery) actually received
-   * more than the sender claims to have sent in its last FC message.
-   */
-  int64_t incoming_fc_window_size_loss;
-
-  /**
-   * Our current flow control window size in bytes.  We
-   * are allowed to transmit this many bytes to @a n.
-   */
-  uint64_t outbound_fc_window_size;
-
-  /**
-   * How much of our current flow control window size have we
-   * used (in bytes).  Must be below
-   * @e outbound_fc_window_size.
-   */
-  uint64_t outbound_fc_window_size_used;
-
-  /**
-   * What is the most recent FC window the other peer sent us
-   * in `outbound_window_size`? This is basically the window
-   * size value the other peer has definitively received from
-   * us. If it matches @e incoming_fc_window_size, we should
-   * not send a FC message to increase the FC window. However,
-   * we may still send an FC message to notify the other peer
-   * that we received the other peer's FC message.
-   */
-  uint64_t last_outbound_window_size_received;
-
-  /**
-   * Generator for the sequence numbers of
-   * #GNUNET_MESSAGE_TYPE_TRANSPORT_FLOW_CONTROL messages we send.
-   */
-  uint32_t fc_seq_gen;
-
-  /**
-   * Last sequence number of a
-   * #GNUNET_MESSAGE_TYPE_TRANSPORT_FLOW_CONTROL message we have
-   * received.
-   */
-  uint32_t last_fc_seq;
-
-  /**
-   * How many more messages can we send to CORE before we exhaust
-   * the receive window of CORE for this peer? If this hits zero,
-   * we must tell communicators to stop providing us more messages
-   * for this peer.  In fact, the window can go negative as we
-   * have multiple communicators, so per communicator we can go
-   * down by one into the negative range. Furthermore, we count
-   * delivery per CORE client, so if we had multiple cores, that
-   * might also cause a negative window size here (as one message
-   * would decrement the window by one per CORE client).
-   */
-  int core_recv_window;
-};
-
-
-/**
- * Data structure kept when we are waiting for an acknowledgement.
- */
-struct PendingAcknowledgement
-{
-  /**
-   * If @e pm is non-NULL, this is the DLL in which this acknowledgement
-   * is kept in relation to its pending message.
-   */
-  struct PendingAcknowledgement *next_pm;
-
-  /**
-   * If @e pm is non-NULL, this is the DLL in which this acknowledgement
-   * is kept in relation to its pending message.
-   */
-  struct PendingAcknowledgement *prev_pm;
-
-  /**
-   * If @e queue is non-NULL, this is the DLL in which this acknowledgement
-   * is kept in relation to the queue that was used to transmit the
-   * @a pm.
-   */
-  struct PendingAcknowledgement *next_queue;
-
-  /**
-   * If @e queue is non-NULL, this is the DLL in which this acknowledgement
-   * is kept in relation to the queue that was used to transmit the
-   * @a pm.
-   */
-  struct PendingAcknowledgement *prev_queue;
-
-  /**
-   * If @e dvh is non-NULL, this is the DLL in which this acknowledgement
-   * is kept in relation to the DVH that was used to transmit the
-   * @a pm.
-   */
-  struct PendingAcknowledgement *next_dvh;
-
-  /**
-   * If @e dvh is non-NULL, this is the DLL in which this acknowledgement
-   * is kept in relation to the DVH that was used to transmit the
-   * @a pm.
-   */
-  struct PendingAcknowledgement *prev_dvh;
-
-  /**
-   * Pointers for the DLL of all pending acknowledgements.
-   * This list is sorted by @e transmission time.  If the list gets too
-   * long, the oldest entries are discarded.
-   */
-  struct PendingAcknowledgement *next_pa;
-
-  /**
-   * Pointers for the DLL of all pending acknowledgements.
-   * This list is sorted by @e transmission time.  If the list gets too
-   * long, the oldest entries are discarded.
-   */
-  struct PendingAcknowledgement *prev_pa;
-
-  /**
-   * Unique identifier for this transmission operation.
-   */
-  struct AcknowledgementUUIDP ack_uuid;
-
-  /**
-   * Message that was transmitted, may be NULL if the message was ACKed
-   * via another channel.
-   */
-  struct PendingMessage *pm;
-
-  /**
-   * Distance vector path chosen for this transmission, NULL if transmission
-   * was to a direct neighbour OR if the path was forgotten in the meantime.
-   */
-  struct DistanceVectorHop *dvh;
-
-  /**
-   * Queue used for transmission, NULL if the queue has been destroyed
-   * (which may happen before we get an acknowledgement).
-   */
-  struct Queue *queue;
-
-  /**
-   * Time of the transmission, for RTT calculation.
-   */
-  struct GNUNET_TIME_Absolute transmission_time;
-
-  /**
-   * Number of bytes of the original message (to calculate bandwidth).
-   */
-  uint16_t message_size;
-};
-
-
-/**
- * One possible hop towards a DV target.
- */
-struct DistanceVectorHop
-{
-  /**
-   * Kept in a MDLL, sorted by @e timeout.
-   */
-  struct DistanceVectorHop *next_dv;
-
-  /**
-   * Kept in a MDLL, sorted by @e timeout.
-   */
-  struct DistanceVectorHop *prev_dv;
-
-  /**
-   * Kept in a MDLL.
-   */
-  struct DistanceVectorHop *next_neighbour;
-
-  /**
-   * Kept in a MDLL.
-   */
-  struct DistanceVectorHop *prev_neighbour;
-
-  /**
-   * Head of DLL of PAs that used our @a path.
-   */
-  struct PendingAcknowledgement *pa_head;
-
-  /**
-   * Tail of DLL of PAs that used our @a path.
-   */
-  struct PendingAcknowledgement *pa_tail;
-
-  /**
-   * What would be the next hop to @e target?
-   */
-  struct Neighbour *next_hop;
-
-  /**
-   * Distance vector entry this hop belongs with.
-   */
-  struct DistanceVector *dv;
-
-  /**
-   * Array of @e distance hops to the target, excluding @e next_hop.
-   * NULL if the entire path is us to @e next_hop to `target`. Allocated
-   * at the end of this struct. Excludes the target itself!
-   */
-  const struct GNUNET_PeerIdentity *path;
-
-  /**
-   * At what time do we forget about this path unless we see it again
-   * while learning?
-   */
-  struct GNUNET_TIME_Absolute timeout;
-
-  /**
-   * For how long is the validation of this path considered
-   * valid?
-   * Set to ZERO if the path is learned by snooping on DV learn messages
-   * initiated by other peers, and to the time at which we generated the
-   * challenge for DV learn operations this peer initiated.
-   */
-  struct GNUNET_TIME_Absolute path_valid_until;
-
-  /**
-   * Performance data for this transmission possibility.
-   */
-  struct PerformanceData pd;
-
-  /**
-   * Number of hops in total to the `target` (excluding @e next_hop and `target`
-   * itself). Thus 0 still means a distance of 2 hops (to @e next_hop and then
-   * to `target`).
-   */
-  unsigned int distance;
-};
-
-
-/**
- * Entry in our #dv_routes table, representing a (set of) distance
- * vector routes to a particular peer.
- */
-struct DistanceVector
-{
-  /**
-   * To which peer is this a route?
-   */
-  struct GNUNET_PeerIdentity target;
-
-  /**
-   * Known paths to @e target.
-   */
-  struct DistanceVectorHop *dv_head;
-
-  /**
-   * Known paths to @e target.
-   */
-  struct DistanceVectorHop *dv_tail;
-
-  /**
-   * Task scheduled to purge expired paths from @e dv_head MDLL.
-   */
-  struct GNUNET_SCHEDULER_Task *timeout_task;
-
-  /**
-   * Do we have a confirmed working queue and are thus visible to
-   * CORE?  If so, this is the virtual link, otherwise NULL.
-   */
-  struct VirtualLink *vl;
-
-  /**
-   * Signature affirming @e ephemeral_key of type
-   * #GNUNET_SIGNATURE_PURPOSE_TRANSPORT_EPHEMERAL
-   */
-  struct GNUNET_CRYPTO_EddsaSignature sender_sig;
-
-  /**
-   * How long is @e sender_sig valid
-   */
-  struct GNUNET_TIME_Absolute ephemeral_validity;
-
-  /**
-   * What time was @e sender_sig created
-   */
-  struct GNUNET_TIME_Absolute monotime;
-
-  /**
-   * Our ephemeral key.
-   */
-  struct GNUNET_CRYPTO_EcdhePublicKey ephemeral_key;
-
-  /**
-   * Our private ephemeral key.
-   */
-  struct GNUNET_CRYPTO_EcdhePrivateKey private_key;
-};
-
-
-/**
- * Entry identifying transmission in one of our `struct
- * Queue` which still awaits an ACK.  This is used to
- * ensure we do not overwhelm a communicator and limit the number of
- * messages outstanding per communicator (say in case communicator is
- * CPU bound) and per queue (in case bandwidth allocation exceeds
- * what the communicator can actually provide towards a particular
- * peer/target).
- */
-struct QueueEntry
-{
-  /**
-   * Kept as a DLL.
-   */
-  struct QueueEntry *next;
-
-  /**
-   * Kept as a DLL.
-   */
-  struct QueueEntry *prev;
-
-  /**
-   * Queue this entry is queued with.
-   */
-  struct Queue *queue;
-
-  /**
-   * Pending message this entry is for, or NULL for none.
-   */
-  struct PendingMessage *pm;
-
-  /**
-   * Message ID used for this message with the queue used for transmission.
-   */
-  uint64_t mid;
-};
-
-
-/**
- * A queue is a message queue provided by a communicator
- * via which we can reach a particular neighbour.
- */
-struct Queue
-{
-  /**
-   * Kept in a MDLL.
-   */
-  struct Queue *next_neighbour;
-
-  /**
-   * Kept in a MDLL.
-   */
-  struct Queue *prev_neighbour;
-
-  /**
-   * Kept in a MDLL.
-   */
-  struct Queue *prev_client;
-
-  /**
-   * Kept in a MDLL.
-   */
-  struct Queue *next_client;
-
-  /**
-   * Head of DLL of PAs that used this queue.
-   */
-  struct PendingAcknowledgement *pa_head;
-
-  /**
-   * Tail of DLL of PAs that used this queue.
-   */
-  struct PendingAcknowledgement *pa_tail;
-
-  /**
-   * Head of DLL of unacked transmission requests.
-   */
-  struct QueueEntry *queue_head;
-
-  /**
-   * End of DLL of unacked transmission requests.
-   */
-  struct QueueEntry *queue_tail;
-
-  /**
-   * Which neighbour is this queue for?
-   */
-  struct Neighbour *neighbour;
-
-  /**
-   * Which communicator offers this queue?
-   */
-  struct TransportClient *tc;
-
-  /**
-   * Address served by the queue.
-   */
-  const char *address;
-
-  /**
-   * Is this queue of unlimited length.
-   */
-  unsigned int unlimited_length;
-
-  /**
-   * Task scheduled for the time when this queue can (likely) transmit the
-   * next message.
-   */
-  struct GNUNET_SCHEDULER_Task *transmit_task;
-
-  /**
-   * How long do *we* consider this @e address to be valid?  In the past or
-   * zero if we have not yet validated it.  Can be updated based on
-   * challenge-response validations (via address validation logic), or when we
-   * receive ACKs that we can definitively map to transmissions via this
-   * queue.
-   */
-  struct GNUNET_TIME_Absolute validated_until;
-
-  /**
-   * Performance data for this queue.
-   */
-  struct PerformanceData pd;
-
-  /**
-   * Message ID generator for transmissions on this queue to the
-   * communicator.
-   */
-  uint64_t mid_gen;
-
-  /**
-   * Unique identifier of this queue with the communicator.
-   */
-  uint32_t qid;
-
-  /**
-   * Maximum transmission unit supported by this queue.
-   */
-  uint32_t mtu;
-
-  /**
-   * Messages pending.
-   */
-  uint32_t num_msg_pending;
-
-  /**
-   * Bytes pending.
-   */
-  uint32_t num_bytes_pending;
-
-  /**
-   * Length of the DLL starting at @e queue_head.
-   */
-  unsigned int queue_length;
-
-  /**
-   * Capacity of the queue.
-   */
-  uint64_t q_capacity;
-
-  /**
-   * Queue priority
-   */
-  uint32_t priority;
-
-  /**
-   * Network type offered by this queue.
-   */
-  enum GNUNET_NetworkType nt;
-
-  /**
-   * Connection status for this queue.
-   */
-  enum GNUNET_TRANSPORT_ConnectionStatus cs;
-
-  /**
-   * Set to #GNUNET_YES if this queue is idle waiting for some
-   * virtual link to give it a pending message.
-   */
-  int idle;
-};
-
-
-
-
-
-/**
- * A neighbour that at least one communicator is connected to.
- */
-struct Neighbour
-{
-  /**
-   * Which peer is this about?
-   */
-  struct GNUNET_PeerIdentity pid;
-
-  /**
-   * Head of MDLL of DV hops that have this neighbour as next hop. Must be
-   * purged if this neighbour goes down.
-   */
-  struct DistanceVectorHop *dv_head;
-
-  /**
-   * Tail of MDLL of DV hops that have this neighbour as next hop. Must be
-   * purged if this neighbour goes down.
-   */
-  struct DistanceVectorHop *dv_tail;
-
-  /**
-   * Head of DLL of queues to this peer.
-   */
-  struct Queue *queue_head;
-
-  /**
-   * Tail of DLL of queues to this peer.
-   */
-  struct Queue *queue_tail;
-
-  /**
-   * Handle for an operation to fetch @e last_dv_learn_monotime information from
-   * the PEERSTORE, or NULL.
-   */
-  struct GNUNET_PEERSTORE_IterateContext *get;
-
-  /**
-   * Handle to a PEERSTORE store operation to store this @e pid's @e
-   * @e last_dv_learn_monotime.  NULL if no PEERSTORE operation is pending.
-   */
-  struct GNUNET_PEERSTORE_StoreContext *sc;
-
-  /**
-   * Do we have a confirmed working queue and are thus visible to
-   * CORE?  If so, this is the virtual link, otherwise NULL.
-   */
-  struct VirtualLink *vl;
-
-  /**
-   * Latest DVLearn monotonic time seen from this peer.  Initialized only
-   * if @e dl_monotime_available is #GNUNET_YES.
-   */
-  struct GNUNET_TIME_Absolute last_dv_learn_monotime;
-
-  /**
-   * Do we have the latest value for @e last_dv_learn_monotime from
-   * PEERSTORE yet, or are we still waiting for a reply of PEERSTORE?
-   */
-  int dv_monotime_available;
-};
-
-
-/**
- * Another peer attempted to talk to us, we should try to establish
- * a connection in the other direction.
- */
-struct IncomingRequest
-{
-  /**
-   * Kept in a DLL.
-   */
-  struct IncomingRequest *next;
-
-  /**
-   * Kept in a DLL.
-   */
-  struct IncomingRequest *prev;
-
-  /**
-   * Handle for watching the peerstore for HELLOs for this peer.
-   */
-  struct GNUNET_PEERSTORE_WatchContext *wc;
-
-  /**
-   * Which peer is this about?
-   */
-  struct GNUNET_PeerIdentity pid;
-};
-
-
-/**
- * A peer that an application (client) would like us to talk to directly.
- */
-struct PeerRequest
-{
-  /**
-   * Which peer is this about?
-   */
-  struct GNUNET_PeerIdentity pid;
-
-  /**
-   * Client responsible for the request.
-   */
-  struct TransportClient *tc;
-
-  /**
-   * Handle for watching the peerstore for HELLOs for this peer.
-   */
-  struct GNUNET_PEERSTORE_WatchContext *wc;
-
-  /**
-   * What kind of performance preference does this @e tc have?
-   *
-   * TODO: use this!
-   */
-  enum GNUNET_MQ_PriorityPreferences pk;
-
-  /**
-   * How much bandwidth would this @e tc like to see?
-   */
-  struct GNUNET_BANDWIDTH_Value32NBO bw;
-};
-
-
-/**
- * Types of different pending messages.
- */
-enum PendingMessageType
-{
-  /**
-   * Ordinary message received from the CORE service.
-   */
-  PMT_CORE = 0,
-
-  /**
-   * Fragment box.
-   */
-  PMT_FRAGMENT_BOX = 1,
-
-  /**
-   * Reliability box.
-   */
-  PMT_RELIABILITY_BOX = 2,
-
-  /**
-   * Pending message created during #forward_dv_box().
-   */
-  PMT_DV_BOX = 3
-};
-
-
-/**
- * Transmission request that is awaiting delivery.  The original
- * transmission requests from CORE may be too big for some queues.
- * In this case, a *tree* of fragments is created.  At each
- * level of the tree, fragments are kept in a DLL ordered by which
- * fragment should be sent next (at the head).  The tree is searched
- * top-down, with the original message at the root.
- *
- * To select a node for transmission, first it is checked if the
- * current node's message fits with the MTU.  If it does not, we
- * either calculate the next fragment (based on @e frag_off) from the
- * current node, or, if all fragments have already been created,
- * descend to the @e head_frag.  Even though the node was already
- * fragmented, the fragment may be too big if the fragment was
- * generated for a queue with a larger MTU. In this case, the node
- * may be fragmented again, thus creating a tree.
- *
- * When acknowledgements for fragments are received, the tree
- * must be pruned, removing those parts that were already
- * acknowledged.  When fragments are sent over a reliable
- * channel, they can be immediately removed.
- *
- * If a message is ever fragmented, then the original "full" message
- * is never again transmitted (even if it fits below the MTU), and
- * only (remaining) fragments are sent.
- */
-struct PendingMessage
-{
-  /**
-   * Kept in a MDLL of messages for this @a vl.
-   */
-  struct PendingMessage *next_vl;
-
-  /**
-   * Kept in a MDLL of messages for this @a vl.
-   */
-  struct PendingMessage *prev_vl;
-
-  /**
-   * Kept in a MDLL of messages from this @a client (if @e pmt is #PMT_CORE)
-   */
-  struct PendingMessage *next_client;
-
-  /**
-   * Kept in a MDLL of messages from this @a client  (if @e pmt is #PMT_CORE)
-   */
-  struct PendingMessage *prev_client;
-
-  /**
-   * Kept in a MDLL of messages from this @a cpm (if @e pmt is
-   * #PMT_FRAGMENT_BOx)
-   */
-  struct PendingMessage *next_frag;
-
-  /**
-   * Kept in a MDLL of messages from this @a cpm  (if @e pmt is
-   * #PMT_FRAGMENT_BOX)
-   */
-  struct PendingMessage *prev_frag;
-
-  /**
-   * Head of DLL of PAs for this pending message.
-   */
-  struct PendingAcknowledgement *pa_head;
-
-  /**
-   * Tail of DLL of PAs for this pending message.
-   */
-  struct PendingAcknowledgement *pa_tail;
-
-  /**
-   * This message, reliability *or* DV-boxed. Only possibly available
-   * if @e pmt is #PMT_CORE.
-   */
-  struct PendingMessage *bpm;
-
-  /**
-   * Target of the request (always the ultimate destination!).
-   */
-  struct VirtualLink *vl;
-
-  /**
-   * Set to non-NULL value if this message is currently being given to a
-   * communicator and we are awaiting that communicator's acknowledgement.
-   * Note that we must not retransmit a pending message while we're still
-   * in the process of giving it to a communicator. If a pending message
-   * is free'd while this entry is non-NULL, the @e qe reference to us
-   * should simply be set to NULL.
-   */
-  struct QueueEntry *qe;
-
-  /**
-   * Client that issued the transmission request, if @e pmt is #PMT_CORE.
-   */
-  struct TransportClient *client;
-
-  /**
-   * Head of a MDLL of fragments created for this core message.
-   */
-  struct PendingMessage *head_frag;
-
-  /**
-   * Tail of a MDLL of fragments created for this core message.
-   */
-  struct PendingMessage *tail_frag;
-
-  /**
-   * Our parent in the fragmentation tree.
-   */
-  struct PendingMessage *frag_parent;
-
-  /**
-   * At what time should we give up on the transmission (and no longer retry)?
-   */
-  struct GNUNET_TIME_Absolute timeout;
-
-  /**
-   * What is the earliest time for us to retry transmission of this message?
-   */
-  struct GNUNET_TIME_Absolute next_attempt;
-
-  /**
-   * UUID to use for this message (used for reassembly of fragments, only
-   * initialized if @e msg_uuid_set is #GNUNET_YES).
-   */
-  struct MessageUUIDP msg_uuid;
-
-  /**
-   * UUID we use to identify this message in our logs.
-   * Generated by incrementing the "logging_uuid_gen".
-   */
-  unsigned long long logging_uuid;
-
-  /**
-   * Type of the pending message.
-   */
-  enum PendingMessageType pmt;
-
-  /**
-   * Preferences for this message.
-   * TODO: actually use this!
-   */
-  enum GNUNET_MQ_PriorityPreferences prefs;
-
-  /**
-   * If pmt is of type PMT_DV_BOX we store the used path here.
-   */
-  struct DistanceVectorHop *used_dvh;
-
-  /**
-   * Size of the original message.
-   */
-  uint16_t bytes_msg;
-
-  /**
-   * Offset at which we should generate the next fragment.
-   */
-  uint16_t frag_off;
-
-  /**
-   * #GNUNET_YES once @e msg_uuid was initialized
-   */
-  int16_t msg_uuid_set;
-
-  /* Followed by @e bytes_msg to transmit */
-};
-
-
-/**
- * Acknowledgement payload.
- */
-struct TransportCummulativeAckPayload
-{
-  /**
-   * When did we receive the message we are ACKing?  Used to calculate
-   * the delay we introduced by cummulating ACKs.
-   */
-  struct GNUNET_TIME_Absolute receive_time;
-
-  /**
-   * UUID of a message being acknowledged.
-   */
-  struct AcknowledgementUUIDP ack_uuid;
-};
-
-
-/**
- * Data structure in which we track acknowledgements still to
- * be sent to the
- */
-struct AcknowledgementCummulator
-{
-  /**
-   * Target peer for which we are accumulating ACKs here.
-   */
-  struct GNUNET_PeerIdentity target;
-
-  /**
-   * ACK data being accumulated.  Only @e num_acks slots are valid.
-   */
-  struct TransportCummulativeAckPayload ack_uuids[MAX_CUMMULATIVE_ACKS];
-
-  /**
-   * Task scheduled either to transmit the cumulative ACK message,
-   * or to clean up this data structure after extended periods of
-   * inactivity (if @e num_acks is zero).
-   */
-  struct GNUNET_SCHEDULER_Task *task;
-
-  /**
-   * When is @e task run (only used if @e num_acks is non-zero)?
-   */
-  struct GNUNET_TIME_Absolute min_transmission_time;
-
-  /**
-   * Counter to produce the `ack_counter` in the `struct
-   * TransportReliabilityAckMessage`.  Allows the receiver to detect
-   * lost ACK messages.  Incremented by @e num_acks upon transmission.
-   */
-  uint32_t ack_counter;
-
-  /**
-   * Number of entries used in @e ack_uuids.  Reset to 0 upon transmission.
-   */
-  unsigned int num_acks;
-};
-
-
-/**
- * One of the addresses of this peer.
- */
-struct AddressListEntry
-{
-  /**
-   * Kept in a DLL.
-   */
-  struct AddressListEntry *next;
-
-  /**
-   * Kept in a DLL.
-   */
-  struct AddressListEntry *prev;
-
-  /**
-   * Which communicator provides this address?
-   */
-  struct TransportClient *tc;
-
-  /**
-   * The actual address.
-   */
-  const char *address;
-
-  /**
-   * Current context for storing this address in the peerstore.
-   */
-  struct GNUNET_PEERSTORE_StoreContext *sc;
-
-  /**
-   * Task to periodically do @e st operation.
-   */
-  struct GNUNET_SCHEDULER_Task *st;
-
-  /**
-   * What is a typical lifetime the communicator expects this
-   * address to have? (Always from now.)
-   */
-  struct GNUNET_TIME_Relative expiration;
-
-  /**
-   * Address identifier used by the communicator.
-   */
-  uint32_t aid;
-
-  /**
-   * Network type offered by this address.
-   */
-  enum GNUNET_NetworkType nt;
-};
-
-
-/**
- * Client connected to the transport service.
- */
-struct TransportClient
-{
-  /**
-   * Kept in a DLL.
-   */
-  struct TransportClient *next;
-
-  /**
-   * Kept in a DLL.
-   */
-  struct TransportClient *prev;
-
-  /**
-   * Handle to the client.
-   */
-  struct GNUNET_SERVICE_Client *client;
-
-  /**
-   * Message queue to the client.
-   */
-  struct GNUNET_MQ_Handle *mq;
-
-  /**
-   * What type of client is this?
-   */
-  enum ClientType type;
-
-  union
-  {
-    /**
-     * Information for @e type #CT_CORE.
-     */
-    struct
-    {
-      /**
-       * Head of list of messages pending for this client, sorted by
-       * transmission time ("next_attempt" + possibly internal prioritization).
-       */
-      struct PendingMessage *pending_msg_head;
-
-      /**
-       * Tail of list of messages pending for this client.
-       */
-      struct PendingMessage *pending_msg_tail;
-    } core;
-
-    /**
-     * Information for @e type #CT_MONITOR.
-     */
-    struct
-    {
-      /**
-       * Peer identity to monitor the addresses of.
-       * Zero to monitor all neighbours.  Valid if
-       * @e type is #CT_MONITOR.
-       */
-      struct GNUNET_PeerIdentity peer;
-
-      /**
-       * Is this a one-shot monitor?
-       */
-      int one_shot;
-    } monitor;
-
-
-    /**
-     * Information for @e type #CT_COMMUNICATOR.
-     */
-    struct
-    {
-      /**
-       * If @e type is #CT_COMMUNICATOR, this communicator
-       * supports communicating using these addresses.
-       */
-      char *address_prefix;
-
-      /**
-       * Head of DLL of queues offered by this communicator.
-       */
-      struct Queue *queue_head;
-
-      /**
-       * Tail of DLL of queues offered by this communicator.
-       */
-      struct Queue *queue_tail;
-
-      /**
-       * Head of list of the addresses of this peer offered by this
-       * communicator.
-       */
-      struct AddressListEntry *addr_head;
-
-      /**
-       * Tail of list of the addresses of this peer offered by this
-       * communicator.
-       */
-      struct AddressListEntry *addr_tail;
-
-      /**
-       * Number of queue entries in all queues to this communicator. Used
-       * throttle sending to a communicator if we see that the communicator
-       * is globally unable to keep up.
-       */
-      unsigned int total_queue_length;
-
-      /**
-       * Characteristics of this communicator.
-       */
-      enum GNUNET_TRANSPORT_CommunicatorCharacteristics cc;
-    } communicator;
-
-    /**
-     * Information for @e type #CT_APPLICATION
-     */
-    struct
-    {
-      /**
-       * Map of requests for peers the given client application would like to
-       * see connections for.  Maps from PIDs to `struct PeerRequest`.
-       */
-      struct GNUNET_CONTAINER_MultiPeerMap *requests;
-    } application;
-  } details;
-};
-
-
-/**
- * State we keep for validation activities.  Each of these
- * is both in the #validation_heap and the #validation_map.
- */
-struct ValidationState
-{
-  /**
-   * For which peer is @a address to be validated (or possibly valid)?
-   * Serves as key in the #validation_map.
-   */
-  struct GNUNET_PeerIdentity pid;
-
-  /**
-   * How long did the peer claim this @e address to be valid? Capped at
-   * minimum of #MAX_ADDRESS_VALID_UNTIL relative to the time where we last
-   * were told about the address and the value claimed by the other peer at
-   * that time.  May be updated similarly when validation succeeds.
-   */
-  struct GNUNET_TIME_Absolute valid_until;
-
-  /**
-   * How long do *we* consider this @e address to be valid?
-   * In the past or zero if we have not yet validated it.
-   */
-  struct GNUNET_TIME_Absolute validated_until;
-
-  /**
-   * When did we FIRST use the current @e challenge in a message?
-   * Used to sanity-check @code{origin_time} in the response when
-   * calculating the RTT. If the @code{origin_time} is not in
-   * the expected range, the response is discarded as malicious.
-   */
-  struct GNUNET_TIME_Absolute first_challenge_use;
-
-  /**
-   * When did we LAST use the current @e challenge in a message?
-   * Used to sanity-check @code{origin_time} in the response when
-   * calculating the RTT.  If the @code{origin_time} is not in
-   * the expected range, the response is discarded as malicious.
-   */
-  struct GNUNET_TIME_Absolute last_challenge_use;
-
-  /**
-   * Next time we will send the @e challenge to the peer, if this time is past
-   * @e valid_until, this validation state is released at this time.  If the
-   * address is valid, @e next_challenge is set to @e validated_until MINUS @e
-   * validation_delay * #VALIDATION_RTT_BUFFER_FACTOR, such that we will try
-   * to re-validate before the validity actually expires.
-   */
-  struct GNUNET_TIME_Absolute next_challenge;
-
-  /**
-   * Current backoff factor we're applying for sending the @a challenge.
-   * Reset to 0 if the @a challenge is confirmed upon validation.
-   * Reduced to minimum of #FAST_VALIDATION_CHALLENGE_FREQ and half of the
-   * existing value if we receive an unvalidated address again over
-   * another channel (and thus should consider the information "fresh").
-   * Maximum is #MAX_VALIDATION_CHALLENGE_FREQ.
-   */
-  struct GNUNET_TIME_Relative challenge_backoff;
-
-  /**
-   * Initially set to "forever". Once @e validated_until is set, this value is
-   * set to the RTT that tells us how long it took to receive the validation.
-   */
-  struct GNUNET_TIME_Relative validation_rtt;
-
-  /**
-   * The challenge we sent to the peer to get it to validate the address. Note
-   * that we rotate the challenge whenever we update @e validated_until to
-   * avoid attacks where a peer simply replays an old challenge in the future.
-   * (We must not rotate more often as otherwise we may discard valid answers
-   * due to packet losses, latency and reorderings on the network).
-   */
-  struct GNUNET_CRYPTO_ChallengeNonceP challenge;
-
-  /**
-   * Claimed address of the peer.
-   */
-  char *address;
-
-  /**
-   * Entry in the #validation_heap, which is sorted by @e next_challenge. The
-   * heap is used to figure out when the next validation activity should be
-   * run.
-   */
-  struct GNUNET_CONTAINER_HeapNode *hn;
-
-  /**
-   * Handle to a PEERSTORE store operation for this @e address.  NULL if
-   * no PEERSTORE operation is pending.
-   */
-  struct GNUNET_PEERSTORE_StoreContext *sc;
-
-  /**
-   * Self-imposed limit on the previous flow control window. (May be zero,
-   * if we never used data from the previous window or are establishing the
-   * connection for the first time).
-   */
-  uint32_t last_window_consum_limit;
-
-  /**
-   * We are technically ready to send the challenge, but we are waiting for
-   * the respective queue to become available for transmission.
-   */
-  int awaiting_queue;
-};
-
-
-/**
- * A Backtalker is a peer sending us backchannel messages. We use this
- * struct to detect monotonic time violations, cache ephemeral key
- * material (to avoid repeatedly checking signatures), and to synchronize
- * monotonic time with the PEERSTORE.
- */
-struct Backtalker
-{
-  /**
-   * Peer this is about.
-   */
-  struct GNUNET_PeerIdentity pid;
-
-  /**
-   * Last (valid) monotonic time received from this sender.
-   */
-  struct GNUNET_TIME_Absolute monotonic_time;
-
-  /**
-   * When will this entry time out?
-   */
-  struct GNUNET_TIME_Absolute timeout;
-
-  /**
-   * Last (valid) ephemeral key received from this sender.
-   */
-  struct GNUNET_CRYPTO_EcdhePublicKey last_ephemeral;
-
-  /**
-   * Task associated with this backtalker. Can be for timeout,
-   * or other asynchronous operations.
-   */
-  struct GNUNET_SCHEDULER_Task *task;
-
-  /**
-   * Communicator context waiting on this backchannel's @e get, or NULL.
-   */
-  struct CommunicatorMessageContext *cmc;
-
-  /**
-   * Handle for an operation to fetch @e monotonic_time information from the
-   * PEERSTORE, or NULL.
-   */
-  struct GNUNET_PEERSTORE_IterateContext *get;
-
-  /**
-   * Handle to a PEERSTORE store operation for this @e pid's @e
-   * monotonic_time.  NULL if no PEERSTORE operation is pending.
-   */
-  struct GNUNET_PEERSTORE_StoreContext *sc;
-
-  /**
-   * Number of bytes of the original message body that follows after this
-   * struct.
-   */
-  size_t body_size;
-};
-
-
-/**
- * Head of linked list of all clients to this service.
- */
-static struct TransportClient *clients_head;
-
-/**
- * Tail of linked list of all clients to this service.
- */
-static struct TransportClient *clients_tail;
-
-/**
- * Statistics handle.
- */
-static struct GNUNET_STATISTICS_Handle *GST_stats;
-
-/**
- * Configuration handle.
- */
-static const struct GNUNET_CONFIGURATION_Handle *GST_cfg;
-
-/**
- * Our public key.
- */
-static struct GNUNET_PeerIdentity GST_my_identity;
-
-/**
- * Our private key.
- */
-static struct GNUNET_CRYPTO_EddsaPrivateKey *GST_my_private_key;
-
-/**
- * Map from PIDs to `struct Neighbour` entries.  A peer is
- * a neighbour if we have an MQ to it from some communicator.
- */
-static struct GNUNET_CONTAINER_MultiPeerMap *neighbours;
-
-/**
- * Map from PIDs to `struct Backtalker` entries.  A peer is
- * a backtalker if it recently send us backchannel messages.
- */
-static struct GNUNET_CONTAINER_MultiPeerMap *backtalkers;
-
-/**
- * Map from PIDs to `struct AcknowledgementCummulator`s.
- * Here we track the cumulative ACKs for transmission.
- */
-static struct GNUNET_CONTAINER_MultiPeerMap *ack_cummulators;
-
-/**
- * Map of pending acknowledgements, mapping `struct AcknowledgementUUID` to
- * a `struct PendingAcknowledgement`.
- */
-static struct GNUNET_CONTAINER_MultiUuidmap *pending_acks;
-
-/**
- * Map from PIDs to `struct DistanceVector` entries describing
- * known paths to the peer.
- */
-static struct GNUNET_CONTAINER_MultiPeerMap *dv_routes;
-
-/**
- * Map from PIDs to `struct ValidationState` entries describing
- * addresses we are aware of and their validity state.
- */
-static struct GNUNET_CONTAINER_MultiPeerMap *validation_map;
-
-/**
- * Map from PIDs to `struct VirtualLink` entries describing
- * links CORE knows to exist.
- */
-static struct GNUNET_CONTAINER_MultiPeerMap *links;
-
-/**
- * Map from challenges to `struct LearnLaunchEntry` values.
- */
-static struct GNUNET_CONTAINER_MultiShortmap *dvlearn_map;
-
-/**
- * Head of a DLL sorted by launch time.
- */
-static struct LearnLaunchEntry *lle_head = NULL;
-
-/**
- * Tail of a DLL sorted by launch time.
- */
-static struct LearnLaunchEntry *lle_tail = NULL;
-
-/**
- * MIN Heap sorted by "next_challenge" to `struct ValidationState` entries
- * sorting addresses we are aware of by when we should next try to (re)validate
- * (or expire) them.
- */
-static struct GNUNET_CONTAINER_Heap *validation_heap;
-
-/**
- * Database for peer's HELLOs.
- */
-static struct GNUNET_PEERSTORE_Handle *peerstore;
-
-/**
- * Task run to initiate DV learning.
- */
-static struct GNUNET_SCHEDULER_Task *dvlearn_task;
-
-/**
- * Task to run address validation.
- */
-static struct GNUNET_SCHEDULER_Task *validation_task;
-
-/**
- * The most recent PA we have created, head of DLL.
- * The length of the DLL is kept in #pa_count.
- */
-static struct PendingAcknowledgement *pa_head;
-
-/**
- * The oldest PA we have created, tail of DLL.
- * The length of the DLL is kept in #pa_count.
- */
-static struct PendingAcknowledgement *pa_tail;
-
-/**
- * List of incoming connections where we are trying
- * to get a connection back established. Length
- * kept in #ir_total.
- */
-static struct IncomingRequest *ir_head;
-
-/**
- * Tail of DLL starting at #ir_head.
- */
-static struct IncomingRequest *ir_tail;
-
-/**
- * Length of the DLL starting at #ir_head.
- */
-static unsigned int ir_total;
-
-/**
- * Generator of `logging_uuid` in `struct PendingMessage`.
- */
-static unsigned long long logging_uuid_gen;
-
-/**
- * Number of entries in the #pa_head/#pa_tail DLL.  Used to
- * limit the size of the data structure.
- */
-static unsigned int pa_count;
-
-/**
- * Monotonic time we use for HELLOs generated at this time.  TODO: we
- * should increase this value from time to time (i.e. whenever a
- * `struct AddressListEntry` actually expires), but IF we do this, we
- * must also update *all* (remaining) addresses in the PEERSTORE at
- * that time! (So for now only increased when the peer is restarted,
- * which hopefully roughly matches whenever our addresses change.)
- */
-static struct GNUNET_TIME_Absolute hello_mono_time;
-
-/**
- * Indication if we have received a shutdown signal
- * and are in the process of cleaning up.
- */
-static int in_shutdown;
-
-/**
- * Get an offset into the transmission history buffer for `struct
- * PerformanceData`.  Note that the caller must perform the required
- * modulo #GOODPUT_AGING_SLOTS operation before indexing into the
- * array!
- *
- * An 'age' lasts 15 minute slots.
- *
- * @return current age of the world
- */
-static unsigned int
-get_age ()
-{
-  struct GNUNET_TIME_Absolute now;
-
-  now = GNUNET_TIME_absolute_get ();
-  return now.abs_value_us / GNUNET_TIME_UNIT_MINUTES.rel_value_us / 15;
-}
-
-
-/**
- * Release @a ir data structure.
- *
- * @param ir data structure to release
- */
-static void
-free_incoming_request (struct IncomingRequest *ir)
-{
-  GNUNET_CONTAINER_DLL_remove (ir_head, ir_tail, ir);
-  GNUNET_assert (ir_total > 0);
-  ir_total--;
-  GNUNET_PEERSTORE_watch_cancel (ir->wc);
-  ir->wc = NULL;
-  GNUNET_free (ir);
-}
-
-
-/**
- * Release @a pa data structure.
- *
- * @param pa data structure to release
- */
-static void
-free_pending_acknowledgement (struct PendingAcknowledgement *pa)
-{
-  struct Queue *q = pa->queue;
-  struct PendingMessage *pm = pa->pm;
-  struct DistanceVectorHop *dvh = pa->dvh;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "free_pending_acknowledgement\n");
-  if (NULL != q)
-  {
-    GNUNET_CONTAINER_MDLL_remove (queue, q->pa_head, q->pa_tail, pa);
-    pa->queue = NULL;
-  }
-  if (NULL != pm)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "remove pa from message\n");
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "remove pa from message %llu\n",
-                pm->logging_uuid);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "remove pa from message %u\n",
-                pm->pmt);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "remove pa from message %s\n",
-                GNUNET_uuid2s (&pa->ack_uuid.value));
-    GNUNET_CONTAINER_MDLL_remove (pm, pm->pa_head, pm->pa_tail, pa);
-    pa->pm = NULL;
-  }
-  if (NULL != dvh)
-  {
-    GNUNET_CONTAINER_MDLL_remove (dvh, dvh->pa_head, dvh->pa_tail, pa);
-    pa->queue = NULL;
-  }
-  GNUNET_assert (GNUNET_YES ==
-                 GNUNET_CONTAINER_multiuuidmap_remove (pending_acks,
-                                                       &pa->ack_uuid.value,
-                                                       pa));
-  GNUNET_free (pa);
-}
-
-
-/**
- * Free fragment tree below @e root, excluding @e root itself.
- * FIXME: this does NOT seem to have the intended semantics
- * based on how this is called. Seems we generally DO expect
- * @a root to be free'ed itself as well!
- *
- * @param root root of the tree to free
- */
-static void
-free_fragment_tree (struct PendingMessage *root)
-{
-  struct PendingMessage *frag;
-
-  while (NULL != (frag = root->head_frag))
-  {
-    struct PendingAcknowledgement *pa;
-
-    free_fragment_tree (frag);
-    while (NULL != (pa = frag->pa_head))
-    {
-      GNUNET_CONTAINER_MDLL_remove (pm, frag->pa_head, frag->pa_tail, pa);
-      pa->pm = NULL;
-    }
-    GNUNET_CONTAINER_MDLL_remove (frag, root->head_frag, root->tail_frag, frag);
-    if (NULL != frag->qe)
-    {
-      GNUNET_assert (frag == frag->qe->pm);
-      frag->qe->pm = NULL;
-      GNUNET_CONTAINER_DLL_remove (frag->qe->queue->queue_head,
-                                   frag->qe->queue->queue_tail,
-                                   frag->qe);
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Removing QueueEntry MID %llu from queue\n",
-                  frag->qe->mid);
-      GNUNET_free (frag->qe);
-    }
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Free frag %p\n",
-                frag);
-    GNUNET_free (frag);
-  }
-}
-
-
-/**
- * Release memory associated with @a pm and remove @a pm from associated
- * data structures.  @a pm must be a top-level pending message and not
- * a fragment in the tree.  The entire tree is freed (if applicable).
- *
- * @param pm the pending message to free
- */
-static void
-free_pending_message (struct PendingMessage *pm)
-{
-  struct TransportClient *tc = pm->client;
-  struct VirtualLink *vl = pm->vl;
-  struct PendingAcknowledgement *pa;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Freeing pm %p\n",
-              pm);
-  if (NULL != tc)
-  {
-    GNUNET_CONTAINER_MDLL_remove (client,
-                                  tc->details.core.pending_msg_head,
-                                  tc->details.core.pending_msg_tail,
-                                  pm);
-  }
-  if ((NULL != vl) && (NULL == pm->frag_parent))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Removing pm %lu\n",
-                pm->logging_uuid);
-    GNUNET_CONTAINER_MDLL_remove (vl,
-                                  vl->pending_msg_head,
-                                  vl->pending_msg_tail,
-                                  pm);
-  }
-  while (NULL != (pa = pm->pa_head))
-  {
-    if (NULL == pa)
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "free pending pa  null\n");
-    if (NULL == pm->pa_tail)
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "free pending pa_tail null\n");
-    if (NULL == pa->prev_pa)
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "free pending pa prev null\n");
-    if (NULL == pa->next_pa)
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "free pending pa next null\n");
-    GNUNET_CONTAINER_MDLL_remove (pm, pm->pa_head, pm->pa_tail, pa);
-    pa->pm = NULL;
-  }
-
-  free_fragment_tree (pm);
-  if (NULL != pm->qe)
-  {
-    GNUNET_assert (pm == pm->qe->pm);
-    pm->qe->pm = NULL;
-    GNUNET_CONTAINER_DLL_remove (pm->qe->queue->queue_head,
-                                 pm->qe->queue->queue_tail,
-                                 pm->qe);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Removing QueueEntry MID %llu from queue\n",
-                pm->qe->mid);
-    GNUNET_free (pm->qe);
-  }
-  if (NULL != pm->bpm)
-  {
-    free_fragment_tree (pm->bpm);
-    GNUNET_free (pm->bpm);
-  }
-  if (NULL == pm)
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "free pending pm  null\n");
-  GNUNET_free (pm);
-}
-
-
-/**
- * Free @a rc
- *
- * @param rc data structure to free
- */
-static void
-free_reassembly_context (struct ReassemblyContext *rc)
-{
-  struct VirtualLink *vl = rc->virtual_link;
-
-  GNUNET_assert (rc == GNUNET_CONTAINER_heap_remove_node (rc->hn));
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONTAINER_multihashmap32_remove (vl->reassembly_map,
-                                                         rc->msg_uuid.uuid,
-                                                         rc));
-  GNUNET_free (rc);
-}
-
-
-/**
- * Task run to clean up reassembly context of a neighbour that have expired.
- *
- * @param cls a `struct Neighbour`
- */
-static void
-reassembly_cleanup_task (void *cls)
-{
-  struct VirtualLink *vl = cls;
-  struct ReassemblyContext *rc;
-
-  vl->reassembly_timeout_task = NULL;
-  while (NULL != (rc = GNUNET_CONTAINER_heap_peek (vl->reassembly_heap)))
-  {
-    if (0 == GNUNET_TIME_absolute_get_remaining (rc->reassembly_timeout)
-        .rel_value_us)
-    {
-      free_reassembly_context (rc);
-      continue;
-    }
-    GNUNET_assert (NULL == vl->reassembly_timeout_task);
-    vl->reassembly_timeout_task =
-      GNUNET_SCHEDULER_add_at (rc->reassembly_timeout,
-                               &reassembly_cleanup_task,
-                               vl);
-    return;
-  }
-}
-
-
-/**
- * function called to #free_reassembly_context().
- *
- * @param cls NULL
- * @param key unused
- * @param value a `struct ReassemblyContext` to free
- * @return #GNUNET_OK (continue iteration)
- */
-static int
-free_reassembly_cb (void *cls, uint32_t key, void *value)
-{
-  struct ReassemblyContext *rc = value;
-
-  (void) cls;
-  (void) key;
-  free_reassembly_context (rc);
-  return GNUNET_OK;
-}
-
-
-/**
- * Free virtual link.
- *
- * @param vl link data to free
- */
-static void
-free_virtual_link (struct VirtualLink *vl)
-{
-  struct PendingMessage *pm;
-  struct CoreSentContext *csc;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "free virtual link %p\n",
-              vl);
-
-  if (NULL != vl->reassembly_map)
-  {
-    GNUNET_CONTAINER_multihashmap32_iterate (vl->reassembly_map,
-                                             &free_reassembly_cb,
-                                             NULL);
-    GNUNET_CONTAINER_multihashmap32_destroy (vl->reassembly_map);
-    vl->reassembly_map = NULL;
-    GNUNET_CONTAINER_heap_destroy (vl->reassembly_heap);
-    vl->reassembly_heap = NULL;
-  }
-  if (NULL != vl->reassembly_timeout_task)
-  {
-    GNUNET_SCHEDULER_cancel (vl->reassembly_timeout_task);
-    vl->reassembly_timeout_task = NULL;
-  }
-  while (NULL != (pm = vl->pending_msg_head))
-    free_pending_message (pm);
-  GNUNET_assert (GNUNET_YES ==
-                 GNUNET_CONTAINER_multipeermap_remove (links, &vl->target, vl));
-  if (NULL != vl->visibility_task)
-  {
-    GNUNET_SCHEDULER_cancel (vl->visibility_task);
-    vl->visibility_task = NULL;
-  }
-  if (NULL != vl->fc_retransmit_task)
-  {
-    GNUNET_SCHEDULER_cancel (vl->fc_retransmit_task);
-    vl->fc_retransmit_task = NULL;
-  }
-  while (NULL != (csc = vl->csc_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (vl->csc_head, vl->csc_tail, csc);
-    GNUNET_assert (vl == csc->vl);
-    csc->vl = NULL;
-  }
-  GNUNET_break (NULL == vl->n);
-  GNUNET_break (NULL == vl->dv);
-  GNUNET_free (vl);
-}
-
-
-/**
- * Free validation state.
- *
- * @param vs validation state to free
- */
-static void
-free_validation_state (struct ValidationState *vs)
-{
-  GNUNET_assert (
-    GNUNET_YES ==
-    GNUNET_CONTAINER_multipeermap_remove (validation_map, &vs->pid, vs));
-  GNUNET_CONTAINER_heap_remove_node (vs->hn);
-  vs->hn = NULL;
-  if (NULL != vs->sc)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "store cancel\n");
-    GNUNET_PEERSTORE_store_cancel (vs->sc);
-    vs->sc = NULL;
-  }
-  GNUNET_free (vs->address);
-  GNUNET_free (vs);
-}
-
-
-/**
- * Lookup neighbour for peer @a pid.
- *
- * @param pid neighbour to look for
- * @return NULL if we do not have this peer as a neighbour
- */
-static struct Neighbour *
-lookup_neighbour (const struct GNUNET_PeerIdentity *pid)
-{
-  return GNUNET_CONTAINER_multipeermap_get (neighbours, pid);
-}
-
-
-/**
- * Lookup virtual link for peer @a pid.
- *
- * @param pid virtual link to look for
- * @return NULL if we do not have this peer as a virtual link
- */
-static struct VirtualLink *
-lookup_virtual_link (const struct GNUNET_PeerIdentity *pid)
-{
-  return GNUNET_CONTAINER_multipeermap_get (links, pid);
-}
-
-
-/**
- * Details about what to notify monitors about.
- */
-struct MonitorEvent
-{
-  /**
-   * @deprecated To be discussed if we keep these...
-   */
-  struct GNUNET_TIME_Absolute last_validation;
-  struct GNUNET_TIME_Absolute valid_until;
-  struct GNUNET_TIME_Absolute next_validation;
-
-  /**
-   * Current round-trip time estimate.
-   */
-  struct GNUNET_TIME_Relative rtt;
-
-  /**
-   * Connection status.
-   */
-  enum GNUNET_TRANSPORT_ConnectionStatus cs;
-
-  /**
-   * Messages pending.
-   */
-  uint32_t num_msg_pending;
-
-  /**
-   * Bytes pending.
-   */
-  uint32_t num_bytes_pending;
-};
-
-
-/**
- * Free a @dvh. Callers MAY want to check if this was the last path to the
- * `target`, and if so call #free_dv_route to also free the associated DV
- * entry in #dv_routes (if not, the associated scheduler job should eventually
- * take care of it).
- *
- * @param dvh hop to free
- */
-static void
-free_distance_vector_hop (struct DistanceVectorHop *dvh)
-{
-  struct Neighbour *n = dvh->next_hop;
-  struct DistanceVector *dv = dvh->dv;
-  struct PendingAcknowledgement *pa;
-
-  while (NULL != (pa = dvh->pa_head))
-  {
-    GNUNET_CONTAINER_MDLL_remove (dvh, dvh->pa_head, dvh->pa_tail, pa);
-    pa->dvh = NULL;
-  }
-  GNUNET_CONTAINER_MDLL_remove (neighbour, n->dv_head, n->dv_tail, dvh);
-  GNUNET_CONTAINER_MDLL_remove (dv, dv->dv_head, dv->dv_tail, dvh);
-  GNUNET_free (dvh);
-}
-
-
-/**
- * Task run to check whether the hops of the @a cls still
- * are validated, or if we need to core about disconnection.
- *
- * @param cls a `struct VirtualLink`
- */
-static void
-check_link_down (void *cls);
-
-
-/**
- * Send message to CORE clients that we lost a connection.
- *
- * @param pid peer the connection was for
- */
-static void
-cores_send_disconnect_info (const struct GNUNET_PeerIdentity *pid)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Informing CORE clients about disconnect from %s\n",
-              GNUNET_i2s (pid));
-  for (struct TransportClient *tc = clients_head; NULL != tc; tc = tc->next)
-  {
-    struct GNUNET_MQ_Envelope *env;
-    struct DisconnectInfoMessage *dim;
-
-    if (CT_CORE != tc->type)
-      continue;
-    env = GNUNET_MQ_msg (dim, GNUNET_MESSAGE_TYPE_TRANSPORT_DISCONNECT);
-    dim->peer = *pid;
-    GNUNET_MQ_send (tc->mq, env);
-  }
-}
-
-
-/**
- * Free entry in #dv_routes.  First frees all hops to the target, and
- * if there are no entries left, frees @a dv as well.
- *
- * @param dv route to free
- */
-static void
-free_dv_route (struct DistanceVector *dv)
-{
-  struct DistanceVectorHop *dvh;
-
-  while (NULL != (dvh = dv->dv_head))
-    free_distance_vector_hop (dvh);
-  if (NULL == dv->dv_head)
-  {
-    struct VirtualLink *vl;
-
-    GNUNET_assert (
-      GNUNET_YES ==
-      GNUNET_CONTAINER_multipeermap_remove (dv_routes, &dv->target, dv));
-    if (NULL != (vl = dv->vl))
-    {
-      GNUNET_assert (dv == vl->dv);
-      vl->dv = NULL;
-      if (NULL == vl->n)
-      {
-        cores_send_disconnect_info (&dv->target);
-        free_virtual_link (vl);
-      }
-      else
-      {
-        GNUNET_SCHEDULER_cancel (vl->visibility_task);
-        vl->visibility_task = GNUNET_SCHEDULER_add_now (&check_link_down, vl);
-      }
-      dv->vl = NULL;
-    }
-
-    if (NULL != dv->timeout_task)
-    {
-      GNUNET_SCHEDULER_cancel (dv->timeout_task);
-      dv->timeout_task = NULL;
-    }
-    GNUNET_free (dv);
-  }
-}
-
-
-/**
- * Notify monitor @a tc about an event.  That @a tc
- * cares about the event has already been checked.
- *
- * Send @a tc information in @a me about a @a peer's status with
- * respect to some @a address to all monitors that care.
- *
- * @param tc monitor to inform
- * @param peer peer the information is about
- * @param address address the information is about
- * @param nt network type associated with @a address
- * @param me detailed information to transmit
- */
-static void
-notify_monitor (struct TransportClient *tc,
-                const struct GNUNET_PeerIdentity *peer,
-                const char *address,
-                enum GNUNET_NetworkType nt,
-                const struct MonitorEvent *me)
-{
-  struct GNUNET_MQ_Envelope *env;
-  struct GNUNET_TRANSPORT_MonitorData *md;
-  size_t addr_len = strlen (address) + 1;
-
-  env = GNUNET_MQ_msg_extra (md,
-                             addr_len,
-                             GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_DATA);
-  md->nt = htonl ((uint32_t) nt);
-  md->peer = *peer;
-  md->last_validation = GNUNET_TIME_absolute_hton (me->last_validation);
-  md->valid_until = GNUNET_TIME_absolute_hton (me->valid_until);
-  md->next_validation = GNUNET_TIME_absolute_hton (me->next_validation);
-  md->rtt = GNUNET_TIME_relative_hton (me->rtt);
-  md->cs = htonl ((uint32_t) me->cs);
-  md->num_msg_pending = htonl (me->num_msg_pending);
-  md->num_bytes_pending = htonl (me->num_bytes_pending);
-  memcpy (&md[1], address, addr_len);
-  GNUNET_MQ_send (tc->mq, env);
-}
-
-
-/**
- * Send information in @a me about a @a peer's status with respect
- * to some @a address to all monitors that care.
- *
- * @param peer peer the information is about
- * @param address address the information is about
- * @param nt network type associated with @a address
- * @param me detailed information to transmit
- */
-static void
-notify_monitors (const struct GNUNET_PeerIdentity *peer,
-                 const char *address,
-                 enum GNUNET_NetworkType nt,
-                 const struct MonitorEvent *me)
-{
-  for (struct TransportClient *tc = clients_head; NULL != tc; tc = tc->next)
-  {
-    if (CT_MONITOR != tc->type)
-      continue;
-    if (tc->details.monitor.one_shot)
-      continue;
-    if ((GNUNET_NO == GNUNET_is_zero (&tc->details.monitor.peer)) &&
-        (0 != GNUNET_memcmp (&tc->details.monitor.peer, peer)))
-      continue;
-    notify_monitor (tc, peer, address, nt, me);
-  }
-}
-
-
-/**
- * Called whenever a client connects.  Allocates our
- * data structures associated with that client.
- *
- * @param cls closure, NULL
- * @param client identification of the client
- * @param mq message queue for the client
- * @return our `struct TransportClient`
- */
-static void *
-client_connect_cb (void *cls,
-                   struct GNUNET_SERVICE_Client *client,
-                   struct GNUNET_MQ_Handle *mq)
-{
-  struct TransportClient *tc;
-
-  (void) cls;
-  tc = GNUNET_new (struct TransportClient);
-  tc->client = client;
-  tc->mq = mq;
-  GNUNET_CONTAINER_DLL_insert (clients_head, clients_tail, tc);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Client %p of type %u connected\n",
-              tc,
-              tc->type);
-  return tc;
-}
-
-
-/**
- * Release memory used by @a neighbour.
- *
- * @param neighbour neighbour entry to free
- */
-static void
-free_neighbour (struct Neighbour *neighbour)
-{
-  struct DistanceVectorHop *dvh;
-  struct VirtualLink *vl;
-
-  GNUNET_assert (NULL == neighbour->queue_head);
-  GNUNET_assert (GNUNET_YES ==
-                 GNUNET_CONTAINER_multipeermap_remove (neighbours,
-                                                       &neighbour->pid,
-                                                       neighbour));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Freeing neighbour\n");
-  while (NULL != (dvh = neighbour->dv_head))
-  {
-    struct DistanceVector *dv = dvh->dv;
-
-    free_distance_vector_hop (dvh);
-    if (NULL == dv->dv_head)
-      free_dv_route (dv);
-  }
-  if (NULL != neighbour->get)
-  {
-    GNUNET_PEERSTORE_iterate_cancel (neighbour->get);
-    neighbour->get = NULL;
-  }
-  if (NULL != neighbour->sc)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "store cancel\n");
-    GNUNET_PEERSTORE_store_cancel (neighbour->sc);
-    neighbour->sc = NULL;
-  }
-  if (NULL != (vl = neighbour->vl))
-  {
-    GNUNET_assert (neighbour == vl->n);
-    vl->n = NULL;
-    if (NULL == vl->dv)
-    {
-      cores_send_disconnect_info (&vl->target);
-      free_virtual_link (vl);
-    }
-    else
-    {
-      GNUNET_SCHEDULER_cancel (vl->visibility_task);
-      vl->visibility_task = GNUNET_SCHEDULER_add_now (&check_link_down, vl);
-    }
-    neighbour->vl = NULL;
-  }
-  GNUNET_free (neighbour);
-}
-
-
-/**
- * Send message to CORE clients that we lost a connection.
- *
- * @param tc client to inform (must be CORE client)
- * @param pid peer the connection is for
- */
-static void
-core_send_connect_info (struct TransportClient *tc,
-                        const struct GNUNET_PeerIdentity *pid)
-{
-  struct GNUNET_MQ_Envelope *env;
-  struct ConnectInfoMessage *cim;
-
-  GNUNET_assert (CT_CORE == tc->type);
-  env = GNUNET_MQ_msg (cim, GNUNET_MESSAGE_TYPE_TRANSPORT_CONNECT);
-  cim->id = *pid;
-  GNUNET_MQ_send (tc->mq, env);
-}
-
-
-/**
- * Send message to CORE clients that we gained a connection
- *
- * @param pid peer the queue was for
- */
-static void
-cores_send_connect_info (const struct GNUNET_PeerIdentity *pid)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Informing CORE clients about connection to %s\n",
-              GNUNET_i2s (pid));
-  for (struct TransportClient *tc = clients_head; NULL != tc; tc = tc->next)
-  {
-    if (CT_CORE != tc->type)
-      continue;
-    core_send_connect_info (tc, pid);
-  }
-}
-
-
-/**
- * We believe we are ready to transmit a message on a queue. Gives the
- * message to the communicator for transmission (updating the tracker,
- * and re-scheduling itself if applicable).
- *
- * @param cls the `struct Queue` to process transmissions for
- */
-static void
-transmit_on_queue (void *cls);
-
-
-/**
- * Check if the communicator has another queue with higher prio ready for sending.
- */
-static unsigned int
-check_for_queue_with_higher_prio (struct Queue *queue, struct Queue *queue_head)
-{
-  for (struct Queue *s = queue_head; NULL != s;
-       s = s->next_client)
-  {
-    if (s->tc->details.communicator.address_prefix !=
-        queue->tc->details.communicator.address_prefix)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "queue address %s qid %u compare with queue: address %s qid %u\n",
-                  queue->address,
-                  queue->qid,
-                  s->address,
-                  s->qid);
-      if ((s->priority > queue->priority) && (0 < s->q_capacity) &&
-          (QUEUE_LENGTH_LIMIT > s->queue_length) )
-        return GNUNET_YES;
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Lower prio\n");
-    }
-  }
-  return GNUNET_NO;
-}
-
-
-/**
- * Called whenever something changed that might effect when we
- * try to do the next transmission on @a queue using #transmit_on_queue().
- *
- * @param queue the queue to do scheduling for
- * @param p task priority to use, if @a queue is scheduled
- */
-static void
-schedule_transmit_on_queue (struct GNUNET_TIME_Relative delay,
-                            struct Queue *queue,
-                            enum GNUNET_SCHEDULER_Priority p)
-{
-  if (check_for_queue_with_higher_prio (queue,
-                                        queue->tc->details.communicator.
-                                        queue_head))
-    return;
-
-  if (queue->tc->details.communicator.total_queue_length >=
-      COMMUNICATOR_TOTAL_QUEUE_LIMIT)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Transmission throttled due to communicator queue limit\n");
-    GNUNET_STATISTICS_update (
-      GST_stats,
-      "# Transmission throttled due to communicator queue limit",
-      1,
-      GNUNET_NO);
-    queue->idle = GNUNET_NO;
-    return;
-  }
-  if (queue->queue_length >= QUEUE_LENGTH_LIMIT)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Transmission throttled due to communicator queue length limit\n");
-    GNUNET_STATISTICS_update (GST_stats,
-                              "# Transmission throttled due to queue queue limit",
-                              1,
-                              GNUNET_NO);
-    queue->idle = GNUNET_NO;
-    return;
-  }
-  if (0 == queue->q_capacity)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Transmission throttled due to communicator message queue qid %u has capacity %lu.\n",
-                queue->qid,
-                queue->q_capacity);
-    GNUNET_STATISTICS_update (GST_stats,
-                              "# Transmission throttled due to message queue capacity",
-                              1,
-                              GNUNET_NO);
-    queue->idle = GNUNET_NO;
-    return;
-  }
-  /* queue might indeed be ready, schedule it */
-  if (NULL != queue->transmit_task)
-    GNUNET_SCHEDULER_cancel (queue->transmit_task);
-  queue->transmit_task =
-    GNUNET_SCHEDULER_add_delayed_with_priority (delay, p, &transmit_on_queue,
-                                                queue);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Considering transmission on queue `%s' QID %llu to %s\n",
-              queue->address,
-              (unsigned long long) queue->qid,
-              GNUNET_i2s (&queue->neighbour->pid));
-}
-
-
-/**
- * Task run to check whether the hops of the @a cls still
- * are validated, or if we need to core about disconnection.
- *
- * @param cls a `struct VirtualLink`
- */
-static void
-check_link_down (void *cls)
-{
-  struct VirtualLink *vl = cls;
-  struct DistanceVector *dv = vl->dv;
-  struct Neighbour *n = vl->n;
-  struct GNUNET_TIME_Absolute dvh_timeout;
-  struct GNUNET_TIME_Absolute q_timeout;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Checking if link is down\n");
-  vl->visibility_task = NULL;
-  dvh_timeout = GNUNET_TIME_UNIT_ZERO_ABS;
-  if (NULL != dv)
-  {
-    for (struct DistanceVectorHop *pos = dv->dv_head; NULL != pos;
-         pos = pos->next_dv)
-      dvh_timeout = GNUNET_TIME_absolute_max (dvh_timeout,
-                                              pos->path_valid_until);
-    if (0 == GNUNET_TIME_absolute_get_remaining (dvh_timeout).rel_value_us)
-    {
-      vl->dv->vl = NULL;
-      vl->dv = NULL;
-    }
-  }
-  q_timeout = GNUNET_TIME_UNIT_ZERO_ABS;
-  for (struct Queue *q = n->queue_head; NULL != q; q = q->next_neighbour)
-    q_timeout = GNUNET_TIME_absolute_max (q_timeout, q->validated_until);
-  if (0 == GNUNET_TIME_absolute_get_remaining (q_timeout).rel_value_us)
-  {
-    vl->n->vl = NULL;
-    vl->n = NULL;
-  }
-  if ((NULL == vl->n) && (NULL == vl->dv))
-  {
-    cores_send_disconnect_info (&vl->target);
-    free_virtual_link (vl);
-    return;
-  }
-  vl->visibility_task =
-    GNUNET_SCHEDULER_add_at (GNUNET_TIME_absolute_max (q_timeout, dvh_timeout),
-                             &check_link_down,
-                             vl);
-}
-
-
-/**
- * Free @a queue.
- *
- * @param queue the queue to free
- */
-static void
-free_queue (struct Queue *queue)
-{
-  struct Neighbour *neighbour = queue->neighbour;
-  struct TransportClient *tc = queue->tc;
-  struct MonitorEvent me = { .cs = GNUNET_TRANSPORT_CS_DOWN,
-                             .rtt = GNUNET_TIME_UNIT_FOREVER_REL };
-  struct QueueEntry *qe;
-  int maxxed;
-  struct PendingAcknowledgement *pa;
-  struct VirtualLink *vl;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Cleaning up queue %u\n", queue->qid);
-  if (NULL != queue->transmit_task)
-  {
-    GNUNET_SCHEDULER_cancel (queue->transmit_task);
-    queue->transmit_task = NULL;
-  }
-  while (NULL != (pa = queue->pa_head))
-  {
-    GNUNET_CONTAINER_MDLL_remove (queue, queue->pa_head, queue->pa_tail, pa);
-    pa->queue = NULL;
-  }
-
-  GNUNET_CONTAINER_MDLL_remove (neighbour,
-                                neighbour->queue_head,
-                                neighbour->queue_tail,
-                                queue);
-  GNUNET_CONTAINER_MDLL_remove (client,
-                                tc->details.communicator.queue_head,
-                                tc->details.communicator.queue_tail,
-                                queue);
-  maxxed = (COMMUNICATOR_TOTAL_QUEUE_LIMIT <=
-            tc->details.communicator.
-            total_queue_length);
-  while (NULL != (qe = queue->queue_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (queue->queue_head, queue->queue_tail, qe);
-    queue->queue_length--;
-    tc->details.communicator.total_queue_length--;
-    if (NULL != qe->pm)
-    {
-      GNUNET_assert (qe == qe->pm->qe);
-      qe->pm->qe = NULL;
-    }
-    GNUNET_free (qe);
-  }
-  GNUNET_assert (0 == queue->queue_length);
-  if ((maxxed) && (COMMUNICATOR_TOTAL_QUEUE_LIMIT >
-                   tc->details.communicator.total_queue_length))
-  {
-    /* Communicator dropped below threshold, resume all _other_ queues */
-    GNUNET_STATISTICS_update (
-      GST_stats,
-      "# Transmission throttled due to communicator queue limit",
-      -1,
-      GNUNET_NO);
-    for (struct Queue *s = tc->details.communicator.queue_head; NULL != s;
-         s = s->next_client)
-      schedule_transmit_on_queue (GNUNET_TIME_UNIT_ZERO,
-                                  s,
-                                  GNUNET_SCHEDULER_PRIORITY_DEFAULT);
-  }
-  notify_monitors (&neighbour->pid, queue->address, queue->nt, &me);
-  GNUNET_free (queue);
-
-  vl = lookup_virtual_link (&neighbour->pid);
-  if ((NULL != vl) && (GNUNET_YES == vl->confirmed) && (neighbour == vl->n))
-  {
-    GNUNET_SCHEDULER_cancel (vl->visibility_task);
-    check_link_down (vl);
-  }
-  if (NULL == neighbour->queue_head)
-  {
-    free_neighbour (neighbour);
-  }
-}
-
-
-/**
- * Free @a ale
- *
- * @param ale address list entry to free
- */
-static void
-free_address_list_entry (struct AddressListEntry *ale)
-{
-  struct TransportClient *tc = ale->tc;
-
-  GNUNET_CONTAINER_DLL_remove (tc->details.communicator.addr_head,
-                               tc->details.communicator.addr_tail,
-                               ale);
-  if (NULL != ale->sc)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "store cancel\n");
-    GNUNET_PEERSTORE_store_cancel (ale->sc);
-    ale->sc = NULL;
-  }
-  if (NULL != ale->st)
-  {
-    GNUNET_SCHEDULER_cancel (ale->st);
-    ale->st = NULL;
-  }
-  GNUNET_free (ale);
-}
-
-
-/**
- * Stop the peer request in @a value.
- *
- * @param cls a `struct TransportClient` that no longer makes the request
- * @param pid the peer's identity
- * @param value a `struct PeerRequest`
- * @return #GNUNET_YES (always)
- */
-static int
-stop_peer_request (void *cls,
-                   const struct GNUNET_PeerIdentity *pid,
-                   void *value)
-{
-  struct TransportClient *tc = cls;
-  struct PeerRequest *pr = value;
-
-  GNUNET_PEERSTORE_watch_cancel (pr->wc);
-  pr->wc = NULL;
-  GNUNET_assert (
-    GNUNET_YES ==
-    GNUNET_CONTAINER_multipeermap_remove (tc->details.application.requests,
-                                          pid,
-                                          pr));
-  GNUNET_free (pr);
-
-  return GNUNET_OK;
-}
-
-
-static void
-do_shutdown (void *cls);
-
-/**
- * Called whenever a client is disconnected.  Frees our
- * resources associated with that client.
- *
- * @param cls closure, NULL
- * @param client identification of the client
- * @param app_ctx our `struct TransportClient`
- */
-static void
-client_disconnect_cb (void *cls,
-                      struct GNUNET_SERVICE_Client *client,
-                      void *app_ctx)
-{
-  struct TransportClient *tc = app_ctx;
-
-  (void) cls;
-  (void) client;
-  GNUNET_CONTAINER_DLL_remove (clients_head, clients_tail, tc);
-  switch (tc->type)
-  {
-  case CT_NONE:
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Unknown Client %p disconnected, cleaning up.\n",
-                tc);
-    break;
-
-  case CT_CORE: {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "CORE Client %p disconnected, cleaning up.\n",
-                  tc);
-
-      struct PendingMessage *pm;
-
-      while (NULL != (pm = tc->details.core.pending_msg_head))
-      {
-        GNUNET_CONTAINER_MDLL_remove (client,
-                                      tc->details.core.pending_msg_head,
-                                      tc->details.core.pending_msg_tail,
-                                      pm);
-        pm->client = NULL;
-      }
-    }
-    break;
-
-  case CT_MONITOR:
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "MONITOR Client %p disconnected, cleaning up.\n",
-                tc);
-
-    break;
-
-  case CT_COMMUNICATOR: {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "COMMUNICATOR Client %p disconnected, cleaning up.\n",
-                  tc);
-
-      struct Queue *q;
-      struct AddressListEntry *ale;
-
-      while (NULL != (q = tc->details.communicator.queue_head))
-        free_queue (q);
-      while (NULL != (ale = tc->details.communicator.addr_head))
-        free_address_list_entry (ale);
-      GNUNET_free (tc->details.communicator.address_prefix);
-    }
-    break;
-
-  case CT_APPLICATION:
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "APPLICATION Client %p disconnected, cleaning up.\n",
-                tc);
-
-    GNUNET_CONTAINER_multipeermap_iterate (tc->details.application.requests,
-                                           &stop_peer_request,
-                                           tc);
-    GNUNET_CONTAINER_multipeermap_destroy (tc->details.application.requests);
-    break;
-  }
-  GNUNET_free (tc);
-  if ((GNUNET_YES == in_shutdown) && (NULL == clients_head))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Our last client disconnected\n");
-    do_shutdown (cls);
-  }
-}
-
-
-/**
- * Iterator telling new CORE client about all existing
- * connections to peers.
- *
- * @param cls the new `struct TransportClient`
- * @param pid a connected peer
- * @param value the `struct Neighbour` with more information
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-notify_client_connect_info (void *cls,
-                            const struct GNUNET_PeerIdentity *pid,
-                            void *value)
-{
-  struct TransportClient *tc = cls;
-
-  (void) value;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Telling new CORE client about existing connection to %s\n",
-              GNUNET_i2s (pid));
-  core_send_connect_info (tc, pid);
-  return GNUNET_OK;
-}
-
-
-/**
- * Initialize a "CORE" client.  We got a start message from this
- * client, so add it to the list of clients for broadcasting of
- * inbound messages.
- *
- * @param cls the client
- * @param start the start message that was sent
- */
-static void
-handle_client_start (void *cls, const struct StartMessage *start)
-{
-  struct TransportClient *tc = cls;
-  uint32_t options;
-
-  options = ntohl (start->options);
-  if ((0 != (1 & options)) &&
-      (0 != GNUNET_memcmp (&start->self, &GST_my_identity)))
-  {
-    /* client thinks this is a different peer, reject */
-    GNUNET_break (0);
-    GNUNET_SERVICE_client_drop (tc->client);
-    return;
-  }
-  if (CT_NONE != tc->type)
-  {
-    GNUNET_break (0);
-    GNUNET_SERVICE_client_drop (tc->client);
-    return;
-  }
-  tc->type = CT_CORE;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "New CORE client with PID %s registered\n",
-              GNUNET_i2s (&start->self));
-  GNUNET_CONTAINER_multipeermap_iterate (neighbours,
-                                         &notify_client_connect_info,
-                                         tc);
-  GNUNET_SERVICE_client_continue (tc->client);
-}
-
-
-/**
- * Client asked for transmission to a peer.  Process the request.
- *
- * @param cls the client
- * @param obm the send message that was sent
- */
-static int
-check_client_send (void *cls, const struct OutboundMessage *obm)
-{
-  struct TransportClient *tc = cls;
-  uint16_t size;
-  const struct GNUNET_MessageHeader *obmm;
-
-  if (CT_CORE != tc->type)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  size = ntohs (obm->header.size) - sizeof(struct OutboundMessage);
-  if (size < sizeof(struct GNUNET_MessageHeader))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  obmm = (const struct GNUNET_MessageHeader *) &obm[1];
-  if (size != ntohs (obmm->size))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Send a response to the @a pm that we have processed a "send"
- * request.  Sends a confirmation to the "core" client responsible for
- * the original request and free's @a pm.
- *
- * @param pm handle to the original pending message
- */
-static void
-client_send_response (struct PendingMessage *pm)
-{
-  struct TransportClient *tc = pm->client;
-  struct VirtualLink *vl = pm->vl;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "client send response\n");
-  if (NULL != tc)
-  {
-    struct GNUNET_MQ_Envelope *env;
-    struct SendOkMessage *so_msg;
-
-    env = GNUNET_MQ_msg (so_msg, GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK);
-    so_msg->peer = vl->target;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Confirming transmission of <%llu> to %s\n",
-                pm->logging_uuid,
-                GNUNET_i2s (&vl->target));
-    GNUNET_MQ_send (tc->mq, env);
-  }
-  free_pending_message (pm);
-}
-
-
-/**
- * Pick @a hops_array_length random DV paths satisfying @a options
- *
- * @param dv data structure to pick paths from
- * @param options constraints to satisfy
- * @param hops_array[out] set to the result
- * @param hops_array_length length of the @a hops_array
- * @return number of entries set in @a hops_array
- */
-static unsigned int
-pick_random_dv_hops (const struct DistanceVector *dv,
-                     enum RouteMessageOptions options,
-                     struct DistanceVectorHop **hops_array,
-                     unsigned int hops_array_length)
-{
-  uint64_t choices[hops_array_length];
-  uint64_t num_dv;
-  unsigned int dv_count;
-
-  /* Pick random vectors, but weighted by distance, giving more weight
-     to shorter vectors */
-  num_dv = 0;
-  dv_count = 0;
-  for (struct DistanceVectorHop *pos = dv->dv_head; NULL != pos;
-       pos = pos->next_dv)
-  {
-    if ((0 == (options & RMO_UNCONFIRMED_ALLOWED)) &&
-        (GNUNET_TIME_absolute_get_remaining (pos->path_valid_until)
-         .rel_value_us == 0))
-      continue;   /* pos unconfirmed and confirmed required */
-    num_dv += MAX_DV_HOPS_ALLOWED - pos->distance;
-    dv_count++;
-  }
-  if (0 == dv_count)
-    return 0;
-  if (dv_count <= hops_array_length)
-  {
-    dv_count = 0;
-    for (struct DistanceVectorHop *pos = dv->dv_head; NULL != pos;
-         pos = pos->next_dv)
-      hops_array[dv_count++] = pos;
-    return dv_count;
-  }
-  for (unsigned int i = 0; i < hops_array_length; i++)
-  {
-    int ok = GNUNET_NO;
-    while (GNUNET_NO == ok)
-    {
-      choices[i] =
-        GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, num_dv);
-      ok = GNUNET_YES;
-      for (unsigned int j = 0; j < i; j++)
-        if (choices[i] == choices[j])
-        {
-          ok = GNUNET_NO;
-          break;
-        }
-    }
-  }
-  dv_count = 0;
-  num_dv = 0;
-  for (struct DistanceVectorHop *pos = dv->dv_head; NULL != pos;
-       pos = pos->next_dv)
-  {
-    uint32_t delta = MAX_DV_HOPS_ALLOWED - pos->distance;
-
-    if ((0 == (options & RMO_UNCONFIRMED_ALLOWED)) &&
-        (GNUNET_TIME_absolute_get_remaining (pos->path_valid_until)
-         .rel_value_us == 0))
-      continue;   /* pos unconfirmed and confirmed required */
-    for (unsigned int i = 0; i < hops_array_length; i++)
-      if ((num_dv <= choices[i]) && (num_dv + delta > choices[i]))
-        hops_array[dv_count++] = pos;
-    num_dv += delta;
-  }
-  return dv_count;
-}
-
-
-/**
- * Communicator started.  Test message is well-formed.
- *
- * @param cls the client
- * @param cam the send message that was sent
- */
-static int
-check_communicator_available (
-  void *cls,
-  const struct GNUNET_TRANSPORT_CommunicatorAvailableMessage *cam)
-{
-  struct TransportClient *tc = cls;
-  uint16_t size;
-
-  if (CT_NONE != tc->type)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  tc->type = CT_COMMUNICATOR;
-  size = ntohs (cam->header.size) - sizeof(*cam);
-  if (0 == size)
-    return GNUNET_OK; /* receive-only communicator */
-  GNUNET_MQ_check_zero_termination (cam);
-  return GNUNET_OK;
-}
-
-
-/**
- * Send ACK to communicator (if requested) and free @a cmc.
- *
- * @param cmc context for which we are done handling the message
- */
-static void
-finish_cmc_handling (struct CommunicatorMessageContext *cmc)
-{
-  if (0 != ntohl (cmc->im.fc_on))
-  {
-    /* send ACK when done to communicator for flow control! */
-    struct GNUNET_MQ_Envelope *env;
-    struct GNUNET_TRANSPORT_IncomingMessageAck *ack;
-
-    env = GNUNET_MQ_msg (ack, GNUNET_MESSAGE_TYPE_TRANSPORT_INCOMING_MSG_ACK);
-    ack->reserved = htonl (0);
-    ack->fc_id = cmc->im.fc_id;
-    ack->sender = cmc->im.sender;
-    GNUNET_MQ_send (cmc->tc->mq, env);
-  }
-  GNUNET_SERVICE_client_continue (cmc->tc->client);
-  GNUNET_free (cmc);
-}
-
-
-/**
- * Client confirms that it is done handling message(s) to a particular
- * peer. We may now provide more messages to CORE for this peer.
- *
- * Notifies the respective queues that more messages can now be received.
- *
- * @param cls the client
- * @param rom the message that was sent
- */
-static void
-handle_client_recv_ok (void *cls, const struct RecvOkMessage *rom)
-{
-  struct TransportClient *tc = cls;
-  struct VirtualLink *vl;
-  uint32_t delta;
-  struct CommunicatorMessageContext *cmc;
-
-  if (CT_CORE != tc->type)
-  {
-    GNUNET_break (0);
-    GNUNET_SERVICE_client_drop (tc->client);
-    return;
-  }
-  vl = lookup_virtual_link (&rom->peer);
-  if ((NULL == vl) || (GNUNET_NO == vl->confirmed))
-  {
-    GNUNET_STATISTICS_update (GST_stats,
-                              "# RECV_OK dropped: virtual link unknown",
-                              1,
-                              GNUNET_NO);
-    GNUNET_SERVICE_client_continue (tc->client);
-    return;
-  }
-  delta = ntohl (rom->increase_window_delta);
-  vl->core_recv_window += delta;
-  if (vl->core_recv_window <= 0)
-    return;
-  /* resume communicators */
-  while (NULL != (cmc = vl->cmc_tail))
-  {
-    GNUNET_CONTAINER_DLL_remove (vl->cmc_head, vl->cmc_tail, cmc);
-    finish_cmc_handling (cmc);
-  }
-}
-
-
-/**
- * Communicator started.  Process the request.
- *
- * @param cls the client
- * @param cam the send message that was sent
- */
-static void
-handle_communicator_available (
-  void *cls,
-  const struct GNUNET_TRANSPORT_CommunicatorAvailableMessage *cam)
-{
-  struct TransportClient *tc = cls;
-  uint16_t size;
-
-  size = ntohs (cam->header.size) - sizeof(*cam);
-  if (0 == size)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Receive-only communicator connected\n");
-    return;   /* receive-only communicator */
-  }
-  tc->details.communicator.address_prefix =
-    GNUNET_strdup ((const char *) &cam[1]);
-  tc->details.communicator.cc =
-    (enum GNUNET_TRANSPORT_CommunicatorCharacteristics) ntohl (cam->cc);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Communicator with prefix `%s' connected\n",
-              tc->details.communicator.address_prefix);
-  GNUNET_SERVICE_client_continue (tc->client);
-}
-
-
-/**
- * Communicator requests backchannel transmission.  Check the request.
- *
- * @param cls the client
- * @param cb the send message that was sent
- * @return #GNUNET_OK if message is well-formed
- */
-static int
-check_communicator_backchannel (
-  void *cls,
-  const struct GNUNET_TRANSPORT_CommunicatorBackchannel *cb)
-{
-  const struct GNUNET_MessageHeader *inbox;
-  const char *is;
-  uint16_t msize;
-  uint16_t isize;
-
-  (void) cls;
-  msize = ntohs (cb->header.size) - sizeof(*cb);
-  inbox = (const struct GNUNET_MessageHeader *) &cb[1];
-  isize = ntohs (inbox->size);
-  if (isize >= msize)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  is = (const char *) inbox;
-  is += isize;
-  msize -= isize;
-  GNUNET_assert (0 < msize);
-  if ('\0' != is[msize - 1])
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Ensure ephemeral keys in our @a dv are current. If no current one exists,
- * set it up.
- *
- * @param dv[in,out] virtual link to update ephemeral for
- */
-static void
-update_ephemeral (struct DistanceVector *dv)
-{
-  struct EphemeralConfirmationPS ec;
-
-  if (0 !=
-      GNUNET_TIME_absolute_get_remaining (dv->ephemeral_validity).rel_value_us)
-    return;
-  dv->monotime = GNUNET_TIME_absolute_get_monotonic (GST_cfg);
-  dv->ephemeral_validity =
-    GNUNET_TIME_absolute_add (dv->monotime, EPHEMERAL_VALIDITY);
-  GNUNET_CRYPTO_ecdhe_key_create (&dv->private_key);
-  GNUNET_CRYPTO_ecdhe_key_get_public (&dv->private_key, &dv->ephemeral_key);
-  ec.purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_EPHEMERAL);
-  ec.target = dv->target;
-  ec.ephemeral_key = dv->ephemeral_key;
-  ec.sender_monotonic_time = GNUNET_TIME_absolute_hton (dv->monotime);
-  ec.purpose.size = htonl (sizeof(ec));
-  GNUNET_CRYPTO_eddsa_sign (GST_my_private_key,
-                            &ec,
-                            &dv->sender_sig);
-}
-
-
-/**
- * Send the message @a payload on @a queue.
- *
- * @param queue the queue to use for transmission
- * @param pm pending message to update once transmission is done, may be NULL!
- * @param payload the payload to send (encapsulated in a
- *        #GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_MSG).
- * @param payload_size number of bytes in @a payload
- */
-static void
-queue_send_msg (struct Queue *queue,
-                struct PendingMessage *pm,
-                const void *payload,
-                size_t payload_size)
-{
-  struct Neighbour *n = queue->neighbour;
-  struct GNUNET_TRANSPORT_SendMessageTo *smt;
-  struct GNUNET_MQ_Envelope *env;
-
-  GNUNET_log (
-    GNUNET_ERROR_TYPE_DEBUG,
-    "Queueing %u bytes of payload for transmission <%llu> on queue %llu to %s\n",
-    (unsigned int) payload_size,
-    (NULL == pm) ? 0 : pm->logging_uuid,
-    (unsigned long long) queue->qid,
-    GNUNET_i2s (&queue->neighbour->pid));
-  env = GNUNET_MQ_msg_extra (smt,
-                             payload_size,
-                             GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_MSG);
-  smt->qid = queue->qid;
-  smt->mid = queue->mid_gen;
-  smt->receiver = n->pid;
-  memcpy (&smt[1], payload, payload_size);
-  {
-    /* Pass the env to the communicator of queue for transmission. */
-    struct QueueEntry *qe;
-
-    qe = GNUNET_new (struct QueueEntry);
-    qe->mid = queue->mid_gen++;
-    qe->queue = queue;
-    if (NULL != pm)
-    {
-      qe->pm = pm;
-      // TODO Why do we have a retransmission. When we know, make decision if we still want this.
-      // GNUNET_assert (NULL == pm->qe);
-      /*if (NULL != pm->qe)
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                    "Retransmitting message <%llu> remove pm from qe with MID: %llu \n",
-                    pm->logging_uuid,
-                    (unsigned long long) pm->qe->mid);
-        pm->qe->pm = NULL;
-        }*/
-      pm->qe = qe;
-    }
-    GNUNET_CONTAINER_DLL_insert (queue->queue_head, queue->queue_tail, qe);
-    GNUNET_assert (CT_COMMUNICATOR == queue->tc->type);
-    queue->queue_length++;
-    queue->tc->details.communicator.total_queue_length++;
-    if (0 == queue->q_capacity)
-      return;
-    if (GNUNET_NO == queue->unlimited_length)
-      queue->q_capacity--;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Queue %s with qid %u has capacity %lu\n",
-                queue->address,
-                queue->qid,
-                queue->q_capacity);
-    if (COMMUNICATOR_TOTAL_QUEUE_LIMIT ==
-        queue->tc->details.communicator.total_queue_length)
-      queue->idle = GNUNET_NO;
-    if (QUEUE_LENGTH_LIMIT == queue->queue_length)
-      queue->idle = GNUNET_NO;
-    if (0 == queue->q_capacity)
-      queue->idle = GNUNET_NO;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Sending message MID %llu of type %u (%u) and size %u with MQ %p\n",
-                smt->mid,
-                ntohs (((const struct GNUNET_MessageHeader *) payload)->type),
-                ntohs (smt->header.size),
-                payload_size,
-                queue->tc->mq);
-    GNUNET_MQ_send (queue->tc->mq, env);
-  }
-}
-
-
-/**
- * Pick a queue of @a n under constraints @a options and schedule
- * transmission of @a hdr.
- *
- * @param n neighbour to send to
- * @param hdr message to send as payload
- * @param options whether queues must be confirmed or not,
- *        and whether we may pick multiple (2) queues
- * @return expected RTT for transmission, #GNUNET_TIME_UNIT_FOREVER_REL if sending failed
- */
-static struct GNUNET_TIME_Relative
-route_via_neighbour (const struct Neighbour *n,
-                     const struct GNUNET_MessageHeader *hdr,
-                     enum RouteMessageOptions options)
-{
-  struct GNUNET_TIME_Absolute now;
-  unsigned int candidates;
-  unsigned int sel1;
-  unsigned int sel2;
-  struct GNUNET_TIME_Relative rtt;
-
-  /* Pick one or two 'random' queues from n (under constraints of options) */
-  now = GNUNET_TIME_absolute_get ();
-  /* FIXME-OPTIMIZE: give queues 'weights' and pick proportional to
-     weight in the future; weight could be assigned by observed
-     bandwidth (note: not sure if we should do this for this type
-     of control traffic though). */
-  candidates = 0;
-  for (struct Queue *pos = n->queue_head; NULL != pos;
-       pos = pos->next_neighbour)
-  {
-    if ((0 != (options & RMO_UNCONFIRMED_ALLOWED)) ||
-        (pos->validated_until.abs_value_us > now.abs_value_us))
-      candidates++;
-  }
-  if (0 == candidates)
-  {
-    /* This can happen rarely if the last confirmed queue timed
-       out just as we were beginning to process this message. */
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Could not route message of type %u to %s: no valid queue\n",
-                ntohs (hdr->type),
-                GNUNET_i2s (&n->pid));
-    GNUNET_STATISTICS_update (GST_stats,
-                              "# route selection failed (all no valid queue)",
-                              1,
-                              GNUNET_NO);
-    return GNUNET_TIME_UNIT_FOREVER_REL;
-  }
-
-  rtt = GNUNET_TIME_UNIT_FOREVER_REL;
-  sel1 = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, candidates);
-  if (0 == (options & RMO_REDUNDANT))
-    sel2 = candidates; /* picks none! */
-  else
-    sel2 = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, candidates);
-  candidates = 0;
-  for (struct Queue *pos = n->queue_head; NULL != pos;
-       pos = pos->next_neighbour)
-  {
-    if ((0 != (options & RMO_UNCONFIRMED_ALLOWED)) ||
-        (pos->validated_until.abs_value_us > now.abs_value_us))
-    {
-      if ((sel1 == candidates) || (sel2 == candidates))
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                    "Routing message of type %u to %s using %s (#%u)\n",
-                    ntohs (hdr->type),
-                    GNUNET_i2s (&n->pid),
-                    pos->address,
-                    (sel1 == candidates) ? 1 : 2);
-        rtt = GNUNET_TIME_relative_min (rtt, pos->pd.aged_rtt);
-        queue_send_msg (pos, NULL, hdr, ntohs (hdr->size));
-      }
-      candidates++;
-    }
-  }
-  return rtt;
-}
-
-
-/**
- * Structure of the key material used to encrypt backchannel messages.
- */
-struct DVKeyState
-{
-  /**
-   * State of our block cipher.
-   */
-  gcry_cipher_hd_t cipher;
-
-  /**
-   * Actual key material.
-   */
-  struct
-  {
-    /**
-     * Key used for HMAC calculations (via #GNUNET_CRYPTO_hmac()).
-     */
-    struct GNUNET_CRYPTO_AuthKey hmac_key;
-
-    /**
-     * Symmetric key to use for encryption.
-     */
-    char aes_key[256 / 8];
-
-    /**
-     * Counter value to use during setup.
-     */
-    char aes_ctr[128 / 8];
-  } material;
-};
-
-
-/**
- * Given the key material in @a km and the initialization vector
- * @a iv, setup the key material for the backchannel in @a key.
- *
- * @param km raw master secret
- * @param iv initialization vector
- * @param key[out] symmetric cipher and HMAC state to generate
- */
-static void
-dv_setup_key_state_from_km (const struct GNUNET_HashCode *km,
-                            const struct GNUNET_ShortHashCode *iv,
-                            struct DVKeyState *key)
-{
-  /* must match #dh_key_derive_eph_pub */
-  GNUNET_assert (GNUNET_YES ==
-                 GNUNET_CRYPTO_kdf (&key->material,
-                                    sizeof(key->material),
-                                    "transport-backchannel-key",
-                                    strlen ("transport-backchannel-key"),
-                                    km,
-                                    sizeof(*km),
-                                    iv,
-                                    sizeof(*iv),
-                                    NULL));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Deriving backchannel key based on KM %s and IV %s\n",
-              GNUNET_h2s (km),
-              GNUNET_sh2s (iv));
-  GNUNET_assert (0 == gcry_cipher_open (&key->cipher,
-                                        GCRY_CIPHER_AES256 /* low level: go for speed */,
-                                        GCRY_CIPHER_MODE_CTR,
-                                        0 /* flags */));
-  GNUNET_assert (0 == gcry_cipher_setkey (key->cipher,
-                                          &key->material.aes_key,
-                                          sizeof(key->material.aes_key)));
-  gcry_cipher_setctr (key->cipher,
-                      &key->material.aes_ctr,
-                      sizeof(key->material.aes_ctr));
-}
-
-
-/**
- * Derive backchannel encryption key material from @a priv_ephemeral
- * and @a target and @a iv.
- *
- * @param priv_ephemeral ephemeral private key to use
- * @param target the target peer to encrypt to
- * @param iv unique IV to use
- * @param key[out] set to the key material
- */
-static void
-dh_key_derive_eph_pid (
-  const struct GNUNET_CRYPTO_EcdhePrivateKey *priv_ephemeral,
-  const struct GNUNET_PeerIdentity *target,
-  const struct GNUNET_ShortHashCode *iv,
-  struct DVKeyState *key)
-{
-  struct GNUNET_HashCode km;
-
-  GNUNET_assert (GNUNET_YES == GNUNET_CRYPTO_ecdh_eddsa (priv_ephemeral,
-                                                         &target->public_key,
-                                                         &km));
-  dv_setup_key_state_from_km (&km, iv, key);
-}
-
-
-/**
- * Derive backchannel encryption key material from #GST_my_private_key
- * and @a pub_ephemeral and @a iv.
- *
- * @param priv_ephemeral ephemeral private key to use
- * @param target the target peer to encrypt to
- * @param iv unique IV to use
- * @param key[out] set to the key material
- */
-static void
-dh_key_derive_eph_pub (const struct GNUNET_CRYPTO_EcdhePublicKey *pub_ephemeral,
-                       const struct GNUNET_ShortHashCode *iv,
-                       struct DVKeyState *key)
-{
-  struct GNUNET_HashCode km;
-
-  GNUNET_assert (GNUNET_YES == GNUNET_CRYPTO_eddsa_ecdh (GST_my_private_key,
-                                                         pub_ephemeral,
-                                                         &km));
-  dv_setup_key_state_from_km (&km, iv, key);
-}
-
-
-/**
- * Do HMAC calculation for backchannel messages over @a data using key
- * material from @a key.
- *
- * @param key key material (from DH)
- * @param hmac[out] set to the HMAC
- * @param data data to perform HMAC calculation over
- * @param data_size number of bytes in @a data
- */
-static void
-dv_hmac (const struct DVKeyState *key,
-         struct GNUNET_HashCode *hmac,
-         const void *data,
-         size_t data_size)
-{
-  GNUNET_CRYPTO_hmac (&key->material.hmac_key, data, data_size, hmac);
-}
-
-
-/**
- * Perform backchannel encryption using symmetric secret in @a key
- * to encrypt data from @a in to @a dst.
- *
- * @param key[in,out] key material to use
- * @param dst where to write the result
- * @param in input data to encrypt (plaintext)
- * @param in_size number of bytes of input in @a in and available at @a dst
- */
-static void
-dv_encrypt (struct DVKeyState *key, const void *in, void *dst, size_t in_size)
-{
-  GNUNET_assert (0 ==
-                 gcry_cipher_encrypt (key->cipher, dst, in_size, in, in_size));
-}
-
-
-/**
- * Perform backchannel encryption using symmetric secret in @a key
- * to encrypt data from @a in to @a dst.
- *
- * @param key[in,out] key material to use
- * @param ciph cipher text to decrypt
- * @param out[out] output data to generate (plaintext)
- * @param out_size number of bytes of input in @a ciph and available in @a out
- */
-static void
-dv_decrypt (struct DVKeyState *key,
-            void *out,
-            const void *ciph,
-            size_t out_size)
-{
-  GNUNET_assert (
-    0 == gcry_cipher_decrypt (key->cipher, out, out_size, ciph, out_size));
-}
-
-
-/**
- * Clean up key material in @a key.
- *
- * @param key key material to clean up (memory must not be free'd!)
- */
-static void
-dv_key_clean (struct DVKeyState *key)
-{
-  gcry_cipher_close (key->cipher);
-  GNUNET_CRYPTO_zero_keys (&key->material, sizeof(key->material));
-}
-
-
-/**
- * Function to call to further operate on the now DV encapsulated
- * message @a hdr, forwarding it via @a next_hop under respect of
- * @a options.
- *
- * @param cls closure
- * @param next_hop next hop of the DV path
- * @param hdr encapsulated message, technically a `struct TransportDFBoxMessage`
- * @param options options of the original message
- */
-typedef void (*DVMessageHandler) (void *cls,
-                                  struct Neighbour *next_hop,
-                                  const struct GNUNET_MessageHeader *hdr,
-                                  enum RouteMessageOptions options);
-
-/**
- * Pick a path of @a dv under constraints @a options and schedule
- * transmission of @a hdr.
- *
- * @param target neighbour to ultimately send to
- * @param num_dvhs length of the @a dvhs array
- * @param dvhs array of hops to send the message to
- * @param hdr message to send as payload
- * @param use function to call with the encapsulated message
- * @param use_cls closure for @a use
- * @param options whether path must be confirmed or not, to be passed to @a use
- * @param shall this TransportDVBoxMessage be forwarded without flow control.
- * @return expected RTT for transmission, #GNUNET_TIME_UNIT_FOREVER_REL if sending failed
- */
-static struct GNUNET_TIME_Relative
-encapsulate_for_dv (struct DistanceVector *dv,
-                    unsigned int num_dvhs,
-                    struct DistanceVectorHop **dvhs,
-                    const struct GNUNET_MessageHeader *hdr,
-                    DVMessageHandler use,
-                    void *use_cls,
-                    enum RouteMessageOptions options,
-                    enum GNUNET_GenericReturnValue without_fc)
-{
-  struct TransportDVBoxMessage box_hdr;
-  struct TransportDVBoxPayloadP payload_hdr;
-  uint16_t enc_body_size = ntohs (hdr->size);
-  char enc[sizeof(struct TransportDVBoxPayloadP) + enc_body_size] GNUNET_ALIGN;
-  struct TransportDVBoxPayloadP *enc_payload_hdr =
-    (struct TransportDVBoxPayloadP *) enc;
-  struct DVKeyState *key;
-  struct GNUNET_TIME_Relative rtt;
-
-  key = GNUNET_new (struct DVKeyState);
-  /* Encrypt payload */
-  box_hdr.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_DV_BOX);
-  box_hdr.total_hops = htons (0);
-  box_hdr.without_fc = htons (without_fc);
-  update_ephemeral (dv);
-  box_hdr.ephemeral_key = dv->ephemeral_key;
-  payload_hdr.sender_sig = dv->sender_sig;
-
-  GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_NONCE,
-                              &box_hdr.iv,
-                              sizeof(box_hdr.iv));
-  dh_key_derive_eph_pid (&dv->private_key, &dv->target, &box_hdr.iv, key);
-  payload_hdr.sender = GST_my_identity;
-  payload_hdr.monotonic_time = GNUNET_TIME_absolute_hton (dv->monotime);
-  dv_encrypt (key, &payload_hdr, enc_payload_hdr, sizeof(payload_hdr));
-  dv_encrypt (key,
-              hdr,
-              &enc[sizeof(struct TransportDVBoxPayloadP)],
-              enc_body_size);
-  dv_hmac (key, &box_hdr.hmac, enc, sizeof(enc));
-  dv_key_clean (key);
-  rtt = GNUNET_TIME_UNIT_FOREVER_REL;
-  /* For each selected path, take the pre-computed header and body
-     and add the path in the middle of the message; then send it. */
-  for (unsigned int i = 0; i < num_dvhs; i++)
-  {
-    struct DistanceVectorHop *dvh = dvhs[i];
-    unsigned int num_hops = dvh->distance + 1;
-    char buf[sizeof(struct TransportDVBoxMessage)
-             + sizeof(struct GNUNET_PeerIdentity) * num_hops
-             + sizeof(struct TransportDVBoxPayloadP)
-             + enc_body_size] GNUNET_ALIGN;
-    struct GNUNET_PeerIdentity *dhops;
-
-    box_hdr.header.size = htons (sizeof(buf));
-    box_hdr.orig_size = htons (sizeof(buf));
-    box_hdr.num_hops = htons (num_hops);
-    memcpy (buf, &box_hdr, sizeof(box_hdr));
-    dhops = (struct GNUNET_PeerIdentity *) &buf[sizeof(box_hdr)];
-    memcpy (dhops,
-            dvh->path,
-            dvh->distance * sizeof(struct GNUNET_PeerIdentity));
-    dhops[dvh->distance] = dv->target;
-    if (GNUNET_EXTRA_LOGGING > 0)
-    {
-      char *path;
-
-      path = GNUNET_strdup (GNUNET_i2s (&GST_my_identity));
-      for (unsigned int j = 0; j < num_hops; j++)
-      {
-        char *tmp;
-
-        GNUNET_asprintf (&tmp, "%s-%s", path, GNUNET_i2s (&dhops[j]));
-        GNUNET_free (path);
-        path = tmp;
-      }
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Routing message of type %u to %s using DV (#%u/%u) via %s\n",
-                  ntohs (hdr->type),
-                  GNUNET_i2s (&dv->target),
-                  i + 1,
-                  num_dvhs,
-                  path);
-      GNUNET_free (path);
-    }
-    rtt = GNUNET_TIME_relative_min (rtt, dvh->pd.aged_rtt);
-    memcpy (&dhops[num_hops], enc, sizeof(enc));
-    use (use_cls,
-         dvh->next_hop,
-         (const struct GNUNET_MessageHeader *) buf,
-         options);
-    GNUNET_free (key);
-  }
-  return rtt;
-}
-
-
-/**
- * Wrapper around #route_via_neighbour() that matches the
- * #DVMessageHandler structure.
- *
- * @param cls unused
- * @param next_hop where to send next
- * @param hdr header of the message to send
- * @param options message options for queue selection
- */
-static void
-send_dv_to_neighbour (void *cls,
-                      struct Neighbour *next_hop,
-                      const struct GNUNET_MessageHeader *hdr,
-                      enum RouteMessageOptions options)
-{
-  (void) cls;
-  (void) route_via_neighbour (next_hop, hdr, RMO_UNCONFIRMED_ALLOWED);
-}
-
-
-/**
- * We need to transmit @a hdr to @a target.  If necessary, this may
- * involve DV routing.  This function routes without applying flow
- * control or congestion control and should only be used for control
- * traffic.
- *
- * @param target peer to receive @a hdr
- * @param hdr header of the message to route and #GNUNET_free()
- * @param options which transmission channels are allowed
- * @return expected RTT for transmission, #GNUNET_TIME_UNIT_FOREVER_REL if sending failed
- */
-static struct GNUNET_TIME_Relative
-route_control_message_without_fc (struct VirtualLink *vl,
-// route_control_message_without_fc (const struct GNUNET_PeerIdentity *target,
-                                  const struct GNUNET_MessageHeader *hdr,
-                                  enum RouteMessageOptions options)
-{
-  // struct VirtualLink *vl;
-  struct Neighbour *n;
-  struct DistanceVector *dv;
-  struct GNUNET_TIME_Relative rtt1;
-  struct GNUNET_TIME_Relative rtt2;
-  const struct GNUNET_PeerIdentity *target = &vl->target;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Trying to route message of type %u to %s without fc\n",
-              ntohs (hdr->type),
-              GNUNET_i2s (target));
-
-  // TODO Do this elsewhere. vl should be given as parameter to method.
-  // vl = lookup_virtual_link (target);
-  GNUNET_assert (NULL != vl && GNUNET_YES == vl->confirmed);
-  if (NULL == vl)
-    return GNUNET_TIME_UNIT_FOREVER_REL;
-  n = vl->n;
-  dv = (0 != (options & RMO_DV_ALLOWED)) ? vl->dv : NULL;
-  if (0 == (options & RMO_UNCONFIRMED_ALLOWED))
-  {
-    /* if confirmed is required, and we do not have anything
-       confirmed, drop respective options */
-    if (NULL == n)
-      n = lookup_neighbour (target);
-    if ((NULL == dv) && (0 != (options & RMO_DV_ALLOWED)))
-      dv = GNUNET_CONTAINER_multipeermap_get (dv_routes, target);
-  }
-  if ((NULL == n) && (NULL == dv))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Cannot route message of type %u to %s: no route\n",
-                ntohs (hdr->type),
-                GNUNET_i2s (target));
-    GNUNET_STATISTICS_update (GST_stats,
-                              "# Messages dropped in routing: no acceptable method",
-                              1,
-                              GNUNET_NO);
-    return GNUNET_TIME_UNIT_FOREVER_REL;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Routing message of type %u to %s with options %X\n",
-              ntohs (hdr->type),
-              GNUNET_i2s (target),
-              (unsigned int) options);
-  /* If both dv and n are possible and we must choose:
-     flip a coin for the choice between the two; for now 50/50 */
-  if ((NULL != n) && (NULL != dv) && (0 == (options & RMO_REDUNDANT)))
-  {
-    if (0 == GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 2))
-      n = NULL;
-    else
-      dv = NULL;
-  }
-  if ((NULL != n) && (NULL != dv))
-    options &= ~RMO_REDUNDANT; /* We will do one DV and one direct, that's
-                                  enough for redundancy, so clear the flag. */
-  rtt1 = GNUNET_TIME_UNIT_FOREVER_REL;
-  rtt2 = GNUNET_TIME_UNIT_FOREVER_REL;
-  if (NULL != n)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Try to route message of type %u to %s without fc via neighbour\n",
-                ntohs (hdr->type),
-                GNUNET_i2s (target));
-    rtt1 = route_via_neighbour (n, hdr, options);
-  }
-  if (NULL != dv)
-  {
-    struct DistanceVectorHop *hops[2];
-    unsigned int res;
-
-    res = pick_random_dv_hops (dv,
-                               options,
-                               hops,
-                               (0 == (options & RMO_REDUNDANT)) ? 1 : 2);
-    if (0 == res)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Failed to route message, could not determine DV path\n");
-      return rtt1;
-    }
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "encapsulate_for_dv 1\n");
-    rtt2 = encapsulate_for_dv (dv,
-                               res,
-                               hops,
-                               hdr,
-                               &send_dv_to_neighbour,
-                               NULL,
-                               options & (~RMO_REDUNDANT),
-                               GNUNET_YES);
-  }
-  return GNUNET_TIME_relative_min (rtt1, rtt2);
-}
-
-
-static void
-consider_sending_fc (void *cls);
-
-/**
- * Something changed on the virtual link with respect to flow
- * control. Consider retransmitting the FC window size.
- *
- * @param cls a `struct VirtualLink` to work with
- */
-static void
-task_consider_sending_fc (void *cls)
-{
-  struct VirtualLink *vl = cls;
-  vl->fc_retransmit_task = NULL;
-  consider_sending_fc (cls);
-}
-
-
-/**
- * Something changed on the virtual link with respect to flow
- * control. Consider retransmitting the FC window size.
- *
- * @param cls a `struct VirtualLink` to work with
- */
-static void
-consider_sending_fc (void *cls)
-{
-  struct VirtualLink *vl = cls;
-  struct GNUNET_TIME_Absolute monotime;
-  struct TransportFlowControlMessage fc;
-  struct GNUNET_TIME_Relative duration;
-  struct GNUNET_TIME_Relative rtt;
-
-  duration = GNUNET_TIME_absolute_get_duration (vl->last_fc_transmission);
-  /* OPTIMIZE-FC-BDP: decide sane criteria on when to do this, instead of doing
-     it always! */
-  /* For example, we should probably ONLY do this if a bit more than
-     an RTT has passed, or if the window changed "significantly" since
-     then. See vl->last_fc_rtt! NOTE: to do this properly, we also
-     need an estimate for the bandwidth-delay-product for the entire
-     VL, as that determines "significantly". We have the delay, but
-     the bandwidth statistics need to be added for the VL!*/(void) duration;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Sending FC seq %u to %s with new window %llu\n",
-              (unsigned int) vl->fc_seq_gen,
-              GNUNET_i2s (&vl->target),
-              (unsigned long long) vl->incoming_fc_window_size);
-  monotime = GNUNET_TIME_absolute_get_monotonic (GST_cfg);
-  vl->last_fc_transmission = monotime;
-  fc.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_FLOW_CONTROL);
-  fc.header.size = htons (sizeof(fc));
-  fc.seq = htonl (vl->fc_seq_gen++);
-  fc.inbound_window_size = GNUNET_htonll (vl->incoming_fc_window_size);
-  fc.outbound_sent = GNUNET_htonll (vl->outbound_fc_window_size_used);
-  fc.outbound_window_size = GNUNET_htonll (vl->outbound_fc_window_size);
-  fc.sender_time = GNUNET_TIME_absolute_hton (monotime);
-  rtt = route_control_message_without_fc (vl, &fc.header, RMO_DV_ALLOWED);
-  if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us == rtt.rel_value_us)
-  {
-    rtt = GNUNET_TIME_UNIT_SECONDS;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "FC retransmission to %s failed, will retry in %s\n",
-                GNUNET_i2s (&vl->target),
-                GNUNET_STRINGS_relative_time_to_string (rtt, GNUNET_YES));
-    vl->last_fc_rtt = GNUNET_TIME_UNIT_ZERO;
-  }
-  else
-  {
-    /* OPTIMIZE-FC-BDP: rtt is not ideal, we can do better! */
-    vl->last_fc_rtt = rtt;
-  }
-  if (NULL != vl->fc_retransmit_task)
-    GNUNET_SCHEDULER_cancel (vl->fc_retransmit_task);
-  if (MAX_FC_RETRANSMIT_COUNT == vl->fc_retransmit_count)
-  {
-    rtt = GNUNET_TIME_UNIT_MINUTES;
-    vl->fc_retransmit_count = 0;
-  }
-  vl->fc_retransmit_task =
-    GNUNET_SCHEDULER_add_delayed (rtt, &task_consider_sending_fc, vl);
-  vl->fc_retransmit_count++;
-}
-
-
-/**
- * There is a message at the head of the pending messages for @a vl
- * which may be ready for transmission. Check if a queue is ready to
- * take it.
- *
- * This function must (1) check for flow control to ensure that we can
- * right now send to @a vl, (2) check that the pending message in the
- * queue is actually eligible, (3) determine if any applicable queue
- * (direct neighbour or DVH path) is ready to accept messages, and
- * (4) prioritize based on the preferences associated with the
- * pending message.
- *
- * So yeah, easy.
- *
- * @param vl virtual link where we should check for transmission
- */
-static void
-check_vl_transmission (struct VirtualLink *vl)
-{
-  struct Neighbour *n = vl->n;
-  struct DistanceVector *dv = vl->dv;
-  struct GNUNET_TIME_Absolute now;
-  struct VirtualLink *vl_next_hop;
-  int elig;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "check_vl_transmission to target %s\n",
-              GNUNET_i2s (&vl->target));
-  /* Check that we have an eligible pending message!
-     (cheaper than having #transmit_on_queue() find out!) */
-  elig = GNUNET_NO;
-  for (struct PendingMessage *pm = vl->pending_msg_head; NULL != pm;
-       pm = pm->next_vl)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "check_vl_transmission loop\n");
-    if (NULL != pm->qe)
-      continue;   /* not eligible, is in a queue! */
-    if (pm->bytes_msg + vl->outbound_fc_window_size_used >
-        vl->outbound_fc_window_size)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Stalled message %lu transmission on VL %s due to flow control: %llu < %llu\n",
-                  pm->logging_uuid,
-                  GNUNET_i2s (&vl->target),
-                  (unsigned long long) vl->outbound_fc_window_size,
-                  (unsigned long long) (pm->bytes_msg
-                                        + vl->outbound_fc_window_size_used));
-      consider_sending_fc (vl);
-      return;     /* We have a message, but flow control says "nope" */
-    }
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Target window on VL %s not stalled. Scheduling transmission on queue\n",
-                GNUNET_i2s (&vl->target));
-    /* Notify queues at direct neighbours that we are interested */
-    now = GNUNET_TIME_absolute_get ();
-    if (NULL != n)
-    {
-      for (struct Queue *queue = n->queue_head; NULL != queue;
-           queue = queue->next_neighbour)
-      {
-        if ((GNUNET_YES == queue->idle) &&
-            (queue->validated_until.abs_value_us > now.abs_value_us))
-        {
-          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                      "Direct neighbour %s not stalled\n",
-                      GNUNET_i2s (&n->pid));
-          schedule_transmit_on_queue (GNUNET_TIME_UNIT_ZERO,
-                                      queue,
-                                      GNUNET_SCHEDULER_PRIORITY_DEFAULT);
-          elig = GNUNET_YES;
-        }
-        else
-          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                      "Neighbour Queue QID: %u (%u) busy or invalid\n",
-                      queue->qid,
-                      queue->idle);
-      }
-    }
-    /* Notify queues via DV that we are interested */
-    if (NULL != dv)
-    {
-      /* Do DV with lower scheduler priority, which effectively means that
-         IF a neighbour exists and is available, we prefer it. */
-      for (struct DistanceVectorHop *pos = dv->dv_head; NULL != pos;
-           pos = pos->next_dv)
-      {
-        struct Neighbour *nh = pos->next_hop;
-
-
-        if (pos->path_valid_until.abs_value_us <= now.abs_value_us)
-          continue;   /* skip this one: path not validated */
-        else
-        {
-          vl_next_hop = lookup_virtual_link (&nh->pid);
-          if (pm->bytes_msg + vl_next_hop->outbound_fc_window_size_used >
-              vl_next_hop->outbound_fc_window_size)
-          {
-            GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                        "Stalled message %lu transmission on next hop %s due to flow control: %llu < %llu\n",
-                        pm->logging_uuid,
-                        GNUNET_i2s (&vl_next_hop->target),
-                        (unsigned long
-                         long) vl_next_hop->outbound_fc_window_size,
-                        (unsigned long long) (pm->bytes_msg
-                                              + vl_next_hop->
-                                              outbound_fc_window_size_used));
-            consider_sending_fc (vl_next_hop);
-            continue; /* We have a message, but flow control says "nope" for the first hop of this path */
-          }
-          for (struct Queue *queue = nh->queue_head; NULL != queue;
-               queue = queue->next_neighbour)
-            if ((GNUNET_YES == queue->idle) &&
-                (queue->validated_until.abs_value_us > now.abs_value_us))
-            {
-              GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                          "Next hop neighbour %s not stalled\n",
-                          GNUNET_i2s (&nh->pid));
-              schedule_transmit_on_queue (GNUNET_TIME_UNIT_ZERO,
-                                          queue,
-                                          GNUNET_SCHEDULER_PRIORITY_BACKGROUND);
-              elig = GNUNET_YES;
-            }
-            else
-              GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                          "DV Queue QID: %u (%u) busy or invalid\n",
-                          queue->qid,
-                          queue->idle);
-        }
-      }
-    }
-    if (GNUNET_YES == elig)
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Eligible message %lu of size %llu to %s: %llu/%llu\n",
-                  pm->logging_uuid,
-                  pm->bytes_msg,
-                  GNUNET_i2s (&vl->target),
-                  (unsigned long long) vl->outbound_fc_window_size,
-                  (unsigned long long) (pm->bytes_msg
-                                        + vl->outbound_fc_window_size_used));
-    break;
-  }
-}
-
-
-/**
- * Client asked for transmission to a peer.  Process the request.
- *
- * @param cls the client
- * @param obm the send message that was sent
- */
-static void
-handle_client_send (void *cls, const struct OutboundMessage *obm)
-{
-  struct TransportClient *tc = cls;
-  struct PendingMessage *pm;
-  const struct GNUNET_MessageHeader *obmm;
-  uint32_t bytes_msg;
-  struct VirtualLink *vl;
-  enum GNUNET_MQ_PriorityPreferences pp;
-
-  GNUNET_assert (CT_CORE == tc->type);
-  obmm = (const struct GNUNET_MessageHeader *) &obm[1];
-  bytes_msg = ntohs (obmm->size);
-  pp = (enum GNUNET_MQ_PriorityPreferences) ntohl (obm->priority);
-  vl = lookup_virtual_link (&obm->peer);
-  if ((NULL == vl) || (GNUNET_NO == vl->confirmed))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Don't have %s as a neighbour (anymore).\n",
-                GNUNET_i2s (&obm->peer));
-    /* Failure: don't have this peer as a neighbour (anymore).
-       Might have gone down asynchronously, so this is NOT
-       a protocol violation by CORE. Still count the event,
-       as this should be rare. */
-    GNUNET_SERVICE_client_continue (tc->client);
-    GNUNET_STATISTICS_update (GST_stats,
-                              "# messages dropped (neighbour unknown)",
-                              1,
-                              GNUNET_NO);
-    return;
-  }
-
-  pm = GNUNET_malloc (sizeof(struct PendingMessage) + bytes_msg);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "1 created pm %p storing vl %p\n",
-              pm,
-              vl);
-  pm->logging_uuid = logging_uuid_gen++;
-  pm->prefs = pp;
-  pm->client = tc;
-  pm->vl = vl;
-  pm->bytes_msg = bytes_msg;
-  memcpy (&pm[1], obmm, bytes_msg);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Sending %u bytes as <%llu> to %s\n",
-              bytes_msg,
-              pm->logging_uuid,
-              GNUNET_i2s (&obm->peer));
-  GNUNET_CONTAINER_MDLL_insert (client,
-                                tc->details.core.pending_msg_head,
-                                tc->details.core.pending_msg_tail,
-                                pm);
-  GNUNET_CONTAINER_MDLL_insert (vl,
-                                vl->pending_msg_head,
-                                vl->pending_msg_tail,
-                                pm);
-  check_vl_transmission (vl);
-  GNUNET_SERVICE_client_continue (tc->client);
-}
-
-
-/**
- * Communicator requests backchannel transmission.  Process the request.
- * Just repacks it into our `struct TransportBackchannelEncapsulationMessage *`
- * (which for now has exactly the same format, only a different message type)
- * and passes it on for routing.
- *
- * @param cls the client
- * @param cb the send message that was sent
- */
-static void
-handle_communicator_backchannel (
-  void *cls,
-  const struct GNUNET_TRANSPORT_CommunicatorBackchannel *cb)
-{
-  struct Neighbour *n;
-  struct VirtualLink *vl;
-  struct TransportClient *tc = cls;
-  const struct GNUNET_MessageHeader *inbox =
-    (const struct GNUNET_MessageHeader *) &cb[1];
-  uint16_t isize = ntohs (inbox->size);
-  const char *is = ((const char *) &cb[1]) + isize;
-  size_t slen = strlen (is) + 1;
-  char
-    mbuf[slen + isize
-         + sizeof(struct
-                  TransportBackchannelEncapsulationMessage)] GNUNET_ALIGN;
-  struct TransportBackchannelEncapsulationMessage *be =
-    (struct TransportBackchannelEncapsulationMessage *) mbuf;
-
-  /* 0-termination of 'is' was checked already in
-   #check_communicator_backchannel() */
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Preparing backchannel transmission to %s:%s of type %u and size %u\n",
-              GNUNET_i2s (&cb->pid),
-              is,
-              ntohs (inbox->type),
-              ntohs (inbox->size));
-  /* encapsulate and encrypt message */
-  be->header.type =
-    htons (GNUNET_MESSAGE_TYPE_TRANSPORT_BACKCHANNEL_ENCAPSULATION);
-  be->header.size = htons (sizeof(mbuf));
-  memcpy (&be[1], inbox, isize);
-  memcpy (&mbuf[sizeof(struct TransportBackchannelEncapsulationMessage)
-                + isize],
-          is,
-          strlen (is) + 1);
-  // route_control_message_without_fc (&cb->pid, &be->header, RMO_DV_ALLOWED);
-  vl = lookup_virtual_link (&cb->pid);
-  if ((NULL != vl) && (GNUNET_YES == vl->confirmed))
-  {
-    route_control_message_without_fc (vl, &be->header, RMO_DV_ALLOWED);
-  }
-  else
-  {
-    /* Use route via neighbour */
-    n = lookup_neighbour (&cb->pid);
-    if (NULL != n)
-      route_via_neighbour (
-        n,
-        &be->header,
-        RMO_NONE);
-  }
-  GNUNET_SERVICE_client_continue (tc->client);
-}
-
-
-/**
- * Address of our peer added.  Test message is well-formed.
- *
- * @param cls the client
- * @param aam the send message that was sent
- * @return #GNUNET_OK if message is well-formed
- */
-static int
-check_add_address (void *cls,
-                   const struct GNUNET_TRANSPORT_AddAddressMessage *aam)
-{
-  struct TransportClient *tc = cls;
-
-  if (CT_COMMUNICATOR != tc->type)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_MQ_check_zero_termination (aam);
-  return GNUNET_OK;
-}
-
-
-/**
- * Ask peerstore to store our address.
- *
- * @param cls an `struct AddressListEntry *`
- */
-static void
-store_pi (void *cls);
-
-
-/**
- * Function called when peerstore is done storing our address.
- *
- * @param cls a `struct AddressListEntry`
- * @param success #GNUNET_YES if peerstore was successful
- */
-static void
-peerstore_store_own_cb (void *cls, int success)
-{
-  struct AddressListEntry *ale = cls;
-
-  ale->sc = NULL;
-  if (GNUNET_YES != success)
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to store our own address `%s' in peerstore!\n",
-                ale->address);
-  else
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Successfully stored our own address `%s' in peerstore!\n",
-                ale->address);
-  /* refresh period is 1/4 of expiration time, that should be plenty
-     without being excessive. */
-  ale->st =
-    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_divide (ale->expiration,
-                                                               4ULL),
-                                  &store_pi,
-                                  ale);
-}
-
-
-/**
- * Ask peerstore to store our address.
- *
- * @param cls an `struct AddressListEntry *`
- */
-static void
-store_pi (void *cls)
-{
-  struct AddressListEntry *ale = cls;
-  void *addr;
-  size_t addr_len;
-  struct GNUNET_TIME_Absolute expiration;
-
-  ale->st = NULL;
-  expiration = GNUNET_TIME_relative_to_absolute (ale->expiration);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Storing our address `%s' in peerstore until %s!\n",
-              ale->address,
-              GNUNET_STRINGS_absolute_time_to_string (expiration));
-  GNUNET_HELLO_sign_address (ale->address,
-                             ale->nt,
-                             hello_mono_time,
-                             GST_my_private_key,
-                             &addr,
-                             &addr_len);
-  ale->sc = GNUNET_PEERSTORE_store (peerstore,
-                                    "transport",
-                                    &GST_my_identity,
-                                    GNUNET_PEERSTORE_TRANSPORT_HELLO_KEY,
-                                    addr,
-                                    addr_len,
-                                    expiration,
-                                    GNUNET_PEERSTORE_STOREOPTION_MULTIPLE,
-                                    &peerstore_store_own_cb,
-                                    ale);
-  GNUNET_free (addr);
-  if (NULL == ale->sc)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Failed to store our address `%s' with peerstore\n",
-                ale->address);
-    ale->st =
-      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &store_pi, ale);
-  }
-}
-
-
-/**
- * Address of our peer added.  Process the request.
- *
- * @param cls the client
- * @param aam the send message that was sent
- */
-static void
-handle_add_address (void *cls,
-                    const struct GNUNET_TRANSPORT_AddAddressMessage *aam)
-{
-  struct TransportClient *tc = cls;
-  struct AddressListEntry *ale;
-  size_t slen;
-
-  /* 0-termination of &aam[1] was checked in #check_add_address */
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Communicator added address `%s'!\n",
-              (const char *) &aam[1]);
-  slen = ntohs (aam->header.size) - sizeof(*aam);
-  ale = GNUNET_malloc (sizeof(struct AddressListEntry) + slen);
-  ale->tc = tc;
-  ale->address = (const char *) &ale[1];
-  ale->expiration = GNUNET_TIME_relative_ntoh (aam->expiration);
-  ale->aid = aam->aid;
-  ale->nt = (enum GNUNET_NetworkType) ntohl (aam->nt);
-  memcpy (&ale[1], &aam[1], slen);
-  GNUNET_CONTAINER_DLL_insert (tc->details.communicator.addr_head,
-                               tc->details.communicator.addr_tail,
-                               ale);
-  ale->st = GNUNET_SCHEDULER_add_now (&store_pi, ale);
-  GNUNET_SERVICE_client_continue (tc->client);
-}
-
-
-/**
- * Address of our peer deleted.  Process the request.
- *
- * @param cls the client
- * @param dam the send message that was sent
- */
-static void
-handle_del_address (void *cls,
-                    const struct GNUNET_TRANSPORT_DelAddressMessage *dam)
-{
-  struct TransportClient *tc = cls;
-  struct AddressListEntry *alen;
-
-  if (CT_COMMUNICATOR != tc->type)
-  {
-    GNUNET_break (0);
-    GNUNET_SERVICE_client_drop (tc->client);
-    return;
-  }
-  for (struct AddressListEntry *ale = tc->details.communicator.addr_head;
-       NULL != ale;
-       ale = alen)
-  {
-    alen = ale->next;
-    if (dam->aid != ale->aid)
-      continue;
-    GNUNET_assert (ale->tc == tc);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Communicator deleted address `%s'!\n",
-                ale->address);
-    free_address_list_entry (ale);
-    GNUNET_SERVICE_client_continue (tc->client);
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-              "Communicator removed address we did not even have.\n");
-  GNUNET_SERVICE_client_continue (tc->client);
-  // GNUNET_SERVICE_client_drop (tc->client);
-}
-
-
-/**
- * Given an inbound message @a msg from a communicator @a cmc,
- * demultiplex it based on the type calling the right handler.
- *
- * @param cmc context for demultiplexing
- * @param msg message to demultiplex
- */
-static void
-demultiplex_with_cmc (struct CommunicatorMessageContext *cmc,
-                      const struct GNUNET_MessageHeader *msg);
-
-
-/**
- * Function called when we are done giving a message of a certain
- * size to CORE and should thus decrement the number of bytes of
- * RAM reserved for that peer's MQ.
- *
- * @param cls a `struct CoreSentContext`
- */
-static void
-core_env_sent_cb (void *cls)
-{
-  struct CoreSentContext *ctx = cls;
-  struct VirtualLink *vl = ctx->vl;
-
-  if (NULL == vl)
-  {
-    /* lost the link in the meantime, ignore */
-    GNUNET_free (ctx);
-    return;
-  }
-  GNUNET_CONTAINER_DLL_remove (vl->csc_head, vl->csc_tail, ctx);
-  GNUNET_assert (vl->incoming_fc_window_size_ram >= ctx->size);
-  vl->incoming_fc_window_size_ram -= ctx->size;
-  vl->incoming_fc_window_size_used += ctx->isize;
-  consider_sending_fc (vl);
-  GNUNET_free (ctx);
-}
-
-
-/**
- * Communicator gave us an unencapsulated message to pass as-is to
- * CORE.  Process the request.
- *
- * @param cls a `struct CommunicatorMessageContext` (must call
- * #finish_cmc_handling() when done)
- * @param mh the message that was received
- */
-static void
-handle_raw_message (void *cls, const struct GNUNET_MessageHeader *mh)
-{
-  struct CommunicatorMessageContext *cmc = cls;
-  struct VirtualLink *vl;
-  uint16_t size = ntohs (mh->size);
-  int have_core;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Handling raw message of type %u with %u bytes\n",
-              (unsigned int) ntohs (mh->type),
-              (unsigned int) ntohs (mh->size));
-
-  if ((size > UINT16_MAX - sizeof(struct InboundMessage)) ||
-      (size < sizeof(struct GNUNET_MessageHeader)))
-  {
-    struct GNUNET_SERVICE_Client *client = cmc->tc->client;
-
-    GNUNET_break (0);
-    finish_cmc_handling (cmc);
-    GNUNET_SERVICE_client_drop (client);
-    return;
-  }
-  vl = lookup_virtual_link (&cmc->im.sender);
-  if ((NULL == vl) || (GNUNET_NO == vl->confirmed))
-  {
-    /* FIXME: sender is giving us messages for CORE but we don't have
-       the link up yet! I *suspect* this can happen right now (i.e.
-       sender has verified us, but we didn't verify sender), but if
-       we pass this on, CORE would be confused (link down, messages
-       arrive).  We should investigate more if this happens often,
-       or in a persistent manner, and possibly do "something" about
-       it. Thus logging as error for now. */
-    GNUNET_break_op (0);
-    GNUNET_STATISTICS_update (GST_stats,
-                              "# CORE messages dropped (virtual link still down)",
-                              1,
-                              GNUNET_NO);
-
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "CORE messages of type %u with %u bytes dropped (virtual link still down)\n",
-                (unsigned int) ntohs (mh->type),
-                (unsigned int) ntohs (mh->size));
-    finish_cmc_handling (cmc);
-    return;
-  }
-  if (vl->incoming_fc_window_size_ram > UINT_MAX - size)
-  {
-    GNUNET_STATISTICS_update (GST_stats,
-                              "# CORE messages dropped (FC arithmetic overflow)",
-                              1,
-                              GNUNET_NO);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "CORE messages of type %u with %u bytes dropped (FC arithmetic overflow)\n",
-                (unsigned int) ntohs (mh->type),
-                (unsigned int) ntohs (mh->size));
-    finish_cmc_handling (cmc);
-    return;
-  }
-  if (vl->incoming_fc_window_size_ram + size > vl->available_fc_window_size)
-  {
-    GNUNET_STATISTICS_update (GST_stats,
-                              "# CORE messages dropped (FC window overflow)",
-                              1,
-                              GNUNET_NO);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "CORE messages of type %u with %u bytes dropped (FC window overflow)\n",
-                (unsigned int) ntohs (mh->type),
-                (unsigned int) ntohs (mh->size));
-    finish_cmc_handling (cmc);
-    return;
-  }
-
-  /* Forward to all CORE clients */
-  have_core = GNUNET_NO;
-  for (struct TransportClient *tc = clients_head; NULL != tc; tc = tc->next)
-  {
-    struct GNUNET_MQ_Envelope *env;
-    struct InboundMessage *im;
-    struct CoreSentContext *ctx;
-
-    if (CT_CORE != tc->type)
-      continue;
-    vl->incoming_fc_window_size_ram += size;
-    env = GNUNET_MQ_msg_extra (im, size, GNUNET_MESSAGE_TYPE_TRANSPORT_RECV);
-    ctx = GNUNET_new (struct CoreSentContext);
-    ctx->vl = vl;
-    ctx->size = size;
-    ctx->isize = (GNUNET_NO == have_core) ? size : 0;
-    have_core = GNUNET_YES;
-    GNUNET_CONTAINER_DLL_insert (vl->csc_head, vl->csc_tail, ctx);
-    GNUNET_MQ_notify_sent (env, &core_env_sent_cb, ctx);
-    im->peer = cmc->im.sender;
-    memcpy (&im[1], mh, size);
-    GNUNET_MQ_send (tc->mq, env);
-    vl->core_recv_window--;
-  }
-  if (GNUNET_NO == have_core)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Dropped message to CORE: no CORE client connected!\n");
-    /* Nevertheless, count window as used, as it is from the
-       perspective of the other peer! */
-    vl->incoming_fc_window_size_used += size;
-    /* TODO-M1 */
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Dropped message of type %u with %u bytes to CORE: no CORE client connected!\n",
-                (unsigned int) ntohs (mh->type),
-                (unsigned int) ntohs (mh->size));
-    finish_cmc_handling (cmc);
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Delivered message from %s of type %u to CORE\n",
-              GNUNET_i2s (&cmc->im.sender),
-              ntohs (mh->type));
-  if (vl->core_recv_window > 0)
-  {
-    finish_cmc_handling (cmc);
-    return;
-  }
-  /* Wait with calling #finish_cmc_handling(cmc) until the message
-     was processed by CORE MQs (for CORE flow control)! */
-  GNUNET_CONTAINER_DLL_insert (vl->cmc_head, vl->cmc_tail, cmc);
-}
-
-
-/**
- * Communicator gave us a fragment box.  Check the message.
- *
- * @param cls a `struct CommunicatorMessageContext`
- * @param fb the send message that was sent
- * @return #GNUNET_YES if message is well-formed
- */
-static int
-check_fragment_box (void *cls, const struct TransportFragmentBoxMessage *fb)
-{
-  uint16_t size = ntohs (fb->header.size);
-  uint16_t bsize = size - sizeof(*fb);
-
-  (void) cls;
-  if (0 == bsize)
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  if (bsize + ntohs (fb->frag_off) > ntohs (fb->msg_size))
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  if (ntohs (fb->frag_off) >= ntohs (fb->msg_size))
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_YES;
-}
-
-
-/**
- * Clean up an idle cumulative acknowledgement data structure.
- *
- * @param cls a `struct AcknowledgementCummulator *`
- */
-static void
-destroy_ack_cummulator (void *cls)
-{
-  struct AcknowledgementCummulator *ac = cls;
-
-  ac->task = NULL;
-  GNUNET_assert (0 == ac->num_acks);
-  GNUNET_assert (
-    GNUNET_YES ==
-    GNUNET_CONTAINER_multipeermap_remove (ack_cummulators, &ac->target, ac));
-  GNUNET_free (ac);
-}
-
-
-/**
- * Do the transmission of a cumulative acknowledgement now.
- *
- * @param cls a `struct AcknowledgementCummulator *`
- */
-static void
-transmit_cummulative_ack_cb (void *cls)
-{
-  struct Neighbour *n;
-  struct VirtualLink *vl;
-  struct AcknowledgementCummulator *ac = cls;
-  char buf[sizeof(struct TransportReliabilityAckMessage)
-           + ac->num_acks
-           * sizeof(struct TransportCummulativeAckPayloadP)] GNUNET_ALIGN;
-  struct TransportReliabilityAckMessage *ack =
-    (struct TransportReliabilityAckMessage *) buf;
-  struct TransportCummulativeAckPayloadP *ap;
-
-  ac->task = NULL;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Sending ACK with %u components to %s\n",
-              ac->num_acks,
-              GNUNET_i2s (&ac->target));
-  GNUNET_assert (0 < ac->num_acks);
-  ack->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_RELIABILITY_ACK);
-  ack->header.size =
-    htons (sizeof(*ack)
-           + ac->num_acks * sizeof(struct TransportCummulativeAckPayloadP));
-  ack->ack_counter = htonl (ac->ack_counter += ac->num_acks);
-  ap = (struct TransportCummulativeAckPayloadP *) &ack[1];
-  for (unsigned int i = 0; i < ac->num_acks; i++)
-  {
-    ap[i].ack_uuid = ac->ack_uuids[i].ack_uuid;
-    ap[i].ack_delay = GNUNET_TIME_relative_hton (
-      GNUNET_TIME_absolute_get_duration (ac->ack_uuids[i].receive_time));
-  }
-  /*route_control_message_without_fc (
-    &ac->target,
-    &ack->header,
-    RMO_DV_ALLOWED);*/
-  vl = lookup_virtual_link (&ac->target);
-  if ((NULL != vl) && (GNUNET_YES == vl->confirmed))
-  {
-    route_control_message_without_fc (
-      vl,
-      &ack->header,
-      RMO_DV_ALLOWED);
-  }
-  else
-  {
-    /* Use route via neighbour */
-    n = lookup_neighbour (&ac->target);
-    if (NULL != n)
-      route_via_neighbour (
-        n,
-        &ack->header,
-        RMO_NONE);
-  }
-  ac->num_acks = 0;
-  ac->task = GNUNET_SCHEDULER_add_delayed (ACK_CUMMULATOR_TIMEOUT,
-                                           &destroy_ack_cummulator,
-                                           ac);
-}
-
-
-/**
- * Transmit an acknowledgement for @a ack_uuid to @a pid delaying
- * transmission by at most @a ack_delay.
- *
- * @param pid target peer
- * @param ack_uuid UUID to ack
- * @param max_delay how long can the ACK wait
- */
-static void
-cummulative_ack (const struct GNUNET_PeerIdentity *pid,
-                 const struct AcknowledgementUUIDP *ack_uuid,
-                 struct GNUNET_TIME_Absolute max_delay)
-{
-  struct AcknowledgementCummulator *ac;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Scheduling ACK %s for transmission to %s\n",
-              GNUNET_uuid2s (&ack_uuid->value),
-              GNUNET_i2s (pid));
-  ac = GNUNET_CONTAINER_multipeermap_get (ack_cummulators, pid);
-  if (NULL == ac)
-  {
-    ac = GNUNET_new (struct AcknowledgementCummulator);
-    ac->target = *pid;
-    ac->min_transmission_time = max_delay;
-    GNUNET_assert (GNUNET_YES ==
-                   GNUNET_CONTAINER_multipeermap_put (
-                     ack_cummulators,
-                     &ac->target,
-                     ac,
-                     GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
-  }
-  else
-  {
-    if (MAX_CUMMULATIVE_ACKS == ac->num_acks)
-    {
-      /* must run immediately, ack buffer full! */
-      transmit_cummulative_ack_cb (ac);
-    }
-    GNUNET_SCHEDULER_cancel (ac->task);
-    ac->min_transmission_time =
-      GNUNET_TIME_absolute_min (ac->min_transmission_time, max_delay);
-  }
-  GNUNET_assert (ac->num_acks < MAX_CUMMULATIVE_ACKS);
-  ac->ack_uuids[ac->num_acks].receive_time = GNUNET_TIME_absolute_get ();
-  ac->ack_uuids[ac->num_acks].ack_uuid = *ack_uuid;
-  ac->num_acks++;
-  ac->task = GNUNET_SCHEDULER_add_at (ac->min_transmission_time,
-                                      &transmit_cummulative_ack_cb,
-                                      ac);
-}
-
-
-/**
- * Closure for #find_by_message_uuid.
- */
-struct FindByMessageUuidContext
-{
-  /**
-   * UUID to look for.
-   */
-  struct MessageUUIDP message_uuid;
-
-  /**
-   * Set to the reassembly context if found.
-   */
-  struct ReassemblyContext *rc;
-};
-
-
-/**
- * Iterator called to find a reassembly context by the message UUID in the
- * multihashmap32.
- *
- * @param cls a `struct FindByMessageUuidContext`
- * @param key a key (unused)
- * @param value a `struct ReassemblyContext`
- * @return #GNUNET_YES if not found, #GNUNET_NO if found
- */
-static int
-find_by_message_uuid (void *cls, uint32_t key, void *value)
-{
-  struct FindByMessageUuidContext *fc = cls;
-  struct ReassemblyContext *rc = value;
-
-  (void) key;
-  if (0 == GNUNET_memcmp (&fc->message_uuid, &rc->msg_uuid))
-  {
-    fc->rc = rc;
-    return GNUNET_NO;
-  }
-  return GNUNET_YES;
-}
-
-
-/**
- * Communicator gave us a fragment.  Process the request.
- *
- * @param cls a `struct CommunicatorMessageContext` (must call
- * #finish_cmc_handling() when done)
- * @param fb the message that was received
- */
-static void
-handle_fragment_box (void *cls, const struct TransportFragmentBoxMessage *fb)
-{
-  struct CommunicatorMessageContext *cmc = cls;
-  struct VirtualLink *vl;
-  struct ReassemblyContext *rc;
-  const struct GNUNET_MessageHeader *msg;
-  uint16_t msize;
-  uint16_t fsize;
-  uint16_t frag_off;
-  char *target;
-  struct GNUNET_TIME_Relative cdelay;
-  struct FindByMessageUuidContext fc;
-
-  vl = lookup_virtual_link (&cmc->im.sender);
-  if ((NULL == vl) || (GNUNET_NO == vl->confirmed))
-  {
-    struct GNUNET_SERVICE_Client *client = cmc->tc->client;
-
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "No virtual link for %s to handle fragment\n",
-                GNUNET_i2s (&cmc->im.sender));
-    GNUNET_break (0);
-    finish_cmc_handling (cmc);
-    GNUNET_SERVICE_client_drop (client);
-    return;
-  }
-  if (NULL == vl->reassembly_map)
-  {
-    vl->reassembly_map = GNUNET_CONTAINER_multihashmap32_create (8);
-    vl->reassembly_heap =
-      GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
-    vl->reassembly_timeout_task =
-      GNUNET_SCHEDULER_add_delayed (REASSEMBLY_EXPIRATION,
-                                    &reassembly_cleanup_task,
-                                    vl);
-  }
-  msize = ntohs (fb->msg_size);
-  fc.message_uuid = fb->msg_uuid;
-  fc.rc = NULL;
-  (void) GNUNET_CONTAINER_multihashmap32_get_multiple (vl->reassembly_map,
-                                                       fb->msg_uuid.uuid,
-                                                       &find_by_message_uuid,
-                                                       &fc);
-  fsize = ntohs (fb->header.size) - sizeof(*fb);
-  if (NULL == (rc = fc.rc))
-  {
-    rc = GNUNET_malloc (sizeof(*rc) + msize    /* reassembly payload buffer */
-                        + (msize + 7) / 8 * sizeof(uint8_t) /* bitfield */);
-    rc->msg_uuid = fb->msg_uuid;
-    rc->virtual_link = vl;
-    rc->msg_size = msize;
-    rc->reassembly_timeout =
-      GNUNET_TIME_relative_to_absolute (REASSEMBLY_EXPIRATION);
-    rc->last_frag = GNUNET_TIME_absolute_get ();
-    rc->hn = GNUNET_CONTAINER_heap_insert (vl->reassembly_heap,
-                                           rc,
-                                           rc->reassembly_timeout.abs_value_us);
-    GNUNET_assert (GNUNET_OK ==
-                   GNUNET_CONTAINER_multihashmap32_put (
-                     vl->reassembly_map,
-                     rc->msg_uuid.uuid,
-                     rc,
-                     GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
-    target = (char *) &rc[1];
-    rc->bitfield = (uint8_t *) (target + rc->msg_size);
-    if (fsize != rc->msg_size)
-      rc->msg_missing = rc->msg_size;
-    else
-      rc->msg_missing = 0;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Received fragment with size %u at offset %u/%u %u bytes missing from %s for NEW message %u\n",
-                fsize,
-                ntohs (fb->frag_off),
-                msize,
-                rc->msg_missing,
-                GNUNET_i2s (&cmc->im.sender),
-                (unsigned int) fb->msg_uuid.uuid);
-  }
-  else
-  {
-    target = (char *) &rc[1];
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Received fragment at offset %u/%u from %s for message %u\n",
-                ntohs (fb->frag_off),
-                msize,
-                GNUNET_i2s (&cmc->im.sender),
-                (unsigned int) fb->msg_uuid.uuid);
-  }
-  if (msize != rc->msg_size)
-  {
-    GNUNET_break (0);
-    finish_cmc_handling (cmc);
-    return;
-  }
-
-  /* reassemble */
-  if (0 == fsize)
-  {
-    GNUNET_break (0);
-    finish_cmc_handling (cmc);
-    return;
-  }
-  frag_off = ntohs (fb->frag_off);
-  if (frag_off + fsize > msize)
-  {
-    /* Fragment (plus fragment size) exceeds message size! */
-    GNUNET_break_op (0);
-    finish_cmc_handling (cmc);
-    return;
-  }
-  memcpy (&target[frag_off], &fb[1], fsize);
-  /* update bitfield and msg_missing */
-  for (unsigned int i = frag_off; i < frag_off + fsize; i++)
-  {
-    if (0 == (rc->bitfield[i / 8] & (1 << (i % 8))))
-    {
-      rc->bitfield[i / 8] |= (1 << (i % 8));
-      rc->msg_missing--;
-    }
-  }
-
-  /* Compute cumulative ACK */
-  cdelay = GNUNET_TIME_absolute_get_duration (rc->last_frag);
-  cdelay = GNUNET_TIME_relative_multiply (cdelay, rc->msg_missing / fsize);
-  if (0 == rc->msg_missing)
-    cdelay = GNUNET_TIME_UNIT_ZERO;
-  cummulative_ack (&cmc->im.sender,
-                   &fb->ack_uuid,
-                   GNUNET_TIME_relative_to_absolute (cdelay));
-  rc->last_frag = GNUNET_TIME_absolute_get ();
-  /* is reassembly complete? */
-  if (0 != rc->msg_missing)
-  {
-    finish_cmc_handling (cmc);
-    return;
-  }
-  /* reassembly is complete, verify result */
-  msg = (const struct GNUNET_MessageHeader *) &rc[1];
-  if (ntohs (msg->size) != rc->msg_size)
-  {
-    GNUNET_break (0);
-    free_reassembly_context (rc);
-    finish_cmc_handling (cmc);
-    return;
-  }
-  /* successful reassembly */
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Fragment reassembly complete for message %u\n",
-              (unsigned int) fb->msg_uuid.uuid);
-  /* FIXME: check that the resulting msg is NOT a
-     DV Box or Reliability Box, as that is NOT allowed! */
-  demultiplex_with_cmc (cmc, msg);
-  /* FIXME-OPTIMIZE: really free here? Might be bad if fragments are still
-     en-route and we forget that we finished this reassembly immediately!
-     -> keep around until timeout?
-     -> shorten timeout based on ACK? */
-  free_reassembly_context (rc);
-}
-
-
-/**
- * Communicator gave us a reliability box.  Check the message.
- *
- * @param cls a `struct CommunicatorMessageContext`
- * @param rb the send message that was sent
- * @return #GNUNET_YES if message is well-formed
- */
-static int
-check_reliability_box (void *cls,
-                       const struct TransportReliabilityBoxMessage *rb)
-{
-  (void) cls;
-  const struct GNUNET_MessageHeader *inbox =  (const struct
-                                               GNUNET_MessageHeader *) &rb[1];
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "check_send_msg with size %u: inner msg type %u and size %u (%u %u)\n",
-              ntohs (rb->header.size),
-              ntohs (inbox->type),
-              ntohs (inbox->size),
-              sizeof (struct TransportReliabilityBoxMessage),
-              sizeof (struct GNUNET_MessageHeader));
-  GNUNET_MQ_check_boxed_message (rb);
-  return GNUNET_YES;
-}
-
-
-/**
- * Communicator gave us a reliability box.  Process the request.
- *
- * @param cls a `struct CommunicatorMessageContext` (must call
- * #finish_cmc_handling() when done)
- * @param rb the message that was received
- */
-static void
-handle_reliability_box (void *cls,
-                        const struct TransportReliabilityBoxMessage *rb)
-{
-  struct CommunicatorMessageContext *cmc = cls;
-  const struct GNUNET_MessageHeader *inbox =
-    (const struct GNUNET_MessageHeader *) &rb[1];
-  struct GNUNET_TIME_Relative rtt;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received reliability box from %s with UUID %s of type %u\n",
-              GNUNET_i2s (&cmc->im.sender),
-              GNUNET_uuid2s (&rb->ack_uuid.value),
-              (unsigned int) ntohs (inbox->type));
-  rtt = GNUNET_TIME_UNIT_SECONDS; /* FIXME: should base this on "RTT", but we
-                                     do not really have an RTT for the
-                                   * incoming* queue (should we have
-                                     the sender add it to the rb message?) */
-  cummulative_ack (
-    &cmc->im.sender,
-    &rb->ack_uuid,
-    (0 == ntohl (rb->ack_countdown))
-    ? GNUNET_TIME_UNIT_ZERO_ABS
-    : GNUNET_TIME_relative_to_absolute (
-      GNUNET_TIME_relative_divide (rtt, 8 /* FIXME: magic constant */)));
-  /* continue with inner message */
-  /* FIXME: check that inbox is NOT a DV Box, fragment or another
-     reliability box (not allowed!) */
-  demultiplex_with_cmc (cmc, inbox);
-}
-
-
-/**
- * Check if we have advanced to another age since the last time.  If
- * so, purge ancient statistics (more than GOODPUT_AGING_SLOTS before
- * the current age)
- *
- * @param pd[in,out] data to update
- * @param age current age
- */
-static void
-update_pd_age (struct PerformanceData *pd, unsigned int age)
-{
-  unsigned int sage;
-
-  if (age == pd->last_age)
-    return; /* nothing to do */
-  sage = GNUNET_MAX (pd->last_age, age - 2 * GOODPUT_AGING_SLOTS);
-  for (unsigned int i = sage; i <= age - GOODPUT_AGING_SLOTS; i++)
-  {
-    struct TransmissionHistoryEntry *the = &pd->the[i % GOODPUT_AGING_SLOTS];
-
-    the->bytes_sent = 0;
-    the->bytes_received = 0;
-  }
-  pd->last_age = age;
-}
-
-
-/**
- * Update @a pd based on the latest @a rtt and the number of bytes
- * that were confirmed to be successfully transmitted.
- *
- * @param pd[in,out] data to update
- * @param rtt latest round-trip time
- * @param bytes_transmitted_ok number of bytes receiver confirmed as received
- */
-static void
-update_performance_data (struct PerformanceData *pd,
-                         struct GNUNET_TIME_Relative rtt,
-                         uint16_t bytes_transmitted_ok)
-{
-  uint64_t nval = rtt.rel_value_us;
-  uint64_t oval = pd->aged_rtt.rel_value_us;
-  unsigned int age = get_age ();
-  struct TransmissionHistoryEntry *the = &pd->the[age % GOODPUT_AGING_SLOTS];
-
-  if (oval == GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us)
-    pd->aged_rtt = rtt;
-  else
-    pd->aged_rtt.rel_value_us = (nval + 7 * oval) / 8;
-  update_pd_age (pd, age);
-  the->bytes_received += bytes_transmitted_ok;
-}
-
-
-/**
- * We have successfully transmitted data via @a q, update metrics.
- *
- * @param q queue to update
- * @param rtt round trip time observed
- * @param bytes_transmitted_ok number of bytes successfully transmitted
- */
-static void
-update_queue_performance (struct Queue *q,
-                          struct GNUNET_TIME_Relative rtt,
-                          uint16_t bytes_transmitted_ok)
-{
-  update_performance_data (&q->pd, rtt, bytes_transmitted_ok);
-}
-
-
-/**
- * We have successfully transmitted data via @a dvh, update metrics.
- *
- * @param dvh distance vector path data to update
- * @param rtt round trip time observed
- * @param bytes_transmitted_ok number of bytes successfully transmitted
- */
-static void
-update_dvh_performance (struct DistanceVectorHop *dvh,
-                        struct GNUNET_TIME_Relative rtt,
-                        uint16_t bytes_transmitted_ok)
-{
-  update_performance_data (&dvh->pd, rtt, bytes_transmitted_ok);
-}
-
-
-/**
- * We have completed transmission of @a pm, remove it from
- * the transmission queues (and if it is a fragment, continue
- * up the tree as necessary).
- *
- * @param pm pending message that was transmitted
- */
-static void
-completed_pending_message (struct PendingMessage *pm)
-{
-  struct PendingMessage *pos;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Complete transmission of message %llu %u\n",
-              pm->logging_uuid,
-              pm->pmt);
-  switch (pm->pmt)
-  {
-  case PMT_CORE:
-  case PMT_RELIABILITY_BOX:
-    /* Full message sent, we are done */
-    client_send_response (pm);
-    return;
-
-  case PMT_FRAGMENT_BOX:
-    /* Fragment sent over reliable channel */
-    pos = pm->frag_parent;
-    GNUNET_CONTAINER_MDLL_remove (frag, pos->head_frag, pos->tail_frag, pm);
-    free_pending_message (pm);
-    /* check if subtree is done */
-    while ((NULL == pos->head_frag) && (pos->frag_off == pos->bytes_msg) &&
-           (NULL != pos->frag_parent))
-    {
-      pm = pos;
-      pos = pm->frag_parent;
-      if ((NULL == pos) && (PMT_DV_BOX == pm->pmt))
-      {
-        client_send_response (pm);
-        return;
-      }
-      else if (PMT_DV_BOX == pm->pmt)
-      {
-        client_send_response (pos);
-        return;
-      }
-      GNUNET_CONTAINER_MDLL_remove (frag, pos->head_frag, pos->tail_frag, pm);
-      free_pending_message (pm);
-    }
-
-    /* Was this the last applicable fragment? */
-    if ((NULL == pos->head_frag) && (NULL == pos->frag_parent) &&
-        (pos->frag_off == pos->bytes_msg))
-      client_send_response (pos);
-    return;
-
-  case PMT_DV_BOX:
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Completed transmission of message %llu (DV Box)\n",
-                pm->logging_uuid);
-    if (NULL != pm->frag_parent)
-    {
-      if (NULL != pm->bpm)
-      {
-        GNUNET_free (pm->bpm);
-      }
-      client_send_response (pm->frag_parent);
-    }
-    else
-      client_send_response (pm);
-    return;
-  }
-}
-
-
-/**
- * The @a pa was acknowledged, process the acknowledgement.
- *
- * @param pa the pending acknowledgement that was satisfied
- * @param ack_delay artificial delay from cumulative acks created by the
- * other peer
- */
-static void
-handle_acknowledged (struct PendingAcknowledgement *pa,
-                     struct GNUNET_TIME_Relative ack_delay)
-{
-  struct GNUNET_TIME_Relative delay;
-
-  delay = GNUNET_TIME_absolute_get_duration (pa->transmission_time);
-  if (delay.rel_value_us > ack_delay.rel_value_us)
-    delay = GNUNET_TIME_UNIT_ZERO;
-  else
-    delay = GNUNET_TIME_relative_subtract (delay, ack_delay);
-  if (NULL != pa->queue)
-    update_queue_performance (pa->queue, delay, pa->message_size);
-  if (NULL != pa->dvh)
-    update_dvh_performance (pa->dvh, delay, pa->message_size);
-  if (NULL != pa->pm)
-    completed_pending_message (pa->pm);
-  free_pending_acknowledgement (pa);
-}
-
-
-/**
- * Communicator gave us a reliability ack.  Check it is well-formed.
- *
- * @param cls a `struct CommunicatorMessageContext` (unused)
- * @param ra the message that was received
- * @return #GNUNET_Ok if @a ra is well-formed
- */
-static int
-check_reliability_ack (void *cls,
-                       const struct TransportReliabilityAckMessage *ra)
-{
-  unsigned int n_acks;
-
-  (void) cls;
-  n_acks = (ntohs (ra->header.size) - sizeof(*ra))
-           / sizeof(struct TransportCummulativeAckPayloadP);
-  if (0 == n_acks)
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  if ((ntohs (ra->header.size) - sizeof(*ra)) !=
-      n_acks * sizeof(struct TransportCummulativeAckPayloadP))
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Communicator gave us a reliability ack.  Process the request.
- *
- * @param cls a `struct CommunicatorMessageContext` (must call
- * #finish_cmc_handling() when done)
- * @param ra the message that was received
- */
-static void
-handle_reliability_ack (void *cls,
-                        const struct TransportReliabilityAckMessage *ra)
-{
-  struct CommunicatorMessageContext *cmc = cls;
-  const struct TransportCummulativeAckPayloadP *ack;
-  unsigned int n_acks;
-  uint32_t ack_counter;
-
-  n_acks = (ntohs (ra->header.size) - sizeof(*ra))
-           / sizeof(struct TransportCummulativeAckPayloadP);
-  ack = (const struct TransportCummulativeAckPayloadP *) &ra[1];
-  for (unsigned int i = 0; i < n_acks; i++)
-  {
-    struct PendingAcknowledgement *pa =
-      GNUNET_CONTAINER_multiuuidmap_get (pending_acks, &ack[i].ack_uuid.value);
-    if (NULL == pa)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Received ACK from %s with UUID %s which is unknown to us!\n",
-                  GNUNET_i2s (&cmc->im.sender),
-                  GNUNET_uuid2s (&ack[i].ack_uuid.value));
-      GNUNET_STATISTICS_update (
-        GST_stats,
-        "# FRAGMENT_ACKS dropped, no matching pending message",
-        1,
-        GNUNET_NO);
-      continue;
-    }
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Received ACK from %s with UUID %s\n",
-                GNUNET_i2s (&cmc->im.sender),
-                GNUNET_uuid2s (&ack[i].ack_uuid.value));
-    handle_acknowledged (pa, GNUNET_TIME_relative_ntoh (ack[i].ack_delay));
-  }
-
-  ack_counter = htonl (ra->ack_counter);
-  (void) ack_counter;  /* silence compiler warning for now */
-  // FIXME-OPTIMIZE: track ACK losses based on ack_counter somewhere!
-  // (DV and/or Neighbour?)
-  finish_cmc_handling (cmc);
-}
-
-
-/**
- * Communicator gave us a backchannel encapsulation.  Check the message.
- *
- * @param cls a `struct CommunicatorMessageContext`
- * @param be the send message that was sent
- * @return #GNUNET_YES if message is well-formed
- */
-static int
-check_backchannel_encapsulation (
-  void *cls,
-  const struct TransportBackchannelEncapsulationMessage *be)
-{
-  uint16_t size = ntohs (be->header.size) - sizeof(*be);
-  const struct GNUNET_MessageHeader *inbox =
-    (const struct GNUNET_MessageHeader *) &be[1];
-  const char *is;
-  uint16_t isize;
-
-  (void) cls;
-  if (ntohs (inbox->size) >= size)
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  isize = ntohs (inbox->size);
-  is = ((const char *) inbox) + isize;
-  size -= isize;
-  if ('\0' != is[size - 1])
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_YES;
-}
-
-
-/**
- * Communicator gave us a backchannel encapsulation.  Process the request.
- * (We are the destination of the backchannel here.)
- *
- * @param cls a `struct CommunicatorMessageContext` (must call
- * #finish_cmc_handling() when done)
- * @param be the message that was received
- */
-static void
-handle_backchannel_encapsulation (
-  void *cls,
-  const struct TransportBackchannelEncapsulationMessage *be)
-{
-  struct CommunicatorMessageContext *cmc = cls;
-  struct GNUNET_TRANSPORT_CommunicatorBackchannelIncoming *cbi;
-  struct GNUNET_MQ_Envelope *env;
-  struct TransportClient *tc;
-  const struct GNUNET_MessageHeader *inbox =
-    (const struct GNUNET_MessageHeader *) &be[1];
-  uint16_t isize = ntohs (inbox->size);
-  const char *target_communicator = ((const char *) inbox) + isize;
-  char *sender;
-  char *self;
-
-  GNUNET_asprintf (&sender,
-                   "%s",
-                   GNUNET_i2s (&cmc->im.sender));
-  GNUNET_asprintf (&self,
-                   "%s",
-                   GNUNET_i2s (&GST_my_identity));
-
-  /* Find client providing this communicator */
-  for (tc = clients_head; NULL != tc; tc = tc->next)
-    if ((CT_COMMUNICATOR == tc->type) &&
-        (0 ==
-         strcmp (tc->details.communicator.address_prefix, target_communicator)))
-      break;
-  if (NULL == tc)
-  {
-    char *stastr;
-
-    GNUNET_asprintf (
-      &stastr,
-      "# Backchannel message dropped: target communicator `%s' unknown",
-      target_communicator);
-    GNUNET_STATISTICS_update (GST_stats, stastr, 1, GNUNET_NO);
-    GNUNET_free (stastr);
-    finish_cmc_handling (cmc);
-    return;
-  }
-  /* Finally, deliver backchannel message to communicator */
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Delivering backchannel message from %s to %s of type %u to %s\n",
-              sender,
-              self,
-              ntohs (inbox->type),
-              target_communicator);
-  env = GNUNET_MQ_msg_extra (
-    cbi,
-    isize,
-    GNUNET_MESSAGE_TYPE_TRANSPORT_COMMUNICATOR_BACKCHANNEL_INCOMING);
-  cbi->pid = cmc->im.sender;
-  memcpy (&cbi[1], inbox, isize);
-  GNUNET_MQ_send (tc->mq, env);
-  finish_cmc_handling (cmc);
-}
-
-
-/**
- * Task called when we should check if any of the DV paths
- * we have learned to a target are due for garbage collection.
- *
- * Collects stale paths, and possibly frees the entire DV
- * entry if no paths are left. Otherwise re-schedules itself.
- *
- * @param cls a `struct DistanceVector`
- */
-static void
-path_cleanup_cb (void *cls)
-{
-  struct DistanceVector *dv = cls;
-  struct DistanceVectorHop *pos;
-
-  dv->timeout_task = NULL;
-  while (NULL != (pos = dv->dv_head))
-  {
-    GNUNET_assert (dv == pos->dv);
-    if (GNUNET_TIME_absolute_get_remaining (pos->timeout).rel_value_us > 0)
-      break;
-    free_distance_vector_hop (pos);
-  }
-  if (NULL == pos)
-  {
-    free_dv_route (dv);
-    return;
-  }
-  dv->timeout_task =
-    GNUNET_SCHEDULER_add_at (pos->timeout, &path_cleanup_cb, dv);
-}
-
-
-/**
- * The @a hop is a validated path to the respective target
- * peer and we should tell core about it -- and schedule
- * a job to revoke the state.
- *
- * @param hop a path to some peer that is the reason for activation
- */
-static void
-activate_core_visible_dv_path (struct DistanceVectorHop *hop)
-{
-  struct DistanceVector *dv = hop->dv;
-  struct VirtualLink *vl;
-
-  vl = lookup_virtual_link (&dv->target);
-  if (NULL == vl)
-  {
-
-    vl = GNUNET_new (struct VirtualLink);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Creating new virtual link %p to %s using DV!\n",
-                vl,
-                GNUNET_i2s (&dv->target));
-    vl->confirmed = GNUNET_YES;
-    vl->message_uuid_ctr =
-      GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, UINT64_MAX);
-    vl->target = dv->target;
-    vl->core_recv_window = RECV_WINDOW_SIZE;
-    vl->available_fc_window_size = DEFAULT_WINDOW_SIZE;
-    vl->incoming_fc_window_size = DEFAULT_WINDOW_SIZE;
-    GNUNET_break (GNUNET_YES ==
-                  GNUNET_CONTAINER_multipeermap_put (
-                    links,
-                    &vl->target,
-                    vl,
-                    GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
-    vl->dv = dv;
-    dv->vl = vl;
-    vl->visibility_task =
-      GNUNET_SCHEDULER_add_at (hop->path_valid_until, &check_link_down, vl);
-    consider_sending_fc (vl);
-    /* We lacked a confirmed connection to the target
-       before, so tell CORE about it (finally!) */
-    cores_send_connect_info (&dv->target);
-  }
-  else
-  {
-    /* Link was already up, remember dv is also now available and we are done */
-    vl->dv = dv;
-    dv->vl = vl;
-    if (GNUNET_NO == vl->confirmed)
-    {
-      vl->confirmed = GNUNET_YES;
-      vl->visibility_task =
-        GNUNET_SCHEDULER_add_at (hop->path_valid_until, &check_link_down, vl);
-      consider_sending_fc (vl);
-      /* We lacked a confirmed connection to the target
-         before, so tell CORE about it (finally!) */
-      cores_send_connect_info (&dv->target);
-    }
-    else
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Virtual link to %s could now also use DV!\n",
-                  GNUNET_i2s (&dv->target));
-  }
-}
-
-
-/**
- * We have learned a @a path through the network to some other peer, add it to
- * our DV data structure (returning #GNUNET_YES on success).
- *
- * We do not add paths if we have a sufficient number of shorter
- * paths to this target already (returning #GNUNET_NO).
- *
- * We also do not add problematic paths, like those where we lack the first
- * hop in our neighbour list (i.e. due to a topology change) or where some
- * non-first hop is in our neighbour list (returning #GNUNET_SYSERR).
- *
- * @param path the path we learned, path[0] should be us,
- *             and then path contains a valid path from us to
- * `path[path_len-1]` path[1] should be a direct neighbour (we should check!)
- * @param path_len number of entries on the @a path, at least three!
- * @param network_latency how long does the message take from us to
- * `path[path_len-1]`? set to "forever" if unknown
- * @param path_valid_until how long is this path considered validated? Maybe
- * be zero.
- * @return #GNUNET_YES on success,
- *         #GNUNET_NO if we have better path(s) to the target
- *         #GNUNET_SYSERR if the path is useless and/or invalid
- *                         (i.e. path[1] not a direct neighbour
- *                        or path[i+1] is a direct neighbour for i>0)
- */
-static int
-learn_dv_path (const struct GNUNET_PeerIdentity *path,
-               unsigned int path_len,
-               struct GNUNET_TIME_Relative network_latency,
-               struct GNUNET_TIME_Absolute path_valid_until)
-{
-  struct DistanceVectorHop *hop;
-  struct DistanceVector *dv;
-  struct Neighbour *next_hop;
-  unsigned int shorter_distance;
-
-  if (path_len < 3)
-  {
-    /* what a boring path! not allowed! */
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_assert (0 == GNUNET_memcmp (&GST_my_identity, &path[0]));
-  next_hop = lookup_neighbour (&path[1]);
-  if (NULL == next_hop)
-  {
-    /* next hop must be a neighbour, otherwise this whole thing is useless! */
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  for (unsigned int i = 2; i < path_len; i++)
-    if (NULL != lookup_neighbour (&path[i]))
-    {
-      /* Useless path: we have a direct connection to some hop
-         in the middle of the path, so this one is not even
-         terribly useful for redundancy */
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Path of %u hops useless: directly link to hop %u (%s)\n",
-                  path_len,
-                  i,
-                  GNUNET_i2s (&path[i]));
-      GNUNET_STATISTICS_update (GST_stats,
-                                "# Useless DV path ignored: hop is neighbour",
-                                1,
-                                GNUNET_NO);
-      return GNUNET_SYSERR;
-    }
-  dv = GNUNET_CONTAINER_multipeermap_get (dv_routes, &path[path_len - 1]);
-  if (NULL == dv)
-  {
-    dv = GNUNET_new (struct DistanceVector);
-    dv->target = path[path_len - 1];
-    dv->timeout_task = GNUNET_SCHEDULER_add_delayed (DV_PATH_VALIDITY_TIMEOUT,
-                                                     &path_cleanup_cb,
-                                                     dv);
-    GNUNET_assert (GNUNET_OK ==
-                   GNUNET_CONTAINER_multipeermap_put (
-                     dv_routes,
-                     &dv->target,
-                     dv,
-                     GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
-  }
-  /* Check if we have this path already! */
-  shorter_distance = 0;
-  for (struct DistanceVectorHop *pos = dv->dv_head; NULL != pos;
-       pos = pos->next_dv)
-  {
-    if (pos->distance < path_len - 3)
-      shorter_distance++;
-    /* Note that the distances in 'pos' excludes us (path[0]),
-       the next_hop (path[1]) and the target so we need to subtract three
-       and check next_hop explicitly */
-    if ((pos->distance == path_len - 3) && (pos->next_hop == next_hop))
-    {
-      int match = GNUNET_YES;
-
-      for (unsigned int i = 0; i < pos->distance; i++)
-      {
-        if (0 != GNUNET_memcmp (&pos->path[i], &path[i + 2]))
-        {
-          match = GNUNET_NO;
-          break;
-        }
-      }
-      if (GNUNET_YES == match)
-      {
-        struct GNUNET_TIME_Relative last_timeout;
-
-        /* Re-discovered known path, update timeout */
-        GNUNET_STATISTICS_update (GST_stats,
-                                  "# Known DV path refreshed",
-                                  1,
-                                  GNUNET_NO);
-        last_timeout = GNUNET_TIME_absolute_get_remaining (pos->timeout);
-        pos->timeout =
-          GNUNET_TIME_relative_to_absolute (DV_PATH_VALIDITY_TIMEOUT);
-        pos->path_valid_until =
-          GNUNET_TIME_absolute_max (pos->path_valid_until, path_valid_until);
-        GNUNET_CONTAINER_MDLL_remove (dv, dv->dv_head, dv->dv_tail, pos);
-        GNUNET_CONTAINER_MDLL_insert (dv, dv->dv_head, dv->dv_tail, pos);
-        if (0 <
-            GNUNET_TIME_absolute_get_remaining (path_valid_until).rel_value_us)
-          activate_core_visible_dv_path (pos);
-        if (last_timeout.rel_value_us <
-            GNUNET_TIME_relative_subtract (DV_PATH_VALIDITY_TIMEOUT,
-                                           DV_PATH_DISCOVERY_FREQUENCY)
-            .rel_value_us)
-        {
-          /* Some peer send DV learn messages too often, we are learning
-             the same path faster than it would be useful; do not forward! */
-          GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                      "Rediscovered path too quickly, not forwarding further\n");
-          return GNUNET_NO;
-        }
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                    "Refreshed known path to %s valid until %s, forwarding further\n",
-                    GNUNET_i2s (&dv->target),
-                    GNUNET_STRINGS_absolute_time_to_string (
-                      pos->path_valid_until));
-        return GNUNET_YES;
-      }
-    }
-  }
-  /* Count how many shorter paths we have (incl. direct
-     neighbours) before simply giving up on this one! */
-  if (shorter_distance >= MAX_DV_PATHS_TO_TARGET)
-  {
-    /* We have a shorter path already! */
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Have many shorter DV paths %s, not forwarding further\n",
-                GNUNET_i2s (&dv->target));
-    return GNUNET_NO;
-  }
-  /* create new DV path entry */
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Discovered new DV path to %s valid until %s\n",
-              GNUNET_i2s (&dv->target),
-              GNUNET_STRINGS_absolute_time_to_string (path_valid_until));
-  hop = GNUNET_malloc (sizeof(struct DistanceVectorHop)
-                       + sizeof(struct GNUNET_PeerIdentity) * (path_len - 3));
-  hop->next_hop = next_hop;
-  hop->dv = dv;
-  hop->path = (const struct GNUNET_PeerIdentity *) &hop[1];
-  memcpy (&hop[1],
-          &path[2],
-          sizeof(struct GNUNET_PeerIdentity) * (path_len - 3));
-  hop->timeout = GNUNET_TIME_relative_to_absolute (DV_PATH_VALIDITY_TIMEOUT);
-  hop->path_valid_until = path_valid_until;
-  hop->distance = path_len - 3;
-  hop->pd.aged_rtt = network_latency;
-  GNUNET_CONTAINER_MDLL_insert (dv, dv->dv_head, dv->dv_tail, hop);
-  GNUNET_CONTAINER_MDLL_insert (neighbour,
-                                next_hop->dv_head,
-                                next_hop->dv_tail,
-                                hop);
-  if (0 < GNUNET_TIME_absolute_get_remaining (path_valid_until).rel_value_us)
-    activate_core_visible_dv_path (hop);
-  return GNUNET_YES;
-}
-
-
-/**
- * Communicator gave us a DV learn message.  Check the message.
- *
- * @param cls a `struct CommunicatorMessageContext`
- * @param dvl the send message that was sent
- * @return #GNUNET_YES if message is well-formed
- */
-static int
-check_dv_learn (void *cls, const struct TransportDVLearnMessage *dvl)
-{
-  uint16_t size = ntohs (dvl->header.size);
-  uint16_t num_hops = ntohs (dvl->num_hops);
-  const struct DVPathEntryP *hops = (const struct DVPathEntryP *) &dvl[1];
-
-  (void) cls;
-  if (size != sizeof(*dvl) + num_hops * sizeof(struct DVPathEntryP))
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  if (num_hops > MAX_DV_HOPS_ALLOWED)
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  for (unsigned int i = 0; i < num_hops; i++)
-  {
-    if (0 == GNUNET_memcmp (&dvl->initiator, &hops[i].hop))
-    {
-      GNUNET_break_op (0);
-      return GNUNET_SYSERR;
-    }
-    if (0 == GNUNET_memcmp (&GST_my_identity, &hops[i].hop))
-    {
-      GNUNET_break_op (0);
-      return GNUNET_SYSERR;
-    }
-  }
-  return GNUNET_YES;
-}
-
-
-/**
- * Build and forward a DV learn message to @a next_hop.
- *
- * @param next_hop peer to send the message to
- * @param msg message received
- * @param bi_history bitmask specifying hops on path that were bidirectional
- * @param nhops length of the @a hops array
- * @param hops path the message traversed so far
- * @param in_time when did we receive the message, used to calculate network
- * delay
- */
-static void
-forward_dv_learn (const struct GNUNET_PeerIdentity *next_hop,
-                  const struct TransportDVLearnMessage *msg,
-                  uint16_t bi_history,
-                  uint16_t nhops,
-                  const struct DVPathEntryP *hops,
-                  struct GNUNET_TIME_Absolute in_time)
-{
-  struct Neighbour *n;
-  struct VirtualLink *vl;
-  struct DVPathEntryP *dhops;
-  char buf[sizeof(struct TransportDVLearnMessage)
-           + (nhops + 1) * sizeof(struct DVPathEntryP)] GNUNET_ALIGN;
-  struct TransportDVLearnMessage *fwd = (struct TransportDVLearnMessage *) buf;
-  struct GNUNET_TIME_Relative nnd;
-
-  /* compute message for forwarding */
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Forwarding DV learn message originating from %s to %s\n",
-              GNUNET_i2s (&msg->initiator),
-              GNUNET_i2s2 (next_hop));
-  GNUNET_assert (nhops < MAX_DV_HOPS_ALLOWED);
-  fwd->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_DV_LEARN);
-  fwd->header.size = htons (sizeof(struct TransportDVLearnMessage)
-                            + (nhops + 1) * sizeof(struct DVPathEntryP));
-  fwd->num_hops = htons (nhops + 1);
-  fwd->bidirectional = htons (bi_history);
-  nnd = GNUNET_TIME_relative_add (GNUNET_TIME_absolute_get_duration (in_time),
-                                  GNUNET_TIME_relative_ntoh (
-                                    msg->non_network_delay));
-  fwd->non_network_delay = GNUNET_TIME_relative_hton (nnd);
-  fwd->init_sig = msg->init_sig;
-  fwd->initiator = msg->initiator;
-  fwd->challenge = msg->challenge;
-  fwd->monotonic_time = msg->monotonic_time;
-  dhops = (struct DVPathEntryP *) &fwd[1];
-  GNUNET_memcpy (dhops, hops, sizeof(struct DVPathEntryP) * nhops);
-  dhops[nhops].hop = GST_my_identity;
-  {
-    struct DvHopPS dhp = {
-      .purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_DV_HOP),
-      .purpose.size = htonl (sizeof(dhp)),
-      .pred = (0 == nhops) ? msg->initiator : dhops[nhops - 1].hop,
-      .succ = *next_hop,
-      .challenge = msg->challenge
-    };
-    GNUNET_CRYPTO_eddsa_sign (GST_my_private_key,
-                              &dhp,
-                              &dhops[nhops].hop_sig);
-  }
-  /*route_control_message_without_fc (next_hop,
-                                    &fwd->header,
-                                    RMO_UNCONFIRMED_ALLOWED);*/
-  vl = lookup_virtual_link (next_hop);
-  if ((NULL != vl) && (GNUNET_YES == vl->confirmed))
-  {
-    route_control_message_without_fc (vl,
-                                      &fwd->header,
-                                      RMO_UNCONFIRMED_ALLOWED);
-  }
-  else
-  {
-    /* Use route via neighbour */
-    n = lookup_neighbour (next_hop);
-    if (NULL != n)
-      route_via_neighbour (
-        n,
-        &fwd->header,
-        RMO_UNCONFIRMED_ALLOWED);
-  }
-}
-
-
-/**
- * Check signature of type #GNUNET_SIGNATURE_PURPOSE_TRANSPORT_DV_INITIATOR
- *
- * @param sender_monotonic_time monotonic time of the initiator
- * @param init the signer
- * @param challenge the challenge that was signed
- * @param init_sig signature presumably by @a init
- * @return #GNUNET_OK if the signature is valid
- */
-static int
-validate_dv_initiator_signature (
-  struct GNUNET_TIME_AbsoluteNBO sender_monotonic_time,
-  const struct GNUNET_PeerIdentity *init,
-  const struct GNUNET_CRYPTO_ChallengeNonceP *challenge,
-  const struct GNUNET_CRYPTO_EddsaSignature *init_sig)
-{
-  struct DvInitPS ip = { .purpose.purpose = htonl (
-                           GNUNET_SIGNATURE_PURPOSE_TRANSPORT_DV_INITIATOR),
-                         .purpose.size = htonl (sizeof(ip)),
-                         .monotonic_time = sender_monotonic_time,
-                         .challenge = *challenge };
-
-  if (
-    GNUNET_OK !=
-    GNUNET_CRYPTO_eddsa_verify (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_DV_INITIATOR,
-                                &ip,
-                                init_sig,
-                                &init->public_key))
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Closure for #dv_neighbour_selection and #dv_neighbour_transmission.
- */
-struct NeighbourSelectionContext
-{
-  /**
-   * Original message we received.
-   */
-  const struct TransportDVLearnMessage *dvl;
-
-  /**
-   * The hops taken.
-   */
-  const struct DVPathEntryP *hops;
-
-  /**
-   * Time we received the message.
-   */
-  struct GNUNET_TIME_Absolute in_time;
-
-  /**
-   * Offsets of the selected peers.
-   */
-  uint32_t selections[MAX_DV_DISCOVERY_SELECTION];
-
-  /**
-   * Number of peers eligible for selection.
-   */
-  unsigned int num_eligible;
-
-  /**
-   * Number of peers that were selected for forwarding.
-   */
-  unsigned int num_selections;
-
-  /**
-   * Number of hops in @e hops
-   */
-  uint16_t nhops;
-
-  /**
-   * Bitmap of bidirectional connections encountered.
-   */
-  uint16_t bi_history;
-};
-
-
-/**
- * Function called for each neighbour during #handle_dv_learn.
- *
- * @param cls a `struct NeighbourSelectionContext *`
- * @param pid identity of the peer
- * @param value a `struct Neighbour`
- * @return #GNUNET_YES (always)
- */
-static int
-dv_neighbour_selection (void *cls,
-                        const struct GNUNET_PeerIdentity *pid,
-                        void *value)
-{
-  struct NeighbourSelectionContext *nsc = cls;
-
-  (void) value;
-  if (0 == GNUNET_memcmp (pid, &nsc->dvl->initiator))
-    return GNUNET_YES; /* skip initiator */
-  for (unsigned int i = 0; i < nsc->nhops; i++)
-    if (0 == GNUNET_memcmp (pid, &nsc->hops[i].hop))
-      return GNUNET_YES;
-  /* skip peers on path */
-  nsc->num_eligible++;
-  return GNUNET_YES;
-}
-
-
-/**
- * Function called for each neighbour during #handle_dv_learn.
- * We call #forward_dv_learn() on the neighbour(s) selected
- * during #dv_neighbour_selection().
- *
- * @param cls a `struct NeighbourSelectionContext *`
- * @param pid identity of the peer
- * @param value a `struct Neighbour`
- * @return #GNUNET_YES (always)
- */
-static int
-dv_neighbour_transmission (void *cls,
-                           const struct GNUNET_PeerIdentity *pid,
-                           void *value)
-{
-  struct NeighbourSelectionContext *nsc = cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "transmission %s\n",
-              GNUNET_i2s (pid));
-  (void) value;
-  if (0 == GNUNET_memcmp (pid, &nsc->dvl->initiator))
-    return GNUNET_YES; /* skip initiator */
-  for (unsigned int i = 0; i < nsc->nhops; i++)
-    if (0 == GNUNET_memcmp (pid, &nsc->hops[i].hop))
-      return GNUNET_YES;
-  /* skip peers on path */
-  for (unsigned int i = 0; i < nsc->num_selections; i++)
-  {
-    if (nsc->selections[i] == nsc->num_eligible)
-    {
-      forward_dv_learn (pid,
-                        nsc->dvl,
-                        nsc->bi_history,
-                        nsc->nhops,
-                        nsc->hops,
-                        nsc->in_time);
-      break;
-    }
-  }
-  nsc->num_eligible++;
-  return GNUNET_YES;
-}
-
-
-/**
- * Computes the number of neighbours we should forward a DVInit
- * message to given that it has so far taken @a hops_taken hops
- * though the network and that the number of neighbours we have
- * in total is @a neighbour_count, out of which @a eligible_count
- * are not yet on the path.
- *
- * NOTE: technically we might want to include NSE in the formula to
- * get a better grip on the overall network size. However, for now
- * using NSE here would create a dependency issue in the build system.
- * => Left for later, hardcoded to 50 for now.
- *
- * The goal of the fomula is that we want to reach a total of LOG(NSE)
- * peers via DV (`target_total`).  We want the reach to be spread out
- * over various distances to the origin, with a bias towards shorter
- * distances.
- *
- * We make the strong assumption that the network topology looks
- * "similar" at other hops, in particular the @a neighbour_count
- * should be comparable at other hops.
- *
- * If the local neighbourhood is densely connected, we expect that @a
- * eligible_count is close to @a neighbour_count minus @a hops_taken
- * as a lot of the path is already known. In that case, we should
- * forward to few(er) peers to try to find a path out of the
- * neighbourhood. OTOH, if @a eligible_count is close to @a
- * neighbour_count, we should forward to many peers as we are either
- * still close to the origin (i.e.  @a hops_taken is small) or because
- * we managed to get beyond a local cluster.  We express this as
- * the `boost_factor` using the square of the fraction of eligible
- * neighbours (so if only 50% are eligible, we boost by 1/4, but if
- * 99% are eligible, the 'boost' will be almost 1).
- *
- * Second, the more hops we have taken, the larger the problem of an
- * exponential traffic explosion gets.  So we take the `target_total`,
- * and compute our degree such that at each distance d 2^{-d} peers
- * are selected (corrected by the `boost_factor`).
- *
- * @param hops_taken number of hops DVInit has travelled so far
- * @param neighbour_count number of neighbours we have in total
- * @param eligible_count number of neighbours we could in
- *        theory forward to
- */
-static unsigned int
-calculate_fork_degree (unsigned int hops_taken,
-                       unsigned int neighbour_count,
-                       unsigned int eligible_count)
-{
-  double target_total = 50.0; /* FIXME: use LOG(NSE)? */
-  double eligible_ratio =
-    ((double) eligible_count) / ((double) neighbour_count);
-  double boost_factor = eligible_ratio * eligible_ratio;
-  unsigned int rnd;
-  double left;
-
-  if (hops_taken >= 64)
-  {
-    GNUNET_break (0);
-    return 0;   /* precaution given bitshift below */
-  }
-  for (unsigned int i = 1; i < hops_taken; i++)
-  {
-    /* For each hop, subtract the expected number of targets
-       reached at distance d (so what remains divided by 2^d) */
-    target_total -= (target_total * boost_factor / (1LLU << i));
-  }
-  rnd =
-    (unsigned int) floor (target_total * boost_factor / (1LLU << hops_taken));
-  /* round up or down probabilistically depending on how close we were
-     when floor()ing to rnd */
-  left = target_total - (double) rnd;
-  if (UINT32_MAX * left >
-      GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, UINT32_MAX))
-    rnd++; /* round up */
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Forwarding DV learn message of %u hops %u(/%u/%u) times\n",
-              hops_taken,
-              rnd,
-              eligible_count,
-              neighbour_count);
-  return rnd;
-}
-
-
-/**
- * Function called when peerstore is done storing a DV monotonic time.
- *
- * @param cls a `struct Neighbour`
- * @param success #GNUNET_YES if peerstore was successful
- */
-static void
-neighbour_store_dvmono_cb (void *cls, int success)
-{
-  struct Neighbour *n = cls;
-
-  n->sc = NULL;
-  if (GNUNET_YES != success)
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to store other peer's monotonic time in peerstore!\n");
-}
-
-
-/**
- * Communicator gave us a DV learn message.  Process the request.
- *
- * @param cls a `struct CommunicatorMessageContext` (must call
- * #finish_cmc_handling() when done)
- * @param dvl the message that was received
- */
-static void
-handle_dv_learn (void *cls, const struct TransportDVLearnMessage *dvl)
-{
-  struct CommunicatorMessageContext *cmc = cls;
-  enum GNUNET_TRANSPORT_CommunicatorCharacteristics cc;
-  int bi_hop;
-  uint16_t nhops;
-  uint16_t bi_history;
-  const struct DVPathEntryP *hops;
-  int do_fwd;
-  int did_initiator;
-  struct GNUNET_TIME_Absolute in_time;
-  struct Neighbour *n;
-
-  nhops = ntohs (dvl->num_hops);  /* 0 = sender is initiator */
-  bi_history = ntohs (dvl->bidirectional);
-  hops = (const struct DVPathEntryP *) &dvl[1];
-  if (0 == nhops)
-  {
-    /* sanity check */
-    if (0 != GNUNET_memcmp (&dvl->initiator, &cmc->im.sender))
-    {
-      GNUNET_break (0);
-      finish_cmc_handling (cmc);
-      return;
-    }
-  }
-  else
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "handle dv learn message last hop %s\n",
-                GNUNET_i2s (&hops[nhops - 1].hop));
-    /* sanity check */
-    if (0 != GNUNET_memcmp (&hops[nhops - 1].hop, &cmc->im.sender))
-    {
-      GNUNET_break (0);
-      finish_cmc_handling (cmc);
-      return;
-    }
-  }
-
-  GNUNET_assert (CT_COMMUNICATOR == cmc->tc->type);
-  cc = cmc->tc->details.communicator.cc;
-  bi_hop = (GNUNET_TRANSPORT_CC_RELIABLE ==
-            cc); // FIXME: add bi-directional flag to cc?
-  in_time = GNUNET_TIME_absolute_get ();
-
-  /* continue communicator here, everything else can happen asynchronous! */
-  finish_cmc_handling (cmc);
-
-  n = lookup_neighbour (&dvl->initiator);
-  if (NULL != n)
-  {
-    if ((n->dv_monotime_available == GNUNET_YES) &&
-        (GNUNET_TIME_absolute_ntoh (dvl->monotonic_time).abs_value_us <
-         n->last_dv_learn_monotime.abs_value_us))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "DV learn from %s discarded due to time travel",
-                  GNUNET_i2s (&dvl->initiator));
-      GNUNET_STATISTICS_update (GST_stats,
-                                "# DV learn discarded due to time travel",
-                                1,
-                                GNUNET_NO);
-      return;
-    }
-    if (GNUNET_OK != validate_dv_initiator_signature (dvl->monotonic_time,
-                                                      &dvl->initiator,
-                                                      &dvl->challenge,
-                                                      &dvl->init_sig))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "DV learn signature from %s invalid\n",
-                  GNUNET_i2s (&dvl->initiator));
-      GNUNET_break_op (0);
-      return;
-    }
-    n->last_dv_learn_monotime = GNUNET_TIME_absolute_ntoh (dvl->monotonic_time);
-    if (GNUNET_YES == n->dv_monotime_available)
-    {
-      if (NULL != n->sc)
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                    "store cancel\n");
-        GNUNET_PEERSTORE_store_cancel (n->sc);
-      }
-      n->sc =
-        GNUNET_PEERSTORE_store (peerstore,
-                                "transport",
-                                &dvl->initiator,
-                                GNUNET_PEERSTORE_TRANSPORT_DVLEARN_MONOTIME,
-                                &dvl->monotonic_time,
-                                sizeof(dvl->monotonic_time),
-                                GNUNET_TIME_UNIT_FOREVER_ABS,
-                                GNUNET_PEERSTORE_STOREOPTION_REPLACE,
-                                &neighbour_store_dvmono_cb,
-                                n);
-    }
-  }
-  /* OPTIMIZE-FIXME: asynchronously (!) verify signatures!,
-     If signature verification load too high, implement random drop strategy */
-  for (unsigned int i = 0; i < nhops; i++)
-  {
-    struct DvHopPS dhp = { .purpose.purpose =
-                             htonl (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_DV_HOP),
-                           .purpose.size = htonl (sizeof(dhp)),
-                           .pred = (0 == i) ? dvl->initiator : hops[i - 1].hop,
-                           .succ = (nhops == i + 1) ? GST_my_identity
-                                   : hops[i + 1].hop,
-                           .challenge = dvl->challenge };
-
-    if (GNUNET_OK !=
-        GNUNET_CRYPTO_eddsa_verify (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_DV_HOP,
-                                    &dhp,
-                                    &hops[i].hop_sig,
-                                    &hops[i].hop.public_key))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "DV learn from %s signature of hop %u invalid\n",
-                  GNUNET_i2s (&dvl->initiator),
-                  i);
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "signature of hop %s invalid\n",
-                  GNUNET_i2s (&hops[i].hop));
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "pred %s\n",
-                  GNUNET_i2s (&dhp.pred));
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "succ %s\n",
-                  GNUNET_i2s (&dhp.succ));
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "hash %s\n",
-                  GNUNET_sh2s (&dhp.challenge.value));
-      GNUNET_break_op (0);
-      return;
-    }
-  }
-  if (GNUNET_EXTRA_LOGGING > 0)
-  {
-    char *path;
-
-    path = GNUNET_strdup (GNUNET_i2s (&dvl->initiator));
-    for (unsigned int i = 0; i < nhops; i++)
-    {
-      char *tmp;
-
-      GNUNET_asprintf (&tmp,
-                       "%s%s%s",
-                       path,
-                       (bi_history & (1 << (nhops - i))) ? "<->" : "-->",
-                       GNUNET_i2s (&hops[i].hop));
-      GNUNET_free (path);
-      path = tmp;
-    }
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Received DVInit via %s%s%s\n",
-                path,
-                bi_hop ? "<->" : "-->",
-                GNUNET_i2s (&GST_my_identity));
-    GNUNET_free (path);
-  }
-  do_fwd = GNUNET_YES;
-  if (0 == GNUNET_memcmp (&GST_my_identity, &dvl->initiator))
-  {
-    struct GNUNET_PeerIdentity path[nhops + 1];
-    struct GNUNET_TIME_Relative host_latency_sum;
-    struct GNUNET_TIME_Relative latency;
-    struct GNUNET_TIME_Relative network_latency;
-    struct GNUNET_TIME_Absolute now;
-
-    /* We initiated this, learn the forward path! */
-    path[0] = GST_my_identity;
-    path[1] = hops[0].hop;
-    host_latency_sum = GNUNET_TIME_relative_ntoh (dvl->non_network_delay);
-
-    // Need also something to lookup initiation time
-    // to compute RTT! -> add RTT argument here?
-    now = GNUNET_TIME_absolute_get ();
-    latency = GNUNET_TIME_absolute_get_duration (GNUNET_TIME_absolute_ntoh (
-                                                   dvl->monotonic_time));
-    GNUNET_assert (latency.rel_value_us >= host_latency_sum.rel_value_us);
-    // latency = GNUNET_TIME_UNIT_FOREVER_REL;   // FIXME: initialize properly
-    // (based on dvl->challenge, we can identify time of origin!)
-
-    network_latency = GNUNET_TIME_relative_subtract (latency, host_latency_sum);
-    /* assumption: latency on all links is the same */
-    network_latency = GNUNET_TIME_relative_divide (network_latency, nhops);
-
-    for (unsigned int i = 2; i <= nhops; i++)
-    {
-      struct GNUNET_TIME_Relative ilat;
-
-      /* assumption: linear latency increase per hop */
-      ilat = GNUNET_TIME_relative_multiply (network_latency, i);
-      path[i] = hops[i - 1].hop;
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Learned path with %u hops to %s with latency %s\n",
-                  i,
-                  GNUNET_i2s (&path[i]),
-                  GNUNET_STRINGS_relative_time_to_string (ilat, GNUNET_YES));
-      learn_dv_path (path,
-                     i + 1,
-                     ilat,
-                     GNUNET_TIME_relative_to_absolute (
-                       ADDRESS_VALIDATION_LIFETIME));
-    }
-    /* as we initiated, do not forward again (would be circular!) */
-    do_fwd = GNUNET_NO;
-    return;
-  }
-  if (bi_hop)
-  {
-    /* last hop was bi-directional, we could learn something here! */
-    struct GNUNET_PeerIdentity path[nhops + 2];
-
-    path[0] = GST_my_identity;
-    path[1] = hops[nhops - 1].hop;   /* direct neighbour == predecessor! */
-    for (unsigned int i = 0; i < nhops; i++)
-    {
-      int iret;
-
-      if (0 == (bi_history & (1 << i)))
-        break;     /* i-th hop not bi-directional, stop learning! */
-      if (i == nhops - 1)
-      {
-        path[i + 2] = dvl->initiator;
-      }
-      else
-      {
-        path[i + 2] = hops[nhops - i - 2].hop;
-      }
-
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Learned inverse path with %u hops to %s\n",
-                  i + 2,
-                  GNUNET_i2s (&path[i + 2]));
-      iret = learn_dv_path (path,
-                            i + 3,
-                            GNUNET_TIME_UNIT_FOREVER_REL,
-                            GNUNET_TIME_UNIT_ZERO_ABS);
-      if (GNUNET_SYSERR == iret)
-      {
-        /* path invalid or too long to be interesting for US, thus should also
-           not be interesting to our neighbours, cut path when forwarding to
-           'i' hops, except of course for the one that goes back to the
-           initiator */
-        GNUNET_STATISTICS_update (GST_stats,
-                                  "# DV learn not forwarded due invalidity of path",
-                                  1,
-                                  GNUNET_NO);
-        do_fwd = GNUNET_NO;
-        break;
-      }
-      if ((GNUNET_NO == iret) && (nhops == i + 1))
-      {
-        /* we have better paths, and this is the longest target,
-           so there cannot be anything interesting later */
-        GNUNET_STATISTICS_update (GST_stats,
-                                  "# DV learn not forwarded, got better paths",
-                                  1,
-                                  GNUNET_NO);
-        do_fwd = GNUNET_NO;
-        break;
-      }
-    }
-  }
-  if (MAX_DV_HOPS_ALLOWED == nhops)
-  {
-    /* At limit, we're out of here! */
-    return;
-  }
-
-  /* Forward to initiator, if path non-trivial and possible */
-  bi_history = (bi_history << 1) | (bi_hop ? 1 : 0);
-  did_initiator = GNUNET_NO;
-  if ((1 <= nhops) &&
-      (GNUNET_YES ==
-       GNUNET_CONTAINER_multipeermap_contains (neighbours, &dvl->initiator)))
-  {
-    /* send back to origin! */
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Sending DVL back to initiator %s\n",
-                GNUNET_i2s (&dvl->initiator));
-    forward_dv_learn (&dvl->initiator, dvl, bi_history, nhops, hops, in_time);
-    did_initiator = GNUNET_YES;
-  }
-  /* We forward under two conditions: either we still learned something
-     ourselves (do_fwd), or the path was darn short and thus the initiator is
-     likely to still be very interested in this (and we did NOT already
-     send it back to the initiator) */
-  if ((do_fwd) || ((nhops < MIN_DV_PATH_LENGTH_FOR_INITIATOR) &&
-                   (GNUNET_NO == did_initiator)))
-  {
-    /* Pick random neighbours that are not yet on the path */
-    struct NeighbourSelectionContext nsc;
-    unsigned int n_cnt;
-
-    n_cnt = GNUNET_CONTAINER_multipeermap_size (neighbours);
-    nsc.nhops = nhops;
-    nsc.dvl = dvl;
-    nsc.bi_history = bi_history;
-    nsc.hops = hops;
-    nsc.in_time = in_time;
-    nsc.num_eligible = 0;
-    GNUNET_CONTAINER_multipeermap_iterate (neighbours,
-                                           &dv_neighbour_selection,
-                                           &nsc);
-    if (0 == nsc.num_eligible)
-      return;   /* done here, cannot forward to anyone else */
-    nsc.num_selections = calculate_fork_degree (nhops, n_cnt, nsc.num_eligible);
-    nsc.num_selections =
-      GNUNET_MIN (MAX_DV_DISCOVERY_SELECTION, nsc.num_selections);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Forwarding DVL to %u other peers\n",
-                nsc.num_selections);
-    for (unsigned int i = 0; i < nsc.num_selections; i++)
-      nsc.selections[i] =
-        (nsc.num_selections == n_cnt)
-        ? i   /* all were selected, avoid collisions by chance */
-        : GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, n_cnt);
-    nsc.num_eligible = 0;
-    GNUNET_CONTAINER_multipeermap_iterate (neighbours,
-                                           &dv_neighbour_transmission,
-                                           &nsc);
-  }
-}
-
-
-/**
- * Communicator gave us a DV box.  Check the message.
- *
- * @param cls a `struct CommunicatorMessageContext`
- * @param dvb the send message that was sent
- * @return #GNUNET_YES if message is well-formed
- */
-static int
-check_dv_box (void *cls, const struct TransportDVBoxMessage *dvb)
-{
-  uint16_t size = ntohs (dvb->header.size);
-  uint16_t num_hops = ntohs (dvb->num_hops);
-  const struct GNUNET_PeerIdentity *hops =
-    (const struct GNUNET_PeerIdentity *) &dvb[1];
-
-  (void) cls;
-  if (size < sizeof(*dvb) + num_hops * sizeof(struct GNUNET_PeerIdentity)
-      + sizeof(struct GNUNET_MessageHeader))
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  /* This peer must not be on the path */
-  for (unsigned int i = 0; i < num_hops; i++)
-    if (0 == GNUNET_memcmp (&hops[i], &GST_my_identity))
-    {
-      GNUNET_break_op (0);
-      return GNUNET_SYSERR;
-    }
-  return GNUNET_YES;
-}
-
-
-/**
- * Create a DV Box message and queue it for transmission to
- * @ea next_hop.
- *
- * @param next_hop peer to receive the message next
- * @param total_hops how many hops did the message take so far
- * @param num_hops length of the @a hops array
- * @param origin origin of the message
- * @param hops next peer(s) to the destination, including destination
- * @param payload payload of the box
- * @param payload_size number of bytes in @a payload
- */
-static void
-forward_dv_box (struct Neighbour *next_hop,
-                struct TransportDVBoxMessage *hdr,
-                uint16_t total_hops,
-                uint16_t num_hops,
-                const struct GNUNET_PeerIdentity *hops,
-                const void *enc_payload,
-                uint16_t enc_payload_size)
-{
-  struct VirtualLink *vl = next_hop->vl;
-  struct PendingMessage *pm;
-  size_t msg_size = sizeof(struct TransportDVBoxMessage)
-                    + num_hops * sizeof(struct GNUNET_PeerIdentity)
-                    + enc_payload_size;
-  char *buf;
-  char msg_buf[msg_size] GNUNET_ALIGN;
-  struct GNUNET_PeerIdentity *dhops;
-
-  hdr->num_hops = htons (num_hops);
-  hdr->total_hops = htons (total_hops);
-  hdr->header.size = htons (msg_size);
-  memcpy (msg_buf, hdr, sizeof(*hdr));
-  dhops = (struct GNUNET_PeerIdentity *) &msg_buf[sizeof(struct
-                                                         TransportDVBoxMessage)];
-  memcpy (dhops, hops, num_hops * sizeof(struct GNUNET_PeerIdentity));
-  memcpy (&dhops[num_hops], enc_payload, enc_payload_size);
-
-  if (GNUNET_YES == ntohs (hdr->without_fc))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Forwarding control message (payload size %u) in DV Box to next hop %s (%u/%u) \n",
-                enc_payload_size,
-                GNUNET_i2s (&next_hop->pid),
-                (unsigned int) num_hops,
-                (unsigned int) total_hops);
-    route_via_neighbour (next_hop, (const struct
-                                    GNUNET_MessageHeader *) msg_buf,
-                         RMO_ANYTHING_GOES);
-  }
-  else if (NULL != vl)
-  {
-    pm = GNUNET_malloc (sizeof(struct PendingMessage) + msg_size);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "2 created pm %p storing vl %p \n",
-                pm,
-                vl);
-    pm->pmt = PMT_DV_BOX;
-    pm->vl = vl;
-    pm->timeout = GNUNET_TIME_relative_to_absolute (DV_FORWARD_TIMEOUT);
-    pm->logging_uuid = logging_uuid_gen++;
-    pm->prefs = GNUNET_MQ_PRIO_BACKGROUND;
-    pm->bytes_msg = msg_size;
-    buf = (char *) &pm[1];
-    memcpy (buf, msg_buf, msg_size);
-    GNUNET_CONTAINER_MDLL_insert (vl,
-                                  vl->pending_msg_head,
-                                  vl->pending_msg_tail,
-                                  pm);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Created pending message %llu for DV Box with next hop %s (%u/%u)\n",
-                pm->logging_uuid,
-                GNUNET_i2s (&next_hop->pid),
-                (unsigned int) num_hops,
-                (unsigned int) total_hops);
-    check_vl_transmission (vl);
-  }
-  else
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "The virtual link is not ready for forwarding a DV Box with payload.\n");
-    // FIXME The DV Box was send before the validation response. Shall we send a validation request for DV paths?
-  }
-}
-
-
-/**
- * Free data structures associated with @a b.
- *
- * @param b data structure to release
- */
-static void
-free_backtalker (struct Backtalker *b)
-{
-  if (NULL != b->get)
-  {
-    GNUNET_PEERSTORE_iterate_cancel (b->get);
-    b->get = NULL;
-    GNUNET_assert (NULL != b->cmc);
-    finish_cmc_handling (b->cmc);
-    b->cmc = NULL;
-  }
-  if (NULL != b->task)
-  {
-    GNUNET_SCHEDULER_cancel (b->task);
-    b->task = NULL;
-  }
-  if (NULL != b->sc)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "store cancel\n");
-    GNUNET_PEERSTORE_store_cancel (b->sc);
-    b->sc = NULL;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Removing backtalker for %s\n",
-              GNUNET_i2s (&b->pid));
-  GNUNET_assert (
-    GNUNET_YES ==
-    GNUNET_CONTAINER_multipeermap_remove (backtalkers, &b->pid, b));
-  GNUNET_free (b);
-}
-
-
-/**
- * Callback to free backtalker records.
- *
- * @param cls NULL
- * @param pid unused
- * @param value a `struct Backtalker`
- * @return #GNUNET_OK (always)
- */
-static int
-free_backtalker_cb (void *cls,
-                    const struct GNUNET_PeerIdentity *pid,
-                    void *value)
-{
-  struct Backtalker *b = value;
-
-  (void) cls;
-  (void) pid;
-  free_backtalker (b);
-  return GNUNET_OK;
-}
-
-
-/**
- * Function called when it is time to clean up a backtalker.
- *
- * @param cls a `struct Backtalker`
- */
-static void
-backtalker_timeout_cb (void *cls)
-{
-  struct Backtalker *b = cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "backtalker timeout.\n");
-  b->task = NULL;
-  if (0 != GNUNET_TIME_absolute_get_remaining (b->timeout).rel_value_us)
-  {
-    b->task = GNUNET_SCHEDULER_add_at (b->timeout, &backtalker_timeout_cb, b);
-    return;
-  }
-  GNUNET_assert (NULL == b->sc);
-  free_backtalker (b);
-}
-
-
-/**
- * Function called with the monotonic time of a backtalker
- * by PEERSTORE. Updates the time and continues processing.
- *
- * @param cls a `struct Backtalker`
- * @param record the information found, NULL for the last call
- * @param emsg error message
- */
-static void
-backtalker_monotime_cb (void *cls,
-                        const struct GNUNET_PEERSTORE_Record *record,
-                        const char *emsg)
-{
-  struct Backtalker *b = cls;
-  struct GNUNET_TIME_AbsoluteNBO *mtbe;
-  struct GNUNET_TIME_Absolute mt;
-
-  (void) emsg;
-  if (NULL == record)
-  {
-    /* we're done with #backtalker_monotime_cb() invocations,
-       continue normal processing */
-    b->get = NULL;
-    GNUNET_assert (NULL != b->cmc);
-    if (0 != b->body_size)
-      demultiplex_with_cmc (b->cmc,
-                            (const struct GNUNET_MessageHeader *) &b[1]);
-    else
-      finish_cmc_handling (b->cmc);
-    b->cmc = NULL;
-    return;
-  }
-  if (sizeof(*mtbe) != record->value_size)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  mtbe = record->value;
-  mt = GNUNET_TIME_absolute_ntoh (*mtbe);
-  if (mt.abs_value_us > b->monotonic_time.abs_value_us)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Backtalker message from %s dropped, monotime in the past\n",
-                GNUNET_i2s (&b->pid));
-    GNUNET_STATISTICS_update (
-      GST_stats,
-      "# Backchannel messages dropped: monotonic time not increasing",
-      1,
-      GNUNET_NO);
-    b->monotonic_time = mt;
-    /* Setting body_size to 0 prevents call to #forward_backchannel_payload()
-     */
-    b->body_size = 0;
-    return;
-  }
-}
-
-
-/**
- * Function called by PEERSTORE when the store operation of
- * a backtalker's monotonic time is complete.
- *
- * @param cls the `struct Backtalker`
- * @param success #GNUNET_OK on success
- */
-static void
-backtalker_monotime_store_cb (void *cls, int success)
-{
-  struct Backtalker *b = cls;
-
-  if (GNUNET_OK != success)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to store backtalker's monotonic time in PEERSTORE!\n");
-  }
-  b->sc = NULL;
-  if (NULL != b->task)
-  {
-    GNUNET_SCHEDULER_cancel (b->task);
-    b->task = NULL;
-  }
-  b->task = GNUNET_SCHEDULER_add_at (b->timeout, &backtalker_timeout_cb, b);
-}
-
-
-/**
- * The backtalker @a b monotonic time changed. Update PEERSTORE.
- *
- * @param b a backtalker with updated monotonic time
- */
-static void
-update_backtalker_monotime (struct Backtalker *b)
-{
-  struct GNUNET_TIME_AbsoluteNBO mtbe;
-
-  if (NULL != b->sc)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "store cancel before store with sc %p\n",
-                b->sc);
-    /*GNUNET_PEERSTORE_store_cancel (b->sc);
-      b->sc = NULL;*/
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "store cancel before store with sc %p is null\n",
-                b->sc);
-  }
-  else
-  {
-    GNUNET_SCHEDULER_cancel (b->task);
-    b->task = NULL;
-  }
-  mtbe = GNUNET_TIME_absolute_hton (b->monotonic_time);
-  b->sc =
-    GNUNET_PEERSTORE_store (peerstore,
-                            "transport",
-                            &b->pid,
-                            GNUNET_PEERSTORE_TRANSPORT_BACKCHANNEL_MONOTIME,
-                            &mtbe,
-                            sizeof(mtbe),
-                            GNUNET_TIME_UNIT_FOREVER_ABS,
-                            GNUNET_PEERSTORE_STOREOPTION_REPLACE,
-                            &backtalker_monotime_store_cb,
-                            b);
-}
-
-
-/**
- * Communicator gave us a DV box.  Process the request.
- *
- * @param cls a `struct CommunicatorMessageContext` (must call
- * #finish_cmc_handling() when done)
- * @param dvb the message that was received
- */
-static void
-handle_dv_box (void *cls, const struct TransportDVBoxMessage *dvb)
-{
-  struct CommunicatorMessageContext *cmc = cls;
-  uint16_t size = ntohs (dvb->header.size) - sizeof(*dvb);
-  uint16_t num_hops = ntohs (dvb->num_hops);
-  const struct GNUNET_PeerIdentity *hops =
-    (const struct GNUNET_PeerIdentity *) &dvb[1];
-  const char *enc_payload = (const char *) &hops[num_hops];
-  uint16_t enc_payload_size =
-    size - (num_hops * sizeof(struct GNUNET_PeerIdentity));
-  char enc[enc_payload_size];
-  struct DVKeyState *key;
-  struct GNUNET_HashCode hmac;
-  const char *hdr;
-  size_t hdr_len;
-
-  key = GNUNET_new (struct DVKeyState);
-
-  if (GNUNET_EXTRA_LOGGING > 0)
-  {
-    char *path;
-
-    path = GNUNET_strdup (GNUNET_i2s (&GST_my_identity));
-    for (unsigned int i = 0; i < num_hops; i++)
-    {
-      char *tmp;
-
-      GNUNET_asprintf (&tmp, "%s->%s", path, GNUNET_i2s (&hops[i]));
-      GNUNET_free (path);
-      path = tmp;
-    }
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Received DVBox with remaining path %s\n",
-                path);
-    GNUNET_free (path);
-  }
-
-  if (num_hops > 0)
-  {
-    /* We're trying from the end of the hops array, as we may be
-       able to find a shortcut unknown to the origin that way */
-    for (int i = num_hops - 1; i >= 0; i--)
-    {
-      struct Neighbour *n;
-
-      if (0 == GNUNET_memcmp (&hops[i], &GST_my_identity))
-      {
-        GNUNET_break_op (0);
-        finish_cmc_handling (cmc);
-        return;
-      }
-      n = lookup_neighbour (&hops[i]);
-      if (NULL == n)
-        continue;
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Skipping %u/%u hops ahead while routing DV Box\n",
-                  i,
-                  num_hops);
-
-      forward_dv_box (n,
-                      (struct TransportDVBoxMessage *) dvb,
-                      ntohs (dvb->total_hops) + 1,
-                      num_hops - i - 1,    /* number of hops left */
-                      &hops[i + 1],    /* remaining hops */
-                      enc_payload,
-                      enc_payload_size);
-      GNUNET_STATISTICS_update (GST_stats,
-                                "# DV hops skipped routing boxes",
-                                i,
-                                GNUNET_NO);
-      GNUNET_STATISTICS_update (GST_stats,
-                                "# DV boxes routed (total)",
-                                1,
-                                GNUNET_NO);
-      finish_cmc_handling (cmc);
-      return;
-    }
-    /* Woopsie, next hop not in neighbours, drop! */
-    GNUNET_STATISTICS_update (GST_stats,
-                              "# DV Boxes dropped: next hop unknown",
-                              1,
-                              GNUNET_NO);
-    finish_cmc_handling (cmc);
-    return;
-  }
-  /* We are the target. Unbox and handle message. */
-  GNUNET_STATISTICS_update (GST_stats,
-                            "# DV boxes opened (ultimate target)",
-                            1,
-                            GNUNET_NO);
-  cmc->total_hops = ntohs (dvb->total_hops);
-
-  dh_key_derive_eph_pub (&dvb->ephemeral_key, &dvb->iv, key);
-  hdr = (const char *) &dvb[1];
-  hdr_len = ntohs (dvb->orig_size) - sizeof(*dvb) - sizeof(struct
-                                                           GNUNET_PeerIdentity)
-            * ntohs (dvb->total_hops);
-
-  dv_hmac (key, &hmac, hdr, hdr_len);
-  if (0 != GNUNET_memcmp (&hmac, &dvb->hmac))
-  {
-    /* HMAC mismatch, discard! */
-    GNUNET_break_op (0);
-    finish_cmc_handling (cmc);
-    return;
-  }
-  /* begin actual decryption */
-  {
-    struct Backtalker *b;
-    struct GNUNET_TIME_Absolute monotime;
-    struct TransportDVBoxPayloadP ppay;
-    char body[hdr_len - sizeof(ppay)] GNUNET_ALIGN;
-    const struct GNUNET_MessageHeader *mh =
-      (const struct GNUNET_MessageHeader *) body;
-
-    GNUNET_assert (hdr_len >=
-                   sizeof(ppay) + sizeof(struct GNUNET_MessageHeader));
-    dv_decrypt (key, &ppay, hdr, sizeof(ppay));
-    dv_decrypt (key, &body, &hdr[sizeof(ppay)], hdr_len - sizeof(ppay));
-    dv_key_clean (key);
-    if (ntohs (mh->size) != sizeof(body))
-    {
-      GNUNET_break_op (0);
-      finish_cmc_handling (cmc);
-      return;
-    }
-    /* need to prevent box-in-a-box (and DV_LEARN) so check inbox type! */
-    switch (ntohs (mh->type))
-    {
-    case GNUNET_MESSAGE_TYPE_TRANSPORT_DV_BOX:
-      GNUNET_break_op (0);
-      finish_cmc_handling (cmc);
-      return;
-
-    case GNUNET_MESSAGE_TYPE_TRANSPORT_DV_LEARN:
-      GNUNET_break_op (0);
-      finish_cmc_handling (cmc);
-      return;
-
-    default:
-      /* permitted, continue */
-      break;
-    }
-    monotime = GNUNET_TIME_absolute_ntoh (ppay.monotonic_time);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Decrypted backtalk from %s\n",
-                GNUNET_i2s (&ppay.sender));
-    b = GNUNET_CONTAINER_multipeermap_get (backtalkers, &ppay.sender);
-    if ((NULL != b) && (monotime.abs_value_us < b->monotonic_time.abs_value_us))
-    {
-      GNUNET_STATISTICS_update (
-        GST_stats,
-        "# Backchannel messages dropped: monotonic time not increasing",
-        1,
-        GNUNET_NO);
-      finish_cmc_handling (cmc);
-      return;
-    }
-    if ((NULL == b) ||
-        (0 != GNUNET_memcmp (&b->last_ephemeral, &dvb->ephemeral_key)))
-    {
-      /* Check signature */
-      struct EphemeralConfirmationPS ec;
-
-      ec.purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_EPHEMERAL);
-      ec.target = GST_my_identity;
-      ec.ephemeral_key = dvb->ephemeral_key;
-      ec.purpose.size =  htonl (sizeof(ec));
-      ec.sender_monotonic_time = ppay.monotonic_time;
-      if (
-        GNUNET_OK !=
-        GNUNET_CRYPTO_eddsa_verify (
-          GNUNET_SIGNATURE_PURPOSE_TRANSPORT_EPHEMERAL,
-          &ec,
-          &ppay.sender_sig,
-          &ppay.sender.public_key))
-      {
-        /* Signature invalid, discard! */
-        GNUNET_break_op (0);
-        finish_cmc_handling (cmc);
-        return;
-      }
-    }
-    /* Update sender, we now know the real origin! */
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "DVBox received for me from %s via %s\n",
-                GNUNET_i2s2 (&ppay.sender),
-                GNUNET_i2s (&cmc->im.sender));
-    cmc->im.sender = ppay.sender;
-
-    if (NULL != b)
-    {
-      /* update key cache and mono time */
-      b->last_ephemeral = dvb->ephemeral_key;
-      b->monotonic_time = monotime;
-      update_backtalker_monotime (b);
-      b->timeout =
-        GNUNET_TIME_relative_to_absolute (BACKCHANNEL_INACTIVITY_TIMEOUT);
-
-      demultiplex_with_cmc (cmc, mh);
-      return;
-    }
-    /* setup data structure to cache signature AND check
-       monotonic time with PEERSTORE before forwarding backchannel payload */
-    b = GNUNET_malloc (sizeof(struct Backtalker) + sizeof(body));
-    b->pid = ppay.sender;
-    b->body_size = sizeof(body);
-    memcpy (&b[1], body, sizeof(body));
-    GNUNET_assert (GNUNET_YES ==
-                   GNUNET_CONTAINER_multipeermap_put (
-                     backtalkers,
-                     &b->pid,
-                     b,
-                     GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
-    b->monotonic_time = monotime; /* NOTE: to be checked still! */
-    b->cmc = cmc;
-    b->timeout =
-      GNUNET_TIME_relative_to_absolute (BACKCHANNEL_INACTIVITY_TIMEOUT);
-    b->task = GNUNET_SCHEDULER_add_at (b->timeout, &backtalker_timeout_cb, b);
-    b->get =
-      GNUNET_PEERSTORE_iterate (peerstore,
-                                "transport",
-                                &b->pid,
-                                GNUNET_PEERSTORE_TRANSPORT_BACKCHANNEL_MONOTIME,
-                                &backtalker_monotime_cb,
-                                b);
-  } /* end actual decryption */
-}
-
-
-/**
- * Client notified us about transmission from a peer.  Process the request.
- *
- * @param cls a `struct TransportClient` which sent us the message
- * @param obm the send message that was sent
- * @return #GNUNET_YES if message is well-formed
- */
-static int
-check_incoming_msg (void *cls,
-                    const struct GNUNET_TRANSPORT_IncomingMessage *im)
-{
-  struct TransportClient *tc = cls;
-
-  if (CT_COMMUNICATOR != tc->type)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_MQ_check_boxed_message (im);
-  return GNUNET_OK;
-}
-
-
-/**
- * Closure for #check_known_address.
- */
-struct CheckKnownAddressContext
-{
-  /**
-   * Set to the address we are looking for.
-   */
-  const char *address;
-
-  /**
-   * Set to a matching validation state, if one was found.
-   */
-  struct ValidationState *vs;
-};
-
-
-/**
- * Test if the validation state in @a value matches the
- * address from @a cls.
- *
- * @param cls a `struct CheckKnownAddressContext`
- * @param pid unused (must match though)
- * @param value a `struct ValidationState`
- * @return #GNUNET_OK if not matching, #GNUNET_NO if match found
- */
-static int
-check_known_address (void *cls,
-                     const struct GNUNET_PeerIdentity *pid,
-                     void *value)
-{
-  struct CheckKnownAddressContext *ckac = cls;
-  struct ValidationState *vs = value;
-
-  (void) pid;
-  if (0 != strcmp (vs->address, ckac->address))
-    return GNUNET_OK;
-  ckac->vs = vs;
-  return GNUNET_NO;
-}
-
-
-/**
- * Task run periodically to validate some address based on #validation_heap.
- *
- * @param cls NULL
- */
-static void
-validation_start_cb (void *cls);
-
-
-/**
- * Set the time for next_challenge of @a vs to @a new_time.
- * Updates the heap and if necessary reschedules the job.
- *
- * @param vs validation state to update
- * @param new_time new time for revalidation
- */
-static void
-update_next_challenge_time (struct ValidationState *vs,
-                            struct GNUNET_TIME_Absolute new_time)
-{
-  struct GNUNET_TIME_Relative delta;
-
-  if (new_time.abs_value_us == vs->next_challenge.abs_value_us)
-    return; /* be lazy */
-  vs->next_challenge = new_time;
-  if (NULL == vs->hn)
-    vs->hn =
-      GNUNET_CONTAINER_heap_insert (validation_heap, vs, new_time.abs_value_us);
-  else
-    GNUNET_CONTAINER_heap_update_cost (vs->hn, new_time.abs_value_us);
-  if ((vs != GNUNET_CONTAINER_heap_peek (validation_heap)) &&
-      (NULL != validation_task))
-    return;
-  if (NULL != validation_task)
-    GNUNET_SCHEDULER_cancel (validation_task);
-  /* randomize a bit */
-  delta.rel_value_us =
-    GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
-                              MIN_DELAY_ADDRESS_VALIDATION.rel_value_us);
-  new_time = GNUNET_TIME_absolute_add (new_time, delta);
-  validation_task =
-    GNUNET_SCHEDULER_add_at (new_time, &validation_start_cb, NULL);
-}
-
-
-/**
- * Start address validation.
- *
- * @param pid peer the @a address is for
- * @param address an address to reach @a pid (presumably)
- */
-static void
-start_address_validation (const struct GNUNET_PeerIdentity *pid,
-                          const char *address)
-{
-  struct GNUNET_TIME_Absolute now;
-  struct ValidationState *vs;
-  struct CheckKnownAddressContext ckac = { .address = address, .vs = NULL };
-
-  (void) GNUNET_CONTAINER_multipeermap_get_multiple (validation_map,
-                                                     pid,
-                                                     &check_known_address,
-                                                     &ckac);
-  if (NULL != (vs = ckac.vs))
-  {
-    /* if 'vs' is not currently valid, we need to speed up retrying the
-     * validation */
-    if (vs->validated_until.abs_value_us < vs->next_challenge.abs_value_us)
-    {
-      /* reduce backoff as we got a fresh advertisement */
-      vs->challenge_backoff =
-        GNUNET_TIME_relative_min (FAST_VALIDATION_CHALLENGE_FREQ,
-                                  GNUNET_TIME_relative_divide (
-                                    vs->challenge_backoff,
-                                    2));
-      update_next_challenge_time (vs,
-                                  GNUNET_TIME_relative_to_absolute (
-                                    vs->challenge_backoff));
-    }
-    return;
-  }
-  now = GNUNET_TIME_absolute_get ();
-  vs = GNUNET_new (struct ValidationState);
-  vs->pid = *pid;
-  vs->valid_until =
-    GNUNET_TIME_relative_to_absolute (ADDRESS_VALIDATION_LIFETIME);
-  vs->first_challenge_use = now;
-  vs->validation_rtt = GNUNET_TIME_UNIT_FOREVER_REL;
-  GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_NONCE,
-                              &vs->challenge,
-                              sizeof(vs->challenge));
-  vs->address = GNUNET_strdup (address);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Starting address validation `%s' of peer %s using challenge %s\n",
-              address,
-              GNUNET_i2s (pid),
-              GNUNET_sh2s (&vs->challenge.value));
-  GNUNET_assert (GNUNET_YES ==
-                 GNUNET_CONTAINER_multipeermap_put (
-                   validation_map,
-                   &vs->pid,
-                   vs,
-                   GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
-  update_next_challenge_time (vs, now);
-}
-
-
-/**
- * Function called by PEERSTORE for each matching record.
- *
- * @param cls closure, a `struct IncomingRequest`
- * @param record peerstore record information
- * @param emsg error message, or NULL if no errors
- */
-static void
-handle_hello_for_incoming (void *cls,
-                           const struct GNUNET_PEERSTORE_Record *record,
-                           const char *emsg)
-{
-  struct IncomingRequest *ir = cls;
-  const char *val;
-
-  if (NULL != emsg)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Got failure from PEERSTORE: %s\n",
-                emsg);
-    return;
-  }
-  val = record->value;
-  if ((0 == record->value_size) || ('\0' != val[record->value_size - 1]))
-  {
-    GNUNET_break (0);
-    return;
-  }
-  start_address_validation (&ir->pid, (const char *) record->value);
-}
-
-
-/**
- * Communicator gave us a transport address validation challenge.  Process the
- * request.
- *
- * @param cls a `struct CommunicatorMessageContext` (must call
- * #finish_cmc_handling() when done)
- * @param tvc the message that was received
- */
-static void
-handle_validation_challenge (
-  void *cls,
-  const struct TransportValidationChallengeMessage *tvc)
-{
-  struct CommunicatorMessageContext *cmc = cls;
-  struct TransportValidationResponseMessage tvr;
-  struct VirtualLink *vl;
-  struct GNUNET_TIME_RelativeNBO validity_duration;
-  struct IncomingRequest *ir;
-  struct Neighbour *n;
-  struct GNUNET_PeerIdentity sender;
-
-  /* DV-routed messages are not allowed for validation challenges */
-  if (cmc->total_hops > 0)
-  {
-    GNUNET_break_op (0);
-    finish_cmc_handling (cmc);
-    return;
-  }
-  validity_duration = cmc->im.expected_address_validity;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received address validation challenge %s\n",
-              GNUNET_sh2s (&tvc->challenge.value));
-  /* If we have a virtual link, we use this mechanism to signal the
-     size of the flow control window, and to allow the sender
-     to ask for increases. If for us the virtual link is still down,
-     we will always give a window size of zero. */
-  tvr.header.type =
-    htons (GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_VALIDATION_RESPONSE);
-  tvr.header.size = htons (sizeof(tvr));
-  tvr.reserved = htonl (0);
-  tvr.challenge = tvc->challenge;
-  tvr.origin_time = tvc->sender_time;
-  tvr.validity_duration = validity_duration;
-  {
-    /* create signature */
-    struct TransportValidationPS tvp = {
-      .purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_CHALLENGE),
-      .purpose.size = htonl (sizeof(tvp)),
-      .validity_duration = validity_duration,
-      .challenge = tvc->challenge
-    };
-
-    GNUNET_CRYPTO_eddsa_sign (GST_my_private_key,
-                              &tvp,
-                              &tvr.signature);
-  }
-  sender = cmc->im.sender;
-  vl = lookup_virtual_link (&sender);
-  if ((NULL != vl) && (GNUNET_YES == vl->confirmed))
-  {
-    // route_control_message_without_fc (&cmc->im.sender,
-    route_control_message_without_fc (vl,
-                                      &tvr.header,
-                                      RMO_ANYTHING_GOES | RMO_REDUNDANT);
-  }
-  else
-  {
-    /* Use route via neighbour */
-    n = lookup_neighbour (&sender);
-    if (NULL != n)
-      route_via_neighbour (n, &tvr.header,
-                           RMO_ANYTHING_GOES | RMO_REDUNDANT
-                           | RMO_UNCONFIRMED_ALLOWED);
-  }
-
-  finish_cmc_handling (cmc);
-  if (NULL != vl)
-    return;
-
-  /* For us, the link is still down, but we need bi-directional
-     connections (for flow-control and for this to be useful for
-     CORE), so we must try to bring the link up! */
-
-  /* (1) Check existing queues, if any, we may be lucky! */
-  n = lookup_neighbour (&sender);
-  if (NULL != n)
-    for (struct Queue *q = n->queue_head; NULL != q; q = q->next_neighbour)
-      start_address_validation (&sender, q->address);
-  /* (2) Also try to see if we have addresses in PEERSTORE for this peer
-     we could use */
-  for (ir = ir_head; NULL != ir; ir = ir->next)
-    if (0 == GNUNET_memcmp (&ir->pid, &sender))
-      return;
-  /* we are already trying */
-  ir = GNUNET_new (struct IncomingRequest);
-  ir->pid = sender;
-  GNUNET_CONTAINER_DLL_insert (ir_head, ir_tail, ir);
-  ir->wc = GNUNET_PEERSTORE_watch (peerstore,
-                                   "transport",
-                                   &ir->pid,
-                                   GNUNET_PEERSTORE_TRANSPORT_URLADDRESS_KEY,
-                                   &handle_hello_for_incoming,
-                                   ir);
-  ir_total++;
-  /* Bound attempts we do in parallel here, might otherwise get excessive */
-  while (ir_total > MAX_INCOMING_REQUEST)
-    free_incoming_request (ir_head);
-}
-
-
-/**
- * Closure for #check_known_challenge.
- */
-struct CheckKnownChallengeContext
-{
-  /**
-   * Set to the challenge we are looking for.
-   */
-  const struct GNUNET_CRYPTO_ChallengeNonceP *challenge;
-
-  /**
-   * Set to a matching validation state, if one was found.
-   */
-  struct ValidationState *vs;
-};
-
-
-/**
- * Test if the validation state in @a value matches the
- * challenge from @a cls.
- *
- * @param cls a `struct CheckKnownChallengeContext`
- * @param pid unused (must match though)
- * @param value a `struct ValidationState`
- * @return #GNUNET_OK if not matching, #GNUNET_NO if match found
- */
-static int
-check_known_challenge (void *cls,
-                       const struct GNUNET_PeerIdentity *pid,
-                       void *value)
-{
-  struct CheckKnownChallengeContext *ckac = cls;
-  struct ValidationState *vs = value;
-
-  (void) pid;
-  if (0 != GNUNET_memcmp (&vs->challenge, ckac->challenge))
-    return GNUNET_OK;
-  ckac->vs = vs;
-  return GNUNET_NO;
-}
-
-
-/**
- * Function called when peerstore is done storing a
- * validated address.
- *
- * @param cls a `struct ValidationState`
- * @param success #GNUNET_YES on success
- */
-static void
-peerstore_store_validation_cb (void *cls, int success)
-{
-  struct ValidationState *vs = cls;
-
-  vs->sc = NULL;
-  if (GNUNET_YES == success)
-    return;
-  GNUNET_STATISTICS_update (GST_stats,
-                            "# Peerstore failed to store foreign address",
-                            1,
-                            GNUNET_NO);
-}
-
-
-/**
- * Find the queue matching @a pid and @a address.
- *
- * @param pid peer the queue must go to
- * @param address address the queue must use
- * @return NULL if no such queue exists
- */
-static struct Queue *
-find_queue (const struct GNUNET_PeerIdentity *pid, const char *address)
-{
-  struct Neighbour *n;
-
-  n = lookup_neighbour (pid);
-  if (NULL == n)
-    return NULL;
-  for (struct Queue *pos = n->queue_head; NULL != pos;
-       pos = pos->next_neighbour)
-  {
-    if (0 == strcmp (pos->address, address))
-      return pos;
-  }
-  return NULL;
-}
-
-
-/**
- * Communicator gave us a transport address validation response.  Process the
- * request.
- *
- * @param cls a `struct CommunicatorMessageContext` (must call
- * #finish_cmc_handling() when done)
- * @param tvr the message that was received
- */
-static void
-handle_validation_response (
-  void *cls,
-  const struct TransportValidationResponseMessage *tvr)
-{
-  struct CommunicatorMessageContext *cmc = cls;
-  struct ValidationState *vs;
-  struct CheckKnownChallengeContext ckac = { .challenge = &tvr->challenge,
-                                             .vs = NULL };
-  struct GNUNET_TIME_Absolute origin_time;
-  struct Queue *q;
-  struct Neighbour *n;
-  struct VirtualLink *vl;
-
-  /* check this is one of our challenges */
-  (void) GNUNET_CONTAINER_multipeermap_get_multiple (validation_map,
-                                                     &cmc->im.sender,
-                                                     &check_known_challenge,
-                                                     &ckac);
-  if (NULL == (vs = ckac.vs))
-  {
-    /* This can happen simply if we 'forgot' the challenge by now,
-       i.e. because we received the validation response twice */
-    GNUNET_STATISTICS_update (GST_stats,
-                              "# Validations dropped, challenge unknown",
-                              1,
-                              GNUNET_NO);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Validation response %s dropped, challenge unknown\n",
-                GNUNET_sh2s (&tvr->challenge.value));
-    finish_cmc_handling (cmc);
-    return;
-  }
-
-  /* sanity check on origin time */
-  origin_time = GNUNET_TIME_absolute_ntoh (tvr->origin_time);
-  if ((origin_time.abs_value_us < vs->first_challenge_use.abs_value_us) ||
-      (origin_time.abs_value_us > vs->last_challenge_use.abs_value_us))
-  {
-    GNUNET_break_op (0);
-    finish_cmc_handling (cmc);
-    return;
-  }
-
-  {
-    /* check signature */
-    struct TransportValidationPS tvp = {
-      .purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_CHALLENGE),
-      .purpose.size = htonl (sizeof(tvp)),
-      .validity_duration = tvr->validity_duration,
-      .challenge = tvr->challenge
-    };
-
-    if (
-      GNUNET_OK !=
-      GNUNET_CRYPTO_eddsa_verify (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_CHALLENGE,
-                                  &tvp,
-                                  &tvr->signature,
-                                  &cmc->im.sender.public_key))
-    {
-      GNUNET_break_op (0);
-      finish_cmc_handling (cmc);
-      return;
-    }
-  }
-
-  /* validity is capped by our willingness to keep track of the
-     validation entry and the maximum the other peer allows */
-  vs->valid_until = GNUNET_TIME_relative_to_absolute (
-    GNUNET_TIME_relative_min (GNUNET_TIME_relative_ntoh (
-                                tvr->validity_duration),
-                              MAX_ADDRESS_VALID_UNTIL));
-  vs->validated_until =
-    GNUNET_TIME_absolute_min (vs->valid_until,
-                              GNUNET_TIME_relative_to_absolute (
-                                ADDRESS_VALIDATION_LIFETIME));
-  vs->validation_rtt = GNUNET_TIME_absolute_get_duration (origin_time);
-  vs->challenge_backoff = GNUNET_TIME_UNIT_ZERO;
-  GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_NONCE,
-                              &vs->challenge,
-                              sizeof(vs->challenge));
-  vs->first_challenge_use = GNUNET_TIME_absolute_subtract (
-    vs->validated_until,
-    GNUNET_TIME_relative_multiply (vs->validation_rtt,
-                                   VALIDATION_RTT_BUFFER_FACTOR));
-  vs->last_challenge_use =
-    GNUNET_TIME_UNIT_ZERO_ABS; /* challenge was not yet used */
-  update_next_challenge_time (vs, vs->first_challenge_use);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Validation response %s accepted, address valid until %s\n",
-              GNUNET_sh2s (&tvr->challenge.value),
-              GNUNET_STRINGS_absolute_time_to_string (vs->valid_until));
-  vs->sc = GNUNET_PEERSTORE_store (peerstore,
-                                   "transport",
-                                   &cmc->im.sender,
-                                   GNUNET_PEERSTORE_TRANSPORT_URLADDRESS_KEY,
-                                   vs->address,
-                                   strlen (vs->address) + 1,
-                                   vs->valid_until,
-                                   GNUNET_PEERSTORE_STOREOPTION_MULTIPLE,
-                                   &peerstore_store_validation_cb,
-                                   vs);
-  finish_cmc_handling (cmc);
-
-  /* Finally, we now possibly have a confirmed (!) working queue,
-     update queue status (if queue still is around) */
-  q = find_queue (&vs->pid, vs->address);
-  if (NULL == q)
-  {
-    GNUNET_STATISTICS_update (GST_stats,
-                              "# Queues lost at time of successful validation",
-                              1,
-                              GNUNET_NO);
-    return;
-  }
-  q->validated_until = vs->validated_until;
-  q->pd.aged_rtt = vs->validation_rtt;
-  n = q->neighbour;
-  vl = lookup_virtual_link (&vs->pid);
-  if (NULL == vl)
-  {
-    vl = GNUNET_new (struct VirtualLink);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Creating new virtual link %p to %s using direct neighbour!\n",
-                vl,
-                GNUNET_i2s (&vs->pid));
-    vl->confirmed = GNUNET_YES;
-    vl->message_uuid_ctr =
-      GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, UINT64_MAX);
-    vl->target = n->pid;
-    vl->core_recv_window = RECV_WINDOW_SIZE;
-    vl->available_fc_window_size = DEFAULT_WINDOW_SIZE;
-    vl->incoming_fc_window_size = DEFAULT_WINDOW_SIZE;
-    GNUNET_break (GNUNET_YES ==
-                  GNUNET_CONTAINER_multipeermap_put (
-                    links,
-                    &vl->target,
-                    vl,
-                    GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
-    vl->n = n;
-    n->vl = vl;
-    q->idle = GNUNET_YES;
-    vl->visibility_task =
-      GNUNET_SCHEDULER_add_at (q->validated_until, &check_link_down, vl);
-    consider_sending_fc (vl);
-    /* We lacked a confirmed connection to the target
-       before, so tell CORE about it (finally!) */
-    cores_send_connect_info (&n->pid);
-  }
-  else
-  {
-    /* Link was already up, remember n is also now available and we are done */
-    if (NULL == vl->n)
-    {
-      vl->n = n;
-      n->vl = vl;
-      if (GNUNET_YES == vl->confirmed)
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                    "Virtual link to %s could now also direct neighbour!\n",
-                    GNUNET_i2s (&vs->pid));
-    }
-    else
-    {
-      GNUNET_assert (n == vl->n);
-    }
-    if (GNUNET_NO == vl->confirmed)
-    {
-      vl->confirmed = GNUNET_YES;
-      q->idle = GNUNET_YES;
-      vl->visibility_task =
-        GNUNET_SCHEDULER_add_at (q->validated_until, &check_link_down, vl);
-      consider_sending_fc (vl);
-      /* We lacked a confirmed connection to the target
-         before, so tell CORE about it (finally!) */
-      cores_send_connect_info (&n->pid);
-    }
-  }
-}
-
-
-/**
- * Incoming meessage.  Process the request.
- *
- * @param im the send message that was received
- */
-static void
-handle_incoming_msg (void *cls,
-                     const struct GNUNET_TRANSPORT_IncomingMessage *im)
-{
-  struct TransportClient *tc = cls;
-  struct CommunicatorMessageContext *cmc =
-    GNUNET_new (struct CommunicatorMessageContext);
-
-  cmc->tc = tc;
-  cmc->im = *im;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received message with size %u via communicator from peer %s\n",
-              &im->header.size,
-              GNUNET_i2s (&im->sender));
-  demultiplex_with_cmc (cmc, (const struct GNUNET_MessageHeader *) &im[1]);
-}
-
-
-/**
- * Communicator gave us a transport address validation response.  Process the
- * request.
- *
- * @param cls a `struct CommunicatorMessageContext` (must call
- * #finish_cmc_handling() when done)
- * @param fc the message that was received
- */
-static void
-handle_flow_control (void *cls, const struct TransportFlowControlMessage *fc)
-{
-  struct CommunicatorMessageContext *cmc = cls;
-  struct VirtualLink *vl;
-  uint32_t seq;
-  struct GNUNET_TIME_Absolute st;
-  uint64_t os;
-  uint64_t wnd;
-  uint32_t random;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received FC from %s\n", GNUNET_i2s (&cmc->im.sender));
-  vl = lookup_virtual_link (&cmc->im.sender);
-  if (NULL == vl)
-  {
-    vl = GNUNET_new (struct VirtualLink);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "No virtual link for %p FC creating new unconfirmed virtual link to %s!\n",
-                vl,
-                GNUNET_i2s (&cmc->im.sender));
-    vl->confirmed = GNUNET_NO;
-    vl->message_uuid_ctr =
-      GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, UINT64_MAX);
-    vl->target = cmc->im.sender;
-    vl->core_recv_window = RECV_WINDOW_SIZE;
-    vl->available_fc_window_size = DEFAULT_WINDOW_SIZE;
-    vl->incoming_fc_window_size = DEFAULT_WINDOW_SIZE;
-    GNUNET_break (GNUNET_YES ==
-                  GNUNET_CONTAINER_multipeermap_put (
-                    links,
-                    &vl->target,
-                    vl,
-                    GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
-  }
-  st = GNUNET_TIME_absolute_ntoh (fc->sender_time);
-  if (st.abs_value_us < vl->last_fc_timestamp.abs_value_us)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "FC dropped: Message out of order\n");
-    /* out of order, drop */
-    GNUNET_STATISTICS_update (GST_stats,
-                              "# FC dropped: message out of order",
-                              1,
-                              GNUNET_NO);
-    finish_cmc_handling (cmc);
-    return;
-  }
-  seq = ntohl (fc->seq);
-  if (seq < vl->last_fc_seq)
-  {
-    /* Wrap-around/reset of other peer; start all counters from zero */
-    vl->outbound_fc_window_size_used = 0;
-  }
-  vl->last_fc_seq = seq;
-  vl->last_fc_timestamp = st;
-  vl->outbound_fc_window_size = GNUNET_ntohll (fc->inbound_window_size);
-  os = GNUNET_ntohll (fc->outbound_sent);
-  vl->incoming_fc_window_size_loss =
-    (int64_t) (os - vl->incoming_fc_window_size_used);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received FC from %s, seq %u, new window %llu (loss at %lld)\n",
-              GNUNET_i2s (&vl->target),
-              (unsigned int) seq,
-              (unsigned long long) vl->outbound_fc_window_size,
-              (long long) vl->incoming_fc_window_size_loss);
-  wnd = GNUNET_ntohll (fc->outbound_window_size);
-  random = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
-                                     UINT32_MAX);
-  if ((GNUNET_YES == vl->confirmed) && ((wnd < vl->incoming_fc_window_size) ||
-                                        (vl->last_outbound_window_size_received
-                                         != wnd) ||
-                                        (0 == random
-                                         % FC_NO_CHANGE_REPLY_PROBABILITY)))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Consider re-sending our FC message, as clearly the other peer's idea of the window is not up-to-date (%llu vs %llu) or %llu last received differs, or random reply %lu\n",
-                (unsigned long long) wnd,
-                (unsigned long long) vl->incoming_fc_window_size,
-                (unsigned long long) vl->last_outbound_window_size_received,
-                random % FC_NO_CHANGE_REPLY_PROBABILITY);
-    consider_sending_fc (vl);
-  }
-  if ((wnd == vl->incoming_fc_window_size) &&
-      (vl->last_outbound_window_size_received == wnd) &&
-      (NULL != vl->fc_retransmit_task))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Stopping FC retransmission to %s: peer is current at window %llu\n",
-                GNUNET_i2s (&vl->target),
-                (unsigned long long) wnd);
-    GNUNET_SCHEDULER_cancel (vl->fc_retransmit_task);
-    vl->fc_retransmit_task = NULL;
-    vl->fc_retransmit_count = 0;
-  }
-  vl->last_outbound_window_size_received = wnd;
-  /* FC window likely increased, check transmission possibilities! */
-  check_vl_transmission (vl);
-  finish_cmc_handling (cmc);
-}
-
-
-/**
- * Given an inbound message @a msg from a communicator @a cmc,
- * demultiplex it based on the type calling the right handler.
- *
- * @param cmc context for demultiplexing
- * @param msg message to demultiplex
- */
-static void
-demultiplex_with_cmc (struct CommunicatorMessageContext *cmc,
-                      const struct GNUNET_MessageHeader *msg)
-{
-  struct GNUNET_MQ_MessageHandler handlers[] =
-  { GNUNET_MQ_hd_var_size (fragment_box,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_FRAGMENT,
-                           struct TransportFragmentBoxMessage,
-                           cmc),
-    GNUNET_MQ_hd_var_size (reliability_box,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_RELIABILITY_BOX,
-                           struct TransportReliabilityBoxMessage,
-                           cmc),
-    GNUNET_MQ_hd_var_size (reliability_ack,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_RELIABILITY_ACK,
-                           struct TransportReliabilityAckMessage,
-                           cmc),
-    GNUNET_MQ_hd_var_size (backchannel_encapsulation,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_BACKCHANNEL_ENCAPSULATION,
-                           struct TransportBackchannelEncapsulationMessage,
-                           cmc),
-    GNUNET_MQ_hd_var_size (dv_learn,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_DV_LEARN,
-                           struct TransportDVLearnMessage,
-                           cmc),
-    GNUNET_MQ_hd_var_size (dv_box,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_DV_BOX,
-                           struct TransportDVBoxMessage,
-                           cmc),
-    GNUNET_MQ_hd_fixed_size (
-      validation_challenge,
-      GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_VALIDATION_CHALLENGE,
-      struct TransportValidationChallengeMessage,
-      cmc),
-    GNUNET_MQ_hd_fixed_size (flow_control,
-                             GNUNET_MESSAGE_TYPE_TRANSPORT_FLOW_CONTROL,
-                             struct TransportFlowControlMessage,
-                             cmc),
-    GNUNET_MQ_hd_fixed_size (
-      validation_response,
-      GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_VALIDATION_RESPONSE,
-      struct TransportValidationResponseMessage,
-      cmc),
-    GNUNET_MQ_handler_end () };
-  int ret;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Handling message of type %u with %u bytes\n",
-              (unsigned int) ntohs (msg->type),
-              (unsigned int) ntohs (msg->size));
-  ret = GNUNET_MQ_handle_message (handlers, msg);
-  if (GNUNET_SYSERR == ret)
-  {
-    GNUNET_break (0);
-    GNUNET_SERVICE_client_drop (cmc->tc->client);
-    GNUNET_free (cmc);
-    return;
-  }
-  if (GNUNET_NO == ret)
-  {
-    /* unencapsulated 'raw' message */
-    handle_raw_message (cmc, msg);
-  }
-}
-
-
-/**
- * New queue became available.  Check message.
- *
- * @param cls the client
- * @param aqm the send message that was sent
- */
-static int
-check_add_queue_message (void *cls,
-                         const struct GNUNET_TRANSPORT_AddQueueMessage *aqm)
-{
-  struct TransportClient *tc = cls;
-
-  if (CT_COMMUNICATOR != tc->type)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_MQ_check_zero_termination (aqm);
-  return GNUNET_OK;
-}
-
-
-/**
- * If necessary, generates the UUID for a @a pm
- *
- * @param pm pending message to generate UUID for.
- */
-static void
-set_pending_message_uuid (struct PendingMessage *pm)
-{
-  if (pm->msg_uuid_set)
-    return;
-  pm->msg_uuid.uuid = pm->vl->message_uuid_ctr++;
-  pm->msg_uuid_set = GNUNET_YES;
-}
-
-
-/**
- * Setup data structure waiting for acknowledgements.
- *
- * @param queue queue the @a pm will be sent over
- * @param dvh path the message will take, may be NULL
- * @param pm the pending message for transmission
- * @return corresponding fresh pending acknowledgement
- */
-static struct PendingAcknowledgement *
-prepare_pending_acknowledgement (struct Queue *queue,
-                                 struct DistanceVectorHop *dvh,
-                                 struct PendingMessage *pm)
-{
-  struct PendingAcknowledgement *pa;
-
-  pa = GNUNET_new (struct PendingAcknowledgement);
-  pa->queue = queue;
-  pa->dvh = dvh;
-  pa->pm = pm;
-  do
-  {
-    GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_NONCE,
-                                &pa->ack_uuid,
-                                sizeof(pa->ack_uuid));
-  }
-  while (GNUNET_YES != GNUNET_CONTAINER_multiuuidmap_put (
-           pending_acks,
-           &pa->ack_uuid.value,
-           pa,
-           GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
-  GNUNET_CONTAINER_MDLL_insert (queue, queue->pa_head, queue->pa_tail, pa);
-  GNUNET_CONTAINER_MDLL_insert (pm, pm->pa_head, pm->pa_tail, pa);
-  if (NULL != dvh)
-    GNUNET_CONTAINER_MDLL_insert (dvh, dvh->pa_head, dvh->pa_tail, pa);
-  pa->transmission_time = GNUNET_TIME_absolute_get ();
-  pa->message_size = pm->bytes_msg;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Waiting for ACKnowledgment `%s' for <%llu>\n",
-              GNUNET_uuid2s (&pa->ack_uuid.value),
-              pm->logging_uuid);
-  return pa;
-}
-
-
-/**
- * Fragment the given @a pm to the given @a mtu.  Adds
- * additional fragments to the neighbour as well. If the
- * @a mtu is too small, generates and error for the @a pm
- * and returns NULL.
- *
- * @param queue which queue to fragment for
- * @param dvh path the message will take, or NULL
- * @param pm pending message to fragment for transmission
- * @return new message to transmit
- */
-static struct PendingMessage *
-fragment_message (struct Queue *queue,
-                  struct DistanceVectorHop *dvh,
-                  struct PendingMessage *pm)
-{
-  struct PendingAcknowledgement *pa;
-  struct PendingMessage *ff;
-  uint16_t mtu;
-
-  mtu = (UINT16_MAX == queue->mtu)
-        ? UINT16_MAX - sizeof(struct GNUNET_TRANSPORT_SendMessageTo)
-        : queue->mtu;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Fragmenting message <%llu> with size %u to %s for MTU %u\n",
-              pm->logging_uuid,
-              pm->bytes_msg,
-              GNUNET_i2s (&pm->vl->target),
-              (unsigned int) mtu);
-  set_pending_message_uuid (pm);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Fragmenting message %llu <%llu> with size %u to %s for MTU %u\n",
-              (unsigned long long) pm->msg_uuid.uuid,
-              pm->logging_uuid,
-              pm->bytes_msg,
-              GNUNET_i2s (&pm->vl->target),
-              (unsigned int) mtu);
-
-  /* This invariant is established in #handle_add_queue_message() */
-  GNUNET_assert (mtu > sizeof(struct TransportFragmentBoxMessage));
-
-  /* select fragment for transmission, descending the tree if it has
-     been expanded until we are at a leaf or at a fragment that is small
-     enough
-   */
-  ff = pm;
-  while (((ff->bytes_msg > mtu) || (pm == ff)) &&
-         (ff->frag_off == ff->bytes_msg) && (NULL != ff->head_frag))
-  {
-    ff = ff->head_frag;   /* descent into fragmented fragments */
-  }
-
-  if (((ff->bytes_msg > mtu) || (pm == ff)) && (ff->frag_off < ff->bytes_msg))
-  {
-    /* Did not yet calculate all fragments, calculate next fragment */
-    struct PendingMessage *frag;
-    struct TransportFragmentBoxMessage tfb;
-    const char *orig;
-    char *msg;
-    uint16_t fragmax;
-    uint16_t fragsize;
-    uint16_t msize;
-    uint16_t xoff = 0;
-
-    orig = (const char *) &ff[1];
-    msize = ff->bytes_msg;
-    if (pm != ff)
-    {
-      const struct TransportFragmentBoxMessage *tfbo;
-
-      tfbo = (const struct TransportFragmentBoxMessage *) orig;
-      orig += sizeof(struct TransportFragmentBoxMessage);
-      msize -= sizeof(struct TransportFragmentBoxMessage);
-      xoff = ntohs (tfbo->frag_off);
-    }
-    fragmax = mtu - sizeof(struct TransportFragmentBoxMessage);
-    fragsize = GNUNET_MIN (msize - ff->frag_off, fragmax);
-    frag =
-      GNUNET_malloc (sizeof(struct PendingMessage)
-                     + sizeof(struct TransportFragmentBoxMessage) + fragsize);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "3 created pm %p from pm %p storing vl %p from pm %p\n",
-                frag,
-                ff,
-                pm->vl,
-                pm);
-    frag->logging_uuid = logging_uuid_gen++;
-    frag->vl = pm->vl;
-    frag->frag_parent = ff;
-    frag->timeout = pm->timeout;
-    frag->bytes_msg = sizeof(struct TransportFragmentBoxMessage) + fragsize;
-    frag->pmt = PMT_FRAGMENT_BOX;
-    msg = (char *) &frag[1];
-    tfb.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_FRAGMENT);
-    tfb.header.size =
-      htons (sizeof(struct TransportFragmentBoxMessage) + fragsize);
-    pa = prepare_pending_acknowledgement (queue, dvh, frag);
-    tfb.ack_uuid = pa->ack_uuid;
-    tfb.msg_uuid = pm->msg_uuid;
-    tfb.frag_off = htons (ff->frag_off + xoff);
-    tfb.msg_size = htons (pm->bytes_msg);
-    memcpy (msg, &tfb, sizeof(tfb));
-    memcpy (&msg[sizeof(tfb)], &orig[ff->frag_off], fragsize);
-    GNUNET_CONTAINER_MDLL_insert (frag, ff->head_frag,
-                                  ff->tail_frag, frag);
-    ff->frag_off += fragsize;
-    ff = frag;
-  }
-
-  /* Move head to the tail and return it */
-  GNUNET_CONTAINER_MDLL_remove (frag,
-                                ff->frag_parent->head_frag,
-                                ff->frag_parent->tail_frag,
-                                ff);
-  GNUNET_CONTAINER_MDLL_insert_tail (frag,
-                                     ff->frag_parent->head_frag,
-                                     ff->frag_parent->tail_frag,
-                                     ff);
-
-  return ff;
-}
-
-
-/**
- * Reliability-box the given @a pm. On error (can there be any), NULL
- * may be returned, otherwise the "replacement" for @a pm (which
- * should then be added to the respective neighbour's queue instead of
- * @a pm).  If the @a pm is already fragmented or reliability boxed,
- * or itself an ACK, this function simply returns @a pm.
- *
- * @param queue which queue to prepare transmission for
- * @param dvh path the message will take, or NULL
- * @param pm pending message to box for transmission over unreliabile queue
- * @return new message to transmit
- */
-static struct PendingMessage *
-reliability_box_message (struct Queue *queue,
-                         struct DistanceVectorHop *dvh,
-                         struct PendingMessage *pm)
-{
-  struct TransportReliabilityBoxMessage rbox;
-  struct PendingAcknowledgement *pa;
-  struct PendingMessage *bpm;
-  char *msg;
-
-  if ((PMT_CORE != pm->pmt) && (PMT_DV_BOX != pm->pmt))
-    return pm; /* already fragmented or reliability boxed, or control message:
-                  do nothing */
-  if (NULL != pm->bpm)
-    return pm->bpm; /* already computed earlier: do nothing */
-  // TODO I guess we do not need this assertion. We might have a DLL with
-  // fragments, because the MTU changed, and we do not need to fragment anymore.
-  // But we should keep the fragments until message was completed, because
-  // the MTU might change again.
-  // GNUNET_assert (NULL == pm->head_frag);
-  if (pm->bytes_msg + sizeof(rbox) > UINT16_MAX)
-  {
-    /* failed hard */
-    GNUNET_break (0);
-    client_send_response (pm);
-    return NULL;
-  }
-
-  pa = prepare_pending_acknowledgement (queue, dvh, pm);
-
-  bpm = GNUNET_malloc (sizeof(struct PendingMessage) + sizeof(rbox)
-                       + pm->bytes_msg);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "4 created pm %p storing vl %p from pm %p\n",
-              bpm,
-              pm->vl,
-              pm);
-  bpm->logging_uuid = logging_uuid_gen++;
-  bpm->vl = pm->vl;
-  bpm->frag_parent = pm;
-  // Why was this needed?
-  // GNUNET_CONTAINER_MDLL_insert (frag, pm->head_frag, pm->tail_frag, bpm);
-  bpm->timeout = pm->timeout;
-  bpm->pmt = PMT_RELIABILITY_BOX;
-  bpm->bytes_msg = pm->bytes_msg + sizeof(rbox);
-  set_pending_message_uuid (bpm);
-  rbox.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_RELIABILITY_BOX);
-  rbox.header.size = htons (sizeof(rbox) + pm->bytes_msg);
-  rbox.ack_countdown = htonl (0);  // FIXME: implement ACK countdown support
-
-  rbox.ack_uuid = pa->ack_uuid;
-  msg = (char *) &bpm[1];
-  memcpy (msg, &rbox, sizeof(rbox));
-  memcpy (&msg[sizeof(rbox)], &pm[1], pm->bytes_msg);
-  pm->bpm = bpm;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Preparing reliability box for message <%llu> of size %lu (%lu) to %s on queue %s\n",
-              pm->logging_uuid,
-              pm->bytes_msg,
-              ntohs (((const struct GNUNET_MessageHeader *) &pm[1])->size),
-              GNUNET_i2s (&pm->vl->target),
-              queue->address);
-  return bpm;
-}
-
-
-static void
-reorder_root_pm (struct PendingMessage *pm,
-                 struct GNUNET_TIME_Absolute next_attempt)
-{
-  struct VirtualLink *vl = pm->vl;
-  struct PendingMessage *pos;
-
-  /* re-insert sort in neighbour list */
-  GNUNET_CONTAINER_MDLL_remove (vl,
-                                vl->pending_msg_head,
-                                vl->pending_msg_tail,
-                                pm);
-  pos = vl->pending_msg_tail;
-  while ((NULL != pos) &&
-         (next_attempt.abs_value_us > pos->next_attempt.abs_value_us))
-    pos = pos->prev_vl;
-  GNUNET_CONTAINER_MDLL_insert_after (vl,
-                                      vl->pending_msg_head,
-                                      vl->pending_msg_tail,
-                                      pos,
-                                      pm);
-}
-
-
-/**
- * Change the value of the `next_attempt` field of @a pm
- * to @a next_attempt and re-order @a pm in the transmission
- * list as required by the new timestamp.
- *
- * @param pm a pending message to update
- * @param next_attempt timestamp to use
- */
-static void
-update_pm_next_attempt (struct PendingMessage *pm,
-                        struct GNUNET_TIME_Absolute next_attempt)
-{
-  struct VirtualLink *vl = pm->vl;
-
-  // TODO Do we really need a next_attempt value for PendingMessage other than the root Pending Message?
-  pm->next_attempt = next_attempt;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Next attempt for message <%llu> set to %s\n",
-              pm->logging_uuid,
-              GNUNET_STRINGS_absolute_time_to_string (next_attempt));
-
-  if (NULL == pm->frag_parent)
-  {
-    reorder_root_pm (pm, next_attempt);
-  }
-  else if ((PMT_RELIABILITY_BOX == pm->pmt) || (PMT_DV_BOX == pm->pmt))
-  {
-    struct PendingMessage *root = pm->frag_parent;
-
-    while (NULL != root->frag_parent)
-      root = root->frag_parent;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Next attempt for root message <%llu> set to %s\n",
-                root->logging_uuid);
-    root->next_attempt = next_attempt;
-    reorder_root_pm (root, next_attempt);
-  }
-  else
-  {
-    /* re-insert sort in fragment list */
-    struct PendingMessage *fp = pm->frag_parent;
-    struct PendingMessage *pos;
-
-    GNUNET_CONTAINER_MDLL_remove (frag, fp->head_frag, fp->tail_frag, pm);
-    pos = fp->tail_frag;
-    while ((NULL != pos) &&
-           (next_attempt.abs_value_us > pos->next_attempt.abs_value_us))
-      pos = pos->prev_frag;
-    GNUNET_CONTAINER_MDLL_insert_after (frag,
-                                        fp->head_frag,
-                                        fp->tail_frag,
-                                        pos,
-                                        pm);
-    if (NULL == pos)
-    {
-      pos = fp;
-      // Get the root pm
-      while (NULL != pos->frag_parent)
-        pos = pos->frag_parent;
-      pos->next_attempt = next_attempt;
-      reorder_root_pm (pos, next_attempt);
-    }
-  }
-}
-
-
-/**
- * Context for #select_best_pending_from_link().
- */
-struct PendingMessageScoreContext
-{
-  /**
-   * Set to the best message that was found, NULL for none.
-   */
-  struct PendingMessage *best;
-
-  /**
-   * DVH that @e best should take, or NULL for direct transmission.
-   */
-  struct DistanceVectorHop *dvh;
-
-  /**
-   * What is the estimated total overhead for this message?
-   */
-  size_t real_overhead;
-
-  /**
-   * Number of pending messages we seriously considered this time.
-   */
-  unsigned int consideration_counter;
-
-  /**
-   * Did we have to fragment?
-   */
-  int frag;
-
-  /**
-   * Did we have to reliability box?
-   */
-  int relb;
-
-  /**
-   * There are pending messages, but it was to early to send one of them.
-   */
-  int to_early;
-
-  /**
-   * When will we try to transmit the message again for which it was to early to retry.
-   */
-  struct GNUNET_TIME_Relative to_early_retry_delay;
-};
-
-
-/**
- * Select the best pending message from @a vl for transmission
- * via @a queue.
- *
- * @param sc[in,out] best message so far (NULL for none), plus scoring data
- * @param queue the queue that will be used for transmission
- * @param vl the virtual link providing the messages
- * @param dvh path we are currently considering, or NULL for none
- * @param overhead number of bytes of overhead to be expected
- *        from DV encapsulation (0 for without DV)
- */
-static void
-select_best_pending_from_link (struct PendingMessageScoreContext *sc,
-                               struct Queue *queue,
-                               struct VirtualLink *vl,
-                               struct DistanceVectorHop *dvh,
-                               size_t overhead)
-{
-  struct GNUNET_TIME_Absolute now;
-
-  now = GNUNET_TIME_absolute_get ();
-  for (struct PendingMessage *pos = vl->pending_msg_head; NULL != pos;
-       pos = pos->next_vl)
-  {
-    size_t real_overhead = overhead;
-    int frag;
-    int relb;
-
-    if ((NULL != dvh) && (PMT_DV_BOX == pos->pmt))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "DV messages must not be DV-routed to next hop!\n");
-      continue;   /* DV messages must not be DV-routed to next hop! */
-    }
-    if (pos->next_attempt.abs_value_us > now.abs_value_us)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "too early for all messages, they are sorted by next_attempt\n");
-      sc->to_early = GNUNET_YES;
-      sc->to_early_retry_delay = GNUNET_TIME_absolute_get_remaining (
-        pos->next_attempt);
-
-      break;   /* too early for all messages, they are sorted by next_attempt */
-    }
-    sc->to_early = GNUNET_NO;
-    if (NULL != pos->qe)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "not eligible\n");
-      continue;   /* not eligible */
-    }
-    sc->consideration_counter++;
-    /* determine if we have to fragment, if so add fragmentation
-       overhead! */
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "check %u for sc->best\n",
-                pos->logging_uuid);
-    frag = GNUNET_NO;
-    if (((0 != queue->mtu) &&
-         (pos->bytes_msg + real_overhead > queue->mtu)) ||
-        (pos->bytes_msg > UINT16_MAX - sizeof(struct
-                                              GNUNET_TRANSPORT_SendMessageTo))
-        ||
-        (NULL != pos->head_frag /* fragments already exist, should
-                                     respect that even if MTU is UINT16_MAX for
-                                     this queue */))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "fragment msg with size %u, realoverhead is %u\n",
-                  pos->bytes_msg,
-                  real_overhead);
-      frag = GNUNET_YES;
-      if (GNUNET_TRANSPORT_CC_RELIABLE == queue->tc->details.communicator.cc)
-      {
-        /* FIXME-FRAG-REL-UUID: we could use an optimized, shorter fragmentation
-           header without the ACK UUID when using a *reliable* channel! */
-      }
-      real_overhead = overhead + sizeof(struct TransportFragmentBoxMessage);
-    }
-    /* determine if we have to reliability-box, if so add reliability box
-       overhead */
-    relb = GNUNET_NO;
-    if ((GNUNET_NO == frag) &&
-        (0 == (pos->prefs & GNUNET_MQ_PREF_UNRELIABLE)) &&
-        (GNUNET_TRANSPORT_CC_RELIABLE != queue->tc->details.communicator.cc))
-    {
-      real_overhead += sizeof(struct TransportReliabilityBoxMessage);
-
-      if ((0 != queue->mtu) && (pos->bytes_msg + real_overhead > queue->mtu))
-      {
-        frag = GNUNET_YES;
-        real_overhead = overhead + sizeof(struct TransportFragmentBoxMessage);
-      }
-      else
-      {
-        relb = GNUNET_YES;
-      }
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Create reliability box of msg with size %u, realoverhead is %u %u %u %u\n",
-                  pos->bytes_msg,
-                  real_overhead,
-                  queue->mtu,
-                  frag,
-                  relb);
-    }
-
-    /* Finally, compare to existing 'best' in sc to see if this 'pos' pending
-       message would beat it! */
-    if (NULL != sc->best)
-    {
-      /* CHECK if pos fits queue BETTER (=smaller) than pm, if not: continue;
-         OPTIMIZE-ME: This is a heuristic, which so far has NOT been
-         experimentally validated. There may be some huge potential for
-         improvement here. Also, we right now only compare how well the
-         given message fits _this_ queue, and do not consider how well other
-         queues might suit the message. Taking other queues into consideration
-         may further improve the result, but could also be expensive
-         in terms of CPU time.  */
-      long long sc_score = sc->frag * 40 + sc->relb * 20 + sc->real_overhead;
-      long long pm_score = frag * 40 + relb * 20 + real_overhead;
-      long long time_delta =
-        (sc->best->next_attempt.abs_value_us - pos->next_attempt.abs_value_us)
-        / 1000LL;
-
-      /* "time_delta" considers which message has been 'ready' for transmission
-         for longer, if a message has a preference for low latency, increase
-         the weight of the time_delta by 10x if it is favorable for that message */
-      if ((0 != (pos->prefs & GNUNET_MQ_PREF_LOW_LATENCY)) &&
-          (0 != (sc->best->prefs & GNUNET_MQ_PREF_LOW_LATENCY)))
-        time_delta *= 10;     /* increase weight (always, both are low latency) */
-      else if ((0 != (pos->prefs & GNUNET_MQ_PREF_LOW_LATENCY)) &&
-               (time_delta > 0))
-        time_delta *= 10;     /* increase weight, favors 'pos', which is low latency */
-      else if ((0 != (sc->best->prefs & GNUNET_MQ_PREF_LOW_LATENCY)) &&
-               (time_delta < 0))
-        time_delta *= 10;     /* increase weight, favors 'sc->best', which is low latency */
-      if (0 != queue->mtu)
-      {
-        /* Grant bonus if we are below MTU, larger bonus the closer we will
-           be to the MTU */
-        if (queue->mtu > sc->real_overhead + sc->best->bytes_msg)
-          sc_score -= queue->mtu - (sc->real_overhead + sc->best->bytes_msg);
-        if (queue->mtu > real_overhead + pos->bytes_msg)
-          pm_score -= queue->mtu - (real_overhead + pos->bytes_msg);
-      }
-      if (sc_score + time_delta > pm_score)
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                    "sc_score of %u larger, keep sc->best %u\n",
-                    pos->logging_uuid,
-                    sc->best->logging_uuid);
-        continue;     /* sc_score larger, keep sc->best */
-      }
-    }
-    sc->best = pos;
-    sc->dvh = dvh;
-    sc->frag = frag;
-    sc->relb = relb;
-    sc->real_overhead = real_overhead;
-  }
-}
-
-
-/**
- * Function to call to further operate on the now DV encapsulated
- * message @a hdr, forwarding it via @a next_hop under respect of
- * @a options.
- *
- * @param cls a `struct PendingMessageScoreContext`
- * @param next_hop next hop of the DV path
- * @param hdr encapsulated message, technically a `struct TransportDVBoxMessage`
- * @param options options of the original message
- */
-static void
-extract_box_cb (void *cls,
-                struct Neighbour *next_hop,
-                const struct GNUNET_MessageHeader *hdr,
-                enum RouteMessageOptions options)
-{
-  struct PendingMessageScoreContext *sc = cls;
-  struct PendingMessage *pm = sc->best;
-  struct PendingMessage *bpm;
-  uint16_t bsize = ntohs (hdr->size);
-
-  GNUNET_assert (NULL == pm->bpm);
-  bpm = GNUNET_malloc (sizeof(struct PendingMessage) + bsize);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "5 created pm %p storing vl %p from pm %p\n",
-              bpm,
-              pm->vl,
-              pm);
-  bpm->logging_uuid = logging_uuid_gen++;
-  bpm->pmt = PMT_DV_BOX;
-  bpm->vl = pm->vl;
-  bpm->timeout = pm->timeout;
-  bpm->bytes_msg = bsize;
-  bpm->frag_parent = pm;
-  set_pending_message_uuid (bpm);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Creating DV Box %llu for original message %llu (next hop is %s)\n",
-              bpm->logging_uuid,
-              pm->logging_uuid,
-              GNUNET_i2s (&next_hop->pid));
-  memcpy (&bpm[1], hdr, bsize);
-  pm->bpm = bpm;
-}
-
-
-/**
- * We believe we are ready to transmit a `struct PendingMessage` on a
- * queue, the big question is which one!  We need to see if there is
- * one pending that is allowed by flow control and congestion control
- * and (ideally) matches our queue's performance profile.
- *
- * If such a message is found, we give the message to the communicator
- * for transmission (updating the tracker, and re-scheduling ourselves
- * if applicable).
- *
- * If no such message is found, the queue's `idle` field must be set
- * to #GNUNET_YES.
- *
- * @param cls the `struct Queue` to process transmissions for
- */
-static void
-transmit_on_queue (void *cls)
-{
-  struct Queue *queue = cls;
-  struct Neighbour *n = queue->neighbour;
-  struct PendingMessageScoreContext sc;
-  struct PendingMessage *pm;
-
-  queue->transmit_task = NULL;
-  if (NULL == n->vl)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Virtual link `%s' is down, cannot have PM for queue `%s'\n",
-                GNUNET_i2s (&n->pid),
-                queue->address);
-    queue->idle = GNUNET_YES;
-    return;
-  }
-  memset (&sc, 0, sizeof(sc));
-  select_best_pending_from_link (&sc, queue, n->vl, NULL, 0);
-  if (NULL == sc.best)
-  {
-    /* Also look at DVH that have the n as first hop! */
-    for (struct DistanceVectorHop *dvh = n->dv_head; NULL != dvh;
-         dvh = dvh->next_neighbour)
-    {
-      select_best_pending_from_link (&sc,
-                                     queue,
-                                     dvh->dv->vl,
-                                     dvh,
-                                     sizeof(struct GNUNET_PeerIdentity)
-                                     * (1 + dvh->distance)
-                                     + sizeof(struct TransportDVBoxMessage)
-                                     + sizeof(struct TransportDVBoxPayloadP));
-    }
-  }
-  if (NULL == sc.best)
-  {
-    /* no message pending, nothing to do here! */
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "No pending messages, queue `%s' to %s now idle\n",
-                queue->address,
-                GNUNET_i2s (&n->pid));
-    if (GNUNET_YES == sc.to_early)
-      schedule_transmit_on_queue (sc.to_early_retry_delay,
-                                  queue,
-                                  GNUNET_SCHEDULER_PRIORITY_DEFAULT);
-    queue->idle = GNUNET_YES;
-    return;
-  }
-  /* There is a message pending, we are certainly not idle */
-  queue->idle = GNUNET_NO;
-
-  /* Given selection in `sc`, do transmission */
-  pm = sc.best;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Selected message <%llu>\n",
-              pm->logging_uuid);
-  if (NULL != sc.dvh)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Is this %u a DV box?\n",
-                pm->pmt);
-    GNUNET_assert (PMT_DV_BOX != pm->pmt);
-    if ((NULL != sc.best->bpm) && (sc.best->bpm->used_dvh != sc.dvh))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Discard old box, because we have a new DV path.\n");
-      free_pending_message (sc.best->bpm);
-      sc.best->bpm = NULL;
-    }
-
-    if (NULL == sc.best->bpm)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "encapsulate_for_dv 2\n");
-      encapsulate_for_dv (sc.dvh->dv,
-                          1,
-                          &sc.dvh,
-                          (const struct GNUNET_MessageHeader *) &sc.best[1],
-                          &extract_box_cb,
-                          &sc,
-                          RMO_NONE,
-                          GNUNET_NO);
-      GNUNET_assert (NULL != sc.best->bpm);
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "%u %u %u %u %u\n",
-                  sizeof(struct GNUNET_PeerIdentity),
-                  sizeof(struct TransportDVBoxMessage),
-                  sizeof(struct TransportDVBoxPayloadP),
-                  sizeof(struct TransportFragmentBoxMessage),
-                  ((const struct GNUNET_MessageHeader *) &sc.best[1])->size);
-      sc.best->bpm->used_dvh = sc.dvh;
-    }
-    pm = sc.best->bpm;
-  }
-  if (GNUNET_YES == sc.frag)
-  {
-    pm = fragment_message (queue, sc.dvh, pm);
-    if (NULL == pm)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Fragmentation failed queue %s to %s for <%llu>, trying again\n",
-                  queue->address,
-                  GNUNET_i2s (&n->pid),
-                  sc.best->logging_uuid);
-      schedule_transmit_on_queue (GNUNET_TIME_UNIT_ZERO,
-                                  queue,
-                                  GNUNET_SCHEDULER_PRIORITY_DEFAULT);
-      return;
-    }
-  }
-  else if (GNUNET_YES == sc.relb)
-  {
-    pm = reliability_box_message (queue, sc.dvh, pm);
-    if (NULL == pm)
-    {
-      /* Reliability boxing failed, try next message... */
-      GNUNET_log (
-        GNUNET_ERROR_TYPE_DEBUG,
-        "Reliability boxing failed queue %s to %s for <%llu>, trying again\n",
-        queue->address,
-        GNUNET_i2s (&n->pid),
-        sc.best->logging_uuid);
-      schedule_transmit_on_queue (GNUNET_TIME_UNIT_ZERO,
-                                  queue,
-                                  GNUNET_SCHEDULER_PRIORITY_DEFAULT);
-      return;
-    }
-  }
-
-  /* Pass 'pm' for transission to the communicator */
-  GNUNET_log (
-    GNUNET_ERROR_TYPE_DEBUG,
-    "Passing message <%llu> to queue %s for peer %s (considered %u others)\n",
-    pm->logging_uuid,
-    queue->address,
-    GNUNET_i2s (&n->pid),
-    sc.consideration_counter);
-
-  /* Flow control: increment amount of traffic sent; if we are routing
-     via DV (and thus the ultimate target of the pending message is for
-     a different virtual link than the one of the queue), then we need
-     to use up not only the window of the direct link but also the
-     flow control window for the DV link! */
-  pm->vl->outbound_fc_window_size_used += pm->bytes_msg;
-
-  if (pm->vl != queue->neighbour->vl)
-  {
-    /* If the virtual link of the queue differs, this better be distance
-       vector routing! */
-    GNUNET_assert (NULL != sc.dvh);
-    /* If we do distance vector routing, we better not do this for a
-       message that was itself DV-routed */
-    GNUNET_assert (PMT_DV_BOX != sc.best->pmt);
-    /* We use the size of the unboxed message here, to avoid counting
-       the DV-Box header which is eaten up on the way by intermediaries */
-    queue->neighbour->vl->outbound_fc_window_size_used += sc.best->bytes_msg;
-  }
-  else
-  {
-    GNUNET_assert (NULL == sc.dvh);
-  }
-
-  queue_send_msg (queue, pm, &pm[1], pm->bytes_msg);
-
-  /* Check if this transmission somehow conclusively finished handing 'pm'
-     even without any explicit ACKs */
-  if ((PMT_CORE == pm->pmt) ||
-      (GNUNET_TRANSPORT_CC_RELIABLE == queue->tc->details.communicator.cc))
-  {
-    completed_pending_message (pm);
-  }
-  else
-  {
-    struct GNUNET_TIME_Relative wait_duration;
-
-    /* Message not finished, waiting for acknowledgement.
-       Update time by which we might retransmit 's' based on queue
-       characteristics (i.e. RTT); it takes one RTT for the message to
-       arrive and the ACK to come back in the best case; but the other
-       side is allowed to delay ACKs by 2 RTTs, so we use 4 RTT before
-       retransmitting.
-
-       OPTIMIZE: Note that in the future this heuristic should likely
-       be improved further (measure RTT stability, consider message
-       urgency and size when delaying ACKs, etc.) */
-
-    if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us !=
-        queue->pd.aged_rtt.rel_value_us)
-      wait_duration = queue->pd.aged_rtt;
-    else
-      wait_duration = DEFAULT_ACK_WAIT_DURATION;
-    struct GNUNET_TIME_Absolute next = GNUNET_TIME_relative_to_absolute (
-      GNUNET_TIME_relative_multiply (
-        wait_duration, 4));
-    struct GNUNET_TIME_Relative plus = GNUNET_TIME_relative_multiply (
-      wait_duration, 4);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Waiting %s (%llu) for ACK until %llu\n",
-                GNUNET_STRINGS_relative_time_to_string (
-                  GNUNET_TIME_relative_multiply (
-                    queue->pd.aged_rtt, 4), GNUNET_NO),
-                plus,
-                next);
-    update_pm_next_attempt (pm,
-                            GNUNET_TIME_relative_to_absolute (
-                              GNUNET_TIME_relative_multiply (wait_duration,
-                                                             4)));
-  }
-  /* finally, re-schedule queue transmission task itself */
-  schedule_transmit_on_queue (GNUNET_TIME_UNIT_ZERO,
-                              queue,
-                              GNUNET_SCHEDULER_PRIORITY_DEFAULT);
-}
-
-
-/**
- * Queue to a peer went down.  Process the request.
- *
- * @param cls the client
- * @param dqm the send message that was sent
- */
-static void
-handle_del_queue_message (void *cls,
-                          const struct GNUNET_TRANSPORT_DelQueueMessage *dqm)
-{
-  struct TransportClient *tc = cls;
-
-  if (CT_COMMUNICATOR != tc->type)
-  {
-    GNUNET_break (0);
-    GNUNET_SERVICE_client_drop (tc->client);
-    return;
-  }
-  for (struct Queue *queue = tc->details.communicator.queue_head; NULL != queue;
-       queue = queue->next_client)
-  {
-    struct Neighbour *neighbour = queue->neighbour;
-
-    if ((dqm->qid != queue->qid) ||
-        (0 != GNUNET_memcmp (&dqm->receiver, &neighbour->pid)))
-      continue;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Dropped queue %s to peer %s\n",
-                queue->address,
-                GNUNET_i2s (&neighbour->pid));
-    free_queue (queue);
-    GNUNET_SERVICE_client_continue (tc->client);
-    return;
-  }
-  GNUNET_break (0);
-  GNUNET_SERVICE_client_drop (tc->client);
-}
-
-
-/**
- * Message was transmitted.  Process the request.
- *
- * @param cls the client
- * @param sma the send message that was sent
- */
-static void
-handle_send_message_ack (void *cls,
-                         const struct GNUNET_TRANSPORT_SendMessageToAck *sma)
-{
-  struct TransportClient *tc = cls;
-  struct QueueEntry *qe;
-  struct PendingMessage *pm;
-
-  if (CT_COMMUNICATOR != tc->type)
-  {
-    GNUNET_break (0);
-    GNUNET_SERVICE_client_drop (tc->client);
-    return;
-  }
-
-  /* find our queue entry matching the ACK */
-  qe = NULL;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Looking for queue for PID %s\n",
-              GNUNET_i2s (&sma->receiver));
-  for (struct Queue *queue = tc->details.communicator.queue_head; NULL != queue;
-       queue = queue->next_client)
-  {
-    if (0 != GNUNET_memcmp (&queue->neighbour->pid, &sma->receiver))
-      continue;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Found PID %s\n",
-                GNUNET_i2s (&queue->neighbour->pid));
-
-
-    for (struct QueueEntry *qep = queue->queue_head; NULL != qep;
-         qep = qep->next)
-    {
-      if (qep->mid != sma->mid)
-        continue;
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "QueueEntry MID: %llu on queue QID: %llu, Ack MID: %llu\n",
-                  (unsigned long long) qep->mid,
-                  (unsigned long long) queue->qid,
-                  (unsigned long long) sma->mid);
-      qe = qep;
-      if ((NULL != qe->pm)&&(qe->pm->qe != qe))
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                    "For pending message %llu we had retransmissions.\n",
-                    qe->pm->logging_uuid);
-      break;
-    }
-  }
-  if (NULL == qe)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "No QueueEntry found for Ack MID %llu\n",
-                (unsigned long long) sma->mid);
-    // TODO I guess this can happen, if the Ack from the peer comes before the Ack from the queue.
-    /* this should never happen */
-    /*GNUNET_break (0);
-      GNUNET_SERVICE_client_drop (tc->client);*/
-    GNUNET_SERVICE_client_continue (tc->client);
-    return;
-  }
-  GNUNET_CONTAINER_DLL_remove (qe->queue->queue_head,
-                               qe->queue->queue_tail,
-                               qe);
-  qe->queue->queue_length--;
-  tc->details.communicator.total_queue_length--;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received ACK on queue %s to peer %s (new length: %u/%u)\n",
-              qe->queue->address,
-              GNUNET_i2s (&qe->queue->neighbour->pid),
-              qe->queue->queue_length,
-              tc->details.communicator.total_queue_length);
-  GNUNET_SERVICE_client_continue (tc->client);
-
-  /* if applicable, resume transmissions that waited on ACK */
-  if (COMMUNICATOR_TOTAL_QUEUE_LIMIT - 1 ==
-      tc->details.communicator.total_queue_length)
-  {
-    /* Communicator dropped below threshold, resume all queues
-       incident with this client! */
-    GNUNET_STATISTICS_update (
-      GST_stats,
-      "# Transmission throttled due to communicator queue limit",
-      -1,
-      GNUNET_NO);
-    for (struct Queue *queue = tc->details.communicator.queue_head;
-         NULL != queue;
-         queue = queue->next_client)
-    {
-      schedule_transmit_on_queue (GNUNET_TIME_UNIT_ZERO,
-                                  queue,
-                                  GNUNET_SCHEDULER_PRIORITY_DEFAULT);
-    }
-  }
-  else if (QUEUE_LENGTH_LIMIT - 1 == qe->queue->queue_length)
-  {
-    /* queue dropped below threshold; only resume this one queue */
-    GNUNET_STATISTICS_update (GST_stats,
-                              "# Transmission throttled due to queue queue limit",
-                              -1,
-                              GNUNET_NO);
-    schedule_transmit_on_queue (GNUNET_TIME_UNIT_ZERO,
-                                qe->queue,
-                                GNUNET_SCHEDULER_PRIORITY_DEFAULT);
-  }
-  else if (1 == qe->queue->q_capacity)
-  {
-    // TODO I guess this will never happen, because the communicator triggers this by updating its queue length itself.
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Transmission rescheduled due to communicator message queue with qid %u has capacity %lu.\n",
-                qe->queue->qid,
-                qe->queue->q_capacity);
-    /* message queue has capacity; only resume this one queue */
-    /* queue dropped below threshold; only resume this one queue */
-    GNUNET_STATISTICS_update (GST_stats,
-                              "# Transmission throttled due to message queue capacity",
-                              -1,
-                              GNUNET_NO);
-    schedule_transmit_on_queue (GNUNET_TIME_UNIT_ZERO,
-                                qe->queue,
-                                GNUNET_SCHEDULER_PRIORITY_DEFAULT);
-  }
-
-  if (NULL != (pm = qe->pm))
-  {
-    struct VirtualLink *vl;
-
-    // GNUNET_assert (qe == pm->qe);
-    pm->qe = NULL;
-    /* If waiting for this communicator may have blocked transmission
-       of pm on other queues for this neighbour, force schedule
-       transmit on queue for queues of the neighbour */
-    if (NULL == pm->frag_parent)
-    {
-      vl = pm->vl;
-      if ((NULL != vl) &&
-          (NULL != vl->pending_msg_head) &&
-          (vl->pending_msg_head == pm))
-        check_vl_transmission (vl);
-    }
-  }
-  GNUNET_free (qe);
-}
-
-
-/**
- * Iterator telling new MONITOR client about all existing
- * queues to peers.
- *
- * @param cls the new `struct TransportClient`
- * @param pid a connected peer
- * @param value the `struct Neighbour` with more information
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-notify_client_queues (void *cls,
-                      const struct GNUNET_PeerIdentity *pid,
-                      void *value)
-{
-  struct TransportClient *tc = cls;
-  struct Neighbour *neighbour = value;
-
-  GNUNET_assert (CT_MONITOR == tc->type);
-  for (struct Queue *q = neighbour->queue_head; NULL != q;
-       q = q->next_neighbour)
-  {
-    struct MonitorEvent me = { .rtt = q->pd.aged_rtt,
-                               .cs = q->cs,
-                               .num_msg_pending = q->num_msg_pending,
-                               .num_bytes_pending = q->num_bytes_pending };
-
-    notify_monitor (tc, pid, q->address, q->nt, &me);
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Initialize a monitor client.
- *
- * @param cls the client
- * @param start the start message that was sent
- */
-static void
-handle_monitor_start (void *cls,
-                      const struct GNUNET_TRANSPORT_MonitorStart *start)
-{
-  struct TransportClient *tc = cls;
-
-  if (CT_NONE != tc->type)
-  {
-    GNUNET_break (0);
-    GNUNET_SERVICE_client_drop (tc->client);
-    return;
-  }
-  tc->type = CT_MONITOR;
-  tc->details.monitor.peer = start->peer;
-  tc->details.monitor.one_shot = ntohl (start->one_shot);
-  GNUNET_CONTAINER_multipeermap_iterate (neighbours, &notify_client_queues, tc);
-  GNUNET_SERVICE_client_mark_monitor (tc->client);
-  GNUNET_SERVICE_client_continue (tc->client);
-}
-
-
-/**
- * Find transport client providing communication service
- * for the protocol @a prefix.
- *
- * @param prefix communicator name
- * @return NULL if no such transport client is available
- */
-static struct TransportClient *
-lookup_communicator (const char *prefix)
-{
-  for (struct TransportClient *tc = clients_head; NULL != tc; tc = tc->next)
-  {
-    if (CT_COMMUNICATOR != tc->type)
-      continue;
-    if (0 == strcmp (prefix, tc->details.communicator.address_prefix))
-      return tc;
-  }
-  GNUNET_log (
-    GNUNET_ERROR_TYPE_WARNING,
-    "Somone suggested use of communicator for `%s', but we do not have such a communicator!\n",
-    prefix);
-  return NULL;
-}
-
-
-/**
- * Signature of a function called with a communicator @a address of a peer
- * @a pid that an application wants us to connect to.
- *
- * @param pid target peer
- * @param address the address to try
- */
-static void
-suggest_to_connect (const struct GNUNET_PeerIdentity *pid, const char *address)
-{
-  static uint32_t idgen;
-  struct TransportClient *tc;
-  char *prefix;
-  struct GNUNET_TRANSPORT_CreateQueue *cqm;
-  struct GNUNET_MQ_Envelope *env;
-  size_t alen;
-
-  prefix = GNUNET_HELLO_address_to_prefix (address);
-  if (NULL == prefix)
-  {
-    GNUNET_break (0);  /* We got an invalid address!? */
-    return;
-  }
-  tc = lookup_communicator (prefix);
-  if (NULL == tc)
-  {
-    GNUNET_STATISTICS_update (GST_stats,
-                              "# Suggestions ignored due to missing communicator",
-                              1,
-                              GNUNET_NO);
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Cannot connect to %s at `%s', no matching communicator present\n",
-                GNUNET_i2s (pid),
-                address);
-    GNUNET_free (prefix);
-    return;
-  }
-  /* forward suggestion for queue creation to communicator */
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Request #%u for `%s' communicator to create queue to `%s'\n",
-              (unsigned int) idgen,
-              prefix,
-              address);
-  GNUNET_free (prefix);
-  alen = strlen (address) + 1;
-  env =
-    GNUNET_MQ_msg_extra (cqm, alen, GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE);
-  cqm->request_id = htonl (idgen++);
-  cqm->receiver = *pid;
-  memcpy (&cqm[1], address, alen);
-  GNUNET_MQ_send (tc->mq, env);
-}
-
-
-/**
- * The queue @a q (which matches the peer and address in @a vs) is
- * ready for queueing. We should now queue the validation request.
- *
- * @param q queue to send on
- * @param vs state to derive validation challenge from
- */
-static void
-validation_transmit_on_queue (struct Queue *q, struct ValidationState *vs)
-{
-  struct TransportValidationChallengeMessage tvc;
-
-  vs->last_challenge_use = GNUNET_TIME_absolute_get_monotonic (GST_cfg);
-  tvc.header.type =
-    htons (GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_VALIDATION_CHALLENGE);
-  tvc.header.size = htons (sizeof(tvc));
-  tvc.reserved = htonl (0);
-  tvc.challenge = vs->challenge;
-  tvc.sender_time = GNUNET_TIME_absolute_hton (vs->last_challenge_use);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Sending address validation challenge %s to %s\n",
-              GNUNET_sh2s (&tvc.challenge.value),
-              GNUNET_i2s (&q->neighbour->pid));
-  queue_send_msg (q, NULL, &tvc, sizeof(tvc));
-}
-
-
-/**
- * Task run periodically to validate some address based on #validation_heap.
- *
- * @param cls NULL
- */
-static void
-validation_start_cb (void *cls)
-{
-  struct ValidationState *vs;
-  struct Queue *q;
-
-  (void) cls;
-  validation_task = NULL;
-  vs = GNUNET_CONTAINER_heap_peek (validation_heap);
-  /* drop validations past their expiration */
-  while (
-    (NULL != vs) &&
-    (0 == GNUNET_TIME_absolute_get_remaining (vs->valid_until).rel_value_us))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Validation response %s cleaned up\n",
-                GNUNET_sh2s (&vs->challenge.value));
-    free_validation_state (vs);
-    vs = GNUNET_CONTAINER_heap_peek (validation_heap);
-  }
-  if (NULL == vs)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Address validation task not scheduled anymore, nothing to do\n");
-    return;   /* woopsie, no more addresses known, should only
-                 happen if we're really a lonely peer */
-  }
-  q = find_queue (&vs->pid, vs->address);
-  if (NULL == q)
-  {
-    vs->awaiting_queue = GNUNET_YES;
-    suggest_to_connect (&vs->pid, vs->address);
-  }
-  else
-    validation_transmit_on_queue (q, vs);
-  /* Finally, reschedule next attempt */
-  vs->challenge_backoff =
-    GNUNET_TIME_randomized_backoff (vs->challenge_backoff,
-                                    MAX_VALIDATION_CHALLENGE_FREQ);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Address validation task will run again in %s\n",
-              GNUNET_STRINGS_relative_time_to_string (vs->challenge_backoff,
-                                                      GNUNET_YES));
-  update_next_challenge_time (vs,
-                              GNUNET_TIME_relative_to_absolute (
-                                vs->challenge_backoff));
-}
-
-
-/**
- * Closure for #check_connection_quality.
- */
-struct QueueQualityContext
-{
-  /**
-   * Set to the @e k'th queue encountered.
-   */
-  struct Queue *q;
-
-  /**
-   * Set to the number of quality queues encountered.
-   */
-  unsigned int quality_count;
-
-  /**
-   * Set to the total number of queues encountered.
-   */
-  unsigned int num_queues;
-
-  /**
-   * Decremented for each queue, for selection of the
-   * k-th queue in @e q.
-   */
-  unsigned int k;
-};
-
-
-/**
- * Check whether any queue to the given neighbour is
- * of a good "quality" and if so, increment the counter.
- * Also counts the total number of queues, and returns
- * the k-th queue found.
- *
- * @param cls a `struct QueueQualityContext *` with counters
- * @param pid peer this is about
- * @param value a `struct Neighbour`
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-check_connection_quality (void *cls,
-                          const struct GNUNET_PeerIdentity *pid,
-                          void *value)
-{
-  struct QueueQualityContext *ctx = cls;
-  struct Neighbour *n = value;
-  int do_inc;
-
-  (void) pid;
-  do_inc = GNUNET_NO;
-  for (struct Queue *q = n->queue_head; NULL != q; q = q->next_neighbour)
-  {
-    ctx->num_queues++;
-    if (0 == ctx->k--)
-      ctx->q = q;
-    /* FIXME-CONQ-STATISTICS: in the future, add reliability / goodput
-       statistics and consider those as well here? */
-    if (q->pd.aged_rtt.rel_value_us < DV_QUALITY_RTT_THRESHOLD.rel_value_us)
-      do_inc = GNUNET_YES;
-  }
-  if (GNUNET_YES == do_inc)
-    ctx->quality_count++;
-  return GNUNET_OK;
-}
-
-
-/**
- * Task run when we CONSIDER initiating a DV learn
- * process. We first check that sending out a message is
- * even possible (queues exist), then that it is desirable
- * (if not, reschedule the task for later), and finally
- * we may then begin the job.  If there are too many
- * entries in the #dvlearn_map, we purge the oldest entry
- * using #lle_tail.
- *
- * @param cls NULL
- */
-static void
-start_dv_learn (void *cls)
-{
-  struct LearnLaunchEntry *lle;
-  struct QueueQualityContext qqc;
-  struct TransportDVLearnMessage dvl;
-
-  (void) cls;
-  dvlearn_task = NULL;
-  if (0 == GNUNET_CONTAINER_multipeermap_size (neighbours))
-    return; /* lost all connectivity, cannot do learning */
-  qqc.quality_count = 0;
-  qqc.num_queues = 0;
-  qqc.k = GNUNET_CONTAINER_multipeermap_size (neighbours);
-  GNUNET_CONTAINER_multipeermap_iterate (neighbours,
-                                         &check_connection_quality,
-                                         &qqc);
-  if (qqc.quality_count > DV_LEARN_QUALITY_THRESHOLD)
-  {
-    struct GNUNET_TIME_Relative delay;
-    unsigned int factor;
-
-    /* scale our retries by how far we are above the threshold */
-    factor = qqc.quality_count / DV_LEARN_QUALITY_THRESHOLD;
-    delay = GNUNET_TIME_relative_multiply (DV_LEARN_BASE_FREQUENCY, factor);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "At connection quality %u, will launch DV learn in %s\n",
-                qqc.quality_count,
-                GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES));
-    dvlearn_task = GNUNET_SCHEDULER_add_delayed (delay, &start_dv_learn, NULL);
-    return;
-  }
-  /* remove old entries in #dvlearn_map if it has grown too big */
-  while (MAX_DV_LEARN_PENDING <=
-         GNUNET_CONTAINER_multishortmap_size (dvlearn_map))
-  {
-    lle = lle_tail;
-    GNUNET_assert (GNUNET_YES ==
-                   GNUNET_CONTAINER_multishortmap_remove (dvlearn_map,
-                                                          &lle->challenge.value,
-                                                          lle));
-    GNUNET_CONTAINER_DLL_remove (lle_head, lle_tail, lle);
-    GNUNET_free (lle);
-  }
-  /* setup data structure for learning */
-  lle = GNUNET_new (struct LearnLaunchEntry);
-  GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_NONCE,
-                              &lle->challenge,
-                              sizeof(lle->challenge));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Starting launch DV learn with challenge %s\n",
-              GNUNET_sh2s (&lle->challenge.value));
-  GNUNET_CONTAINER_DLL_insert (lle_head, lle_tail, lle);
-  GNUNET_break (GNUNET_YES ==
-                GNUNET_CONTAINER_multishortmap_put (
-                  dvlearn_map,
-                  &lle->challenge.value,
-                  lle,
-                  GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
-  dvl.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_DV_LEARN);
-  dvl.header.size = htons (sizeof(dvl));
-  dvl.num_hops = htons (0);
-  dvl.bidirectional = htons (0);
-  dvl.non_network_delay = GNUNET_TIME_relative_hton (GNUNET_TIME_UNIT_ZERO);
-  dvl.monotonic_time =
-    GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get_monotonic (GST_cfg));
-  {
-    struct DvInitPS dvip = {
-      .purpose.purpose = htonl (
-        GNUNET_SIGNATURE_PURPOSE_TRANSPORT_DV_INITIATOR),
-      .purpose.size = htonl (sizeof(dvip)),
-      .monotonic_time = dvl.monotonic_time,
-      .challenge = lle->challenge
-    };
-
-    GNUNET_CRYPTO_eddsa_sign (GST_my_private_key,
-                              &dvip,
-                              &dvl.init_sig);
-  }
-  dvl.initiator = GST_my_identity;
-  dvl.challenge = lle->challenge;
-
-  qqc.quality_count = 0;
-  qqc.k = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, qqc.num_queues);
-  qqc.num_queues = 0;
-  qqc.q = NULL;
-  GNUNET_CONTAINER_multipeermap_iterate (neighbours,
-                                         &check_connection_quality,
-                                         &qqc);
-  GNUNET_assert (NULL != qqc.q);
-
-  /* Do this as close to transmission time as possible! */
-  lle->launch_time = GNUNET_TIME_absolute_get ();
-
-  queue_send_msg (qqc.q, NULL, &dvl, sizeof(dvl));
-  /* reschedule this job, randomizing the time it runs (but no
-     actual backoff!) */
-  dvlearn_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_randomize (
-                                                 DV_LEARN_BASE_FREQUENCY),
-                                               &start_dv_learn,
-                                               NULL);
-}
-
-
-/**
- * A new queue has been created, check if any address validation
- * requests have been waiting for it.
- *
- * @param cls a `struct Queue`
- * @param pid peer concerned (unused)
- * @param value a `struct ValidationState`
- * @return #GNUNET_NO if a match was found and we can stop looking
- */
-static int
-check_validation_request_pending (void *cls,
-                                  const struct GNUNET_PeerIdentity *pid,
-                                  void *value)
-{
-  struct Queue *q = cls;
-  struct ValidationState *vs = value;
-
-  (void) pid;
-  if ((GNUNET_YES == vs->awaiting_queue) &&
-      (0 == strcmp (vs->address, q->address)))
-  {
-    vs->awaiting_queue = GNUNET_NO;
-    validation_transmit_on_queue (q, vs);
-    return GNUNET_NO;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Function called with the monotonic time of a DV initiator
- * by PEERSTORE. Updates the time.
- *
- * @param cls a `struct Neighbour`
- * @param record the information found, NULL for the last call
- * @param emsg error message
- */
-static void
-neighbour_dv_monotime_cb (void *cls,
-                          const struct GNUNET_PEERSTORE_Record *record,
-                          const char *emsg)
-{
-  struct Neighbour *n = cls;
-  struct GNUNET_TIME_AbsoluteNBO *mtbe;
-
-  (void) emsg;
-  if (NULL == record)
-  {
-    /* we're done with #neighbour_dv_monotime_cb() invocations,
-       continue normal processing */
-    n->get = NULL;
-    n->dv_monotime_available = GNUNET_YES;
-    return;
-  }
-  if (sizeof(*mtbe) != record->value_size)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  mtbe = record->value;
-  n->last_dv_learn_monotime =
-    GNUNET_TIME_absolute_max (n->last_dv_learn_monotime,
-                              GNUNET_TIME_absolute_ntoh (*mtbe));
-}
-
-
-/**
- * New queue became available.  Process the request.
- *
- * @param cls the client
- * @param aqm the send message that was sent
- */
-static void
-handle_add_queue_message (void *cls,
-                          const struct GNUNET_TRANSPORT_AddQueueMessage *aqm)
-{
-  struct TransportClient *tc = cls;
-  struct Queue *queue;
-  struct Neighbour *neighbour;
-  const char *addr;
-  uint16_t addr_len;
-
-  if (ntohl (aqm->mtu) <= sizeof(struct TransportFragmentBoxMessage))
-  {
-    /* MTU so small as to be useless for transmissions,
-       required for #fragment_message()! */
-    GNUNET_break_op (0);
-    GNUNET_SERVICE_client_drop (tc->client);
-    return;
-  }
-  /* This may simply be a queue update */
-  for (queue = tc->details.communicator.queue_head;
-       NULL != queue;
-       queue = queue->next_client)
-  {
-    if (queue->qid != aqm->qid)
-      continue;
-    break;
-  }
-
-  if (NULL != queue)
-  {
-    neighbour = queue->neighbour;
-  }
-  else
-  {
-    neighbour = lookup_neighbour (&aqm->receiver);
-    if (NULL == neighbour)
-    {
-      neighbour = GNUNET_new (struct Neighbour);
-      neighbour->pid = aqm->receiver;
-      GNUNET_assert (GNUNET_OK ==
-                     GNUNET_CONTAINER_multipeermap_put (
-                       neighbours,
-                       &neighbour->pid,
-                       neighbour,
-                       GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
-      neighbour->get =
-        GNUNET_PEERSTORE_iterate (peerstore,
-                                  "transport",
-                                  &neighbour->pid,
-                                  GNUNET_PEERSTORE_TRANSPORT_DVLEARN_MONOTIME,
-                                  &neighbour_dv_monotime_cb,
-                                  neighbour);
-    }
-    addr_len = ntohs (aqm->header.size) - sizeof(*aqm);
-    addr = (const char *) &aqm[1];
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "New queue %s to %s available with QID %llu and q_len %lu and mtu %u\n",
-                addr,
-                GNUNET_i2s (&aqm->receiver),
-                (unsigned long long) aqm->qid,
-                GNUNET_ntohll (aqm->q_len),
-                ntohl (aqm->mtu));
-    queue = GNUNET_malloc (sizeof(struct Queue) + addr_len);
-    queue->tc = tc;
-    queue->address = (const char *) &queue[1];
-    queue->pd.aged_rtt = GNUNET_TIME_UNIT_FOREVER_REL;
-    queue->qid = aqm->qid;
-    queue->neighbour = neighbour;
-    if (GNUNET_TRANSPORT_QUEUE_LENGTH_UNLIMITED == GNUNET_ntohll (aqm->q_len))
-      queue->unlimited_length = GNUNET_YES;
-    queue->q_capacity = GNUNET_ntohll (aqm->q_len);
-    memcpy (&queue[1], addr, addr_len);
-    /* notify monitors about new queue */
-    {
-      struct MonitorEvent me = { .rtt = queue->pd.aged_rtt, .cs = queue->cs };
-
-      notify_monitors (&neighbour->pid, queue->address, queue->nt, &me);
-    }
-    GNUNET_CONTAINER_MDLL_insert (neighbour,
-                                  neighbour->queue_head,
-                                  neighbour->queue_tail,
-                                  queue);
-    GNUNET_CONTAINER_MDLL_insert (client,
-                                  tc->details.communicator.queue_head,
-                                  tc->details.communicator.queue_tail,
-                                  queue);
-
-  }
-  queue->mtu = ntohl (aqm->mtu);
-  queue->nt = (enum GNUNET_NetworkType) ntohl (aqm->nt);
-  queue->cs = (enum GNUNET_TRANSPORT_ConnectionStatus) ntohl (aqm->cs);
-  queue->idle = GNUNET_YES;
-  /* check if valdiations are waiting for the queue */
-  (void)
-  GNUNET_CONTAINER_multipeermap_get_multiple (validation_map,
-                                              &aqm->receiver,
-                                              &check_validation_request_pending,
-                                              queue);
-  /* look for traffic for this queue */
-  schedule_transmit_on_queue (GNUNET_TIME_UNIT_ZERO,
-                              queue, GNUNET_SCHEDULER_PRIORITY_DEFAULT);
-  /* might be our first queue, try launching DV learning */
-  if (NULL == dvlearn_task)
-    dvlearn_task = GNUNET_SCHEDULER_add_now (&start_dv_learn, NULL);
-  GNUNET_SERVICE_client_continue (tc->client);
-}
-
-
-/**
- * @brief Handle updates to queues.
- *
- * @param cls the transport client.
- * @param msg Message struct.
- */
-static void
-handle_update_queue_message (void *cls,
-                             const struct
-                             GNUNET_TRANSPORT_UpdateQueueMessage *msg)
-{
-  struct TransportClient *tc = cls;
-  struct Queue *target_queue = NULL;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received queue update message for %u with q_len %llu and mtu %u\n",
-              msg->qid,
-              (unsigned long long) GNUNET_ntohll (msg->q_len),
-              ntohl (msg->mtu));
-  for (target_queue = tc->details.communicator.queue_head;
-       NULL != target_queue;
-       target_queue = target_queue->next_client)
-  {
-    if (msg->qid == target_queue->qid)
-      break;
-  }
-  if (NULL == target_queue)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Queue to update no longer exists! Discarding update.\n");
-    return;
-  }
-
-  target_queue->nt = msg->nt;
-  target_queue->mtu = ntohl (msg->mtu);
-  target_queue->cs = msg->cs;
-  target_queue->priority = ntohl (msg->priority);
-  /* The update message indicates how many messages
-   * the queue should be able to handle.
-   */
-  if (GNUNET_TRANSPORT_QUEUE_LENGTH_UNLIMITED == GNUNET_ntohll (msg->q_len))
-    target_queue->unlimited_length = GNUNET_YES;
-  else
-    target_queue->unlimited_length = GNUNET_NO;
-  target_queue->q_capacity = GNUNET_ntohll (msg->q_len);
-  if (0 < target_queue->q_capacity)
-    schedule_transmit_on_queue (GNUNET_TIME_UNIT_ZERO,
-                                target_queue,
-                                GNUNET_SCHEDULER_PRIORITY_DEFAULT);
-  GNUNET_SERVICE_client_continue (tc->client);
-}
-
-
-/**
- * Communicator tells us that our request to create a queue "worked", that
- * is setting up the queue is now in process.
- *
- * @param cls the `struct TransportClient`
- * @param cqr confirmation message
- */
-static void
-handle_queue_create_ok (void *cls,
-                        const struct GNUNET_TRANSPORT_CreateQueueResponse *cqr)
-{
-  struct TransportClient *tc = cls;
-
-  if (CT_COMMUNICATOR != tc->type)
-  {
-    GNUNET_break (0);
-    GNUNET_SERVICE_client_drop (tc->client);
-    return;
-  }
-  GNUNET_STATISTICS_update (GST_stats,
-                            "# Suggestions succeeded at communicator",
-                            1,
-                            GNUNET_NO);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Request #%u for communicator to create queue succeeded\n",
-              (unsigned int) ntohs (cqr->request_id));
-  GNUNET_SERVICE_client_continue (tc->client);
-}
-
-
-/**
- * Communicator tells us that our request to create a queue failed. This
- * usually indicates that the provided address is simply invalid or that the
- * communicator's resources are exhausted.
- *
- * @param cls the `struct TransportClient`
- * @param cqr failure message
- */
-static void
-handle_queue_create_fail (
-  void *cls,
-  const struct GNUNET_TRANSPORT_CreateQueueResponse *cqr)
-{
-  struct TransportClient *tc = cls;
-
-  if (CT_COMMUNICATOR != tc->type)
-  {
-    GNUNET_break (0);
-    GNUNET_SERVICE_client_drop (tc->client);
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Request #%u for communicator to create queue failed\n",
-              (unsigned int) ntohs (cqr->request_id));
-  GNUNET_STATISTICS_update (GST_stats,
-                            "# Suggestions failed in queue creation at communicator",
-                            1,
-                            GNUNET_NO);
-  GNUNET_SERVICE_client_continue (tc->client);
-}
-
-
-/**
- * We have received a `struct ExpressPreferenceMessage` from an application
- * client.
- *
- * @param cls handle to the client
- * @param msg the start message
- */
-static void
-handle_suggest_cancel (void *cls, const struct ExpressPreferenceMessage *msg)
-{
-  struct TransportClient *tc = cls;
-  struct PeerRequest *pr;
-
-  if (CT_APPLICATION != tc->type)
-  {
-    GNUNET_break (0);
-    GNUNET_SERVICE_client_drop (tc->client);
-    return;
-  }
-  pr = GNUNET_CONTAINER_multipeermap_get (tc->details.application.requests,
-                                          &msg->peer);
-  if (NULL == pr)
-  {
-    GNUNET_break (0);
-    GNUNET_SERVICE_client_drop (tc->client);
-    return;
-  }
-  (void) stop_peer_request (tc, &pr->pid, pr);
-  GNUNET_SERVICE_client_continue (tc->client);
-}
-
-
-/**
- * Function called by PEERSTORE for each matching record.
- *
- * @param cls closure, a `struct PeerRequest`
- * @param record peerstore record information
- * @param emsg error message, or NULL if no errors
- */
-static void
-handle_hello_for_client (void *cls,
-                         const struct GNUNET_PEERSTORE_Record *record,
-                         const char *emsg)
-{
-  struct PeerRequest *pr = cls;
-  const char *val;
-
-  if (NULL != emsg)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Got failure from PEERSTORE: %s\n",
-                emsg);
-    return;
-  }
-  val = record->value;
-  if ((0 == record->value_size) || ('\0' != val[record->value_size - 1]))
-  {
-    GNUNET_break (0);
-    return;
-  }
-  start_address_validation (&pr->pid, (const char *) record->value);
-}
-
-
-/**
- * We have received a `struct ExpressPreferenceMessage` from an application
- * client.
- *
- * @param cls handle to the client
- * @param msg the start message
- */
-static void
-handle_suggest (void *cls, const struct ExpressPreferenceMessage *msg)
-{
-  struct TransportClient *tc = cls;
-  struct PeerRequest *pr;
-
-  if (CT_NONE == tc->type)
-  {
-    tc->type = CT_APPLICATION;
-    tc->details.application.requests =
-      GNUNET_CONTAINER_multipeermap_create (16, GNUNET_YES);
-  }
-  if (CT_APPLICATION != tc->type)
-  {
-    GNUNET_break (0);
-    GNUNET_SERVICE_client_drop (tc->client);
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Client suggested we talk to %s with preference %d at rate %u\n",
-              GNUNET_i2s (&msg->peer),
-              (int) ntohl (msg->pk),
-              (int) ntohl (msg->bw.value__));
-  pr = GNUNET_new (struct PeerRequest);
-  pr->tc = tc;
-  pr->pid = msg->peer;
-  pr->bw = msg->bw;
-  pr->pk = (enum GNUNET_MQ_PriorityPreferences) ntohl (msg->pk);
-  if (GNUNET_YES != GNUNET_CONTAINER_multipeermap_put (
-        tc->details.application.requests,
-        &pr->pid,
-        pr,
-        GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
-  {
-    GNUNET_break (0);
-    GNUNET_free (pr);
-    GNUNET_SERVICE_client_drop (tc->client);
-    return;
-  }
-  pr->wc = GNUNET_PEERSTORE_watch (peerstore,
-                                   "transport",
-                                   &pr->pid,
-                                   GNUNET_PEERSTORE_TRANSPORT_URLADDRESS_KEY,
-                                   &handle_hello_for_client,
-                                   pr);
-  GNUNET_SERVICE_client_continue (tc->client);
-}
-
-
-/**
- * Check #GNUNET_MESSAGE_TYPE_TRANSPORT_REQUEST_HELLO_VALIDATION
- * messages.
- *
- * @param cls a `struct TransportClient *`
- * @param m message to verify
- * @return #GNUNET_OK on success
- */
-static int
-check_request_hello_validation (void *cls,
-                                const struct RequestHelloValidationMessage *m)
-{
-  (void) cls;
-  GNUNET_MQ_check_zero_termination (m);
-  return GNUNET_OK;
-}
-
-
-/**
- * A client encountered an address of another peer. Consider validating it,
- * and if validation succeeds, persist it to PEERSTORE.
- *
- * @param cls a `struct TransportClient *`
- * @param m message to verify
- */
-static void
-handle_request_hello_validation (void *cls,
-                                 const struct RequestHelloValidationMessage *m)
-{
-  struct TransportClient *tc = cls;
-
-  start_address_validation (&m->peer, (const char *) &m[1]);
-  GNUNET_SERVICE_client_continue (tc->client);
-}
-
-
-/**
- * Free neighbour entry.
- *
- * @param cls NULL
- * @param pid unused
- * @param value a `struct Neighbour`
- * @return #GNUNET_OK (always)
- */
-static int
-free_neighbour_cb (void *cls,
-                   const struct GNUNET_PeerIdentity *pid,
-                   void *value)
-{
-  struct Neighbour *neighbour = value;
-
-  (void) cls;
-  (void) pid;
-  GNUNET_break (0);  // should this ever happen?
-  free_neighbour (neighbour);
-
-  return GNUNET_OK;
-}
-
-
-/**
- * Free DV route entry.
- *
- * @param cls NULL
- * @param pid unused
- * @param value a `struct DistanceVector`
- * @return #GNUNET_OK (always)
- */
-static int
-free_dv_routes_cb (void *cls,
-                   const struct GNUNET_PeerIdentity *pid,
-                   void *value)
-{
-  struct DistanceVector *dv = value;
-
-  (void) cls;
-  (void) pid;
-  free_dv_route (dv);
-
-  return GNUNET_OK;
-}
-
-
-/**
- * Free validation state.
- *
- * @param cls NULL
- * @param pid unused
- * @param value a `struct ValidationState`
- * @return #GNUNET_OK (always)
- */
-static int
-free_validation_state_cb (void *cls,
-                          const struct GNUNET_PeerIdentity *pid,
-                          void *value)
-{
-  struct ValidationState *vs = value;
-
-  (void) cls;
-  (void) pid;
-  free_validation_state (vs);
-  return GNUNET_OK;
-}
-
-
-/**
- * Free pending acknowledgement.
- *
- * @param cls NULL
- * @param key unused
- * @param value a `struct PendingAcknowledgement`
- * @return #GNUNET_OK (always)
- */
-static int
-free_pending_ack_cb (void *cls, const struct GNUNET_Uuid *key, void *value)
-{
-  struct PendingAcknowledgement *pa = value;
-
-  (void) cls;
-  (void) key;
-  free_pending_acknowledgement (pa);
-  return GNUNET_OK;
-}
-
-
-/**
- * Free acknowledgement cummulator.
- *
- * @param cls NULL
- * @param pid unused
- * @param value a `struct AcknowledgementCummulator`
- * @return #GNUNET_OK (always)
- */
-static int
-free_ack_cummulator_cb (void *cls,
-                        const struct GNUNET_PeerIdentity *pid,
-                        void *value)
-{
-  struct AcknowledgementCummulator *ac = value;
-
-  (void) cls;
-  (void) pid;
-  GNUNET_SCHEDULER_cancel (ac->task);
-  GNUNET_free (ac);
-  return GNUNET_OK;
-}
-
-
-/**
- * Function called when the service shuts down.  Unloads our plugins
- * and cancels pending validations.
- *
- * @param cls closure, unused
- */
-static void
-do_shutdown (void *cls)
-{
-  struct LearnLaunchEntry *lle;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "shutdown logic\n");
-  (void) cls;
-  GNUNET_CONTAINER_multipeermap_iterate (neighbours,
-                                         &free_neighbour_cb, NULL);
-  if (NULL != validation_task)
-  {
-    GNUNET_SCHEDULER_cancel (validation_task);
-    validation_task = NULL;
-  }
-  if (NULL != dvlearn_task)
-  {
-    GNUNET_SCHEDULER_cancel (dvlearn_task);
-    dvlearn_task = NULL;
-  }
-  if (NULL != GST_stats)
-  {
-    GNUNET_STATISTICS_destroy (GST_stats, GNUNET_NO);
-    GST_stats = NULL;
-  }
-  if (NULL != GST_my_private_key)
-  {
-    GNUNET_free (GST_my_private_key);
-    GST_my_private_key = NULL;
-  }
-  GNUNET_CONTAINER_multipeermap_iterate (ack_cummulators,
-                                         &free_ack_cummulator_cb,
-                                         NULL);
-  GNUNET_CONTAINER_multipeermap_destroy (ack_cummulators);
-  ack_cummulators = NULL;
-  GNUNET_CONTAINER_multiuuidmap_iterate (pending_acks,
-                                         &free_pending_ack_cb,
-                                         NULL);
-  GNUNET_CONTAINER_multiuuidmap_destroy (pending_acks);
-  pending_acks = NULL;
-  GNUNET_break (0 == GNUNET_CONTAINER_multipeermap_size (neighbours));
-  GNUNET_CONTAINER_multipeermap_destroy (neighbours);
-  neighbours = NULL;
-  GNUNET_break (0 == GNUNET_CONTAINER_multipeermap_size (links));
-  GNUNET_CONTAINER_multipeermap_destroy (links);
-  links = NULL;
-  GNUNET_CONTAINER_multipeermap_iterate (backtalkers,
-                                         &free_backtalker_cb,
-                                         NULL);
-  GNUNET_CONTAINER_multipeermap_destroy (backtalkers);
-  backtalkers = NULL;
-  GNUNET_CONTAINER_multipeermap_iterate (validation_map,
-                                         &free_validation_state_cb,
-                                         NULL);
-  GNUNET_CONTAINER_multipeermap_destroy (validation_map);
-  validation_map = NULL;
-  while (NULL != ir_head)
-    free_incoming_request (ir_head);
-  GNUNET_assert (0 == ir_total);
-  while (NULL != (lle = lle_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (lle_head, lle_tail, lle);
-    GNUNET_free (lle);
-  }
-  if (NULL != peerstore)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Disconnecting from PEERSTORE service\n");
-    GNUNET_PEERSTORE_disconnect (peerstore, GNUNET_NO);
-    peerstore = NULL;
-  }
-  GNUNET_CONTAINER_multishortmap_destroy (dvlearn_map);
-  dvlearn_map = NULL;
-  GNUNET_CONTAINER_heap_destroy (validation_heap);
-  validation_heap = NULL;
-  GNUNET_CONTAINER_multipeermap_iterate (dv_routes, &free_dv_routes_cb, NULL);
-  GNUNET_CONTAINER_multipeermap_destroy (dv_routes);
-  dv_routes = NULL;
-  GNUNET_SCHEDULER_shutdown ();
-}
-
-
-static void
-shutdown_task (void *cls)
-{
-  in_shutdown = GNUNET_YES;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Shutdown task executed\n");
-  if (NULL != clients_head)
-  {
-    for (struct TransportClient *tc = clients_head; NULL != tc; tc = tc->next)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "client still connected: %u\n",
-                  tc->type);
-    }
-  }
-  else
-    do_shutdown (cls);
-
-}
-
-
-/**
- * Initiate transport service.
- *
- * @param cls closure
- * @param c configuration to use
- * @param service the initialized service
- */
-static void
-run (void *cls,
-     const struct GNUNET_CONFIGURATION_Handle *c,
-     struct GNUNET_SERVICE_Handle *service)
-{
-  (void) cls;
-  (void) service;
-  /* setup globals */
-  hello_mono_time = GNUNET_TIME_absolute_get_monotonic (c);
-  in_shutdown = GNUNET_NO;
-  GST_cfg = c;
-  backtalkers = GNUNET_CONTAINER_multipeermap_create (16, GNUNET_YES);
-  pending_acks = GNUNET_CONTAINER_multiuuidmap_create (32768, GNUNET_YES);
-  ack_cummulators = GNUNET_CONTAINER_multipeermap_create (256, GNUNET_YES);
-  neighbours = GNUNET_CONTAINER_multipeermap_create (1024, GNUNET_YES);
-  links = GNUNET_CONTAINER_multipeermap_create (512, GNUNET_YES);
-  dv_routes = GNUNET_CONTAINER_multipeermap_create (1024, GNUNET_YES);
-  dvlearn_map = GNUNET_CONTAINER_multishortmap_create (2 * MAX_DV_LEARN_PENDING,
-                                                       GNUNET_YES);
-  validation_map = GNUNET_CONTAINER_multipeermap_create (1024, GNUNET_YES);
-  validation_heap =
-    GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
-  GST_my_private_key =
-    GNUNET_CRYPTO_eddsa_key_create_from_configuration (GST_cfg);
-  if (NULL == GST_my_private_key)
-  {
-    GNUNET_log (
-      GNUNET_ERROR_TYPE_ERROR,
-      _ (
-        "Transport service is lacking key configuration settings. Exiting.\n"));
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-  GNUNET_CRYPTO_eddsa_key_get_public (GST_my_private_key,
-                                      &GST_my_identity.public_key);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "My identity is `%s'\n",
-              GNUNET_i2s_full (&GST_my_identity));
-  GST_stats = GNUNET_STATISTICS_create ("transport", GST_cfg);
-  GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
-  peerstore = GNUNET_PEERSTORE_connect (GST_cfg);
-  if (NULL == peerstore)
-  {
-    GNUNET_break (0);
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-}
-
-
-/**
- * Define "main" method using service macro.
- */
-GNUNET_SERVICE_MAIN (
-  "transport",
-  GNUNET_SERVICE_OPTION_SOFT_SHUTDOWN,
-  &run,
-  &client_connect_cb,
-  &client_disconnect_cb,
-  NULL,
-  /* communication with applications */
-  GNUNET_MQ_hd_fixed_size (suggest,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_SUGGEST,
-                           struct ExpressPreferenceMessage,
-                           NULL),
-  GNUNET_MQ_hd_fixed_size (suggest_cancel,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_SUGGEST_CANCEL,
-                           struct ExpressPreferenceMessage,
-                           NULL),
-  GNUNET_MQ_hd_var_size (request_hello_validation,
-                         GNUNET_MESSAGE_TYPE_TRANSPORT_REQUEST_HELLO_VALIDATION,
-                         struct RequestHelloValidationMessage,
-                         NULL),
-  /* communication with core */
-  GNUNET_MQ_hd_fixed_size (client_start,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_START,
-                           struct StartMessage,
-                           NULL),
-  GNUNET_MQ_hd_var_size (client_send,
-                         GNUNET_MESSAGE_TYPE_TRANSPORT_SEND,
-                         struct OutboundMessage,
-                         NULL),
-  GNUNET_MQ_hd_fixed_size (client_recv_ok,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_RECV_OK,
-                           struct RecvOkMessage,
-                           NULL),
-  /* communication with communicators */
-  GNUNET_MQ_hd_var_size (communicator_available,
-                         GNUNET_MESSAGE_TYPE_TRANSPORT_NEW_COMMUNICATOR,
-                         struct GNUNET_TRANSPORT_CommunicatorAvailableMessage,
-                         NULL),
-  GNUNET_MQ_hd_var_size (communicator_backchannel,
-                         GNUNET_MESSAGE_TYPE_TRANSPORT_COMMUNICATOR_BACKCHANNEL,
-                         struct GNUNET_TRANSPORT_CommunicatorBackchannel,
-                         NULL),
-  GNUNET_MQ_hd_var_size (add_address,
-                         GNUNET_MESSAGE_TYPE_TRANSPORT_ADD_ADDRESS,
-                         struct GNUNET_TRANSPORT_AddAddressMessage,
-                         NULL),
-  GNUNET_MQ_hd_fixed_size (del_address,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_DEL_ADDRESS,
-                           struct GNUNET_TRANSPORT_DelAddressMessage,
-                           NULL),
-  GNUNET_MQ_hd_var_size (incoming_msg,
-                         GNUNET_MESSAGE_TYPE_TRANSPORT_INCOMING_MSG,
-                         struct GNUNET_TRANSPORT_IncomingMessage,
-                         NULL),
-  GNUNET_MQ_hd_fixed_size (queue_create_ok,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE_OK,
-                           struct GNUNET_TRANSPORT_CreateQueueResponse,
-                           NULL),
-  GNUNET_MQ_hd_fixed_size (queue_create_fail,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE_FAIL,
-                           struct GNUNET_TRANSPORT_CreateQueueResponse,
-                           NULL),
-  GNUNET_MQ_hd_var_size (add_queue_message,
-                         GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_SETUP,
-                         struct GNUNET_TRANSPORT_AddQueueMessage,
-                         NULL),
-  GNUNET_MQ_hd_fixed_size (update_queue_message,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_UPDATE,
-                           struct GNUNET_TRANSPORT_UpdateQueueMessage,
-                           NULL),
-  GNUNET_MQ_hd_fixed_size (del_queue_message,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_TEARDOWN,
-                           struct GNUNET_TRANSPORT_DelQueueMessage,
-                           NULL),
-  GNUNET_MQ_hd_fixed_size (send_message_ack,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_MSG_ACK,
-                           struct GNUNET_TRANSPORT_SendMessageToAck,
-                           NULL),
-  /* communication with monitors */
-  GNUNET_MQ_hd_fixed_size (monitor_start,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_START,
-                           struct GNUNET_TRANSPORT_MonitorStart,
-                           NULL),
-  GNUNET_MQ_handler_end ());
-
-
-/* end of file gnunet-service-transport.c */
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
deleted file mode 100644
index fad2ca4a1..000000000
--- a/src/transport/gnunet-service-transport.c
+++ /dev/null
@@ -1,2788 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2010-2016 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport/gnunet-service-transport.c
- * @brief main for gnunet-service-transport
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_statistics_service.h"
-#include "gnunet_transport_service.h"
-#include "gnunet_peerinfo_service.h"
-#include "gnunet_ats_service.h"
-#include "gnunet-service-transport.h"
-#include "gnunet-service-transport_ats.h"
-#include "gnunet-service-transport_hello.h"
-#include "gnunet-service-transport_neighbours.h"
-#include "gnunet-service-transport_plugins.h"
-#include "gnunet-service-transport_validation.h"
-#include "gnunet-service-transport_manipulation.h"
-#include "transport.h"
-
-/**
- * Size of the blacklist hash map.
- */
-#define TRANSPORT_BLACKLIST_HT_SIZE 64
-
-/**
- * How many messages can we have pending for a given client process
- * before we start to drop incoming messages?  We typically should
- * have only one client and so this would be the primary buffer for
- * messages, so the number should be chosen rather generously.
- *
- * The expectation here is that most of the time the queue is large
- * enough so that a drop is virtually never required.  Note that
- * this value must be about as large as 'TOTAL_MSGS' in the
- * 'test_transport_api_reliability.c', otherwise that testcase may
- * fail.
- */
-#define MAX_PENDING (128 * 1024)
-
-
-/**
- * Information we need for an asynchronous session kill.
- */
-struct GNUNET_ATS_SessionKiller
-{
-  /**
-   * Kept in a DLL.
-   */
-  struct GNUNET_ATS_SessionKiller *next;
-
-  /**
-   * Kept in a DLL.
-   */
-  struct GNUNET_ATS_SessionKiller *prev;
-
-  /**
-   * Session to kill.
-   */
-  struct GNUNET_ATS_Session *session;
-
-  /**
-   * Plugin for the session.
-   */
-  struct GNUNET_TRANSPORT_PluginFunctions *plugin;
-
-  /**
-   * The kill task.
-   */
-  struct GNUNET_SCHEDULER_Task *task;
-};
-
-
-/**
- * What type of client is the `struct TransportClient` about?
- */
-enum ClientType
-{
-  /**
-   * We do not know yet (client is fresh).
-   */
-  CT_NONE = 0,
-
-  /**
-   * Is the CORE service, we need to forward traffic to it.
-   */
-  CT_CORE = 1,
-
-  /**
-   * It is a monitor, forward monitor data.
-   */
-  CT_MONITOR = 2,
-
-  /**
-   * It is a blacklist, query about allowed connections.
-   */
-  CT_BLACKLIST = 3,
-
-  /**
-   * CORE client without any handlers.
-   */
-  CT_CORE_NO_HANDLERS = 4
-};
-
-
-/**
- * Context we use when performing a blacklist check.
- */
-struct GST_BlacklistCheck;
-
-/**
- * Client connected to the transport service.
- */
-struct TransportClient
-{
-  /**
-   * This is a doubly-linked list.
-   */
-  struct TransportClient *next;
-
-  /**
-   * This is a doubly-linked list.
-   */
-  struct TransportClient *prev;
-
-  /**
-   * Handle to the client.
-   */
-  struct GNUNET_SERVICE_Client *client;
-
-  /**
-   * Message queue to the client.
-   */
-  struct GNUNET_MQ_Handle *mq;
-
-  /**
-   * What type of client is this?
-   */
-  enum ClientType type;
-
-  union
-  {
-    /**
-     * Peer identity to monitor the addresses of.
-     * Zero to monitor all neighbours.  Valid if
-     * @e type is CT_MONITOR.
-     */
-    struct GNUNET_PeerIdentity monitor_peer;
-
-    /**
-     * Additional details if @e type is CT_BLACKLIST.
-     */
-    struct
-    {
-      /**
-       * Blacklist check that we're currently performing (or NULL
-       * if we're performing one that has been cancelled).
-       */
-      struct GST_BlacklistCheck *bc;
-
-      /**
-       * Set to #GNUNET_YES if we're currently waiting for a reply.
-       */
-      int waiting_for_reply;
-
-      /**
-       * #GNUNET_YES if we have to call receive_done for this client
-       */
-      int call_receive_done;
-    } blacklist;
-  } details;
-};
-
-
-/**
- * Context we use when performing a blacklist check.
- */
-struct GST_BlacklistCheck
-{
-  /**
-   * This is a linked list.
-   */
-  struct GST_BlacklistCheck *next;
-
-  /**
-   * This is a linked list.
-   */
-  struct GST_BlacklistCheck *prev;
-
-  /**
-   * Peer being checked.
-   */
-  struct GNUNET_PeerIdentity peer;
-
-  /**
-   * Continuation to call with the result.
-   */
-  GST_BlacklistTestContinuation cont;
-
-  /**
-   * Closure for @e cont.
-   */
-  void *cont_cls;
-
-  /**
-   * Address for #GST_blacklist_abort_matching(), can be NULL.
-   */
-  struct GNUNET_HELLO_Address *address;
-
-  /**
-   * Session for #GST_blacklist_abort_matching(), can be NULL.
-   */
-  struct GNUNET_ATS_Session *session;
-
-  /**
-   * Our current position in the blacklisters list.
-   */
-  struct TransportClient *bl_pos;
-
-  /**
-   * Current task performing the check.
-   */
-  struct GNUNET_SCHEDULER_Task *task;
-};
-
-
-/**
- * Context for address to string operations
- */
-struct AddressToStringContext
-{
-  /**
-   * This is a doubly-linked list.
-   */
-  struct AddressToStringContext *next;
-
-  /**
-   * This is a doubly-linked list.
-   */
-  struct AddressToStringContext *prev;
-
-  /**
-   * Client that made the request.
-   */
-  struct TransportClient *tc;
-};
-
-
-/**
- * Closure for #handle_send_transmit_continuation()
- */
-struct SendTransmitContinuationContext
-{
-  /**
-   * Client that made the request.
-   */
-  struct TransportClient *tc;
-
-  /**
-   * Peer that was the target.
-   */
-  struct GNUNET_PeerIdentity target;
-
-  /**
-   * At what time did we receive the message?
-   */
-  struct GNUNET_TIME_Absolute send_time;
-
-  /**
-   * Unique ID, for logging.
-   */
-  unsigned long long uuid;
-
-  /**
-   * Set to #GNUNET_YES if the connection for @e target goes
-   * down and we thus must no longer send the
-   * #GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK message.
-   */
-  int down;
-};
-
-
-/**
- * Head of linked list of all clients to this service.
- */
-static struct TransportClient *clients_head;
-
-/**
- * Tail of linked list of all clients to this service.
- */
-static struct TransportClient *clients_tail;
-
-/**
- * Map of peer identities to active send transmit continuation
- * contexts. Used to flag contexts as 'dead' when a connection goes
- * down. Values are of type `struct SendTransmitContinuationContext
- * *`.
- */
-static struct GNUNET_CONTAINER_MultiPeerMap *active_stccs;
-
-/**
- * Head of linked list of all pending address iterations
- */
-static struct AddressToStringContext *a2s_head;
-
-/**
- * Tail of linked list of all pending address iterations
- */
-static struct AddressToStringContext *a2s_tail;
-
-/**
- * Head of DLL of active blacklisting queries.
- */
-static struct GST_BlacklistCheck *bc_head;
-
-/**
- * Tail of DLL of active blacklisting queries.
- */
-static struct GST_BlacklistCheck *bc_tail;
-
-/**
- * Hashmap of blacklisted peers.  Values are of type 'char *' (transport names),
- * can be NULL if we have no static blacklist.
- */
-static struct GNUNET_CONTAINER_MultiPeerMap *blacklist;
-
-/**
- * Notification context, to send updates on changes to active plugin
- * connections.
- */
-static struct GNUNET_NotificationContext *plugin_nc;
-
-/**
- * Plugin monitoring client we are currently syncing, NULL if all
- * monitoring clients are in sync.
- */
-static struct TransportClient *sync_client;
-
-/**
- * Peer identity that is all zeros, used as a way to indicate
- * "all peers".  Used for comparisons.
- */
-static struct GNUNET_PeerIdentity all_zeros;
-
-/**
- * Statistics handle.
- */
-struct GNUNET_STATISTICS_Handle *GST_stats;
-
-/**
- * Configuration handle.
- */
-const struct GNUNET_CONFIGURATION_Handle *GST_cfg;
-
-/**
- * Configuration handle.
- */
-struct GNUNET_PeerIdentity GST_my_identity;
-
-/**
- * Handle to peerinfo service.
- */
-struct GNUNET_PEERINFO_Handle *GST_peerinfo;
-
-/**
- * Our private key.
- */
-struct GNUNET_CRYPTO_EddsaPrivateKey GST_my_private_key;
-
-/**
- * ATS scheduling handle.
- */
-struct GNUNET_ATS_SchedulingHandle *GST_ats;
-
-/**
- * ATS connectivity handle.
- */
-struct GNUNET_ATS_ConnectivityHandle *GST_ats_connect;
-
-/**
- * Hello address expiration
- */
-struct GNUNET_TIME_Relative hello_expiration;
-
-/**
- * Head of DLL of asynchronous tasks to kill sessions.
- */
-static struct GNUNET_ATS_SessionKiller *sk_head;
-
-/**
- * Tail of DLL of asynchronous tasks to kill sessions.
- */
-static struct GNUNET_ATS_SessionKiller *sk_tail;
-
-/**
- * Interface scanner determines our LAN address range(s).
- */
-struct GNUNET_NT_InterfaceScanner *GST_is;
-
-/**
- * Queue the given message for transmission to the given client
- *
- * @param tc target of the message
- * @param msg message to transmit
- * @param may_drop #GNUNET_YES if the message can be dropped
- */
-static void
-unicast (struct TransportClient *tc,
-         const struct GNUNET_MessageHeader *msg,
-         int may_drop)
-{
-  struct GNUNET_MQ_Envelope *env;
-
-  if ((GNUNET_MQ_get_length (tc->mq) >= MAX_PENDING) &&
-      (GNUNET_YES == may_drop))
-  {
-    GNUNET_log (
-      GNUNET_ERROR_TYPE_DEBUG,
-      "Dropping message of type %u and size %u, have %u/%u messages pending\n",
-      ntohs (msg->type),
-      ntohs (msg->size),
-      GNUNET_MQ_get_length (tc->mq),
-      MAX_PENDING);
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop (
-                                "# messages dropped due to slow client"),
-                              1,
-                              GNUNET_NO);
-    return;
-  }
-  env = GNUNET_MQ_msg_copy (msg);
-  GNUNET_MQ_send (tc->mq, env);
-}
-
-
-/**
- * Called whenever a client connects.  Allocates our
- * data structures associated with that client.
- *
- * @param cls closure, NULL
- * @param client identification of the client
- * @param mq message queue for the client
- * @return our `struct TransportClient`
- */
-static void *
-client_connect_cb (void *cls,
-                   struct GNUNET_SERVICE_Client *client,
-                   struct GNUNET_MQ_Handle *mq)
-{
-  struct TransportClient *tc;
-
-  tc = GNUNET_new (struct TransportClient);
-  tc->client = client;
-  tc->mq = mq;
-  GNUNET_CONTAINER_DLL_insert (clients_head, clients_tail, tc);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Client %p connected\n", tc);
-  return tc;
-}
-
-
-/**
- * Perform next action in the blacklist check.
- *
- * @param cls the `struct BlacklistCheck*`
- */
-static void
-do_blacklist_check (void *cls);
-
-
-/**
- * Mark the peer as down so we don't call the continuation
- * context in the future.
- *
- * @param cls a `struct TransportClient`
- * @param peer a peer we are sending to
- * @param value a `struct SendTransmitContinuationContext` to mark
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-mark_match_down (void *cls, const struct GNUNET_PeerIdentity *peer, void *value)
-{
-  struct TransportClient *tc = cls;
-  struct SendTransmitContinuationContext *stcc = value;
-
-  if (tc == stcc->tc)
-  {
-    stcc->down = GNUNET_YES;
-    stcc->tc = NULL;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Called whenever a client is disconnected.  Frees our
- * resources associated with that client.
- *
- * @param cls closure, NULL
- * @param client identification of the client
- * @param app_ctx our `struct TransportClient`
- */
-static void
-client_disconnect_cb (void *cls,
-                      struct GNUNET_SERVICE_Client *client,
-                      void *app_ctx)
-{
-  struct TransportClient *tc = app_ctx;
-  struct GST_BlacklistCheck *bc;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Client %p disconnected, cleaning up.\n",
-              tc);
-  if (NULL != active_stccs)
-    GNUNET_CONTAINER_multipeermap_iterate (active_stccs,
-                                           &mark_match_down,
-                                           tc);
-  for (struct AddressToStringContext *cur = a2s_head; NULL != cur;
-       cur = cur->next)
-  {
-    if (cur->tc == tc)
-      cur->tc = NULL;
-  }
-  GNUNET_CONTAINER_DLL_remove (clients_head, clients_tail, tc);
-  switch (tc->type)
-  {
-  case CT_NONE:
-    break;
-
-  case CT_CORE:
-    break;
-
-  case CT_MONITOR:
-    break;
-
-  case CT_BLACKLIST:
-    for (bc = bc_head; NULL != bc; bc = bc->next)
-    {
-      if (bc->bl_pos != tc)
-        continue;
-      bc->bl_pos = tc->next;
-      if (NULL == bc->task)
-        bc->task = GNUNET_SCHEDULER_add_now (&do_blacklist_check, bc);
-    }
-    break;
-
-  case CT_CORE_NO_HANDLERS:
-    break;
-  }
-  GNUNET_free (tc);
-}
-
-
-/**
- * Function called for each of our connected neighbours.  Notify the
- * client about the existing neighbour.
- *
- * @param cls the `struct TransportClient *` to notify
- * @param peer identity of the neighbour
- * @param address the address
- * @param state the current state of the peer
- * @param state_timeout the time out for the state
- * @param bandwidth_in inbound bandwidth in NBO
- * @param bandwidth_out outbound bandwidth in NBO
- */
-static void
-notify_client_about_neighbour (void *cls,
-                               const struct GNUNET_PeerIdentity *peer,
-                               const struct GNUNET_HELLO_Address *address,
-                               enum GNUNET_TRANSPORT_PeerState state,
-                               struct GNUNET_TIME_Absolute state_timeout,
-                               struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
-                               struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out)
-{
-  struct TransportClient *tc = cls;
-  struct ConnectInfoMessage cim;
-
-  if (GNUNET_NO == GST_neighbours_test_connected (peer))
-    return;
-  cim.header.size = htons (sizeof(struct ConnectInfoMessage));
-  cim.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_CONNECT);
-  cim.id = *peer;
-  cim.quota_out = bandwidth_out;
-  unicast (tc, &cim.header, GNUNET_NO);
-}
-
-
-/**
- * Initialize a normal client.  We got a start message from this
- * client, add it to the list of clients for broadcasting of inbound
- * messages.
- *
- * @param cls the client
- * @param start the start message that was sent
- */
-static void
-handle_client_start (void *cls, const struct StartMessage *start)
-{
-  struct TransportClient *tc = cls;
-  const struct GNUNET_MessageHeader *hello;
-  uint32_t options;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Client %p sent START\n", tc);
-  options = ntohl (start->options);
-  if ((0 != (1 & options)) &&
-      (0 != memcmp (&start->self,
-                    &GST_my_identity,
-                    sizeof(struct GNUNET_PeerIdentity))))
-  {
-    /* client thinks this is a different peer, reject */
-    GNUNET_break (0);
-    GNUNET_SERVICE_client_drop (tc->client);
-    return;
-  }
-  if (CT_NONE != tc->type)
-  {
-    GNUNET_break (0);
-    GNUNET_SERVICE_client_drop (tc->client);
-    return;
-  }
-  if (0 != (2 & options))
-    tc->type = CT_CORE;
-  else
-    tc->type = CT_CORE_NO_HANDLERS;
-  hello = GST_hello_get ();
-  if (NULL != hello)
-    unicast (tc, hello, GNUNET_NO);
-  GST_neighbours_iterate (&notify_client_about_neighbour, tc);
-  GNUNET_SERVICE_client_continue (tc->client);
-}
-
-
-/**
- * Client sent us a HELLO.  Check the request.
- *
- * @param cls the client
- * @param message the HELLO message
- */
-static int
-check_client_hello (void *cls, const struct GNUNET_MessageHeader *message)
-{
-  return GNUNET_OK; /* FIXME: check here? */
-}
-
-
-/**
- * Client sent us a HELLO.  Process the request.
- *
- * @param cls the client
- * @param message the HELLO message
- */
-static void
-handle_client_hello (void *cls, const struct GNUNET_MessageHeader *message)
-{
-  struct TransportClient *tc = cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Received HELLO message\n");
-  GST_validation_handle_hello (message);
-  GNUNET_SERVICE_client_continue (tc->client);
-}
-
-
-/**
- * Function called after the transmission is done.  Notify the client that it is
- * OK to send the next message.
- *
- * @param cls closure
- * @param success #GNUNET_OK on success, #GNUNET_NO on failure, #GNUNET_SYSERR if we're not connected
- * @param bytes_payload bytes payload sent
- * @param bytes_on_wire bytes sent on wire
- */
-static void
-handle_send_transmit_continuation (void *cls,
-                                   int success,
-                                   size_t bytes_payload,
-                                   size_t bytes_on_wire)
-{
-  struct SendTransmitContinuationContext *stcc = cls;
-  struct SendOkMessage send_ok_msg;
-#ifdef ENABLE_TTD
-  struct GNUNET_TIME_Relative delay;
-  const struct GNUNET_HELLO_Address *addr;
-
-  delay = GNUNET_TIME_absolute_get_duration (stcc->send_time);
-  addr = GST_neighbour_get_current_address (&stcc->target);
-
-  if (delay.rel_value_us > GNUNET_CONSTANTS_LATENCY_WARN.rel_value_us)
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "It took us %s to send %u/%u bytes to %s (%d, %s)\n",
-                GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES),
-                (unsigned int) bytes_payload,
-                (unsigned int) bytes_on_wire,
-                GNUNET_i2s (&stcc->target),
-                success,
-                (NULL != addr) ? addr->transport_name : "%");
-  else
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "It took us %s to send %u/%u bytes to %s (%d, %s)\n",
-                GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES),
-                (unsigned int) bytes_payload,
-                (unsigned int) bytes_on_wire,
-                GNUNET_i2s (&stcc->target),
-                success,
-                (NULL != addr) ? addr->transport_name : "%");
-#endif
-
-  if (GNUNET_NO == stcc->down)
-  {
-    /* Only send confirmation if we are still connected */
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Sending SEND_OK for transmission request %llu\n",
-                stcc->uuid);
-    send_ok_msg.header.size = htons (sizeof(send_ok_msg));
-    send_ok_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK);
-    send_ok_msg.bytes_msg = htons (bytes_payload);
-    send_ok_msg.bytes_physical = htonl (bytes_on_wire);
-    send_ok_msg.success = htons (success);
-    send_ok_msg.peer = stcc->target;
-    unicast (stcc->tc, &send_ok_msg.header, GNUNET_NO);
-  }
-  GNUNET_assert (
-    GNUNET_OK ==
-    GNUNET_CONTAINER_multipeermap_remove (active_stccs, &stcc->target, stcc));
-  GNUNET_free (stcc);
-}
-
-
-/**
- * Client asked for transmission to a peer.  Process the request.
- *
- * @param cls the client
- * @param obm the send message that was sent
- */
-static int
-check_client_send (void *cls, const struct OutboundMessage *obm)
-{
-  uint16_t size;
-  const struct GNUNET_MessageHeader *obmm;
-
-  size = ntohs (obm->header.size) - sizeof(struct OutboundMessage);
-  if (size < sizeof(struct GNUNET_MessageHeader))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  obmm = (const struct GNUNET_MessageHeader *) &obm[1];
-  if (size != ntohs (obmm->size))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Client asked for transmission to a peer.  Process the request.
- *
- * @param cls the client
- * @param obm the send message that was sent
- */
-static void
-handle_client_send (void *cls, const struct OutboundMessage *obm)
-{
-  static unsigned long long uuid_gen;
-  struct TransportClient *tc = cls;
-  const struct GNUNET_MessageHeader *obmm;
-  struct SendTransmitContinuationContext *stcc;
-
-  obmm = (const struct GNUNET_MessageHeader *) &obm[1];
-  if (GNUNET_NO == GST_neighbours_test_connected (&obm->peer))
-  {
-    /* not connected, not allowed to send; can happen due to asynchronous operations */
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Could not send message to peer `%s': not connected\n",
-                GNUNET_i2s (&obm->peer));
-    GNUNET_STATISTICS_update (
-      GST_stats,
-      gettext_noop ("# bytes payload dropped (other peer was not connected)"),
-      ntohs (obmm->size),
-      GNUNET_NO);
-    GNUNET_SERVICE_client_continue (tc->client);
-    return;
-  }
-  GNUNET_log (
-    GNUNET_ERROR_TYPE_DEBUG,
-    "Received SEND request %llu for `%s' and first message of type %u and total size %u\n",
-    uuid_gen,
-    GNUNET_i2s (&obm->peer),
-    ntohs (obmm->type),
-    ntohs (obmm->size));
-  GNUNET_SERVICE_client_continue (tc->client);
-
-  stcc = GNUNET_new (struct SendTransmitContinuationContext);
-  stcc->target = obm->peer;
-  stcc->tc = tc;
-  stcc->send_time = GNUNET_TIME_absolute_get ();
-  stcc->uuid = uuid_gen++;
-  (void) GNUNET_CONTAINER_multipeermap_put (
-    active_stccs,
-    &stcc->target,
-    stcc,
-    GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-  GST_manipulation_send (&obm->peer,
-                         obmm,
-                         ntohs (obmm->size),
-                         GNUNET_TIME_relative_ntoh (obm->timeout),
-                         &handle_send_transmit_continuation,
-                         stcc);
-}
-
-
-/**
- * Take the given address and append it to the set of results sent back to
- * the client.  This function may be called several times for a single
- * conversion.   The last invocation will be with a @a address of
- * NULL and a @a res of #GNUNET_OK.  Thus, to indicate conversion
- * errors, the callback might be called first with @a address NULL and
- * @a res being #GNUNET_SYSERR.  In that case, there will still be a
- * subsequent call later with @a address NULL and @a res #GNUNET_OK.
- *
- * @param cls the `struct AddressToStringContext`
- * @param buf text to transmit (contains the human-readable address, or NULL)
- * @param res #GNUNET_OK if conversion was successful, #GNUNET_SYSERR on error,
- *            never #GNUNET_NO
- */
-static void
-transmit_address_to_client (void *cls, const char *buf, int res)
-{
-  struct AddressToStringContext *actx = cls;
-  struct GNUNET_MQ_Envelope *env;
-  struct AddressToStringResultMessage *atsm;
-  size_t slen;
-
-  GNUNET_assert ((GNUNET_OK == res) || (GNUNET_SYSERR == res));
-  if (NULL == actx->tc)
-    return;
-  if (NULL == buf)
-  {
-    env = GNUNET_MQ_msg (atsm,
-                         GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_TO_STRING_REPLY);
-    if (GNUNET_OK == res)
-    {
-      /* this was the last call, transmit */
-      atsm->res = htonl (GNUNET_OK);
-      atsm->addr_len = htonl (0);
-      GNUNET_MQ_send (actx->tc->mq, env);
-      GNUNET_CONTAINER_DLL_remove (a2s_head, a2s_tail, actx);
-      GNUNET_free (actx);
-      return;
-    }
-    if (GNUNET_SYSERR == res)
-    {
-      /* address conversion failed, but there will be more callbacks */
-      atsm->res = htonl (GNUNET_SYSERR);
-      atsm->addr_len = htonl (0);
-      GNUNET_MQ_send (actx->tc->mq, env);
-      return;
-    }
-  }
-  GNUNET_assert (GNUNET_OK == res);
-  /* successful conversion, append*/
-  slen = strlen (buf) + 1;
-  env =
-    GNUNET_MQ_msg_extra (atsm,
-                         slen,
-                         GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_TO_STRING_REPLY);
-  atsm->res = htonl (GNUNET_YES);
-  atsm->addr_len = htonl (slen);
-  GNUNET_memcpy (&atsm[1], buf, slen);
-  GNUNET_MQ_send (actx->tc->mq, env);
-}
-
-
-/**
- * Client asked to resolve an address.  Check the request.
- *
- * @param cls the client
- * @param alum the resolution request
- * @return #GNUNET_OK if @a alum is well-formed
- */
-static int
-check_client_address_to_string (void *cls,
-                                const struct AddressLookupMessage *alum)
-{
-  const char *plugin_name;
-  const char *address;
-  uint32_t address_len;
-  uint16_t size;
-
-  size = ntohs (alum->header.size);
-  address_len = ntohs (alum->addrlen);
-  if (size <= sizeof(struct AddressLookupMessage) + address_len)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  address = (const char *) &alum[1];
-  plugin_name = (const char *) &address[address_len];
-  if ('\0' != plugin_name[size - sizeof(struct AddressLookupMessage)
-                          - address_len - 1])
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Client asked to resolve an address.  Process the request.
- *
- * @param cls the client
- * @param alum the resolution request
- */
-static void
-handle_client_address_to_string (void *cls,
-                                 const struct AddressLookupMessage *alum)
-{
-  struct TransportClient *tc = cls;
-  struct GNUNET_TRANSPORT_PluginFunctions *papi;
-  const char *plugin_name;
-  const char *address;
-  uint32_t address_len;
-  struct AddressToStringContext *actx;
-  struct GNUNET_MQ_Envelope *env;
-  struct AddressToStringResultMessage *atsm;
-  struct GNUNET_TIME_Relative rtimeout;
-  int32_t numeric;
-
-  address_len = ntohs (alum->addrlen);
-  address = (const char *) &alum[1];
-  plugin_name = (const char *) &address[address_len];
-  rtimeout = GNUNET_TIME_relative_ntoh (alum->timeout);
-  numeric = ntohs (alum->numeric_only);
-  papi = GST_plugins_printer_find (plugin_name);
-  if (NULL == papi)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Failed to find plugin `%s'\n",
-                plugin_name);
-    env = GNUNET_MQ_msg (atsm,
-                         GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_TO_STRING_REPLY);
-    atsm->res = htonl (GNUNET_SYSERR);
-    atsm->addr_len = htonl (0);
-    GNUNET_MQ_send (tc->mq, env);
-    env = GNUNET_MQ_msg (atsm,
-                         GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_TO_STRING_REPLY);
-    atsm->res = htonl (GNUNET_OK);
-    atsm->addr_len = htonl (0);
-    GNUNET_MQ_send (tc->mq, env);
-    return;
-  }
-  actx = GNUNET_new (struct AddressToStringContext);
-  actx->tc = tc;
-  GNUNET_CONTAINER_DLL_insert (a2s_head, a2s_tail, actx);
-  GNUNET_SERVICE_client_disable_continue_warning (tc->client);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Pretty-printing address of %u bytes using plugin `%s'\n",
-              address_len,
-              plugin_name);
-  papi->address_pretty_printer (papi->cls,
-                                plugin_name,
-                                address,
-                                address_len,
-                                numeric,
-                                rtimeout,
-                                &transmit_address_to_client,
-                                actx);
-}
-
-
-/**
- * Compose #PeerIterateResponseMessage using the given peer and address.
- *
- * @param peer identity of the peer
- * @param address the address, NULL on disconnect
- * @return composed message
- */
-static struct PeerIterateResponseMessage *
-compose_address_iterate_response_message (
-  const struct GNUNET_PeerIdentity *peer,
-  const struct GNUNET_HELLO_Address *address)
-{
-  struct PeerIterateResponseMessage *msg;
-  size_t size;
-  size_t tlen;
-  size_t alen;
-  char *addr;
-
-  GNUNET_assert (NULL != peer);
-  if (NULL != address)
-  {
-    tlen = strlen (address->transport_name) + 1;
-    alen = address->address_length;
-  }
-  else
-  {
-    tlen = 0;
-    alen = 0;
-  }
-  size = (sizeof(struct PeerIterateResponseMessage) + alen + tlen);
-  msg = GNUNET_malloc (size);
-  msg->header.size = htons (size);
-  msg->header.type =
-    htons (GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_PEER_RESPONSE);
-  msg->reserved = htonl (0);
-  msg->peer = *peer;
-  msg->addrlen = htonl (alen);
-  msg->pluginlen = htonl (tlen);
-
-  if (NULL != address)
-  {
-    msg->local_address_info = htonl ((uint32_t) address->local_info);
-    addr = (char *) &msg[1];
-    GNUNET_memcpy (addr, address->address, alen);
-    GNUNET_memcpy (&addr[alen], address->transport_name, tlen);
-  }
-  return msg;
-}
-
-
-/**
- * Context for #send_validation_information() and
- * #send_peer_information().
- */
-struct IterationContext
-{
-  /**
-   * Context to use for the transmission.
-   */
-  struct TransportClient *tc;
-
-  /**
-   * Which peers do we care about?
-   */
-  struct GNUNET_PeerIdentity id;
-
-  /**
-   * #GNUNET_YES if @e id should be ignored because we want all peers.
-   */
-  int all;
-};
-
-
-/**
- * Output information of neighbours to the given client.
- *
- * @param cls the `struct PeerIterationContext *`
- * @param peer identity of the neighbour
- * @param address the address
- * @param state current state this peer is in
- * @param state_timeout timeout for the current state of the peer
- * @param bandwidth_in inbound quota in NBO
- * @param bandwidth_out outbound quota in NBO
- */
-static void
-send_peer_information (void *cls,
-                       const struct GNUNET_PeerIdentity *peer,
-                       const struct GNUNET_HELLO_Address *address,
-                       enum GNUNET_TRANSPORT_PeerState state,
-                       struct GNUNET_TIME_Absolute state_timeout,
-                       struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
-                       struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out)
-{
-  struct IterationContext *pc = cls;
-  struct GNUNET_MQ_Envelope *env;
-  struct PeerIterateResponseMessage *msg;
-
-  if ((GNUNET_YES != pc->all) && (0 != memcmp (peer, &pc->id, sizeof(pc->id))))
-    return;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Sending information about `%s' using address `%s' in state `%s'\n",
-              GNUNET_i2s (peer),
-              (NULL != address) ? GST_plugins_a2s (address) : "<none>",
-              GNUNET_TRANSPORT_ps2s (state));
-  msg = compose_address_iterate_response_message (peer, address);
-  msg->state = htonl (state);
-  msg->state_timeout = GNUNET_TIME_absolute_hton (state_timeout);
-  env = GNUNET_MQ_msg_copy (&msg->header);
-  GNUNET_free (msg);
-  GNUNET_MQ_send (pc->tc->mq, env);
-}
-
-
-/**
- * Client asked to obtain information about a specific or all peers
- * Process the request.
- *
- * @param cls the client
- * @param msg the peer address information request
- */
-static void
-handle_client_monitor_peers (void *cls, const struct PeerMonitorMessage *msg)
-{
-  struct TransportClient *tc = cls;
-  struct IterationContext pc;
-
-  if (CT_NONE != tc->type)
-  {
-    GNUNET_break (0);
-    GNUNET_SERVICE_client_drop (tc->client);
-    return;
-  }
-  GNUNET_SERVICE_client_disable_continue_warning (tc->client);
-  GNUNET_SERVICE_client_mark_monitor (tc->client);
-
-  /* Send initial list */
-  pc.tc = tc;
-  if (0 == memcmp (&msg->peer, &all_zeros, sizeof(struct GNUNET_PeerIdentity)))
-  {
-    /* iterate over all neighbours */
-    pc.all = GNUNET_YES;
-    pc.id = msg->peer;
-  }
-  else
-  {
-    /* just return one neighbour */
-    pc.all = GNUNET_NO;
-    pc.id = msg->peer;
-  }
-  GST_neighbours_iterate (&send_peer_information, &pc);
-
-  if (GNUNET_YES != ntohl (msg->one_shot))
-  {
-    tc->details.monitor_peer = msg->peer;
-    tc->type = CT_MONITOR;
-    if (0 !=
-        memcmp (&msg->peer, &all_zeros, sizeof(struct GNUNET_PeerIdentity)))
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Client %p started monitoring of the peer `%s'\n",
-                  tc,
-                  GNUNET_i2s (&msg->peer));
-    else
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Client %p started monitoring all peers\n",
-                  tc);
-  }
-  else
-  {
-    struct GNUNET_MessageHeader *msg;
-    struct GNUNET_MQ_Envelope *env;
-
-    env =
-      GNUNET_MQ_msg (msg,
-                     GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_PEER_RESPONSE_END);
-    GNUNET_MQ_send (tc->mq, env);
-  }
-}
-
-
-/**
- * Function called by the plugin with information about the
- * current sessions managed by the plugin (for monitoring).
- *
- * @param cls closure
- * @param session session handle this information is about,
- *        NULL to indicate that we are "in sync" (initial
- *        iteration complete)
- * @param info information about the state of the session,
- *        NULL if @a session is also NULL and we are
- *        merely signalling that the initial iteration is over
- */
-static void
-plugin_session_info_cb (void *cls,
-                        struct GNUNET_ATS_Session *session,
-                        const struct GNUNET_TRANSPORT_SessionInfo *info)
-{
-  struct GNUNET_MQ_Envelope *env;
-  struct TransportPluginMonitorMessage *msg;
-  struct GNUNET_MessageHeader *sync;
-  size_t size;
-  size_t slen;
-  uint16_t alen;
-  char *name;
-  char *addr;
-
-  if (0 == GNUNET_notification_context_get_size (plugin_nc))
-  {
-    GST_plugins_monitor_subscribe (NULL, NULL);
-    return;
-  }
-  if ((NULL == info) && (NULL == session))
-  {
-    /* end of initial iteration */
-    if (NULL != sync_client)
-    {
-      env =
-        GNUNET_MQ_msg (sync, GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_PLUGIN_SYNC);
-      GNUNET_MQ_send (sync_client->mq, env);
-      sync_client = NULL;
-    }
-    return;
-  }
-  GNUNET_assert (NULL != info);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Plugin event for peer %s on transport %s\n",
-              GNUNET_i2s (&info->address->peer),
-              info->address->transport_name);
-  slen = strlen (info->address->transport_name) + 1;
-  alen = info->address->address_length;
-  size = sizeof(struct TransportPluginMonitorMessage) + slen + alen;
-  if (size > UINT16_MAX)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  msg = GNUNET_malloc (size);
-  msg->header.size = htons (size);
-  msg->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_PLUGIN_EVENT);
-  msg->session_state = htons ((uint16_t) info->state);
-  msg->is_inbound = htons ((int16_t) info->is_inbound);
-  msg->msgs_pending = htonl (info->num_msg_pending);
-  msg->bytes_pending = htonl (info->num_bytes_pending);
-  msg->timeout = GNUNET_TIME_absolute_hton (info->session_timeout);
-  msg->delay = GNUNET_TIME_absolute_hton (info->receive_delay);
-  msg->peer = info->address->peer;
-  msg->session_id = (uint64_t) (intptr_t) session;
-  msg->plugin_name_len = htons (slen);
-  msg->plugin_address_len = htons (alen);
-  name = (char *) &msg[1];
-  GNUNET_memcpy (name, info->address->transport_name, slen);
-  addr = &name[slen];
-  GNUNET_memcpy (addr, info->address->address, alen);
-  if (NULL != sync_client)
-  {
-    struct GNUNET_MQ_Envelope *env;
-
-    env = GNUNET_MQ_msg_copy (&msg->header);
-    GNUNET_MQ_send (sync_client->mq, env);
-  }
-  else
-  {
-    GNUNET_notification_context_broadcast (plugin_nc, &msg->header, GNUNET_NO);
-  }
-  GNUNET_free (msg);
-}
-
-
-/**
- * Client asked to obtain information about all plugin connections.
- *
- * @param cls the client
- * @param message the peer address information request
- */
-static void
-handle_client_monitor_plugins (void *cls,
-                               const struct GNUNET_MessageHeader *message)
-{
-  struct TransportClient *tc = cls;
-
-  GNUNET_SERVICE_client_mark_monitor (tc->client);
-  GNUNET_SERVICE_client_disable_continue_warning (tc->client);
-  GNUNET_notification_context_add (plugin_nc, tc->mq);
-  GNUNET_assert (NULL == sync_client);
-  sync_client = tc;
-  GST_plugins_monitor_subscribe (&plugin_session_info_cb, NULL);
-}
-
-
-/**
- * Broadcast the given message to all of our clients.
- *
- * @param msg message to broadcast
- * @param may_drop #GNUNET_YES if the message can be dropped / is payload
- */
-void
-GST_clients_broadcast (const struct GNUNET_MessageHeader *msg, int may_drop)
-{
-  int done;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Asked to broadcast message of type %u with %u bytes\n",
-              (unsigned int) ntohs (msg->type),
-              (unsigned int) ntohs (msg->size));
-  done = GNUNET_NO;
-  for (struct TransportClient *tc = clients_head; NULL != tc; tc = tc->next)
-  {
-    if (CT_NONE == tc->type)
-      continue;   /* client not yet ready */
-    if ((GNUNET_YES == may_drop) && (CT_CORE != tc->type))
-      continue;   /* skip, this client does not care about payload */
-    unicast (tc, msg, may_drop);
-    done = GNUNET_YES;
-  }
-  if (GNUNET_NO == done)
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Message of type %u not delivered, is CORE service up?\n",
-                ntohs (msg->type));
-}
-
-
-/**
- * Broadcast the new active address to all clients monitoring the peer.
- *
- * @param peer peer this update is about (never NULL)
- * @param address address, NULL on disconnect
- * @param state the current state of the peer
- * @param state_timeout the time out for the state
- */
-void
-GST_clients_broadcast_peer_notification (
-  const struct GNUNET_PeerIdentity *peer,
-  const struct GNUNET_HELLO_Address *address,
-  enum GNUNET_TRANSPORT_PeerState state,
-  struct GNUNET_TIME_Absolute state_timeout)
-{
-  struct GNUNET_MQ_Envelope *env;
-  struct PeerIterateResponseMessage *msg;
-
-  msg = compose_address_iterate_response_message (peer, address);
-  msg->state = htonl (state);
-  msg->state_timeout = GNUNET_TIME_absolute_hton (state_timeout);
-  for (struct TransportClient *tc = clients_head; NULL != tc; tc = tc->next)
-  {
-    if (CT_MONITOR != tc->type)
-      continue;
-    if ((0 == memcmp (&tc->details.monitor_peer,
-                      &all_zeros,
-                      sizeof(struct GNUNET_PeerIdentity))) ||
-        (0 == memcmp (&tc->details.monitor_peer,
-                      peer,
-                      sizeof(struct GNUNET_PeerIdentity))))
-    {
-      env = GNUNET_MQ_msg_copy (&msg->header);
-      GNUNET_MQ_send (tc->mq, env);
-    }
-  }
-  GNUNET_free (msg);
-}
-
-
-/**
- * Mark the peer as down so we don't call the continuation
- * context in the future.
- *
- * @param cls NULL
- * @param peer peer that got disconnected
- * @param value a `struct SendTransmitContinuationContext` to mark
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-mark_peer_down (void *cls, const struct GNUNET_PeerIdentity *peer, void *value)
-{
-  struct SendTransmitContinuationContext *stcc = value;
-
-  stcc->down = GNUNET_YES;
-  return GNUNET_OK;
-}
-
-
-/**
- * Notify all clients about a disconnect, and cancel
- * pending SEND_OK messages for this peer.
- *
- * @param peer peer that disconnected
- */
-void
-GST_clients_broadcast_disconnect (const struct GNUNET_PeerIdentity *peer)
-{
-  struct DisconnectInfoMessage disconnect_msg;
-
-  GNUNET_CONTAINER_multipeermap_get_multiple (active_stccs,
-                                              peer,
-                                              &mark_peer_down,
-                                              NULL);
-  disconnect_msg.header.size = htons (sizeof(struct DisconnectInfoMessage));
-  disconnect_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_DISCONNECT);
-  disconnect_msg.reserved = htonl (0);
-  disconnect_msg.peer = *peer;
-  GST_clients_broadcast (&disconnect_msg.header, GNUNET_NO);
-}
-
-
-/**
- * Transmit our HELLO message to the given (connected) neighbour.
- *
- * @param cls the 'HELLO' message
- * @param peer identity of the peer
- * @param address the address
- * @param state current state this peer is in
- * @param state_timeout timeout for the current state of the peer
- * @param bandwidth_in inbound quota in NBO
- * @param bandwidth_out outbound quota in NBO
- */
-static void
-transmit_our_hello (void *cls,
-                    const struct GNUNET_PeerIdentity *peer,
-                    const struct GNUNET_HELLO_Address *address,
-                    enum GNUNET_TRANSPORT_PeerState state,
-                    struct GNUNET_TIME_Absolute state_timeout,
-                    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
-                    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out)
-{
-  const struct GNUNET_MessageHeader *hello = cls;
-
-  if (0 == memcmp (peer, &GST_my_identity, sizeof(struct GNUNET_PeerIdentity)))
-    return; /* not to ourselves */
-  if (GNUNET_NO == GST_neighbours_test_connected (peer))
-    return;
-
-  GST_neighbours_send (peer,
-                       hello,
-                       ntohs (hello->size),
-                       hello_expiration,
-                       NULL,
-                       NULL);
-}
-
-
-/**
- * My HELLO has changed. Tell everyone who should know.
- *
- * @param cls unused
- * @param hello new HELLO
- */
-static void
-process_hello_update (void *cls, const struct GNUNET_MessageHeader *hello)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Broadcasting HELLO to clients\n");
-  GST_clients_broadcast (hello, GNUNET_NO);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Broadcasting HELLO to neighbours\n");
-  GST_neighbours_iterate (&transmit_our_hello, (void *) hello);
-}
-
-
-/**
- * We received some payload.  Prepare to pass it on to our clients.
- *
- * @param address address and (claimed) identity of the other peer
- * @param session identifier used for this session (NULL for plugins
- *                that do not offer bi-directional communication to the sender
- *                using the same "connection")
- * @param message the message to process
- * @return how long the plugin should wait until receiving more data
- */
-static struct GNUNET_TIME_Relative
-process_payload (const struct GNUNET_HELLO_Address *address,
-                 struct GNUNET_ATS_Session *session,
-                 const struct GNUNET_MessageHeader *message)
-{
-  struct GNUNET_TIME_Relative ret;
-  int do_forward;
-  struct InboundMessage *im;
-  size_t msg_size = ntohs (message->size);
-  size_t size = sizeof(struct InboundMessage) + msg_size;
-  char buf[size] GNUNET_ALIGN;
-
-  do_forward = GNUNET_SYSERR;
-  ret = GST_neighbours_calculate_receive_delay (&address->peer,
-                                                msg_size,
-                                                &do_forward);
-  if (! GST_neighbours_test_connected (&address->peer))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Discarded %u bytes type %u payload from peer `%s'\n",
-                (unsigned int) msg_size,
-                ntohs (message->type),
-                GNUNET_i2s (&address->peer));
-    GNUNET_STATISTICS_update (
-      GST_stats,
-      gettext_noop ("# bytes payload discarded due to not connected peer"),
-      msg_size,
-      GNUNET_NO);
-    return ret;
-  }
-
-  if (GNUNET_YES != do_forward)
-    return ret;
-  im = (struct InboundMessage *) buf;
-  im->header.size = htons (size);
-  im->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_RECV);
-  im->peer = address->peer;
-  GNUNET_memcpy (&im[1], message, ntohs (message->size));
-  GST_clients_broadcast (&im->header, GNUNET_YES);
-  return ret;
-}
-
-
-/**
- * Task to asynchronously terminate a session.
- *
- * @param cls the `struct GNUNET_ATS_SessionKiller` with the information for the kill
- */
-static void
-kill_session_task (void *cls)
-{
-  struct GNUNET_ATS_SessionKiller *sk = cls;
-
-  sk->task = NULL;
-  GNUNET_CONTAINER_DLL_remove (sk_head, sk_tail, sk);
-  sk->plugin->disconnect_session (sk->plugin->cls, sk->session);
-  GNUNET_free (sk);
-}
-
-
-/**
- * Force plugin to terminate session due to communication
- * issue.
- *
- * @param plugin_name name of the plugin
- * @param session session to termiante
- */
-static void
-kill_session (const char *plugin_name, struct GNUNET_ATS_Session *session)
-{
-  struct GNUNET_TRANSPORT_PluginFunctions *plugin;
-  struct GNUNET_ATS_SessionKiller *sk;
-
-  for (sk = sk_head; NULL != sk; sk = sk->next)
-    if (sk->session == session)
-      return;
-  plugin = GST_plugins_find (plugin_name);
-  if (NULL == plugin)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  /* need to issue disconnect asynchronously */
-  sk = GNUNET_new (struct GNUNET_ATS_SessionKiller);
-  sk->session = session;
-  sk->plugin = plugin;
-  sk->task = GNUNET_SCHEDULER_add_now (&kill_session_task, sk);
-  GNUNET_CONTAINER_DLL_insert (sk_head, sk_tail, sk);
-}
-
-
-/**
- * Black list check result for try_connect call
- * If connection to the peer is allowed request address and ???
- *
- * @param cls the message
- * @param peer the peer
- * @param address the address
- * @param session the session
- * @param result the result
- */
-static void
-connect_bl_check_cont (void *cls,
-                       const struct GNUNET_PeerIdentity *peer,
-                       const struct GNUNET_HELLO_Address *address,
-                       struct GNUNET_ATS_Session *session,
-                       int result)
-{
-  struct GNUNET_MessageHeader *msg = cls;
-
-  if (GNUNET_OK == result)
-  {
-    /* Blacklist allows to speak to this peer, forward SYN to neighbours  */
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Received SYN message from peer `%s' at `%s'\n",
-                GNUNET_i2s (peer),
-                GST_plugins_a2s (address));
-    if (GNUNET_OK != GST_neighbours_handle_session_syn (msg, peer))
-    {
-      GST_blacklist_abort_matching (address, session);
-      kill_session (address->transport_name, session);
-    }
-    GNUNET_free (msg);
-    return;
-  }
-  GNUNET_free (msg);
-  if (GNUNET_SYSERR == result)
-    return; /* check was aborted, session destroyed */
-  /* Blacklist denies to speak to this peer */
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Discarding SYN message from `%s' due to denied blacklist check\n",
-              GNUNET_i2s (peer));
-  kill_session (address->transport_name, session);
-}
-
-
-/**
- * Function called by the transport for each received message.
- *
- * @param cls closure, const char* with the name of the plugin we received the message from
- * @param address address and (claimed) identity of the other peer
- * @param message the message, NULL if we only care about
- *                learning about the delay until we should receive again
- * @param session identifier used for this session (NULL for plugins
- *                that do not offer bi-directional communication to the sender
- *                using the same "connection")
- * @return how long the plugin should wait until receiving more data
- *         (plugins that do not support this, can ignore the return value)
- */
-struct GNUNET_TIME_Relative
-GST_receive_callback (void *cls,
-                      const struct GNUNET_HELLO_Address *address,
-                      struct GNUNET_ATS_Session *session,
-                      const struct GNUNET_MessageHeader *message)
-{
-  const char *plugin_name = cls;
-  struct GNUNET_TIME_Relative ret;
-  uint16_t type;
-
-  ret = GNUNET_TIME_UNIT_ZERO;
-  if (NULL == message)
-    goto end;
-  type = ntohs (message->type);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received message with type %u from peer `%s' at %s\n",
-              type,
-              GNUNET_i2s (&address->peer),
-              GST_plugins_a2s (address));
-
-  GNUNET_STATISTICS_update (GST_stats,
-                            gettext_noop ("# bytes total received"),
-                            ntohs (message->size),
-                            GNUNET_NO);
-  GST_neighbours_notify_data_recv (address, message);
-  switch (type)
-  {
-  case GNUNET_MESSAGE_TYPE_HELLO_URI:
-    /* Future HELLO message, discard  */
-    return ret;
-
-  case GNUNET_MESSAGE_TYPE_HELLO:
-    if (GNUNET_OK != GST_validation_handle_hello (message))
-    {
-      GNUNET_break_op (0);
-      GST_blacklist_abort_matching (address, session);
-    }
-    return ret;
-
-  case GNUNET_MESSAGE_TYPE_TRANSPORT_PING:
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Processing PING from `%s'\n",
-                GST_plugins_a2s (address));
-    if (GNUNET_OK !=
-        GST_validation_handle_ping (&address->peer, message, address, session))
-    {
-      GST_blacklist_abort_matching (address, session);
-      kill_session (plugin_name, session);
-    }
-    break;
-
-  case GNUNET_MESSAGE_TYPE_TRANSPORT_PONG:
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Processing PONG from `%s'\n",
-                GST_plugins_a2s (address));
-    if (GNUNET_OK != GST_validation_handle_pong (&address->peer, message))
-    {
-      GNUNET_break_op (0);
-      GST_blacklist_abort_matching (address, session);
-      kill_session (plugin_name, session);
-    }
-    break;
-
-  case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_SYN:
-    /* Do blacklist check if communication with this peer is allowed */
-    (void) GST_blacklist_test_allowed (&address->peer,
-                                       NULL,
-                                       &connect_bl_check_cont,
-                                       GNUNET_copy_message (message),
-                                       address,
-                                       session);
-    break;
-
-  case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_SYN_ACK:
-    if (GNUNET_OK !=
-        GST_neighbours_handle_session_syn_ack (message, address, session))
-    {
-      GST_blacklist_abort_matching (address, session);
-      kill_session (plugin_name, session);
-    }
-    break;
-
-  case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_ACK:
-    if (GNUNET_OK !=
-        GST_neighbours_handle_session_ack (message, address, session))
-    {
-      GNUNET_break_op (0);
-      GST_blacklist_abort_matching (address, session);
-      kill_session (plugin_name, session);
-    }
-    break;
-
-  case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT:
-    GST_neighbours_handle_disconnect_message (&address->peer, message);
-    break;
-
-  case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_QUOTA:
-    GST_neighbours_handle_quota_message (&address->peer, message);
-    break;
-
-  case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE:
-    GST_neighbours_keepalive (&address->peer, message);
-    break;
-
-  case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE_RESPONSE:
-    GST_neighbours_keepalive_response (&address->peer, message);
-    break;
-
-  default:
-    /* should be payload */
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop ("# bytes payload received"),
-                              ntohs (message->size),
-                              GNUNET_NO);
-    ret = process_payload (address, session, message);
-    break;
-  }
-end:
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Allowing receive from peer %s to continue in %s\n",
-              GNUNET_i2s (&address->peer),
-              GNUNET_STRINGS_relative_time_to_string (ret, GNUNET_YES));
-  return ret;
-}
-
-
-/**
- * Function that will be called for each address the transport
- * is aware that it might be reachable under.  Update our HELLO.
- *
- * @param cls name of the plugin (const char*)
- * @param add_remove should the address added (YES) or removed (NO) from the
- *                   set of valid addresses?
- * @param address the address to add or remove
- */
-static void
-plugin_env_address_change_notification (
-  void *cls,
-  int add_remove,
-  const struct GNUNET_HELLO_Address *address)
-{
-  static int addresses = 0;
-
-  if (GNUNET_YES == add_remove)
-  {
-    addresses++;
-    GNUNET_STATISTICS_update (GST_stats, "# transport addresses", 1, GNUNET_NO);
-  }
-  else if (GNUNET_NO == add_remove)
-  {
-    if (0 == addresses)
-    {
-      GNUNET_break (0);
-    }
-    else
-    {
-      addresses--;
-      GNUNET_STATISTICS_update (GST_stats,
-                                "# transport addresses",
-                                -1,
-                                GNUNET_NO);
-    }
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Transport now has %u addresses to communicate\n",
-              addresses);
-  GST_hello_modify_addresses (add_remove, address);
-}
-
-
-/**
- * Function that will be called whenever the plugin internally
- * cleans up a session pointer and hence the service needs to
- * discard all of those sessions as well.  Plugins that do not
- * use sessions can simply omit calling this function and always
- * use NULL wherever a session pointer is needed.  This function
- * should be called BEFORE a potential "TransmitContinuation"
- * from the "TransmitFunction".
- *
- * @param cls closure
- * @param address which address was the session for
- * @param session which session is being destroyed
- */
-static void
-plugin_env_session_end (void *cls,
-                        const struct GNUNET_HELLO_Address *address,
-                        struct GNUNET_ATS_Session *session)
-{
-  struct GNUNET_ATS_SessionKiller *sk;
-
-  if (NULL == address)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  if (NULL == session)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  GNUNET_assert (strlen (address->transport_name) > 0);
-
-  GNUNET_log (
-    GNUNET_ERROR_TYPE_DEBUG,
-    "Notification from plugin about terminated session %p from peer `%s' address `%s'\n",
-    session,
-    GNUNET_i2s (&address->peer),
-    GST_plugins_a2s (address));
-
-  GST_neighbours_session_terminated (&address->peer, session);
-  GST_ats_del_session (address, session);
-  GST_blacklist_abort_matching (address, session);
-
-  for (sk = sk_head; NULL != sk; sk = sk->next)
-  {
-    if (sk->session == session)
-    {
-      GNUNET_CONTAINER_DLL_remove (sk_head, sk_tail, sk);
-      GNUNET_SCHEDULER_cancel (sk->task);
-      GNUNET_free (sk);
-      break;
-    }
-  }
-}
-
-
-/**
- * Black list check result from blacklist check triggered when a
- * plugin gave us a new session in #plugin_env_session_start().  If
- * connection to the peer is disallowed, kill the session.
- *
- * @param cls NULL
- * @param peer the peer
- * @param address address associated with the request
- * @param session session associated with the request
- * @param result the result
- */
-static void
-plugin_env_session_start_bl_check_cont (
-  void *cls,
-  const struct GNUNET_PeerIdentity *peer,
-  const struct GNUNET_HELLO_Address *address,
-  struct GNUNET_ATS_Session *session,
-  int result)
-{
-  if (GNUNET_OK != result)
-  {
-    kill_session (address->transport_name, session);
-    return;
-  }
-  if (GNUNET_YES !=
-      GNUNET_HELLO_address_check_option (address,
-                                         GNUNET_HELLO_ADDRESS_INFO_INBOUND))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Informing verifier about inbound session's address `%s'\n",
-                GST_plugins_a2s (address));
-    GST_validation_handle_address (address);
-  }
-}
-
-
-/**
- * Plugin tells transport service about a new inbound session
- *
- * @param cls unused
- * @param address the address
- * @param session the new session
- * @param scope network scope information
- */
-static void
-plugin_env_session_start (void *cls,
-                          const struct GNUNET_HELLO_Address *address,
-                          struct GNUNET_ATS_Session *session,
-                          enum GNUNET_NetworkType scope)
-{
-  struct GNUNET_ATS_Properties prop;
-
-  if (NULL == address)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  if (NULL == session)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  GNUNET_log (
-    GNUNET_ERROR_TYPE_INFO,
-    "Notification from plugin `%s' about new session from peer `%s' address `%s'\n",
-    address->transport_name,
-    GNUNET_i2s (&address->peer),
-    GST_plugins_a2s (address));
-  if (GNUNET_YES ==
-      GNUNET_HELLO_address_check_option (address,
-                                         GNUNET_HELLO_ADDRESS_INFO_INBOUND))
-  {
-    /* inbound is always new, but outbound MAY already be known, but
-       for example for UNIX, we have symmetric connections and thus we
-       may not know the address yet; add if necessary! */
-    /* FIXME: maybe change API here so we just pass scope? */
-    memset (&prop, 0, sizeof(prop));
-    GNUNET_break (GNUNET_NT_UNSPECIFIED != scope);
-    prop.scope = scope;
-    GST_ats_add_inbound_address (address, session, &prop);
-  }
-  /* Do blacklist check if communication with this peer is allowed */
-  (void) GST_blacklist_test_allowed (&address->peer,
-                                     address->transport_name,
-                                     &plugin_env_session_start_bl_check_cont,
-                                     NULL,
-                                     address,
-                                     session);
-}
-
-
-/**
- * Function called by ATS to notify the callee that the
- * assigned bandwidth or address for a given peer was changed.  If the
- * callback is called with address/bandwidth assignments of zero, the
- * ATS disconnect function will still be called once the disconnect
- * actually happened.
- *
- * @param cls closure
- * @param peer the peer this address is intended for
- * @param address address to use (for peer given in address)
- * @param session session to use (if available)
- * @param bandwidth_out assigned outbound bandwidth for the connection in NBO,
- *      0 to disconnect from peer
- * @param bandwidth_in assigned inbound bandwidth for the connection in NBO,
- *      0 to disconnect from peer
- * @param ats ATS information
- * @param ats_count number of @a ats elements
- */
-static void
-ats_request_address_change (void *cls,
-                            const struct GNUNET_PeerIdentity *peer,
-                            const struct GNUNET_HELLO_Address *address,
-                            struct GNUNET_ATS_Session *session,
-                            struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
-                            struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
-{
-  uint32_t bw_in = ntohl (bandwidth_in.value__);
-  uint32_t bw_out = ntohl (bandwidth_out.value__);
-
-  if (NULL == peer)
-  {
-    /* ATS service died, all suggestions become invalid!
-       (but we'll keep using the allocations for a little
-       while, to keep going while ATS restarts) */
-    /* FIXME: We should drop all
-       connections now, as ATS won't explicitly tell
-       us and be unaware of ongoing resource allocations! */
-    return;
-  }
-  /* ATS tells me to disconnect from peer */
-  if ((0 == bw_in) && (0 == bw_out))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "ATS tells me to disconnect from peer `%s'\n",
-                GNUNET_i2s (peer));
-    GST_neighbours_force_disconnect (peer);
-    return;
-  }
-  GNUNET_assert (NULL != address);
-  GNUNET_STATISTICS_update (GST_stats,
-                            "# ATS suggestions received",
-                            1,
-                            GNUNET_NO);
-  GST_neighbours_switch_to_address (address,
-                                    session,
-                                    bandwidth_in,
-                                    bandwidth_out);
-}
-
-
-/**
- * Closure for #test_connection_ok().
- */
-struct TestConnectionContext
-{
-  /**
-   * Is this the first neighbour we're checking?
-   */
-  int first;
-
-  /**
-   * Handle to the blacklisting client we need to ask.
-   */
-  struct TransportClient *tc;
-};
-
-
-/**
- * Got the result about an existing connection from a new blacklister.
- * Shutdown the neighbour if necessary.
- *
- * @param cls unused
- * @param peer the neighbour that was investigated
- * @param address address associated with the request
- * @param session session associated with the request
- * @param allowed #GNUNET_OK if we can keep it,
- *                #GNUNET_NO if we must shutdown the connection
- */
-static void
-confirm_or_drop_neighbour (void *cls,
-                           const struct GNUNET_PeerIdentity *peer,
-                           const struct GNUNET_HELLO_Address *address,
-                           struct GNUNET_ATS_Session *session,
-                           int allowed)
-{
-  if (GNUNET_OK == allowed)
-    return; /* we're done */
-  GNUNET_STATISTICS_update (GST_stats,
-                            gettext_noop ("# disconnects due to blacklist"),
-                            1,
-                            GNUNET_NO);
-  GST_neighbours_force_disconnect (peer);
-}
-
-
-/**
- * Test if an existing connection is still acceptable given a new
- * blacklisting client.
- *
- * @param cls the `struct TestConnectionContext *`
- * @param peer identity of the peer
- * @param address the address
- * @param state current state this peer is in
- * @param state_timeout timeout for the current state of the peer
- * @param bandwidth_in bandwidth assigned inbound
- * @param bandwidth_out bandwidth assigned outbound
- */
-static void
-test_connection_ok (void *cls,
-                    const struct GNUNET_PeerIdentity *peer,
-                    const struct GNUNET_HELLO_Address *address,
-                    enum GNUNET_TRANSPORT_PeerState state,
-                    struct GNUNET_TIME_Absolute state_timeout,
-                    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
-                    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out)
-{
-  struct TestConnectionContext *tcc = cls;
-  struct GST_BlacklistCheck *bc;
-
-  bc = GNUNET_new (struct GST_BlacklistCheck);
-  GNUNET_CONTAINER_DLL_insert (bc_head, bc_tail, bc);
-  bc->peer = *peer;
-  bc->address = GNUNET_HELLO_address_copy (address);
-  bc->cont = &confirm_or_drop_neighbour;
-  bc->cont_cls = NULL;
-  bc->bl_pos = tcc->tc;
-  if (GNUNET_YES == tcc->first)
-  {
-    /* all would wait for the same client, no need to
-     * create more than just the first task right now */
-    bc->task = GNUNET_SCHEDULER_add_now (&do_blacklist_check, bc);
-    tcc->first = GNUNET_NO;
-  }
-}
-
-
-/**
- * Initialize a blacklisting client.  We got a blacklist-init
- * message from this client, add it to the list of clients
- * to query for blacklisting.
- *
- * @param cls the client
- * @param message the blacklist-init message that was sent
- */
-static void
-handle_client_blacklist_init (void *cls,
-                              const struct GNUNET_MessageHeader *message)
-{
-  struct TransportClient *tc = cls;
-  struct TestConnectionContext tcc;
-
-  if (CT_NONE != tc->type)
-  {
-    GNUNET_break (0);
-    GNUNET_SERVICE_client_drop (tc->client);
-    return;
-  }
-  GNUNET_SERVICE_client_mark_monitor (tc->client);
-  tc->type = CT_BLACKLIST;
-  tc->details.blacklist.call_receive_done = GNUNET_YES;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "New blacklist client %p\n", tc);
-  /* confirm that all existing connections are OK! */
-  tcc.tc = tc;
-  tcc.first = GNUNET_YES;
-  GST_neighbours_iterate (&test_connection_ok, &tcc);
-}
-
-
-/**
- * Free the given entry in the blacklist.
- *
- * @param cls unused
- * @param key host identity (unused)
- * @param value the blacklist entry
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-free_blacklist_entry (void *cls,
-                      const struct GNUNET_PeerIdentity *key,
-                      void *value)
-{
-  char *be = value;
-
-  GNUNET_free (be);
-  return GNUNET_OK;
-}
-
-
-/**
- * Set traffic metric to manipulate
- *
- * @param cls closure
- * @param message containing information
- */
-static void
-handle_client_set_metric (void *cls, const struct TrafficMetricMessage *tm)
-{
-  struct TransportClient *tc = cls;
-
-  GST_manipulation_set_metric (tm);
-  GNUNET_SERVICE_client_continue (tc->client);
-}
-
-
-/**
- * Function called when the service shuts down.  Unloads our plugins
- * and cancels pending validations.
- *
- * @param cls closure, unused
- */
-static void
-shutdown_task (void *cls)
-{
-  struct AddressToStringContext *cur;
-
-  GST_neighbours_stop ();
-  GST_plugins_unload ();
-  GST_validation_stop ();
-  GST_ats_done ();
-  GNUNET_ATS_scheduling_done (GST_ats);
-  GST_ats = NULL;
-  GNUNET_ATS_connectivity_done (GST_ats_connect);
-  GST_ats_connect = NULL;
-  GNUNET_NT_scanner_done (GST_is);
-  GST_is = NULL;
-  while (NULL != (cur = a2s_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (a2s_head, a2s_tail, cur);
-    GNUNET_free (cur);
-  }
-  if (NULL != plugin_nc)
-  {
-    GNUNET_notification_context_destroy (plugin_nc);
-    plugin_nc = NULL;
-  }
-  GNUNET_CONTAINER_multipeermap_destroy (active_stccs);
-  active_stccs = NULL;
-  if (NULL != blacklist)
-  {
-    GNUNET_CONTAINER_multipeermap_iterate (blacklist,
-                                           &free_blacklist_entry,
-                                           NULL);
-    GNUNET_CONTAINER_multipeermap_destroy (blacklist);
-    blacklist = NULL;
-  }
-  GST_hello_stop ();
-  GST_manipulation_stop ();
-
-  if (NULL != GST_peerinfo)
-  {
-    GNUNET_PEERINFO_disconnect (GST_peerinfo);
-    GST_peerinfo = NULL;
-  }
-  if (NULL != GST_stats)
-  {
-    GNUNET_STATISTICS_destroy (GST_stats, GNUNET_NO);
-    GST_stats = NULL;
-  }
-}
-
-
-/**
- * Perform next action in the blacklist check.
- *
- * @param cls the `struct GST_BlacklistCheck *`
- */
-static void
-do_blacklist_check (void *cls)
-{
-  struct GST_BlacklistCheck *bc = cls;
-  struct TransportClient *tc;
-  struct GNUNET_MQ_Envelope *env;
-  struct BlacklistMessage *bm;
-
-  bc->task = NULL;
-  while (NULL != (tc = bc->bl_pos))
-  {
-    if (CT_BLACKLIST == tc->type)
-      break;
-    bc->bl_pos = tc->next;
-  }
-  if (NULL == tc)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "No other blacklist clients active, will allow neighbour `%s'\n",
-                GNUNET_i2s (&bc->peer));
-
-    bc->cont (bc->cont_cls, &bc->peer, bc->address, bc->session, GNUNET_OK);
-    GST_blacklist_test_cancel (bc);
-    return;
-  }
-  if ((NULL != tc->details.blacklist.bc) ||
-      (GNUNET_NO != tc->details.blacklist.waiting_for_reply))
-    return; /* someone else busy with this client */
-  tc->details.blacklist.bc = bc;
-  env = GNUNET_MQ_msg (bm, GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST_QUERY);
-  bm->is_allowed = htonl (0);
-  bm->peer = bc->peer;
-  GNUNET_MQ_send (tc->mq, env);
-  if (GNUNET_YES == tc->details.blacklist.call_receive_done)
-  {
-    tc->details.blacklist.call_receive_done = GNUNET_NO;
-    GNUNET_SERVICE_client_continue (tc->client);
-  }
-  tc->details.blacklist.waiting_for_reply = GNUNET_YES;
-}
-
-
-/**
- * A blacklisting client has sent us reply. Process it.
- *
- * @param cls the client
- * @param msg the blacklist-reply message that was sent
- */
-static void
-handle_client_blacklist_reply (void *cls, const struct BlacklistMessage *msg)
-{
-  struct TransportClient *tc = cls;
-  struct GST_BlacklistCheck *bc;
-
-  if (CT_BLACKLIST != tc->type)
-  {
-    GNUNET_break (0);
-    GNUNET_SERVICE_client_drop (tc->client);
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Blacklist client %p sent reply for `%s'\n",
-              tc,
-              GNUNET_i2s (&msg->peer));
-  bc = tc->details.blacklist.bc;
-  tc->details.blacklist.bc = NULL;
-  tc->details.blacklist.waiting_for_reply = GNUNET_NO;
-  tc->details.blacklist.call_receive_done = GNUNET_YES;
-  if (NULL != bc)
-  {
-    /* only run this if the blacklist check has not been
-     * cancelled in the meantime... */
-    GNUNET_assert (bc->bl_pos == tc);
-    if (ntohl (msg->is_allowed) == GNUNET_SYSERR)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Blacklist check failed, peer not allowed\n");
-      /* For the duration of the continuation, make the ongoing
-         check invisible (to avoid double-cancellation); then
-         add it back again so we can re-use GST_blacklist_test_cancel() */
-      GNUNET_CONTAINER_DLL_remove (bc_head, bc_tail, bc);
-      bc->cont (bc->cont_cls, &bc->peer, bc->address, bc->session, GNUNET_NO);
-      GNUNET_CONTAINER_DLL_insert (bc_head, bc_tail, bc);
-      GST_blacklist_test_cancel (bc);
-      tc->details.blacklist.call_receive_done = GNUNET_NO;
-      GNUNET_SERVICE_client_continue (tc->client);
-      return;
-    }
-    else
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Blacklist check succeeded, continuing with checks\n");
-      tc->details.blacklist.call_receive_done = GNUNET_NO;
-      GNUNET_SERVICE_client_continue (tc->client);
-      bc->bl_pos = tc->next;
-      bc->task = GNUNET_SCHEDULER_add_now (&do_blacklist_check, bc);
-    }
-  }
-  /* check if any other blacklist checks are waiting for this blacklister */
-  for (bc = bc_head; bc != NULL; bc = bc->next)
-    if ((bc->bl_pos == tc) && (NULL == bc->task))
-    {
-      bc->task = GNUNET_SCHEDULER_add_now (&do_blacklist_check, bc);
-      break;
-    }
-}
-
-
-/**
- * Add the given peer to the blacklist (for the given transport).
- *
- * @param peer peer to blacklist
- * @param transport_name transport to blacklist for this peer, NULL for all
- */
-void
-GST_blacklist_add_peer (const struct GNUNET_PeerIdentity *peer,
-                        const char *transport_name)
-{
-  char *transport = NULL;
-
-  if (NULL != transport_name)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Adding peer `%s' with plugin `%s' to blacklist\n",
-                GNUNET_i2s (peer),
-                transport_name);
-    transport = GNUNET_strdup (transport_name);
-  }
-  else
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Adding peer `%s' with all plugins to blacklist\n",
-                GNUNET_i2s (peer));
-  if (NULL == blacklist)
-    blacklist =
-      GNUNET_CONTAINER_multipeermap_create (TRANSPORT_BLACKLIST_HT_SIZE,
-                                            GNUNET_NO);
-
-  GNUNET_CONTAINER_multipeermap_put (blacklist,
-                                     peer,
-                                     transport,
-                                     GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-}
-
-
-/**
- * Abort blacklist if @a address and @a session match.
- *
- * @param address address used to abort matching checks
- * @param session session used to abort matching checks
- */
-void
-GST_blacklist_abort_matching (const struct GNUNET_HELLO_Address *address,
-                              struct GNUNET_ATS_Session *session)
-{
-  struct GST_BlacklistCheck *bc;
-  struct GST_BlacklistCheck *n;
-
-  n = bc_head;
-  while (NULL != (bc = n))
-  {
-    n = bc->next;
-    if ((bc->session == session) &&
-        (0 == GNUNET_HELLO_address_cmp (bc->address, address)))
-    {
-      bc->cont (bc->cont_cls,
-                &bc->peer,
-                bc->address,
-                bc->session,
-                GNUNET_SYSERR);
-      GST_blacklist_test_cancel (bc);
-    }
-  }
-}
-
-
-/**
- * Test if the given blacklist entry matches.  If so,
- * abort the iteration.
- *
- * @param cls the transport name to match (const char*)
- * @param key the key (unused)
- * @param value the 'char *' (name of a blacklisted transport)
- * @return #GNUNET_OK if the entry does not match, #GNUNET_NO if it matches
- */
-static int
-test_blacklisted (void *cls, const struct GNUNET_PeerIdentity *key, void *value)
-{
-  const char *transport_name = cls;
-  char *be = value;
-
-  /* Blacklist entry be:
-   *  (NULL == be): peer is blacklisted with all plugins
-   *  (NULL != be): peer is blacklisted for a specific plugin
-   *
-   * If (NULL != transport_name) we look for a transport specific entry:
-   *  if (transport_name == be) forbidden
-   *
-   */GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Comparing BL request for peer `%4s':`%s' with BL entry: `%s'\n",
-              GNUNET_i2s (key),
-              (NULL == transport_name) ? "unspecified" : transport_name,
-              (NULL == be) ? "all plugins" : be);
-  /* all plugins for this peer were blacklisted: disallow */
-  if (NULL == value)
-    return GNUNET_NO;
-
-  /* blacklist check for specific transport */
-  if ((NULL != transport_name) && (NULL != value))
-  {
-    if (0 == strcmp (transport_name, be))
-      return GNUNET_NO;   /* plugin is blacklisted! */
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Test if a peer/transport combination is blacklisted.
- *
- * @param peer the identity of the peer to test
- * @param transport_name name of the transport to test, never NULL
- * @param cont function to call with result
- * @param cont_cls closure for @a cont
- * @param address address to pass back to @a cont, can be NULL
- * @param session session to pass back to @a cont, can be NULL
- * @return handle to the blacklist check, NULL if the decision
- *        was made instantly and @a cont was already called
- */
-struct GST_BlacklistCheck *
-GST_blacklist_test_allowed (const struct GNUNET_PeerIdentity *peer,
-                            const char *transport_name,
-                            GST_BlacklistTestContinuation cont,
-                            void *cont_cls,
-                            const struct GNUNET_HELLO_Address *address,
-                            struct GNUNET_ATS_Session *session)
-{
-  struct GST_BlacklistCheck *bc;
-  struct TransportClient *tc;
-
-  GNUNET_assert (NULL != peer);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Blacklist check for peer `%s':%s\n",
-              GNUNET_i2s (peer),
-              (NULL != transport_name) ? transport_name : "unspecified");
-
-  /* Check local blacklist by iterating over hashmap
-   * If iteration is aborted, we found a matching blacklist entry */
-  if ((NULL != blacklist) &&
-      (GNUNET_SYSERR ==
-       GNUNET_CONTAINER_multipeermap_get_multiple (blacklist,
-                                                   peer,
-                                                   &test_blacklisted,
-                                                   (void *) transport_name)))
-  {
-    /* Disallowed by config, disapprove instantly */
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop ("# disconnects due to blacklist"),
-                              1,
-                              GNUNET_NO);
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                _ ("Disallowing connection to peer `%s' on transport %s\n"),
-                GNUNET_i2s (peer),
-                (NULL != transport_name) ? transport_name : "unspecified");
-    if (NULL != cont)
-      cont (cont_cls, peer, address, session, GNUNET_NO);
-    return NULL;
-  }
-
-  for (tc = clients_head; NULL != tc; tc = tc->next)
-    if (CT_BLACKLIST == tc->type)
-      break;
-  if (NULL == tc)
-  {
-    /* no blacklist clients, approve instantly */
-    if (NULL != cont)
-      cont (cont_cls, peer, address, session, GNUNET_OK);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Allowing connection to peer `%s' %s\n",
-                GNUNET_i2s (peer),
-                (NULL != transport_name) ? transport_name : "");
-    return NULL;
-  }
-
-  /* need to query blacklist clients */
-  bc = GNUNET_new (struct GST_BlacklistCheck);
-  GNUNET_CONTAINER_DLL_insert (bc_head, bc_tail, bc);
-  bc->peer = *peer;
-  bc->address = GNUNET_HELLO_address_copy (address);
-  bc->session = session;
-  bc->cont = cont;
-  bc->cont_cls = cont_cls;
-  bc->bl_pos = tc;
-  bc->task = GNUNET_SCHEDULER_add_now (&do_blacklist_check, bc);
-  return bc;
-}
-
-
-/**
- * Cancel a blacklist check.
- *
- * @param bc check to cancel
- */
-void
-GST_blacklist_test_cancel (struct GST_BlacklistCheck *bc)
-{
-  GNUNET_CONTAINER_DLL_remove (bc_head, bc_tail, bc);
-  if (NULL != bc->bl_pos)
-  {
-    if ((CT_BLACKLIST == bc->bl_pos->type) &&
-        (bc->bl_pos->details.blacklist.bc == bc))
-    {
-      /* we're at the head of the queue, remove us! */
-      bc->bl_pos->details.blacklist.bc = NULL;
-    }
-  }
-  if (NULL != bc->task)
-  {
-    GNUNET_SCHEDULER_cancel (bc->task);
-    bc->task = NULL;
-  }
-  GNUNET_free (bc->address);
-  GNUNET_free (bc);
-}
-
-
-/**
- * Function to iterate over options in the blacklisting section for a peer.
- *
- * @param cls closure
- * @param section name of the section
- * @param option name of the option
- * @param value value of the option
- */
-static void
-blacklist_cfg_iter (void *cls,
-                    const char *section,
-                    const char *option,
-                    const char *value)
-{
-  unsigned int *res = cls;
-  struct GNUNET_PeerIdentity peer;
-  char *plugs;
-  char *pos;
-
-  if (GNUNET_OK !=
-      GNUNET_CRYPTO_eddsa_public_key_from_string (option,
-                                                  strlen (option),
-                                                  &peer.public_key))
-    return;
-
-  if ((NULL == value) || (0 == strcmp (value, "")))
-  {
-    /* Blacklist whole peer */
-    GST_blacklist_add_peer (&peer, NULL);
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                _ ("Adding blacklisting entry for peer `%s'\n"),
-                GNUNET_i2s (&peer));
-  }
-  else
-  {
-    plugs = GNUNET_strdup (value);
-    for (pos = strtok (plugs, " "); pos != NULL; pos = strtok (NULL, " "))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  _ ("Adding blacklisting entry for peer `%s':`%s'\n"),
-                  GNUNET_i2s (&peer),
-                  pos);
-      GST_blacklist_add_peer (&peer, pos);
-    }
-    GNUNET_free (plugs);
-  }
-  (*res)++;
-}
-
-
-/**
- * Read blacklist configuration
- *
- * @param cfg the configuration handle
- * @param my_id my peer identity
- */
-static void
-read_blacklist_configuration (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                              const struct GNUNET_PeerIdentity *my_id)
-{
-  char cfg_sect[512];
-  unsigned int res = 0;
-
-  GNUNET_snprintf (cfg_sect,
-                   sizeof(cfg_sect),
-                   "transport-blacklist-%s",
-                   GNUNET_i2s_full (my_id));
-  GNUNET_CONFIGURATION_iterate_section_values (cfg,
-                                               cfg_sect,
-                                               &blacklist_cfg_iter,
-                                               &res);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Loaded %u blacklisting entries from configuration\n",
-              res);
-}
-
-
-/**
- * Initiate transport service.
- *
- * @param cls closure
- * @param c configuration to use
- * @param service the initialized service
- */
-static void
-run (void *cls,
-     const struct GNUNET_CONFIGURATION_Handle *c,
-     struct GNUNET_SERVICE_Handle *service)
-{
-  char *keyfile;
-  long long unsigned int max_fd_cfg;
-  int max_fd_rlimit;
-  int max_fd;
-  int friend_only;
-
-  /* setup globals */
-  GST_cfg = c;
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (c,
-                                                            "PEER",
-                                                            "PRIVATE_KEY",
-                                                            &keyfile))
-  {
-    GNUNET_log (
-      GNUNET_ERROR_TYPE_ERROR,
-      _ (
-        "Transport service is lacking key configuration settings. Exiting.\n"));
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_time (c,
-                                                        "transport",
-                                                        "HELLO_EXPIRATION",
-                                                        &hello_expiration))
-  {
-    hello_expiration = GNUNET_CONSTANTS_HELLO_ADDRESS_EXPIRATION;
-  }
-  if (GNUNET_SYSERR ==
-      GNUNET_CRYPTO_eddsa_key_from_file (keyfile,
-                                         GNUNET_YES,
-                                         &GST_my_private_key))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to setup peer's private key\n");
-    GNUNET_SCHEDULER_shutdown ();
-    GNUNET_free (keyfile);
-    return;
-  }
-  GNUNET_free (keyfile);
-  GST_stats = GNUNET_STATISTICS_create ("transport", GST_cfg);
-  GST_peerinfo = GNUNET_PEERINFO_connect (GST_cfg);
-  GNUNET_CRYPTO_eddsa_key_get_public (&GST_my_private_key,
-                                      &GST_my_identity.public_key);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "My identity is `%s'\n",
-              GNUNET_i2s_full (&GST_my_identity));
-
-  GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
-  if (NULL == GST_peerinfo)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _ ("Could not access PEERINFO service.  Exiting.\n"));
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-
-  max_fd_rlimit = 0;
-#if HAVE_GETRLIMIT
-  {
-    struct rlimit r_file;
-
-    if (0 == getrlimit (RLIMIT_NOFILE, &r_file))
-    {
-      max_fd_rlimit = r_file.rlim_cur;
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Maximum number of open files was: %u/%u\n",
-                  (unsigned int) r_file.rlim_cur,
-                  (unsigned int) r_file.rlim_max);
-    }
-    max_fd_rlimit =
-      (9 * max_fd_rlimit) / 10; /* Keep 10% for rest of transport */
-  }
-#endif
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (GST_cfg,
-                                                          "transport",
-                                                          "MAX_FD",
-                                                          &max_fd_cfg))
-    max_fd_cfg = max_fd_rlimit;
-
-  if (max_fd_cfg > max_fd_rlimit)
-    max_fd = max_fd_cfg;
-  else
-    max_fd = max_fd_rlimit;
-  if (max_fd < DEFAULT_MAX_FDS)
-    max_fd = DEFAULT_MAX_FDS;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Limiting number of sockets to %u: validation %u, neighbors: %u\n",
-              max_fd,
-              (max_fd / 3),
-              (max_fd / 3) * 2);
-
-  friend_only =
-    GNUNET_CONFIGURATION_get_value_yesno (GST_cfg, "topology", "FRIENDS-ONLY");
-  if (GNUNET_SYSERR == friend_only)
-    friend_only = GNUNET_NO; /* According to topology defaults */
-  /* start subsystems */
-  /* Disable DSTJ peer */
-  {
-    struct GNUNET_PeerIdentity dstj;
-    const char *ds = "DSTJBRRKZ8TBW3FGK6B0M5QXWT9WYNZ45H5MCV4HY7ST64Q8T9F0";
-
-    GNUNET_assert (
-      GNUNET_OK ==
-      GNUNET_CRYPTO_eddsa_public_key_from_string (ds,
-                                                  strlen (ds),
-                                                  &dstj.public_key));
-    GST_blacklist_add_peer (&dstj, NULL);
-  }
-  read_blacklist_configuration (GST_cfg, &GST_my_identity);
-  GST_is = GNUNET_NT_scanner_init ();
-  GST_ats_connect = GNUNET_ATS_connectivity_init (GST_cfg);
-  GST_ats =
-    GNUNET_ATS_scheduling_init (GST_cfg, &ats_request_address_change, NULL);
-  GST_ats_init ();
-  GST_manipulation_init ();
-  GST_plugins_load (&GST_manipulation_recv,
-                    &plugin_env_address_change_notification,
-                    &plugin_env_session_start,
-                    &plugin_env_session_end);
-  GST_hello_start (friend_only, &process_hello_update, NULL);
-  GST_neighbours_start ((max_fd / 3) * 2);
-  active_stccs = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_YES);
-  plugin_nc = GNUNET_notification_context_create (0);
-  GST_validation_start ((max_fd / 3));
-}
-
-
-/**
- * Define "main" method using service macro.
- */
-GNUNET_SERVICE_MAIN (
-  "transport",
-  GNUNET_SERVICE_OPTION_NONE,
-  &run,
-  &client_connect_cb,
-  &client_disconnect_cb,
-  NULL,
-  GNUNET_MQ_hd_fixed_size (client_start,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_START,
-                           struct StartMessage,
-                           NULL),
-  GNUNET_MQ_hd_var_size (client_hello,
-                         GNUNET_MESSAGE_TYPE_HELLO,
-                         struct GNUNET_MessageHeader,
-                         NULL),
-  GNUNET_MQ_hd_var_size (client_send,
-                         GNUNET_MESSAGE_TYPE_TRANSPORT_SEND,
-                         struct OutboundMessage,
-                         NULL),
-  GNUNET_MQ_hd_var_size (client_address_to_string,
-                         GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_TO_STRING,
-                         struct AddressLookupMessage,
-                         NULL),
-  GNUNET_MQ_hd_fixed_size (client_monitor_peers,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_PEER_REQUEST,
-                           struct PeerMonitorMessage,
-                           NULL),
-  GNUNET_MQ_hd_fixed_size (client_blacklist_init,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST_INIT,
-                           struct GNUNET_MessageHeader,
-                           NULL),
-  GNUNET_MQ_hd_fixed_size (client_blacklist_reply,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST_REPLY,
-                           struct BlacklistMessage,
-                           NULL),
-  GNUNET_MQ_hd_fixed_size (client_set_metric,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_TRAFFIC_METRIC,
-                           struct TrafficMetricMessage,
-                           NULL),
-  GNUNET_MQ_hd_fixed_size (client_monitor_plugins,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_PLUGIN_START,
-                           struct GNUNET_MessageHeader,
-                           NULL),
-  GNUNET_MQ_handler_end ());
-
-
-/* end of file gnunet-service-transport.c */
diff --git a/src/transport/gnunet-service-transport.h b/src/transport/gnunet-service-transport.h
deleted file mode 100644
index ea9e71e4b..000000000
--- a/src/transport/gnunet-service-transport.h
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2010,2011 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/gnunet-service-transport.h
- * @brief globals
- * @author Christian Grothoff
- */
-#ifndef GNUNET_SERVICE_TRANSPORT_H
-#define GNUNET_SERVICE_TRANSPORT_H
-
-#include "gnunet_util_lib.h"
-#include "gnunet_statistics_service.h"
-#include "gnunet_ats_service.h"
-#include "gnunet_transport_service.h"
-
-#define VERBOSE_VALIDATION GNUNET_YES
-
-/**
- * Statistics handle.
- */
-extern struct GNUNET_STATISTICS_Handle *GST_stats;
-
-/**
- * Configuration handle.
- */
-extern const struct GNUNET_CONFIGURATION_Handle *GST_cfg;
-
-/**
- * Configuration handle.
- */
-extern struct GNUNET_PeerIdentity GST_my_identity;
-
-/**
- * Handle to peerinfo service.
- */
-extern struct GNUNET_PEERINFO_Handle *GST_peerinfo;
-
-/**
- * Our private key.
- */
-extern struct GNUNET_CRYPTO_EddsaPrivateKey GST_my_private_key;
-
-/**
- * ATS handle.
- */
-extern struct GNUNET_ATS_SchedulingHandle *GST_ats;
-
-/**
- * ATS connectivity handle.
- */
-extern struct GNUNET_ATS_ConnectivityHandle *GST_ats_connect;
-
-/**
- * Interface scanner determines our LAN address range(s).
- */
-extern struct GNUNET_NT_InterfaceScanner *GST_is;
-
-
-/**
- * Function to call when a peer's address has changed
- *
- * @param cls closure
- * @param peer peer this update is about,
- * @param address address, NULL for disconnect notification
- */
-typedef void
-(*GNUNET_TRANSPORT_NeighbourChangeCallback) (void *cls,
-                                             const struct
-                                             GNUNET_PeerIdentity *peer,
-                                             const struct
-                                             GNUNET_HELLO_Address *address,
-                                             enum GNUNET_TRANSPORT_PeerState
-                                             state,
-                                             struct GNUNET_TIME_Absolute
-                                             state_timeout,
-                                             struct GNUNET_BANDWIDTH_Value32NBO
-                                             bandwidth_in,
-                                             struct GNUNET_BANDWIDTH_Value32NBO
-                                             bandwidth_out);
-
-
-/**
- * Continuation called from a blacklist test.
- *
- * @param cls closure
- * @param peer identity of peer that was tested
- * @param address address associated with the request
- * @param session session associated with the request
- * @param result #GNUNET_OK if the connection is allowed,
- *               #GNUNET_NO if not,
- *               #GNUNET_SYSERR if operation was aborted
- */
-typedef void
-(*GST_BlacklistTestContinuation) (void *cls,
-                                  const struct GNUNET_PeerIdentity *peer,
-                                  const struct GNUNET_HELLO_Address *address,
-                                  struct GNUNET_ATS_Session *session,
-                                  int result);
-
-
-/**
- * Add the given peer to the blacklist (for the given transport).
- *
- * @param peer peer to blacklist
- * @param transport_name transport to blacklist for this peer, NULL for all
- */
-void
-GST_blacklist_add_peer (const struct GNUNET_PeerIdentity *peer,
-                        const char *transport_name);
-
-
-/**
- * Handle to an active blacklist check.
- */
-struct GST_BlacklistCheck;
-
-
-/**
- * Test if a peer/transport combination is blacklisted.
- *
- * @param peer the identity of the peer to test
- * @param transport_name name of the transport to test, never NULL
- * @param cont function to call with result
- * @param cont_cls closure for @a cont
- * @param address address to pass back to @a cont, can be NULL
- * @param session session to pass back to @a cont, can be NULL
- * @return handle to the blacklist check, NULL if the decision
- *        was made instantly and @a cont was already called
- */
-struct GST_BlacklistCheck *
-GST_blacklist_test_allowed (const struct GNUNET_PeerIdentity *peer,
-                            const char *transport_name,
-                            GST_BlacklistTestContinuation cont,
-                            void *cont_cls,
-                            const struct GNUNET_HELLO_Address *address,
-                            struct GNUNET_ATS_Session *session);
-
-
-/**
- * Abort blacklist if @a address and @a session match.
- *
- * @param address address used to abort matching checks
- * @param session session used to abort matching checks
- */
-void
-GST_blacklist_abort_matching (const struct GNUNET_HELLO_Address *address,
-                              struct GNUNET_ATS_Session *session);
-
-/**
- * Cancel a blacklist check.
- *
- * @param bc check to cancel
- */
-void
-GST_blacklist_test_cancel (struct GST_BlacklistCheck *bc);
-
-
-/**
- * Function called by the transport for each received message.
- *
- * @param cls closure, const char* with the name of the plugin we received the message from
- * @param address address and (claimed) identity of the other peer
- * @param session identifier used for this session (NULL for plugins
- *                that do not offer bi-directional communication to the sender
- *                using the same "connection")
- * @param message the message, NULL if we only care about
- *                learning about the delay until we should receive again
- * @return how long the plugin should wait until receiving more data
- *         (plugins that do not support this, can ignore the return value)
- */
-struct GNUNET_TIME_Relative
-GST_receive_callback (void *cls,
-                      const struct GNUNET_HELLO_Address *address,
-                      struct GNUNET_ATS_Session *session,
-                      const struct GNUNET_MessageHeader *message);
-
-/**
- * Broadcast the given message to all of our clients.
- *
- * @param msg message to broadcast
- * @param may_drop #GNUNET_YES if the message can be dropped / is payload
- */
-void
-GST_clients_broadcast (const struct GNUNET_MessageHeader *msg,
-                       int may_drop);
-
-
-/**
- * Broadcast the new active address to all clients monitoring the peer.
- *
- * @param peer peer this update is about (never NULL)
- * @param address address, NULL on disconnect
- * @param state the current state of the peer
- * @param state_timeout the time out for the state
- */
-void
-GST_clients_broadcast_peer_notification (const struct GNUNET_PeerIdentity *peer,
-                                         const struct
-                                         GNUNET_HELLO_Address *address,
-                                         enum GNUNET_TRANSPORT_PeerState state,
-                                         struct GNUNET_TIME_Absolute
-                                         state_timeout);
-
-
-/**
- * Notify all clients about a disconnect, and cancel
- * pending SEND_OK messages for this peer.
- *
- * @param peer peer that disconnected
- */
-void
-GST_clients_broadcast_disconnect (const struct GNUNET_PeerIdentity *peer);
-
-
-#endif
-/* end of file gnunet-service-transport_plugins.h */
diff --git a/src/transport/gnunet-service-transport_ats.c b/src/transport/gnunet-service-transport_ats.c
deleted file mode 100644
index 130311e15..000000000
--- a/src/transport/gnunet-service-transport_ats.c
+++ /dev/null
@@ -1,920 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2015 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport/gnunet-service-transport_ats.c
- * @brief interfacing between transport and ATS service
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "gnunet-service-transport.h"
-#include "gnunet-service-transport_ats.h"
-#include "gnunet-service-transport_manipulation.h"
-#include "gnunet-service-transport_plugins.h"
-#include "gnunet_ats_service.h"
-
-/**
- * Log convenience function.
- */
-#define LOG(kind, ...) GNUNET_log_from (kind, "transport-ats", __VA_ARGS__)
-
-
-/**
- * Information we track for each address known to ATS.
- */
-struct AddressInfo
-{
-  /**
-   * The address (with peer identity).  Must never change
-   * while this struct is in the #p2a map.
-   */
-  struct GNUNET_HELLO_Address *address;
-
-  /**
-   * Session (can be NULL)
-   */
-  struct GNUNET_ATS_Session *session;
-
-  /**
-   * Record with ATS API for the address.
-   */
-  struct GNUNET_ATS_AddressRecord *ar;
-
-  /**
-   * Performance properties of this address.
-   */
-  struct GNUNET_ATS_Properties properties;
-
-  /**
-   * Time until when this address is blocked and should thus not be
-   * made available to ATS (@e ar should be NULL until this time).
-   * Used when transport determines that for some reason it
-   * (temporarily) cannot use an address, even though it has been
-   * validated.
-   */
-  struct GNUNET_TIME_Absolute blocked;
-
-  /**
-   * If an address is blocked as part of an exponential back-off,
-   * we track the current size of the backoff here.
-   */
-  struct GNUNET_TIME_Relative back_off;
-
-  /**
-   * Task scheduled to unblock an ATS-blocked address at
-   * @e blocked time, or NULL if the address is not blocked
-   * (and thus @e ar is non-NULL).
-   */
-  struct GNUNET_SCHEDULER_Task *unblock_task;
-
-  /**
-   * Set to #GNUNET_YES if the address has expired but we could
-   * not yet remove it because we still have a valid session.
-   */
-  int expired;
-};
-
-
-/**
- * Map from peer identities to one or more `struct AddressInfo` values
- * for the peer.
- */
-static struct GNUNET_CONTAINER_MultiPeerMap *p2a;
-
-/**
- * Number of blocked addresses.
- */
-static unsigned int num_blocked;
-
-
-/**
- * Closure for #find_ai_cb() and #find_ai_no_session_cb().
- */
-struct FindClosure
-{
-  /**
-   * Session to look for (only used if the address is inbound).
-   */
-  struct GNUNET_ATS_Session *session;
-
-  /**
-   * Address to look for.
-   */
-  const struct GNUNET_HELLO_Address *address;
-
-  /**
-   * Where to store the result.
-   */
-  struct AddressInfo *ret;
-};
-
-
-/**
- * Provide an update on the `p2a` map size to statistics.
- * This function should be called whenever the `p2a` map
- * is changed.
- */
-static void
-publish_p2a_stat_update ()
-{
-  GNUNET_STATISTICS_set (GST_stats,
-                         gettext_noop ("# Addresses given to ATS"),
-                         GNUNET_CONTAINER_multipeermap_size (p2a) - num_blocked,
-                         GNUNET_NO);
-  GNUNET_STATISTICS_set (GST_stats,
-                         "# blocked addresses",
-                         num_blocked,
-                         GNUNET_NO);
-}
-
-
-/**
- * Find matching address info.  Both the address and the session
- * must match; note that expired addresses are still found (as
- * the session kind-of keeps those alive).
- *
- * @param cls the `struct FindClosure`
- * @param key which peer is this about
- * @param value the `struct AddressInfo`
- * @return #GNUNET_YES to continue to iterate, #GNUNET_NO if we found the value
- */
-static int
-find_ai_cb (void *cls,
-            const struct GNUNET_PeerIdentity *key,
-            void *value)
-{
-  struct FindClosure *fc = cls;
-  struct AddressInfo *ai = value;
-
-  if ((0 ==
-       GNUNET_HELLO_address_cmp (fc->address,
-                                 ai->address)) &&
-      (fc->session == ai->session))
-  {
-    fc->ret = ai;
-    return GNUNET_NO;
-  }
-  return GNUNET_YES;
-}
-
-
-/**
- * Find the address information struct for the
- * given @a address and @a session.
- *
- * @param address address to look for
- * @param session session to match for inbound connections
- * @return NULL if this combination is unknown
- */
-static struct AddressInfo *
-find_ai (const struct GNUNET_HELLO_Address *address,
-         struct GNUNET_ATS_Session *session)
-{
-  struct FindClosure fc;
-
-  fc.address = address;
-  fc.session = session;
-  fc.ret = NULL;
-  GNUNET_CONTAINER_multipeermap_get_multiple (p2a,
-                                              &address->peer,
-                                              &find_ai_cb,
-                                              &fc);
-  return fc.ret;
-}
-
-
-/**
- * Find matching address info, ignoring sessions and expired
- * addresses.
- *
- * @param cls the `struct FindClosure`
- * @param key which peer is this about
- * @param value the `struct AddressInfo`
- * @return #GNUNET_YES to continue to iterate, #GNUNET_NO if we found the value
- */
-static int
-find_ai_no_session_cb (void *cls,
-                       const struct GNUNET_PeerIdentity *key,
-                       void *value)
-{
-  struct FindClosure *fc = cls;
-  struct AddressInfo *ai = value;
-
-  if (ai->expired)
-    return GNUNET_YES; /* expired do not count here */
-  if (0 ==
-      GNUNET_HELLO_address_cmp (fc->address,
-                                ai->address))
-  {
-    fc->ret = ai;
-    return GNUNET_NO;
-  }
-  return GNUNET_YES;
-}
-
-
-/**
- * Find the address information struct for the
- * given address (ignoring sessions)
- *
- * @param address address to look for
- * @return NULL if this combination is unknown
- */
-static struct AddressInfo *
-find_ai_no_session (const struct GNUNET_HELLO_Address *address)
-{
-  struct FindClosure fc;
-
-  fc.address = address;
-  fc.session = NULL;
-  fc.ret = NULL;
-  GNUNET_CONTAINER_multipeermap_get_multiple (p2a,
-                                              &address->peer,
-                                              &find_ai_no_session_cb,
-                                              &fc);
-  return fc.ret;
-}
-
-
-/**
- * Test if ATS knows about this @a address and @a session.
- * Note that even if the address is expired, we return
- * #GNUNET_YES if the respective session matches.
- *
- * @param address the address
- * @param session the session
- * @return #GNUNET_YES if @a address is known, #GNUNET_NO if not.
- */
-int
-GST_ats_is_known (const struct GNUNET_HELLO_Address *address,
-                  struct GNUNET_ATS_Session *session)
-{
-  return (NULL != find_ai (address, session)) ? GNUNET_YES : GNUNET_NO;
-}
-
-
-/**
- * Test if ATS knows about this @a address.  Note that
- * expired addresses do not count.
- *
- * @param address the address
- * @return #GNUNET_YES if @a address is known, #GNUNET_NO if not.
- */
-int
-GST_ats_is_known_no_session (const struct GNUNET_HELLO_Address *address)
-{
-  return (NULL != find_ai_no_session (address))
-         ? GNUNET_YES
-         : GNUNET_NO;
-}
-
-
-/**
- * The blocking time for an address has expired, allow ATS to
- * suggest it again.
- *
- * @param cls the `struct AddressInfo` of the address to unblock
- */
-static void
-unblock_address (void *cls)
-{
-  struct AddressInfo *ai = cls;
-
-  ai->unblock_task = NULL;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Unblocking address %s of peer %s\n",
-       GST_plugins_a2s (ai->address),
-       GNUNET_i2s (&ai->address->peer));
-  ai->ar = GNUNET_ATS_address_add (GST_ats,
-                                   ai->address,
-                                   ai->session,
-                                   &ai->properties);
-  GNUNET_break (NULL != ai->ar);
-  num_blocked--;
-  publish_p2a_stat_update ();
-}
-
-
-/**
- * Temporarily block a valid address for use by ATS for address
- * suggestions.  This function should be called if an address was
- * suggested by ATS but failed to perform (i.e. failure to establish a
- * session or to exchange the PING/PONG).
- *
- * @param address the address to block
- * @param session the session (can be NULL)
- */
-void
-GST_ats_block_address (const struct GNUNET_HELLO_Address *address,
-                       struct GNUNET_ATS_Session *session)
-{
-  struct AddressInfo *ai;
-
-  if (0 ==
-      memcmp (&GST_my_identity,
-              &address->peer,
-              sizeof(struct GNUNET_PeerIdentity)))
-    return; /* our own, ignore! */
-  ai = find_ai (address,
-                session);
-  if ((NULL == ai) || (NULL == ai->ar))
-  {
-    /* The address is already gone/blocked, this can happen during a blacklist
-     * callback. */
-    return;
-  }
-  ai->back_off = GNUNET_TIME_STD_BACKOFF (ai->back_off);
-  if (GNUNET_YES ==
-      GNUNET_HELLO_address_check_option (address,
-                                         GNUNET_HELLO_ADDRESS_INFO_INBOUND))
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Removing address %s of peer %s from use (inbound died)\n",
-         GST_plugins_a2s (address),
-         GNUNET_i2s (&address->peer));
-  else
-    LOG (GNUNET_ERROR_TYPE_INFO,
-         "Blocking address %s of peer %s from use for %s\n",
-         GST_plugins_a2s (address),
-         GNUNET_i2s (&address->peer),
-         GNUNET_STRINGS_relative_time_to_string (ai->back_off,
-                                                 GNUNET_YES));
-  /* destroy session and address */
-  if ((NULL == session) ||
-      (GNUNET_NO ==
-       GNUNET_ATS_address_del_session (ai->ar,
-                                       session)))
-  {
-    GNUNET_ATS_address_destroy (ai->ar);
-  }
-  /* "ar" has been freed, regardless how the branch
-     above played out: it was either freed in
-   #GNUNET_ATS_address_del_session() because it was
-     incoming, or explicitly in
-   #GNUNET_ATS_address_del_session(). */ai->ar = NULL;
-
-  /* determine when the address should come back to life */
-  ai->blocked = GNUNET_TIME_relative_to_absolute (ai->back_off);
-  ai->unblock_task = GNUNET_SCHEDULER_add_delayed (ai->back_off,
-                                                   &unblock_address,
-                                                   ai);
-  num_blocked++;
-  publish_p2a_stat_update ();
-}
-
-
-/**
- * Reset address blocking time.  Resets the exponential
- * back-off timer for this address to zero.  Called when
- * an address was used to create a successful connection.
- *
- * @param address the address to reset the blocking timer
- * @param session the session (can be NULL)
- */
-void
-GST_ats_block_reset (const struct GNUNET_HELLO_Address *address,
-                     struct GNUNET_ATS_Session *session)
-{
-  struct AddressInfo *ai;
-
-  if (0 ==
-      memcmp (&GST_my_identity,
-              &address->peer,
-              sizeof(struct GNUNET_PeerIdentity)))
-    return; /* our own, ignore! */
-  ai = find_ai (address, session);
-  if (NULL == ai)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  /* address is in successful use, so it should not be blocked right now */
-  GNUNET_break (NULL == ai->unblock_task);
-  ai->back_off = GNUNET_TIME_UNIT_ZERO;
-}
-
-
-/**
- * Notify ATS about a new inbound @a address. The @a address in
- * combination with the @a session must be new, but this function will
- * perform a santiy check.  If the @a address is indeed new, make it
- * available to ATS.
- *
- * @param address the address
- * @param session the session
- * @param prop performance information
- */
-void
-GST_ats_add_inbound_address (const struct GNUNET_HELLO_Address *address,
-                             struct GNUNET_ATS_Session *session,
-                             const struct GNUNET_ATS_Properties *prop)
-{
-  struct GNUNET_ATS_AddressRecord *ar;
-  struct AddressInfo *ai;
-
-  if (0 ==
-      memcmp (&GST_my_identity,
-              &address->peer,
-              sizeof(struct GNUNET_PeerIdentity)))
-    return; /* our own, ignore! */
-
-  /* Sanity checks for a valid inbound address */
-  if (NULL == address->transport_name)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  GNUNET_break (GNUNET_NT_UNSPECIFIED != prop->scope);
-  GNUNET_assert (GNUNET_YES ==
-                 GNUNET_HELLO_address_check_option (address,
-                                                    GNUNET_HELLO_ADDRESS_INFO_INBOUND));
-  GNUNET_assert (NULL != session);
-  ai = find_ai (address, session);
-  if (NULL != ai)
-  {
-    /* This should only be called for new sessions, and thus
-       we should not already have the address */
-    GNUNET_break (0);
-    return;
-  }
-  /* Is indeed new, let's tell ATS */
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Notifying ATS about peer `%s''s new inbound address `%s' session %p in network %s\n",
-       GNUNET_i2s (&address->peer),
-       GST_plugins_a2s (address),
-       session,
-       GNUNET_NT_to_string (prop->scope));
-  ar = GNUNET_ATS_address_add (GST_ats,
-                               address,
-                               session,
-                               prop);
-  GNUNET_assert (NULL != ar);
-  ai = GNUNET_new (struct AddressInfo);
-  ai->address = GNUNET_HELLO_address_copy (address);
-  ai->session = session;
-  ai->properties = *prop;
-  ai->ar = ar;
-  (void) GNUNET_CONTAINER_multipeermap_put (p2a,
-                                            &ai->address->peer,
-                                            ai,
-                                            GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-  publish_p2a_stat_update ();
-}
-
-
-/**
- * Notify ATS about the new address including the network this address is
- * located in.  The address must NOT be inbound and must be new to ATS.
- *
- * @param address the address
- * @param prop performance information
- */
-void
-GST_ats_add_address (const struct GNUNET_HELLO_Address *address,
-                     const struct GNUNET_ATS_Properties *prop)
-{
-  struct GNUNET_ATS_AddressRecord *ar;
-  struct AddressInfo *ai;
-
-  if (0 ==
-      memcmp (&GST_my_identity,
-              &address->peer,
-              sizeof(struct GNUNET_PeerIdentity)))
-    return; /* our own, ignore! */
-  /* validadte address */
-  if (NULL == address->transport_name)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  GNUNET_assert (GNUNET_YES !=
-                 GNUNET_HELLO_address_check_option (address,
-                                                    GNUNET_HELLO_ADDRESS_INFO_INBOUND));
-  ai = find_ai_no_session (address);
-  GNUNET_assert (NULL == ai);
-  GNUNET_break (GNUNET_NT_UNSPECIFIED != prop->scope);
-
-  /* address seems sane, let's tell ATS */
-  LOG (GNUNET_ERROR_TYPE_INFO,
-       "Notifying ATS about peer %s's new address `%s'\n",
-       GNUNET_i2s (&address->peer),
-       GST_plugins_a2s (address));
-  ar = GNUNET_ATS_address_add (GST_ats,
-                               address,
-                               NULL,
-                               prop);
-  GNUNET_assert (NULL != ar);
-  ai = GNUNET_new (struct AddressInfo);
-  ai->address = GNUNET_HELLO_address_copy (address);
-  ai->ar = ar;
-  ai->properties = *prop;
-  (void) GNUNET_CONTAINER_multipeermap_put (p2a,
-                                            &ai->address->peer,
-                                            ai,
-                                            GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-  publish_p2a_stat_update ();
-}
-
-
-/**
- * Notify ATS about a new @a session now existing for the given
- * @a address.  Essentially, an outbound @a address was used
- * to establish a @a session.  It is safe to call this function
- * repeatedly for the same @a address and @a session pair.
- *
- * @param address the address
- * @param session the session
- */
-void
-GST_ats_new_session (const struct GNUNET_HELLO_Address *address,
-                     struct GNUNET_ATS_Session *session)
-{
-  struct AddressInfo *ai;
-
-  if (0 ==
-      memcmp (&GST_my_identity,
-              &address->peer,
-              sizeof(struct GNUNET_PeerIdentity)))
-    return; /* our own, ignore! */
-  ai = find_ai (address, NULL);
-  if (NULL == ai)
-  {
-    /* We may simply already be aware of the session, even if some
-       other part of the code could not tell if it just created a new
-       session or just got one recycled from the plugin; hence, we may
-       be called with "new" session even for an "old" session; in that
-       case, check that this is the case, but just ignore it. */GNUNET_assert (NULL != (find_ai (address, session)));
-    return;
-  }
-  GNUNET_assert (NULL == ai->session);
-  ai->session = session;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Telling ATS about new session for peer %s\n",
-       GNUNET_i2s (&address->peer));
-  /* Note that the address might currently be blocked; we only
-     tell ATS about the session if the address is currently not
-     blocked; otherwise, ATS will be told about the session on
-     unblock. */
-  if (NULL != ai->ar)
-    GNUNET_ATS_address_add_session (ai->ar,
-                                    session);
-  else
-    GNUNET_assert (NULL != ai->unblock_task);
-}
-
-
-/**
- * Release memory used by the given address data.
- *
- * @param ai the `struct AddressInfo`
- */
-static void
-destroy_ai (struct AddressInfo *ai)
-{
-  GNUNET_assert (NULL == ai->session);
-  if (NULL != ai->unblock_task)
-  {
-    GNUNET_SCHEDULER_cancel (ai->unblock_task);
-    ai->unblock_task = NULL;
-    num_blocked--;
-  }
-  GNUNET_assert (GNUNET_YES ==
-                 GNUNET_CONTAINER_multipeermap_remove (p2a,
-                                                       &ai->address->peer,
-                                                       ai));
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Telling ATS to destroy address from peer %s\n",
-       GNUNET_i2s (&ai->address->peer));
-  if (NULL != ai->ar)
-  {
-    GNUNET_ATS_address_destroy (ai->ar);
-    ai->ar = NULL;
-  }
-  publish_p2a_stat_update ();
-  GNUNET_HELLO_address_free (ai->address);
-  GNUNET_free (ai);
-}
-
-
-/**
- * Notify ATS that the @a session (but not the @a address) of
- * a given @a address is no longer relevant. (The @a session
- * went down.)  This function may be called even if for the
- * respective outbound address #GST_ats_new_session() was
- * never called and thus the pair is unknown to ATS. In this
- * case, the call is simply ignored.
- *
- * @param address the address
- * @param session the session
- */
-void
-GST_ats_del_session (const struct GNUNET_HELLO_Address *address,
-                     struct GNUNET_ATS_Session *session)
-{
-  struct AddressInfo *ai;
-
-  if (0 ==
-      memcmp (&GST_my_identity,
-              &address->peer,
-              sizeof(struct GNUNET_PeerIdentity)))
-    return; /* our own, ignore! */
-  if (NULL == session)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  ai = find_ai (address,
-                session);
-  if (NULL == ai)
-  {
-    /* We sometimes create sessions just for sending a PING,
-       and if those are destroyed they were never known to
-       ATS which means we end up here (however, in this
-       case, the address must be an outbound address). */
-    GNUNET_break (GNUNET_YES !=
-                  GNUNET_HELLO_address_check_option (address,
-                                                     GNUNET_HELLO_ADDRESS_INFO_INBOUND));
-    return;
-  }
-  GNUNET_assert (session == ai->session);
-  ai->session = NULL;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Telling ATS to destroy session %p from peer %s\n",
-       session,
-       GNUNET_i2s (&address->peer));
-  if (GNUNET_YES == ai->expired)
-  {
-    /* last reason to keep this 'ai' around is now gone, the
-       session is dead as well, clean up */
-    if (NULL != ai->ar)
-    {
-      /* Address expired but not blocked, and thus 'ar' was still
-         live because of the session; deleting just the session
-         will do for an inbound session, but for an outbound we
-         then also need to destroy the address with ATS. */
-      if (GNUNET_NO ==
-          GNUNET_ATS_address_del_session (ai->ar,
-                                          session))
-      {
-        GNUNET_ATS_address_destroy (ai->ar);
-      }
-      /* "ar" has been freed, regardless how the branch
-         above played out: it was either freed in
-       #GNUNET_ATS_address_del_session() because it was
-         incoming, or explicitly in
-       #GNUNET_ATS_address_del_session(). */ai->ar = NULL;
-    }
-    destroy_ai (ai);
-    return;
-  }
-
-  if (NULL == ai->ar)
-  {
-    /* If ATS doesn't know about the address/session, this means
-       this address was blocked. */
-    if (GNUNET_YES ==
-        GNUNET_HELLO_address_check_option (address,
-                                           GNUNET_HELLO_ADDRESS_INFO_INBOUND))
-    {
-      /* This was a blocked inbound session, which now lost the
-         session.  But inbound addresses are by themselves useless,
-         so we must forget about the address as well. */
-      destroy_ai (ai);
-      return;
-    }
-    /* Otherwise, we are done as we have set `ai->session` to NULL
-       already and ATS will simply not be told about the session when
-       the connection is unblocked and the outbound address becomes
-       available again. . */
-    return;
-  }
-
-  /* This is the "simple" case where ATS knows about the session and
-     the address is neither blocked nor expired.  Delete the session,
-     and if it was inbound, free the address as well. */
-  if (GNUNET_YES ==
-      GNUNET_ATS_address_del_session (ai->ar,
-                                      session))
-  {
-    /* This was an inbound address, the session is now gone, so we
-       need to also forget about the address itself. */
-    ai->ar = NULL;
-    destroy_ai (ai);
-  }
-}
-
-
-/**
- * Notify ATS about DV @a distance change to an @a address.
- * Does nothing if the @a address is not known to us.
- *
- * @param address the address
- * @param distance new distance value
- */
-void
-GST_ats_update_distance (const struct GNUNET_HELLO_Address *address,
-                         uint32_t distance)
-{
-  struct AddressInfo *ai;
-
-  ai = find_ai_no_session (address);
-  if (NULL == ai)
-  {
-    /* We do not know about this address, do nothing. */
-    return;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Updated distance for peer `%s' to %u\n",
-       GNUNET_i2s (&address->peer),
-       distance);
-  ai->properties.distance = distance;
-  /* Give manipulation its chance to change metrics */
-  GST_manipulation_manipulate_metrics (address,
-                                       ai->session,
-                                       &ai->properties);
-  /* Address may be blocked, only give ATS if address is
-     currently active. */
-  if (NULL != ai->ar)
-    GNUNET_ATS_address_update (ai->ar,
-                               &ai->properties);
-}
-
-
-/**
- * Notify ATS about @a delay changes to properties of an @a address.
- * Does nothing if the @a address is not known to us.
- *
- * @param address the address
- * @param delay new delay value
- */
-void
-GST_ats_update_delay (const struct GNUNET_HELLO_Address *address,
-                      struct GNUNET_TIME_Relative delay)
-{
-  struct AddressInfo *ai;
-
-  ai = find_ai_no_session (address);
-  if (NULL == ai)
-  {
-    /* We do not know about this address, do nothing. */
-    return;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Updated latency for peer `%s' to %s\n",
-       GNUNET_i2s (&address->peer),
-       GNUNET_STRINGS_relative_time_to_string (delay,
-                                               GNUNET_YES));
-  ai->properties.delay = delay;
-  /* Give manipulation its chance to change metrics */
-  GST_manipulation_manipulate_metrics (address,
-                                       ai->session,
-                                       &ai->properties);
-  /* Address may be blocked, only give ATS if address is
-     currently active. */
-  if (NULL != ai->ar)
-    GNUNET_ATS_address_update (ai->ar,
-                               &ai->properties);
-}
-
-
-/**
- * Notify ATS about utilization changes to an @a address.
- * Does nothing if the @a address is not known to us.
- *
- * @param address our information about the address
- * @param bps_in new utilization inbound
- * @param bps_out new utilization outbound
- */
-void
-GST_ats_update_utilization (const struct GNUNET_HELLO_Address *address,
-                            uint32_t bps_in,
-                            uint32_t bps_out)
-{
-  struct AddressInfo *ai;
-
-  ai = find_ai_no_session (address);
-  if (NULL == ai)
-  {
-    /* We do not know about this address, do nothing. */
-    return;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Updating utilization for peer `%s' address %s: %u/%u\n",
-       GNUNET_i2s (&address->peer),
-       GST_plugins_a2s (address),
-       (unsigned int) bps_in,
-       (unsigned int) bps_out);
-  ai->properties.utilization_in = bps_in;
-  ai->properties.utilization_out = bps_out;
-  /* Give manipulation its chance to change metrics */
-  GST_manipulation_manipulate_metrics (address,
-                                       ai->session,
-                                       &ai->properties);
-  /* Address may be blocked, only give ATS if address is
-     currently active. */
-  if (NULL != ai->ar)
-    GNUNET_ATS_address_update (ai->ar,
-                               &ai->properties);
-}
-
-
-/**
- * Notify ATS that the address has expired and thus cannot
- * be used any longer.  This function must only be called
- * if the corresponding session is already gone.
- *
- * @param address the address
- */
-void
-GST_ats_expire_address (const struct GNUNET_HELLO_Address *address)
-{
-  struct AddressInfo *ai;
-
-  if (0 ==
-      memcmp (&GST_my_identity,
-              &address->peer,
-              sizeof(struct GNUNET_PeerIdentity)))
-    return; /* our own, ignore! */
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Address %s of peer %s expired\n",
-       GST_plugins_a2s (address),
-       GNUNET_i2s (&address->peer));
-  ai = find_ai_no_session (address);
-  if (NULL == ai)
-  {
-    GNUNET_assert (0);
-    return;
-  }
-  if (NULL != ai->session)
-  {
-    /* Got an active session, just remember the expiration
-       and act upon it when the session goes down. */
-    ai->expired = GNUNET_YES;
-    return;
-  }
-  /* Address expired, no session, free resources */
-  destroy_ai (ai);
-}
-
-
-/**
- * Initialize ATS subsystem.
- */
-void
-GST_ats_init ()
-{
-  p2a = GNUNET_CONTAINER_multipeermap_create (4, GNUNET_YES);
-}
-
-
-/**
- * Release memory used by the given address data.
- *
- * @param cls NULL
- * @param key which peer is this about
- * @param value the `struct AddressInfo`
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-destroy_ai_cb (void *cls,
-               const struct GNUNET_PeerIdentity *key,
-               void *value)
-{
-  struct AddressInfo *ai = value;
-
-  destroy_ai (ai);
-  return GNUNET_OK;
-}
-
-
-/**
- * Shutdown ATS subsystem.
- */
-void
-GST_ats_done ()
-{
-  GNUNET_CONTAINER_multipeermap_iterate (p2a,
-                                         &destroy_ai_cb,
-                                         NULL);
-  publish_p2a_stat_update ();
-  GNUNET_CONTAINER_multipeermap_destroy (p2a);
-  p2a = NULL;
-}
-
-
-/* end of gnunet-service-transport_ats.c */
diff --git a/src/transport/gnunet-service-transport_ats.h b/src/transport/gnunet-service-transport_ats.h
deleted file mode 100644
index d536714ec..000000000
--- a/src/transport/gnunet-service-transport_ats.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2015 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport/gnunet-service-transport_ats.h
- * @brief interfacing between transport and ATS service
- * @author Christian Grothoff
- */
-#ifndef GNUNET_SERVICE_TRANSPORT_ATS_H
-#define GNUNET_SERVICE_TRANSPORT_ATS_H
-
-#include "gnunet_ats_service.h"
-
-/**
- * Initialize ATS subsystem.
- */
-void
-GST_ats_init (void);
-
-
-/**
- * Shutdown ATS subsystem.
- */
-void
-GST_ats_done (void);
-
-
-/**
- * Test if ATS knows about this @a address and @a session.
- * Note that even if the address is expired, we return
- * #GNUNET_YES if the respective session matches.
- *
- * @param address the address
- * @param session the session
- * @return #GNUNET_YES if @a address is known, #GNUNET_NO if not.
- */
-int
-GST_ats_is_known (const struct GNUNET_HELLO_Address *address,
-                  struct GNUNET_ATS_Session *session);
-
-
-/**
- * Test if ATS knows about this @a address.  Note that
- * expired addresses do not count.
- *
- * @param address the address
- * @return #GNUNET_YES if @a address is known, #GNUNET_NO if not.
- */
-int
-GST_ats_is_known_no_session (const struct GNUNET_HELLO_Address *address);
-
-
-/**
- * Temporarily block a valid address for use by ATS for address
- * suggestions.  This function should be called if an address was
- * suggested by ATS but failed to perform (i.e. failure to establish a
- * session or to exchange the PING/PONG).
- *
- * @param address the address to block
- * @param session the session (can be NULL)
- */
-void
-GST_ats_block_address (const struct GNUNET_HELLO_Address *address,
-                       struct GNUNET_ATS_Session *session);
-
-
-/**
- * Reset address blocking time.  Resets the exponential
- * back-off timer for this address to zero.  Called when
- * an address was used to create a successful connection.
- *
- * @param address the address to reset the blocking timer
- * @param session the session (can be NULL)
- */
-void
-GST_ats_block_reset (const struct GNUNET_HELLO_Address *address,
-                     struct GNUNET_ATS_Session *session);
-
-
-/**
- * Notify ATS about a new inbound @a address. The @a address in
- * combination with the @a session must be new, but this function will
- * perform a santiy check.  If the @a address is indeed new, make it
- * available to ATS.
- *
- * @param address the address
- * @param session the session
- * @param prop performance information
- */
-void
-GST_ats_add_inbound_address (const struct GNUNET_HELLO_Address *address,
-                             struct GNUNET_ATS_Session *session,
-                             const struct GNUNET_ATS_Properties *prop);
-
-
-/**
- * Notify ATS about a new address including the network this address is
- * located in.  The address must NOT be inbound and must be new to ATS.
- *
- * @param address the address
- * @param prop performance information
- */
-void
-GST_ats_add_address (const struct GNUNET_HELLO_Address *address,
-                     const struct GNUNET_ATS_Properties *prop);
-
-
-/**
- * Notify ATS about a new @a session now existing for the given
- * @a address.  Essentially, an outbound @a address was used
- * to establish a @a session.  It is safe to call this function
- * repeatedly for the same @a address and @a session pair.
- *
- * @param address the address
- * @param session the session
- */
-void
-GST_ats_new_session (const struct GNUNET_HELLO_Address *address,
-                     struct GNUNET_ATS_Session *session);
-
-
-/**
- * Notify ATS about utilization changes to an @a address.
- * Does nothing if the @a address is not known to us.
- *
- * @param address our information about the address
- * @param bps_in new utilization inbound
- * @param bps_out new utilization outbound
- */
-void
-GST_ats_update_utilization (const struct GNUNET_HELLO_Address *address,
-                            uint32_t bps_in,
-                            uint32_t bps_out);
-
-
-/**
- * Notify ATS about @a delay changes to properties of an @a address.
- * Does nothing if the @a address is not known to us.
- *
- * @param address the address
- * @param session the session
- * @param delay new delay value
- */
-void
-GST_ats_update_delay (const struct GNUNET_HELLO_Address *address,
-                      struct GNUNET_TIME_Relative delay);
-
-
-/**
- * Notify ATS about DV @a distance change to an @a address.
- * Does nothing if the @a address is not known to us.
- *
- * @param address the address
- * @param distance new distance value
- */
-void
-GST_ats_update_distance (const struct GNUNET_HELLO_Address *address,
-                         uint32_t distance);
-
-
-/**
- * Notify ATS that the @a session (but not the @a address) of
- * a given @a address is no longer relevant. (The @a session
- * went down.) This function may be called even if for the
- * respective outbound address #GST_ats_new_session() was
- * never called and thus the pair is unknown to ATS. In this
- * case, the call is simply ignored.
- *
- * @param address the address
- * @param session the session
- */
-void
-GST_ats_del_session (const struct GNUNET_HELLO_Address *address,
-                     struct GNUNET_ATS_Session *session);
-
-
-/**
- * Notify ATS that the address has expired and thus cannot
- * be used any longer.  This function must only be called
- * if the corresponding session is already gone.
- *
- * @param address the address
- */
-void
-GST_ats_expire_address (const struct GNUNET_HELLO_Address *address);
-
-
-#endif
diff --git a/src/transport/gnunet-service-transport_hello.c b/src/transport/gnunet-service-transport_hello.c
deleted file mode 100644
index 472c77c27..000000000
--- a/src/transport/gnunet-service-transport_hello.c
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2010,2011 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/gnunet-service-transport_hello.c
- * @brief hello management implementation
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "gnunet_constants.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_peerinfo_service.h"
-#include "gnunet_statistics_service.h"
-#include "gnunet-service-transport_hello.h"
-#include "gnunet-service-transport.h"
-#include "gnunet-service-transport_plugins.h"
-
-
-/**
- * How often do we refresh our HELLO (due to expiration concerns)?
- */
-#define HELLO_REFRESH_PERIOD GNUNET_TIME_relative_multiply ( \
-    GNUNET_TIME_UNIT_HOURS, 6)
-
-/**
- * Hello address expiration
- */
-extern struct GNUNET_TIME_Relative hello_expiration;
-
-
-/**
- * Entry in linked list of network addresses for ourselves.  Also
- * includes a cached signature for 'struct TransportPongMessage's.
- */
-struct OwnAddressList
-{
-  /**
-   * This is a doubly-linked list.
-   */
-  struct OwnAddressList *next;
-
-  /**
-   * This is a doubly-linked list.
-   */
-  struct OwnAddressList *prev;
-
-  /**
-   * The address.
-   */
-  struct GNUNET_HELLO_Address *address;
-
-  /**
-   * How long until the current signature expires? (ZERO if the
-   * signature was never created).
-   */
-  struct GNUNET_TIME_Absolute pong_sig_expires;
-
-  /**
-   * Signature for a 'struct TransportPongMessage' for this address.
-   */
-  struct GNUNET_CRYPTO_EddsaSignature pong_signature;
-
-  /**
-   * How often has this address been added/removed? Used as
-   * some plugins may learn the same external address from
-   * multiple origins.
-   */
-  unsigned int rc;
-};
-
-
-/**
- * Our HELLO message.
- */
-static struct GNUNET_HELLO_Message *our_hello;
-
-/**
- * Function to call on HELLO changes.
- */
-static GST_HelloCallback hello_cb;
-
-/**
- * Closure for #hello_cb.
- */
-static void *hello_cb_cls;
-
-/**
- * Head of my addresses.
- */
-static struct OwnAddressList *oal_head;
-
-/**
- * Tail of my addresses.
- */
-static struct OwnAddressList *oal_tail;
-
-/**
- * Should we use a friend-only HELLO?
- */
-static int friend_option;
-
-/**
- * Identifier of #refresh_hello_task().
- */
-static struct GNUNET_SCHEDULER_Task *hello_task;
-
-
-/**
- * Closure for #address_generator().
- */
-struct GeneratorContext
-{
-  /**
-   * Where are we in the DLL?
-   */
-  struct OwnAddressList *addr_pos;
-
-  /**
-   * When do addresses expire?
-   */
-  struct GNUNET_TIME_Absolute expiration;
-};
-
-
-/**
- * Add an address from the `struct OwnAddressList` to the buffer.
- *
- * @param cls the `struct GeneratorContext`
- * @param max maximum number of bytes left
- * @param buf where to write the address
- * @return bytes written or #GNUNET_SYSERR to signal the
- *         end of the iteration.
- */
-static ssize_t
-address_generator (void *cls,
-                   size_t max,
-                   void *buf)
-{
-  struct GeneratorContext *gc = cls;
-  ssize_t ret;
-
-  if (NULL == gc->addr_pos)
-    return GNUNET_SYSERR; /* Done */
-  ret = GNUNET_HELLO_add_address (gc->addr_pos->address,
-                                  gc->expiration,
-                                  buf,
-                                  max);
-  gc->addr_pos = gc->addr_pos->next;
-  return ret;
-}
-
-
-/**
- * Construct our HELLO message from all of the addresses of
- * all of the transports.
- *
- * @param cls unused
- */
-static void
-refresh_hello_task (void *cls)
-{
-  struct GeneratorContext gc;
-
-  hello_task = NULL;
-  gc.addr_pos = oal_head;
-  gc.expiration = GNUNET_TIME_relative_to_absolute (hello_expiration);
-
-  GNUNET_free (our_hello);
-  our_hello = GNUNET_HELLO_create (&GST_my_identity.public_key,
-                                   &address_generator,
-                                   &gc,
-                                   friend_option);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Refreshed my %s HELLO, new size is %d\n",
-              (GNUNET_YES == friend_option) ? "friend-only" : "public",
-              GNUNET_HELLO_size (our_hello));
-  GNUNET_STATISTICS_update (GST_stats,
-                            gettext_noop ("# refreshed my HELLO"),
-                            1,
-                            GNUNET_NO);
-  if (NULL != hello_cb)
-    hello_cb (hello_cb_cls,
-              GST_hello_get ());
-  GNUNET_PEERINFO_add_peer (GST_peerinfo,
-                            our_hello,
-                            NULL,
-                            NULL);
-  hello_task =
-    GNUNET_SCHEDULER_add_delayed (HELLO_REFRESH_PERIOD,
-                                  &refresh_hello_task,
-                                  NULL);
-}
-
-
-/**
- * Schedule task to refresh hello (but only if such a
- * task exists already, as otherwise the module might
- * have been shutdown).
- */
-static void
-refresh_hello ()
-{
-  if (NULL != hello_task)
-  {
-    GNUNET_SCHEDULER_cancel (hello_task);
-    hello_task = GNUNET_SCHEDULER_add_now (&refresh_hello_task,
-                                           NULL);
-  }
-}
-
-
-/**
- * Initialize the HELLO module.
- *
- * @param friend_only use a friend only hello
- * @param cb function to call whenever our HELLO changes
- * @param cb_cls closure for @a cb
- */
-void
-GST_hello_start (int friend_only,
-                 GST_HelloCallback cb,
-                 void *cb_cls)
-{
-  hello_cb = cb;
-  hello_cb_cls = cb_cls;
-  friend_option = friend_only;
-  refresh_hello_task (NULL);
-}
-
-
-/**
- * Shutdown the HELLO module.
- */
-void
-GST_hello_stop ()
-{
-  hello_cb = NULL;
-  hello_cb_cls = NULL;
-  if (NULL != hello_task)
-  {
-    GNUNET_SCHEDULER_cancel (hello_task);
-    hello_task = NULL;
-  }
-  if (NULL != our_hello)
-  {
-    GNUNET_free (our_hello);
-    our_hello = NULL;
-  }
-}
-
-
-/**
- * Obtain this peers HELLO message.
- *
- * @return our HELLO message
- */
-const struct GNUNET_MessageHeader *
-GST_hello_get ()
-{
-  return (const struct GNUNET_MessageHeader *) our_hello;
-}
-
-
-/**
- * Add or remove an address from this peer's HELLO message.
- *
- * @param addremove #GNUNET_YES to add, #GNUNET_NO to remove
- * @param address address to add or remove
- */
-void
-GST_hello_modify_addresses (int addremove,
-                            const struct GNUNET_HELLO_Address *address)
-{
-  struct OwnAddressList *al;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              (GNUNET_YES == addremove)
-              ? "Adding `%s' to the set of our addresses\n"
-              : "Removing `%s' from the set of our addresses\n",
-              GST_plugins_a2s (address));
-  GNUNET_assert (NULL != address);
-  for (al = oal_head; al != NULL; al = al->next)
-    if (0 == GNUNET_HELLO_address_cmp (address, al->address))
-      break;
-  if (GNUNET_NO == addremove)
-  {
-    if (NULL == al)
-    {
-      /* address to be removed not found!? */
-      GNUNET_break (0);
-      return;
-    }
-    al->rc--;
-    if (0 != al->rc)
-      return;   /* RC not yet zero */
-    GNUNET_CONTAINER_DLL_remove (oal_head,
-                                 oal_tail,
-                                 al);
-    GNUNET_HELLO_address_free (al->address);
-    GNUNET_free (al);
-    refresh_hello ();
-    return;
-  }
-  if (NULL != al)
-  {
-    /* address added twice or more */
-    al->rc++;
-    return;
-  }
-  al = GNUNET_new (struct OwnAddressList);
-  al->rc = 1;
-  GNUNET_CONTAINER_DLL_insert (oal_head,
-                               oal_tail,
-                               al);
-  al->address = GNUNET_HELLO_address_copy (address);
-  refresh_hello ();
-}
-
-
-/**
- * Test if a particular address is one of ours.
- *
- * @param address address to test
- * @param sig location where to cache PONG signatures for this address [set]
- * @param sig_expiration how long until the current 'sig' expires?
- *            (ZERO if sig was never created) [set]
- * @return #GNUNET_YES if this is one of our addresses,
- *         #GNUNET_NO if not
- */
-int
-GST_hello_test_address (const struct GNUNET_HELLO_Address *address,
-                        struct GNUNET_CRYPTO_EddsaSignature **sig,
-                        struct GNUNET_TIME_Absolute **sig_expiration)
-{
-  struct OwnAddressList *al;
-
-  for (al = oal_head; al != NULL; al = al->next)
-    if (0 == GNUNET_HELLO_address_cmp (address,
-                                       al->address))
-    {
-      *sig = &al->pong_signature;
-      *sig_expiration = &al->pong_sig_expires;
-      return GNUNET_YES;
-    }
-  *sig = NULL;
-  *sig_expiration = NULL;
-  return GNUNET_NO;
-}
-
-
-/* end of file gnunet-service-transport_hello.c */
diff --git a/src/transport/gnunet-service-transport_hello.h b/src/transport/gnunet-service-transport_hello.h
deleted file mode 100644
index be089dd35..000000000
--- a/src/transport/gnunet-service-transport_hello.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2010,2011 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport/gnunet-service-transport_hello.h
- * @brief hello API
- * @author Christian Grothoff
- */
-#ifndef GNUNET_SERVICE_TRANSPORT_HELLO_H
-#define GNUNET_SERVICE_TRANSPORT_HELLO_H
-
-#include "gnunet_statistics_service.h"
-#include "gnunet_transport_service.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_hello_lib.h"
-
-
-/**
- * Signature of a function to call whenever our hello changes.
- *
- * @param cls closure
- * @param hello updated HELLO
- */
-typedef void
-(*GST_HelloCallback) (void *cls,
-                      const struct GNUNET_MessageHeader *hello);
-
-
-/**
- * Initialize the HELLO module.
- *
- * @param friend_only use a friend only hello
- * @param cb function to call whenever our HELLO changes
- * @param cb_cls closure for @a cb
- */
-void
-GST_hello_start (int friend_only,
-                 GST_HelloCallback cb,
-                 void *cb_cls);
-
-
-/**
- * Shutdown the HELLO module.
- */
-void
-GST_hello_stop (void);
-
-
-/**
- * Obtain this peers HELLO message.
- *
- * @return our HELLO message
- */
-const struct GNUNET_MessageHeader *
-GST_hello_get (void);
-
-
-/**
- * Add or remove an address from this peer's HELLO message.
- *
- * @param addremove #GNUNET_YES to add, #GNUNET_NO to remove
- * @param address address to add or remove
- */
-void
-GST_hello_modify_addresses (int addremove,
-                            const struct GNUNET_HELLO_Address *address);
-
-
-/**
- * Test if a particular address is one of ours.
- *
- * @param address the address to test
- * @param sig location where to cache PONG signatures for this address [set]
- * @param sig_expiration how long until the current 'sig' expires?
- *            (ZERO if sig was never created) [set]
- * @return #GNUNET_YES if this is one of our addresses,
- *         #GNUNET_NO if not
- */
-int
-GST_hello_test_address (const struct GNUNET_HELLO_Address *address,
-                        struct GNUNET_CRYPTO_EddsaSignature **sig,
-                        struct GNUNET_TIME_Absolute **sig_expiration);
-
-
-#endif
-/* end of file gnunet-service-transport_hello.h */
diff --git a/src/transport/gnunet-service-transport_manipulation.c b/src/transport/gnunet-service-transport_manipulation.c
deleted file mode 100644
index 04d1774c0..000000000
--- a/src/transport/gnunet-service-transport_manipulation.c
+++ /dev/null
@@ -1,586 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2010-2013 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/gnunet-service-transport_manipulation.c
- * @brief transport component manipulation traffic for simulation
- * @author Christian Grothoff
- * @author Matthias Wachs
- */
-#include "platform.h"
-#include "gnunet-service-transport_hello.h"
-#include "gnunet-service-transport_neighbours.h"
-#include "gnunet-service-transport_plugins.h"
-#include "gnunet-service-transport_validation.h"
-#include "gnunet-service-transport.h"
-#include "transport.h"
-
-
-/**
- * Struct containing information about manipulations to a specific peer
- */
-struct TM_Peer
-{
-  /**
-   * Peer ID
-   */
-  struct GNUNET_PeerIdentity peer;
-
-  /**
-   * How long to delay incoming messages for this peer.
-   */
-  struct GNUNET_TIME_Relative delay_in;
-
-  /**
-   * How long to delay outgoing messages for this peer.
-   */
-  struct GNUNET_TIME_Relative delay_out;
-
-  /**
-   * Manipulated properties to use for this peer.
-   */
-  struct GNUNET_ATS_Properties properties;
-
-  /**
-   * Task to schedule delayed sendding
-   */
-  struct GNUNET_SCHEDULER_Task *send_delay_task;
-
-  /**
-   * Send queue DLL head
-   */
-  struct DelayQueueEntry *send_head;
-
-  /**
-   * Send queue DLL tail
-   */
-  struct DelayQueueEntry *send_tail;
-};
-
-
-/**
- * Entry in the delay queue for an outbound delayed message
- */
-struct DelayQueueEntry
-{
-  /**
-   * Next in DLL
-   */
-  struct DelayQueueEntry *prev;
-
-  /**
-   * Previous in DLL
-   */
-  struct DelayQueueEntry *next;
-
-  /**
-   * Peer this entry is belonging to if (NULL == tmp): enqueued in
-   * generic DLL and scheduled by generic_send_delay_task else:
-   * enqueued in tmp->send_head and tmp->send_tail and scheduled by
-   * tmp->send_delay_task
-   */
-  struct TM_Peer *tmp;
-
-  /**
-   * Peer ID
-   */
-  struct GNUNET_PeerIdentity id;
-
-  /**
-   * Absolute time when to send
-   */
-  struct GNUNET_TIME_Absolute sent_at;
-
-  /**
-   * The message
-   */
-  void *msg;
-
-  /**
-   * The message size
-   */
-  size_t msg_size;
-
-  /**
-   * Message timeout
-   */
-  struct GNUNET_TIME_Relative timeout;
-
-  /**
-   * Transports send continuation
-   */
-  GST_NeighbourSendContinuation cont;
-
-  /**
-   * Transports send continuation cls
-   */
-  void *cont_cls;
-};
-
-/**
- * Hashmap contain all peers currently manipulated
- */
-static struct GNUNET_CONTAINER_MultiPeerMap *peers;
-
-/**
- * Inbound delay to apply to all peers.
- */
-static struct GNUNET_TIME_Relative delay_in;
-
-/**
- * Outbound delay to apply to all peers.
- */
-static struct GNUNET_TIME_Relative delay_out;
-
-/**
- * DLL head for delayed messages based on general delay
- */
-static struct DelayQueueEntry *generic_dqe_head;
-
-/**
- * DLL tail for delayed messages based on general delay
- */
-static struct DelayQueueEntry *generic_dqe_tail;
-
-/**
- * Task to schedule delayed sending based on general delay
- */
-static struct GNUNET_SCHEDULER_Task *generic_send_delay_task;
-
-
-/**
- * Set traffic metric to manipulate
- *
- * @param message containing information
- */
-void
-GST_manipulation_set_metric (const struct TrafficMetricMessage *tm)
-{
-  static struct GNUNET_PeerIdentity zero;
-  struct TM_Peer *tmp;
-
-  if (0 == memcmp (&tm->peer,
-                   &zero,
-                   sizeof(struct GNUNET_PeerIdentity)))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Received traffic metrics for all peers\n");
-    delay_in = GNUNET_TIME_relative_ntoh (tm->delay_in);
-    delay_out = GNUNET_TIME_relative_ntoh (tm->delay_out);
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received traffic metrics for peer `%s'\n",
-              GNUNET_i2s (&tm->peer));
-  if (NULL ==
-      (tmp = GNUNET_CONTAINER_multipeermap_get (peers,
-                                                &tm->peer)))
-  {
-    tmp = GNUNET_new (struct TM_Peer);
-    tmp->peer = tm->peer;
-    GNUNET_CONTAINER_multipeermap_put (peers,
-                                       &tm->peer,
-                                       tmp,
-                                       GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
-  }
-  GNUNET_ATS_properties_ntoh (&tmp->properties,
-                              &tm->properties);
-  tmp->delay_in = GNUNET_TIME_relative_ntoh (tm->delay_in);
-  tmp->delay_out = GNUNET_TIME_relative_ntoh (tm->delay_out);
-}
-
-
-/**
- * We have delayed transmission, now it is time to send the
- * message.
- *
- * @param cls the `struct DelayQueueEntry` to transmit
- */
-static void
-send_delayed (void *cls)
-{
-  struct DelayQueueEntry *dqe = cls;
-  struct DelayQueueEntry *next;
-  struct TM_Peer *tmp = dqe->tmp;
-
-  GNUNET_break (GNUNET_YES ==
-                GST_neighbours_test_connected (&dqe->id));
-  if (NULL != tmp)
-  {
-    tmp->send_delay_task = NULL;
-    GNUNET_CONTAINER_DLL_remove (tmp->send_head,
-                                 tmp->send_tail,
-                                 dqe);
-    next = tmp->send_head;
-    if (NULL != next)
-    {
-      /* More delayed messages */
-      tmp->send_delay_task = GNUNET_SCHEDULER_add_at (next->sent_at,
-                                                      &send_delayed,
-                                                      next);
-    }
-  }
-  else
-  {
-    /* Remove from generic queue */
-    generic_send_delay_task = NULL;
-    GNUNET_CONTAINER_DLL_remove (generic_dqe_head,
-                                 generic_dqe_tail,
-                                 dqe);
-    next = generic_dqe_head;
-    if (NULL != next)
-    {
-      /* More delayed messages */
-      generic_send_delay_task = GNUNET_SCHEDULER_add_at (next->sent_at,
-                                                         &send_delayed,
-                                                         next);
-    }
-  }
-  GST_neighbours_send (&dqe->id,
-                       dqe->msg,
-                       dqe->msg_size,
-                       dqe->timeout,
-                       dqe->cont,
-                       dqe->cont_cls);
-  GNUNET_free (dqe);
-}
-
-
-/**
- * Adapter function between transport's send function and transport plugins.
- * Delays message transmission if an artificial delay is configured.
- *
- * @param target the peer the message to send to
- * @param msg the message received
- * @param msg_size message size
- * @param timeout timeout
- * @param cont the continuation to call after sending
- * @param cont_cls cls for @a cont
- */
-void
-GST_manipulation_send (const struct GNUNET_PeerIdentity *target,
-                       const void *msg,
-                       size_t msg_size,
-                       struct GNUNET_TIME_Relative timeout,
-                       GST_NeighbourSendContinuation cont,
-                       void *cont_cls)
-{
-  struct TM_Peer *tmp;
-  struct DelayQueueEntry *dqe;
-  struct GNUNET_TIME_Relative delay;
-
-  if (NULL != (tmp =
-                 GNUNET_CONTAINER_multipeermap_get (peers,
-                                                    target)))
-    delay = tmp->delay_out;
-  else
-    delay = delay_out;
-  if (0 == delay.rel_value_us)
-  {
-    /* Normal sending */
-    GST_neighbours_send (target,
-                         msg,
-                         msg_size,
-                         timeout,
-                         cont, cont_cls);
-    return;
-  }
-  dqe = GNUNET_malloc (sizeof(struct DelayQueueEntry) + msg_size);
-  dqe->id = *target;
-  dqe->tmp = tmp;
-  dqe->sent_at = GNUNET_TIME_relative_to_absolute (delay);
-  dqe->cont = cont;
-  dqe->cont_cls = cont_cls;
-  dqe->msg = &dqe[1];
-  dqe->msg_size = msg_size;
-  dqe->timeout = timeout;
-  GNUNET_memcpy (dqe->msg,
-                 msg,
-                 msg_size);
-  if (NULL == tmp)
-  {
-    GNUNET_CONTAINER_DLL_insert_tail (generic_dqe_head,
-                                      generic_dqe_tail,
-                                      dqe);
-    if (NULL == generic_send_delay_task)
-      generic_send_delay_task = GNUNET_SCHEDULER_add_delayed (delay,
-                                                              &send_delayed,
-                                                              dqe);
-  }
-  else
-  {
-    GNUNET_CONTAINER_DLL_insert_tail (tmp->send_head,
-                                      tmp->send_tail,
-                                      dqe);
-    if (NULL == tmp->send_delay_task)
-      tmp->send_delay_task = GNUNET_SCHEDULER_add_delayed (delay,
-                                                           &send_delayed,
-                                                           dqe);
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Delaying %u byte message to peer `%s' with peer specific delay for %s\n",
-              (unsigned int) msg_size,
-              GNUNET_i2s (target),
-              GNUNET_STRINGS_relative_time_to_string (delay,
-                                                      GNUNET_YES));
-}
-
-
-/**
- * Function that will be called to manipulate ATS information according to
- * current manipulation settings
- *
- * @param address binary address
- * @param session the session
- * @param prop[IN|OUT] metrics to modify
- */
-void
-GST_manipulation_manipulate_metrics (const struct GNUNET_HELLO_Address *address,
-                                     struct GNUNET_ATS_Session *session,
-                                     struct GNUNET_ATS_Properties *prop)
-{
-  const struct GNUNET_PeerIdentity *peer = &address->peer;
-  struct TM_Peer *tmp;
-
-  tmp = GNUNET_CONTAINER_multipeermap_get (peers,
-                                           peer);
-  if (NULL != tmp)
-    *prop = tmp->properties;
-}
-
-
-/**
- * Adapter function between transport plugins and transport receive function
- * manipulation delays for next send.
- *
- * @param cls the closure for transport
- * @param address the address and the peer the message was received from
- * @param message the message received
- * @param session the session the message was received on
- * @return manipulated delay for next receive
- */
-struct GNUNET_TIME_Relative
-GST_manipulation_recv (void *cls,
-                       const struct GNUNET_HELLO_Address *address,
-                       struct GNUNET_ATS_Session *session,
-                       const struct GNUNET_MessageHeader *message)
-{
-  struct TM_Peer *tmp;
-  struct GNUNET_TIME_Relative quota_delay;
-  struct GNUNET_TIME_Relative m_delay;
-
-  if (NULL !=
-      (tmp = GNUNET_CONTAINER_multipeermap_get (peers,
-                                                &address->peer)))
-    m_delay = tmp->delay_in;
-  else
-    m_delay = delay_in;
-
-  quota_delay = GST_receive_callback (cls,
-                                      address,
-                                      session,
-                                      message);
-  m_delay = GNUNET_TIME_relative_max (m_delay,
-                                      quota_delay);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Delaying next receive for peer `%s' for %s\n",
-              GNUNET_i2s (&address->peer),
-              GNUNET_STRINGS_relative_time_to_string (m_delay,
-                                                      GNUNET_YES));
-  return m_delay;
-}
-
-
-/**
- * Initialize traffic manipulation
- */
-void
-GST_manipulation_init ()
-{
-  struct GNUNET_TIME_Relative delay;
-
-  if ((GNUNET_OK ==
-       GNUNET_CONFIGURATION_get_value_time (GST_cfg,
-                                            "transport",
-                                            "MANIPULATE_DELAY_IN",
-                                            &delay)) &&
-      (delay.rel_value_us > 0))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Delaying inbound traffic for %s\n",
-                GNUNET_STRINGS_relative_time_to_string (delay,
-                                                        GNUNET_YES));
-    delay_in = delay;
-  }
-  if ((GNUNET_OK ==
-       GNUNET_CONFIGURATION_get_value_time (GST_cfg,
-                                            "transport",
-                                            "MANIPULATE_DELAY_OUT",
-                                            &delay)) &&
-      (delay.rel_value_us > 0))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Delaying outbound traffic for %s\n",
-                GNUNET_STRINGS_relative_time_to_string (delay,
-                                                        GNUNET_YES));
-    delay_out = delay;
-  }
-  peers = GNUNET_CONTAINER_multipeermap_create (4,
-                                                GNUNET_NO);
-}
-
-
-/**
- * Notify manipulation about disconnect so it can discard queued messages
- *
- * @param peer the disconnecting peer
- */
-void
-GST_manipulation_peer_disconnect (const struct GNUNET_PeerIdentity *peer)
-{
-  struct TM_Peer *tmp;
-  struct DelayQueueEntry *dqe;
-  struct DelayQueueEntry *next;
-
-  tmp = GNUNET_CONTAINER_multipeermap_get (peers,
-                                           peer);
-  if (NULL != tmp)
-  {
-    while (NULL != (dqe = tmp->send_head))
-    {
-      GNUNET_CONTAINER_DLL_remove (tmp->send_head,
-                                   tmp->send_tail,
-                                   dqe);
-      if (NULL != dqe->cont)
-        dqe->cont (dqe->cont_cls,
-                   GNUNET_SYSERR,
-                   dqe->msg_size,
-                   0);
-      GNUNET_free (dqe);
-    }
-  }
-  next = generic_dqe_head;
-  while (NULL != (dqe = next))
-  {
-    next = dqe->next;
-    if (0 == memcmp (peer,
-                     &dqe->id,
-                     sizeof(dqe->id)))
-    {
-      GNUNET_CONTAINER_DLL_remove (generic_dqe_head,
-                                   generic_dqe_tail,
-                                   dqe);
-      if (NULL != dqe->cont)
-        dqe->cont (dqe->cont_cls,
-                   GNUNET_SYSERR,
-                   dqe->msg_size,
-                   0);
-      GNUNET_free (dqe);
-    }
-  }
-  if (NULL != generic_send_delay_task)
-  {
-    GNUNET_SCHEDULER_cancel (generic_send_delay_task);
-    generic_send_delay_task = NULL;
-    if (NULL != generic_dqe_head)
-      generic_send_delay_task
-        = GNUNET_SCHEDULER_add_at (generic_dqe_head->sent_at,
-                                   &send_delayed,
-                                   generic_dqe_head);
-  }
-}
-
-
-/**
- * Free manipulation information about a peer.
- *
- * @param cls NULL
- * @param key peer the info is about
- * @param value a `struct TM_Peer` to free
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-free_tmps (void *cls,
-           const struct GNUNET_PeerIdentity *key,
-           void *value)
-{
-  struct TM_Peer *tmp = value;
-  struct DelayQueueEntry *dqe;
-
-  GNUNET_break (GNUNET_YES ==
-                GNUNET_CONTAINER_multipeermap_remove (peers,
-                                                      key,
-                                                      value));
-  while (NULL != (dqe = tmp->send_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (tmp->send_head,
-                                 tmp->send_tail,
-                                 dqe);
-    if (NULL != dqe->cont)
-      dqe->cont (dqe->cont_cls,
-                 GNUNET_SYSERR,
-                 dqe->msg_size,
-                 0);
-    GNUNET_free (dqe);
-  }
-  if (NULL != tmp->send_delay_task)
-  {
-    GNUNET_SCHEDULER_cancel (tmp->send_delay_task);
-    tmp->send_delay_task = NULL;
-  }
-  GNUNET_free (tmp);
-  return GNUNET_OK;
-}
-
-
-/**
- * Stop traffic manipulation
- */
-void
-GST_manipulation_stop ()
-{
-  struct DelayQueueEntry *cur;
-
-  GNUNET_CONTAINER_multipeermap_iterate (peers,
-                                         &free_tmps,
-                                         NULL);
-  GNUNET_CONTAINER_multipeermap_destroy (peers);
-  peers = NULL;
-  while (NULL != (cur = generic_dqe_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (generic_dqe_head,
-                                 generic_dqe_tail,
-                                 cur);
-    if (NULL != cur->cont)
-      cur->cont (cur->cont_cls,
-                 GNUNET_SYSERR,
-                 cur->msg_size,
-                 0);
-    GNUNET_free (cur);
-  }
-  if (NULL != generic_send_delay_task)
-  {
-    GNUNET_SCHEDULER_cancel (generic_send_delay_task);
-    generic_send_delay_task = NULL;
-  }
-}
-
-
-/* end of file gnunet-service-transport_manipulation.c */
diff --git a/src/transport/gnunet-service-transport_manipulation.h b/src/transport/gnunet-service-transport_manipulation.h
deleted file mode 100644
index b84f3fc32..000000000
--- a/src/transport/gnunet-service-transport_manipulation.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2010-2015 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/gnunet-service-transport_neighbours.h
- * @brief neighbour manipulation API, allows manipulation of
- *        performance metrics (delay and towards ATS)
- * @author Christian Grothoff
- */
-#ifndef GNUNET_SERVICE_TRANSPORT_MANIPULATION_H
-#define GNUNET_SERVICE_TRANSPORT_MANIPULATION_H
-
-#include "platform.h"
-#include "gnunet-service-transport_hello.h"
-#include "gnunet-service-transport_neighbours.h"
-#include "gnunet-service-transport_plugins.h"
-#include "gnunet-service-transport_validation.h"
-#include "gnunet-service-transport.h"
-#include "transport.h"
-
-
-/**
- * Set traffic metric to manipulate
- *
- * @param message containing information
- */
-void
-GST_manipulation_set_metric (const struct TrafficMetricMessage *tm);
-
-
-/**
- * Adapter function between transport's send function and transport plugins
- *
- * @param target the peer the message to send to
- * @param msg the message received
- * @param msg_size message size
- * @param timeout timeout
- * @param cont the continuation to call after sending
- * @param cont_cls cls for continuation
- */
-void
-GST_manipulation_send (const struct GNUNET_PeerIdentity *target,
-                       const void *msg,
-                       size_t msg_size,
-                       struct GNUNET_TIME_Relative timeout,
-                       GST_NeighbourSendContinuation cont,
-                       void *cont_cls);
-
-
-/**
- * Adapter function between transport plugins and transport receive function
- * manipulation delays for next send.
- *
- * @param cls the closure for transport
- * @param address the address and the peer the message was received from
- * @param message the message received
- * @param session the session the message was received on
- * @return manipulated delay for next receive
- */
-struct GNUNET_TIME_Relative
-GST_manipulation_recv (void *cls,
-                       const struct GNUNET_HELLO_Address *address,
-                       struct GNUNET_ATS_Session *session,
-                       const struct GNUNET_MessageHeader *message);
-
-
-/**
- * Function that will be called to manipulate ATS information according to
- * current manipulation settings
- *
- * @param address binary address
- * @param session the session
- * @param prop[IN|OUT] metrics to modify
- */
-void
-GST_manipulation_manipulate_metrics (const struct GNUNET_HELLO_Address *address,
-                                     struct GNUNET_ATS_Session *session,
-                                     struct GNUNET_ATS_Properties *prop);
-
-
-/**
- * Notify manipulation about disconnect so it can discard queued messages
- *
- * @param peer the disconnecting peer
- */
-void
-GST_manipulation_peer_disconnect (const struct GNUNET_PeerIdentity *peer);
-
-
-/**
- * Initialize traffic manipulation
- */
-void
-GST_manipulation_init (void);
-
-
-/**
- * Stop traffic manipulation
- */
-void
-GST_manipulation_stop (void);
-
-#endif
-/* end of file gnunet-service-transport_neighbours.h */
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c
deleted file mode 100644
index ca1b4d1da..000000000
--- a/src/transport/gnunet-service-transport_neighbours.c
+++ /dev/null
@@ -1,3971 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2010-2015 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/gnunet-service-transport_neighbours.c
- * @brief neighbour management
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "gnunet_ats_service.h"
-#include "gnunet-service-transport_ats.h"
-#include "gnunet-service-transport_neighbours.h"
-#include "gnunet-service-transport_manipulation.h"
-#include "gnunet-service-transport_plugins.h"
-#include "gnunet-service-transport_validation.h"
-#include "gnunet-service-transport.h"
-#include "gnunet_peerinfo_service.h"
-#include "gnunet_constants.h"
-#include "transport.h"
-
-/**
- * Experimental option to ignore SessionQuotaMessages from
- * the other peer.
- */
-#define IGNORE_INBOUND_QUOTA GNUNET_YES
-
-/**
- * Size of the neighbour hash map.
- */
-#define NEIGHBOUR_TABLE_SIZE 256
-
-/**
- * Time we give plugin to transmit DISCONNECT message before the
- * neighbour entry self-destructs.
- */
-#define DISCONNECT_SENT_TIMEOUT GNUNET_TIME_relative_multiply ( \
-    GNUNET_TIME_UNIT_MILLISECONDS, 500)
-
-/**
- * How often must a peer violate bandwidth quotas before we start
- * to simply drop its messages?
- */
-#define QUOTA_VIOLATION_DROP_THRESHOLD 10
-
-/**
- * How long are we willing to wait for a response from ATS before timing out?
- */
-#define ATS_RESPONSE_TIMEOUT GNUNET_TIME_relative_multiply ( \
-    GNUNET_TIME_UNIT_SECONDS, 5)
-
-/**
- * How long are we willing to wait for an ACK from the other peer before
- * giving up on our connect operation?
- */
-#define SETUP_CONNECTION_TIMEOUT GNUNET_TIME_relative_multiply ( \
-    GNUNET_TIME_UNIT_SECONDS, 15)
-
-/**
- * How long are we willing to wait for a successful reconnect if
- * an existing connection went down?  Much shorter than the
- * usual SETUP_CONNECTION_TIMEOUT as we do not inform the
- * higher layers about the disconnect during this period.
- */
-#define FAST_RECONNECT_TIMEOUT GNUNET_TIME_UNIT_SECONDS
-
-/**
- * Interval to send utilization data
- */
-#define UTIL_TRANSMISSION_INTERVAL GNUNET_TIME_UNIT_SECONDS
-
-/**
- * State describing which kind a reply this neighbour should send
- */
-enum GST_ACK_State
-{
-  /**
-   * We did not receive a SYN message for this neighbour
-   */
-  ACK_UNDEFINED = 0,
-
-  /**
-   * The neighbour received a SYN message and has to send a SYN_ACK
-   * as reply
-   */
-  ACK_SEND_SYN_ACK = 1,
-
-  /**
-   * The neighbour sent a SYN_ACK message and has to send a ACK
-   * as reply
-   */
-  ACK_SEND_ACK = 2
-};
-
-
-GNUNET_NETWORK_STRUCT_BEGIN
-
-/**
- * Message a peer sends to another to indicate that it intends to
- * setup a connection/session for data exchange.  A 'SESSION_SYN'
- * should be answered with a 'SESSION_SYN_ACK' with the same body
- * to confirm.  A 'SESSION_SYN_ACK' should then be followed with
- * a 'ACK'.  Once the 'ACK' is received, both peers
- * should be connected.
- */
-struct TransportSynMessage
-{
-  /**
-   * Header of type #GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_SYN
-   * or #GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_SYN_ACK
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Always zero.
-   */
-  uint32_t reserved GNUNET_PACKED;
-
-  /**
-   * Absolute time at the sender.  Only the most recent connect
-   * message implies which session is preferred by the sender.
-   */
-  struct GNUNET_TIME_AbsoluteNBO timestamp;
-};
-
-
-/**
- * Message a peer sends to another when connected to indicate that a
- * session is in use and the peer is still alive or to respond to a keep alive.
- * A peer sends a message with type #GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE
- * to request a message with #GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE_RESPONSE.
- * When the keep alive response with type is received, transport service
- * will call the respective plugin to update the session timeout
- */
-struct GNUNET_ATS_SessionKeepAliveMessage
-{
-  /**
-   * Header of type #GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE or
-   * #GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE_RESPONSE.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * A nonce to identify the session the keep alive is used for
-   */
-  uint32_t nonce GNUNET_PACKED;
-};
-
-
-/**
- * Message a peer sends to another when connected to indicate that
- * the other peer should limit transmissions to the indicated
- * quota.
- */
-struct GNUNET_ATS_SessionQuotaMessage
-{
-  /**
-   * Header of type #GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_QUOTA.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Quota to use (for sending), in bytes per second.
-   */
-  uint32_t quota GNUNET_PACKED;
-};
-
-
-/**
- * Message we send to the other peer to notify it that we intentionally
- * are disconnecting (to reduce timeouts).  This is just a friendly
- * notification, peers must not rely on always receiving disconnect
- * messages.
- */
-struct GNUNET_ATS_SessionDisconnectMessage
-{
-  /**
-   * Header of type #GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Always zero.
-   */
-  uint32_t reserved GNUNET_PACKED;
-
-  /**
-   * Purpose of the signature.  Extends over the timestamp.
-   * Purpose should be #GNUNET_SIGNATURE_PURPOSE_TRANSPORT_DISCONNECT.
-   */
-  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
-
-  /**
-   * Absolute time at the sender.  Only the most recent connect
-   * message implies which session is preferred by the sender.
-   */
-  struct GNUNET_TIME_AbsoluteNBO timestamp;
-
-  /**
-   * Public key of the sender.
-   */
-  struct GNUNET_CRYPTO_EddsaPublicKey public_key;
-
-  /**
-   * Signature of the peer that sends us the disconnect.  Only
-   * valid if the timestamp is AFTER the timestamp from the
-   * corresponding 'SYN' message.
-   */
-  struct GNUNET_CRYPTO_EddsaSignature signature;
-};
-
-GNUNET_NETWORK_STRUCT_END
-
-
-/**
- * For each neighbour we keep a list of messages
- * that we still want to transmit to the neighbour.
- */
-struct MessageQueue
-{
-  /**
-   * This is a doubly linked list.
-   */
-  struct MessageQueue *next;
-
-  /**
-   * This is a doubly linked list.
-   */
-  struct MessageQueue *prev;
-
-  /**
-   * Function to call once we're done.
-   */
-  GST_NeighbourSendContinuation cont;
-
-  /**
-   * Closure for @e cont
-   */
-  void *cont_cls;
-
-  /**
-   * The message(s) we want to transmit, GNUNET_MessageHeader(s)
-   * stuck together in memory.  Allocated at the end of this struct.
-   */
-  const char *message_buf;
-
-  /**
-   * Size of the message buf
-   */
-  size_t message_buf_size;
-
-  /**
-   * At what time should we fail?
-   */
-  struct GNUNET_TIME_Absolute timeout;
-};
-
-
-/**
- * A possible address we could use to communicate with a neighbour.
- */
-struct NeighbourAddress
-{
-  /**
-   * Active session for this address.
-   */
-  struct GNUNET_ATS_Session *session;
-
-  /**
-   * Network-level address information.
-   */
-  struct GNUNET_HELLO_Address *address;
-
-  /**
-   * Timestamp of the 'SESSION_CONNECT' message we sent to the other
-   * peer for this address.  Use to check that the ACK is in response
-   * to our most recent 'SYN'.
-   */
-  struct GNUNET_TIME_Absolute connect_timestamp;
-
-  /**
-   * Inbound bandwidth from ATS for this address.
-   */
-  struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in;
-
-  /**
-   * Outbound bandwidth from ATS for this address.
-   */
-  struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out;
-
-  /**
-   * Did we tell ATS that this is our 'active' address?
-   */
-  int ats_active;
-
-  /**
-   * The current nonce sent in the last keep alive messages
-   */
-  uint32_t keep_alive_nonce;
-};
-
-
-/**
- * Entry in neighbours.
- */
-struct NeighbourMapEntry
-{
-  /**
-   * Head of list of messages we would like to send to this peer;
-   * must contain at most one message per client.
-   */
-  struct MessageQueue *messages_head;
-
-  /**
-   * Tail of list of messages we would like to send to this peer; must
-   * contain at most one message per client.
-   */
-  struct MessageQueue *messages_tail;
-
-  /**
-   * Are we currently trying to send a message? If so, which one?
-   */
-  struct MessageQueue *is_active;
-
-  /**
-   * Primary address we currently use to communicate with the neighbour.
-   */
-  struct NeighbourAddress primary_address;
-
-  /**
-   * Alternative address currently under consideration for communicating
-   * with the neighbour.
-   */
-  struct NeighbourAddress alternative_address;
-
-  /**
-   * Identity of this neighbour.
-   */
-  struct GNUNET_PeerIdentity id;
-
-  /**
-   * Main task that drives this peer (timeouts, keepalives, etc.).
-   * Always runs the #master_task().
-   */
-  struct GNUNET_SCHEDULER_Task *task;
-
-  /**
-   * Task to disconnect neighbour after we received a DISCONNECT message
-   */
-  struct GNUNET_SCHEDULER_Task *delayed_disconnect_task;
-
-  /**
-   * At what time should we sent the next keep-alive message?
-   */
-  struct GNUNET_TIME_Absolute keep_alive_time;
-
-  /**
-   * At what time did we sent the last keep-alive message?  Used
-   * to calculate round-trip time ("latency").
-   */
-  struct GNUNET_TIME_Absolute last_keep_alive_time;
-
-  /**
-   * Timestamp we should include in our next SYN_ACK message.
-   * (only valid if 'send_connect_ack' is #GNUNET_YES).  Used to build
-   * our SYN_ACK message.
-   */
-  struct GNUNET_TIME_Absolute connect_ack_timestamp;
-
-  /**
-   * ATS address suggest handle
-   */
-  struct GNUNET_ATS_ConnectivitySuggestHandle *suggest_handle;
-
-  /**
-   * Time where we should cut the connection (timeout) if we don't
-   * make progress in the state machine (or get a KEEPALIVE_RESPONSE
-   * if we are in #GNUNET_TRANSPORT_PS_CONNECTED).
-   */
-  struct GNUNET_TIME_Absolute timeout;
-
-  /**
-   * Tracker for inbound bandwidth.
-   */
-  struct GNUNET_BANDWIDTH_Tracker in_tracker;
-
-  /**
-   * How often has the other peer (recently) violated the inbound
-   * traffic limit?  Incremented by 10 per violation, decremented by 1
-   * per non-violation (for each time interval).
-   */
-  unsigned int quota_violation_count;
-
-  /**
-   * Latest quota the other peer send us in bytes per second.
-   * We should not send more, least the other peer throttle
-   * receiving our traffic.
-   */
-  struct GNUNET_BANDWIDTH_Value32NBO neighbour_receive_quota;
-
-  /**
-   * The current state of the peer.
-   */
-  enum GNUNET_TRANSPORT_PeerState state;
-
-  /**
-   * Did we sent an KEEP_ALIVE message and are we expecting a response?
-   */
-  int expect_latency_response;
-
-  /**
-   * When a peer wants to connect we have to reply to the 1st SYN message
-   * with a SYN_ACK message. But sometime we cannot send this message
-   * immediately since we do not have an address and then we have to remember
-   * to send this message as soon as we have an address.
-   *
-   * Flag to set if we still need to send a SYN_ACK message to the other peer
-   * (once we have an address to use and the peer has been allowed by our
-   * blacklist).  Initially set to #ACK_UNDEFINED. Set to #ACK_SEND_SYN_ACK
-   * if we need to send a SYN_ACK.  Set to #ACK_SEND_ACK if we did
-   * send a SYN_ACK and should go to #S_CONNECTED upon receiving a
-   * 'ACK' (regardless of what our own state machine might say).
-   */
-  enum GST_ACK_State ack_state;
-
-  /**
-   * Tracking utilization of outbound bandwidth
-   */
-  uint32_t util_total_bytes_sent;
-
-  /**
-   * Tracking utilization of inbound bandwidth
-   */
-  uint32_t util_total_bytes_recv;
-
-  /**
-   * Date of last utilization transmission
-   */
-  struct GNUNET_TIME_Absolute last_util_transmission;
-};
-
-
-/**
- * Hash map from peer identities to the respective `struct NeighbourMapEntry`.
- */
-static struct GNUNET_CONTAINER_MultiPeerMap *neighbours;
-
-/**
- * List of pending blacklist checks: head
- */
-static struct BlacklistCheckSwitchContext *pending_bc_head;
-
-/**
- * List of pending blacklist checks: tail
- */
-static struct BlacklistCheckSwitchContext *pending_bc_tail;
-
-/**
- * counter for connected neighbours
- */
-static unsigned int neighbours_connected;
-
-/**
- * Number of bytes we have currently queued for transmission.
- */
-static unsigned long long bytes_in_send_queue;
-
-/**
- * Task transmitting utilization data
- */
-static struct GNUNET_SCHEDULER_Task *util_transmission_tk;
-
-
-/**
- * Convert the given ACK state to a string.
- *
- * @param s state
- * @return corresponding human-readable string
- */
-static char *
-print_ack_state (enum GST_ACK_State s)
-{
-  switch (s)
-  {
-  case ACK_UNDEFINED:
-    return "UNDEFINED";
-
-  case ACK_SEND_SYN_ACK:
-    return "SEND_SYN_ACK";
-
-  case ACK_SEND_ACK:
-    return "SEND_ACK";
-
-  default:
-    GNUNET_break (0);
-    return "N/A";
-  }
-}
-
-
-/**
- * Send information about a new outbound quota to our clients.
- * Note that the outbound quota is enforced client-side (i.e.
- * in libgnunettransport).
- *
- * @param n affected peer
- */
-static void
-send_outbound_quota_to_clients (struct NeighbourMapEntry *n)
-{
-  struct QuotaSetMessage q_msg;
-  struct GNUNET_BANDWIDTH_Value32NBO bandwidth_min;
-
-  if (! GNUNET_TRANSPORT_is_connected (n->state))
-    return;
-#if IGNORE_INBOUND_QUOTA
-  bandwidth_min = n->primary_address.bandwidth_out;
-#else
-  bandwidth_min = GNUNET_BANDWIDTH_value_min (n->primary_address.bandwidth_out,
-                                              n->neighbour_receive_quota);
-#endif
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Sending outbound quota of %u Bps for peer `%s' to all clients\n",
-              ntohl (bandwidth_min.value__),
-              GNUNET_i2s (&n->id));
-  q_msg.header.size = htons (sizeof(struct QuotaSetMessage));
-  q_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SET_QUOTA);
-  q_msg.quota = bandwidth_min;
-  q_msg.peer = n->id;
-  GST_clients_broadcast (&q_msg.header,
-                         GNUNET_NO);
-}
-
-
-/**
- * Notify our clients that another peer connected to us.
- *
- * @param n the peer that connected
- */
-static void
-neighbours_connect_notification (struct NeighbourMapEntry *n)
-{
-  size_t len = sizeof(struct ConnectInfoMessage);
-  char buf[len] GNUNET_ALIGN;
-  struct ConnectInfoMessage *connect_msg = (struct ConnectInfoMessage *) buf;
-  struct GNUNET_BANDWIDTH_Value32NBO bandwidth_min;
-
-#if IGNORE_INBOUND_QUOTA
-  bandwidth_min = n->primary_address.bandwidth_out;
-#else
-  bandwidth_min = GNUNET_BANDWIDTH_value_min (n->primary_address.bandwidth_out,
-                                              n->neighbour_receive_quota);
-#endif
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "We are now connected to peer `%s'\n",
-              GNUNET_i2s (&n->id));
-  connect_msg->header.size = htons (sizeof(buf));
-  connect_msg->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_CONNECT);
-  connect_msg->id = n->id;
-  connect_msg->quota_out = bandwidth_min;
-  GST_clients_broadcast (&connect_msg->header,
-                         GNUNET_NO);
-}
-
-
-/**
- * Notify our clients (and manipulation) that a peer disconnected from
- * us.
- *
- * @param n the peer that disconnected
- */
-static void
-neighbours_disconnect_notification (struct NeighbourMapEntry *n)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Peer `%s' disconnected\n",
-              GNUNET_i2s (&n->id));
-  GST_manipulation_peer_disconnect (&n->id);
-  GST_clients_broadcast_disconnect (&n->id);
-}
-
-
-/**
- * Notify transport clients that a neighbour peer changed its active
- * address.
- *
- * @param peer identity of the peer
- * @param address address possibly NULL if peer is not connected
- * @param state current state this peer is in
- * @param state_timeout timeout for the current state of the peer
- * @param bandwidth_in bandwidth assigned inbound, 0 on disconnect
- * @param bandwidth_out bandwidth assigned outbound, 0 on disconnect
- */
-static void
-neighbours_changed_notification (const struct GNUNET_PeerIdentity *peer,
-                                 const struct GNUNET_HELLO_Address *address,
-                                 enum GNUNET_TRANSPORT_PeerState state,
-                                 struct GNUNET_TIME_Absolute state_timeout,
-                                 struct GNUNET_BANDWIDTH_Value32NBO
-                                 bandwidth_in,
-                                 struct GNUNET_BANDWIDTH_Value32NBO
-                                 bandwidth_out)
-{
-  (void) bandwidth_in;
-  (void) bandwidth_out;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Notifying about change for peer `%s' with address `%s' in state `%s' timing out at %s\n",
-              GNUNET_i2s (peer),
-              GST_plugins_a2s (address),
-              GNUNET_TRANSPORT_ps2s (state),
-              GNUNET_STRINGS_absolute_time_to_string (state_timeout));
-  /* FIXME: include bandwidth in notification! */
-  GST_clients_broadcast_peer_notification (peer,
-                                           address,
-                                           state,
-                                           state_timeout);
-}
-
-
-/**
- * Lookup a neighbour entry in the neighbours hash map.
- *
- * @param pid identity of the peer to look up
- * @return the entry, NULL if there is no existing record
- */
-static struct NeighbourMapEntry *
-lookup_neighbour (const struct GNUNET_PeerIdentity *pid)
-{
-  if (NULL == neighbours)
-    return NULL;
-  return GNUNET_CONTAINER_multipeermap_get (neighbours, pid);
-}
-
-
-/**
- * Test if we're connected to the given peer.
- *
- * @param n neighbour entry of peer to test
- * @return #GNUNET_YES if we are connected, #GNUNET_NO if not
- */
-static int
-test_connected (struct NeighbourMapEntry *n)
-{
-  if (NULL == n)
-    return GNUNET_NO;
-  return GNUNET_TRANSPORT_is_connected (n->state);
-}
-
-
-/**
- * We don't need a given neighbour address any more.
- * Release its resources and give appropriate notifications
- * to ATS and other subsystems.
- *
- * @param na address we are done with; @a na itself must NOT be 'free'd, only the contents!
- */
-static void
-free_address (struct NeighbourAddress *na)
-{
-  if (GNUNET_YES == na->ats_active)
-    GST_validation_set_address_use (na->address,
-                                    GNUNET_NO);
-  if (NULL != na->address)
-  {
-    GST_ats_block_address (na->address,
-                           na->session);
-    GNUNET_HELLO_address_free (na->address);
-    na->address = NULL;
-  }
-  na->bandwidth_in = GNUNET_BANDWIDTH_value_init (0);
-  na->bandwidth_out = GNUNET_BANDWIDTH_value_init (0);
-  na->ats_active = GNUNET_NO;
-  na->keep_alive_nonce = 0;
-  na->session = NULL;
-}
-
-
-/**
- * Master task run for every neighbour.  Performs all of the time-related
- * activities (keep alive, send next message, disconnect if idle, finish
- * clean up after disconnect).
- *
- * @param cls the `struct NeighbourMapEntry` for which we are running
- */
-static void
-master_task (void *cls);
-
-
-/**
- * Set net state and state timeout for this neighbour and notify monitoring
- *
- * @param n the respective neighbour
- * @param s the new state
- * @param timeout the new timeout
- */
-static void
-set_state_and_timeout (struct NeighbourMapEntry *n,
-                       enum GNUNET_TRANSPORT_PeerState s,
-                       struct GNUNET_TIME_Absolute timeout)
-{
-  if (GNUNET_TRANSPORT_is_connected (s) &&
-      (! GNUNET_TRANSPORT_is_connected (n->state)))
-  {
-    neighbours_connect_notification (n);
-    GNUNET_STATISTICS_set (GST_stats,
-                           gettext_noop ("# peers connected"),
-                           ++neighbours_connected,
-                           GNUNET_NO);
-  }
-  if ((! GNUNET_TRANSPORT_is_connected (s)) &&
-      GNUNET_TRANSPORT_is_connected (n->state))
-  {
-    GNUNET_STATISTICS_set (GST_stats,
-                           gettext_noop ("# peers connected"),
-                           --neighbours_connected,
-                           GNUNET_NO);
-    neighbours_disconnect_notification (n);
-  }
-  n->state = s;
-  if ((timeout.abs_value_us < n->timeout.abs_value_us) &&
-      (NULL != n->task))
-  {
-    /* new timeout is earlier, reschedule master task */
-    GNUNET_SCHEDULER_cancel (n->task);
-    n->task = GNUNET_SCHEDULER_add_at (timeout,
-                                       &master_task,
-                                       n);
-  }
-  n->timeout = timeout;
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Neighbour `%s' changed state to %s with timeout %s\n",
-              GNUNET_i2s (&n->id),
-              GNUNET_TRANSPORT_ps2s (s),
-              GNUNET_STRINGS_absolute_time_to_string (timeout));
-  neighbours_changed_notification (&n->id,
-                                   n->primary_address.address,
-                                   n->state,
-                                   n->timeout,
-                                   n->primary_address.bandwidth_in,
-                                   n->primary_address.bandwidth_out);
-}
-
-
-/**
- * Initialize the alternative address of a neighbour
- *
- * @param n the neighbour
- * @param address address of the other peer, NULL if other peer
- *                       connected to us
- * @param session session to use (or NULL, in which case an
- *        address must be setup)
- * @param bandwidth_in inbound quota to be used when connection is up
- * @param bandwidth_out outbound quota to be used when connection is up
- */
-static void
-set_alternative_address (struct NeighbourMapEntry *n,
-                         const struct GNUNET_HELLO_Address *address,
-                         struct GNUNET_ATS_Session *session,
-                         struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
-                         struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out)
-{
-  struct GNUNET_TRANSPORT_PluginFunctions *papi;
-
-  if (NULL == (papi = GST_plugins_find (address->transport_name)))
-  {
-    GNUNET_break (0);
-    return;
-  }
-  if (session == n->alternative_address.session)
-  {
-    n->alternative_address.bandwidth_in = bandwidth_in;
-    n->alternative_address.bandwidth_out = bandwidth_out;
-    return;
-  }
-  if (NULL != n->alternative_address.address)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Replacing existing alternative address with another one\n");
-    free_address (&n->alternative_address);
-  }
-  if (NULL == session)
-    session = papi->get_session (papi->cls,
-                                 address);
-  if (NULL == session)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Failed to obtain new session for peer `%s' and  address '%s'\n",
-                GNUNET_i2s (&address->peer),
-                GST_plugins_a2s (address));
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop ("# session creation failed"),
-                              1,
-                              GNUNET_NO);
-    return;
-  }
-  GST_ats_new_session (address,
-                       session);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Neighbour `%s' configured alternative address %s\n",
-              GNUNET_i2s (&n->id),
-              GST_plugins_a2s (address));
-
-  n->alternative_address.address = GNUNET_HELLO_address_copy (address);
-  n->alternative_address.bandwidth_in = bandwidth_in;
-  n->alternative_address.bandwidth_out = bandwidth_out;
-  n->alternative_address.session = session;
-  n->alternative_address.ats_active = GNUNET_NO;
-  n->alternative_address.keep_alive_nonce = 0;
-  GNUNET_assert (GNUNET_YES ==
-                 GST_ats_is_known (n->alternative_address.address,
-                                   n->alternative_address.session));
-}
-
-
-/**
- * Transmit a message using the current session of the given
- * neighbour.
- *
- * @param n entry for the recipient
- * @param msgbuf buffer to transmit
- * @param msgbuf_size number of bytes in @a msgbuf buffer
- * @param priority transmission priority
- * @param timeout transmission timeout
- * @param use_keepalive_timeout #GNUNET_YES to use plugin-specific keep-alive
- *        timeout (@a timeout is ignored in that case), #GNUNET_NO otherwise
- * @param cont continuation to call when finished (can be NULL)
- * @param cont_cls closure for @a cont
- * @return timeout (copy of @a timeout or a calculated one if
- *         @a use_keepalive_timeout is #GNUNET_YES.
- */
-static struct GNUNET_TIME_Relative
-send_with_session (struct NeighbourMapEntry *n,
-                   const void *msgbuf,
-                   size_t msgbuf_size,
-                   uint32_t priority,
-                   struct GNUNET_TIME_Relative timeout,
-                   unsigned int use_keepalive_timeout,
-                   GNUNET_TRANSPORT_TransmitContinuation cont,
-                   void *cont_cls)
-{
-  struct GNUNET_TRANSPORT_PluginFunctions *papi;
-  struct GNUNET_TIME_Relative result = GNUNET_TIME_UNIT_FOREVER_REL;
-
-  GNUNET_assert (NULL != n->primary_address.session);
-  if ((((NULL == (papi = GST_plugins_find (
-                    n->primary_address.address->transport_name))) ||
-        (-1 == papi->send (papi->cls,
-                           n->primary_address.session,
-                           msgbuf,
-                           msgbuf_size,
-                           priority,
-                           (result = (GNUNET_NO == use_keepalive_timeout) ?
-                                     timeout :
-                                     GNUNET_TIME_relative_divide (
-                              GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
-                              papi->
-                              query_keepalive_factor (papi->cls))),
-                           cont,
-                           cont_cls)))) &&
-      (NULL != cont))
-    cont (cont_cls,
-          &n->id,
-          GNUNET_SYSERR,
-          msgbuf_size,
-          0);
-  GST_neighbours_notify_data_sent (n->primary_address.address,
-                                   n->primary_address.session,
-                                   msgbuf_size);
-  GNUNET_break (NULL != papi);
-  return result;
-}
-
-
-/**
- * Clear the primary address of a neighbour since this address is not
- * valid anymore and notify monitoring about it
- *
- * @param n the neighbour
- */
-static void
-unset_primary_address (struct NeighbourMapEntry *n)
-{
-  /* Notify monitoring about change */
-  if (NULL == n->primary_address.address)
-    return;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Disabling primary address\n");
-  neighbours_changed_notification (&n->id,
-                                   n->primary_address.address,
-                                   n->state,
-                                   n->timeout,
-                                   GNUNET_BANDWIDTH_value_init (0),
-                                   GNUNET_BANDWIDTH_value_init (0));
-  free_address (&n->primary_address);
-}
-
-
-/**
- * Free a neighbour map entry.
- *
- * @param n entry to free
- */
-static void
-free_neighbour (struct NeighbourMapEntry *n)
-{
-  struct MessageQueue *mq;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Freeing neighbour state of peer `%s'\n",
-              GNUNET_i2s (&n->id));
-  n->is_active = NULL; /* always free'd by its own continuation! */
-
-  /* fail messages currently in the queue */
-  while (NULL != (mq = n->messages_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (n->messages_head,
-                                 n->messages_tail,
-                                 mq);
-    if (NULL != mq->cont)
-      mq->cont (mq->cont_cls,
-                GNUNET_SYSERR,
-                mq->message_buf_size,
-                0);
-    GNUNET_free (mq);
-  }
-  /* Mark peer as disconnected */
-  set_state_and_timeout (n,
-                         GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED,
-                         GNUNET_TIME_UNIT_FOREVER_ABS);
-  /* free addresses and mark as unused */
-  unset_primary_address (n);
-
-  if (NULL != n->alternative_address.address)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Cleaning up alternative address\n");
-    free_address (&n->alternative_address);
-  }
-  GNUNET_assert (GNUNET_YES ==
-                 GNUNET_CONTAINER_multipeermap_remove (neighbours,
-                                                       &n->id,
-                                                       n));
-
-  /* Cancel address requests for this peer */
-  if (NULL != n->suggest_handle)
-  {
-    GNUNET_ATS_connectivity_suggest_cancel (n->suggest_handle);
-    n->suggest_handle = NULL;
-  }
-
-  /* Cancel the disconnect task */
-  if (NULL != n->delayed_disconnect_task)
-  {
-    GNUNET_SCHEDULER_cancel (n->delayed_disconnect_task);
-    n->delayed_disconnect_task = NULL;
-  }
-
-  /* Cancel the master task */
-  if (NULL != n->task)
-  {
-    GNUNET_SCHEDULER_cancel (n->task);
-    n->task = NULL;
-  }
-  /* free rest of memory */
-  GNUNET_free (n);
-}
-
-
-/**
- * Function called when the 'DISCONNECT' message has been sent by the
- * plugin.  Frees the neighbour --- if the entry still exists.
- *
- * @param cls NULL
- * @param target identity of the neighbour that was disconnected
- * @param result #GNUNET_OK if the disconnect got out successfully
- * @param payload bytes payload
- * @param physical bytes on wire
- */
-static void
-send_disconnect_cont (void *cls,
-                      const struct GNUNET_PeerIdentity *target,
-                      int result,
-                      size_t payload,
-                      size_t physical)
-{
-  struct NeighbourMapEntry *n;
-
-  (void) cls;
-  (void) result;
-  (void) payload;
-  (void) physical;
-  n = lookup_neighbour (target);
-  if (NULL == n)
-    return; /* already gone */
-  if (GNUNET_TRANSPORT_PS_DISCONNECT != n->state)
-    return; /* have created a fresh entry since */
-  if (NULL != n->task)
-    GNUNET_SCHEDULER_cancel (n->task);
-  n->task = GNUNET_SCHEDULER_add_now (&master_task, n);
-}
-
-
-/**
- * Transmit a DISCONNECT message to the other peer.
- *
- * @param n neighbour to send DISCONNECT message.
- */
-static void
-send_disconnect (struct NeighbourMapEntry *n)
-{
-  struct GNUNET_ATS_SessionDisconnectMessage disconnect_msg;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Sending DISCONNECT message to peer `%4s'\n",
-              GNUNET_i2s (&n->id));
-  disconnect_msg.header.size = htons (sizeof(struct
-                                             GNUNET_ATS_SessionDisconnectMessage));
-  disconnect_msg.header.type =
-    htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT);
-  disconnect_msg.reserved = htonl (0);
-  disconnect_msg.purpose.size =
-    htonl (sizeof(struct GNUNET_CRYPTO_EccSignaturePurpose)
-           + sizeof(struct GNUNET_CRYPTO_EddsaPublicKey)
-           + sizeof(struct GNUNET_TIME_AbsoluteNBO));
-  disconnect_msg.purpose.purpose =
-    htonl (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT);
-  disconnect_msg.timestamp =
-    GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ());
-  disconnect_msg.public_key = GST_my_identity.public_key;
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CRYPTO_eddsa_sign_ (&GST_my_private_key,
-                                            &disconnect_msg.purpose,
-                                            &disconnect_msg.signature));
-
-  (void) send_with_session (n,
-                            &disconnect_msg,
-                            sizeof(disconnect_msg),
-                            UINT32_MAX,
-                            GNUNET_TIME_UNIT_FOREVER_REL,
-                            GNUNET_NO,
-                            &send_disconnect_cont,
-                            NULL);
-  GNUNET_STATISTICS_update (GST_stats,
-                            gettext_noop ("# DISCONNECT messages sent"),
-                            1,
-                            GNUNET_NO);
-}
-
-
-/**
- * Disconnect from the given neighbour, clean up the record.
- *
- * @param n neighbour to disconnect from
- */
-static void
-disconnect_neighbour (struct NeighbourMapEntry *n)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Disconnecting from peer %s in state %s\n",
-              GNUNET_i2s (&n->id),
-              GNUNET_TRANSPORT_ps2s (n->state));
-  /* depending on state, notify neighbour and/or upper layers of this peer
-     about disconnect */
-  switch (n->state)
-  {
-  case GNUNET_TRANSPORT_PS_NOT_CONNECTED:
-  case GNUNET_TRANSPORT_PS_INIT_ATS:
-    /* other peer is completely unaware of us, no need to send DISCONNECT */
-    free_neighbour (n);
-    return;
-
-  case GNUNET_TRANSPORT_PS_SYN_SENT:
-    send_disconnect (n);
-    set_state_and_timeout (n,
-                           GNUNET_TRANSPORT_PS_DISCONNECT,
-                           GNUNET_TIME_UNIT_FOREVER_ABS);
-    break;
-
-  case GNUNET_TRANSPORT_PS_SYN_RECV_ATS:
-    /* we never ACK'ed the other peer's request, no need to send DISCONNECT */
-    free_neighbour (n);
-    return;
-
-  case GNUNET_TRANSPORT_PS_SYN_RECV_ACK:
-    /* we DID ACK the other peer's request, must send DISCONNECT */
-    send_disconnect (n);
-    set_state_and_timeout (n,
-                           GNUNET_TRANSPORT_PS_DISCONNECT,
-                           GNUNET_TIME_UNIT_FOREVER_ABS);
-    break;
-
-  case GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT:
-  case GNUNET_TRANSPORT_PS_CONNECTED:
-  case GNUNET_TRANSPORT_PS_RECONNECT_SENT:
-    /* we are currently connected, need to send disconnect and do
-       internal notifications and update statistics */
-    send_disconnect (n);
-    set_state_and_timeout (n,
-                           GNUNET_TRANSPORT_PS_DISCONNECT,
-                           GNUNET_TIME_UNIT_FOREVER_ABS);
-    break;
-
-  case GNUNET_TRANSPORT_PS_RECONNECT_ATS:
-    /* Disconnecting while waiting for an ATS address to reconnect,
-     * cannot send DISCONNECT */
-    free_neighbour (n);
-    return;
-
-  case GNUNET_TRANSPORT_PS_DISCONNECT:
-    /* already disconnected, ignore */
-    break;
-
-  case GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED:
-    /* already cleaned up, how did we get here!? */
-    GNUNET_assert (0);
-    break;
-
-  default:
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unhandled state `%s'\n",
-                GNUNET_TRANSPORT_ps2s (n->state));
-    GNUNET_break (0);
-    break;
-  }
-  /* schedule timeout to clean up */
-  if (NULL != n->task)
-    GNUNET_SCHEDULER_cancel (n->task);
-  n->task = GNUNET_SCHEDULER_add_delayed (DISCONNECT_SENT_TIMEOUT,
-                                          &master_task,
-                                          n);
-}
-
-
-/**
- * Change the incoming quota for the given peer.  Updates
- * our own receive rate and informs the neighbour about
- * the new quota.
- *
- * @param n neighbour entry to change quota for
- * @param quota new quota
- * @return #GNUNET_YES if @a n is still valid, #GNUNET_NO if
- *   @a n was freed
- */
-static int
-set_incoming_quota (struct NeighbourMapEntry *n,
-                    struct GNUNET_BANDWIDTH_Value32NBO quota)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Setting inbound quota of %u Bps for peer `%s' to all clients\n",
-              ntohl (quota.value__), GNUNET_i2s (&n->id));
-  GNUNET_BANDWIDTH_tracker_update_quota (&n->in_tracker,
-                                         quota);
-  if (0 != ntohl (quota.value__))
-  {
-    struct GNUNET_ATS_SessionQuotaMessage sqm;
-
-    sqm.header.size = htons (sizeof(struct GNUNET_ATS_SessionQuotaMessage));
-    sqm.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_QUOTA);
-    sqm.quota = quota.value__;
-    if (NULL != n->primary_address.session)
-      (void) send_with_session (n,
-                                &sqm,
-                                sizeof(sqm),
-                                UINT32_MAX - 1,
-                                GNUNET_TIME_UNIT_FOREVER_REL,
-                                GNUNET_NO,
-                                NULL, NULL);
-    return GNUNET_YES;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Disconnecting peer `%s' due to SET_QUOTA\n",
-              GNUNET_i2s (&n->id));
-  if (GNUNET_YES == test_connected (n))
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop ("# disconnects due to quota of 0"),
-                              1, GNUNET_NO);
-  disconnect_neighbour (n);
-  return GNUNET_NO;
-}
-
-
-/**
- * Initialize the primary address of a neighbour
- *
- * @param n the neighbour
- * @param address address of the other peer, NULL if other peer
- *                       connected to us
- * @param session session to use (or NULL, in which case an
- *        address must be setup)
- * @param bandwidth_in inbound quota to be used when connection is up
- * @param bandwidth_out outbound quota to be used when connection is up
- */
-static void
-set_primary_address (struct NeighbourMapEntry *n,
-                     const struct GNUNET_HELLO_Address *address,
-                     struct GNUNET_ATS_Session *session,
-                     struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
-                     struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out)
-{
-  if (session == n->primary_address.session)
-  {
-    GST_validation_set_address_use (n->primary_address.address,
-                                    GNUNET_YES);
-    if (n->primary_address.bandwidth_in.value__ != bandwidth_in.value__)
-    {
-      n->primary_address.bandwidth_in = bandwidth_in;
-      if (GNUNET_YES !=
-          set_incoming_quota (n,
-                              bandwidth_in))
-        return;
-    }
-    if (n->primary_address.bandwidth_out.value__ != bandwidth_out.value__)
-    {
-      n->primary_address.bandwidth_out = bandwidth_out;
-      send_outbound_quota_to_clients (n);
-    }
-    return;
-  }
-  if ((NULL != n->primary_address.address) &&
-      (0 == GNUNET_HELLO_address_cmp (address,
-                                      n->primary_address.address)))
-  {
-    GNUNET_break (0);
-    return;
-  }
-  if (NULL == session)
-  {
-    GNUNET_break (0);
-    GST_ats_block_address (address,
-                           session);
-    return;
-  }
-  if (NULL != n->primary_address.address)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Replacing existing primary address with another one\n");
-    free_address (&n->primary_address);
-  }
-  n->primary_address.address = GNUNET_HELLO_address_copy (address);
-  n->primary_address.bandwidth_in = bandwidth_in;
-  n->primary_address.bandwidth_out = bandwidth_out;
-  n->primary_address.session = session;
-  n->primary_address.keep_alive_nonce = 0;
-  GNUNET_assert (GNUNET_YES ==
-                 GST_ats_is_known (n->primary_address.address,
-                                   n->primary_address.session));
-  /* subsystems about address use */
-  GST_validation_set_address_use (n->primary_address.address,
-                                  GNUNET_YES);
-  if (GNUNET_YES !=
-      set_incoming_quota (n,
-                          bandwidth_in))
-    return;
-  send_outbound_quota_to_clients (n);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Neighbour `%s' switched to address `%s'\n",
-              GNUNET_i2s (&n->id),
-              GST_plugins_a2s (address));
-
-  neighbours_changed_notification (&n->id,
-                                   n->primary_address.address,
-                                   n->state,
-                                   n->timeout,
-                                   n->primary_address.bandwidth_in,
-                                   n->primary_address.bandwidth_out);
-}
-
-
-/**
- * We're done with our transmission attempt, continue processing.
- *
- * @param cls the `struct MessageQueue` of the message
- * @param receiver intended receiver
- * @param success whether it worked or not
- * @param size_payload bytes payload sent
- * @param physical bytes sent on wire
- */
-static void
-transmit_send_continuation (void *cls,
-                            const struct GNUNET_PeerIdentity *receiver,
-                            int success,
-                            size_t size_payload,
-                            size_t physical)
-{
-  struct MessageQueue *mq = cls;
-  struct NeighbourMapEntry *n;
-
-  if (NULL == (n = lookup_neighbour (receiver)))
-  {
-    if (NULL != mq->cont)
-      mq->cont (mq->cont_cls,
-                GNUNET_SYSERR /* not connected */,
-                size_payload,
-                0);
-    GNUNET_free (mq);
-    return;   /* disconnect or other error while transmitting, can happen */
-  }
-  if (n->is_active == mq)
-  {
-    /* this is still "our" neighbour, remove us from its queue
-       and allow it to send the next message now */
-    n->is_active = NULL;
-    if (NULL != n->task)
-      GNUNET_SCHEDULER_cancel (n->task);
-    n->task = GNUNET_SCHEDULER_add_now (&master_task,
-                                        n);
-  }
-  if (bytes_in_send_queue < mq->message_buf_size)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Bytes_in_send_queue `%llu', Message_size %u, result: %s, payload %u, on wire %u\n",
-                bytes_in_send_queue,
-                (unsigned int) mq->message_buf_size,
-                (GNUNET_OK == success) ? "OK" : "FAIL",
-                (unsigned int) size_payload,
-                (unsigned int) physical);
-    GNUNET_break (0);
-  }
-
-  GNUNET_break (size_payload == mq->message_buf_size);
-  bytes_in_send_queue -= mq->message_buf_size;
-  GNUNET_STATISTICS_set (GST_stats,
-                         gettext_noop (
-                           "# bytes in message queue for other peers"),
-                         bytes_in_send_queue,
-                         GNUNET_NO);
-  if (GNUNET_OK == success)
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop (
-                                "# messages transmitted to other peers"),
-                              1,
-                              GNUNET_NO);
-  else
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop
-                              (
-                                "# transmission failures for messages to other peers"),
-                              1, GNUNET_NO);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Sending message to `%s' of type %u with %u bytes was a %s\n",
-              GNUNET_i2s (receiver),
-              ntohs (((struct GNUNET_MessageHeader *) mq->message_buf)->type),
-              (unsigned int) mq->message_buf_size,
-              (success == GNUNET_OK) ? "success" : "FAILURE");
-  if (NULL != mq->cont)
-    mq->cont (mq->cont_cls,
-              success,
-              size_payload,
-              physical);
-  GNUNET_free (mq);
-}
-
-
-/**
- * Check the message list for the given neighbour and if we can
- * send a message, do so.  This function should only be called
- * if the connection is at least generally ready for transmission.
- * While we will only send one message at a time, no bandwidth
- * quota management is performed here.  If a message was given to
- * the plugin, the continuation will automatically re-schedule
- * the 'master' task once the next message might be transmitted.
- *
- * @param n target peer for which to transmit
- */
-static void
-try_transmission_to_peer (struct NeighbourMapEntry *n)
-{
-  struct MessageQueue *mq;
-  struct GNUNET_TIME_Relative timeout;
-
-  if (NULL == n->primary_address.address)
-  {
-    /* no address, why are we here? */
-    GNUNET_break (0);
-    return;
-  }
-  if ((0 == n->primary_address.address->address_length) &&
-      (NULL == n->primary_address.session))
-  {
-    /* no address, why are we here? */
-    GNUNET_break (0);
-    return;
-  }
-  if (NULL != n->is_active)
-  {
-    /* transmission already pending */
-    return;
-  }
-
-  /* timeout messages from the queue that are past their due date */
-  while (NULL != (mq = n->messages_head))
-  {
-    timeout = GNUNET_TIME_absolute_get_remaining (mq->timeout);
-    if (timeout.rel_value_us > 0)
-      break;
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop (
-                                "# messages timed out while in transport queue"),
-                              1,
-                              GNUNET_NO);
-    GNUNET_CONTAINER_DLL_remove (n->messages_head,
-                                 n->messages_tail,
-                                 mq);
-    n->is_active = mq;
-    transmit_send_continuation (mq,
-                                &n->id,
-                                GNUNET_SYSERR,
-                                mq->message_buf_size,
-                                0);     /* timeout */
-  }
-  if (NULL == mq)
-    return;                     /* no more messages */
-  if (NULL == n->primary_address.address)
-  {
-    /* transmit_send_continuation() caused us to drop session,
-       can't try transmission anymore. */
-    return;
-  }
-
-
-  GNUNET_CONTAINER_DLL_remove (n->messages_head,
-                               n->messages_tail,
-                               mq);
-  n->is_active = mq;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Giving message with %u bytes to plugin session %p\n",
-              (unsigned int) mq->message_buf_size,
-              n->primary_address.session);
-  (void) send_with_session (n,
-                            mq->message_buf,
-                            mq->message_buf_size,
-                            0 /* priority */,
-                            timeout,
-                            GNUNET_NO,
-                            &transmit_send_continuation,
-                            mq);
-}
-
-
-/**
- * Send keepalive message to the neighbour.  Must only be called
- * if we are on 'connected' state or while trying to switch addresses.
- * Will internally determine if a keepalive is truly needed (so can
- * always be called).
- *
- * @param n neighbour that went idle and needs a keepalive
- */
-static void
-send_keepalive (struct NeighbourMapEntry *n)
-{
-  struct GNUNET_ATS_SessionKeepAliveMessage m;
-  struct GNUNET_TIME_Relative timeout;
-  uint32_t nonce;
-
-  GNUNET_assert ((GNUNET_TRANSPORT_PS_CONNECTED == n->state) ||
-                 (GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT == n->state));
-  if (GNUNET_TIME_absolute_get_remaining (n->keep_alive_time).rel_value_us > 0)
-    return; /* no keepalive needed at this time */
-
-  nonce = 0; /* 0 indicates 'not set' */
-  while (0 == nonce)
-    nonce = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE,
-                                      UINT32_MAX);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Sending KEEPALIVE to peer `%s' with nonce %u\n",
-              GNUNET_i2s (&n->id),
-              nonce);
-  m.header.size = htons (sizeof(struct GNUNET_ATS_SessionKeepAliveMessage));
-  m.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE);
-  m.nonce = htonl (nonce);
-
-  timeout = send_with_session (n,
-                               &m,
-                               sizeof(m),
-                               UINT32_MAX /* priority */,
-                               GNUNET_TIME_UNIT_FOREVER_REL,
-                               GNUNET_YES,
-                               NULL, NULL);
-  GNUNET_STATISTICS_update (GST_stats,
-                            gettext_noop ("# KEEPALIVES sent"),
-                            1,
-                            GNUNET_NO);
-  n->primary_address.keep_alive_nonce = nonce;
-  n->expect_latency_response = GNUNET_YES;
-  n->last_keep_alive_time = GNUNET_TIME_absolute_get ();
-  n->keep_alive_time = GNUNET_TIME_relative_to_absolute (timeout);
-}
-
-
-/**
- * Keep the connection to the given neighbour alive longer,
- * we received a KEEPALIVE (or equivalent); send a response.
- *
- * @param neighbour neighbour to keep alive (by sending keep alive response)
- * @param m the keep alive message containing the nonce to respond to
- */
-void
-GST_neighbours_keepalive (const struct GNUNET_PeerIdentity *neighbour,
-                          const struct GNUNET_MessageHeader *m)
-{
-  struct NeighbourMapEntry *n;
-  const struct GNUNET_ATS_SessionKeepAliveMessage *msg_in;
-  struct GNUNET_ATS_SessionKeepAliveMessage msg;
-
-  if (sizeof(struct GNUNET_ATS_SessionKeepAliveMessage) != ntohs (m->size))
-  {
-    GNUNET_break_op (0);
-    return;
-  }
-
-  msg_in = (const struct GNUNET_ATS_SessionKeepAliveMessage *) m;
-  if (NULL == (n = lookup_neighbour (neighbour)))
-  {
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop
-                                ("# KEEPALIVE messages discarded (peer unknown)"),
-                              1, GNUNET_NO);
-    return;
-  }
-  if (NULL == n->primary_address.session)
-  {
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop
-                                ("# KEEPALIVE messages discarded (no session)"),
-                              1, GNUNET_NO);
-    return;
-  }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received KEEPALIVE request from peer `%s' with nonce %u\n",
-              GNUNET_i2s (&n->id),
-              ntohl (msg_in->nonce));
-  GNUNET_STATISTICS_update (GST_stats,
-                            gettext_noop (
-                              "# KEEPALIVES received in good order"),
-                            1,
-                            GNUNET_NO);
-
-  /* send reply to allow neighbour to measure latency */
-  msg.header.size = htons (sizeof(struct GNUNET_ATS_SessionKeepAliveMessage));
-  msg.header.type = htons (
-    GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE_RESPONSE);
-  msg.nonce = msg_in->nonce;
-  (void) send_with_session (n,
-                            &msg,
-                            sizeof(struct GNUNET_ATS_SessionKeepAliveMessage),
-                            UINT32_MAX /* priority */,
-                            GNUNET_TIME_UNIT_FOREVER_REL,
-                            GNUNET_YES,
-                            NULL, NULL);
-}
-
-
-/**
- * We received a KEEP_ALIVE_RESPONSE message and use this to calculate
- * latency to this peer.  Pass the updated information (existing ats
- * plus calculated latency) to ATS.
- *
- * @param neighbour neighbour to keep alive
- * @param m the message containing the keep alive response
- */
-void
-GST_neighbours_keepalive_response (const struct GNUNET_PeerIdentity *neighbour,
-                                   const struct GNUNET_MessageHeader *m)
-{
-  struct NeighbourMapEntry *n;
-  const struct GNUNET_ATS_SessionKeepAliveMessage *msg;
-  struct GNUNET_TRANSPORT_PluginFunctions *papi;
-  struct GNUNET_TIME_Relative latency;
-
-  if (sizeof(struct GNUNET_ATS_SessionKeepAliveMessage) != ntohs (m->size))
-  {
-    GNUNET_break_op (0);
-    return;
-  }
-
-  msg = (const struct GNUNET_ATS_SessionKeepAliveMessage *) m;
-  if (NULL == (n = lookup_neighbour (neighbour)))
-  {
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop (
-                                "# KEEPALIVE_RESPONSEs discarded (not connected)"),
-                              1,
-                              GNUNET_NO);
-    return;
-  }
-  if ((GNUNET_TRANSPORT_PS_CONNECTED != n->state) ||
-      (GNUNET_YES != n->expect_latency_response))
-  {
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop (
-                                "# KEEPALIVE_RESPONSEs discarded (not expected)"),
-                              1,
-                              GNUNET_NO);
-    return;
-  }
-  if (NULL == n->primary_address.address)
-  {
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop (
-                                "# KEEPALIVE_RESPONSEs discarded (address changed)"),
-                              1,
-                              GNUNET_NO);
-    return;
-  }
-  if (n->primary_address.keep_alive_nonce != ntohl (msg->nonce))
-  {
-    if (0 == n->primary_address.keep_alive_nonce)
-      GNUNET_STATISTICS_update (GST_stats,
-                                gettext_noop (
-                                  "# KEEPALIVE_RESPONSEs discarded (no nonce)"),
-                                1,
-                                GNUNET_NO);
-    else
-      GNUNET_STATISTICS_update (GST_stats,
-                                gettext_noop (
-                                  "# KEEPALIVE_RESPONSEs discarded (bad nonce)"),
-                                1,
-                                GNUNET_NO);
-    return;
-  }
-  GNUNET_STATISTICS_update (GST_stats,
-                            gettext_noop (
-                              "# KEEPALIVE_RESPONSEs received (OK)"),
-                            1,
-                            GNUNET_NO);
-
-
-  /* Update session timeout here */
-  if (NULL != (papi = GST_plugins_find (
-                 n->primary_address.address->transport_name)))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Updating session for peer `%s' for session %p\n",
-                GNUNET_i2s (&n->id),
-                n->primary_address.session);
-    papi->update_session_timeout (papi->cls,
-                                  &n->id,
-                                  n->primary_address.session);
-  }
-  else
-  {
-    GNUNET_break (0);
-  }
-
-  n->primary_address.keep_alive_nonce = 0;
-  n->expect_latency_response = GNUNET_NO;
-  set_state_and_timeout (n,
-                         n->state,
-                         GNUNET_TIME_relative_to_absolute (
-                           GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT));
-
-  latency = GNUNET_TIME_absolute_get_duration (n->last_keep_alive_time);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received KEEPALIVE_RESPONSE from peer `%s', latency is %s\n",
-              GNUNET_i2s (&n->id),
-              GNUNET_STRINGS_relative_time_to_string (latency,
-                                                      GNUNET_YES));
-  GST_ats_update_delay (n->primary_address.address,
-                        GNUNET_TIME_relative_divide (latency,
-                                                     2));
-}
-
-
-/**
- * We have received a message from the given sender.  How long should
- * we delay before receiving more?  (Also used to keep the peer marked
- * as live).
- *
- * @param sender sender of the message
- * @param size size of the message
- * @param do_forward set to #GNUNET_YES if the message should be forwarded to clients
- *                   #GNUNET_NO if the neighbour is not connected or violates the quota,
- *                   #GNUNET_SYSERR if the connection is not fully up yet
- * @return how long to wait before reading more from this sender
- */
-struct GNUNET_TIME_Relative
-GST_neighbours_calculate_receive_delay (const struct
-                                        GNUNET_PeerIdentity *sender,
-                                        ssize_t size,
-                                        int *do_forward)
-{
-  struct NeighbourMapEntry *n;
-  struct GNUNET_TIME_Relative ret;
-
-  if (NULL == neighbours)
-  {
-    *do_forward = GNUNET_NO;
-    return GNUNET_TIME_UNIT_FOREVER_REL;   /* This can happen during shutdown */
-  }
-  if (NULL == (n = lookup_neighbour (sender)))
-  {
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop (
-                                "# messages discarded due to lack of neighbour record"),
-                              1,
-                              GNUNET_NO);
-    *do_forward = GNUNET_NO;
-    return GNUNET_TIME_UNIT_ZERO;
-  }
-  if (! test_connected (n))
-  {
-    *do_forward = GNUNET_SYSERR;
-    return GNUNET_TIME_UNIT_ZERO;
-  }
-  if (GNUNET_YES == GNUNET_BANDWIDTH_tracker_consume (&n->in_tracker, size))
-  {
-    n->quota_violation_count++;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Bandwidth quota (%u b/s) violation detected (total of %u).\n",
-                n->in_tracker.available_bytes_per_s__,
-                n->quota_violation_count);
-    /* Discount 32k per violation */
-    GNUNET_BANDWIDTH_tracker_consume (&n->in_tracker, -32 * 1024);
-  }
-  else
-  {
-    if (n->quota_violation_count > 0)
-    {
-      /* try to add 32k back */
-      GNUNET_BANDWIDTH_tracker_consume (&n->in_tracker, 32 * 1024);
-      n->quota_violation_count--;
-    }
-  }
-  if (n->quota_violation_count > QUOTA_VIOLATION_DROP_THRESHOLD)
-  {
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop
-                                ("# bandwidth quota violations by other peers"),
-                              1, GNUNET_NO);
-    *do_forward = GNUNET_NO;
-    return GNUNET_CONSTANTS_QUOTA_VIOLATION_TIMEOUT;
-  }
-  *do_forward = GNUNET_YES;
-  ret = GNUNET_BANDWIDTH_tracker_get_delay (&n->in_tracker, 32 * 1024);
-  if (ret.rel_value_us > 0)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Throttling read (%lld bytes excess at %u b/s), waiting %s before reading more.\n",
-                (long long) n->in_tracker.consumption_since_last_update__,
-                (unsigned int) n->in_tracker.available_bytes_per_s__,
-                GNUNET_STRINGS_relative_time_to_string (ret, GNUNET_YES));
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop ("# ms throttling suggested"),
-                              (int64_t) ret.rel_value_us / 1000LL,
-                              GNUNET_NO);
-  }
-  return ret;
-}
-
-
-/**
- * Transmit a message to the given target using the active connection.
- *
- * @param target destination
- * @param msg message to send
- * @param msg_size number of bytes in msg
- * @param timeout when to fail with timeout
- * @param cont function to call when done
- * @param cont_cls closure for @a cont
- */
-void
-GST_neighbours_send (const struct GNUNET_PeerIdentity *target,
-                     const void *msg,
-                     size_t msg_size,
-                     struct GNUNET_TIME_Relative timeout,
-                     GST_NeighbourSendContinuation cont,
-                     void *cont_cls)
-{
-  struct NeighbourMapEntry *n;
-  struct MessageQueue *mq;
-
-  /* All ove these cases should never happen; they are all API violations.
-     But we check anyway, just to be sure. */
-  if (NULL == (n = lookup_neighbour (target)))
-  {
-    GNUNET_break (0);
-    if (NULL != cont)
-      cont (cont_cls,
-            GNUNET_SYSERR,
-            msg_size,
-            0);
-    return;
-  }
-  if (GNUNET_YES != test_connected (n))
-  {
-    GNUNET_break (0);
-    if (NULL != cont)
-      cont (cont_cls,
-            GNUNET_SYSERR,
-            msg_size,
-            0);
-    return;
-  }
-  bytes_in_send_queue += msg_size;
-  GNUNET_STATISTICS_set (GST_stats,
-                         gettext_noop
-                           ("# bytes in message queue for other peers"),
-                         bytes_in_send_queue, GNUNET_NO);
-  mq = GNUNET_malloc (sizeof(struct MessageQueue) + msg_size);
-  mq->cont = cont;
-  mq->cont_cls = cont_cls;
-  GNUNET_memcpy (&mq[1], msg, msg_size);
-  mq->message_buf = (const char *) &mq[1];
-  mq->message_buf_size = msg_size;
-  mq->timeout = GNUNET_TIME_relative_to_absolute (timeout);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Enqueueing %u bytes to send to peer %s\n",
-              (unsigned int) msg_size,
-              GNUNET_i2s (target));
-  GNUNET_CONTAINER_DLL_insert_tail (n->messages_head,
-                                    n->messages_tail,
-                                    mq);
-  if (NULL != n->task)
-    GNUNET_SCHEDULER_cancel (n->task);
-  n->task = GNUNET_SCHEDULER_add_now (&master_task, n);
-}
-
-
-/**
- * Continuation called from our attempt to transmitted our
- * #GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_SYN to the specified @a
- * target.  Continue processing based on the @a result.  Specifically,
- * if we failed to transmit, discard the address we used.
- *
- * @param cls NULL
- * @param target which peer received the transmission
- * @param result #GNUNET_OK if sending worked
- * @param size_payload how many bytes of payload were sent (ignored)
- * @param size_on_wire how much bandwidth was consumed on the wire (ignored)
- */
-static void
-send_session_syn_cont (void *cls,
-                       const struct GNUNET_PeerIdentity *target,
-                       int result,
-                       size_t size_payload,
-                       size_t size_on_wire)
-{
-  struct NeighbourMapEntry *n;
-
-  (void) cls;
-  (void) size_payload;
-  (void) size_on_wire;
-  n = lookup_neighbour (target);
-  if (NULL == n)
-  {
-    /* SYN continuation was called after neighbor was freed,
-     * for example due to a time out for the state or the session
-     * used was already terminated: nothing to do here... */
-    return;
-  }
-
-  if ((GNUNET_TRANSPORT_PS_SYN_SENT != n->state) &&
-      (GNUNET_TRANSPORT_PS_RECONNECT_SENT != n->state) &&
-      (GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT != n->state))
-  {
-    /* SYN continuation was called after neighbor changed state,
-     * for example due to a time out for the state or the session
-     * used was already terminated: nothing to do here... */
-    return;
-  }
-  if (GNUNET_OK == result)
-    return;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              _ ("Failed to send SYN message to peer `%s'\n"),
-              GNUNET_i2s (target));
-  switch (n->state)
-  {
-  case GNUNET_TRANSPORT_PS_SYN_SENT:
-    /* Remove address and request an additional one */
-    unset_primary_address (n);
-    set_state_and_timeout (n,
-                           GNUNET_TRANSPORT_PS_INIT_ATS,
-                           GNUNET_TIME_relative_to_absolute (
-                             FAST_RECONNECT_TIMEOUT));
-    break;
-
-  case GNUNET_TRANSPORT_PS_RECONNECT_SENT:
-    /* Remove address and request an additional one */
-    unset_primary_address (n);
-    set_state_and_timeout (n,
-                           GNUNET_TRANSPORT_PS_RECONNECT_ATS,
-                           GNUNET_TIME_relative_to_absolute (
-                             ATS_RESPONSE_TIMEOUT));
-    break;
-
-  case GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT:
-    /* Remove address and request and go back to primary address */
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop (
-                                "# Failed attempts to switch addresses (failed to send SYN CONT)"),
-                              1,
-                              GNUNET_NO);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Switch failed, cleaning up alternative address\n");
-    free_address (&n->alternative_address);
-    set_state_and_timeout (n,
-                           GNUNET_TRANSPORT_PS_CONNECTED,
-                           GNUNET_TIME_relative_to_absolute (
-                             ATS_RESPONSE_TIMEOUT));
-    break;
-
-  default:
-    disconnect_neighbour (n);
-    break;
-  }
-}
-
-
-/**
- * Send a SYN message via the given address.
- *
- * @param na address to use
- */
-static void
-send_syn (struct NeighbourAddress *na)
-{
-  struct GNUNET_TRANSPORT_PluginFunctions *papi;
-  struct TransportSynMessage connect_msg;
-  struct NeighbourMapEntry *n;
-
-  GNUNET_assert (NULL != na->session);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Sending SYN message to peer `%s' at %s\n",
-              GNUNET_i2s (&na->address->peer),
-              GST_plugins_a2s (na->address));
-
-  papi = GST_plugins_find (na->address->transport_name);
-  GNUNET_assert (NULL != papi);
-  GNUNET_STATISTICS_update (GST_stats,
-                            gettext_noop
-                              ("# SYN messages sent"),
-                            1, GNUNET_NO);
-  na->connect_timestamp = GNUNET_TIME_absolute_get ();
-  connect_msg.header.size = htons (sizeof(struct TransportSynMessage));
-  connect_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_SYN);
-  connect_msg.reserved = htonl (0);
-  connect_msg.timestamp = GNUNET_TIME_absolute_hton (na->connect_timestamp);
-  if (-1 ==
-      papi->send (papi->cls,
-                  na->session,
-                  (const char *) &connect_msg,
-                  sizeof(struct TransportSynMessage),
-                  UINT_MAX,
-                  SETUP_CONNECTION_TIMEOUT,
-                  &send_session_syn_cont, NULL))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                _ ("Failed to transmit SYN message to %s\n"),
-                GST_plugins_a2s (na->address));
-    n = lookup_neighbour (&na->address->peer);
-    if (NULL == n)
-    {
-      GNUNET_break (0);
-      return;
-    }
-    switch (n->state)
-    {
-    case GNUNET_TRANSPORT_PS_SYN_SENT:
-      /* Remove address and request and additional one */
-      GNUNET_assert (na == &n->primary_address);
-      unset_primary_address (n);
-      set_state_and_timeout (n,
-                             GNUNET_TRANSPORT_PS_INIT_ATS,
-                             GNUNET_TIME_relative_to_absolute (
-                               FAST_RECONNECT_TIMEOUT));
-      /* Hard failure to send the SYN message with this address:
-         Destroy address and session */
-      break;
-
-    case GNUNET_TRANSPORT_PS_RECONNECT_SENT:
-      /* Remove address and request an additional one */
-      GNUNET_assert (na == &n->primary_address);
-      unset_primary_address (n);
-      set_state_and_timeout (n,
-                             GNUNET_TRANSPORT_PS_RECONNECT_ATS,
-                             GNUNET_TIME_relative_to_absolute (
-                               ATS_RESPONSE_TIMEOUT));
-      break;
-
-    case GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT:
-      GNUNET_assert (na == &n->alternative_address);
-      GNUNET_STATISTICS_update (GST_stats,
-                                gettext_noop (
-                                  "# Failed attempts to switch addresses (failed to send SYN)"),
-                                1,
-                                GNUNET_NO);
-      /* Remove address and request an additional one */
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Switch failed, cleaning up alternative address\n");
-      free_address (&n->alternative_address);
-      set_state_and_timeout (n,
-                             GNUNET_TRANSPORT_PS_CONNECTED,
-                             GNUNET_TIME_relative_to_absolute (
-                               ATS_RESPONSE_TIMEOUT));
-      break;
-
-    default:
-      GNUNET_break (0);
-      disconnect_neighbour (n);
-      break;
-    }
-    return;
-  }
-  GST_neighbours_notify_data_sent (na->address,
-                                   na->session,
-                                   sizeof(struct TransportSynMessage));
-}
-
-
-/**
- * Continuation called from our attempt to transmitted our
- * #GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_SYN_ACK to the specified @a
- * target.  Continue processing based on the @a result.  Specifically,
- * if we failed to transmit, discard the address we used.
- *
- * @param cls NULL
- * @param target which peer received the transmission
- * @param result #GNUNET_OK if sending worked
- * @param size_payload how many bytes of payload were sent (ignored)
- * @param size_on_wire how much bandwidth was consumed on the wire (ignored)
- */
-static void
-send_session_syn_ack_cont (void *cls,
-                           const struct GNUNET_PeerIdentity *target,
-                           int result,
-                           size_t size_payload,
-                           size_t size_on_wire)
-{
-  struct NeighbourMapEntry *n;
-
-  (void) cls;
-  (void) size_payload;
-  (void) size_on_wire;
-  n = lookup_neighbour (target);
-  if (NULL == n)
-  {
-    /* SYN_ACK continuation was called after neighbor was freed,
-     * for example due to a time out for the state or the session
-     * used was already terminated: nothing to do here... */
-    return;
-  }
-
-  if (GNUNET_TRANSPORT_PS_SYN_RECV_ACK != n->state)
-  {
-    /* SYN_ACK continuation was called after neighbor changed state,
-     * for example due to a time out for the state or the session
-     * used was already terminated: nothing to do here... */
-    return;
-  }
-  if (GNUNET_OK == result)
-    return;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              _ (
-                "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"),
-              GNUNET_i2s (target),
-              GST_plugins_a2s (n->primary_address.address));
-
-  /* Remove address and request and additional one */
-  /* FIXME: what if the neighbour's primary address
-     changed in the meantime? Might want to instead
-     pass "something" around in closure to be sure. */
-  unset_primary_address (n);
-  n->ack_state = ACK_SEND_SYN_ACK;
-  set_state_and_timeout (n,
-                         GNUNET_TRANSPORT_PS_SYN_RECV_ATS,
-                         GNUNET_TIME_relative_to_absolute (
-                           ATS_RESPONSE_TIMEOUT));
-}
-
-
-/**
- * Send a SYN_ACK message via the given address.
- *
- * @param na address and session to use
- * @param timestamp timestamp to use for the ACK message
- * @return #GNUNET_SYSERR if sending immediately failed, #GNUNET_OK otherwise
- */
-static void
-send_syn_ack_message (struct NeighbourAddress *na,
-                      struct GNUNET_TIME_Absolute timestamp)
-{
-  const struct GNUNET_HELLO_Address *address = na->address;
-  struct GNUNET_ATS_Session *session = na->session;
-  struct GNUNET_TRANSPORT_PluginFunctions *papi;
-  struct TransportSynMessage connect_msg;
-  struct NeighbourMapEntry *n;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Sending SYN_ACK to peer `%s'\n",
-              GNUNET_i2s (&address->peer));
-
-  if (NULL == (papi = GST_plugins_find (address->transport_name)))
-  {
-    GNUNET_break (0);
-    return;
-  }
-  if (NULL == session)
-    session = papi->get_session (papi->cls,
-                                 address);
-  if (NULL == session)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  GST_ats_new_session (address,
-                       session);
-  GNUNET_STATISTICS_update (GST_stats,
-                            gettext_noop
-                              ("# SYN_ACK messages sent"),
-                            1, GNUNET_NO);
-  connect_msg.header.size = htons (sizeof(struct TransportSynMessage));
-  connect_msg.header.type = htons (
-    GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_SYN_ACK);
-  connect_msg.reserved = htonl (0);
-  connect_msg.timestamp = GNUNET_TIME_absolute_hton (timestamp);
-
-  if (GNUNET_SYSERR ==
-      papi->send (papi->cls,
-                  session,
-                  (const char *) &connect_msg,
-                  sizeof(struct TransportSynMessage),
-                  UINT_MAX,
-                  GNUNET_TIME_UNIT_FOREVER_REL,
-                  &send_session_syn_ack_cont, NULL))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                _ ("Failed to transmit SYN_ACK message to %s\n"),
-                GST_plugins_a2s (address));
-
-    n = lookup_neighbour (&address->peer);
-    if (NULL == n)
-    {
-      GNUNET_break (0);
-      return;
-    }
-    /* Remove address and request and additional one */
-    unset_primary_address (n);
-    n->ack_state = ACK_SEND_SYN_ACK;
-    set_state_and_timeout (n,
-                           GNUNET_TRANSPORT_PS_SYN_RECV_ATS,
-                           GNUNET_TIME_relative_to_absolute (
-                             ATS_RESPONSE_TIMEOUT));
-    return;
-  }
-}
-
-
-/**
- * Function called by the bandwidth tracker for a peer whenever
- * the tracker's state changed such that we need to recalculate
- * the delay for flow control.  We calculate the latest delay
- * and inform the plugin (if applicable).
- *
- * @param cls the `struct NeighbourMapEntry` to update calculations for
- */
-static void
-inbound_bw_tracker_update (void *cls)
-{
-  struct NeighbourMapEntry *n = cls;
-  struct GNUNET_TRANSPORT_PluginFunctions *papi;
-  struct GNUNET_TIME_Relative delay;
-  int do_forward;
-
-  if (NULL == n->primary_address.address)
-    return; /* not active, ignore */
-  papi = GST_plugins_find (n->primary_address.address->transport_name);
-  GNUNET_assert (NULL != papi);
-  if (NULL == papi->update_inbound_delay)
-    return;
-  delay = GST_neighbours_calculate_receive_delay (&n->id,
-                                                  0,
-                                                  &do_forward);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "New inbound delay for peer `%s' is %llu ms\n",
-              GNUNET_i2s (&n->id),
-              (unsigned long long) delay.rel_value_us / 1000LL);
-  if (NULL == n->primary_address.session)
-    return;
-  papi->update_inbound_delay (papi->cls,
-                              &n->id,
-                              n->primary_address.session,
-                              delay);
-}
-
-
-/**
- * Create a fresh entry in the neighbour map for the given peer
- *
- * @param peer peer to create an entry for
- * @return new neighbour map entry
- */
-static struct NeighbourMapEntry *
-setup_neighbour (const struct GNUNET_PeerIdentity *peer)
-{
-  struct NeighbourMapEntry *n;
-
-  if (0 ==
-      memcmp (&GST_my_identity,
-              peer,
-              sizeof(struct GNUNET_PeerIdentity)))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Cowardly refusing to consider myself my neighbour!\n");
-    return NULL;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Creating new neighbour entry for `%s'\n",
-              GNUNET_i2s (peer));
-  n = GNUNET_new (struct NeighbourMapEntry);
-  n->id = *peer;
-  n->ack_state = ACK_UNDEFINED;
-  n->last_util_transmission = GNUNET_TIME_absolute_get ();
-  n->neighbour_receive_quota = GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT;
-  GNUNET_BANDWIDTH_tracker_init (&n->in_tracker,
-                                 &inbound_bw_tracker_update,
-                                 n,
-                                 GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT,
-                                 MAX_BANDWIDTH_CARRY_S);
-  n->task = GNUNET_SCHEDULER_add_now (&master_task, n);
-  set_state_and_timeout (n,
-                         GNUNET_TRANSPORT_PS_NOT_CONNECTED,
-                         GNUNET_TIME_UNIT_FOREVER_ABS);
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONTAINER_multipeermap_put (neighbours,
-                                                    &n->id,
-                                                    n,
-                                                    GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
-  n->suggest_handle = GNUNET_ATS_connectivity_suggest (GST_ats_connect,
-                                                       peer,
-                                                       0);
-
-  return n;
-}
-
-
-/**
- * Entry in a DLL we use to keep track of pending blacklist checks.
- */
-struct BlacklistCheckSwitchContext
-{
-  /**
-   * DLL prev pointer.
-   */
-  struct BlacklistCheckSwitchContext *prev;
-
-  /**
-   * DLL next pointer.
-   */
-  struct BlacklistCheckSwitchContext *next;
-
-  /**
-   * Handle to the blacklist check we are performing.
-   */
-  struct GST_BlacklistCheck *blc;
-
-  /**
-   * Inbound bandwidth that was assigned to @e address.
-   */
-  struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in;
-
-  /**
-   * Outbound bandwidth that was assigned to @e address.
-   */
-  struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out;
-};
-
-
-/**
- * We received a 'SYN' message from the other peer.
- * Consider switching to it.
- *
- * @param message possibly a `struct TransportSynMessage` (check format)
- * @param peer identity of the peer to switch the address for
- * @return #GNUNET_OK if the message was fine, #GNUNET_SYSERR on serious error
- */
-int
-GST_neighbours_handle_session_syn (const struct GNUNET_MessageHeader *message,
-                                   const struct GNUNET_PeerIdentity *peer)
-{
-  const struct TransportSynMessage *scm;
-  struct NeighbourMapEntry *n;
-  struct GNUNET_TIME_Absolute ts;
-
-  if (ntohs (message->size) != sizeof(struct TransportSynMessage))
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_STATISTICS_update (GST_stats,
-                            gettext_noop
-                              ("# SYN messages received"),
-                            1, GNUNET_NO);
-  if (NULL == neighbours)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                _ (
-                  "SYN request from peer `%s' ignored due impending shutdown\n"),
-                GNUNET_i2s (peer));
-    return GNUNET_OK;   /* we're shutting down */
-  }
-  scm = (const struct TransportSynMessage *) message;
-  GNUNET_break_op (0 == ntohl (scm->reserved));
-  ts = GNUNET_TIME_absolute_ntoh (scm->timestamp);
-  if (0 ==
-      memcmp (&GST_my_identity,
-              peer,
-              sizeof(struct GNUNET_PeerIdentity)))
-  {
-    /* loopback connection-to-self, ignore */
-    return GNUNET_SYSERR;
-  }
-  n = lookup_neighbour (peer);
-  if (NULL == n)
-  {
-    /* This is a new neighbour and set to not connected */
-    n = setup_neighbour (peer);
-    GNUNET_assert (NULL != n);
-  }
-
-  /* Remember this SYN message in neighbour */
-  n->ack_state = ACK_SEND_SYN_ACK;
-  n->connect_ack_timestamp = ts;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Received SYN for peer `%s' in state %s/%s\n",
-              GNUNET_i2s (peer),
-              GNUNET_TRANSPORT_ps2s (n->state),
-              print_ack_state (n->ack_state));
-
-  switch (n->state)
-  {
-  case GNUNET_TRANSPORT_PS_NOT_CONNECTED:
-    /* Request an address from ATS to send SYN_ACK to this peer */
-    set_state_and_timeout (n,
-                           GNUNET_TRANSPORT_PS_SYN_RECV_ATS,
-                           GNUNET_TIME_relative_to_absolute (
-                             ATS_RESPONSE_TIMEOUT));
-    break;
-
-  case GNUNET_TRANSPORT_PS_INIT_ATS:
-    /* SYN message takes priority over us asking ATS for address:
-     * Wait for ATS to suggest an address and send SYN_ACK */
-    set_state_and_timeout (n,
-                           GNUNET_TRANSPORT_PS_SYN_RECV_ATS,
-                           GNUNET_TIME_relative_to_absolute (
-                             ATS_RESPONSE_TIMEOUT));
-    break;
-
-  case GNUNET_TRANSPORT_PS_SYN_RECV_ATS:
-    /* We already wait for an address to send an SYN_ACK */
-    break;
-
-  case GNUNET_TRANSPORT_PS_SYN_SENT:
-  case GNUNET_TRANSPORT_PS_SYN_RECV_ACK:
-    /* Send ACK immediately */
-    n->ack_state = ACK_SEND_ACK;
-    send_syn_ack_message (&n->primary_address,
-                          ts);
-    break;
-
-  case GNUNET_TRANSPORT_PS_CONNECTED:
-    /* we are already connected and can thus send the ACK immediately */
-    GNUNET_assert (NULL != n->primary_address.address);
-    GNUNET_assert (NULL != n->primary_address.session);
-    n->ack_state = ACK_SEND_ACK;
-    send_syn_ack_message (&n->primary_address,
-                          ts);
-    break;
-
-  case GNUNET_TRANSPORT_PS_RECONNECT_ATS:
-    /* We wait for ATS address suggestion */
-    break;
-
-  case GNUNET_TRANSPORT_PS_RECONNECT_SENT:
-    /* We received a SYN message while waiting for a SYN_ACK in fast
-     * reconnect. Send SYN_ACK immediately */
-    n->ack_state = ACK_SEND_ACK;
-    send_syn_ack_message (&n->primary_address,
-                          n->connect_ack_timestamp);
-    break;
-
-  case GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT:
-    /* We are already connected and can thus send the ACK immediately;
-       still, it can never hurt to have an alternative address, so also
-       tell ATS  about it */
-    GNUNET_assert (NULL != n->primary_address.address);
-    GNUNET_assert (NULL != n->primary_address.session);
-    n->ack_state = ACK_SEND_ACK;
-    send_syn_ack_message (&n->primary_address,
-                          ts);
-    break;
-
-  case GNUNET_TRANSPORT_PS_DISCONNECT:
-    /* Get rid of remains and re-try */
-    free_neighbour (n);
-    n = setup_neighbour (peer);
-    GNUNET_assert (NULL != n);
-    /* Remember the SYN time stamp for ACK message */
-    n->ack_state = ACK_SEND_SYN_ACK;
-    n->connect_ack_timestamp = ts;
-    /* Request an address for the peer */
-    set_state_and_timeout (n,
-                           GNUNET_TRANSPORT_PS_SYN_RECV_ATS,
-                           GNUNET_TIME_relative_to_absolute (
-                             ATS_RESPONSE_TIMEOUT));
-    break;
-
-  case GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED:
-    /* should not be possible */
-    GNUNET_assert (0);
-    break;
-
-  default:
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unhandled state `%s'\n",
-                GNUNET_TRANSPORT_ps2s (n->state));
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Check if the given @a address is the same that we are already
- * using for the respective neighbour. If so, update the bandwidth
- * assignment and possibly the session and return #GNUNET_OK.
- * If the new address is different from what the neighbour is
- * using right now, return #GNUNET_NO.
- *
- * @param address address of the other peer,
- * @param session session to use or NULL if transport should initiate a session
- * @param bandwidth_in inbound quota to be used when connection is up,
- *      0 to disconnect from peer
- * @param bandwidth_out outbound quota to be used when connection is up,
- *      0 to disconnect from peer
- * @return #GNUNET_OK if we were able to just update the bandwidth and session,
- *         #GNUNET_NO if more extensive changes are required (address changed)
- */
-static int
-try_run_fast_ats_update (const struct GNUNET_HELLO_Address *address,
-                         struct GNUNET_ATS_Session *session,
-                         struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
-                         struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out)
-{
-  struct NeighbourMapEntry *n;
-
-  n = lookup_neighbour (&address->peer);
-  if ((NULL == n) ||
-      (NULL == n->primary_address.address) ||
-      (0 != GNUNET_HELLO_address_cmp (address,
-                                      n->primary_address.address)))
-    return GNUNET_NO;
-  /* We are not really switching addresses, but merely adjusting
-     session and/or bandwidth, can do fast ATS update! */
-  if (session != n->primary_address.session)
-  {
-    /* switch to a different session, but keeping same address; could
-       happen if there is a 2nd inbound connection */
-    n->primary_address.session = session;
-    GNUNET_assert (GNUNET_YES ==
-                   GST_ats_is_known (n->primary_address.address,
-                                     n->primary_address.session));
-  }
-  if (n->primary_address.bandwidth_in.value__ != bandwidth_in.value__)
-  {
-    n->primary_address.bandwidth_in = bandwidth_in;
-    if (GNUNET_YES !=
-        set_incoming_quota (n,
-                            bandwidth_in))
-      return GNUNET_NO;
-  }
-  if (n->primary_address.bandwidth_out.value__ != bandwidth_out.value__)
-  {
-    n->primary_address.bandwidth_out = bandwidth_out;
-    send_outbound_quota_to_clients (n);
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * We've been asked to switch addresses, and just now got the result
- * from the blacklist check to see if this is allowed.
- *
- * @param cls the `struct BlacklistCheckSwitchContext` with
- *        the information about the future address
- * @param peer the peer we may switch addresses on
- * @param address address associated with the request
- * @param session session associated with the request
- * @param result #GNUNET_OK if the connection is allowed,
- *               #GNUNET_NO if not,
- *               #GNUNET_SYSERR if operation was aborted
- */
-static void
-switch_address_bl_check_cont (void *cls,
-                              const struct GNUNET_PeerIdentity *peer,
-                              const struct GNUNET_HELLO_Address *address,
-                              struct GNUNET_ATS_Session *session,
-                              int result)
-{
-  struct BlacklistCheckSwitchContext *blc_ctx = cls;
-  struct GNUNET_TRANSPORT_PluginFunctions *papi;
-  struct NeighbourMapEntry *n;
-
-  if (GNUNET_SYSERR == result)
-    goto cleanup;
-
-  papi = GST_plugins_find (address->transport_name);
-  if (NULL == papi)
-  {
-    /* This can happen during shutdown. */
-    goto cleanup;
-  }
-
-  if (GNUNET_NO == result)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Blacklist denied to switch to suggested address `%s' session %p for peer `%s'\n",
-                GST_plugins_a2s (address),
-                session,
-                GNUNET_i2s (peer));
-    GNUNET_STATISTICS_update (GST_stats,
-                              "# ATS suggestions ignored (blacklist denied)",
-                              1,
-                              GNUNET_NO);
-    if (NULL != session)
-      papi->disconnect_session (papi->cls,
-                                session);
-    if (GNUNET_YES !=
-        GNUNET_HELLO_address_check_option (address,
-                                           GNUNET_HELLO_ADDRESS_INFO_INBOUND))
-      GST_ats_block_address (address,
-                             NULL);
-    goto cleanup;
-  }
-
-
-  if (NULL == session)
-  {
-    /* need to create a session, ATS only gave us an address */
-    session = papi->get_session (papi->cls,
-                                 address);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Obtained new session for peer `%s' and  address '%s': %p\n",
-                GNUNET_i2s (&address->peer),
-                GST_plugins_a2s (address),
-                session);
-    if (NULL != session)
-      GST_ats_new_session (address,
-                           session);
-  }
-  if (NULL == session)
-  {
-    /* session creation failed, bad!, fail! */
-    GNUNET_STATISTICS_update (GST_stats,
-                              "# ATS suggestions ignored (failed to create session)",
-                              1,
-                              GNUNET_NO);
-    /* No session could be obtained, remove blacklist check and clean up */
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Failed to obtain new session for peer `%s' and address '%s'\n",
-                GNUNET_i2s (&address->peer),
-                GST_plugins_a2s (address));
-    GST_ats_block_address (address,
-                           session);
-    goto cleanup;
-  }
-
-  /* We did this check already before going into blacklist, but
-     it is theoretically possible that the situation changed in
-     the meantime, hence we check again here */
-  if (GNUNET_OK ==
-      try_run_fast_ats_update (address,
-                               session,
-                               blc_ctx->bandwidth_in,
-                               blc_ctx->bandwidth_out))
-    goto cleanup; /* was just a minor update, we're done */
-
-  /* check if we also need to setup the neighbour entry */
-  if (NULL == (n = lookup_neighbour (peer)))
-  {
-    n = setup_neighbour (peer);
-    if (NULL == n)
-    {
-      /* not sure how this can happen... */
-      GNUNET_break (0);
-      goto cleanup;
-    }
-    n->state = GNUNET_TRANSPORT_PS_INIT_ATS;
-  }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Peer `%s' switches to address `%s'\n",
-              GNUNET_i2s (&address->peer),
-              GST_plugins_a2s (address));
-
-  switch (n->state)
-  {
-  case GNUNET_TRANSPORT_PS_NOT_CONNECTED:
-    GNUNET_break (0);
-    GST_ats_block_address (address,
-                           session);
-    free_neighbour (n);
-    return;
-
-  case GNUNET_TRANSPORT_PS_INIT_ATS:
-    /* We requested an address and ATS suggests one:
-     * set primary address and send SYN message*/
-    set_primary_address (n,
-                         address,
-                         session,
-                         blc_ctx->bandwidth_in,
-                         blc_ctx->bandwidth_out);
-    if (ACK_SEND_SYN_ACK == n->ack_state)
-    {
-      /* Send pending SYN_ACK message */
-      n->ack_state = ACK_SEND_ACK;
-      send_syn_ack_message (&n->primary_address,
-                            n->connect_ack_timestamp);
-    }
-    set_state_and_timeout (n,
-                           GNUNET_TRANSPORT_PS_SYN_SENT,
-                           GNUNET_TIME_relative_to_absolute (
-                             SETUP_CONNECTION_TIMEOUT));
-    send_syn (&n->primary_address);
-    break;
-
-  case GNUNET_TRANSPORT_PS_SYN_SENT:
-    /* ATS suggested a new address while waiting for an SYN_ACK:
-     * Switch and send new SYN */
-    /* ATS suggests a different address, switch again */
-    set_primary_address (n,
-                         address,
-                         session,
-                         blc_ctx->bandwidth_in,
-                         blc_ctx->bandwidth_out);
-    if (ACK_SEND_SYN_ACK == n->ack_state)
-    {
-      /* Send pending SYN_ACK message */
-      n->ack_state = ACK_SEND_ACK;
-      send_syn_ack_message (&n->primary_address,
-                            n->connect_ack_timestamp);
-    }
-    set_state_and_timeout (n,
-                           GNUNET_TRANSPORT_PS_SYN_SENT,
-                           GNUNET_TIME_relative_to_absolute (
-                             SETUP_CONNECTION_TIMEOUT));
-    send_syn (&n->primary_address);
-    break;
-
-  case GNUNET_TRANSPORT_PS_SYN_RECV_ATS:
-    /* We requested an address and ATS suggests one:
-    * set primary address and send SYN_ACK message*/
-    set_primary_address (n,
-                         address,
-                         session,
-                         blc_ctx->bandwidth_in,
-                         blc_ctx->bandwidth_out);
-    /* Send an ACK message as a response to the SYN msg */
-    set_state_and_timeout (n,
-                           GNUNET_TRANSPORT_PS_SYN_RECV_ACK,
-                           GNUNET_TIME_relative_to_absolute (
-                             SETUP_CONNECTION_TIMEOUT));
-    send_syn_ack_message (&n->primary_address,
-                          n->connect_ack_timestamp);
-    if ((ACK_SEND_SYN_ACK == n->ack_state) ||
-        (ACK_UNDEFINED == n->ack_state))
-      n->ack_state = ACK_SEND_ACK;
-    break;
-
-  case GNUNET_TRANSPORT_PS_SYN_RECV_ACK:
-    /* ATS asks us to switch while we were trying to connect; switch to new
-       address and check blacklist again */
-    if ((ACK_SEND_SYN_ACK == n->ack_state))
-    {
-      n->ack_state = ACK_SEND_ACK;
-      send_syn_ack_message (&n->primary_address,
-                            n->connect_ack_timestamp);
-    }
-    set_primary_address (n,
-                         address,
-                         session,
-                         blc_ctx->bandwidth_in,
-                         blc_ctx->bandwidth_out);
-    set_state_and_timeout (n,
-                           GNUNET_TRANSPORT_PS_SYN_RECV_ACK,
-                           GNUNET_TIME_relative_to_absolute (
-                             SETUP_CONNECTION_TIMEOUT));
-    break;
-
-  case GNUNET_TRANSPORT_PS_CONNECTED:
-    GNUNET_assert (NULL != n->primary_address.address);
-    GNUNET_assert (NULL != n->primary_address.session);
-    GNUNET_break (n->primary_address.session != session);
-    /* ATS asks us to switch a life connection; see if we can get
-       a SYN_ACK on it before we actually do this! */
-    set_alternative_address (n,
-                             address,
-                             session,
-                             blc_ctx->bandwidth_in,
-                             blc_ctx->bandwidth_out);
-    set_state_and_timeout (n,
-                           GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT,
-                           GNUNET_TIME_relative_to_absolute (
-                             SETUP_CONNECTION_TIMEOUT));
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop ("# Attempts to switch addresses"),
-                              1,
-                              GNUNET_NO);
-    send_syn (&n->alternative_address);
-    break;
-
-  case GNUNET_TRANSPORT_PS_RECONNECT_ATS:
-    set_primary_address (n,
-                         address,
-                         session,
-                         blc_ctx->bandwidth_in,
-                         blc_ctx->bandwidth_out);
-    if (ACK_SEND_SYN_ACK == n->ack_state)
-    {
-      /* Send pending SYN_ACK message */
-      n->ack_state = ACK_SEND_ACK;
-      send_syn_ack_message (&n->primary_address,
-                            n->connect_ack_timestamp);
-    }
-    set_state_and_timeout (n,
-                           GNUNET_TRANSPORT_PS_RECONNECT_SENT,
-                           GNUNET_TIME_relative_to_absolute (
-                             FAST_RECONNECT_TIMEOUT));
-    send_syn (&n->primary_address);
-    break;
-
-  case GNUNET_TRANSPORT_PS_RECONNECT_SENT:
-    /* ATS asks us to switch while we were trying to reconnect; switch to new
-       address and send SYN again */
-    set_primary_address (n,
-                         address,
-                         session,
-                         blc_ctx->bandwidth_in,
-                         blc_ctx->bandwidth_out);
-    set_state_and_timeout (n,
-                           GNUNET_TRANSPORT_PS_RECONNECT_SENT,
-                           GNUNET_TIME_relative_to_absolute (
-                             FAST_RECONNECT_TIMEOUT));
-    send_syn (&n->primary_address);
-    break;
-
-  case GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT:
-    if ((0 == GNUNET_HELLO_address_cmp (n->primary_address.address,
-                                        address)) &&
-        (n->primary_address.session == session))
-    {
-      /* ATS switches back to still-active session */
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "ATS double-switched, cleaning up alternative address\n");
-      free_address (&n->alternative_address);
-      set_state_and_timeout (n,
-                             GNUNET_TRANSPORT_PS_CONNECTED,
-                             n->timeout);
-      break;
-    }
-    /* ATS asks us to switch a life connection, send */
-    set_alternative_address (n,
-                             address,
-                             session,
-                             blc_ctx->bandwidth_in,
-                             blc_ctx->bandwidth_out);
-    set_state_and_timeout (n,
-                           GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT,
-                           GNUNET_TIME_relative_to_absolute (
-                             SETUP_CONNECTION_TIMEOUT));
-    send_syn (&n->alternative_address);
-    break;
-
-  case GNUNET_TRANSPORT_PS_DISCONNECT:
-    /* not going to switch addresses while disconnecting */
-    GNUNET_STATISTICS_update (GST_stats,
-                              "# ATS suggestion ignored (disconnecting)",
-                              1,
-                              GNUNET_NO);
-    return;
-
-  case GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED:
-    GNUNET_assert (0);
-    break;
-
-  default:
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unhandled state `%s'\n",
-                GNUNET_TRANSPORT_ps2s (n->state));
-    GNUNET_break (0);
-    break;
-  }
-cleanup:
-  GNUNET_CONTAINER_DLL_remove (pending_bc_head,
-                               pending_bc_tail,
-                               blc_ctx);
-  GNUNET_free (blc_ctx);
-}
-
-
-/**
- * For the given peer, switch to this address.
- *
- * Before accepting this addresses and actively using it, a blacklist check
- * is performed.
- *
- * If any check fails or the suggestion can somehow not be followed, we
- * MUST call #GST_ats_block_address() to tell ATS that the suggestion
- * could not be satisfied and force ATS to do something else.
- *
- * @param address address of the other peer,
- * @param session session to use or NULL if transport should initiate a session
- * @param bandwidth_in inbound quota to be used when connection is up,
- *      0 to disconnect from peer
- * @param bandwidth_out outbound quota to be used when connection is up,
- *      0 to disconnect from peer
- */
-void
-GST_neighbours_switch_to_address (const struct GNUNET_HELLO_Address *address,
-                                  struct GNUNET_ATS_Session *session,
-                                  struct GNUNET_BANDWIDTH_Value32NBO
-                                  bandwidth_in,
-                                  struct GNUNET_BANDWIDTH_Value32NBO
-                                  bandwidth_out)
-{
-  struct GST_BlacklistCheck *blc;
-  struct BlacklistCheckSwitchContext *blc_ctx;
-
-  GNUNET_assert (NULL != address->transport_name);
-  if (GNUNET_OK ==
-      try_run_fast_ats_update (address,
-                               session,
-                               bandwidth_in,
-                               bandwidth_out))
-    return;
-
-  /* Check if plugin is available */
-  if (NULL == (GST_plugins_find (address->transport_name)))
-  {
-    /* we don't have the plugin for this address */
-    GNUNET_break (0);
-    GST_ats_block_address (address,
-                           session);
-    return;
-  }
-  if ((NULL == session) &&
-      (GNUNET_HELLO_address_check_option (address,
-                                          GNUNET_HELLO_ADDRESS_INFO_INBOUND)))
-  {
-    /* This is a inbound address and we do not have a session to use! */
-    GNUNET_break (0);
-    GST_ats_block_address (address,
-                           session);
-    return;
-  }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "ATS suggests address '%s' for peer `%s' at %u/%u speed\n",
-              GST_plugins_a2s (address),
-              GNUNET_i2s (&address->peer),
-              (unsigned int) ntohl (bandwidth_in.value__),
-              (unsigned int) ntohl (bandwidth_out.value__));
-
-  /* Perform blacklist check */
-  blc_ctx = GNUNET_new (struct BlacklistCheckSwitchContext);
-  blc_ctx->bandwidth_in = bandwidth_in;
-  blc_ctx->bandwidth_out = bandwidth_out;
-  GNUNET_CONTAINER_DLL_insert (pending_bc_head,
-                               pending_bc_tail,
-                               blc_ctx);
-  if (NULL != (blc = GST_blacklist_test_allowed (&address->peer,
-                                                 address->transport_name,
-                                                 &switch_address_bl_check_cont,
-                                                 blc_ctx,
-                                                 address,
-                                                 session)))
-  {
-    blc_ctx->blc = blc;
-  }
-}
-
-
-/**
- * Function called to send network utilization data to ATS for
- * each active connection.
- *
- * @param cls NULL
- * @param key peer we send utilization data for
- * @param value the `struct NeighbourMapEntry *` with data to send
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-send_utilization_data (void *cls,
-                       const struct GNUNET_PeerIdentity *key,
-                       void *value)
-{
-  struct NeighbourMapEntry *n = value;
-  uint32_t bps_in;
-  uint32_t bps_out;
-  struct GNUNET_TIME_Relative delta;
-
-  (void) cls;
-  if ((GNUNET_YES != test_connected (n)) ||
-      (NULL == n->primary_address.address))
-    return GNUNET_OK;
-  delta = GNUNET_TIME_absolute_get_difference (n->last_util_transmission,
-                                               GNUNET_TIME_absolute_get ());
-  bps_in = 0;
-  if ((0 != n->util_total_bytes_recv) && (0 != delta.rel_value_us))
-    bps_in = (1000LL * 1000LL * n->util_total_bytes_recv)
-             / (delta.rel_value_us);
-  bps_out = 0;
-  if ((0 != n->util_total_bytes_sent) && (0 != delta.rel_value_us))
-    bps_out = (1000LL * 1000LL * n->util_total_bytes_sent) / delta.rel_value_us;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "`%s' total: received %u Bytes/s, sent %u Bytes/s\n",
-              GNUNET_i2s (key),
-              bps_in,
-              bps_out);
-  GST_ats_update_utilization (n->primary_address.address,
-                              bps_in,
-                              bps_out);
-  n->util_total_bytes_recv = 0;
-  n->util_total_bytes_sent = 0;
-  n->last_util_transmission = GNUNET_TIME_absolute_get ();
-  return GNUNET_OK;
-}
-
-
-/**
- * Task transmitting utilization in a regular interval
- *
- * @param cls the `struct NeighbourMapEntry` for which we are running
- */
-static void
-utilization_transmission (void *cls)
-{
-  (void) cls;
-  util_transmission_tk = NULL;
-  GNUNET_CONTAINER_multipeermap_iterate (neighbours,
-                                         &send_utilization_data,
-                                         NULL);
-  util_transmission_tk
-    = GNUNET_SCHEDULER_add_delayed (UTIL_TRANSMISSION_INTERVAL,
-                                    &utilization_transmission,
-                                    NULL);
-}
-
-
-/**
- * Track information about data we received from the
- * given address (used to notify ATS about our utilization
- * of allocated resources).
- *
- * @param address the address we got data from
- * @param message the message we received (really only the size is used)
- */
-void
-GST_neighbours_notify_data_recv (const struct GNUNET_HELLO_Address *address,
-                                 const struct GNUNET_MessageHeader *message)
-{
-  struct NeighbourMapEntry *n;
-
-  n = lookup_neighbour (&address->peer);
-  if (NULL == n)
-    return;
-  n->util_total_bytes_recv += ntohs (message->size);
-}
-
-
-/**
- * Track information about data we transmitted using the given @a
- * address and @a session (used to notify ATS about our utilization of
- * allocated resources).
- *
- * @param address the address we transmitted data to
- * @param session session we used to transmit data
- * @param message the message we sent (really only the size is used)
- */
-void
-GST_neighbours_notify_data_sent (const struct GNUNET_HELLO_Address *address,
-                                 struct GNUNET_ATS_Session *session,
-                                 size_t size)
-{
-  struct NeighbourMapEntry *n;
-
-  n = lookup_neighbour (&address->peer);
-  if (NULL == n)
-    return;
-  if (n->primary_address.session != session)
-    return;
-  n->util_total_bytes_sent += size;
-}
-
-
-/**
- * Master task run for every neighbour.  Performs all of the time-related
- * activities (keep alive, send next message, disconnect if idle, finish
- * clean up after disconnect).
- *
- * @param cls the 'struct NeighbourMapEntry' for which we are running
- */
-static void
-master_task (void *cls)
-{
-  struct NeighbourMapEntry *n = cls;
-  struct GNUNET_TIME_Relative delay;
-
-  n->task = NULL;
-  delay = GNUNET_TIME_absolute_get_remaining (n->timeout);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Master task runs for neighbour `%s' in state %s with timeout in %s\n",
-              GNUNET_i2s (&n->id),
-              GNUNET_TRANSPORT_ps2s (n->state),
-              GNUNET_STRINGS_relative_time_to_string (delay,
-                                                      GNUNET_YES));
-  switch (n->state)
-  {
-  case GNUNET_TRANSPORT_PS_NOT_CONNECTED:
-    /* invalid state for master task, clean up */
-    GNUNET_break (0);
-    free_neighbour (n);
-    return;
-
-  case GNUNET_TRANSPORT_PS_INIT_ATS:
-    if (0 == delay.rel_value_us)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Connection to `%s' timed out waiting for ATS to provide address\n",
-                  GNUNET_i2s (&n->id));
-      free_neighbour (n);
-      return;
-    }
-    break;
-
-  case GNUNET_TRANSPORT_PS_SYN_SENT:
-    if (0 == delay.rel_value_us)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Connection to `%s' timed out waiting for other peer to send SYN_ACK\n",
-                  GNUNET_i2s (&n->id));
-      /* Remove address and request and additional one */
-      unset_primary_address (n);
-      set_state_and_timeout (n,
-                             GNUNET_TRANSPORT_PS_INIT_ATS,
-                             GNUNET_TIME_relative_to_absolute (
-                               ATS_RESPONSE_TIMEOUT));
-      return;
-    }
-    break;
-
-  case GNUNET_TRANSPORT_PS_SYN_RECV_ATS:
-    if (0 == delay.rel_value_us)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Connection to `%s' timed out waiting ATS to provide address to use for SYN_ACK\n",
-                  GNUNET_i2s (&n->id));
-      free_neighbour (n);
-      return;
-    }
-    break;
-
-  case GNUNET_TRANSPORT_PS_SYN_RECV_ACK:
-    if (0 == delay.rel_value_us)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Connection to `%s' timed out waiting for other peer to send ACK\n",
-                  GNUNET_i2s (&n->id));
-      disconnect_neighbour (n);
-      return;
-    }
-    break;
-
-  case GNUNET_TRANSPORT_PS_CONNECTED:
-    if (0 == delay.rel_value_us)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Connection to `%s' timed out, missing KEEPALIVE_RESPONSEs\n",
-                  GNUNET_i2s (&n->id));
-      disconnect_neighbour (n);
-      return;
-    }
-    try_transmission_to_peer (n);
-    send_keepalive (n);
-    break;
-
-  case GNUNET_TRANSPORT_PS_RECONNECT_ATS:
-    if (0 == delay.rel_value_us)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Connection to `%s' timed out, waiting for ATS replacement address\n",
-                  GNUNET_i2s (&n->id));
-      disconnect_neighbour (n);
-      return;
-    }
-    break;
-
-  case GNUNET_TRANSPORT_PS_RECONNECT_SENT:
-    if (0 == delay.rel_value_us)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Connection to `%s' timed out, waiting for other peer to SYN_ACK replacement address\n",
-                  GNUNET_i2s (&n->id));
-      disconnect_neighbour (n);
-      return;
-    }
-    break;
-
-  case GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT:
-    if (0 == delay.rel_value_us)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Switch failed, cleaning up alternative address\n");
-      free_address (&n->alternative_address);
-      set_state_and_timeout (n,
-                             GNUNET_TRANSPORT_PS_CONNECTED,
-                             GNUNET_TIME_relative_to_absolute (
-                               SETUP_CONNECTION_TIMEOUT));
-    }
-    try_transmission_to_peer (n);
-    send_keepalive (n);
-    break;
-
-  case GNUNET_TRANSPORT_PS_DISCONNECT:
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Cleaning up connection to `%s' after sending DISCONNECT\n",
-                GNUNET_i2s (&n->id));
-    free_neighbour (n);
-    return;
-
-  case GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED:
-    /* how did we get here!? */
-    GNUNET_assert (0);
-    break;
-
-  default:
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unhandled state `%s'\n",
-                GNUNET_TRANSPORT_ps2s (n->state));
-    GNUNET_break (0);
-    break;
-  }
-  delay = GNUNET_TIME_absolute_get_remaining (n->timeout);
-  if ((GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT == n->state) ||
-      (GNUNET_TRANSPORT_PS_CONNECTED == n->state))
-  {
-    /* if we are *now* in one of the two states, we're sending
-       keep alive messages, so we need to consider the keepalive
-       delay, not just the connection timeout */
-    delay = GNUNET_TIME_relative_min (GNUNET_TIME_absolute_get_remaining (
-                                        n->keep_alive_time),
-                                      delay);
-  }
-  if (NULL == n->task)
-    n->task = GNUNET_SCHEDULER_add_delayed (delay,
-                                            &master_task,
-                                            n);
-}
-
-
-/**
- * Send a ACK message to the neighbour to confirm that we
- * got its SYN_ACK.
- *
- * @param n neighbour to send the ACK to
- */
-static void
-send_session_ack_message (struct NeighbourMapEntry *n)
-{
-  struct GNUNET_MessageHeader msg;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Sending ACK message to peer `%s'\n",
-              GNUNET_i2s (&n->id));
-
-  msg.size = htons (sizeof(struct GNUNET_MessageHeader));
-  msg.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_ACK);
-  (void) send_with_session (n,
-                            &msg,
-                            sizeof(struct GNUNET_MessageHeader),
-                            UINT32_MAX,
-                            GNUNET_TIME_UNIT_FOREVER_REL,
-                            GNUNET_NO,
-                            NULL, NULL);
-}
-
-
-/**
- * We received a 'SESSION_SYN_ACK' message from the other peer.
- * Consider switching to it.
- *
- * @param message possibly a `struct GNUNET_ATS_SessionConnectMessage` (check format)
- * @param peer identity of the peer to switch the address for
- * @param address address of the other peer, NULL if other peer
- *                       connected to us
- * @param session session to use (or NULL)
- * @return #GNUNET_OK if the message was fine, #GNUNET_SYSERR on serious error
- */
-int
-GST_neighbours_handle_session_syn_ack (const struct
-                                       GNUNET_MessageHeader *message,
-                                       const struct
-                                       GNUNET_HELLO_Address *address,
-                                       struct GNUNET_ATS_Session *session)
-{
-  const struct TransportSynMessage *scm;
-  struct GNUNET_TIME_Absolute ts;
-  struct NeighbourMapEntry *n;
-
-  (void) session;
-  if (ntohs (message->size) != sizeof(struct TransportSynMessage))
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_STATISTICS_update (GST_stats,
-                            gettext_noop
-                              ("# SYN_ACK messages received"),
-                            1, GNUNET_NO);
-  scm = (const struct TransportSynMessage *) message;
-  GNUNET_break_op (ntohl (scm->reserved) == 0);
-  if (NULL == (n = lookup_neighbour (&address->peer)))
-  {
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop
-                                ("# unexpected SYN_ACK messages (no peer)"),
-                              1, GNUNET_NO);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received SYN_ACK message from peer `%s' in state %s/%s\n",
-              GNUNET_i2s (&address->peer),
-              GNUNET_TRANSPORT_ps2s (n->state),
-              print_ack_state (n->ack_state));
-  ts = GNUNET_TIME_absolute_ntoh (scm->timestamp);
-  switch (n->state)
-  {
-  case GNUNET_TRANSPORT_PS_NOT_CONNECTED:
-    GNUNET_break (0);
-    free_neighbour (n);
-    return GNUNET_SYSERR;
-
-  case GNUNET_TRANSPORT_PS_INIT_ATS:
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop (
-                                "# unexpected SYN_ACK messages (not ready)"),
-                              1,
-                              GNUNET_NO);
-    break;
-
-  case GNUNET_TRANSPORT_PS_SYN_SENT:
-    if (ts.abs_value_us != n->primary_address.connect_timestamp.abs_value_us)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "SYN_ACK ignored as the timestamp does not match our SYN request\n");
-      return GNUNET_OK;
-    }
-    set_state_and_timeout (n,
-                           GNUNET_TRANSPORT_PS_CONNECTED,
-                           GNUNET_TIME_relative_to_absolute (
-                             GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT));
-    set_primary_address (n,
-                         n->primary_address.address,
-                         n->primary_address.session,
-                         n->primary_address.bandwidth_in,
-                         n->primary_address.bandwidth_out);
-    send_session_ack_message (n);
-    break;
-
-  case GNUNET_TRANSPORT_PS_SYN_RECV_ATS:
-  case GNUNET_TRANSPORT_PS_SYN_RECV_ACK:
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop (
-                                "# unexpected SYN_ACK messages (not ready)"),
-                              1,
-                              GNUNET_NO);
-    break;
-
-  case GNUNET_TRANSPORT_PS_CONNECTED:
-    /* duplicate SYN_ACK, let's answer by duplicate ACK just in case */
-    send_session_ack_message (n);
-    break;
-
-  case GNUNET_TRANSPORT_PS_RECONNECT_ATS:
-    /* we didn't expect any SYN_ACK, as we are waiting for ATS
-       to give us a new address... */
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop (
-                                "# unexpected SYN_ACK messages (waiting on ATS)"),
-                              1,
-                              GNUNET_NO);
-    break;
-
-  case GNUNET_TRANSPORT_PS_RECONNECT_SENT:
-    /* Reconnecting with new address address worked; go back to connected! */
-    set_state_and_timeout (n,
-                           GNUNET_TRANSPORT_PS_CONNECTED,
-                           GNUNET_TIME_relative_to_absolute (
-                             GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT));
-    send_session_ack_message (n);
-    break;
-
-  case GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT:
-    /* new address worked; adopt it and go back to connected! */
-    set_state_and_timeout (n,
-                           GNUNET_TRANSPORT_PS_CONNECTED,
-                           GNUNET_TIME_relative_to_absolute (
-                             GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT));
-    GNUNET_break (GNUNET_NO == n->alternative_address.ats_active);
-
-    /* Set primary addresses */
-    set_primary_address (n,
-                         n->alternative_address.address,
-                         n->alternative_address.session,
-                         n->alternative_address.bandwidth_in,
-                         n->alternative_address.bandwidth_out);
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop (
-                                "# Successful attempts to switch addresses"),
-                              1,
-                              GNUNET_NO);
-
-    GNUNET_HELLO_address_free (n->alternative_address.address);
-    memset (&n->alternative_address,
-            0,
-            sizeof(n->alternative_address));
-    send_session_ack_message (n);
-    break;
-
-  case GNUNET_TRANSPORT_PS_DISCONNECT:
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop
-                                ("# unexpected SYN_ACK messages (disconnecting)"),
-                              1, GNUNET_NO);
-    return GNUNET_SYSERR;
-
-  case GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED:
-    GNUNET_assert (0);
-    break;
-
-  default:
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unhandled state `%s'\n",
-                GNUNET_TRANSPORT_ps2s (n->state));
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * A session was terminated. Take note; if needed, try to get
- * an alternative address from ATS.
- *
- * @param peer identity of the peer where the session died
- * @param session session that is gone
- * @return #GNUNET_YES if this was a session used, #GNUNET_NO if
- *        this session was not in use
- */
-int
-GST_neighbours_session_terminated (const struct GNUNET_PeerIdentity *peer,
-                                   struct GNUNET_ATS_Session *session)
-{
-  struct NeighbourMapEntry *n;
-
-  if (NULL == (n = lookup_neighbour (peer)))
-    return GNUNET_NO; /* can't affect us */
-  if (session != n->primary_address.session)
-  {
-    /* Free alternative address */
-    if (session == n->alternative_address.session)
-    {
-      if (GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT == n->state)
-        set_state_and_timeout (n,
-                               GNUNET_TRANSPORT_PS_CONNECTED,
-                               n->timeout);
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Session died, cleaning up alternative address\n");
-      free_address (&n->alternative_address);
-    }
-    return GNUNET_NO;   /* doesn't affect us further */
-  }
-
-  n->expect_latency_response = GNUNET_NO;
-  /* The session for neighbour's primary address died */
-  switch (n->state)
-  {
-  case GNUNET_TRANSPORT_PS_NOT_CONNECTED:
-    GNUNET_break (0);
-    free_neighbour (n);
-    return GNUNET_YES;
-
-  case GNUNET_TRANSPORT_PS_INIT_ATS:
-    GNUNET_break (0);
-    free_neighbour (n);
-    return GNUNET_YES;
-
-  case GNUNET_TRANSPORT_PS_SYN_SENT:
-    /* The session used to send the SYN terminated:
-     * this implies a connect error*/
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Failed to send SYN in CONNECT_SENT with `%s' %p: session terminated\n",
-                GST_plugins_a2s (n->primary_address.address),
-                n->primary_address.session);
-
-    /* Destroy the address since it cannot be used */
-    unset_primary_address (n);
-    set_state_and_timeout (n,
-                           GNUNET_TRANSPORT_PS_INIT_ATS,
-                           GNUNET_TIME_relative_to_absolute (
-                             ATS_RESPONSE_TIMEOUT));
-    break;
-
-  case GNUNET_TRANSPORT_PS_SYN_RECV_ATS:
-  case GNUNET_TRANSPORT_PS_SYN_RECV_ACK:
-    /* error on inbound session; free neighbour entirely */
-    free_neighbour (n);
-    return GNUNET_YES;
-
-  case GNUNET_TRANSPORT_PS_CONNECTED:
-    /* Our primary connection died, try a fast reconnect */
-    unset_primary_address (n);
-    set_state_and_timeout (n,
-                           GNUNET_TRANSPORT_PS_RECONNECT_ATS,
-                           GNUNET_TIME_relative_to_absolute (
-                             ATS_RESPONSE_TIMEOUT));
-    break;
-
-  case GNUNET_TRANSPORT_PS_RECONNECT_ATS:
-    /* we don't have an address, how can it go down? */
-    GNUNET_break (0);
-    break;
-
-  case GNUNET_TRANSPORT_PS_RECONNECT_SENT:
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Failed to send SYN in RECONNECT_SENT with `%s' %p: session terminated\n",
-                GST_plugins_a2s (n->primary_address.address),
-                n->primary_address.session);
-    /* Destroy the address since it cannot be used */
-    unset_primary_address (n);
-    set_state_and_timeout (n,
-                           GNUNET_TRANSPORT_PS_RECONNECT_ATS,
-                           GNUNET_TIME_relative_to_absolute (
-                             ATS_RESPONSE_TIMEOUT));
-    break;
-
-  case GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT:
-    /* primary went down while we were waiting for SYN_ACK on secondary;
-       secondary as primary */
-
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Connection `%s' %p to peer `%s' was terminated while switching, "
-                "switching to alternative address `%s' %p\n",
-                GST_plugins_a2s (n->primary_address.address),
-                n->primary_address.session,
-                GNUNET_i2s (peer),
-                GST_plugins_a2s (n->alternative_address.address),
-                n->alternative_address.session);
-
-    /* Destroy the inbound address since it cannot be used */
-    free_address (&n->primary_address);
-    n->primary_address = n->alternative_address;
-    GNUNET_assert (GNUNET_YES ==
-                   GST_ats_is_known (n->primary_address.address,
-                                     n->primary_address.session));
-    memset (&n->alternative_address,
-            0,
-            sizeof(struct NeighbourAddress));
-    set_state_and_timeout (n,
-                           GNUNET_TRANSPORT_PS_RECONNECT_SENT,
-                           GNUNET_TIME_relative_to_absolute (
-                             FAST_RECONNECT_TIMEOUT));
-    break;
-
-  case GNUNET_TRANSPORT_PS_DISCONNECT:
-    unset_primary_address (n);
-    break;
-
-  case GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED:
-    /* neighbour was freed and plugins told to terminate session */
-    return GNUNET_NO;
-
-  default:
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unhandled state `%s'\n",
-                GNUNET_TRANSPORT_ps2s (n->state));
-    GNUNET_break (0);
-    break;
-  }
-  if (NULL != n->task)
-    GNUNET_SCHEDULER_cancel (n->task);
-  n->task = GNUNET_SCHEDULER_add_now (&master_task, n);
-  return GNUNET_YES;
-}
-
-
-/**
- * We received a 'ACK' message from the other peer.
- * If we sent a 'SYN_ACK' last, this means we are now
- * connected.  Otherwise, do nothing.
- *
- * @param message possibly a 'struct GNUNET_ATS_SessionConnectMessage' (check format)
- * @param address address of the other peer
- * @param session session to use (or NULL)
- * @return #GNUNET_OK if the message was fine, #GNUNET_SYSERR on serious error
- */
-int
-GST_neighbours_handle_session_ack (const struct GNUNET_MessageHeader *message,
-                                   const struct GNUNET_HELLO_Address *address,
-                                   struct GNUNET_ATS_Session *session)
-{
-  struct NeighbourMapEntry *n;
-
-  (void) session;
-  if (ntohs (message->size) != sizeof(struct GNUNET_MessageHeader))
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_STATISTICS_update (GST_stats,
-                            gettext_noop ("# ACK messages received"),
-                            1,
-                            GNUNET_NO);
-  if (NULL == (n = lookup_neighbour (&address->peer)))
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received ACK for peer `%s' in state %s/%s\n",
-              GNUNET_i2s (&address->peer),
-              GNUNET_TRANSPORT_ps2s (n->state),
-              print_ack_state (n->ack_state));
-
-  /* Check if we are in a plausible state for having sent
-     a SYN_ACK.  If not, return, otherwise break.
-
-     The remote peers sends a ACK as a response for a SYN_ACK
-     message.
-
-     We expect a ACK:
-     - If a remote peer has sent a SYN, we responded with a SYN_ACK and
-     now wait for the ACK to finally be connected
-     - If we sent a SYN_ACK to this peer before */if (((GNUNET_TRANSPORT_PS_SYN_RECV_ACK != n->state) &&
-       (ACK_SEND_ACK != n->ack_state)) ||
-      (NULL == n->primary_address.address))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Received unexpected ACK message from peer `%s' in state %s/%s\n",
-                GNUNET_i2s (&address->peer),
-                GNUNET_TRANSPORT_ps2s (n->state),
-                print_ack_state (n->ack_state));
-
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop ("# unexpected ACK messages"),
-                              1,
-                              GNUNET_NO);
-    return GNUNET_OK;
-  }
-  if (GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT == n->state)
-  {
-    /* We tried to switch addresses while being connect. We explicitly wait
-     * for a SYN_ACK before going to GNUNET_TRANSPORT_PS_CONNECTED,
-     * so we do not want to set the address as in use! */
-    return GNUNET_OK;
-  }
-  set_state_and_timeout (n,
-                         GNUNET_TRANSPORT_PS_CONNECTED,
-                         GNUNET_TIME_relative_to_absolute (
-                           GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT));
-
-  if (NULL == n->primary_address.address)
-  {
-    /* See issue #3693.
-     * We are in state = PSY_SYN_RECV_ACK or ack_state = ACK_SEND_ACK, which
-     * really means we did try (and succeed) to send a SYN and are waiting for
-     * an ACK.
-     * That suggests that the primary_address used to be non-NULL, but maybe it
-     * got reset to NULL without the state being changed appropriately?
-     */GNUNET_break (0);
-    return GNUNET_OK;
-  }
-
-  /* Reset backoff for primary address */
-  GST_ats_block_reset (n->primary_address.address,
-                       n->primary_address.session);
-  return GNUNET_OK;
-}
-
-
-/**
- * Test if we're connected to the given peer.
- *
- * @param target peer to test
- * @return #GNUNET_YES if we are connected, #GNUNET_NO if not
- */
-int
-GST_neighbours_test_connected (const struct GNUNET_PeerIdentity *target)
-{
-  return test_connected (lookup_neighbour (target));
-}
-
-
-/**
- * Task to asynchronously run #free_neighbour().
- *
- * @param cls the `struct NeighbourMapEntry` to free
- */
-static void
-delayed_disconnect (void *cls)
-{
-  struct NeighbourMapEntry *n = cls;
-
-  n->delayed_disconnect_task = NULL;
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Disconnecting by request from peer %s\n",
-              GNUNET_i2s (&n->id));
-  free_neighbour (n);
-}
-
-
-/**
- * We received a quota message from the given peer,
- * validate and process.
- *
- * @param peer sender of the message
- * @param msg the quota message
- */
-void
-GST_neighbours_handle_quota_message (const struct GNUNET_PeerIdentity *peer,
-                                     const struct GNUNET_MessageHeader *msg)
-{
-  struct NeighbourMapEntry *n;
-  const struct GNUNET_ATS_SessionQuotaMessage *sqm;
-  struct GNUNET_BANDWIDTH_Value32NBO last;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received QUOTA message from peer `%s'\n",
-              GNUNET_i2s (peer));
-  if (ntohs (msg->size) != sizeof(struct GNUNET_ATS_SessionQuotaMessage))
-  {
-    GNUNET_break_op (0);
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop (
-                                "# quota messages ignored (malformed)"),
-                              1,
-                              GNUNET_NO);
-    return;
-  }
-  GNUNET_STATISTICS_update (GST_stats,
-                            gettext_noop
-                              ("# QUOTA messages received"),
-                            1, GNUNET_NO);
-  sqm = (const struct GNUNET_ATS_SessionQuotaMessage *) msg;
-  if (NULL == (n = lookup_neighbour (peer)))
-  {
-    /* gone already */
-    return;
-  }
-  last = GNUNET_BANDWIDTH_value_max (GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT,
-                                     GNUNET_BANDWIDTH_value_init (ntohl (
-                                                                    sqm->quota)));
-  if (last.value__ != n->neighbour_receive_quota.value__)
-  {
-    n->neighbour_receive_quota = last;
-    send_outbound_quota_to_clients (n);
-  }
-}
-
-
-/**
- * We received a disconnect message from the given peer,
- * validate and process.
- *
- * @param peer sender of the message
- * @param msg the disconnect message
- */
-void
-GST_neighbours_handle_disconnect_message (const struct
-                                          GNUNET_PeerIdentity *peer,
-                                          const struct
-                                          GNUNET_MessageHeader *msg)
-{
-  struct NeighbourMapEntry *n;
-  const struct GNUNET_ATS_SessionDisconnectMessage *sdm;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received DISCONNECT message from peer `%s'\n",
-              GNUNET_i2s (peer));
-  if (ntohs (msg->size) != sizeof(struct GNUNET_ATS_SessionDisconnectMessage))
-  {
-    GNUNET_break_op (0);
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop
-                                ("# disconnect messages ignored (malformed)"),
-                              1,
-                              GNUNET_NO);
-    return;
-  }
-  GNUNET_STATISTICS_update (GST_stats,
-                            gettext_noop
-                              ("# DISCONNECT messages received"),
-                            1, GNUNET_NO);
-  sdm = (const struct GNUNET_ATS_SessionDisconnectMessage *) msg;
-  if (NULL == (n = lookup_neighbour (peer)))
-  {
-    /* gone already */
-    return;
-  }
-  if (GNUNET_TIME_absolute_ntoh (sdm->timestamp).abs_value_us <=
-      n->connect_ack_timestamp.abs_value_us)
-  {
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop (
-                                "# disconnect messages ignored (timestamp)"),
-                              1,
-                              GNUNET_NO);
-    return;
-  }
-  if (0 != memcmp (peer,
-                   &sdm->public_key,
-                   sizeof(struct GNUNET_PeerIdentity)))
-  {
-    GNUNET_break_op (0);
-    return;
-  }
-  if (ntohl (sdm->purpose.size) !=
-      sizeof(struct GNUNET_CRYPTO_EccSignaturePurpose)
-      + sizeof(struct GNUNET_CRYPTO_EddsaPublicKey)
-      + sizeof(struct GNUNET_TIME_AbsoluteNBO))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "DISCONNECT message from peer `%s' has invalid size\n",
-                GNUNET_i2s (peer));
-    GNUNET_break_op (0);
-    return;
-  }
-  if (GNUNET_OK !=
-      GNUNET_CRYPTO_eddsa_verify_ (
-        GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT,
-        &sdm->purpose,
-        &sdm->signature,
-        &sdm->public_key))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "DISCONNECT message from peer `%s' cannot be verified \n",
-                GNUNET_i2s (peer));
-    GNUNET_break_op (0);
-    return;
-  }
-  if (NULL == n->delayed_disconnect_task)
-  {
-    n->delayed_disconnect_task = GNUNET_SCHEDULER_add_now (&delayed_disconnect,
-                                                           n);
-  }
-}
-
-
-/**
- * Closure for the #neighbours_iterate() function.
- */
-struct IteratorContext
-{
-  /**
-   * Function to call on each connected neighbour.
-   */
-  GST_NeighbourIterator cb;
-
-  /**
-   * Closure for @e cb.
-   */
-  void *cb_cls;
-};
-
-
-/**
- * Call the callback from the closure for each neighbour.
- *
- * @param cls the `struct IteratorContext`
- * @param key the hash of the public key of the neighbour
- * @param value the `struct NeighbourMapEntry`
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-neighbours_iterate (void *cls,
-                    const struct GNUNET_PeerIdentity *key,
-                    void *value)
-{
-  struct IteratorContext *ic = cls;
-  struct NeighbourMapEntry *n = value;
-  struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in;
-  struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out;
-
-  (void) key;
-  if (NULL != n->primary_address.address)
-  {
-    bandwidth_in = n->primary_address.bandwidth_in;
-    bandwidth_out = n->primary_address.bandwidth_out;
-  }
-  else
-  {
-    bandwidth_in = GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT;
-    bandwidth_out = GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT;
-  }
-  ic->cb (ic->cb_cls,
-          &n->id,
-          n->primary_address.address,
-          n->state,
-          n->timeout,
-          bandwidth_in, bandwidth_out);
-  return GNUNET_OK;
-}
-
-
-/**
- * Iterate over all connected neighbours.
- *
- * @param cb function to call
- * @param cb_cls closure for @a cb
- */
-void
-GST_neighbours_iterate (GST_NeighbourIterator cb,
-                        void *cb_cls)
-{
-  struct IteratorContext ic;
-
-  if (NULL == neighbours)
-    return; /* can happen during shutdown */
-  ic.cb = cb;
-  ic.cb_cls = cb_cls;
-  GNUNET_CONTAINER_multipeermap_iterate (neighbours,
-                                         &neighbours_iterate,
-                                         &ic);
-}
-
-
-/**
- * If we have an active connection to the given target, it must be shutdown.
- *
- * @param target peer to disconnect from
- */
-void
-GST_neighbours_force_disconnect (const struct GNUNET_PeerIdentity *target)
-{
-  struct NeighbourMapEntry *n;
-
-  if (NULL == (n = lookup_neighbour (target)))
-    return;  /* not active */
-  if (GNUNET_YES == test_connected (n))
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop (
-                                "# disconnected from peer upon explicit request"),
-                              1,
-                              GNUNET_NO);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Forced disconnect from peer %s\n",
-              GNUNET_i2s (target));
-  disconnect_neighbour (n);
-}
-
-
-/**
- * Obtain current address information for the given neighbour.
- *
- * @param peer
- * @return address currently used
- */
-const struct GNUNET_HELLO_Address *
-GST_neighbour_get_current_address (const struct GNUNET_PeerIdentity *peer)
-{
-  struct NeighbourMapEntry *n;
-
-  n = lookup_neighbour (peer);
-  if (NULL == n)
-    return NULL;
-  return n->primary_address.address;
-}
-
-
-/**
- * Initialize the neighbours subsystem.
- *
- * @param max_fds maximum number of fds to use
- */
-void
-GST_neighbours_start (unsigned int max_fds)
-{
-  (void) max_fds;
-  neighbours = GNUNET_CONTAINER_multipeermap_create (NEIGHBOUR_TABLE_SIZE,
-                                                     GNUNET_NO);
-  util_transmission_tk = GNUNET_SCHEDULER_add_delayed (
-    UTIL_TRANSMISSION_INTERVAL,
-    &utilization_transmission,
-    NULL);
-}
-
-
-/**
- * Disconnect from the given neighbour.
- *
- * @param cls unused
- * @param key hash of neighbour's public key (not used)
- * @param value the `struct NeighbourMapEntry` of the neighbour
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-disconnect_all_neighbours (void *cls,
-                           const struct GNUNET_PeerIdentity *key,
-                           void *value)
-{
-  struct NeighbourMapEntry *n = value;
-
-  (void) cls;
-  (void) key;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Disconnecting peer `%4s' during shutdown\n",
-              GNUNET_i2s (&n->id));
-  free_neighbour (n);
-  return GNUNET_OK;
-}
-
-
-/**
- * Cleanup the neighbours subsystem.
- */
-void
-GST_neighbours_stop ()
-{
-  if (NULL == neighbours)
-    return;
-  if (NULL != util_transmission_tk)
-  {
-    GNUNET_SCHEDULER_cancel (util_transmission_tk);
-    util_transmission_tk = NULL;
-  }
-  GNUNET_CONTAINER_multipeermap_iterate (neighbours,
-                                         &disconnect_all_neighbours,
-                                         NULL);
-  GNUNET_CONTAINER_multipeermap_destroy (neighbours);
-  neighbours = NULL;
-}
-
-
-/* end of file gnunet-service-transport_neighbours.c */
diff --git a/src/transport/gnunet-service-transport_neighbours.h b/src/transport/gnunet-service-transport_neighbours.h
deleted file mode 100644
index 13aeab4e6..000000000
--- a/src/transport/gnunet-service-transport_neighbours.h
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2010-2015 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/gnunet-service-transport_neighbours.h
- * @brief neighbour management API
- * @author Christian Grothoff
- */
-#ifndef GNUNET_SERVICE_TRANSPORT_NEIGHBOURS_H
-#define GNUNET_SERVICE_TRANSPORT_NEIGHBOURS_H
-
-#include "gnunet_statistics_service.h"
-#include "gnunet_transport_service.h"
-#include "gnunet_transport_plugin.h"
-#include "gnunet-service-transport.h"
-#include "transport.h"
-#include "gnunet_util_lib.h"
-
-
-/**
- * Initialize the neighbours subsystem.
- *
- * @param max_fds maximum number of fds to use
- */
-void
-GST_neighbours_start (unsigned int max_fds);
-
-
-/**
- * Cleanup the neighbours subsystem.
- */
-void
-GST_neighbours_stop (void);
-
-
-/**
- * Test if we're connected to the given peer.
- *
- * @param target peer to test
- * @return #GNUNET_YES if we are connected, #GNUNET_NO if not
- */
-int
-GST_neighbours_test_connected (const struct GNUNET_PeerIdentity *target);
-
-
-/**
- * Function called after the transmission is done.
- *
- * @param cls closure
- * @param success #GNUNET_OK on success, #GNUNET_NO on failure, #GNUNET_SYSERR if we're not connected
- * @param bytes_payload how much payload was transmitted
- * @param bytes_on_wire how many bytes were used on the wire
- */
-typedef void
-(*GST_NeighbourSendContinuation) (void *cls,
-                                  int success,
-                                  size_t bytes_payload,
-                                  size_t bytes_on_wire);
-
-
-/**
- * Transmit a message to the given target using the active connection.
- *
- * @param target destination
- * @param msg message to send
- * @param msg_size number of bytes in @a msg
- * @param timeout when to fail with timeout
- * @param cont function to call when done
- * @param cont_cls closure for @a cont
- */
-void
-GST_neighbours_send (const struct GNUNET_PeerIdentity *target,
-                     const void *msg,
-                     size_t msg_size,
-                     struct GNUNET_TIME_Relative timeout,
-                     GST_NeighbourSendContinuation cont, void *cont_cls);
-
-
-/**
- * We have received a message from the given sender.
- * How long should we delay before receiving more?
- * (Also used to keep the peer marked as live).
- *
- * @param sender sender of the message
- * @param size size of the message
- * @param do_forward set to #GNUNET_YES if the message should be forwarded to clients
- *                   #GNUNET_NO if the neighbour is not connected or violates the quota
- * @return how long to wait before reading more from this sender
- */
-struct GNUNET_TIME_Relative
-GST_neighbours_calculate_receive_delay (const struct
-                                        GNUNET_PeerIdentity *sender,
-                                        ssize_t size,
-                                        int *do_forward);
-
-
-/**
- * Keep the connection to the given neighbour alive longer,
- * we received a KEEPALIVE (or equivalent); send a response.
- *
- * @param neighbour neighbour to keep alive (by sending keep alive response)
- * @param m the keep alive message containing the nonce to respond to
- */
-void
-GST_neighbours_keepalive (const struct GNUNET_PeerIdentity *neighbour,
-                          const struct GNUNET_MessageHeader *m);
-
-
-/**
- * We received a KEEP_ALIVE_RESPONSE message and use this to calculate
- * latency to this peer.  Pass the updated information (existing ats
- * plus calculated latency) to ATS.
- *
- * @param neighbour neighbour to keep alive
- * @param m the message containing the keep alive response
- */
-void
-GST_neighbours_keepalive_response (const struct GNUNET_PeerIdentity *neighbour,
-                                   const struct GNUNET_MessageHeader *m);
-
-
-/**
- * If we have an active connection to the given target, it must be shutdown.
- *
- * @param target peer to disconnect from
- */
-void
-GST_neighbours_force_disconnect (const struct GNUNET_PeerIdentity *target);
-
-
-/**
- * Function called for each neighbour.
- *
- * @param cls closure
- * @param peer identity of the neighbour
- * @param address the address of the neighbour
- * @param state current state the peer is in
- * @param state_timeout timeout for this state
- * @param bandwidth_in inbound quota in NBO
- * @param bandwidth_out outbound quota in NBO
- */
-typedef void
-(*GST_NeighbourIterator) (void *cls,
-                          const struct GNUNET_PeerIdentity *peer,
-                          const struct GNUNET_HELLO_Address *address,
-                          enum GNUNET_TRANSPORT_PeerState state,
-                          struct GNUNET_TIME_Absolute state_timeout,
-                          struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
-                          struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out);
-
-
-/**
- * Iterate over all connected neighbours.
- *
- * @param cb function to call
- * @param cb_cls closure for @a cb
- */
-void
-GST_neighbours_iterate (GST_NeighbourIterator cb, void *cb_cls);
-
-
-/**
- * A session was terminated. Take note.
- *
- * @param peer identity of the peer where the session died
- * @param session session that is gone
- * @return #GNUNET_YES if this was a session used, #GNUNET_NO if
- *        this session was not in use
- */
-int
-GST_neighbours_session_terminated (const struct GNUNET_PeerIdentity *peer,
-                                   struct GNUNET_ATS_Session *session);
-
-
-/**
- * Track information about data we received from the
- * given address (used to notify ATS about our utilization
- * of allocated resources).
- *
- * @param address the address we got data from
- * @param message the message we received (really only the size is used)
- */
-void
-GST_neighbours_notify_data_recv (const struct GNUNET_HELLO_Address *address,
-                                 const struct GNUNET_MessageHeader *message);
-
-
-/**
- * Track information about data we transmitted using the given @a
- * address and @a session (used to notify ATS about our utilization of
- * allocated resources).
- *
- * @param address the address we transmitted data to
- * @param session session we used to transmit data
- * @param message the message we sent (really only the size is used)
- */
-void
-GST_neighbours_notify_data_sent (const struct GNUNET_HELLO_Address *address,
-                                 struct GNUNET_ATS_Session *session,
-                                 size_t size);
-
-
-/**
- * For an existing neighbour record, set the active connection to
- * use the given address.
- *
- * @param address address of the other peer to start using
- * @param session session to use (or NULL)
- * @param bandwidth_in inbound quota to be used when connection is up
- * @param bandwidth_out outbound quota to be used when connection is up
- */
-void
-GST_neighbours_switch_to_address (const struct GNUNET_HELLO_Address *address,
-                                  struct GNUNET_ATS_Session *session,
-                                  struct GNUNET_BANDWIDTH_Value32NBO
-                                  bandwidth_in,
-                                  struct GNUNET_BANDWIDTH_Value32NBO
-                                  bandwidth_out);
-
-
-/**
- * We received a 'SESSION_CONNECT' message from the other peer.
- * Consider switching to it.
- *
- * @param message possibly a 'struct GNUNET_ATS_SessionConnectMessage' (check format)
- * @param peer identity of the peer to switch the address for
- * @return #GNUNET_OK if the message was fine, #GNUNET_SYSERR on serious error
- */
-int
-GST_neighbours_handle_session_syn (const struct GNUNET_MessageHeader *message,
-                                   const struct GNUNET_PeerIdentity *peer);
-
-
-/**
- * We received a 'SESSION_CONNECT_ACK' message from the other peer.
- * Consider switching to it.
- *
- * @param message possibly a `struct GNUNET_ATS_SessionConnectMessage` (check format)
- * @param address address of the other peer
- * @param session session to use (or NULL)
- * @return #GNUNET_OK if the message was fine, #GNUNET_SYSERR on serious error
- */
-int
-GST_neighbours_handle_session_syn_ack (const struct
-                                       GNUNET_MessageHeader *message,
-                                       const struct
-                                       GNUNET_HELLO_Address *address,
-                                       struct GNUNET_ATS_Session *session);
-
-
-/**
- * We received a 'SESSION_ACK' message from the other peer.
- * If we sent a 'CONNECT_ACK' last, this means we are now
- * connected.  Otherwise, do nothing.
- *
- * @param message possibly a 'struct GNUNET_ATS_SessionConnectMessage' (check format)
- * @param address address of the other peer
- * @param session session to use (or NULL)
- * @return #GNUNET_OK if the message was fine, #GNUNET_SYSERR on serious error
- */
-int
-GST_neighbours_handle_session_ack (const struct GNUNET_MessageHeader *message,
-                                   const struct GNUNET_HELLO_Address *address,
-                                   struct GNUNET_ATS_Session *session);
-
-
-/**
- * Obtain current address information for the given neighbour.
- *
- * @param peer
- * @return address currently used
- */
-const struct GNUNET_HELLO_Address *
-GST_neighbour_get_current_address (const struct GNUNET_PeerIdentity *peer);
-
-
-/**
- * We received a quoat message from the given peer,
- * validate and process.
- *
- * @param peer sender of the message
- * @param msg the quota message
- */
-void
-GST_neighbours_handle_quota_message (const struct GNUNET_PeerIdentity *peer,
-                                     const struct GNUNET_MessageHeader *msg);
-
-
-/**
- * We received a disconnect message from the given peer,
- * validate and process.
- *
- * @param peer sender of the message
- * @param msg the disconnect message
- */
-void
-GST_neighbours_handle_disconnect_message (const struct
-                                          GNUNET_PeerIdentity *peer,
-                                          const struct
-                                          GNUNET_MessageHeader *msg);
-
-
-#endif
-/* end of file gnunet-service-transport_neighbours.h */
diff --git a/src/transport/gnunet-service-transport_plugins.c b/src/transport/gnunet-service-transport_plugins.c
deleted file mode 100644
index c88532806..000000000
--- a/src/transport/gnunet-service-transport_plugins.c
+++ /dev/null
@@ -1,456 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2010-2014 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/gnunet-service-transport_plugins.c
- * @brief plugin management
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "gnunet-service-transport.h"
-#include "gnunet-service-transport_hello.h"
-#include "gnunet-service-transport_ats.h"
-#include "gnunet-service-transport_plugins.h"
-
-/**
- * Entry in doubly-linked list of all of our plugins.
- */
-struct TransportPlugin
-{
-  /**
-   * This is a doubly-linked list.
-   */
-  struct TransportPlugin *next;
-
-  /**
-   * This is a doubly-linked list.
-   */
-  struct TransportPlugin *prev;
-
-  /**
-   * API of the transport as returned by the plugin's
-   * initialization function.
-   */
-  struct GNUNET_TRANSPORT_PluginFunctions *api;
-
-  /**
-   * Short name for the plugin (e.g. "tcp").
-   */
-  char *short_name;
-
-  /**
-   * Name of the library (e.g. "gnunet_plugin_transport_tcp").
-   */
-  char *lib_name;
-
-  /**
-   * Environment this transport service is using
-   * for this plugin.
-   */
-  struct GNUNET_TRANSPORT_PluginEnvironment env;
-};
-
-/**
- * Head of DLL of all loaded plugins.
- */
-static struct TransportPlugin *plugins_head;
-
-/**
- * Head of DLL of all loaded plugins.
- */
-static struct TransportPlugin *plugins_tail;
-
-
-/**
- * Function that will be called to update metrics for an address
- *
- * @param cls closure
- * @param address address to update metrics for
- * @param session the session
- * @param distance new distance
- */
-static void
-plugin_env_update_distance (void *cls,
-                            const struct GNUNET_HELLO_Address *address,
-                            uint32_t distance)
-{
-  GST_ats_update_distance (address,
-                           distance);
-}
-
-
-/**
- * Function that will be called to figure if an address is an loopback,
- * LAN, WAN etc. address
- *
- * @param cls closure
- * @param addr binary address
- * @param addrlen length of the @a addr
- * @return type of the network @a addr belongs to
- */
-static enum GNUNET_NetworkType
-plugin_env_address_to_type (void *cls,
-                            const struct sockaddr *addr,
-                            size_t addrlen)
-{
-  if (NULL == GST_is)
-  {
-    GNUNET_break (0);
-    return GNUNET_NT_UNSPECIFIED;
-  }
-  return GNUNET_NT_scanner_get_type (GST_is,
-                                     addr,
-                                     addrlen);
-}
-
-
-/**
- * Load and initialize all plugins.  The respective functions will be
- * invoked by the plugins when the respective events happen.  The
- * closure will be set to a 'const char*' containing the name of the
- * plugin that caused the call.
- *
- * @param recv_cb function to call when data is received
- * @param address_cb function to call when our public addresses changed
- * @param session_start_cb function to call when a session was created
- * @param session_end_cb function to call when a session was terminated
- * @param address_type_cb function to call when a address type is requested
- */
-void
-GST_plugins_load (GNUNET_TRANSPORT_PluginReceiveCallback recv_cb,
-                  GNUNET_TRANSPORT_AddressNotification address_cb,
-                  GNUNET_TRANSPORT_SessionStart session_start_cb,
-                  GNUNET_TRANSPORT_SessionEnd session_end_cb)
-{
-  struct TransportPlugin *plug;
-  struct TransportPlugin *next;
-  unsigned long long tneigh;
-  char *libname;
-  char *plugs;
-  char *pos;
-  int fail;
-
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (GST_cfg,
-                                             "TRANSPORT",
-                                             "NEIGHBOUR_LIMIT",
-                                             &tneigh))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _ ("Transport service is lacking NEIGHBOUR_LIMIT option.\n"));
-    return;
-  }
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (GST_cfg,
-                                             "TRANSPORT",
-                                             "PLUGINS",
-                                             &plugs))
-    return;
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              _ ("Starting transport plugins `%s'\n"),
-              plugs);
-  for (pos = strtok (plugs, " "); pos != NULL; pos = strtok (NULL, " "))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                _ ("Loading `%s' transport plugin\n"),
-                pos);
-    GNUNET_asprintf (&libname,
-                     "libgnunet_plugin_transport_%s",
-                     pos);
-    plug = GNUNET_new (struct TransportPlugin);
-    plug->short_name = GNUNET_strdup (pos);
-    plug->lib_name = libname;
-    plug->env.cfg = GST_cfg;
-    plug->env.my_identity = &GST_my_identity;
-    plug->env.get_our_hello = &GST_hello_get;
-    plug->env.cls = plug->short_name;
-    plug->env.receive = recv_cb;
-    plug->env.notify_address = address_cb;
-    plug->env.session_start = session_start_cb;
-    plug->env.session_end = session_end_cb;
-    plug->env.get_address_type = &plugin_env_address_to_type;
-    plug->env.update_address_distance = &plugin_env_update_distance;
-    plug->env.max_connections = tneigh;
-    plug->env.stats = GST_stats;
-    GNUNET_CONTAINER_DLL_insert (plugins_head,
-                                 plugins_tail,
-                                 plug);
-  }
-  GNUNET_free (plugs);
-  next = plugins_head;
-  while (NULL != next)
-  {
-    plug = next;
-    next = plug->next;
-    plug->api = GNUNET_PLUGIN_load (plug->lib_name,
-                                    &plug->env);
-    if (NULL == plug->api)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _ ("Failed to load transport plugin for `%s'\n"),
-                  plug->lib_name);
-      GNUNET_CONTAINER_DLL_remove (plugins_head,
-                                   plugins_tail,
-                                   plug);
-      GNUNET_free (plug->short_name);
-      GNUNET_free (plug->lib_name);
-      GNUNET_free (plug);
-      continue;
-    }
-    fail = GNUNET_NO;
-    if (NULL == plug->api->address_pretty_printer)
-    {
-      fail = GNUNET_YES;
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _ ("Missing function `%s' in transport plugin for `%s'\n"),
-                  "address_pretty_printer",
-                  plug->lib_name);
-    }
-    if (NULL == plug->api->address_to_string)
-    {
-      fail = GNUNET_YES;
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _ ("Missing function `%s' in transport plugin for `%s'\n"),
-                  "address_to_string",
-                  plug->lib_name);
-    }
-    if (NULL == plug->api->string_to_address)
-    {
-      fail = GNUNET_YES;
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _ ("Missing function `%s' in transport plugin for `%s'\n"),
-                  "string_to_address",
-                  plug->lib_name);
-    }
-    if (NULL == plug->api->check_address)
-    {
-      fail = GNUNET_YES;
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _ ("Missing function `%s' in transport plugin for `%s'\n"),
-                  "check_address",
-                  plug->lib_name);
-    }
-    if (NULL == plug->api->get_session)
-    {
-      fail = GNUNET_YES;
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _ ("Missing function `%s' in transport plugin for `%s'\n"),
-                  "get_session",
-                  plug->lib_name);
-    }
-    if (NULL == plug->api->get_network)
-    {
-      fail = GNUNET_YES;
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _ ("Missing function `%s' in transport plugin for `%s'\n"),
-                  "get_network",
-                  plug->lib_name);
-    }
-    if (NULL == plug->api->send)
-    {
-      fail = GNUNET_YES;
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _ ("Missing function `%s' in transport plugin for `%s'\n"),
-                  "send",
-                  plug->lib_name);
-    }
-    if (NULL == plug->api->disconnect_peer)
-    {
-      fail = GNUNET_YES;
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _ ("Missing function `%s' in transport plugin for `%s'\n"),
-                  "disconnect_peer",
-                  plug->lib_name);
-    }
-    if (NULL == plug->api->disconnect_session)
-    {
-      fail = GNUNET_YES;
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _ ("Missing function `%s' in transport plugin for `%s'\n"),
-                  "disconnect_session",
-                  plug->lib_name);
-    }
-    if (NULL == plug->api->query_keepalive_factor)
-    {
-      fail = GNUNET_YES;
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _ ("Missing function `%s' in transport plugin for `%s'\n"),
-                  "query_keepalive_factor",
-                  plug->lib_name);
-    }
-    if (NULL == plug->api->update_session_timeout)
-    {
-      fail = GNUNET_YES;
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _ ("Missing function `%s' in transport plugin for `%s'\n"),
-                  "update_session_timeout",
-                  plug->lib_name);
-    }
-    if (GNUNET_YES == fail)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _ ("Did not load plugin `%s' due to missing functions\n"),
-                  plug->lib_name);
-      GNUNET_break (NULL == GNUNET_PLUGIN_unload (plug->lib_name, plug->api));
-      GNUNET_CONTAINER_DLL_remove (plugins_head,
-                                   plugins_tail,
-                                   plug);
-      GNUNET_free (plug->short_name);
-      GNUNET_free (plug->lib_name);
-      GNUNET_free (plug);
-    }
-  }
-}
-
-
-/**
- * Unload all plugins
- */
-void
-GST_plugins_unload ()
-{
-  struct TransportPlugin *plug;
-
-  while (NULL != (plug = plugins_head))
-  {
-    GNUNET_break (NULL == GNUNET_PLUGIN_unload (plug->lib_name, plug->api));
-    GNUNET_free (plug->lib_name);
-    GNUNET_free (plug->short_name);
-    GNUNET_CONTAINER_DLL_remove (plugins_head, plugins_tail, plug);
-    GNUNET_free (plug);
-  }
-}
-
-
-/**
- * Obtain the plugin API based on a plugin name.
- *
- * @param name name of the plugin
- * @return the plugin's API, NULL if the plugin is not loaded
- */
-struct GNUNET_TRANSPORT_PluginFunctions *
-GST_plugins_find (const char *name)
-{
-  struct TransportPlugin *pos;
-
-  for (pos = plugins_head; NULL != pos; pos = pos->next)
-    if (0 == strcmp (name, pos->short_name))
-      break;
-  if (NULL == pos)
-    return NULL;
-  return pos->api;
-}
-
-
-/**
- * Obtain the plugin API based on a the stripped plugin name after the underscore.
- *
- * Example: GST_plugins_printer_find (http_client) will return all plugins
- * starting with the prefix "http":
- * http_client or server if loaded
- *
- * @param name name of the plugin
- * @return the plugin's API, NULL if the plugin is not loaded
- */
-struct GNUNET_TRANSPORT_PluginFunctions *
-GST_plugins_printer_find (const char *name)
-{
-  struct TransportPlugin *pos;
-  char *stripped = GNUNET_strdup (name);
-  char *sep = strchr (stripped, '_');
-
-  if (NULL != sep)
-    sep[0] = '\0';
-  for (pos = plugins_head; NULL != pos; pos = pos->next)
-    if (pos->short_name == strstr (pos->short_name, stripped))
-      break;
-  GNUNET_free (stripped);
-  if (NULL == pos)
-    return NULL;
-  return pos->api;
-}
-
-
-/**
- * Convert a given address to a human-readable format.  Note that the
- * return value will be overwritten on the next call to this function.
- *
- * @param address the address to convert
- * @return statically allocated (!) human-readable address
- */
-const char *
-GST_plugins_a2s (const struct GNUNET_HELLO_Address *address)
-{
-  struct GNUNET_TRANSPORT_PluginFunctions *api;
-  static char unable_to_show[1024];
-  static const char *s;
-
-  if (NULL == address)
-    return "<NULL>";
-  if (0 == address->address_length)
-    return TRANSPORT_SESSION_INBOUND_STRING; /* Addresse with length 0 are inbound, address->address itself may be NULL */
-  api = GST_plugins_printer_find (address->transport_name);
-  if (NULL == api)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Failed to find transport plugin `%s'\n",
-                address->transport_name);
-    return "<plugin unknown>";
-  }
-  if (0 == address->address_length)
-  {
-    GNUNET_snprintf (unable_to_show,
-                     sizeof(unable_to_show),
-                     "<unable to stringify %u-byte long address of %s transport>",
-                     (unsigned int) address->address_length,
-                     address->transport_name);
-    return unable_to_show;
-  }
-  return(NULL != (s = api->address_to_string (NULL,
-                                              address->address,
-                                              address->address_length))
-         ? s
-         : "<invalid>");
-}
-
-
-/**
- * Register callback with all plugins to monitor their status.
- *
- * @param cb callback to register, NULL to unsubscribe
- * @param cb_cls closure for @a cb
- */
-void
-GST_plugins_monitor_subscribe (GNUNET_TRANSPORT_SessionInfoCallback cb,
-                               void *cb_cls)
-{
-  struct TransportPlugin *pos;
-
-  for (pos = plugins_head; NULL != pos; pos = pos->next)
-    if (NULL == pos->api->setup_monitor)
-      GNUNET_break (0);
-    else
-      pos->api->setup_monitor (pos->api->cls,
-                               cb,
-                               cb_cls);
-}
-
-
-/* end of file gnunet-service-transport_plugins.c */
diff --git a/src/transport/gnunet-service-transport_plugins.h b/src/transport/gnunet-service-transport_plugins.h
deleted file mode 100644
index 0e69da074..000000000
--- a/src/transport/gnunet-service-transport_plugins.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2010,2011 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/gnunet-service-transport_plugins.h
- * @brief plugin management API
- * @author Christian Grothoff
- */
-#ifndef GNUNET_SERVICE_TRANSPORT_PLUGINS_H
-#define GNUNET_SERVICE_TRANSPORT_PLUGINS_H
-
-#include "gnunet_statistics_service.h"
-#include "gnunet_transport_service.h"
-#include "gnunet_transport_plugin.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_hello_lib.h"
-
-
-/**
- * Load and initialize all plugins.  The respective functions will be
- * invoked by the plugins when the respective events happen.  The
- * closure will be set to a 'const char*' containing the name of the
- * plugin that caused the call.
- *
- * @param recv_cb function to call when data is received
- * @param register_quota_cb function to call to register a quota callback
- * @param unregister_quota_cb function to call to unregister a quota callback
- * @param address_cb function to call when our public addresses changed
- * @param session_start_cb function to call when a session was created
- * @param session_end_cb function to call when a session was terminated
- * @param address_type_cb function to call when a address type is requested
- * @param metric_update_cb function to call when address metrics change
- */
-void
-GST_plugins_load (GNUNET_TRANSPORT_PluginReceiveCallback recv_cb,
-                  GNUNET_TRANSPORT_AddressNotification address_cb,
-                  GNUNET_TRANSPORT_SessionStart session_start_cb,
-                  GNUNET_TRANSPORT_SessionEnd session_end_cb);
-
-/**
- * Unload all plugins
- */
-void
-GST_plugins_unload (void);
-
-
-/**
- * Obtain the plugin API based on a plugin name.
- *
- * @param name name of the plugin
- * @return the plugin's API, NULL if the plugin is not loaded
- */
-struct GNUNET_TRANSPORT_PluginFunctions *
-GST_plugins_find (const char *name);
-
-
-/**
- * Obtain the plugin API based on a the stripped plugin name after the underscore.
- *
- * Example: GST_plugins_printer_find (http_client) will return all plugins
- * starting with the prefix "http":
- * http_client or server if loaded
- *
- * @param name name of the plugin
- * @return the plugin's API, NULL if the plugin is not loaded
- */
-struct GNUNET_TRANSPORT_PluginFunctions *
-GST_plugins_printer_find (const char *name);
-
-
-/**
- * Convert a given address to a human-readable format.  Note that the
- * return value will be overwritten on the next call to this function.
- *
- * @param address address to convert
- * @return statically allocated (!) human-readable address
- */
-const char *
-GST_plugins_a2s (const struct GNUNET_HELLO_Address *address);
-
-
-/**
- * Register callback with all plugins to monitor their status.
- *
- * @param cb callback to register, NULL to unsubscribe
- * @param cb_cls closure for @a cb
- */
-void
-GST_plugins_monitor_subscribe (GNUNET_TRANSPORT_SessionInfoCallback cb,
-                               void *cb_cls);
-
-
-#endif
-/* end of file gnunet-service-transport_plugins.h */
diff --git a/src/transport/gnunet-service-transport_validation.c b/src/transport/gnunet-service-transport_validation.c
deleted file mode 100644
index 86161bd85..000000000
--- a/src/transport/gnunet-service-transport_validation.c
+++ /dev/null
@@ -1,1819 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2010-2015 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/gnunet-service-transport_validation.c
- * @brief address validation subsystem
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "gnunet-service-transport_ats.h"
-#include "gnunet-service-transport_hello.h"
-#include "gnunet-service-transport_neighbours.h"
-#include "gnunet-service-transport_plugins.h"
-#include "gnunet-service-transport_validation.h"
-#include "gnunet-service-transport.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_ats_service.h"
-#include "gnunet_peerinfo_service.h"
-#include "gnunet_signatures.h"
-
-/**
- * Current state of a validation process.
- *
- * FIXME: what state is used to indicate that a validation
- * was successful? If that is clarified/determined, "UGH" in
- * ~gnunetpeerinfogtk.c:1103 should be resolved.
- */
-enum GNUNET_TRANSPORT_ValidationState
-{
-  /**
-   * Undefined state
-   *
-   * Used for final callback indicating operation done
-   */
-  GNUNET_TRANSPORT_VS_NONE,
-
-  /**
-   * Fresh validation entry
-   *
-   * Entry was just created, no validation process was executed
-   */
-  GNUNET_TRANSPORT_VS_NEW,
-
-  /**
-   * Updated validation entry
-   *
-   * This is an update for an existing validation entry
-   */
-  GNUNET_TRANSPORT_VS_UPDATE,
-
-  /**
-   * Timeout for validation entry
-   *
-   * A timeout occurred during the validation process
-   */
-  GNUNET_TRANSPORT_VS_TIMEOUT,
-
-  /**
-   * Validation entry is removed
-   *
-   * The validation entry is getting removed due to a failed validation
-   */
-  GNUNET_TRANSPORT_VS_REMOVE
-};
-
-
-/**
- * How long is a PONG signature valid?  We'll recycle a signature until
- * 1/4 of this time is remaining.  PONGs should expire so that if our
- * external addresses change an adversary cannot replay them indefinitely.
- * OTOH, we don't want to spend too much time generating PONG signatures,
- * so they must have some lifetime to reduce our CPU usage.
- */
-#define PONG_SIGNATURE_LIFETIME GNUNET_TIME_relative_multiply ( \
-    GNUNET_TIME_UNIT_HOURS, 1)
-
-/**
- * After how long do we expire an address in a HELLO that we just
- * validated?  This value is also used for our own addresses when we
- * create a HELLO.
- */
-#define HELLO_ADDRESS_EXPIRATION GNUNET_TIME_relative_multiply ( \
-    GNUNET_TIME_UNIT_HOURS, 12)
-
-/**
- * How often do we allow PINGing an address that we have not yet
- * validated?  This also determines how long we track an address that
- * we cannot validate (because after this time we can destroy the
- * validation record).
- */
-#define UNVALIDATED_PING_KEEPALIVE GNUNET_TIME_relative_multiply ( \
-    GNUNET_TIME_UNIT_MINUTES, 5)
-
-/**
- * How often do we PING an address that we have successfully validated
- * in the past but are not actively using?  Should be (significantly)
- * smaller than HELLO_ADDRESS_EXPIRATION.
- */
-#define VALIDATED_PING_FREQUENCY GNUNET_TIME_relative_multiply ( \
-    GNUNET_TIME_UNIT_MINUTES, 15)
-
-/**
- * How often do we PING an address that we are currently using?
- */
-#define CONNECTED_PING_FREQUENCY GNUNET_TIME_relative_multiply ( \
-    GNUNET_TIME_UNIT_MINUTES, 2)
-
-/**
- * How much delay is acceptable for sending the PING or PONG?
- */
-#define ACCEPTABLE_PING_DELAY GNUNET_TIME_relative_multiply ( \
-    GNUNET_TIME_UNIT_SECONDS, 1)
-
-/**
- * Size of the validation map hashmap.
- */
-#define VALIDATION_MAP_SIZE 256
-
-/**
- * Priority to use for PINGs
- */
-#define PING_PRIORITY 2
-
-/**
- * Priority to use for PONGs
- */
-#define PONG_PRIORITY 4
-
-
-GNUNET_NETWORK_STRUCT_BEGIN
-
-/**
- * Message used to ask a peer to validate receipt (to check an address
- * from a HELLO).  Followed by the address we are trying to validate,
- * or an empty address if we are just sending a PING to confirm that a
- * connection which the receiver (of the PING) initiated is still valid.
- */
-struct TransportPingMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_PING
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Challenge code (to ensure fresh reply).
-   */
-  uint32_t challenge GNUNET_PACKED;
-
-  /**
-   * Who is the intended recipient?
-   */
-  struct GNUNET_PeerIdentity target;
-};
-
-
-/**
- * Message used to validate a HELLO.  The challenge is included in the
- * confirmation to make matching of replies to requests possible.  The
- * signature signs our public key, an expiration time and our address.<p>
- *
- * This message is followed by our transport address that the PING tried
- * to confirm (if we liked it).  The address can be empty (zero bytes)
- * if the PING had not address either (and we received the request via
- * a connection that we initiated).
- */
-struct TransportPongMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_PONG
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Challenge code from PING (showing freshness).  Not part of what
-   * is signed so that we can re-use signatures.
-   */
-  uint32_t challenge GNUNET_PACKED;
-
-  /**
-   * Signature.
-   */
-  struct GNUNET_CRYPTO_EddsaSignature signature;
-
-  /**
-   * #GNUNET_SIGNATURE_PURPOSE_TRANSPORT_PONG_OWN to confirm that this is a
-   * plausible address for the signing peer.
-   */
-  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
-
-  /**
-   * When does this signature expire?
-   */
-  struct GNUNET_TIME_AbsoluteNBO expiration;
-
-  /**
-   * Size of address appended to this message (part of what is
-   * being signed, hence not redundant).
-   */
-  uint32_t addrlen GNUNET_PACKED;
-};
-GNUNET_NETWORK_STRUCT_END
-
-/**
- * Information about an address under validation
- */
-struct ValidationEntry
-{
-  /**
-   * The address.
-   */
-  struct GNUNET_HELLO_Address *address;
-
-  /**
-   * Handle to the blacklist check (if we're currently in it).
-   */
-  struct GST_BlacklistCheck *bc;
-
-  /**
-   * Cached PONG signature
-   */
-  struct GNUNET_CRYPTO_EddsaSignature pong_sig_cache;
-
-  /**
-   * ID of task that will clean up this entry if nothing happens.
-   */
-  struct GNUNET_SCHEDULER_Task *timeout_task;
-
-  /**
-   * ID of task that will trigger address revalidation.
-   */
-  struct GNUNET_SCHEDULER_Task *revalidation_task;
-
-  /**
-   * At what time did we send the latest validation request (PING)?
-   */
-  struct GNUNET_TIME_Absolute send_time;
-
-  /**
-   * At what time do we send the next validation request (PING)?
-   */
-  struct GNUNET_TIME_Absolute next_validation;
-
-  /**
-   * Until when is this address valid?
-   * ZERO if it is not currently considered valid.
-   */
-  struct GNUNET_TIME_Absolute valid_until;
-
-  /**
-   * Until when is the cached PONG signature valid?
-   * ZERO if it is not currently considered valid.
-   */
-  struct GNUNET_TIME_Absolute pong_sig_valid_until;
-
-  /**
-   * How long until we can try to validate this address again?
-   * FOREVER if the address is for an unsupported plugin (from PEERINFO)
-   * ZERO if the address is considered valid (no validation needed)
-   * otherwise a time in the future if we're currently denying re-validation
-   */
-  struct GNUNET_TIME_Absolute revalidation_block;
-
-  /**
-   * Last observed latency for this address (round-trip), delay between
-   * last PING sent and PONG received; FOREVER if we never got a PONG.
-   */
-  struct GNUNET_TIME_Relative latency;
-
-  /**
-   * Current state of this validation entry
-   */
-  enum GNUNET_TRANSPORT_ValidationState state;
-
-  /**
-   * Challenge number we used.
-   */
-  uint32_t challenge;
-
-  /**
-   * When passing the address in #add_valid_peer_address(), did we
-   * copy the address to the HELLO yet?
-   */
-  int copied;
-
-  /**
-   * Are we currently using this address for a connection?
-   */
-  int in_use;
-
-  /**
-   * Are we expecting a PONG message for this validation entry?
-   */
-  int expecting_pong;
-
-  /**
-   * Is this address known to ATS as valid right now?
-   */
-  int known_to_ats;
-
-  /**
-   * Which network type does our address belong to?
-   */
-  enum GNUNET_NetworkType network;
-};
-
-
-/**
- * Map of PeerIdentities to 'struct ValidationEntry*'s (addresses
- * of the given peer that we are currently validating, have validated
- * or are blocked from re-validation for a while).
- */
-static struct GNUNET_CONTAINER_MultiPeerMap *validation_map;
-
-/**
- * Context for peerinfo iteration.
- */
-static struct GNUNET_PEERINFO_NotifyContext *pnc;
-
-/**
- * Minimum delay between to validations
- */
-static struct GNUNET_TIME_Relative validation_delay;
-
-/**
- * Number of validations running; any PING that was not yet
- * matched by a PONG and for which we have not yet hit the
- * timeout is considered a running 'validation'.
- */
-static unsigned int validations_running;
-
-/**
- * Validition fast start threshold
- */
-static unsigned int validations_fast_start_threshold;
-
-/**
- * When is next validation allowed
- */
-static struct GNUNET_TIME_Absolute validation_next;
-
-
-/**
- * Context for the validation entry match function.
- */
-struct ValidationEntryMatchContext
-{
-  /**
-   * Where to store the result?
-   */
-  struct ValidationEntry *ve;
-
-  /**
-   * Address we're interested in.
-   */
-  const struct GNUNET_HELLO_Address *address;
-};
-
-
-/**
- * Provide an update on the `validation_map` map size to statistics.
- * This function should be called whenever the `validation_map`
- * is changed.
- */
-static void
-publish_ve_stat_update ()
-{
-  GNUNET_STATISTICS_set (GST_stats,
-                         gettext_noop ("# Addresses in validation map"),
-                         GNUNET_CONTAINER_multipeermap_size (validation_map),
-                         GNUNET_NO);
-}
-
-
-/**
- * Iterate over validation entries until a matching one is found.
- *
- * @param cls the `struct ValidationEntryMatchContext *`
- * @param key peer identity (unused)
- * @param value a `struct ValidationEntry *` to match
- * @return #GNUNET_YES if the entry does not match,
- *         #GNUNET_NO if the entry does match
- */
-static int
-validation_entry_match (void *cls,
-                        const struct GNUNET_PeerIdentity *key,
-                        void *value)
-{
-  struct ValidationEntryMatchContext *vemc = cls;
-  struct ValidationEntry *ve = value;
-
-  if (0 == GNUNET_HELLO_address_cmp (ve->address,
-                                     vemc->address))
-  {
-    vemc->ve = ve;
-    return GNUNET_NO;
-  }
-  return GNUNET_YES;
-}
-
-
-/**
- * A validation entry changed.  Update the state and notify
- * monitors.
- *
- * @param ve validation entry that changed
- * @param state new state
- */
-static void
-validation_entry_changed (struct ValidationEntry *ve,
-                          enum GNUNET_TRANSPORT_ValidationState state)
-{
-  ve->state = state;
-}
-
-
-/**
- * Iterate over validation entries and free them.
- *
- * @param cls (unused)
- * @param key peer identity (unused)
- * @param value a `struct ValidationEntry *` to clean up
- * @return #GNUNET_YES (continue to iterate)
- */
-static int
-cleanup_validation_entry (void *cls,
-                          const struct GNUNET_PeerIdentity *key,
-                          void *value)
-{
-  struct ValidationEntry *ve = value;
-
-  ve->next_validation = GNUNET_TIME_UNIT_ZERO_ABS;
-  ve->valid_until = GNUNET_TIME_UNIT_ZERO_ABS;
-
-  /* Notify about deleted entry */
-  validation_entry_changed (ve,
-                            GNUNET_TRANSPORT_VS_REMOVE);
-
-  if (NULL != ve->bc)
-  {
-    GST_blacklist_test_cancel (ve->bc);
-    ve->bc = NULL;
-  }
-  GNUNET_break (GNUNET_OK ==
-                GNUNET_CONTAINER_multipeermap_remove (validation_map,
-                                                      &ve->address->peer,
-                                                      ve));
-  publish_ve_stat_update ();
-  if (GNUNET_YES == ve->known_to_ats)
-  {
-    GST_ats_expire_address (ve->address);
-    GNUNET_assert (GNUNET_NO ==
-                   GST_ats_is_known_no_session (ve->address));
-    ve->known_to_ats = GNUNET_NO;
-  }
-  GNUNET_HELLO_address_free (ve->address);
-  if (NULL != ve->timeout_task)
-  {
-    GNUNET_SCHEDULER_cancel (ve->timeout_task);
-    ve->timeout_task = NULL;
-  }
-  if (NULL != ve->revalidation_task)
-  {
-    GNUNET_SCHEDULER_cancel (ve->revalidation_task);
-    ve->revalidation_task = NULL;
-  }
-  if ((GNUNET_YES == ve->expecting_pong) &&
-      (validations_running > 0))
-  {
-    validations_running--;
-    GNUNET_STATISTICS_set (GST_stats,
-                           gettext_noop ("# validations running"),
-                           validations_running,
-                           GNUNET_NO);
-  }
-  GNUNET_free (ve);
-  return GNUNET_OK;
-}
-
-
-/**
- * Address validation cleanup task.  Assesses if the record is no
- * longer valid and then possibly triggers its removal.
- *
- * @param cls the `struct ValidationEntry`
- */
-static void
-timeout_hello_validation (void *cls)
-{
-  struct ValidationEntry *ve = cls;
-  struct GNUNET_TIME_Absolute max;
-  struct GNUNET_TIME_Relative left;
-
-  ve->timeout_task = NULL;
-  /* For valid addresses, we want to wait until the expire;
-     for addresses under PING validation, we want to wait
-     until we give up on the PING */
-  max = GNUNET_TIME_absolute_max (ve->valid_until,
-                                  ve->revalidation_block);
-  left = GNUNET_TIME_absolute_get_remaining (max);
-  if (left.rel_value_us > 0)
-  {
-    /* We should wait a bit longer. This happens when
-       address lifetimes are extended due to successful
-       validations. */
-    ve->timeout_task =
-      GNUNET_SCHEDULER_add_delayed (left,
-                                    &timeout_hello_validation,
-                                    ve);
-    return;
-  }
-  GNUNET_STATISTICS_update (GST_stats,
-                            gettext_noop (
-                              "# address records discarded (timeout)"),
-                            1,
-                            GNUNET_NO);
-  cleanup_validation_entry (NULL,
-                            &ve->address->peer,
-                            ve);
-}
-
-
-/**
- * Function called with the result from blacklisting.
- * Send a PING to the other peer if a communication is allowed.
- *
- * @param cls our `struct ValidationEntry`
- * @param pid identity of the other peer
- * @param address_null address associated with the request, always NULL
- * @param session_null session associated with the request, always NULL
- * @param result #GNUNET_OK if the connection is allowed,
- *               #GNUNET_NO if not,
- *               #GNUNET_SYSERR if operation was aborted
- */
-static void
-transmit_ping_if_allowed (void *cls,
-                          const struct GNUNET_PeerIdentity *pid,
-                          const struct GNUNET_HELLO_Address *address_null,
-                          struct GNUNET_ATS_Session *session_null,
-                          int result)
-{
-  struct ValidationEntry *ve = cls;
-  struct TransportPingMessage ping;
-  struct GNUNET_TRANSPORT_PluginFunctions *papi;
-  struct GNUNET_TIME_Absolute next;
-  const struct GNUNET_MessageHeader *hello;
-  ssize_t ret;
-  size_t tsize;
-  size_t slen;
-  uint16_t hsize;
-  struct GNUNET_ATS_Session *session;
-
-  ve->bc = NULL;
-  if (GNUNET_OK != result)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Blacklist denies sending PING to `%s' `%s' `%s'\n",
-                GNUNET_i2s (pid),
-                GST_plugins_a2s (ve->address),
-                ve->address->transport_name);
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop (
-                                "# address records discarded (blacklist)"),
-                              1,
-                              GNUNET_NO);
-    cleanup_validation_entry (NULL,
-                              pid,
-                              ve);
-    return;
-  }
-  hello = GST_hello_get ();
-  GNUNET_assert (NULL != hello);
-  slen = strlen (ve->address->transport_name) + 1;
-  hsize = ntohs (hello->size);
-  tsize = sizeof(struct TransportPingMessage)
-          + ve->address->address_length + slen + hsize;
-
-  ping.header.size =
-    htons (sizeof(struct TransportPingMessage)
-           + ve->address->address_length + slen);
-  ping.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_PING);
-  ping.challenge = htonl (ve->challenge);
-  ping.target = *pid;
-
-  if (tsize >= GNUNET_MAX_MESSAGE_SIZE)
-  {
-    GNUNET_break (0);
-    hsize = 0;
-    tsize =
-      sizeof(struct TransportPingMessage) + ve->address->address_length
-      + slen + hsize;
-  }
-  {
-    char message_buf[tsize] GNUNET_ALIGN;
-
-    GNUNET_memcpy (message_buf,
-                   hello,
-                   hsize);
-    GNUNET_memcpy (&message_buf[hsize],
-                   &ping,
-                   sizeof(struct TransportPingMessage));
-    GNUNET_memcpy (&message_buf[sizeof(struct TransportPingMessage) + hsize],
-                   ve->address->transport_name,
-                   slen);
-    GNUNET_memcpy (&message_buf[sizeof(struct TransportPingMessage) + slen
-                                + hsize],
-                   ve->address->address,
-                   ve->address->address_length);
-    papi = GST_plugins_find (ve->address->transport_name);
-    GNUNET_assert (NULL != papi);
-    session = papi->get_session (papi->cls,
-                                 ve->address);
-    if (NULL == session)
-    {
-      /* Could not get a valid session */
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Failed to get session to send PING to `%s' at `%s'\n",
-                  GNUNET_i2s (pid),
-                  GST_plugins_a2s (ve->address));
-      return;
-    }
-
-    ret = papi->send (papi->cls, session,
-                      message_buf, tsize,
-                      PING_PRIORITY,
-                      ACCEPTABLE_PING_DELAY,
-                      NULL, NULL);
-    if (-1 == ret)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Failed to send PING to `%s' at `%s'\n",
-                  GNUNET_i2s (pid),
-                  GST_plugins_a2s (ve->address));
-      return;
-    }
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Transmitted plain PING to `%s' `%s' `%s'\n",
-                GNUNET_i2s (pid),
-                GST_plugins_a2s (ve->address),
-                ve->address->transport_name);
-    ve->network = papi->get_network (papi->cls,
-                                     session);
-    GNUNET_break (GNUNET_NT_UNSPECIFIED != ve->network);
-    GST_neighbours_notify_data_sent (ve->address,
-                                     session,
-                                     tsize);
-    next = GNUNET_TIME_relative_to_absolute (validation_delay);
-    validation_next = GNUNET_TIME_absolute_max (next,
-                                                validation_next);
-    ve->send_time = GNUNET_TIME_absolute_get ();
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop (
-                                "# PINGs for address validation sent"),
-                              1,
-                              GNUNET_NO);
-    ve->expecting_pong = GNUNET_YES;
-    validations_running++;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Validation started, %u validation processes running\n",
-                validations_running);
-    GNUNET_STATISTICS_set (GST_stats,
-                           gettext_noop ("# validations running"),
-                           validations_running,
-                           GNUNET_NO);
-    /*  Notify about PING sent */
-    validation_entry_changed (ve,
-                              GNUNET_TRANSPORT_VS_UPDATE);
-  }
-}
-
-
-/**
- * Do address validation again to keep address valid.
- *
- * @param cls the `struct ValidationEntry`
- */
-static void
-revalidate_address (void *cls)
-{
-  struct ValidationEntry *ve = cls;
-  struct GNUNET_TIME_Relative canonical_delay;
-  struct GNUNET_TIME_Relative delay;
-  struct GNUNET_TIME_Relative blocked_for;
-  struct GST_BlacklistCheck *bc;
-  uint32_t rdelay;
-
-  ve->revalidation_task = NULL;
-  delay = GNUNET_TIME_absolute_get_remaining (ve->revalidation_block);
-  /* Considering current connectivity situation, what is the maximum
-     block period permitted? */
-  if (GNUNET_YES == ve->in_use)
-    canonical_delay = CONNECTED_PING_FREQUENCY;
-  else if (GNUNET_TIME_absolute_get_remaining (ve->valid_until).rel_value_us >
-           0)
-    canonical_delay = VALIDATED_PING_FREQUENCY;
-  else
-    canonical_delay = UNVALIDATED_PING_KEEPALIVE;
-  /* Use delay that is MIN of original delay and possibly adjusted
-     new maximum delay (which may be lower); the real delay
-     is originally randomized between "canonical_delay" and "2 * canonical_delay",
-     so continue to permit that window for the operation. */
-  delay = GNUNET_TIME_relative_min (delay,
-                                    GNUNET_TIME_relative_multiply (
-                                      canonical_delay,
-                                      2));
-  ve->revalidation_block = GNUNET_TIME_relative_to_absolute (delay);
-  if (delay.rel_value_us > 0)
-  {
-    /* should wait a bit longer */
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Waiting for %s longer before (re)validating address `%s'\n",
-                GNUNET_STRINGS_relative_time_to_string (delay,
-                                                        GNUNET_YES),
-                GST_plugins_a2s (ve->address));
-    ve->revalidation_task =
-      GNUNET_SCHEDULER_add_delayed (delay,
-                                    &revalidate_address, ve);
-    ve->next_validation = GNUNET_TIME_relative_to_absolute (delay);
-    return;
-  }
-  /* check if globally we have too many active validations at a
-     too high rate, if so, delay ours */
-  blocked_for = GNUNET_TIME_absolute_get_remaining (validation_next);
-  if ((validations_running > validations_fast_start_threshold) &&
-      (blocked_for.rel_value_us > 0))
-  {
-    /* Validations are blocked, have to wait for blocked_for time */
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Validations blocked for another %s, delaying validating address `%s'\n",
-                GNUNET_STRINGS_relative_time_to_string (blocked_for,
-                                                        GNUNET_YES),
-                GST_plugins_a2s (ve->address));
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop (
-                                "# validations delayed by global throttle"),
-                              1,
-                              GNUNET_NO);
-    ve->revalidation_task =
-      GNUNET_SCHEDULER_add_delayed (blocked_for,
-                                    &revalidate_address,
-                                    ve);
-    ve->next_validation = GNUNET_TIME_relative_to_absolute (blocked_for);
-    return;
-  }
-
-  /* We are good to go; remember to not go again for `canonical_delay` time;
-     add up to `canonical_delay` to randomize start time */
-  ve->revalidation_block = GNUNET_TIME_relative_to_absolute (canonical_delay);
-  /* schedule next PINGing with some extra random delay to avoid synchronous re-validations */
-  rdelay =
-    GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
-                              canonical_delay.rel_value_us);
-
-  delay = GNUNET_TIME_relative_add (canonical_delay,
-                                    GNUNET_TIME_relative_multiply
-                                      (GNUNET_TIME_UNIT_MICROSECONDS,
-                                      rdelay));
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Validating now, next scheduled for %s, now validating address `%s'\n",
-              GNUNET_STRINGS_relative_time_to_string (blocked_for,
-                                                      GNUNET_YES),
-              GST_plugins_a2s (ve->address));
-  ve->revalidation_task =
-    GNUNET_SCHEDULER_add_delayed (delay,
-                                  &revalidate_address,
-                                  ve);
-  ve->next_validation = GNUNET_TIME_relative_to_absolute (delay);
-
-  /* start PINGing by checking blacklist */
-  GNUNET_STATISTICS_update (GST_stats,
-                            gettext_noop ("# address revalidations started"), 1,
-                            GNUNET_NO);
-  if (NULL != ve->bc)
-  {
-    GST_blacklist_test_cancel (ve->bc);
-    ve->bc = NULL;
-  }
-  bc = GST_blacklist_test_allowed (&ve->address->peer,
-                                   ve->address->transport_name,
-                                   &transmit_ping_if_allowed,
-                                   ve,
-                                   NULL,
-                                   NULL);
-  if (NULL != bc)
-  {
-    /* If transmit_ping_if_allowed was already called it may have freed ve,
-     * so only set ve->bc if it has not been called.
-     */
-    ve->bc = bc;
-  }
-}
-
-
-/**
- * Find a ValidationEntry entry for the given neighbour that matches
- * the given address and transport.  If none exists, create one (but
- * without starting any validation).
- *
- * @param address address to find
- * @return validation entry matching the given specifications, NULL
- *         if we don't have an existing entry and no public key was given
- */
-static struct ValidationEntry *
-find_validation_entry (const struct GNUNET_HELLO_Address *address)
-{
-  struct ValidationEntryMatchContext vemc;
-  struct ValidationEntry *ve;
-
-  vemc.ve = NULL;
-  vemc.address = address;
-  GNUNET_CONTAINER_multipeermap_get_multiple (validation_map,
-                                              &address->peer,
-                                              &validation_entry_match, &vemc);
-  if (NULL != (ve = vemc.ve))
-    return ve;
-  GNUNET_assert (GNUNET_NO ==
-                 GST_ats_is_known_no_session (address));
-  ve = GNUNET_new (struct ValidationEntry);
-  ve->in_use = GNUNET_SYSERR; /* not defined */
-  ve->address = GNUNET_HELLO_address_copy (address);
-  ve->pong_sig_valid_until = GNUNET_TIME_UNIT_ZERO_ABS;
-  memset (&ve->pong_sig_cache,
-          '\0',
-          sizeof(struct GNUNET_CRYPTO_EddsaSignature));
-  ve->latency = GNUNET_TIME_UNIT_FOREVER_REL;
-  ve->challenge =
-    GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX);
-  ve->timeout_task =
-    GNUNET_SCHEDULER_add_delayed (UNVALIDATED_PING_KEEPALIVE,
-                                  &timeout_hello_validation,
-                                  ve);
-  GNUNET_CONTAINER_multipeermap_put (validation_map,
-                                     &address->peer,
-                                     ve,
-                                     GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-  publish_ve_stat_update ();
-  validation_entry_changed (ve,
-                            GNUNET_TRANSPORT_VS_NEW);
-  return ve;
-}
-
-
-/**
- * Iterator which adds the given address to the set of validated
- * addresses.
- *
- * @param cls original HELLO message
- * @param address the address
- * @param expiration expiration time
- * @return #GNUNET_OK (keep the address), could return
- *         #GNUNET_NO (delete address, but this is ignored);
- *         #GNUNET_SYSERR would abort iteration (but we always iterate all)
- */
-static int
-add_valid_address (void *cls,
-                   const struct GNUNET_HELLO_Address *address,
-                   struct GNUNET_TIME_Absolute expiration)
-{
-  const struct GNUNET_HELLO_Message *hello = cls;
-  struct ValidationEntry *ve;
-  struct GNUNET_PeerIdentity pid;
-  struct GNUNET_ATS_Properties prop;
-  struct GNUNET_TRANSPORT_PluginFunctions *papi;
-
-  if (0 == GNUNET_TIME_absolute_get_remaining (expiration).rel_value_us)
-    return GNUNET_OK;           /* expired */
-  if (GNUNET_OK != GNUNET_HELLO_get_id (hello, &pid))
-  {
-    GNUNET_break (0);
-    return GNUNET_OK;           /* invalid HELLO !? */
-  }
-  if (NULL == (papi = GST_plugins_find (address->transport_name)))
-  {
-    /* might have been valid in the past, but we don't have that
-       plugin loaded right now */
-    return GNUNET_OK;
-  }
-  if (NULL ==
-      papi->address_to_string (papi->cls,
-                               address->address,
-                               address->address_length))
-  {
-    /* Why do we try to add an ill-formed address? */
-    GNUNET_break (0);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Address with %u bytes for plugin %s and peer %s is malformed\n",
-                (unsigned int) address->address_length,
-                address->transport_name,
-                GNUNET_i2s (&pid));
-    return GNUNET_OK;
-  }
-
-  ve = find_validation_entry (address);
-  ve->network = papi->get_network_for_address (papi->cls,
-                                               address);
-  GNUNET_break (GNUNET_NT_UNSPECIFIED != ve->network);
-  ve->valid_until = GNUNET_TIME_absolute_max (ve->valid_until,
-                                              expiration);
-  if (NULL == ve->revalidation_task)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Starting revalidations for valid address `%s'\n",
-                GST_plugins_a2s (ve->address));
-    ve->next_validation = GNUNET_TIME_absolute_get ();
-    ve->revalidation_task = GNUNET_SCHEDULER_add_now (&revalidate_address, ve);
-  }
-  validation_entry_changed (ve,
-                            GNUNET_TRANSPORT_VS_UPDATE);
-  memset (&prop, 0, sizeof(prop));
-  prop.scope = ve->network;
-  prop.delay = GNUNET_TIME_relative_divide (ve->latency, 2);
-  if (GNUNET_YES != ve->known_to_ats)
-  {
-    ve->known_to_ats = GNUNET_YES;
-    GST_ats_add_address (address, &prop);
-    GNUNET_assert (GNUNET_YES ==
-                   GST_ats_is_known_no_session (ve->address));
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Function called for any HELLO known to PEERINFO.
- *
- * @param cls unused (NULL)
- * @param peer id of the peer, NULL for last call (during iteration,
- *             as we are monitoring, this should never happen)
- * @param hello hello message for the peer (can be NULL)
- * @param err_msg error message
- */
-static void
-process_peerinfo_hello (void *cls,
-                        const struct GNUNET_PeerIdentity *peer,
-                        const struct GNUNET_HELLO_Message *hello,
-                        const char *err_msg)
-{
-  GNUNET_assert (NULL != peer);
-  if (NULL == hello)
-    return;
-  if (0 == memcmp (&GST_my_identity,
-                   peer,
-                   sizeof(struct GNUNET_PeerIdentity)))
-  {
-    /* Peerinfo returned own identity, skip validation */
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Handling HELLO for peer `%s'\n",
-              GNUNET_i2s (peer));
-  GNUNET_assert (NULL ==
-                 GNUNET_HELLO_iterate_addresses (hello, GNUNET_NO,
-                                                 &add_valid_address,
-                                                 (void *) hello));
-}
-
-
-/**
- * Start the validation subsystem.
- *
- * @param max_fds maximum number of fds to use
- */
-void
-GST_validation_start (unsigned int max_fds)
-{
-  /**
-   * Initialization for validation throttling
-   *
-   * We have a maximum number max_fds of connections we can use for validation
-   * We monitor the number of validations in parallel and start to throttle it
-   * when doing to many validations in parallel:
-   * if (running validations < (max_fds / 2))
-   * - "fast start": run validation immediately
-   * - have delay of (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value_us) / (max_fds / 2)
-   *   (300 sec / ~150 == ~2 sec.) between two validations
-   */validation_next = GNUNET_TIME_absolute_get ();
-  validation_delay.rel_value_us =
-    (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value_us) / (max_fds / 2);
-  validations_fast_start_threshold = (max_fds / 2);
-  validations_running = 0;
-  GNUNET_STATISTICS_set (GST_stats,
-                         gettext_noop ("# validations running"),
-                         validations_running,
-                         GNUNET_NO);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Validation uses a fast start threshold of %u connections and a delay of %s\n",
-              validations_fast_start_threshold,
-              GNUNET_STRINGS_relative_time_to_string (validation_delay,
-                                                      GNUNET_YES));
-  validation_map = GNUNET_CONTAINER_multipeermap_create (VALIDATION_MAP_SIZE,
-                                                         GNUNET_NO);
-  pnc = GNUNET_PEERINFO_notify (GST_cfg, GNUNET_YES,
-                                &process_peerinfo_hello, NULL);
-}
-
-
-/**
- * Stop the validation subsystem.
- */
-void
-GST_validation_stop ()
-{
-  GNUNET_CONTAINER_multipeermap_iterate (validation_map,
-                                         &cleanup_validation_entry,
-                                         NULL);
-  GNUNET_CONTAINER_multipeermap_destroy (validation_map);
-  validation_map = NULL;
-  GNUNET_PEERINFO_notify_cancel (pnc);
-}
-
-
-/**
- * Send the given PONG to the given address.
- *
- * @param cls the PONG message
- * @param valid_until is ZERO if we never validated the address,
- *                    otherwise a time up to when we consider it (or was) valid
- * @param validation_block  is FOREVER if the address is for an unsupported plugin (from PEERINFO)
- *                          is ZERO if the address is considered valid (no validation needed)
- *                          otherwise a time in the future if we're currently denying re-validation
- * @param address target address
- */
-static void
-multicast_pong (void *cls,
-                struct GNUNET_TIME_Absolute valid_until,
-                struct GNUNET_TIME_Absolute validation_block,
-                const struct GNUNET_HELLO_Address *address)
-{
-  struct TransportPongMessage *pong = cls;
-  struct GNUNET_TRANSPORT_PluginFunctions *papi;
-  struct GNUNET_ATS_Session *session;
-
-  papi = GST_plugins_find (address->transport_name);
-  if (NULL == papi)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Plugin %s not supported, cannot send PONG\n",
-                address->transport_name);
-    return;
-  }
-  GNUNET_assert (NULL != papi->send);
-  GNUNET_assert (NULL != papi->get_session);
-  session = papi->get_session (papi->cls, address);
-  if (NULL == session)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  GST_ats_new_session (address, session);
-  papi->send (papi->cls, session,
-              (const char *) pong,
-              ntohs (pong->header.size),
-              PONG_PRIORITY,
-              ACCEPTABLE_PING_DELAY,
-              NULL, NULL);
-  GST_neighbours_notify_data_sent (address,
-                                   session,
-                                   pong->header.size);
-}
-
-
-/**
- * We've received a PING.  If appropriate, generate a PONG.
- *
- * @param sender peer sending the PING
- * @param hdr the PING
- * @param sender_address the sender address as we got it
- * @param session session we got the PING from
- * @return #GNUNET_OK if the message was fine, #GNUNET_SYSERR on serious error
- */
-int
-GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender,
-                            const struct GNUNET_MessageHeader *hdr,
-                            const struct GNUNET_HELLO_Address *sender_address,
-                            struct GNUNET_ATS_Session *session)
-{
-  const struct TransportPingMessage *ping;
-  struct TransportPongMessage *pong;
-  struct GNUNET_TRANSPORT_PluginFunctions *papi;
-  struct GNUNET_CRYPTO_EddsaSignature *sig_cache;
-  struct GNUNET_TIME_Absolute *sig_cache_exp;
-  const char *addr;
-  const char *addrend;
-  char *plugin_name;
-  char *pos;
-  size_t len_address;
-  size_t len_plugin;
-  ssize_t ret;
-  struct GNUNET_HELLO_Address address;
-
-  if (0 ==
-      memcmp (&GST_my_identity,
-              sender,
-              sizeof(struct GNUNET_PeerIdentity)))
-    return GNUNET_OK; /* our own, ignore! */
-  if (ntohs (hdr->size) < sizeof(struct TransportPingMessage))
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  ping = (const struct TransportPingMessage *) hdr;
-  if (0 !=
-      memcmp (&ping->target,
-              &GST_my_identity,
-              sizeof(struct GNUNET_PeerIdentity)))
-  {
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop
-                                ("# PING message for different peer received"),
-                              1,
-                              GNUNET_NO);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_STATISTICS_update (GST_stats,
-                            gettext_noop ("# PING messages received"), 1,
-                            GNUNET_NO);
-  addr = (const char *) &ping[1];
-  len_address = ntohs (hdr->size) - sizeof(struct TransportPingMessage);
-  /* peer wants to confirm that this is one of our addresses, this is what is
-   * used for address validation */
-
-  sig_cache = NULL;
-  sig_cache_exp = NULL;
-  papi = NULL;
-  if (len_address > 0)
-  {
-    addrend = memchr (addr, '\0', len_address);
-    if (NULL == addrend)
-    {
-      GNUNET_break_op (0);
-      return GNUNET_SYSERR;
-    }
-    addrend++;
-    len_plugin = strlen (addr) + 1;
-    len_address -= len_plugin;
-    address.local_info = GNUNET_HELLO_ADDRESS_INFO_NONE;
-    address.address = addrend;
-    address.address_length = len_address;
-    address.transport_name = addr;
-    address.peer = GST_my_identity;
-
-    if (NULL == address.transport_name)
-    {
-      GNUNET_break (0);
-    }
-
-    if (0 != strstr (address.transport_name, "_client"))
-    {
-      plugin_name = GNUNET_strdup (address.transport_name);
-      pos = strstr (plugin_name, "_client");
-      GNUNET_assert (NULL != pos);
-      GNUNET_snprintf (pos, strlen ("_server") + 1, "%s", "_server");
-    }
-    else
-      plugin_name = GNUNET_strdup (address.transport_name);
-
-    if (NULL == (papi = GST_plugins_find (plugin_name)))
-    {
-      /* we don't have the plugin for this address */
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  _ (
-                    "Plugin `%s' not available, cannot confirm having this address\n"),
-                  plugin_name);
-      GNUNET_free (plugin_name);
-      return GNUNET_SYSERR;
-    }
-    GNUNET_free (plugin_name);
-    if (GNUNET_OK !=
-        papi->check_address (papi->cls,
-                             addrend,
-                             len_address))
-    {
-      GNUNET_STATISTICS_update (GST_stats,
-                                gettext_noop
-                                  ("# failed address checks during validation"),
-                                1,
-                                GNUNET_NO);
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  _ (
-                    "Address `%s' is not one of my addresses, not confirming PING\n"),
-                  GST_plugins_a2s (&address));
-      return GNUNET_SYSERR;
-    }
-    else
-    {
-      GNUNET_STATISTICS_update (GST_stats,
-                                gettext_noop
-                                (
-                                  "# successful address checks during validation"),
-                                1,
-                                GNUNET_NO);
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Address `%s' is one of my addresses, confirming PING\n",
-                  GST_plugins_a2s (&address));
-    }
-
-    if (GNUNET_YES !=
-        GST_hello_test_address (&address,
-                                &sig_cache,
-                                &sig_cache_exp))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  _ (
-                    "Not confirming PING from peer `%s' with address `%s' since I cannot confirm having this address.\n"),
-                  GNUNET_i2s (sender),
-                  GST_plugins_a2s (&address));
-      return GNUNET_SYSERR;
-    }
-  }
-  else
-  {
-    addrend = NULL;             /* make gcc happy */
-    len_plugin = 0;
-    static struct GNUNET_CRYPTO_EddsaSignature no_address_signature;
-    static struct GNUNET_TIME_Absolute no_address_signature_expiration;
-
-    sig_cache = &no_address_signature;
-    sig_cache_exp = &no_address_signature_expiration;
-  }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "I am `%s', sending PONG to peer `%s'\n",
-              GNUNET_i2s_full (&GST_my_identity),
-              GNUNET_i2s (sender));
-
-  /* message with structure:
-   * [TransportPongMessage][Transport name][Address] */
-
-  pong = GNUNET_malloc (sizeof(struct TransportPongMessage) + len_address
-                        + len_plugin);
-  pong->header.size =
-    htons (sizeof(struct TransportPongMessage) + len_address + len_plugin);
-  pong->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_PONG);
-  pong->purpose.size =
-    htonl (sizeof(struct GNUNET_CRYPTO_EccSignaturePurpose)
-           + sizeof(uint32_t) + sizeof(struct GNUNET_TIME_AbsoluteNBO)
-           + len_address + len_plugin);
-  pong->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_PONG_OWN);
-  GNUNET_memcpy (&pong->challenge, &ping->challenge, sizeof(ping->challenge));
-  pong->addrlen = htonl (len_address + len_plugin);
-  GNUNET_memcpy (&pong[1], addr, len_plugin);    /* Copy transport plugin */
-  if (len_address > 0)
-  {
-    GNUNET_assert (NULL != addrend);
-    GNUNET_memcpy (&((char *) &pong[1])[len_plugin], addrend, len_address);
-  }
-  if (GNUNET_TIME_absolute_get_remaining (*sig_cache_exp).rel_value_us <
-      PONG_SIGNATURE_LIFETIME.rel_value_us / 4)
-  {
-    /* create / update cached sig */
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Creating PONG signature to indicate ownership.\n");
-    *sig_cache_exp = GNUNET_TIME_relative_to_absolute (PONG_SIGNATURE_LIFETIME);
-    pong->expiration = GNUNET_TIME_absolute_hton (*sig_cache_exp);
-    if (GNUNET_OK !=
-        GNUNET_CRYPTO_eddsa_sign_ (&GST_my_private_key,
-                                   &pong->purpose,
-                                   sig_cache))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _ ("Failed to create PONG signature for peer `%s'\n"),
-                  GNUNET_i2s (sender));
-    }
-  }
-  else
-  {
-    pong->expiration = GNUNET_TIME_absolute_hton (*sig_cache_exp);
-  }
-  pong->signature = *sig_cache;
-
-  GNUNET_assert (NULL != sender_address);
-
-  /* first see if the session we got this PING from can be used to transmit
-   * a response reliably */
-  if (NULL == papi)
-  {
-    ret = -1;
-  }
-  else
-  {
-    GNUNET_assert (NULL != papi->send);
-    GNUNET_assert (NULL != papi->get_session);
-    if (NULL == session)
-    {
-      session = papi->get_session (papi->cls, sender_address);
-    }
-    if (NULL == session)
-    {
-      GNUNET_break (0);
-      ret = -1;
-    }
-    else
-    {
-      ret = papi->send (papi->cls, session,
-                        (const char *) pong,
-                        ntohs (pong->header.size),
-                        PONG_PRIORITY, ACCEPTABLE_PING_DELAY,
-                        NULL, NULL);
-      if (-1 != ret)
-        GST_neighbours_notify_data_sent (sender_address,
-                                         session,
-                                         pong->header.size);
-    }
-  }
-  if (-1 != ret)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Transmitted PONG to `%s' via reliable mechanism\n",
-                GNUNET_i2s (sender));
-    /* done! */
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop
-                                ("# PONGs unicast via reliable transport"), 1,
-                              GNUNET_NO);
-    GNUNET_free (pong);
-    return GNUNET_OK;
-  }
-
-  /* no reliable method found, try transmission via all known addresses */
-  GNUNET_STATISTICS_update (GST_stats,
-                            gettext_noop
-                              ("# PONGs multicast to all available addresses"),
-                            1,
-                            GNUNET_NO);
-  GST_validation_get_addresses (sender,
-                                &multicast_pong, pong);
-  GNUNET_free (pong);
-  return GNUNET_OK;
-}
-
-
-/**
- * Validate an individual address.
- *
- * @param address address we should try to validate
- */
-void
-GST_validation_handle_address (const struct GNUNET_HELLO_Address *address)
-{
-  struct GNUNET_TRANSPORT_PluginFunctions *papi;
-  struct ValidationEntry *ve;
-
-  papi = GST_plugins_find (address->transport_name);
-  if (NULL == papi)
-  {
-    /* This plugin is currently unavailable ... ignore */
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "No plugin available for %s\n",
-                address->transport_name);
-    return;
-  }
-  ve = find_validation_entry (address);
-  if (NULL == ve->revalidation_task)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Validation process started for fresh address `%s' of %s\n",
-                GST_plugins_a2s (ve->address),
-                GNUNET_i2s (&ve->address->peer));
-    ve->revalidation_task = GNUNET_SCHEDULER_add_now (&revalidate_address, ve);
-  }
-  else
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Validation already running for address `%s' of %s\n",
-                GST_plugins_a2s (ve->address),
-                GNUNET_i2s (&ve->address->peer));
-  }
-}
-
-
-/**
- * Iterator callback to go over all addresses and try to validate them
- * (unless blocked or already validated).
- *
- * @param cls NULL
- * @param address the address
- * @param expiration expiration time
- * @return #GNUNET_OK (keep the address)
- */
-static int
-validate_address_iterator (void *cls,
-                           const struct GNUNET_HELLO_Address *address,
-                           struct GNUNET_TIME_Absolute expiration)
-{
-  if (0 == GNUNET_TIME_absolute_get_remaining (expiration).rel_value_us)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Skipping expired address from HELLO\n");
-    return GNUNET_OK;           /* expired */
-  }
-  GST_validation_handle_address (address);
-  return GNUNET_OK;
-}
-
-
-/**
- * Add the validated peer address to the HELLO.
- *
- * @param cls the `struct ValidationEntry *` with the validated address
- * @param max space in @a buf
- * @param buf where to add the address
- * @return number of bytes written, #GNUNET_SYSERR to signal the
- *         end of the iteration.
- */
-static ssize_t
-add_valid_peer_address (void *cls,
-                        size_t max,
-                        void *buf)
-{
-  struct ValidationEntry *ve = cls;
-
-  if (GNUNET_YES == ve->copied)
-    return GNUNET_SYSERR; /* Done */
-  ve->copied = GNUNET_YES;
-  return GNUNET_HELLO_add_address (ve->address,
-                                   ve->valid_until,
-                                   buf,
-                                   max);
-}
-
-
-/**
- * We've received a PONG.  Check if it matches a pending PING and
- * mark the respective address as confirmed.
- *
- * @param sender peer sending the PONG
- * @param hdr the PONG
- * @return #GNUNET_OK if the message was fine, #GNUNET_SYSERR on serious error
- */
-int
-GST_validation_handle_pong (const struct GNUNET_PeerIdentity *sender,
-                            const struct GNUNET_MessageHeader *hdr)
-{
-  const struct TransportPongMessage *pong;
-  struct ValidationEntry *ve;
-  const char *tname;
-  const char *addr;
-  size_t addrlen;
-  size_t slen;
-  size_t size;
-  struct GNUNET_HELLO_Message *hello;
-  struct GNUNET_HELLO_Address address;
-  int sig_res;
-  int do_verify;
-
-  if (0 ==
-      memcmp (&GST_my_identity,
-              sender,
-              sizeof(struct GNUNET_PeerIdentity)))
-    return GNUNET_OK; /* our own, ignore! */
-
-  if (ntohs (hdr->size) < sizeof(struct TransportPongMessage))
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_STATISTICS_update (GST_stats,
-                            gettext_noop ("# PONG messages received"), 1,
-                            GNUNET_NO);
-
-  /* message with structure:
-   * [TransportPongMessage][Transport name][Address] */
-
-  pong = (const struct TransportPongMessage *) hdr;
-  tname = (const char *) &pong[1];
-  size = ntohs (hdr->size) - sizeof(struct TransportPongMessage);
-  addr = memchr (tname, '\0', size);
-  if (NULL == addr)
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  addr++;
-  slen = strlen (tname) + 1;
-  addrlen = size - slen;
-
-  if (NULL == GST_plugins_find (tname))
-  {
-    /* we got the PONG, but the transport plugin specified in it
-       is not supported by this peer, so this cannot be a good
-       PONG for us. */
-    GNUNET_break_op (0);
-    return GNUNET_OK;
-  }
-
-  address.peer = *sender;
-  address.address = addr;
-  address.address_length = addrlen;
-  address.transport_name = tname;
-  address.local_info = GNUNET_HELLO_ADDRESS_INFO_NONE;
-  ve = find_validation_entry (&address);
-  if ((NULL == ve) || (GNUNET_NO == ve->expecting_pong))
-  {
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop
-                              (
-                                "# PONGs dropped, no matching pending validation"),
-                              1, GNUNET_NO);
-    return GNUNET_OK;
-  }
-  /* now check that PONG is well-formed */
-  if (0 != memcmp (&ve->address->peer,
-                   sender,
-                   sizeof(struct GNUNET_PeerIdentity)))
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  if (0 ==
-      GNUNET_TIME_absolute_get_remaining
-        (GNUNET_TIME_absolute_ntoh (pong->expiration)).rel_value_us)
-  {
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop
-                                ("# PONGs dropped, signature expired"), 1,
-                              GNUNET_NO);
-    return GNUNET_SYSERR;
-  }
-
-  sig_res = GNUNET_SYSERR;
-  do_verify = GNUNET_YES;
-  if (0 != GNUNET_TIME_absolute_get_remaining (
-        ve->pong_sig_valid_until).rel_value_us)
-  {
-    /* We have a cached and valid signature for this peer,
-     * try to compare instead of verify */
-    if (0 == memcmp (&ve->pong_sig_cache,
-                     &pong->signature,
-                     sizeof(struct GNUNET_CRYPTO_EddsaSignature)))
-    {
-      /* signatures are identical, we can skip verification */
-      sig_res = GNUNET_OK;
-      do_verify = GNUNET_NO;
-    }
-    else
-    {
-      sig_res = GNUNET_SYSERR;
-      /* signatures do not match, we have to verify */
-    }
-  }
-
-  if (GNUNET_YES == do_verify)
-  {
-    /* Do expensive verification */
-    sig_res = GNUNET_CRYPTO_eddsa_verify_ (
-      GNUNET_SIGNATURE_PURPOSE_TRANSPORT_PONG_OWN,
-      &pong->purpose,
-      &pong->signature,
-      &ve->address->peer.public_key);
-    if (sig_res == GNUNET_SYSERR)
-    {
-      GNUNET_break_op (0);
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Failed to verify: invalid signature on address `%s':%s from peer `%s'\n",
-                  tname,
-                  GST_plugins_a2s (ve->address),
-                  GNUNET_i2s (sender));
-    }
-  }
-  if (sig_res == GNUNET_SYSERR)
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Validation process successful for peer `%s' with plugin `%s' address `%s'\n",
-              GNUNET_i2s (sender),
-              tname,
-              GST_plugins_a2s (ve->address));
-  GNUNET_STATISTICS_update (GST_stats,
-                            gettext_noop ("# validations succeeded"),
-                            1,
-                            GNUNET_NO);
-  /* validity achieved, remember it! */
-  ve->expecting_pong = GNUNET_NO;
-  ve->valid_until = GNUNET_TIME_relative_to_absolute (HELLO_ADDRESS_EXPIRATION);
-  ve->pong_sig_cache = pong->signature;
-  ve->pong_sig_valid_until = GNUNET_TIME_absolute_ntoh (pong->expiration);
-  ve->latency = GNUNET_TIME_absolute_get_duration (ve->send_time);
-  {
-    if (GNUNET_YES == ve->known_to_ats)
-    {
-      GNUNET_assert (GNUNET_YES ==
-                     GST_ats_is_known_no_session (ve->address));
-      GST_ats_update_delay (ve->address,
-                            GNUNET_TIME_relative_divide (ve->latency, 2));
-    }
-    else
-    {
-      struct GNUNET_ATS_Properties prop;
-
-      memset (&prop, 0, sizeof(prop));
-      GNUNET_break (GNUNET_NT_UNSPECIFIED != ve->network);
-      prop.scope = ve->network;
-      prop.delay = GNUNET_TIME_relative_divide (ve->latency, 2);
-      GNUNET_assert (GNUNET_NO ==
-                     GST_ats_is_known_no_session (ve->address));
-      ve->known_to_ats = GNUNET_YES;
-      GST_ats_add_address (ve->address, &prop);
-      GNUNET_assert (GNUNET_YES ==
-                     GST_ats_is_known_no_session (ve->address));
-    }
-  }
-  if (validations_running > 0)
-  {
-    validations_running--;
-    GNUNET_STATISTICS_set (GST_stats,
-                           gettext_noop ("# validations running"),
-                           validations_running,
-                           GNUNET_NO);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Validation finished, %u validation processes running\n",
-                validations_running);
-  }
-  else
-  {
-    GNUNET_break (0);
-  }
-
-  /* Notify about new validity */
-  validation_entry_changed (ve,
-                            GNUNET_TRANSPORT_VS_UPDATE);
-
-  /* build HELLO to store in PEERINFO */
-  GNUNET_STATISTICS_update (GST_stats,
-                            gettext_noop ("# HELLOs given to peerinfo"),
-                            1,
-                            GNUNET_NO);
-  ve->copied = GNUNET_NO;
-  hello = GNUNET_HELLO_create (&ve->address->peer.public_key,
-                               &add_valid_peer_address,
-                               ve,
-                               GNUNET_NO);
-  GNUNET_break (NULL !=
-                GNUNET_PEERINFO_add_peer (GST_peerinfo,
-                                          hello,
-                                          NULL,
-                                          NULL));
-  GNUNET_free (hello);
-  return GNUNET_OK;
-}
-
-
-/**
- * We've received a HELLO, check which addresses are new and trigger
- * validation.
- *
- * @param hello the HELLO we received
- * @return #GNUNET_OK if the message was fine, #GNUNET_SYSERR on serious error
- */
-int
-GST_validation_handle_hello (const struct GNUNET_MessageHeader *hello)
-{
-  const struct GNUNET_HELLO_Message *hm =
-    (const struct GNUNET_HELLO_Message *) hello;
-  struct GNUNET_PeerIdentity pid;
-  int friend;
-
-  friend = GNUNET_HELLO_is_friend_only (hm);
-  if (((GNUNET_YES != friend) &&
-       (GNUNET_NO != friend)) ||
-      (GNUNET_OK != GNUNET_HELLO_get_id (hm, &pid)))
-  {
-    /* malformed HELLO */
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  if (0 ==
-      memcmp (&GST_my_identity,
-              &pid,
-              sizeof(struct GNUNET_PeerIdentity)))
-  {
-    /* got our own HELLO, how boring */
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Validation received our own HELLO (%s), ignoring\n",
-                GNUNET_i2s (&pid));
-    return GNUNET_OK;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Validation received HELLO message for peer `%s' with size %u, checking for new addresses\n",
-              GNUNET_i2s (&pid),
-              ntohs (hello->size));
-  GNUNET_assert (NULL ==
-                 GNUNET_HELLO_iterate_addresses (hm,
-                                                 GNUNET_NO,
-                                                 &validate_address_iterator,
-                                                 NULL));
-  return GNUNET_OK;
-}
-
-
-/**
- * Closure for #iterate_addresses().
- */
-struct IteratorContext
-{
-  /**
-   * Function to call on each address.
-   */
-  GST_ValidationAddressCallback cb;
-
-  /**
-   * Closure for @e cb.
-   */
-  void *cb_cls;
-};
-
-
-/**
- * Call the callback in the closure for each validation entry.
- *
- * @param cls the `struct IteratorContext`
- * @param key the peer's identity
- * @param value the `struct ValidationEntry`
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-iterate_addresses (void *cls,
-                   const struct GNUNET_PeerIdentity *key,
-                   void *value)
-{
-  struct IteratorContext *ic = cls;
-  struct ValidationEntry *ve = value;
-
-  ic->cb (ic->cb_cls,
-          ve->valid_until,
-          ve->revalidation_block,
-          ve->address);
-  return GNUNET_OK;
-}
-
-
-/**
- * Call the given function for each address for the given target.
- * Can either give a snapshot (synchronous API) or be continuous.
- *
- * @param target peer information is requested for
- * @param cb function to call; will not be called after this function returns
- * @param cb_cls closure for @a cb
- */
-void
-GST_validation_get_addresses (const struct GNUNET_PeerIdentity *target,
-                              GST_ValidationAddressCallback cb,
-                              void *cb_cls)
-{
-  struct IteratorContext ic;
-
-  ic.cb = cb;
-  ic.cb_cls = cb_cls;
-  GNUNET_CONTAINER_multipeermap_get_multiple (validation_map,
-                                              target,
-                                              &iterate_addresses, &ic);
-}
-
-
-/**
- * Update if we are using an address for a connection actively right now.
- * Based on this, the validation module will measure latency for the
- * address more or less often.
- *
- * @param address the address that we are now using (or not)
- * @param in_use #GNUNET_YES if we are now using the address for a connection,
- *               #GNUNET_NO if we are no longer using the address for a connection
- */
-void
-GST_validation_set_address_use (const struct GNUNET_HELLO_Address *address,
-                                int in_use)
-{
-  struct ValidationEntry *ve;
-
-  if (GNUNET_HELLO_address_check_option (address,
-                                         GNUNET_HELLO_ADDRESS_INFO_INBOUND))
-    return; /* ignore inbound for validation */
-  if (NULL == GST_plugins_find (address->transport_name))
-  {
-    /* How can we use an address for which we don't have the plugin? */
-    GNUNET_break (0);
-    return;
-  }
-  ve = find_validation_entry (address);
-  if (NULL == ve)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  if (in_use == ve->in_use)
-    return;
-  ve->in_use = in_use;
-  if (GNUNET_YES == in_use)
-  {
-    /* from now on, higher frequency, so reschedule now */
-    if (NULL != ve->revalidation_task)
-      GNUNET_SCHEDULER_cancel (ve->revalidation_task);
-    ve->revalidation_task = GNUNET_SCHEDULER_add_now (&revalidate_address,
-                                                      ve);
-  }
-}
-
-
-/* end of file gnunet-service-transport_validation.c */
diff --git a/src/transport/gnunet-service-transport_validation.h b/src/transport/gnunet-service-transport_validation.h
deleted file mode 100644
index 2a0428869..000000000
--- a/src/transport/gnunet-service-transport_validation.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2010,2011 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/gnunet-service-transport_validation.h
- * @brief address validation API
- * @author Christian Grothoff
- */
-#ifndef GNUNET_SERVICE_TRANSPORT_VALIDATION_H
-#define GNUNET_SERVICE_TRANSPORT_VALIDATION_H
-
-#include "gnunet_statistics_service.h"
-#include "gnunet_transport_plugin.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_hello_lib.h"
-
-/**
- * Start the validation subsystem.
- *
- * @param max_fds maximum number of fds to use
- */
-void
-GST_validation_start (unsigned int max_fds);
-
-
-/**
- * Stop the validation subsystem.
- */
-void
-GST_validation_stop (void);
-
-
-/**
- * Update if we are using an address for a connection actively right now.
- * Based on this, the validation module will measure latency for the
- * address more or less often.
- *
- * @param address the address that we are now using (or not)
- * @param in_use #GNUNET_YES if we are now using the address for a connection,
- *               #GNUNET_NO if we are no longer using the address for a connection
- */
-void
-GST_validation_set_address_use (const struct GNUNET_HELLO_Address *address,
-                                int in_use);
-
-
-/**
- * We've received a PING.  If appropriate, generate a PONG.
- *
- * @param sender peer sending the PING
- * @param hdr the PING
- * @param sender_address address of the sender, NULL if we did not initiate
- * @param session session we got the PING from
- * @return #GNUNET_OK if the message was fine, #GNUNET_SYSERR on serious error
- */
-int
-GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender,
-                            const struct GNUNET_MessageHeader *hdr,
-                            const struct GNUNET_HELLO_Address *sender_address,
-                            struct GNUNET_ATS_Session *session);
-
-
-/**
- * We've received a PONG.  Check if it matches a pending PING and
- * mark the respective address as confirmed.
- *
- * @param sender peer sending the PONG
- * @param hdr the PONG
- * @return #GNUNET_OK if the message was fine, #GNUNET_SYSERR on serious error
- */
-int
-GST_validation_handle_pong (const struct GNUNET_PeerIdentity *sender,
-                            const struct GNUNET_MessageHeader *hdr);
-
-
-/**
- * We've received a HELLO, check which addresses are new and trigger
- * validation.
- *
- * @param hello the HELLO we received
- * @return #GNUNET_OK if the message was fine, #GNUNET_SYSERR on serious error
- */
-int
-GST_validation_handle_hello (const struct GNUNET_MessageHeader *hello);
-
-
-/**
- * Validate an individual address.
- *
- * @param address address we should try to validate
- */
-void
-GST_validation_handle_address (const struct GNUNET_HELLO_Address *address);
-
-
-/**
- * Function called for each address (or address status change) that
- * the validation module is aware of (for the given target).
- *
- * @param cls closure
- * @param public_key public key for the peer, never NULL
- * @param valid_until is ZERO if we never validated the address,
- *                    otherwise a time up to when we consider it (or was) valid
- * @param validation_block  is FOREVER if the address is for an unsupported plugin (from PEERINFO)
- *                          is ZERO if the address is considered valid (no validation needed)
- *                          otherwise a time in the future if we're currently denying re-validation
- * @param address the address
- */
-typedef void
-(*GST_ValidationAddressCallback) (void *cls,
-                                  struct GNUNET_TIME_Absolute valid_until,
-                                  struct GNUNET_TIME_Absolute validation_block,
-                                  const struct GNUNET_HELLO_Address *address);
-
-
-/**
- * Call the given function for each address for the given target.
- *
- * @param target peer information is requested for
- * @param cb function to call; will not be called after this function returns
- * @param cb_cls closure for @a cb
- */
-void
-GST_validation_get_addresses (const struct GNUNET_PeerIdentity *target,
-                              GST_ValidationAddressCallback cb, void *cb_cls);
-
-
-#endif
-/* end of file gnunet-service-transport_validation.h */
diff --git a/src/transport/gnunet-transport-certificate-creation.in b/src/transport/gnunet-transport-certificate-creation.in
deleted file mode 100644
index 8348dd1b7..000000000
--- a/src/transport/gnunet-transport-certificate-creation.in
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/bin/sh
-#
-# This shell script will generate an X509 certificate for
-# your gnunet-transport HTTPS
-#
-# The current version partially reuses and recycles
-# code from build.sh by NetBSD (although not entirely
-# used because it needs debugging):
-#
-# Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to
-# The NetBSD Foundation by Todd Vierling and Luke Mewburn.
-
-# Redistribution and use in source and binary forms, with or
-# without modification, are permitted provided that the following
-# conditions are met:
-# 1. Redistributions of source code must retain the above
-#    copyright notice, this list of conditions and the following
-#    disclaimer.
-# 2. Redistributions in binary form must reproduce the above
-#    copyright notice, this list of conditions and the following
-#    disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
-# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED.
-# IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-# OF SUCH DAMAGE.
-
-progname=${0##*/}
-
-setdefaults()
-{
-    verbosity=0
-    runcmd=
-}
-
-statusmsg()
-{
-    ${runcmd} echo "    $@"
-}
-
-infomsg()
-{
-    if [ x$verbosity = x1 ]; then
-        statusmsg "INFO: $@"
-    fi
-}
-
-warningmsg()
-{
-    statusmsg "WARNING: $@"
-}
-
-errormsg()
-{
-    statusmsg "ERROR: $@"
-}
-
-linemsg()
-{
-    statusmsg "========================================="
-}
-
-
-usage()
-{
-    if [ -n "$*" ]; then
-        echo ""
-        echo "${progname}: $*"
-    fi
-    cat <<_usage_
-
-Usage: ${progname} [-hv] [-c FILE] [...]
-
-Options:
-   -c FILE      Use the configuration file FILE.
-   -h           Print this help message.
-   -v           Print the version and exit.
-   -V           be verbose
-
-_usage_
-        exit 1
-}
-
-
-generate_cert_key()
-{
-    echo ""
-    infomsg "Generating Cert and Key"
-
-    CERTTOOL=""
-    GNUTLS_CA_TEMPLATE=@PKGDATADIRECTORY@/gnunet-gns-proxy-ca.template
-    OPENSSL=0
-    if test -z "`gnutls-certtool --version`" > /dev/null
-    then
-      if test -z "`openssl version`" > /dev/null
-      then
-        warningmsg "Install either gnutls certtool or openssl for certificate generation!"
-        exit 1
-      else
-        OPENSSL=1
-      fi
-      CERTTOOL="openssl"
-    else
-      CERTTOOL="gnutls-certtool"
-    fi
-    mkdir -p `dirname $KEYFILE`
-
-    if test 1 -eq $OPENSSL
-    then
-      $CERTTOOL genrsa -out $KEYFILE 1024
-      $CERTTOOL req -batch -days 365 -out $CERTFILE -new -x509 -key $KEYFILE
-    else
-      $CERTTOOL --generate-privkey --outfile $KEYFILE 2>/dev/null
-      $CERTTOOL --template $GNUTLS_CA_TEMPLATE --generate-self-signed --load-privkey $KEYFILE --outfile $CERTFILE 2>/dev/null
-    fi
-  }
-
-print_version()
-{
-  GNUNET_ARM_VERSION=`gnunet-arm -v`
-  echo $GNUNET_ARM_VERSION
-}
-
-main()
-{
-  KEYFILE=$1
-  CERTFILE=$2
-  setdefaults
-  generate_cert_key
-}
-
-main "$@"
diff --git a/src/transport/gnunet-transport-profiler.c b/src/transport/gnunet-transport-profiler.c
deleted file mode 100644
index 6e5204e28..000000000
--- a/src/transport/gnunet-transport-profiler.c
+++ /dev/null
@@ -1,625 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2011-2016 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file src/transport/gnunet-transport-profiler.c
- * @brief Tool to help benchmark the transport subsystem.
- * @author Christian Grothoff
- * @author Nathan Evans
- *
- * This utility can be used to benchmark a transport mechanism for
- * GNUnet.
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_protocols.h"
-#include "gnunet_ats_service.h"
-#include "gnunet_transport_service.h"
-
-
-struct Iteration
-{
-  struct Iteration *next;
-  struct Iteration *prev;
-  struct GNUNET_TIME_Absolute start;
-  struct GNUNET_TIME_Absolute end;
-
-  struct GNUNET_TIME_Relative dur;
-
-  /* Transmission rate for this iteration in KB/s */
-  float rate;
-
-  unsigned int msgs_sent;
-};
-
-
-/**
- * Timeout for a connections
- */
-#define CONNECT_TIMEOUT \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
-
-/**
- * Benchmarking block size in bye
- */
-#define DEFAULT_MESSAGE_SIZE 1024
-
-/**
- * Benchmarking message count
- */
-#define DEFAULT_MESSAGE_COUNT 1024
-
-/**
- * Benchmarking iteration count
- */
-#define DEFAULT_ITERATION_COUNT 1
-
-/**
- * Option -s.
- */
-static int benchmark_send;
-
-/**
- * Option -b.
- */
-static int benchmark_receive;
-
-/**
- * Option -n.
- */
-static unsigned int benchmark_count;
-
-/**
- * Option -i.
- */
-static unsigned int benchmark_iterations;
-
-/**
- * Option -m.
- */
-static unsigned int benchmark_size;
-
-/**
- * Benchmark running
- */
-static unsigned int benchmark_running;
-
-/**
- * Which peer should we connect to?
- */
-static char *cpid;
-
-/**
- * Handle to transport service.
- */
-static struct GNUNET_TRANSPORT_CoreHandle *handle;
-
-/**
- * Handle to ATS service.
- */
-static struct GNUNET_ATS_ConnectivityHandle *ats;
-
-/**
- * Configuration handle
- */
-static struct GNUNET_CONFIGURATION_Handle *cfg;
-
-/**
- * Try_connect handle
- */
-static struct GNUNET_ATS_ConnectivitySuggestHandle *ats_sh;
-
-static struct Iteration *ihead;
-
-static struct Iteration *itail;
-
-/**
- * Global return value (0 success).
- */
-static int ret;
-
-/**
- * Handle for transmissions.
- */
-static struct GNUNET_MQ_Handle *mq;
-
-static struct GNUNET_TRANSPORT_Blacklist *bl_handle;
-
-/**
- * Identity of the peer we transmit to / connect to.
- * (equivalent to 'cpid' string).
- */
-static struct GNUNET_PeerIdentity pid;
-
-/**
- * Selected level of verbosity.
- */
-static unsigned int verbosity;
-
-
-/**
- * Task run in monitor mode when the user presses CTRL-C to abort.
- * Stops monitoring activity.
- *
- * @param cls NULL
- */
-static void
-shutdown_task (void *cls)
-{
-  struct Iteration *icur;
-  struct Iteration *inext;
-
-  unsigned int iterations;
-
-  unsigned long long avg_duration;
-  float avg_rate;
-  float stddev_rate;
-  float stddev_duration;
-
-  if (NULL != ats_sh)
-  {
-    GNUNET_ATS_connectivity_suggest_cancel (ats_sh);
-    ats_sh = NULL;
-  }
-  if (NULL != bl_handle)
-  {
-    GNUNET_TRANSPORT_blacklist_cancel (bl_handle);
-    bl_handle = NULL;
-  }
-  if (NULL != ats)
-  {
-    GNUNET_ATS_connectivity_done (ats);
-    ats = NULL;
-  }
-  if (NULL != handle)
-  {
-    GNUNET_TRANSPORT_core_disconnect (handle);
-    handle = NULL;
-  }
-
-  if (verbosity > 0)
-    fprintf (stdout, "\n");
-
-  /* Output format:
-   * All time values in ms
-   * Rate in KB/s
-   * #messages;#messagesize;#avg_dur;#avg_rate;#duration_i0;#duration_i0;... */
-
-  if (benchmark_send)
-  {
-    /* First iteration to calculate avg and stddev */
-    iterations = 0;
-    avg_duration = 0;
-    avg_rate = 0.0;
-
-    inext = ihead;
-    while (NULL != (icur = inext))
-    {
-      inext = icur->next;
-      icur->rate = ((benchmark_count * benchmark_size) / 1024)
-                   / ((float) icur->dur.rel_value_us / (1000 * 1000));
-      if (verbosity > 0)
-        fprintf (stdout,
-                 _ ("%llu B in %llu ms == %.2f KB/s!\n"),
-                 ((long long unsigned int) benchmark_count * benchmark_size),
-                 ((long long unsigned int) icur->dur.rel_value_us / 1000),
-                 (float) icur->rate);
-
-      avg_duration += icur->dur.rel_value_us / (1000);
-      avg_rate += icur->rate;
-      iterations++;
-    }
-    if (0 == iterations)
-      iterations = 1;   /* avoid division by zero */
-    /* Calculate average rate */
-    avg_rate /= iterations;
-    /* Calculate average duration */
-    avg_duration /= iterations;
-
-    stddev_rate = 0;
-    stddev_duration = 0;
-    inext = ihead;
-    while (NULL != (icur = inext))
-    {
-      inext = icur->next;
-      stddev_rate += ((icur->rate - avg_rate) * (icur->rate - avg_rate));
-      stddev_duration += (((icur->dur.rel_value_us / 1000) - avg_duration)
-                          * ((icur->dur.rel_value_us / 1000) - avg_duration));
-    }
-    /* Calculate standard deviation rate */
-    stddev_rate = stddev_rate / iterations;
-    stddev_rate = sqrtf (stddev_rate);
-
-    /* Calculate standard deviation duration */
-    stddev_duration = stddev_duration / iterations;
-    stddev_duration = sqrtf (stddev_duration);
-
-    /* Output */
-    fprintf (stdout,
-             "%u;%u;%llu;%llu;%.2f;%.2f",
-             benchmark_count,
-             benchmark_size,
-             avg_duration,
-             (unsigned long long) stddev_duration,
-             avg_rate,
-             stddev_rate);
-
-    inext = ihead;
-    while (NULL != (icur = inext))
-    {
-      inext = icur->next;
-      GNUNET_CONTAINER_DLL_remove (ihead, itail, icur);
-
-      fprintf (stdout,
-               ";%llu;%.2f",
-               (long long unsigned int) (icur->dur.rel_value_us / 1000),
-               icur->rate);
-
-      GNUNET_free (icur);
-    }
-  }
-#if 0
-  if (benchmark_receive)
-  {
-    duration = GNUNET_TIME_absolute_get_duration (start_time);
-    fprintf (stdout,
-             "Received %llu bytes/s (%llu bytes in %s)\n",
-             1000LL * 1000LL * traffic_received / (1 + duration.rel_value_us),
-             traffic_received,
-             GNUNET_STRINGS_relative_time_to_string (duration, GNUNET_YES));
-  }
-#endif
-  fprintf (stdout, "\n");
-}
-
-
-static void
-iteration_done ();
-
-
-/**
- * Function called to notify a client about the socket
- * begin ready to queue more data.  @a buf will be
- * NULL and @a size zero if the socket was closed for
- * writing in the meantime.
- *
- * @param cls closure
- * @param size number of bytes available in @a buf
- * @param buf where the callee should write the message
- * @return number of bytes written to @a buf
- */
-static void
-send_msg (void *cls)
-{
-  struct GNUNET_MQ_Envelope *env;
-  struct GNUNET_MessageHeader *m;
-
-  if (NULL == mq)
-    return;
-  env = GNUNET_MQ_msg_extra (m, benchmark_size, GNUNET_MESSAGE_TYPE_DUMMY);
-  memset (&m[1], 52, benchmark_size - sizeof(struct GNUNET_MessageHeader));
-
-  if (itail->msgs_sent < benchmark_count)
-  {
-    GNUNET_MQ_notify_sent (env, &send_msg, NULL);
-  }
-  else
-  {
-    iteration_done ();
-  }
-  GNUNET_MQ_send (mq, env);
-  if ((verbosity > 0) && (0 == itail->msgs_sent % 10))
-    fprintf (stdout, ".");
-}
-
-
-static void
-iteration_start ()
-{
-  struct Iteration *icur;
-
-  ret = 0;
-  if (! benchmark_send)
-    return;
-  benchmark_running = GNUNET_YES;
-  icur = GNUNET_new (struct Iteration);
-  GNUNET_CONTAINER_DLL_insert_tail (ihead, itail, icur);
-  icur->start = GNUNET_TIME_absolute_get ();
-  if (verbosity > 0)
-    fprintf (
-      stdout,
-      "\nStarting benchmark, starting to send %u messages in %u byte blocks\n",
-      benchmark_count,
-      benchmark_size);
-  send_msg (NULL);
-}
-
-
-static void
-iteration_done ()
-{
-  static int it_count = 0;
-
-  it_count++;
-  itail->dur = GNUNET_TIME_absolute_get_duration (itail->start);
-  if (it_count == benchmark_iterations)
-  {
-    benchmark_running = GNUNET_NO;
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-  iteration_start ();
-}
-
-
-/**
- * Function called to notify transport users that another
- * peer connected to us.
- *
- * @param cls closure
- * @param peer the peer that connected
- * @param m message queue for transmissions
- * @return NULL
- */
-static void *
-notify_connect (void *cls,
-                const struct GNUNET_PeerIdentity *peer,
-                struct GNUNET_MQ_Handle *m)
-{
-  if (0 != memcmp (&pid, peer, sizeof(struct GNUNET_PeerIdentity)))
-  {
-    fprintf (stdout, "Connected to different peer `%s'\n", GNUNET_i2s (&pid));
-    return NULL;
-  }
-
-  if (verbosity > 0)
-    fprintf (stdout, "Successfully connected to `%s'\n", GNUNET_i2s (&pid));
-  mq = m;
-  iteration_start ();
-  return NULL;
-}
-
-
-/**
- * Function called to notify transport users that another
- * peer disconnected from us.
- *
- * @param cls closure
- * @param peer the peer that disconnected
- * @param internal_cls NULL
- */
-static void
-notify_disconnect (void *cls,
-                   const struct GNUNET_PeerIdentity *peer,
-                   void *internal_cls)
-{
-  if (0 != memcmp (&pid, peer, sizeof(struct GNUNET_PeerIdentity)))
-    return;
-  mq = NULL;
-  if (GNUNET_YES == benchmark_running)
-  {
-    fprintf (stdout,
-             "Disconnected from peer `%s' while benchmarking\n",
-             GNUNET_i2s (&pid));
-    return;
-  }
-}
-
-
-/**
- * Function called by the transport for each received message.
- *
- * @param cls closure
- * @param message the message
- * @return #GNUNET_OK
- */
-static int
-check_dummy (void *cls, const struct GNUNET_MessageHeader *message)
-{
-  return GNUNET_OK; /* all messages are fine */
-}
-
-
-/**
- * Function called by the transport for each received message.
- *
- * @param cls closure
- * @param message the message
- */
-static void
-handle_dummy (void *cls, const struct GNUNET_MessageHeader *message)
-{
-  if (! benchmark_receive)
-    return;
-  if (verbosity > 0)
-    fprintf (stdout,
-             "Received %u bytes\n",
-             (unsigned int) ntohs (message->size));
-}
-
-
-static int
-blacklist_cb (void *cls, const struct GNUNET_PeerIdentity *peer)
-{
-  if (0 != memcmp (&pid, peer, sizeof(struct GNUNET_PeerIdentity)))
-  {
-    if (verbosity > 0)
-      fprintf (stdout, "Denying connection to `%s'\n", GNUNET_i2s (peer));
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Main function that will be run by the scheduler.
- *
- * @param cls closure
- * @param args remaining command-line arguments
- * @param cfgfile name of the configuration file used (for saving, can be NULL!)
- * @param mycfg configuration
- */
-static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *mycfg)
-{
-  struct GNUNET_MQ_MessageHandler handlers[] =
-  { GNUNET_MQ_hd_var_size (dummy,
-                           GNUNET_MESSAGE_TYPE_DUMMY,
-                           struct GNUNET_MessageHeader,
-                           NULL),
-    GNUNET_MQ_handler_end () };
-
-  cfg = (struct GNUNET_CONFIGURATION_Handle *) mycfg;
-
-  ret = 1;
-  if (GNUNET_MAX_MESSAGE_SIZE <= benchmark_size)
-  {
-    fprintf (stderr, "Message size too big!\n");
-    return;
-  }
-
-  if (NULL == cpid)
-  {
-    fprintf (stderr, "No peer identity given\n");
-    return;
-  }
-  if (GNUNET_OK != GNUNET_CRYPTO_eddsa_public_key_from_string (cpid,
-                                                               strlen (cpid),
-                                                               &pid.public_key))
-  {
-    fprintf (stderr, "Failed to parse peer identity `%s'\n", cpid);
-    return;
-  }
-  if (1 == benchmark_send)
-  {
-    if (verbosity > 0)
-      fprintf (stderr,
-               "Trying to send %u messages with size %u to peer `%s'\n",
-               benchmark_count,
-               benchmark_size,
-               GNUNET_i2s (&pid));
-  }
-  else if (1 == benchmark_receive)
-  {
-    fprintf (stderr,
-             "Trying to receive messages from peer `%s'\n",
-             GNUNET_i2s (&pid));
-  }
-  else
-  {
-    fprintf (stderr, "No operation given\n");
-    return;
-  }
-
-  ats = GNUNET_ATS_connectivity_init (cfg);
-  if (NULL == ats)
-  {
-    fprintf (stderr, "Failed to connect to ATS service\n");
-    ret = 1;
-    return;
-  }
-
-  handle = GNUNET_TRANSPORT_core_connect (cfg,
-                                          NULL,
-                                          handlers,
-                                          NULL,
-                                          &notify_connect,
-                                          &notify_disconnect,
-                                          NULL);
-  if (NULL == handle)
-  {
-    fprintf (stderr, "Failed to connect to transport service\n");
-    GNUNET_ATS_connectivity_done (ats);
-    ats = NULL;
-    ret = 1;
-    return;
-  }
-
-  bl_handle = GNUNET_TRANSPORT_blacklist (cfg, &blacklist_cb, NULL);
-  ats_sh = GNUNET_ATS_connectivity_suggest (ats, &pid, 1);
-  GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
-}
-
-
-int
-main (int argc, char *const *argv)
-{
-  int res;
-
-  benchmark_count = DEFAULT_MESSAGE_COUNT;
-  benchmark_size = DEFAULT_MESSAGE_SIZE;
-  benchmark_iterations = DEFAULT_ITERATION_COUNT;
-  benchmark_running = GNUNET_NO;
-
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_option_flag ('s',
-                               "send",
-                               gettext_noop ("send data to peer"),
-                               &benchmark_send),
-    GNUNET_GETOPT_option_flag ('r',
-                               "receive",
-                               gettext_noop ("receive data from peer"),
-                               &benchmark_receive),
-    GNUNET_GETOPT_option_uint ('i',
-                               "iterations",
-                               NULL,
-                               gettext_noop ("iterations"),
-                               &benchmark_iterations),
-    GNUNET_GETOPT_option_uint ('n',
-                               "number",
-                               NULL,
-                               gettext_noop ("number of messages to send"),
-                               &benchmark_count),
-    GNUNET_GETOPT_option_uint ('m',
-                               "messagesize",
-                               NULL,
-                               gettext_noop ("message size to use"),
-                               &benchmark_size),
-    GNUNET_GETOPT_option_string ('p',
-                                 "peer",
-                                 "PEER",
-                                 gettext_noop ("peer identity"),
-                                 &cpid),
-    GNUNET_GETOPT_option_verbose (&verbosity),
-    GNUNET_GETOPT_OPTION_END
-  };
-
-  if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
-    return 2;
-
-  res =
-    GNUNET_PROGRAM_run (argc,
-                        argv,
-                        "gnunet-transport",
-                        gettext_noop ("Direct access to transport service."),
-                        options,
-                        &run,
-                        NULL);
-  GNUNET_free_nz ((void *) argv);
-  if (GNUNET_OK == res)
-    return ret;
-  return 1;
-}
-
-
-/* end of gnunet-transport-profiler.c */
diff --git a/src/transport/gnunet-transport-wlan-receiver.c b/src/transport/gnunet-transport-wlan-receiver.c
deleted file mode 100644
index 7f34a957f..000000000
--- a/src/transport/gnunet-transport-wlan-receiver.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-   This file is part of GNUnet
-   Copyright (C) 2012 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/gnunet-transport-wlan-receiver.c
- * @brief program to send via WLAN as much as possible (to test physical/theoretical throughput)
- * @author David Brodski
- */
-#include "platform.h"
-#include "gnunet_protocols.h"
-#include "plugin_transport_wlan.h"
-
-int
-main (int argc, char *argv[])
-{
-  char msg_buf[65536];
-  unsigned long long count;
-  double bytes_per_s;
-  time_t start;
-  time_t akt;
-  ssize_t ret;
-  pid_t pid;
-  int commpipe[2]; /* This holds the fd for the input & output of the pipe */
-
-  if (2 != argc)
-  {
-    fprintf (stderr,
-             "This program must be started with the interface name as argument.\n");
-    fprintf (stderr,
-             "Usage: %s interface-name\n"
-             "e.g. %s mon0\n",
-             argv[0],
-             argv[0]);
-    return 1;
-  }
-
-  /* Setup communication pipeline first */
-  if (pipe (commpipe))
-  {
-    fprintf (stderr, "Failed to create pipe: %s\n", strerror (errno));
-    exit (1);
-  }
-
-  /* Attempt to fork and check for errors */
-  if ((pid = fork ()) == -1)
-  {
-    fprintf (stderr, "Failed to fork: %s\n", strerror (errno));
-    exit (1);
-  }
-
-  if (pid)
-  {
-    /* A positive (non-negative) PID indicates the parent process */
-    if (0 != close (commpipe[1]))  /* Close unused side of pipe (in side) */
-      fprintf (stderr, "Failed to close fd: %s\n", strerror (errno));
-    start = time (NULL);
-    count = 0;
-    while (1)
-    {
-      ret = read (commpipe[0], msg_buf, sizeof(msg_buf));
-      if (0 > ret)
-      {
-        fprintf (stderr, "read failed: %s\n", strerror (errno));
-        break;
-      }
-      count += ret;
-      akt = time (NULL);
-      if (akt - start > 30)
-      {
-        bytes_per_s = count / (akt - start);
-        bytes_per_s /= 1024;
-        printf ("recv %f kb/s\n", bytes_per_s);
-        start = akt;
-        count = 0;
-      }
-    }
-  }
-  else
-  {
-    /* A zero PID indicates that this is the child process */
-    (void) close (1);
-    if (-1 ==
-        dup2 (commpipe[1], 1))  /* Replace stdin with the in side of the pipe */
-      fprintf (stderr, "dup2 failed: %s\n", strerror (errno));
-    (void) close (commpipe[0]); /* Close unused side of pipe (in side) */
-    /* Replace the child fork with a new process */
-    if (execlp ("gnunet-helper-transport-wlan",
-                "gnunet-helper-transport-wlan",
-                argv[1],
-                NULL) == -1)
-    {
-      fprintf (stderr, "Could not start gnunet-helper-transport-wlan!");
-      _exit (1);
-    }
-  }
-  return 0;
-}
diff --git a/src/transport/gnunet-transport-wlan-sender.c b/src/transport/gnunet-transport-wlan-sender.c
deleted file mode 100644
index 5256ec7be..000000000
--- a/src/transport/gnunet-transport-wlan-sender.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
-   This file is part of GNUnet
-   Copyright (C) 2011 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/gnunet-transport-wlan-sender.c
- * @brief program to send via WLAN as much as possible (to test physical/theoretical throughput)
- * @author David Brodski
- */
-#include "platform.h"
-#include "plugin_transport_wlan.h"
-#include "gnunet_protocols.h"
-
-#define WLAN_MTU 1500
-
-/**
- * LLC fields for better compatibility
- */
-#define WLAN_LLC_DSAP_FIELD 0x1f
-#define WLAN_LLC_SSAP_FIELD 0x1f
-
-#define IEEE80211_ADDR_LEN 6 /* size of 802.11 address */
-
-#define IEEE80211_FC0_VERSION_MASK 0x03
-#define IEEE80211_FC0_VERSION_SHIFT 0
-#define IEEE80211_FC0_VERSION_0 0x00
-#define IEEE80211_FC0_TYPE_MASK 0x0c
-#define IEEE80211_FC0_TYPE_SHIFT 2
-#define IEEE80211_FC0_TYPE_MGT 0x00
-#define IEEE80211_FC0_TYPE_CTL 0x04
-#define IEEE80211_FC0_TYPE_DATA 0x08
-
-
-/**
- * function to fill the radiotap header
- * @param header pointer to the radiotap header
- * @param size total message size
- * @return GNUNET_YES at success
- */
-static int
-getRadiotapHeader (struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage *header,
-                   uint16_t size)
-{
-  header->header.size = htons (size);
-  header->header.type = htons (GNUNET_MESSAGE_TYPE_WLAN_DATA_TO_HELPER);
-  header->rate = 255;
-  header->tx_power = 0;
-  header->antenna = 0;
-  return GNUNET_YES;
-}
-
-
-/**
- * function to generate the wlan hardware header for one packet
- * @param Header address to write the header to
- * @param to_mac_addr pointer to the address of the recipient
- * @param mac pointer to the mac address to send from (normally overwritten over by helper)
- * @param size size of the whole packet, needed to calculate the time to send the packet
- * @return GNUNET_YES if there was no error
- */
-static int
-getWlanHeader (struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame *Header,
-               const struct GNUNET_TRANSPORT_WLAN_MacAddress *to_mac_addr,
-               const struct GNUNET_TRANSPORT_WLAN_MacAddress *mac,
-               unsigned int size)
-{
-  const int rate = 11000000;
-
-  Header->frame_control = htons (IEEE80211_FC0_TYPE_DATA);
-  Header->addr3 = mac_bssid_gnunet;
-  Header->addr2 = *mac;
-  Header->addr1 = *to_mac_addr;
-  Header->duration = GNUNET_htole16 ((size * 1000000) / rate + 290);
-  Header->llc[0] = WLAN_LLC_DSAP_FIELD;
-  Header->llc[1] = WLAN_LLC_SSAP_FIELD;
-  Header->llc[2] = 0; // FIXME
-  Header->llc[3] = 0; // FIXME
-  return GNUNET_YES;
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  char msg_buf[WLAN_MTU];
-  struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage *radiotap;
-  unsigned int temp[6];
-  struct GNUNET_TRANSPORT_WLAN_MacAddress inmac;
-  struct GNUNET_TRANSPORT_WLAN_MacAddress outmac;
-  struct GNUNET_TRANSPORT_WLAN_HelperControlMessage hcm;
-  unsigned long long count;
-  double bytes_per_s;
-  time_t start;
-  time_t akt;
-  int i;
-  ssize_t ret;
-  pid_t pid;
-  int commpipe[2]; /* This holds the fd for the input & output of the pipe */
-  int macpipe[2]; /* This holds the fd for the input & output of the pipe */
-
-  if (4 != argc)
-  {
-    fprintf (
-      stderr,
-      "This program must be started with the interface and the targets and source mac as argument.\n");
-    fprintf (stderr,
-             "Usage: interface-name mac-DST mac-SRC\n"
-             "e.g. mon0 11-22-33-44-55-66 12-34-56-78-90-ab\n");
-    return 1;
-  }
-  if (6 != sscanf (argv[2],
-                   "%x-%x-%x-%x-%x-%x",
-                   &temp[0],
-                   &temp[1],
-                   &temp[2],
-                   &temp[3],
-                   &temp[4],
-                   &temp[5]))
-  {
-    fprintf (stderr,
-             "Usage: interface-name mac-DST mac-SRC\n"
-             "e.g. mon0 11-22-33-44-55-66 12-34-56-78-90-ab\n");
-    return 1;
-  }
-  for (i = 0; i < 6; i++)
-    outmac.mac[i] = temp[i];
-  if (6 != sscanf (argv[3],
-                   "%x-%x-%x-%x-%x-%x",
-                   &temp[0],
-                   &temp[1],
-                   &temp[2],
-                   &temp[3],
-                   &temp[4],
-                   &temp[5]))
-  {
-    fprintf (stderr,
-             "Usage: interface-name mac-DST mac-SRC\n"
-             "e.g. mon0 11-22-33-44-55-66 12-34-56-78-90-ab\n");
-    return 1;
-  }
-  for (i = 0; i < 6; i++)
-    inmac.mac[i] = temp[i];
-
-
-  /* Setup communication pipeline first */
-  if (pipe (commpipe))
-  {
-    fprintf (stderr, "Failed to create pipe: %s\n", strerror (errno));
-    exit (1);
-  }
-  if (pipe (macpipe))
-  {
-    fprintf (stderr, "Failed to create pipe: %s\n", strerror (errno));
-    exit (1);
-  }
-
-  /* Attempt to fork and check for errors */
-  if ((pid = fork ()) == -1)
-  {
-    fprintf (stderr, "Failed to fork: %s\n", strerror (errno));
-    exit (1);
-  }
-  memset (msg_buf, 0x42, sizeof(msg_buf));
-  if (pid)
-  {
-    /* A positive (non-negative) PID indicates the parent process */
-    if (0 != close (commpipe[0]))  /* Close unused side of pipe (in side) */
-      fprintf (stderr, "Failed to close fd: %s\n", strerror (errno));
-    setvbuf (stdout,
-             (char *) NULL,
-             _IONBF,
-             0);  /* Set non-buffered output on stdout */
-
-    if (0 != close (macpipe[1]))
-      fprintf (stderr, "Failed to close fd: %s\n", strerror (errno));
-    if (sizeof(hcm) != read (macpipe[0], &hcm, sizeof(hcm)))
-      fprintf (stderr, "Failed to read hcm...\n");
-    fprintf (stderr,
-             "Got MAC %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n",
-             hcm.mac.mac[0],
-             hcm.mac.mac[1],
-             hcm.mac.mac[2],
-             hcm.mac.mac[3],
-             hcm.mac.mac[4],
-             hcm.mac.mac[5]);
-    radiotap = (struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage *) msg_buf;
-    getRadiotapHeader (radiotap, WLAN_MTU);
-    getWlanHeader (&radiotap->frame, &outmac, &inmac, WLAN_MTU);
-    start = time (NULL);
-    count = 0;
-    while (1)
-    {
-      ret = write (commpipe[1], msg_buf, WLAN_MTU);
-      if (0 > ret)
-      {
-        fprintf (stderr, "write failed: %s\n", strerror (errno));
-        break;
-      }
-      count += ret;
-      akt = time (NULL);
-      if (akt - start > 30)
-      {
-        bytes_per_s = count / (akt - start);
-        bytes_per_s /= 1024;
-        printf ("send %f kbytes/s\n", bytes_per_s);
-        start = akt;
-        count = 0;
-      }
-    }
-  }
-  else
-  {
-    /* A zero PID indicates that this is the child process */
-    (void) close (0);
-    (void) close (1);
-    if (-1 ==
-        dup2 (commpipe[0], 0))  /* Replace stdin with the in side of the pipe */
-      fprintf (stderr, "dup2 failed: %s\n", strerror (errno));
-    if (-1 ==
-        dup2 (macpipe[1], 1))  /* Replace stdout with the out side of the pipe */
-      fprintf (stderr, "dup2 failed: %s\n", strerror (errno));
-    (void) close (commpipe[1]); /* Close unused side of pipe (out side) */
-    (void) close (macpipe[0]); /* Close unused side of pipe (in side) */
-    /* Replace the child fork with a new process */
-    if (execlp ("gnunet-helper-transport-wlan",
-                "gnunet-helper-transport-wlan",
-                argv[1],
-                NULL) == -1)
-    {
-      fprintf (stderr, "Could not start gnunet-helper-transport-wlan!");
-      _exit (1);
-    }
-  }
-  return 0;
-}
diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c
deleted file mode 100644
index b5ad43770..000000000
--- a/src/transport/gnunet-transport.c
+++ /dev/null
@@ -1,1437 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2011-2014, 2016, 2017 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file src/transport/gnunet-transport.c
- * @brief Tool to help configure, measure and control the transport subsystem.
- * @author Christian Grothoff
- * @author Nathan Evans
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_resolver_service.h"
-#include "gnunet_protocols.h"
-#include "gnunet_transport_service.h"
-
-/**
- * Timeout for a name resolution
- */
-#define RESOLUTION_TIMEOUT \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
-
-/**
- * Timeout for an operation
- */
-#define OP_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
-
-
-/**
- * Context to store name resolutions for valiation
- */
-struct ValidationResolutionContext
-{
-  /**
-   * Next in DLL
-   */
-  struct ValidationResolutionContext *next;
-
-  /**
-   * Previous in DLL
-   */
-  struct ValidationResolutionContext *prev;
-
-  /**
-   * Address to resolve
-   */
-  struct GNUNET_HELLO_Address *addrcp;
-
-  /**
-   * Time of last validation
-   */
-  struct GNUNET_TIME_Absolute last_validation;
-
-  /**
-   * Address is valid until
-   */
-  struct GNUNET_TIME_Absolute valid_until;
-
-  /**
-   * Time of next validation
-   */
-  struct GNUNET_TIME_Absolute next_validation;
-
-  /**
-   * Transport conversion handle
-   */
-  struct GNUNET_TRANSPORT_AddressToStringContext *asc;
-
-  /**
-   * plugin name
-   */
-  char *transport;
-
-  /**
-   * was the entry printed
-   */
-  int printed;
-};
-
-/**
- * Struct to store information about peers in monitor mode
- */
-struct MonitoredPeer
-{
-  /**
-   * State of the peer
-   */
-  enum GNUNET_TRANSPORT_PeerState state;
-
-  /**
-   * Timeout
-   */
-  struct GNUNET_TIME_Absolute state_timeout;
-
-  /**
-   * The address to convert
-   */
-  struct GNUNET_HELLO_Address *address;
-};
-
-/**
- * Context to store name resolutions for valiation
- */
-struct PeerResolutionContext
-{
-  /**
-   * Next in DLL
-   */
-  struct PeerResolutionContext *next;
-
-  /**
-   * Prev in DLL
-   */
-  struct PeerResolutionContext *prev;
-
-  /**
-   * address to resolve
-   */
-  struct GNUNET_HELLO_Address *addrcp;
-
-  /**
-   * transport conversiion context
-   */
-  struct GNUNET_TRANSPORT_AddressToStringContext *asc;
-
-  /**
-   * peer state
-   */
-  enum GNUNET_TRANSPORT_PeerState state;
-
-  /**
-   * state timeout
-   */
-  struct GNUNET_TIME_Absolute state_timeout;
-
-  /**
-   * transport plugin
-   */
-  char *transport;
-
-  /**
-   * was the entry printed
-   */
-  int printed;
-};
-
-
-/**
- * Benchmarking block size in KB
- */
-#define BLOCKSIZE 4
-
-/**
- * Handle to transport service.
- */
-static struct GNUNET_TRANSPORT_CoreHandle *handle;
-
-/**
- * Configuration handle
- */
-static struct GNUNET_CONFIGURATION_Handle *cfg;
-
-/**
- * Blacklisting handle
- */
-struct GNUNET_TRANSPORT_Blacklist *blacklist;
-
-/**
- * Option -s.
- */
-static int benchmark_send;
-
-/**
- * Option -b.
- */
-static int benchmark_receive;
-
-/**
- * Option -l.
- */
-static int benchmark_receive;
-
-/**
- * Option -i.
- */
-static int iterate_connections;
-
-/**
- * Option -a.
- */
-static int iterate_all;
-
-/**
- * Option -c.
- */
-static int monitor_connects;
-
-/**
- * Option -m.
- */
-static int monitor_connections;
-
-/**
- * Option -P.
- */
-static int monitor_plugins;
-
-/**
- * Option -D.
- */
-static int do_disconnect;
-
-/**
- * Option -n.
- */
-static int numeric;
-
-/**
- * Global return value (0 success).
- */
-static int ret;
-
-/**
- * Current number of connections in monitor mode
- */
-static int monitor_connect_counter;
-
-/**
- * Number of bytes of traffic we received so far.
- */
-static unsigned long long traffic_received;
-
-/**
- * Number of bytes of traffic we sent so far.
- */
-static unsigned long long traffic_sent;
-
-/**
- * Starting time of transmitting/receiving data.
- */
-static struct GNUNET_TIME_Absolute start_time;
-
-/**
- * Map storing information about monitored peers
- */
-static struct GNUNET_CONTAINER_MultiPeerMap *monitored_peers;
-
-/**
- * Map storing information about monitored plugins's sessions.
- */
-static struct GNUNET_CONTAINER_MultiPeerMap *monitored_plugins;
-
-/**
- * Handle if we are monitoring peers at the transport level.
- */
-static struct GNUNET_TRANSPORT_PeerMonitoringContext *pic;
-
-/**
- * Handle if we are monitoring plugin session activity.
- */
-static struct GNUNET_TRANSPORT_PluginMonitor *pm;
-
-/**
- * Identity of the peer we transmit to / connect to.
- * ('-p' command-line option).
- */
-static struct GNUNET_PeerIdentity pid;
-
-/**
- * Task for operation timeout
- */
-static struct GNUNET_SCHEDULER_Task *op_timeout;
-
-/**
- * Selected level of verbosity.
- */
-static unsigned int verbosity;
-
-/**
- * Resolver process handle.
- */
-struct GNUNET_OS_Process *resolver;
-
-/**
- * Number of address resolutions pending
- */
-static unsigned int address_resolutions;
-
-/**
- * DLL: head of validation resolution entries
- */
-static struct ValidationResolutionContext *vc_head;
-
-/**
- * DLL: tail of validation resolution entries
- */
-static struct ValidationResolutionContext *vc_tail;
-
-/**
- * DLL: head of resolution entries
- */
-static struct PeerResolutionContext *rc_head;
-
-/**
- * DLL: head of resolution entries
- */
-static struct PeerResolutionContext *rc_tail;
-
-
-/**
- * Function called to release data stored in the #monitored_peers map.
- *
- * @param cls unused
- * @param key the peer identity
- * @param value a `struct MonitoredPeer` to release
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-destroy_it (void *cls, const struct GNUNET_PeerIdentity *key, void *value)
-{
-  struct MonitoredPeer *m = value;
-
-  GNUNET_assert (
-    GNUNET_OK ==
-    GNUNET_CONTAINER_multipeermap_remove (monitored_peers, key, value));
-  GNUNET_free (m->address);
-  GNUNET_free (value);
-  return GNUNET_OK;
-}
-
-
-/**
- * Task run in monitor mode when the user presses CTRL-C to abort.
- * Stops monitoring activity.
- *
- * @param cls NULL
- */
-static void
-shutdown_task (void *cls)
-{
-  struct GNUNET_TIME_Relative duration;
-  struct ValidationResolutionContext *cur;
-  struct ValidationResolutionContext *next;
-  struct PeerResolutionContext *rc;
-
-  if (NULL != op_timeout)
-  {
-    GNUNET_SCHEDULER_cancel (op_timeout);
-    op_timeout = NULL;
-  }
-  if (NULL != pic)
-  {
-    GNUNET_TRANSPORT_monitor_peers_cancel (pic);
-    pic = NULL;
-  }
-  if (NULL != pm)
-  {
-    GNUNET_TRANSPORT_monitor_plugins_cancel (pm);
-    pm = NULL;
-  }
-
-  next = vc_head;
-  for (cur = next; NULL != cur; cur = next)
-  {
-    next = cur->next;
-
-    GNUNET_TRANSPORT_address_to_string_cancel (cur->asc);
-    GNUNET_CONTAINER_DLL_remove (vc_head, vc_tail, cur);
-    GNUNET_free (cur->transport);
-    GNUNET_HELLO_address_free (cur->addrcp);
-    GNUNET_free (cur);
-  }
-  while (NULL != (rc = rc_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (rc_head, rc_tail, rc);
-    GNUNET_TRANSPORT_address_to_string_cancel (rc->asc);
-    GNUNET_free (rc->transport);
-    GNUNET_free (rc->addrcp);
-    GNUNET_free (rc);
-  }
-  if (NULL != handle)
-  {
-    GNUNET_TRANSPORT_core_disconnect (handle);
-    handle = NULL;
-  }
-  if (benchmark_send)
-  {
-    duration = GNUNET_TIME_absolute_get_duration (start_time);
-    fprintf (stdout,
-             _ ("Transmitted %llu bytes/s (%llu bytes in %s)\n"),
-             1000LL * 1000LL * traffic_sent / (1 + duration.rel_value_us),
-             traffic_sent,
-             GNUNET_STRINGS_relative_time_to_string (duration, GNUNET_YES));
-  }
-  if (benchmark_receive)
-  {
-    duration = GNUNET_TIME_absolute_get_duration (start_time);
-    fprintf (stdout,
-             _ ("Received %llu bytes/s (%llu bytes in %s)\n"),
-             1000LL * 1000LL * traffic_received / (1 + duration.rel_value_us),
-             traffic_received,
-             GNUNET_STRINGS_relative_time_to_string (duration, GNUNET_YES));
-  }
-
-  if (NULL != monitored_peers)
-  {
-    GNUNET_CONTAINER_multipeermap_iterate (monitored_peers, &destroy_it, NULL);
-    GNUNET_CONTAINER_multipeermap_destroy (monitored_peers);
-    monitored_peers = NULL;
-  }
-  if (NULL != monitored_plugins)
-  {
-    GNUNET_break (0 == GNUNET_CONTAINER_multipeermap_size (monitored_plugins));
-    GNUNET_CONTAINER_multipeermap_destroy (monitored_plugins);
-    monitored_plugins = NULL;
-  }
-  if (NULL != blacklist)
-  {
-    GNUNET_TRANSPORT_blacklist_cancel (blacklist);
-    blacklist = NULL;
-    ret = 0;
-  }
-}
-
-
-/**
- * We are done, shut down.
- */
-static void
-operation_timeout (void *cls)
-{
-  struct PeerResolutionContext *cur;
-  struct PeerResolutionContext *next;
-
-  op_timeout = NULL;
-  if ((benchmark_send) || (benchmark_receive))
-  {
-    fprintf (stdout, _ ("Failed to connect to `%s'\n"), GNUNET_i2s_full (&pid));
-    GNUNET_SCHEDULER_shutdown ();
-    ret = 1;
-    return;
-  }
-  if (iterate_connections)
-  {
-    next = rc_head;
-    while (NULL != (cur = next))
-    {
-      next = cur->next;
-      fprintf (stdout,
-               _ ("Failed to resolve address for peer `%s'\n"),
-               GNUNET_i2s (&cur->addrcp->peer));
-
-      GNUNET_CONTAINER_DLL_remove (rc_head, rc_tail, cur);
-      GNUNET_TRANSPORT_address_to_string_cancel (cur->asc);
-      GNUNET_free (cur->transport);
-      GNUNET_free (cur->addrcp);
-      GNUNET_free (cur);
-    }
-    fprintf (stdout,
-             "%s",
-             _ ("Failed to list connections, timeout occurred\n"));
-    GNUNET_SCHEDULER_shutdown ();
-    ret = 1;
-    return;
-  }
-}
-
-
-/**
- * Function called to notify a client about the socket
- * begin ready to queue more data.  Sends another message.
- *
- * @param cls closure with the message queue
- */
-static void
-do_send (void *cls)
-{
-  struct GNUNET_MQ_Handle *mq = cls;
-  struct GNUNET_MessageHeader *m;
-  struct GNUNET_MQ_Envelope *env;
-
-  env = GNUNET_MQ_msg_extra (m, BLOCKSIZE * 1024, GNUNET_MESSAGE_TYPE_DUMMY);
-  memset (&m[1], 52, BLOCKSIZE * 1024 - sizeof(struct GNUNET_MessageHeader));
-  traffic_sent += BLOCKSIZE * 1024;
-  GNUNET_MQ_notify_sent (env, &do_send, mq);
-  if (verbosity > 0)
-    fprintf (stdout,
-             _ ("Transmitting %u bytes\n"),
-             (unsigned int) BLOCKSIZE * 1024);
-  GNUNET_MQ_send (mq, env);
-}
-
-
-/**
- * Function called to notify transport users that another
- * peer connected to us.
- *
- * @param cls closure
- * @param peer the peer that connected
- * @param mq message queue for sending to @a peer
- */
-static void *
-notify_connect (void *cls,
-                const struct GNUNET_PeerIdentity *peer,
-                struct GNUNET_MQ_Handle *mq)
-{
-  if (0 != memcmp (&pid, peer, sizeof(struct GNUNET_PeerIdentity)))
-    return NULL;
-  ret = 0;
-  if (! benchmark_send)
-    return NULL;
-  if (NULL != op_timeout)
-  {
-    GNUNET_SCHEDULER_cancel (op_timeout);
-    op_timeout = NULL;
-  }
-  if (verbosity > 0)
-    fprintf (
-      stdout,
-      _ (
-        "Successfully connected to `%s', starting to send benchmark data in %u Kb blocks\n"),
-      GNUNET_i2s (peer),
-      BLOCKSIZE);
-  start_time = GNUNET_TIME_absolute_get ();
-  do_send (mq);
-  return mq;
-}
-
-
-/**
- * Function called to notify transport users that another
- * peer disconnected from us.
- *
- * @param cls closure
- * @param peer the peer that disconnected
- * @param internal_cls what we returned from #notify_connect()
- */
-static void
-notify_disconnect (void *cls,
-                   const struct GNUNET_PeerIdentity *peer,
-                   void *internal_cls)
-{
-  if (0 != memcmp (&pid, peer, sizeof(struct GNUNET_PeerIdentity)))
-    return;
-  if (NULL == internal_cls)
-    return; /* not about target peer */
-  if (! benchmark_send)
-    return; /* not transmitting */
-  fprintf (stdout,
-           _ ("Disconnected from peer `%s' while benchmarking\n"),
-           GNUNET_i2s (&pid));
-}
-
-
-/**
- * Function called to notify transport users that another
- * peer connected to us.
- *
- * @param cls closure
- * @param peer the peer that connected
- * @param mq for sending messages to @a peer
- * @return NULL
- */
-static void *
-monitor_notify_connect (void *cls,
-                        const struct GNUNET_PeerIdentity *peer,
-                        struct GNUNET_MQ_Handle *mq)
-{
-  struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
-  const char *now_str = GNUNET_STRINGS_absolute_time_to_string (now);
-
-  monitor_connect_counter++;
-  fprintf (stdout,
-           _ ("%24s: %-17s %4s   (%u connections in total)\n"),
-           now_str,
-           _ ("Connected to"),
-           GNUNET_i2s (peer),
-           monitor_connect_counter);
-  return NULL;
-}
-
-
-/**
- * Function called to notify transport users that another
- * peer disconnected from us.
- *
- * @param cls closure
- * @param peer the peer that disconnected
- * @param internal_cls what we returned from #monitor_notify_connect()
- */
-static void
-monitor_notify_disconnect (void *cls,
-                           const struct GNUNET_PeerIdentity *peer,
-                           void *internal_cls)
-{
-  struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
-  const char *now_str = GNUNET_STRINGS_absolute_time_to_string (now);
-
-  GNUNET_assert (monitor_connect_counter > 0);
-  monitor_connect_counter--;
-
-  fprintf (stdout,
-           _ ("%24s: %-17s %4s   (%u connections in total)\n"),
-           now_str,
-           _ ("Disconnected from"),
-           GNUNET_i2s (peer),
-           monitor_connect_counter);
-}
-
-
-/**
- * Function called by the transport for each received message.
- *
- * @param cls closure
- * @param message the message
- * @return #GNUNET_OK
- */
-static int
-check_dummy (void *cls, const struct GNUNET_MessageHeader *message)
-{
-  return GNUNET_OK; /* all messages are fine */
-}
-
-
-/**
- * Function called by the transport for each received message.
- *
- * @param cls closure
- * @param message the message
- */
-static void
-handle_dummy (void *cls, const struct GNUNET_MessageHeader *message)
-{
-  if (! benchmark_receive)
-    return;
-  if (verbosity > 0)
-    fprintf (stdout,
-             _ ("Received %u bytes\n"),
-             (unsigned int) ntohs (message->size));
-  if (0 == traffic_received)
-    start_time = GNUNET_TIME_absolute_get ();
-  traffic_received += ntohs (message->size);
-}
-
-
-/**
- * Convert address to a printable format.
- *
- * @param address the address
- * @param numeric #GNUNET_YES to convert to numeric format, #GNUNET_NO
- *                to try to use reverse DNS
- * @param state state the peer is in
- * @param state_timeout when will the peer's state expire
- */
-static void
-resolve_peer_address (const struct GNUNET_HELLO_Address *address,
-                      int numeric,
-                      enum GNUNET_TRANSPORT_PeerState state,
-                      struct GNUNET_TIME_Absolute state_timeout);
-
-
-static void
-print_info (const struct GNUNET_PeerIdentity *id,
-            const char *transport,
-            const char *addr,
-            enum GNUNET_TRANSPORT_PeerState state,
-            struct GNUNET_TIME_Absolute state_timeout)
-{
-  if (((GNUNET_YES == iterate_connections) && (GNUNET_YES == iterate_all)) ||
-      (GNUNET_YES == monitor_connections))
-  {
-    fprintf (stdout,
-             _ ("Peer `%s': %s %s in state `%s' until %s\n"),
-             GNUNET_i2s (id),
-             (NULL == transport) ? "<none>" : transport,
-             (NULL == transport) ? "<none>" : addr,
-             GNUNET_TRANSPORT_ps2s (state),
-             GNUNET_STRINGS_absolute_time_to_string (state_timeout));
-  }
-  else if ((GNUNET_YES == iterate_connections) &&
-           (GNUNET_TRANSPORT_is_connected (state)))
-  {
-    /* Only connected peers, skip state */
-    fprintf (stdout,
-             _ ("Peer `%s': %s %s\n"),
-             GNUNET_i2s (id),
-             transport,
-             addr);
-  }
-}
-
-
-/**
- * Function called with a textual representation of an address.  This
- * function will be called several times with different possible
- * textual representations, and a last time with @a address being NULL
- * to signal the end of the iteration.  Note that @a address NULL
- * always is the last call, regardless of the value in @a res.
- *
- * @param cls closure
- * @param address NULL on end of iteration,
- *        otherwise 0-terminated printable UTF-8 string,
- *        in particular an empty string if @a res is #GNUNET_NO
- * @param res result of the address to string conversion:
- *        if #GNUNET_OK: conversion successful
- *        if #GNUNET_NO: address was invalid (or not supported)
- *        if #GNUNET_SYSERR: communication error (IPC error)
- */
-static void
-process_peer_string (void *cls, const char *address, int res)
-{
-  struct PeerResolutionContext *rc = cls;
-
-  if (NULL != address)
-  {
-    if (GNUNET_SYSERR == res)
-    {
-      fprintf (
-        stderr,
-        "Failed to convert address for peer `%s' plugin `%s' length %u to string \n",
-        GNUNET_i2s (&rc->addrcp->peer),
-        rc->addrcp->transport_name,
-        (unsigned int) rc->addrcp->address_length);
-      print_info (&rc->addrcp->peer,
-                  rc->transport,
-                  NULL,
-                  rc->state,
-                  rc->state_timeout);
-      rc->printed = GNUNET_YES;
-      return;
-    }
-    if (GNUNET_OK == res)
-    {
-      print_info (&rc->addrcp->peer,
-                  rc->transport,
-                  address,
-                  rc->state,
-                  rc->state_timeout);
-      rc->printed = GNUNET_YES;
-      return;     /* Wait for done call */
-    }
-    /* GNUNET_NO == res: ignore, was simply not supported */
-    return;
-  }
-  /* NULL == address, last call, we are done */
-
-  rc->asc = NULL;
-  GNUNET_assert (address_resolutions > 0);
-  address_resolutions--;
-  if (GNUNET_NO == rc->printed)
-  {
-    if (numeric == GNUNET_NO)
-    {
-      /* Failed to resolve address, try numeric lookup
-         (note: this should not be needed, as transport
-         should fallback to numeric conversion if DNS takes
-         too long) */
-      resolve_peer_address (rc->addrcp,
-                            GNUNET_YES,
-                            rc->state,
-                            rc->state_timeout);
-    }
-    else
-    {
-      print_info (&rc->addrcp->peer,
-                  rc->transport,
-                  NULL,
-                  rc->state,
-                  rc->state_timeout);
-    }
-  }
-  GNUNET_free (rc->transport);
-  GNUNET_free (rc->addrcp);
-  GNUNET_CONTAINER_DLL_remove (rc_head, rc_tail, rc);
-  GNUNET_free (rc);
-  if ((0 == address_resolutions) && (iterate_connections))
-  {
-    if (NULL != op_timeout)
-    {
-      GNUNET_SCHEDULER_cancel (op_timeout);
-      op_timeout = NULL;
-    }
-    ret = 0;
-    GNUNET_SCHEDULER_shutdown ();
-  }
-}
-
-
-/**
- * Convert address to a printable format and print it
- * together with the given state data.
- *
- * @param address the address
- * @param numeric #GNUNET_YES to convert to numeric format, #GNUNET_NO
- *                to try to use reverse DNS
- * @param state state the peer is in
- * @param state_timeout when will the peer's state expire
- */
-static void
-resolve_peer_address (const struct GNUNET_HELLO_Address *address,
-                      int numeric,
-                      enum GNUNET_TRANSPORT_PeerState state,
-                      struct GNUNET_TIME_Absolute state_timeout)
-{
-  struct PeerResolutionContext *rc;
-
-  rc = GNUNET_new (struct PeerResolutionContext);
-  GNUNET_CONTAINER_DLL_insert (rc_head, rc_tail, rc);
-  address_resolutions++;
-  rc->transport = GNUNET_strdup (address->transport_name);
-  rc->addrcp = GNUNET_HELLO_address_copy (address);
-  rc->printed = GNUNET_NO;
-  rc->state = state;
-  rc->state_timeout = state_timeout;
-  /* Resolve address to string */
-  rc->asc = GNUNET_TRANSPORT_address_to_string (cfg,
-                                                address,
-                                                numeric,
-                                                RESOLUTION_TIMEOUT,
-                                                &process_peer_string,
-                                                rc);
-}
-
-
-/**
- * Function called with information about a peers during a one shot iteration
- *
- * @param cls closure
- * @param peer identity of the peer, NULL for final callback when operation done
- * @param address binary address used to communicate with this peer,
- *  NULL on disconnect or when done
- * @param state current state this peer is in
- * @param state_timeout time out for the current state
- */
-static void
-process_peer_iteration_cb (void *cls,
-                           const struct GNUNET_PeerIdentity *peer,
-                           const struct GNUNET_HELLO_Address *address,
-                           enum GNUNET_TRANSPORT_PeerState state,
-                           struct GNUNET_TIME_Absolute state_timeout)
-{
-  if (NULL == peer)
-  {
-    /* done */
-    pic = NULL;
-    return;
-  }
-
-  if ((GNUNET_NO == iterate_all) &&
-      (GNUNET_NO == GNUNET_TRANSPORT_is_connected (state)))
-    return; /* Display only connected peers */
-
-  if (NULL != op_timeout)
-    GNUNET_SCHEDULER_cancel (op_timeout);
-  op_timeout =
-    GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT, &operation_timeout, NULL);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received address for peer `%s': %s\n",
-              GNUNET_i2s (peer),
-              address ? address->transport_name : "");
-
-  if (NULL != address)
-    resolve_peer_address (address, numeric, state, state_timeout);
-  else
-    print_info (peer, NULL, NULL, state, state_timeout);
-}
-
-
-/**
- * Context for address resolution by #plugin_monitoring_cb().
- */
-struct PluginMonitorAddress
-{
-  /**
-   * Ongoing resolution request.
-   */
-  struct GNUNET_TRANSPORT_AddressToStringContext *asc;
-
-  /**
-   * Resolved address as string.
-   */
-  char *str;
-
-  /**
-   * Last event we got and did not yet print because
-   * @e str was NULL (address not yet resolved).
-   */
-  struct GNUNET_TRANSPORT_SessionInfo si;
-};
-
-
-/**
- * Print information about a plugin monitoring event.
- *
- * @param addr out internal context
- * @param info the monitoring information
- */
-static void
-print_plugin_event_info (struct PluginMonitorAddress *addr,
-                         const struct GNUNET_TRANSPORT_SessionInfo *info)
-{
-  const char *state;
-
-  switch (info->state)
-  {
-  case GNUNET_TRANSPORT_SS_INIT:
-    state = "INIT";
-    break;
-
-  case GNUNET_TRANSPORT_SS_HANDSHAKE:
-    state = "HANDSHAKE";
-    break;
-
-  case GNUNET_TRANSPORT_SS_UP:
-    state = "UP";
-    break;
-
-  case GNUNET_TRANSPORT_SS_UPDATE:
-    state = "UPDATE";
-    break;
-
-  case GNUNET_TRANSPORT_SS_DONE:
-    state = "DONE";
-    break;
-
-  default:
-    state = "UNKNOWN";
-    break;
-  }
-  fprintf (stdout,
-           "%s: state %s timeout in %s @ %s%s\n",
-           GNUNET_i2s (&info->address->peer),
-           state,
-           GNUNET_STRINGS_relative_time_to_string (
-             GNUNET_TIME_absolute_get_remaining (info->session_timeout),
-             GNUNET_YES),
-           addr->str,
-           (info->is_inbound == GNUNET_YES) ? " (INBOUND)" : "");
-  fprintf (stdout,
-           "%s: queue has %3u messages and %6u bytes\n",
-           GNUNET_i2s (&info->address->peer),
-           info->num_msg_pending,
-           info->num_bytes_pending);
-  if (0 !=
-      GNUNET_TIME_absolute_get_remaining (info->receive_delay).rel_value_us)
-    fprintf (stdout,
-             "%s: receiving blocked until %s\n",
-             GNUNET_i2s (&info->address->peer),
-             GNUNET_STRINGS_absolute_time_to_string (info->receive_delay));
-}
-
-
-/**
- * Function called with a textual representation of an address.  This
- * function will be called several times with different possible
- * textual representations, and a last time with @a address being NULL
- * to signal the end of the iteration.  Note that @a address NULL
- * always is the last call, regardless of the value in @a res.
- *
- * @param cls closure
- * @param address NULL on end of iteration,
- *        otherwise 0-terminated printable UTF-8 string,
- *        in particular an empty string if @a res is #GNUNET_NO
- * @param res result of the address to string conversion:
- *        if #GNUNET_OK: conversion successful
- *        if #GNUNET_NO: address was invalid (or not supported)
- *        if #GNUNET_SYSERR: communication error (IPC error)
- */
-static void
-address_cb (void *cls, const char *address, int res)
-{
-  struct PluginMonitorAddress *addr = cls;
-
-  if (NULL == address)
-  {
-    addr->asc = NULL;
-    return;
-  }
-  if (NULL != addr->str)
-    return;
-  addr->str = GNUNET_strdup (address);
-  print_plugin_event_info (addr, &addr->si);
-}
-
-
-/**
- * Function called by the plugin with information about the
- * current sessions managed by the plugin (for monitoring).
- *
- * @param cls closure (NULL)
- * @param session session handle this information is about,
- *        NULL to indicate that we are "in sync" (initial
- *        iteration complete)
- * @param session_ctx storage location where the application
- *        can store data; will point to NULL on #GNUNET_TRANSPORT_SS_INIT,
- *        and must be reset to NULL on #GNUNET_TRANSPORT_SS_DONE
- * @param info information about the state of the session,
- *        NULL if @a session is also NULL and we are
- *        merely signalling that the initial iteration is over;
- *        NULL with @a session being non-NULL if the monitor
- *        was being cancelled while sessions were active
- */
-static void
-plugin_monitoring_cb (void *cls,
-                      struct GNUNET_TRANSPORT_PluginSession *session,
-                      void **session_ctx,
-                      const struct GNUNET_TRANSPORT_SessionInfo *info)
-{
-  struct PluginMonitorAddress *addr;
-
-  if ((NULL == info) && (NULL == session))
-    return; /* in sync with transport service */
-  addr = *session_ctx;
-  if (NULL == info)
-  {
-    if (NULL != addr)
-    {
-      if (NULL != addr->asc)
-      {
-        GNUNET_TRANSPORT_address_to_string_cancel (addr->asc);
-        addr->asc = NULL;
-      }
-      GNUNET_free (addr->str);
-      GNUNET_free (addr);
-      *session_ctx = NULL;
-    }
-    return;   /* shutdown */
-  }
-  if (0 !=
-      memcmp (&info->address->peer, &pid, sizeof(struct GNUNET_PeerIdentity)))
-    return; /* filtered */
-  if (NULL == addr)
-  {
-    addr = GNUNET_new (struct PluginMonitorAddress);
-    addr->asc =
-      GNUNET_TRANSPORT_address_to_string (cfg,
-                                          info->address,
-                                          numeric,
-                                          GNUNET_TIME_UNIT_FOREVER_REL,
-                                          &address_cb,
-                                          addr);
-    *session_ctx = addr;
-  }
-  if (NULL == addr->str)
-    addr->si = *info;
-  else
-    print_plugin_event_info (addr, info);
-  if (GNUNET_TRANSPORT_SS_DONE == info->state)
-  {
-    if (NULL != addr->asc)
-    {
-      GNUNET_TRANSPORT_address_to_string_cancel (addr->asc);
-      addr->asc = NULL;
-    }
-    GNUNET_free (addr->str);
-    GNUNET_free (addr);
-    *session_ctx = NULL;
-  }
-}
-
-
-/**
- * Function called with information about a peers
- *
- * @param cls closure, NULL
- * @param peer identity of the peer, NULL for final callback when operation done
- * @param address binary address used to communicate with this peer,
- *  NULL on disconnect or when done
- * @param state current state this peer is in
- * @param state_timeout time out for the current state
- */
-static void
-process_peer_monitoring_cb (void *cls,
-                            const struct GNUNET_PeerIdentity *peer,
-                            const struct GNUNET_HELLO_Address *address,
-                            enum GNUNET_TRANSPORT_PeerState state,
-                            struct GNUNET_TIME_Absolute state_timeout)
-{
-  struct MonitoredPeer *m;
-
-  if (NULL == peer)
-  {
-    fprintf (stdout,
-             "%s",
-             _ (
-               "Monitor disconnected from transport service. Reconnecting.\n"));
-    return;
-  }
-
-  if (NULL != op_timeout)
-    GNUNET_SCHEDULER_cancel (op_timeout);
-  op_timeout =
-    GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT, &operation_timeout, NULL);
-
-  if (NULL == (m = GNUNET_CONTAINER_multipeermap_get (monitored_peers, peer)))
-  {
-    m = GNUNET_new (struct MonitoredPeer);
-    GNUNET_CONTAINER_multipeermap_put (
-      monitored_peers,
-      peer,
-      m,
-      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
-  }
-  else
-  {
-    if ((m->state == state) &&
-        (m->state_timeout.abs_value_us == state_timeout.abs_value_us) &&
-        (NULL == address) && (NULL == m->address))
-    {
-      return;     /* No real change */
-    }
-    if ((m->state == state) && (NULL != address) && (NULL != m->address) &&
-        (0 == GNUNET_HELLO_address_cmp (m->address, address)))
-      return;   /* No real change */
-  }
-
-  if (NULL != m->address)
-  {
-    GNUNET_free (m->address);
-    m->address = NULL;
-  }
-  if (NULL != address)
-    m->address = GNUNET_HELLO_address_copy (address);
-  m->state = state;
-  m->state_timeout = state_timeout;
-
-  if (NULL != address)
-    resolve_peer_address (m->address, numeric, m->state, m->state_timeout);
-  else
-    print_info (peer, NULL, NULL, m->state, m->state_timeout);
-}
-
-
-/**
- * Function called with the transport service checking if we
- * want to blacklist a peer. Return #GNUNET_SYSERR for the
- * peer that we should disconnect from.
- *
- * @param cls NULL
- * @param cpid peer to check blacklisting for
- * @return #GNUNET_OK if the connection is allowed, #GNUNET_SYSERR if not
- */
-static int
-blacklist_cb (void *cls, const struct GNUNET_PeerIdentity *cpid)
-{
-  if (0 == memcmp (cpid, &pid, sizeof(struct GNUNET_PeerIdentity)))
-    return GNUNET_SYSERR;
-  return GNUNET_OK;
-}
-
-
-/**
- * Main function that will be run by the scheduler.
- *
- * @param cls closure
- * @param args remaining command-line arguments
- * @param cfgfile name of the configuration file used (for saving, can be NULL!)
- * @param mycfg configuration
- */
-static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *mycfg)
-{
-  static struct GNUNET_PeerIdentity zero_pid;
-  int counter = 0;
-
-  ret = 1;
-
-  cfg = (struct GNUNET_CONFIGURATION_Handle *) mycfg;
-
-  counter = benchmark_send + benchmark_receive + iterate_connections
-            + monitor_connections + monitor_connects + do_disconnect
-            + monitor_plugins;
-
-  if (1 < counter)
-  {
-    fprintf (
-      stderr,
-      _ (
-        "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, %s, %s %s\n"),
-      "disconnect",
-      "benchmark send",
-      "benchmark receive",
-      "information",
-      "monitor",
-      "events",
-      "plugins");
-    return;
-  }
-  if (0 == counter)
-  {
-    fprintf (
-      stderr,
-      _ (
-        "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"),
-      "disconnect",
-      "benchmark send",
-      "benchmark receive",
-      "information",
-      "monitor",
-      "events",
-      "plugins");
-    return;
-  }
-
-  if (do_disconnect) /* -D: Disconnect from peer */
-  {
-    if (0 == memcmp (&zero_pid, &pid, sizeof(pid)))
-    {
-      fprintf (stderr,
-               _ ("Option `%s' makes no sense without option `%s'.\n"),
-               "-D",
-               "-p");
-      ret = 1;
-      return;
-    }
-    blacklist = GNUNET_TRANSPORT_blacklist (cfg, &blacklist_cb, NULL);
-    if (NULL == blacklist)
-    {
-      fprintf (stderr,
-               "%s",
-               _ (
-                 "Failed to connect to transport service for disconnection\n"));
-      ret = 1;
-      return;
-    }
-    fprintf (stdout,
-             "%s",
-             _ ("Blacklisting request in place, stop with CTRL-C\n"));
-  }
-  else if (benchmark_send) /* -s: Benchmark sending */
-  {
-    if (0 == memcmp (&zero_pid, &pid, sizeof(pid)))
-    {
-      fprintf (stderr,
-               _ ("Option `%s' makes no sense without option `%s'.\n"),
-               "-s",
-               "-p");
-      ret = 1;
-      return;
-    }
-    handle = GNUNET_TRANSPORT_core_connect (cfg,
-                                            NULL,
-                                            NULL,
-                                            NULL,
-                                            &notify_connect,
-                                            &notify_disconnect,
-                                            NULL);
-    if (NULL == handle)
-    {
-      fprintf (stderr, "%s", _ ("Failed to connect to transport service\n"));
-      ret = 1;
-      return;
-    }
-    start_time = GNUNET_TIME_absolute_get ();
-    op_timeout =
-      GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT, &operation_timeout, NULL);
-  }
-  else if (benchmark_receive) /* -b: Benchmark receiving */
-  {
-    struct GNUNET_MQ_MessageHandler handlers[] =
-    { GNUNET_MQ_hd_var_size (dummy,
-                             GNUNET_MESSAGE_TYPE_DUMMY,
-                             struct GNUNET_MessageHeader,
-                             NULL),
-      GNUNET_MQ_handler_end () };
-
-    handle = GNUNET_TRANSPORT_core_connect (cfg,
-                                            NULL,
-                                            handlers,
-                                            NULL,
-                                            NULL,
-                                            NULL,
-                                            NULL);
-    if (NULL == handle)
-    {
-      fprintf (stderr, "%s", _ ("Failed to connect to transport service\n"));
-      ret = 1;
-      return;
-    }
-    if (verbosity > 0)
-      fprintf (stdout, "%s", _ ("Starting to receive benchmark data\n"));
-    start_time = GNUNET_TIME_absolute_get ();
-  }
-  else if (iterate_connections) /* -i: List information about peers once */
-  {
-    pic = GNUNET_TRANSPORT_monitor_peers (cfg,
-                                          &pid,
-                                          GNUNET_YES,
-                                          &process_peer_iteration_cb,
-                                          (void *) cfg);
-    op_timeout =
-      GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT, &operation_timeout, NULL);
-  }
-  else if (monitor_connections) /* -m: List information about peers continuously
-                                 */
-  {
-    monitored_peers = GNUNET_CONTAINER_multipeermap_create (10, GNUNET_NO);
-    pic = GNUNET_TRANSPORT_monitor_peers (cfg,
-                                          &pid,
-                                          GNUNET_NO,
-                                          &process_peer_monitoring_cb,
-                                          NULL);
-  }
-  else if (monitor_plugins) /* -P: List information about plugins continuously
-                             */
-  {
-    monitored_plugins = GNUNET_CONTAINER_multipeermap_create (10, GNUNET_NO);
-    pm = GNUNET_TRANSPORT_monitor_plugins (cfg, &plugin_monitoring_cb, NULL);
-  }
-  else if (monitor_connects) /* -e : Monitor (dis)connect events continuously */
-  {
-    monitor_connect_counter = 0;
-    handle = GNUNET_TRANSPORT_core_connect (cfg,
-                                            NULL,
-                                            NULL,
-                                            NULL,
-                                            &monitor_notify_connect,
-                                            &monitor_notify_disconnect,
-                                            NULL);
-    if (NULL == handle)
-    {
-      fprintf (stderr, "%s", _ ("Failed to connect to transport service\n"));
-      ret = 1;
-      return;
-    }
-    ret = 0;
-  }
-  else
-  {
-    GNUNET_break (0);
-    return;
-  }
-
-  GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
-}
-
-
-int
-main (int argc, char *const *argv)
-{
-  int res;
-  struct GNUNET_GETOPT_CommandLineOption options[] =
-  { GNUNET_GETOPT_option_flag (
-      'a',
-      "all",
-      gettext_noop (
-        "print information for all peers (instead of only connected peers)"),
-      &iterate_all),
-    GNUNET_GETOPT_option_flag (
-      'b',
-      "benchmark",
-      gettext_noop (
-        "measure how fast we are receiving data from all peers (until CTRL-C)"),
-      &benchmark_receive),
-    GNUNET_GETOPT_option_flag ('D',
-                               "disconnect",
-                               gettext_noop ("disconnect from a peer"),
-                               &do_disconnect),
-    GNUNET_GETOPT_option_flag (
-      'i',
-      "information",
-      gettext_noop (
-        "provide information about all current connections (once)"),
-      &iterate_connections),
-    GNUNET_GETOPT_option_flag (
-      'm',
-      "monitor",
-      gettext_noop (
-        "provide information about all current connections (continuously)"),
-      &monitor_connections),
-    GNUNET_GETOPT_option_flag (
-      'e',
-      "events",
-      gettext_noop (
-        "provide information about all connects and disconnect events (continuously)"),
-      &monitor_connects),
-    GNUNET_GETOPT_option_flag ('n',
-                               "numeric",
-                               gettext_noop ("do not resolve hostnames"),
-                               &numeric),
-    GNUNET_GETOPT_option_base32_auto ('p',
-                                      "peer",
-                                      "PEER",
-                                      gettext_noop ("peer identity"),
-                                      &pid),
-    GNUNET_GETOPT_option_flag ('P',
-                               "plugins",
-                               gettext_noop ("monitor plugin sessions"),
-                               &monitor_plugins),
-    GNUNET_GETOPT_option_flag (
-      's',
-      "send",
-      gettext_noop (
-        "send data for benchmarking to the other peer (until CTRL-C)"),
-      &benchmark_send),
-    GNUNET_GETOPT_option_verbose (&verbosity),
-    GNUNET_GETOPT_OPTION_END };
-
-  if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
-    return 2;
-
-  res =
-    GNUNET_PROGRAM_run (argc,
-                        argv,
-                        "gnunet-transport",
-                        gettext_noop ("Direct access to transport service."),
-                        options,
-                        &run,
-                        NULL);
-  GNUNET_free_nz ((void *) argv);
-  if (GNUNET_OK == res)
-    return ret;
-  return 1;
-}
-
-
-/* end of gnunet-transport.c */
diff --git a/src/transport/ieee80211_radiotap.h b/src/transport/ieee80211_radiotap.h
deleted file mode 100644
index 9351da9a5..000000000
--- a/src/transport/ieee80211_radiotap.h
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * Copyright (c) 2003, 2004 David Young.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DAVID
- * YOUNG BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- */
-
-/*
- * Modifications to fit into the linux IEEE 802.11 stack,
- * Mike Kershaw (dragorn@kismetwireless.net)
- */
-
-#ifndef IEEE80211RADIOTAP_H
-#define IEEE80211RADIOTAP_H
-
-#include <linux/if_ether.h>
-#include <linux/kernel.h>
-// #include <asm/unaligned.h>
-
-/* Base version of the radiotap packet header data */
-#define PKTHDR_RADIOTAP_VERSION         0
-
-/* A generic radio capture format is desirable. There is one for
- * Linux, but it is neither rigidly defined (there were not even
- * units given for some fields) nor easily extensible.
- *
- * I suggest the following extensible radio capture format. It is
- * based on a bitmap indicating which fields are present.
- *
- * I am trying to describe precisely what the application programmer
- * should expect in the following, and for that reason I tell the
- * units and origin of each measurement (where it applies), or else I
- * use sufficiently weaselly language ("is a monotonically nondecreasing
- * function of...") that I cannot set false expectations for lawyerly
- * readers.
- */
-
-/*
- * The radio capture header precedes the 802.11 header.
- * All data in the header is little endian on all platforms.
- */
-struct ieee80211_radiotap_header
-{
-  u8 it_version;                /* Version 0. Only increases
-                                 * for drastic changes,
-                                 * introduction of compatible
-                                 * new fields does not count.
-                                 */
-  u8 it_pad;
-  __le16 it_len;                /* length of the whole
-                                 * header in bytes, including
-                                 * it_version, it_pad,
-                                 * it_len, and data fields.
-                                 */
-  __le32 it_present;            /* A bitmap telling which
-                                 * fields are present. Set bit 31
-                                 * (0x80000000) to extend the
-                                 * bitmap by another 32 bits.
-                                 * Additional extensions are made
-                                 * by setting bit 31.
-                                 */
-} __packed;
-
-/* Name                                 Data type    Units
- * ----                                 ---------    -----
- *
- * IEEE80211_RADIOTAP_TSFT              __le64       microseconds
- *
- *      Value in microseconds of the MAC's 64-bit 802.11 Time
- *      Synchronization Function timer when the first bit of the
- *      MPDU arrived at the MAC. For received frames, only.
- *
- * IEEE80211_RADIOTAP_CHANNEL           2 x __le16   MHz, bitmap
- *
- *      Tx/Rx frequency in MHz, followed by flags (see below).
- *
- * IEEE80211_RADIOTAP_FHSS              __le16       see below
- *
- *      For frequency-hopping radios, the hop set (first byte)
- *      and pattern (second byte).
- *
- * IEEE80211_RADIOTAP_RATE              u8           500kb/s
- *
- *      Tx/Rx data rate
- *
- * IEEE80211_RADIOTAP_DBM_ANTSIGNAL     s8           decibels from
- *                                                   one milliwatt (dBm)
- *
- *      RF signal power at the antenna, decibel difference from
- *      one milliwatt.
- *
- * IEEE80211_RADIOTAP_DBM_ANTNOISE      s8           decibels from
- *                                                   one milliwatt (dBm)
- *
- *      RF noise power at the antenna, decibel difference from one
- *      milliwatt.
- *
- * IEEE80211_RADIOTAP_DB_ANTSIGNAL      u8           decibel (dB)
- *
- *      RF signal power at the antenna, decibel difference from an
- *      arbitrary, fixed reference.
- *
- * IEEE80211_RADIOTAP_DB_ANTNOISE       u8           decibel (dB)
- *
- *      RF noise power at the antenna, decibel difference from an
- *      arbitrary, fixed reference point.
- *
- * IEEE80211_RADIOTAP_LOCK_QUALITY      __le16       unitless
- *
- *      Quality of Barker code lock. Unitless. Monotonically
- *      nondecreasing with "better" lock strength. Called "Signal
- *      Quality" in datasheets.  (Is there a standard way to measure
- *      this?)
- *
- * IEEE80211_RADIOTAP_TX_ATTENUATION    __le16       unitless
- *
- *      Transmit power expressed as unitless distance from max
- *      power set at factory calibration.  0 is max power.
- *      Monotonically nondecreasing with lower power levels.
- *
- * IEEE80211_RADIOTAP_DB_TX_ATTENUATION __le16       decibels (dB)
- *
- *      Transmit power expressed as decibel distance from max power
- *      set at factory calibration.  0 is max power.  Monotonically
- *      nondecreasing with lower power levels.
- *
- * IEEE80211_RADIOTAP_DBM_TX_POWER      s8           decibels from
- *                                                   one milliwatt (dBm)
- *
- *      Transmit power expressed as dBm (decibels from a 1 milliwatt
- *      reference). This is the absolute power level measured at
- *      the antenna port.
- *
- * IEEE80211_RADIOTAP_FLAGS             u8           bitmap
- *
- *      Properties of transmitted and received frames. See flags
- *      defined below.
- *
- * IEEE80211_RADIOTAP_ANTENNA           u8           antenna index
- *
- *      Unitless indication of the Rx/Tx antenna for this packet.
- *      The first antenna is antenna 0.
- *
- * IEEE80211_RADIOTAP_RX_FLAGS          __le16       bitmap
- *
- *     Properties of received frames. See flags defined below.
- *
- * IEEE80211_RADIOTAP_TX_FLAGS          __le16       bitmap
- *
- *     Properties of transmitted frames. See flags defined below.
- *
- * IEEE80211_RADIOTAP_RTS_RETRIES       u8           data
- *
- *     Number of rts retries a transmitted frame used.
- *
- * IEEE80211_RADIOTAP_DATA_RETRIES      u8           data
- *
- *     Number of unicast retries a transmitted frame used.
- *
- */
-enum ieee80211_radiotap_type
-{
-  IEEE80211_RADIOTAP_TSFT = 0,
-  IEEE80211_RADIOTAP_FLAGS = 1,
-  IEEE80211_RADIOTAP_RATE = 2,
-  IEEE80211_RADIOTAP_CHANNEL = 3,
-  IEEE80211_RADIOTAP_FHSS = 4,
-  IEEE80211_RADIOTAP_DBM_ANTSIGNAL = 5,
-  IEEE80211_RADIOTAP_DBM_ANTNOISE = 6,
-  IEEE80211_RADIOTAP_LOCK_QUALITY = 7,
-  IEEE80211_RADIOTAP_TX_ATTENUATION = 8,
-  IEEE80211_RADIOTAP_DB_TX_ATTENUATION = 9,
-  IEEE80211_RADIOTAP_DBM_TX_POWER = 10,
-  IEEE80211_RADIOTAP_ANTENNA = 11,
-  IEEE80211_RADIOTAP_DB_ANTSIGNAL = 12,
-  IEEE80211_RADIOTAP_DB_ANTNOISE = 13,
-  IEEE80211_RADIOTAP_RX_FLAGS = 14,
-  IEEE80211_RADIOTAP_TX_FLAGS = 15,
-  IEEE80211_RADIOTAP_RTS_RETRIES = 16,
-  IEEE80211_RADIOTAP_DATA_RETRIES = 17,
-
-  /* valid in every it_present bitmap, even vendor namespaces */
-  IEEE80211_RADIOTAP_RADIOTAP_NAMESPACE = 29,
-  IEEE80211_RADIOTAP_VENDOR_NAMESPACE = 30,
-  IEEE80211_RADIOTAP_EXT = 31
-};
-
-/* Channel flags. */
-#define IEEE80211_CHAN_TURBO    0x0010  /* Turbo channel */
-#define IEEE80211_CHAN_CCK      0x0020  /* CCK channel */
-#define IEEE80211_CHAN_OFDM     0x0040  /* OFDM channel */
-#define IEEE80211_CHAN_2GHZ     0x0080  /* 2 GHz spectrum channel. */
-#define IEEE80211_CHAN_5GHZ     0x0100  /* 5 GHz spectrum channel */
-#define IEEE80211_CHAN_PASSIVE  0x0200  /* Only passive scan allowed */
-#define IEEE80211_CHAN_DYN      0x0400  /* Dynamic CCK-OFDM channel */
-#define IEEE80211_CHAN_GFSK     0x0800  /* GFSK channel (FHSS PHY) */
-
-/* For IEEE80211_RADIOTAP_FLAGS */
-#define IEEE80211_RADIOTAP_F_CFP        0x01    /* sent/received
-                                                 * during CFP
-                                                 */
-#define IEEE80211_RADIOTAP_F_SHORTPRE   0x02    /* sent/received
-                                                 * with short
-                                                 * preamble
-                                                 */
-#define IEEE80211_RADIOTAP_F_WEP        0x04    /* sent/received
-                                                 * with WEP encryption
-                                                 */
-#define IEEE80211_RADIOTAP_F_FRAG       0x08    /* sent/received
-                                                 * with fragmentation
-                                                 */
-#define IEEE80211_RADIOTAP_F_FCS        0x10    /* frame includes FCS */
-#define IEEE80211_RADIOTAP_F_DATAPAD    0x20    /* frame has padding between
-                                                 * 802.11 header and payload
-                                                 * (to 32-bit boundary)
-                                                 */
-#define IEEE80211_RADIOTAP_F_BADFCS     0x40    /* bad FCS */
-
-/* For IEEE80211_RADIOTAP_RX_FLAGS */
-#define IEEE80211_RADIOTAP_F_RX_BADPLCP 0x0002  /* frame has bad PLCP */
-
-/* For IEEE80211_RADIOTAP_TX_FLAGS */
-#define IEEE80211_RADIOTAP_F_TX_FAIL    0x0001  /* failed due to excessive
-                                                 * retries */
-#define IEEE80211_RADIOTAP_F_TX_CTS     0x0002  /* used cts 'protection' */
-#define IEEE80211_RADIOTAP_F_TX_RTS     0x0004  /* used rts/cts handshake */
-
-/* Ugly macro to convert literal channel numbers into their mhz equivalents
- * There are certainly some conditions that will break this (like feeding it '30')
- * but they shouldn't arise since nothing talks on channel 30. */
-#define ieee80211chan2mhz(x) \
-  (((x) <= 14) ? \
-   (((x) == 14) ? 2484 : ((x) * 5) + 2407) : \
-   ((x) + 1000) * 5)
-
-/* helpers */
-static inline u16
-get_unaligned_le16 (const u8 *p)
-{
-  return p[0] | p[1] << 8;
-}
-
-
-static inline int
-ieee80211_get_radiotap_len (unsigned char *data)
-{
-  struct ieee80211_radiotap_header *hdr =
-    (struct ieee80211_radiotap_header *) data;
-
-  return get_unaligned_le16 ((const u8 *) &hdr->it_len);
-}
-
-
-#endif /* IEEE80211_RADIOTAP_H */
diff --git a/src/transport/perf_http_peer1.conf b/src/transport/perf_http_peer1.conf
deleted file mode 100644
index e97e16289..000000000
--- a/src/transport/perf_http_peer1.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
-
-[transport]
-PLUGINS = http_client
-
-[nat]
-# Disable IPv6 support
-DISABLEV6 = YES
-# Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8)
-RETURN_LOCAL_ADDRESSES = NO
-
-[hostlist]
-OPTIONS = -b
-SERVERS = http://localhost:9080/
-
-[ats]
-# Network specific inbound/outbound quotas
-UNSPECIFIED_QUOTA_IN = unlimited
-UNSPECIFIED_QUOTA_OUT = unlimited
-# LOOPBACK
-LOOPBACK_QUOTA_IN = unlimited
-LOOPBACK_QUOTA_OUT = unlimited
-# LAN
-LAN_QUOTA_IN = unlimited
-LAN_QUOTA_OUT = unlimited
-# WAN
-WAN_QUOTA_IN = unlimited
-WAN_QUOTA_OUT = unlimited
-# WLAN
-WLAN_QUOTA_IN = unlimited
-WLAN_QUOTA_OUT = unlimited
-# BLUETOOTH
-BLUETOOTH_QUOTA_IN = unlimited
-BLUETOOTH_QUOTA_OUT = unlimited
-# ATS options
diff --git a/src/transport/perf_http_peer2.conf b/src/transport/perf_http_peer2.conf
deleted file mode 100644
index a1c83bde5..000000000
--- a/src/transport/perf_http_peer2.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
-
-[transport]
-PLUGINS = http_server
-
-[nat]
-# Disable IPv6 support
-DISABLEV6 = YES
-# Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8)
-RETURN_LOCAL_ADDRESSES = NO
-
-[hostlist]
-HTTPPORT = 9080
-OPTIONS = -p
-BINDTOIPV4 = YES
-BINDTOIP = 127.0.0.1
-
-[ats]
-# Network specific inbound/outbound quotas
-UNSPECIFIED_QUOTA_IN = unlimited
-UNSPECIFIED_QUOTA_OUT = unlimited
-# LOOPBACK
-LOOPBACK_QUOTA_IN = unlimited
-LOOPBACK_QUOTA_OUT = unlimited
-# LAN
-LAN_QUOTA_IN = unlimited
-LAN_QUOTA_OUT = unlimited
-# WAN
-WAN_QUOTA_IN = unlimited
-WAN_QUOTA_OUT = unlimited
-# WLAN
-WLAN_QUOTA_IN = unlimited
-WLAN_QUOTA_OUT = unlimited
-# BLUETOOTH
-BLUETOOTH_QUOTA_IN = unlimited
-BLUETOOTH_QUOTA_OUT = unlimited
-# ATS options
-
diff --git a/src/transport/perf_https_peer1.conf b/src/transport/perf_https_peer1.conf
deleted file mode 100644
index e943671c2..000000000
--- a/src/transport/perf_https_peer1.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
-
-[transport]
-PLUGINS = https_client
-
-[nat]
-# Disable IPv6 support
-DISABLEV6 = YES
-# Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8)
-RETURN_LOCAL_ADDRESSES = NO
-
-[hostlist]
-OPTIONS = -b
-SERVERS = http://localhost:9080/
-
-[ats]
-# Network specific inbound/outbound quotas
-UNSPECIFIED_QUOTA_IN = unlimited
-UNSPECIFIED_QUOTA_OUT = unlimited
-# LOOPBACK
-LOOPBACK_QUOTA_IN = unlimited
-LOOPBACK_QUOTA_OUT = unlimited
-# LAN
-LAN_QUOTA_IN = unlimited
-LAN_QUOTA_OUT = unlimited
-# WAN
-WAN_QUOTA_IN = unlimited
-WAN_QUOTA_OUT = unlimited
-# WLAN
-WLAN_QUOTA_IN = unlimited
-WLAN_QUOTA_OUT = unlimited
-# BLUETOOTH
-BLUETOOTH_QUOTA_IN = unlimited
-BLUETOOTH_QUOTA_OUT = unlimited
-# ATS options
diff --git a/src/transport/perf_https_peer2.conf b/src/transport/perf_https_peer2.conf
deleted file mode 100644
index 6e30f9e60..000000000
--- a/src/transport/perf_https_peer2.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
-
-[transport]
-PLUGINS = https_server
-
-[nat]
-# Disable IPv6 support
-DISABLEV6 = YES
-# Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8)
-RETURN_LOCAL_ADDRESSES = NO
-
-[hostlist]
-HTTPPORT = 9080
-OPTIONS = -p
-BINDTOIPV4 = YES
-BINDTOIP = 127.0.0.1
-
-[ats]
-# Network specific inbound/outbound quotas
-UNSPECIFIED_QUOTA_IN = unlimited
-UNSPECIFIED_QUOTA_OUT = unlimited
-# LOOPBACK
-LOOPBACK_QUOTA_IN = unlimited
-LOOPBACK_QUOTA_OUT = unlimited
-# LAN
-LAN_QUOTA_IN = unlimited
-LAN_QUOTA_OUT = unlimited
-# WAN
-WAN_QUOTA_IN = unlimited
-WAN_QUOTA_OUT = unlimited
-# WLAN
-WLAN_QUOTA_IN = unlimited
-WLAN_QUOTA_OUT = unlimited
-# BLUETOOTH
-BLUETOOTH_QUOTA_IN = unlimited
-BLUETOOTH_QUOTA_OUT = unlimited
-# ATS options
-
diff --git a/src/transport/perf_tcp_peer1.conf b/src/transport/perf_tcp_peer1.conf
deleted file mode 100644
index e56c47ada..000000000
--- a/src/transport/perf_tcp_peer1.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
-
-[transport]
-PLUGINS = tcp
-
-[hostlist]
-OPTIONS = -b
-SERVERS = http://localhost:9080/
-
-[ats]
-# Network specific inbound/outbound quotas
-UNSPECIFIED_QUOTA_IN = unlimited
-UNSPECIFIED_QUOTA_OUT = unlimited
-# LOOPBACK
-LOOPBACK_QUOTA_IN = unlimited
-LOOPBACK_QUOTA_OUT = unlimited
-# LAN
-LAN_QUOTA_IN = unlimited
-LAN_QUOTA_OUT = unlimited
-# WAN
-WAN_QUOTA_IN = unlimited
-WAN_QUOTA_OUT = unlimited
-# WLAN
-WLAN_QUOTA_IN = unlimited
-WLAN_QUOTA_OUT = unlimited
-# BLUETOOTH
-BLUETOOTH_QUOTA_IN = unlimited
-BLUETOOTH_QUOTA_OUT = unlimited
-# ATS options
diff --git a/src/transport/perf_tcp_peer2.conf b/src/transport/perf_tcp_peer2.conf
deleted file mode 100644
index 3264161f5..000000000
--- a/src/transport/perf_tcp_peer2.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
-
-[transport]
-PLUGINS = tcp
-
-[hostlist]
-HTTPPORT = 9080
-OPTIONS = -p
-BINDTOIPV4 = YES
-BINDTOIP = 127.0.0.1
-
-[ats]
-# Network specific inbound/outbound quotas
-UNSPECIFIED_QUOTA_IN = unlimited
-UNSPECIFIED_QUOTA_OUT = unlimited
-# LOOPBACK
-LOOPBACK_QUOTA_IN = unlimited
-LOOPBACK_QUOTA_OUT = unlimited
-# LAN
-LAN_QUOTA_IN = unlimited
-LAN_QUOTA_OUT = unlimited
-# WAN
-WAN_QUOTA_IN = unlimited
-WAN_QUOTA_OUT = unlimited
-# WLAN
-WLAN_QUOTA_IN = unlimited
-WLAN_QUOTA_OUT = unlimited
-# BLUETOOTH
-BLUETOOTH_QUOTA_IN = unlimited
-BLUETOOTH_QUOTA_OUT = unlimited
-# ATS options
-
diff --git a/src/transport/perf_udp_peer1.conf b/src/transport/perf_udp_peer1.conf
deleted file mode 100644
index 68bf43908..000000000
--- a/src/transport/perf_udp_peer1.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
-
-[transport]
-PLUGINS = udp
-
-[transport-udp]
-BROADCAST = NO
-BROADCAST_RECEIVE = NO
-BROADCAST_INTERVAL = 30 s
-MAX_BPS = 1000000000
-
-[nat]
-# Disable IPv6 support
-DISABLEV6 = YES
-# Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8)
-RETURN_LOCAL_ADDRESSES = NO
-
-[hostlist]
-OPTIONS = -b
-SERVERS = http://localhost:9080/
-
-[ats]
-# Network specific inbound/outbound quotas
-UNSPECIFIED_QUOTA_IN = unlimited
-UNSPECIFIED_QUOTA_OUT = unlimited
-# LOOPBACK
-LOOPBACK_QUOTA_IN = unlimited
-LOOPBACK_QUOTA_OUT = unlimited
-# LAN
-LAN_QUOTA_IN = unlimited
-LAN_QUOTA_OUT = unlimited
-# WAN
-WAN_QUOTA_IN = unlimited
-WAN_QUOTA_OUT = unlimited
-# WLAN
-WLAN_QUOTA_IN = unlimited
-WLAN_QUOTA_OUT = unlimited
-# BLUETOOTH
-BLUETOOTH_QUOTA_IN = unlimited
-BLUETOOTH_QUOTA_OUT = unlimited
-# ATS options
diff --git a/src/transport/perf_udp_peer2.conf b/src/transport/perf_udp_peer2.conf
deleted file mode 100644
index efed935f8..000000000
--- a/src/transport/perf_udp_peer2.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
-
-[transport]
-PLUGINS = udp
-
-
-[transport-udp]
-# Use PORT = 0 to autodetect a port available
-BROADCAST = NO
-BROADCAST_RECEIVE = NO
-BROADCAST_INTERVAL = 30 s
-MAX_BPS = 1000000000
-
-[nat]
-# Disable IPv6 support
-DISABLEV6 = YES
-# Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8)
-RETURN_LOCAL_ADDRESSES = NO
-
-[hostlist]
-HTTPPORT = 9080
-OPTIONS = -p
-BINDTOIPV4 = YES
-BINDTOIP = 127.0.0.1
-
-[ats]
-# Network specific inbound/outbound quotas
-UNSPECIFIED_QUOTA_IN = unlimited
-UNSPECIFIED_QUOTA_OUT = unlimited
-# LOOPBACK
-LOOPBACK_QUOTA_IN = unlimited
-LOOPBACK_QUOTA_OUT = unlimited
-# LAN
-LAN_QUOTA_IN = unlimited
-LAN_QUOTA_OUT = unlimited
-# WAN
-WAN_QUOTA_IN = unlimited
-WAN_QUOTA_OUT = unlimited
-# WLAN
-WLAN_QUOTA_IN = unlimited
-WLAN_QUOTA_OUT = unlimited
-# BLUETOOTH
-BLUETOOTH_QUOTA_IN = unlimited
-BLUETOOTH_QUOTA_OUT = unlimited
-# ATS options
-
diff --git a/src/transport/perf_unix_peer1.conf b/src/transport/perf_unix_peer1.conf
deleted file mode 100644
index 06cd63fc6..000000000
--- a/src/transport/perf_unix_peer1.conf
+++ /dev/null
@@ -1,52 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
-
-[transport]
-PORT = 12001
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-PLUGINS = unix
-
-[transport-unix]
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-unix.sock
-
-[arm]
-PORT = 12005
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12004
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12003
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12002
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[hostlist]
-OPTIONS = -b
-SERVERS = http://localhost:9080/
-
-[ats]
-# Network specific inbound/outbound quotas
-UNSPECIFIED_QUOTA_IN = unlimited
-UNSPECIFIED_QUOTA_OUT = unlimited
-# LOOPBACK
-LOOPBACK_QUOTA_IN = unlimited
-LOOPBACK_QUOTA_OUT = unlimited
-# LAN
-LAN_QUOTA_IN = unlimited
-LAN_QUOTA_OUT = unlimited
-# WAN
-WAN_QUOTA_IN = unlimited
-WAN_QUOTA_OUT = unlimited
-# WLAN
-WLAN_QUOTA_IN = unlimited
-WLAN_QUOTA_OUT = unlimited
-# BLUETOOTH
-BLUETOOTH_QUOTA_IN = unlimited
-BLUETOOTH_QUOTA_OUT = unlimited
-# ATS options
diff --git a/src/transport/perf_unix_peer2.conf b/src/transport/perf_unix_peer2.conf
deleted file mode 100644
index feadb6fec..000000000
--- a/src/transport/perf_unix_peer2.conf
+++ /dev/null
@@ -1,56 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
-
-[transport]
-PORT = 12010
-PLUGINS = unix
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
-
-[transport-unix]
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-unix.sock
-
-[arm]
-PORT = 12014
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12013
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12012
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12011
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[hostlist]
-HTTPPORT = 9080
-OPTIONS = -p
-BINDTOIPV4 = YES
-BINDTOIP = 127.0.0.1
-
-[ats]
-# Network specific inbound/outbound quotas
-UNSPECIFIED_QUOTA_IN = unlimited
-UNSPECIFIED_QUOTA_OUT = unlimited
-# LOOPBACK
-LOOPBACK_QUOTA_IN = unlimited
-LOOPBACK_QUOTA_OUT = unlimited
-# LAN
-LAN_QUOTA_IN = unlimited
-LAN_QUOTA_OUT = unlimited
-# WAN
-WAN_QUOTA_IN = unlimited
-WAN_QUOTA_OUT = unlimited
-# WLAN
-WLAN_QUOTA_IN = unlimited
-WLAN_QUOTA_OUT = unlimited
-# BLUETOOTH
-BLUETOOTH_QUOTA_IN = unlimited
-BLUETOOTH_QUOTA_OUT = unlimited
-# ATS options
-
diff --git a/src/transport/plugin_transport_http.h b/src/transport/plugin_transport_http.h
deleted file mode 100644
index a3b59513e..000000000
--- a/src/transport/plugin_transport_http.h
+++ /dev/null
@@ -1,579 +0,0 @@
-/*
-     This file is part of GNUnet
-     Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/plugin_transport_http.h
- * @brief http transport service plugin
- * @author Matthias Wachs
- */
-#ifndef PLUGIN_TRANSPORT_HTTP_H
-#define PLUGIN_TRANSPORT_HTTP_H
-
-#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_constants.h"
-#include "gnunet_protocols.h"
-#include "gnunet_connection_lib.h"
-#include "gnunet_service_lib.h"
-#include "gnunet_statistics_service.h"
-#include "gnunet_transport_service.h"
-#include "gnunet_resolver_service.h"
-#include "gnunet_server_lib.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_transport_plugin.h"
-#include "gnunet_os_lib.h"
-#include "gnunet_nat_lib.h"
-#include "microhttpd.h"
-/* Just included for the right curl.h */
-#include "gnunet_curl_lib.h"
-
-
-#define DEBUG_HTTP GNUNET_EXTRA_LOGGING
-#define VERBOSE_SERVER GNUNET_EXTRA_LOGGING
-#define VERBOSE_CLIENT GNUNET_EXTRA_LOGGING
-#define VERBOSE_CURL GNUNET_NO
-
-#if BUILD_HTTPS
-#define LIBGNUNET_PLUGIN_TRANSPORT_INIT libgnunet_plugin_transport_https_init
-#define LIBGNUNET_PLUGIN_TRANSPORT_DONE libgnunet_plugin_transport_https_done
-#else
-#define LIBGNUNET_PLUGIN_TRANSPORT_INIT libgnunet_plugin_transport_http_init
-#define LIBGNUNET_PLUGIN_TRANSPORT_DONE libgnunet_plugin_transport_http_done
-#endif
-
-#define INBOUND  GNUNET_YES
-#define OUTBOUND GNUNET_NO
-
-
-#define HTTP_NOT_VALIDATED_TIMEOUT GNUNET_TIME_relative_multiply ( \
-    GNUNET_TIME_UNIT_SECONDS, 15)
-
-/**
- * Encapsulation of all of the state of the plugin.
- */
-struct Plugin
-{
-  /**
-   * Our environment.
-   */
-  struct GNUNET_TRANSPORT_PluginEnvironment *env;
-
-  /**
-   * Head of linked list of open sessions.
-   */
-  struct GNUNET_ATS_Session *head;
-
-  /**
-   * Tail of linked list of open sessions.
-   */
-  struct GNUNET_ATS_Session *tail;
-
-  /**
-   * NAT handle & address management
-   */
-  struct GNUNET_NAT_Handle *nat;
-
-  /**
-   * Our own IPv4 addresses DLL head
-   */
-  struct HttpAddressWrapper *addr_head;
-
-  /**
-   * Our own IPv4 addresses DLL tail
-   */
-  struct HttpAddressWrapper *addr_tail;
-
-  /**
-   * External hostname the plugin can be connected to, can be different to
-   * the host's FQDN, used e.g. for reverse proxying
-   */
-  char *external_hostname;
-
-  /**
-   * External hostname the plugin can be connected to, can be different to
-   * the host's FQDN, used e.g. for reverse proxying
-   */
-  struct HttpAddress *ext_addr;
-
-  /**
-   * External address length
-   */
-  size_t ext_addr_len;
-
-  /**
-   * Task calling transport service about external address
-   */
-  struct GNUNET_SCHEDULER_Task *notify_ext_task;
-
-  /**
-   * Plugin name.
-   * Equals configuration section: transport-http, transport-https
-   */
-  char *name;
-
-  /**
-   * Plugin protocol
-   * http, https
-   */
-  char *protocol;
-
-  /**
-   * Use IPv4? #GNUNET_YES or #GNUNET_NO
-   */
-  int ipv4;
-
-  /**
-   * Use IPv6? #GNUNET_YES or #GNUNET_NO
-   */
-  int ipv6;
-
-  /**
-   * Does plugin just use outbound connections and not accept inbound?
-   */
-  int client_only;
-
-  /**
-   * Port used
-   */
-  uint16_t port;
-
-  /**
-   * Maximum number of sockets the plugin can use
-   * Each http inbound /outbound connections are two connections
-   */
-  int max_connections;
-
-  /**
-   * Number of outbound sessions
-   */
-  unsigned int outbound_sessions;
-
-  /**
-   * Number of inbound sessions
-   */
-  unsigned int inbound_sessions;
-
-  /**
-   * libCurl TLS crypto init string, can be set to enhance performance
-   *
-   * Example:
-   *
-   * Use RC4-128 instead of AES:
-   * NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
-   */
-  char *crypto_init;
-
-  /**
-   * TLS key
-   */
-  char *key;
-
-  /**
-   * TLS certificate
-   */
-  char *cert;
-
-  /**
-   * Current number of establishes connections
-   */
-  int cur_connections;
-
-  /**
-   * Last used unique HTTP connection tag
-   */
-  uint32_t last_tag;
-
-  /**
-   * MHD IPv4 daemon
-   */
-  struct MHD_Daemon *server_v4;
-
-  /**
-   * MHD IPv4 task
-   */
-  struct GNUNET_SCHEDULER_Task *server_v4_task;
-
-  /**
-   * The IPv4 server is scheduled to run asap
-   */
-  int server_v4_immediately;
-
-  /**
-   * MHD IPv6 daemon
-   */
-  struct MHD_Daemon *server_v6;
-
-  /**
-   * MHD IPv4 task
-   */
-  struct GNUNET_SCHEDULER_Task *server_v6_task;
-
-  /**
-   * The IPv6 server is scheduled to run asap
-   */
-  int server_v6_immediately;
-
-  /**
-   * IPv4 server socket to bind to
-   */
-  struct sockaddr_in *server_addr_v4;
-
-  /**
-   * IPv6 server socket to bind to
-   */
-  struct sockaddr_in6 *server_addr_v6;
-
-  /**
-   * Head of server semi connections
-   * A full session consists of 2 semi-connections: send and receive
-   * If not both directions are established the server keeps this sessions here
-   */
-  struct GNUNET_ATS_Session *server_semi_head;
-
-  /**
-   * Tail of server semi connections
-   * A full session consists of 2 semi-connections: send and receive
-   * If not both directions are established the server keeps this sessions here
-   */
-  struct GNUNET_ATS_Session *server_semi_tail;
-
-  /**
-   * cURL Multihandle
-   */
-  CURLM *client_mh;
-
-  /**
-   * curl perform task
-   */
-  struct GNUNET_SCHEDULER_Task *client_perform_task;
-};
-
-GNUNET_NETWORK_STRUCT_BEGIN
-
-/**
- * HTTP addresses including a full URI
- */
-struct HttpAddress
-{
-  /**
-   * Length of the address following in NBO
-   */
-  uint32_t addr_len GNUNET_PACKED;
-
-  /**
-   * Address following
-   */
-  void *addr GNUNET_PACKED;
-};
-
-/**
- * IPv4 addresses
- */
-struct IPv4HttpAddress
-{
-  /**
-   * IPv4 address, in network byte order.
-   */
-  uint32_t ipv4_addr GNUNET_PACKED;
-
-  /**
-   * Port number, in network byte order.
-   */
-  uint16_t u4_port GNUNET_PACKED;
-};
-
-/**
- * IPv4 addresses
- */
-struct IPv6HttpAddress
-{
-  /**
-   * IPv6 address.
-   */
-  struct in6_addr ipv6_addr GNUNET_PACKED;
-
-  /**
-   * Port number, in network byte order.
-   */
-  uint16_t u6_port GNUNET_PACKED;
-};
-GNUNET_NETWORK_STRUCT_END
-
-
-struct ServerRequest
-{
-  /**
-   * _RECV or _SEND
-   */
-  int direction;
-
-  /**
-   * Should this connection get disconnected? #GNUNET_YES / #GNUNET_NO
-   */
-  int disconnect;
-
-  /**
-   * The session this server connection belongs to
-   */
-  struct GNUNET_ATS_Session *session;
-
-  /**
-   * The MHD connection
-   */
-  struct MHD_Connection *mhd_conn;
-};
-
-
-/**
- * Session handle for connections.
- */
-struct GNUNET_ATS_Session
-{
-  /**
-   * To whom are we talking to
-   */
-  struct GNUNET_PeerIdentity target;
-
-  /**
-   * Stored in a linked list.
-   */
-  struct GNUNET_ATS_Session *next;
-
-  /**
-   * Stored in a linked list.
-   */
-  struct GNUNET_ATS_Session *prev;
-
-  /**
-   * Pointer to the global plugin struct.
-   */
-  struct Plugin *plugin;
-
-  /**
-   * Address
-   */
-  void *addr;
-
-  /**
-   * Address length
-   */
-  size_t addrlen;
-
-  /**
-   * ATS network type in NBO
-   */
-  uint32_t ats_address_network_type;
-
-  /**
-   * next pointer for double linked list
-   */
-  struct HTTP_Message *msg_head;
-
-  /**
-   * previous pointer for double linked list
-   */
-  struct HTTP_Message *msg_tail;
-
-  /**
-   * Message stream tokenizer for incoming data
-   */
-  struct GNUNET_SERVER_MessageStreamTokenizer *msg_tk;
-
-  /**
-   * Absolute time when to receive data again
-   * Used for receive throttling
-   */
-  struct GNUNET_TIME_Absolute next_receive;
-
-  /**
-   * Inbound or outbound connection
-   * Outbound: #GNUNET_NO (client is used to send and receive)
-   * Inbound : #GNUNET_YES (server is used to send and receive)
-   */
-  int inbound;
-
-  /**
-   * Unique HTTP/S connection tag for this connection
-   */
-  uint32_t tag;
-
-  /**
-   * Client send handle
-   */
-  void *client_put;
-
-  /**
-   * Client receive handle
-   */
-  void *client_get;
-
-  /**
-   * Task to wake up client receive handle when receiving is allowed again
-   */
-  struct GNUNET_SCHEDULER_Task *recv_wakeup_task;
-
-  /**
-   * Session timeout task
-   */
-  struct GNUNET_SCHEDULER_Task *timeout_task;
-
-  /**
-   * Is client send handle paused since there are no data to send?
-   * #GNUNET_YES or #GNUNET_NO
-   */
-  int client_put_paused;
-
-  /**
-   * Client send handle
-   */
-  struct ServerRequest *server_recv;
-
-  /**
-   * Client send handle
-   */
-  struct ServerRequest *server_send;
-};
-
-
-/**
- *  Message to send using http
- */
-struct HTTP_Message
-{
-  /**
-   * next pointer for double linked list
-   */
-  struct HTTP_Message *next;
-
-  /**
-   * previous pointer for double linked list
-   */
-  struct HTTP_Message *prev;
-
-  /**
-   * buffer containing data to send
-   */
-  char *buf;
-
-  /**
-   * amount of data already sent
-   */
-  size_t pos;
-
-  /**
-   * buffer length
-   */
-  size_t size;
-
-  /**
-   * Continuation function to call once the transmission buffer
-   * has again space available.  NULL if there is no
-   * continuation to call.
-   */
-  GNUNET_TRANSPORT_TransmitContinuation transmit_cont;
-
-  /**
-   * Closure for @e transmit_cont.
-   */
-  void *transmit_cont_cls;
-};
-
-
-struct GNUNET_ATS_Session *
-create_session (struct Plugin *plugin,
-                const struct GNUNET_PeerIdentity *target,
-                const void *addr,
-                size_t addrlen);
-
-
-int
-exist_session (struct Plugin *plugin,
-               struct GNUNET_ATS_Session *s);
-
-
-void
-delete_session (struct GNUNET_ATS_Session *s);
-
-
-int
-exist_session (struct Plugin *plugin,
-               struct GNUNET_ATS_Session *s);
-
-
-struct GNUNET_TIME_Relative
-http_plugin_receive (void *cls,
-                     const struct GNUNET_PeerIdentity *peer,
-                     const struct GNUNET_MessageHeader *message,
-                     struct GNUNET_ATS_Session *session,
-                     const char *sender_address,
-                     uint16_t sender_address_len);
-
-
-const char *
-http_plugin_address_to_string (void *cls,
-                               const void *addr,
-                               size_t addrlen);
-
-
-int
-client_disconnect (struct GNUNET_ATS_Session *s);
-
-
-int
-client_connect (struct GNUNET_ATS_Session *s);
-
-
-int
-client_send (struct GNUNET_ATS_Session *s, struct HTTP_Message *msg);
-
-
-int
-client_start (struct Plugin *plugin);
-
-
-void
-client_stop (struct Plugin *plugin);
-
-
-int
-server_disconnect (struct GNUNET_ATS_Session *s);
-
-
-int
-server_send (struct GNUNET_ATS_Session *s, struct HTTP_Message *msg);
-
-
-int
-server_start (struct Plugin *plugin);
-
-
-void
-server_stop (struct Plugin *plugin);
-
-
-void
-notify_session_end (void *cls,
-                    const struct GNUNET_PeerIdentity *peer,
-                    struct GNUNET_ATS_Session *s);
-
-
-/*#ifndef PLUGIN_TRANSPORT_HTTP_H*/
-#endif
-/* end of plugin_transport_http.h */
diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c
deleted file mode 100644
index 18bfcc054..000000000
--- a/src/transport/plugin_transport_http_client.c
+++ /dev/null
@@ -1,2535 +0,0 @@
-/*
-     This file is part of GNUnet
-     Copyright (C) 2002-2014 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/plugin_transport_http_client.c
- * @brief HTTP/S client transport plugin
- * @author Matthias Wachs
- * @author Christian Grothoff
- */
-
-#if BUILD_HTTPS
-#define PLUGIN_NAME "https_client"
-#define HTTP_STAT_STR_CONNECTIONS "# HTTPS client connections"
-#define LIBGNUNET_PLUGIN_TRANSPORT_INIT \
-  libgnunet_plugin_transport_https_client_init
-#define LIBGNUNET_PLUGIN_TRANSPORT_DONE \
-  libgnunet_plugin_transport_https_client_done
-#else
-#define PLUGIN_NAME "http_client"
-#define HTTP_STAT_STR_CONNECTIONS "# HTTP client connections"
-#define LIBGNUNET_PLUGIN_TRANSPORT_INIT \
-  libgnunet_plugin_transport_http_client_init
-#define LIBGNUNET_PLUGIN_TRANSPORT_DONE \
-  libgnunet_plugin_transport_http_client_done
-#endif
-
-#define VERBOSE_CURL GNUNET_NO
-
-#define PUT_DISCONNECT_TIMEOUT GNUNET_TIME_relative_multiply ( \
-    GNUNET_TIME_UNIT_SECONDS, 1)
-
-#define ENABLE_PUT GNUNET_YES
-#define ENABLE_GET GNUNET_YES
-
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_protocols.h"
-#include "gnunet_transport_plugin.h"
-#include "plugin_transport_http_common.h"
-/* Just included for the right curl.h */
-#include "gnunet_curl_lib.h"
-
-
-#define LOG(kind, ...) GNUNET_log_from (kind, PLUGIN_NAME, __VA_ARGS__)
-
-/**
- * Encapsulation of all of the state of the plugin.
- */
-struct HTTP_Client_Plugin;
-
-/**
- * State of a HTTP PUT request
- */
-enum HTTP_PUT_REQUEST_STATE
-{
-  /**
-   *  Just created, not yet connected
-   */
-  H_NOT_CONNECTED,
-
-  /**
-   *  Connected
-   */
-  H_CONNECTED,
-
-  /**
-   *  Paused, nothing to send
-   */
-  H_PAUSED,
-
-  /**
-   * Temporary disconnect in progress due to inactivity
-   */
-  H_TMP_DISCONNECTING,
-
-  /**
-   * Send request while temporary disconnect, reconnect
-   */
-  H_TMP_RECONNECT_REQUIRED,
-
-  /**
-   * Temporarily disconnected
-   */
-  H_TMP_DISCONNECTED,
-
-  /**
-   * Disconnected
-   */
-  H_DISCONNECTED
-};
-
-/**
- *  Message to send using http
- */
-struct HTTP_Message
-{
-  /**
-   * next pointer for double linked list
-   */
-  struct HTTP_Message *next;
-
-  /**
-   * previous pointer for double linked list
-   */
-  struct HTTP_Message *prev;
-
-  /**
-   * buffer containing data to send
-   */
-  char *buf;
-
-  /**
-   * Continuation function to call once the transmission buffer
-   * has again space available.  NULL if there is no
-   * continuation to call.
-   */
-  GNUNET_TRANSPORT_TransmitContinuation transmit_cont;
-
-  /**
-   * Closure for @e transmit_cont.
-   */
-  void *transmit_cont_cls;
-
-  /**
-   * amount of data already sent
-   */
-  size_t pos;
-
-  /**
-   * buffer length
-   */
-  size_t size;
-};
-
-
-/**
- * Session handle for HTTP(S) connections.
- */
-struct GNUNET_ATS_Session;
-
-
-/**
- * A request handle
- *
- */
-struct RequestHandle
-{
-  /**
-   * Current state of this request
-   */
-  enum HTTP_PUT_REQUEST_STATE state;
-
-  /**
-   * The curl easy handle
-   */
-  CURL *easyhandle;
-
-  /**
-   * The related session
-   */
-  struct GNUNET_ATS_Session *s;
-};
-
-
-/**
- * Session handle for connections.
- */
-struct GNUNET_ATS_Session
-{
-  /**
-   * The URL to connect to
-   */
-  char *url;
-
-  /**
-   * Address
-   */
-  struct GNUNET_HELLO_Address *address;
-
-  /**
-   * Pointer to the global plugin struct.
-   */
-  struct HTTP_Client_Plugin *plugin;
-
-  /**
-   * Handle for the HTTP PUT request.
-   */
-  struct RequestHandle put;
-
-  /**
-   * Handle for the HTTP GET request.
-   */
-  struct RequestHandle get;
-
-  /**
-   * next pointer for double linked list
-   */
-  struct HTTP_Message *msg_head;
-
-  /**
-   * previous pointer for double linked list
-   */
-  struct HTTP_Message *msg_tail;
-
-  /**
-   * Message stream tokenizer for incoming data
-   */
-  struct GNUNET_MessageStreamTokenizer *msg_tk;
-
-  /**
-   * Session timeout task
-   */
-  struct GNUNET_SCHEDULER_Task *put_disconnect_task;
-
-  /**
-   * Session timeout task
-   */
-  struct GNUNET_SCHEDULER_Task *timeout_task;
-
-  /**
-   * Task to wake up client receive handle when receiving is allowed again
-   */
-  struct GNUNET_SCHEDULER_Task *recv_wakeup_task;
-
-  /**
-   * Absolute time when to receive data again.
-   * Used for receive throttling.
-   */
-  struct GNUNET_TIME_Absolute next_receive;
-
-  /**
-   * When does this session time out.
-   */
-  struct GNUNET_TIME_Absolute timeout;
-
-  /**
-   * Number of bytes waiting for transmission to this peer.
-   */
-  unsigned long long bytes_in_queue;
-
-  /**
-   * Outbound overhead due to HTTP connection
-   * Add to next message of this session when calling callback
-   */
-  size_t overhead;
-
-  /**
-   * Number of messages waiting for transmission to this peer.
-   */
-  unsigned int msgs_in_queue;
-
-  /**
-   * ATS network type.
-   */
-  enum GNUNET_NetworkType scope;
-};
-
-
-/**
- * Encapsulation of all of the state of the plugin.
- */
-struct HTTP_Client_Plugin
-{
-  /**
-   * Our environment.
-   */
-  struct GNUNET_TRANSPORT_PluginEnvironment *env;
-
-  /**
-   * Open sessions.
-   */
-  struct GNUNET_CONTAINER_MultiPeerMap *sessions;
-
-  /**
-   * Function to call about session status changes.
-   */
-  GNUNET_TRANSPORT_SessionInfoCallback sic;
-
-  /**
-   * Closure for @e sic.
-   */
-  void *sic_cls;
-
-  /**
-   * Plugin name
-   */
-  char *name;
-
-  /**
-   * Protocol
-   */
-  char *protocol;
-
-  /**
-   * Proxy configuration: hostname or ip of the proxy server
-   */
-  char *proxy_hostname;
-
-  /**
-   * Username for the proxy server
-   */
-  char *proxy_username;
-
-  /**
-   * Password for the proxy server
-   */
-  char *proxy_password;
-
-  /**
-   * cURL Multihandle
-   */
-  CURLM *curl_multi_handle;
-
-  /**
-   * curl perform task
-   */
-  struct GNUNET_SCHEDULER_Task *client_perform_task;
-
-  /**
-   * Type of proxy server:
-   *
-   * Valid values as supported by curl:
-   * CURLPROXY_HTTP, CURLPROXY_HTTP_1_0 CURLPROXY_SOCKS4, CURLPROXY_SOCKS5,
-   * CURLPROXY_SOCKS4A, CURLPROXY_SOCKS5_HOSTNAME
-   */
-  curl_proxytype proxytype;
-
-  /**
-   * Use proxy tunneling:
-   * Tunnel all operations through a given HTTP instead of have the proxy
-   * evaluate the HTTP request
-   *
-   * Default: #GNUNET_NO, #GNUNET_YES experimental
-   */
-  int proxy_use_httpproxytunnel;
-
-  /**
-   * My options to be included in the address
-   */
-  uint32_t options;
-
-  /**
-   * Maximum number of sockets the plugin can use
-   * Each http connections are two requests
-   */
-  unsigned int max_requests;
-
-  /**
-   * Current number of sockets the plugin can use
-   * Each http connections are two requests
-   */
-  unsigned int cur_requests;
-
-  /**
-   * Last used unique HTTP connection tag
-   */
-  uint32_t last_tag;
-
-  /**
-   * use IPv6
-   */
-  uint16_t use_ipv6;
-
-  /**
-   * use IPv4
-   */
-  uint16_t use_ipv4;
-
-  /**
-   * Should we emulate an XHR client for testing?
-   */
-  int emulate_xhr;
-};
-
-
-/**
- * Disconnect a session
- *
- * @param cls the `struct HTTP_Client_Plugin *`
- * @param s session
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
- */
-static int
-http_client_plugin_session_disconnect (void *cls, struct GNUNET_ATS_Session *s);
-
-
-/**
- * If a session monitor is attached, notify it about the new
- * session state.
- *
- * @param plugin our plugin
- * @param session session that changed state
- * @param state new state of the session
- */
-static void
-notify_session_monitor (struct HTTP_Client_Plugin *plugin,
-                        struct GNUNET_ATS_Session *session,
-                        enum GNUNET_TRANSPORT_SessionState state)
-{
-  struct GNUNET_TRANSPORT_SessionInfo info;
-
-  if (NULL == plugin->sic)
-    return;
-  memset (&info, 0, sizeof(info));
-  info.state = state;
-  info.is_inbound = GNUNET_NO;
-  info.num_msg_pending = session->msgs_in_queue;
-  info.num_bytes_pending = session->bytes_in_queue;
-  info.receive_delay = session->next_receive;
-  info.session_timeout = session->timeout;
-  info.address = session->address;
-  plugin->sic (plugin->sic_cls,
-               session,
-               &info);
-}
-
-
-/**
- * Delete session @a s.
- *
- * @param s the session to delete
- */
-static void
-client_delete_session (struct GNUNET_ATS_Session *s)
-{
-  struct HTTP_Client_Plugin *plugin = s->plugin;
-  struct HTTP_Message *pos;
-  struct HTTP_Message *next;
-  CURLMcode mret;
-
-  if (NULL != s->timeout_task)
-  {
-    GNUNET_SCHEDULER_cancel (s->timeout_task);
-    s->timeout_task = NULL;
-    s->timeout = GNUNET_TIME_UNIT_ZERO_ABS;
-  }
-  if (NULL != s->put_disconnect_task)
-  {
-    GNUNET_SCHEDULER_cancel (s->put_disconnect_task);
-    s->put_disconnect_task = NULL;
-  }
-  if (NULL != s->recv_wakeup_task)
-  {
-    GNUNET_SCHEDULER_cancel (s->recv_wakeup_task);
-    s->recv_wakeup_task = NULL;
-  }
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONTAINER_multipeermap_remove (plugin->sessions,
-                                                       &s->address->peer,
-                                                       s));
-  if (NULL != s->put.easyhandle)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Session %p/request %p: disconnecting PUT request to peer `%s'\n",
-         s,
-         s->put.easyhandle,
-         GNUNET_i2s (&s->address->peer));
-
-    /* remove curl handle from multi handle */
-    mret = curl_multi_remove_handle (plugin->curl_multi_handle,
-                                     s->put.easyhandle);
-    GNUNET_break (CURLM_OK == mret);
-    curl_easy_cleanup (s->put.easyhandle);
-    GNUNET_assert (plugin->cur_requests > 0);
-    plugin->cur_requests--;
-    s->put.easyhandle = NULL;
-  }
-  if (NULL != s->get.easyhandle)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Session %p/request %p: disconnecting GET request to peer `%s'\n",
-         s, s->get.easyhandle,
-         GNUNET_i2s (&s->address->peer));
-    /* remove curl handle from multi handle */
-    mret = curl_multi_remove_handle (plugin->curl_multi_handle,
-                                     s->get.easyhandle);
-    GNUNET_break (CURLM_OK == mret);
-    curl_easy_cleanup (s->get.easyhandle);
-    GNUNET_assert (plugin->cur_requests > 0);
-    plugin->cur_requests--;
-    s->get.easyhandle = NULL;
-  }
-
-  GNUNET_STATISTICS_set (plugin->env->stats,
-                         HTTP_STAT_STR_CONNECTIONS,
-                         plugin->cur_requests,
-                         GNUNET_NO);
-  next = s->msg_head;
-  while (NULL != (pos = next))
-  {
-    next = pos->next;
-    GNUNET_CONTAINER_DLL_remove (s->msg_head,
-                                 s->msg_tail,
-                                 pos);
-    GNUNET_assert (0 < s->msgs_in_queue);
-    s->msgs_in_queue--;
-    GNUNET_assert (pos->size <= s->bytes_in_queue);
-    s->bytes_in_queue -= pos->size;
-    if (NULL != pos->transmit_cont)
-      pos->transmit_cont (pos->transmit_cont_cls,
-                          &s->address->peer,
-                          GNUNET_SYSERR,
-                          pos->size,
-                          pos->pos + s->overhead);
-    s->overhead = 0;
-    GNUNET_free (pos);
-  }
-  GNUNET_assert (0 == s->msgs_in_queue);
-  GNUNET_assert (0 == s->bytes_in_queue);
-  notify_session_monitor (plugin,
-                          s,
-                          GNUNET_TRANSPORT_SS_DONE);
-  if (NULL != s->msg_tk)
-  {
-    GNUNET_MST_destroy (s->msg_tk);
-    s->msg_tk = NULL;
-  }
-  GNUNET_HELLO_address_free (s->address);
-  GNUNET_free (s->url);
-  GNUNET_free (s);
-}
-
-
-/**
- * Increment session timeout due to activity for session @a s.
- *
- * @param s the session
- */
-static void
-client_reschedule_session_timeout (struct GNUNET_ATS_Session *s)
-{
-  GNUNET_assert (NULL != s->timeout_task);
-  s->timeout = GNUNET_TIME_relative_to_absolute (
-    GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
-}
-
-
-/**
- * Task performing curl operations
- *
- * @param cls plugin as closure
- * @param tc gnunet scheduler task context
- */
-static void
-client_run (void *cls);
-
-
-/**
- * Function setting up file descriptors and scheduling task to run
- *
- * @param plugin the plugin as closure
- * @param now schedule task in 1ms, regardless of what curl may say
- * @return #GNUNET_SYSERR for hard failure, #GNUNET_OK for ok
- */
-static int
-client_schedule (struct HTTP_Client_Plugin *plugin,
-                 int now)
-{
-  fd_set rs;
-  fd_set ws;
-  fd_set es;
-  int max;
-  struct GNUNET_NETWORK_FDSet *grs;
-  struct GNUNET_NETWORK_FDSet *gws;
-  long to;
-  CURLMcode mret;
-  struct GNUNET_TIME_Relative timeout;
-
-  /* Cancel previous scheduled task */
-  if (plugin->client_perform_task != NULL)
-  {
-    GNUNET_SCHEDULER_cancel (plugin->client_perform_task);
-    plugin->client_perform_task = NULL;
-  }
-  max = -1;
-  FD_ZERO (&rs);
-  FD_ZERO (&ws);
-  FD_ZERO (&es);
-  mret = curl_multi_fdset (plugin->curl_multi_handle, &rs, &ws, &es, &max);
-  if (mret != CURLM_OK)
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         _ ("%s failed at %s:%d: `%s'\n"),
-         "curl_multi_fdset",
-         __FILE__,
-         __LINE__,
-         curl_multi_strerror (mret));
-    return GNUNET_SYSERR;
-  }
-  mret = curl_multi_timeout (plugin->curl_multi_handle, &to);
-  if (-1 == to)
-    timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1);
-  else
-    timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, to);
-  if (now == GNUNET_YES)
-    timeout = GNUNET_TIME_UNIT_MILLISECONDS;
-
-  if (CURLM_OK != mret)
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         _ ("%s failed at %s:%d: `%s'\n"),
-         "curl_multi_timeout", __FILE__, __LINE__,
-         curl_multi_strerror (mret));
-    return GNUNET_SYSERR;
-  }
-
-  grs = GNUNET_NETWORK_fdset_create ();
-  gws = GNUNET_NETWORK_fdset_create ();
-  GNUNET_NETWORK_fdset_copy_native (grs, &rs, max + 1);
-  GNUNET_NETWORK_fdset_copy_native (gws, &ws, max + 1);
-
-  /* Schedule task to run when select is ready to read or write */
-  plugin->client_perform_task =
-    GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
-                                 timeout, grs, gws,
-                                 &client_run, plugin);
-  GNUNET_NETWORK_fdset_destroy (gws);
-  GNUNET_NETWORK_fdset_destroy (grs);
-  return GNUNET_OK;
-}
-
-
-#if VERBOSE_CURL
-/**
- * Logging function
- *
- * @param curl the curl easy handle
- * @param type message type
- * @param data data to log, NOT a 0-terminated string
- * @param size data length
- * @param cls the closure
- * @return always 0
- */
-static int
-client_log (CURL *curl,
-            curl_infotype type,
-            const char *data,
-            size_t size,
-            void *cls)
-{
-  struct RequestHandle *ch = cls;
-  const char *ttype = "UNSPECIFIED";
-  char text[size + 2];
-
-  if (! ((CURLINFO_TEXT == type) ||
-         (CURLINFO_HEADER_IN == type) ||
-         (CURLINFO_HEADER_OUT == type)))
-    return 0;
-  switch (type)
-  {
-  case CURLINFO_TEXT:
-    ttype = "TEXT";
-    break;
-
-  case CURLINFO_HEADER_IN:
-    ttype = "HEADER_IN";
-    break;
-
-  case CURLINFO_HEADER_OUT:
-    ttype = "HEADER_OUT";
-    /* Overhead*/
-    GNUNET_assert (NULL != ch);
-    GNUNET_assert (NULL != ch->easyhandle);
-    GNUNET_assert (NULL != ch->s);
-    ch->s->overhead += size;
-    break;
-
-  default:
-    ttype = "UNSPECIFIED";
-    break;
-  }
-  GNUNET_memcpy (text, data, size);
-  if (text[size - 1] == '\n')
-  {
-    text[size] = '\0';
-  }
-  else
-  {
-    text[size] = '\n';
-    text[size + 1] = '\0';
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Request %p %s: %s",
-       ch->easyhandle,
-       ttype,
-       text);
-  return 0;
-}
-
-
-#endif
-
-/**
- * Connect GET request
- *
- * @param s the session to connect
- * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
- */
-static int
-client_connect_get (struct GNUNET_ATS_Session *s);
-
-
-/**
- * Connect a HTTP put request
- *
- * @param s the session to connect
- * @return #GNUNET_SYSERR for hard failure, #GNUNET_OK for success
- */
-static int
-client_connect_put (struct GNUNET_ATS_Session *s);
-
-
-/**
- * Function that can be used by the transport service to transmit
- * a message using the plugin.   Note that in the case of a
- * peer disconnecting, the continuation MUST be called
- * prior to the disconnect notification itself.  This function
- * will be called with this peer's HELLO message to initiate
- * a fresh connection to another peer.
- *
- * @param cls closure
- * @param s which session must be used
- * @param msgbuf the message to transmit
- * @param msgbuf_size number of bytes in @a msgbuf
- * @param priority how important is the message (most plugins will
- *                 ignore message priority and just FIFO)
- * @param to how long to wait at most for the transmission (does not
- *                require plugins to discard the message after the timeout,
- *                just advisory for the desired delay; most plugins will ignore
- *                this as well)
- * @param cont continuation to call once the message has
- *        been transmitted (or if the transport is ready
- *        for the next transmission call; or if the
- *        peer disconnected...); can be NULL
- * @param cont_cls closure for @a cont
- * @return number of bytes used (on the physical network, with overheads);
- *         -1 on hard errors (i.e. address invalid); 0 is a legal value
- *         and does NOT mean that the message was not transmitted (DV)
- */
-static ssize_t
-http_client_plugin_send (void *cls,
-                         struct GNUNET_ATS_Session *s,
-                         const char *msgbuf,
-                         size_t msgbuf_size,
-                         unsigned int priority,
-                         struct GNUNET_TIME_Relative to,
-                         GNUNET_TRANSPORT_TransmitContinuation cont,
-                         void *cont_cls)
-{
-  struct HTTP_Client_Plugin *plugin = cls;
-  struct HTTP_Message *msg;
-  char *stat_txt;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Session %p/request %p: Sending message with %lu to peer `%s' \n",
-       s,
-       s->put.easyhandle,
-       (unsigned long) msgbuf_size,
-       GNUNET_i2s (&s->address->peer));
-
-  /* create new message and schedule */
-  msg = GNUNET_malloc (sizeof(struct HTTP_Message) + msgbuf_size);
-  msg->size = msgbuf_size;
-  msg->buf = (char *) &msg[1];
-  msg->transmit_cont = cont;
-  msg->transmit_cont_cls = cont_cls;
-  GNUNET_memcpy (msg->buf,
-                 msgbuf,
-                 msgbuf_size);
-  GNUNET_CONTAINER_DLL_insert_tail (s->msg_head,
-                                    s->msg_tail,
-                                    msg);
-  s->msgs_in_queue++;
-  s->bytes_in_queue += msg->size;
-
-  GNUNET_asprintf (&stat_txt,
-                   "# bytes currently in %s_client buffers",
-                   plugin->protocol);
-  GNUNET_STATISTICS_update (plugin->env->stats,
-                            stat_txt, msgbuf_size, GNUNET_NO);
-  GNUNET_free (stat_txt);
-  notify_session_monitor (plugin,
-                          s,
-                          GNUNET_TRANSPORT_SS_UPDATE);
-  if (H_TMP_DISCONNECTING == s->put.state)
-  {
-    /* PUT request is currently getting disconnected */
-    s->put.state = H_TMP_RECONNECT_REQUIRED;
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Session %p/request %p: currently disconnecting, reconnecting immediately\n",
-         s,
-         s->put.easyhandle);
-    return msgbuf_size;
-  }
-  if (H_PAUSED == s->put.state)
-  {
-    /* PUT request was paused, unpause */
-    GNUNET_assert (s->put_disconnect_task != NULL);
-    GNUNET_SCHEDULER_cancel (s->put_disconnect_task);
-    s->put_disconnect_task = NULL;
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Session %p/request %p: unpausing request\n",
-         s, s->put.easyhandle);
-    s->put.state = H_CONNECTED;
-    if (NULL != s->put.easyhandle)
-      curl_easy_pause (s->put.easyhandle, CURLPAUSE_CONT);
-  }
-  else if (H_TMP_DISCONNECTED == s->put.state)
-  {
-    /* PUT request was disconnected, reconnect */
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "Session %p: Reconnecting PUT request\n", s);
-    GNUNET_break (NULL == s->put.easyhandle);
-    if (GNUNET_SYSERR == client_connect_put (s))
-    {
-      /* Could not reconnect */
-      http_client_plugin_session_disconnect (plugin, s);
-      return GNUNET_SYSERR;
-    }
-  }
-  client_schedule (s->plugin, GNUNET_YES);
-  return msgbuf_size;
-}
-
-
-/**
- * Disconnect a session
- *
- * @param cls the `struct HTTP_Client_Plugin *`
- * @param s session
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
- */
-static int
-http_client_plugin_session_disconnect (void *cls,
-                                       struct GNUNET_ATS_Session *s)
-{
-  struct HTTP_Client_Plugin *plugin = cls;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Session %p: notifying transport about ending session\n",
-       s);
-  plugin->env->session_end (plugin->env->cls,
-                            s->address,
-                            s);
-  client_delete_session (s);
-
-  /* Re-schedule since handles have changed */
-  if (NULL != plugin->client_perform_task)
-  {
-    GNUNET_SCHEDULER_cancel (plugin->client_perform_task);
-    plugin->client_perform_task = NULL;
-  }
-  client_schedule (plugin, GNUNET_YES);
-
-  return GNUNET_OK;
-}
-
-
-/**
- * Function that is called to get the keepalive factor.
- * #GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT is divided by this number to
- * calculate the interval between keepalive packets.
- *
- * @param cls closure with the `struct Plugin`
- * @return keepalive factor
- */
-static unsigned int
-http_client_query_keepalive_factor (void *cls)
-{
-  return 3;
-}
-
-
-/**
- * Callback to destroys all sessions on exit.
- *
- * @param cls the `struct HTTP_Client_Plugin *`
- * @param peer identity of the peer
- * @param value the `struct GNUNET_ATS_Session *`
- * @return #GNUNET_OK (continue iterating)
- */
-static int
-destroy_session_cb (void *cls,
-                    const struct GNUNET_PeerIdentity *peer,
-                    void *value)
-{
-  struct HTTP_Client_Plugin *plugin = cls;
-  struct GNUNET_ATS_Session *session = value;
-
-  http_client_plugin_session_disconnect (plugin, session);
-  return GNUNET_OK;
-}
-
-
-/**
- * Function that can be used to force the plugin to disconnect
- * from the given peer and cancel all previous transmissions
- * (and their continuationc).
- *
- * @param cls closure
- * @param target peer from which to disconnect
- */
-static void
-http_client_plugin_peer_disconnect (void *cls,
-                                    const struct GNUNET_PeerIdentity *target)
-{
-  struct HTTP_Client_Plugin *plugin = cls;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Transport tells me to disconnect `%s'\n",
-       GNUNET_i2s (target));
-  GNUNET_CONTAINER_multipeermap_get_multiple (plugin->sessions,
-                                              target,
-                                              &destroy_session_cb,
-                                              plugin);
-}
-
-
-/**
- * Closure for #session_lookup_client_by_address().
- */
-struct GNUNET_ATS_SessionClientCtx
-{
-  /**
-   * Address we are looking for.
-   */
-  const struct GNUNET_HELLO_Address *address;
-
-  /**
-   * Session that was found.
-   */
-  struct GNUNET_ATS_Session *ret;
-};
-
-
-/**
- * Locate the seession object for a given address.
- *
- * @param cls the `struct GNUNET_ATS_SessionClientCtx *`
- * @param key peer identity
- * @param value the `struct GNUNET_ATS_Session` to check
- * @return #GNUNET_NO if found, #GNUNET_OK if not
- */
-static int
-session_lookup_client_by_address (void *cls,
-                                  const struct GNUNET_PeerIdentity *key,
-                                  void *value)
-{
-  struct GNUNET_ATS_SessionClientCtx *sc_ctx = cls;
-  struct GNUNET_ATS_Session *s = value;
-
-  if (0 == GNUNET_HELLO_address_cmp (sc_ctx->address,
-                                     s->address))
-  {
-    sc_ctx->ret = s;
-    return GNUNET_NO;
-  }
-  return GNUNET_YES;
-}
-
-
-/**
- * Check if a sessions exists for an specific address
- *
- * @param plugin the plugin
- * @param address the address
- * @return the session or NULL
- */
-static struct GNUNET_ATS_Session *
-client_lookup_session (struct HTTP_Client_Plugin *plugin,
-                       const struct GNUNET_HELLO_Address *address)
-{
-  struct GNUNET_ATS_SessionClientCtx sc_ctx;
-
-  sc_ctx.address = address;
-  sc_ctx.ret = NULL;
-  GNUNET_CONTAINER_multipeermap_iterate (plugin->sessions,
-                                         &session_lookup_client_by_address,
-                                         &sc_ctx);
-  return sc_ctx.ret;
-}
-
-
-/**
- * When we have nothing to transmit, we pause the HTTP PUT
- * after a while (so that gnurl stops asking).  This task
- * is the delayed task that actually disconnects the PUT.
- *
- * @param cls the `struct GNUNET_ATS_Session *` with the put
- */
-static void
-client_put_disconnect (void *cls)
-{
-  struct GNUNET_ATS_Session *s = cls;
-
-  s->put_disconnect_task = NULL;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Session %p/request %p: will be disconnected due to no activity\n",
-       s, s->put.easyhandle);
-  s->put.state = H_TMP_DISCONNECTING;
-  if (NULL != s->put.easyhandle)
-    curl_easy_pause (s->put.easyhandle,
-                     CURLPAUSE_CONT);
-  client_schedule (s->plugin, GNUNET_YES);
-}
-
-
-/**
- * Callback method used with libcurl
- * Method is called when libcurl needs to read data during sending
- *
- * @param stream pointer where to write data
- * @param size size of an individual element
- * @param nmemb count of elements that can be written to the buffer
- * @param cls our `struct GNUNET_ATS_Session`
- * @return bytes written to stream, returning 0 will terminate request!
- */
-static size_t
-client_send_cb (void *stream,
-                size_t size,
-                size_t nmemb,
-                void *cls)
-{
-  struct GNUNET_ATS_Session *s = cls;
-  struct HTTP_Client_Plugin *plugin = s->plugin;
-  struct HTTP_Message *msg = s->msg_head;
-  size_t len;
-  char *stat_txt;
-
-  if (H_TMP_DISCONNECTING == s->put.state)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Session %p/request %p: disconnect due to inactivity\n",
-         s, s->put.easyhandle);
-    return 0;
-  }
-
-  if (NULL == msg)
-  {
-    if (GNUNET_YES == plugin->emulate_xhr)
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Session %p/request %p: PUT request finished\n",
-           s,
-           s->put.easyhandle);
-      s->put.state = H_TMP_DISCONNECTING;
-      return 0;
-    }
-
-    /* We have nothing to send, so pause PUT request */
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Session %p/request %p: nothing to send, suspending\n",
-         s,
-         s->put.easyhandle);
-    s->put_disconnect_task
-      = GNUNET_SCHEDULER_add_delayed (PUT_DISCONNECT_TIMEOUT,
-                                      &client_put_disconnect,
-                                      s);
-    s->put.state = H_PAUSED;
-    return CURL_READFUNC_PAUSE;
-  }
-  /* data to send */
-  GNUNET_assert (msg->pos < msg->size);
-  /* calculate how much fits in buffer */
-  len = GNUNET_MIN (msg->size - msg->pos,
-                    size * nmemb);
-  GNUNET_memcpy (stream,
-                 &msg->buf[msg->pos],
-                 len);
-  msg->pos += len;
-  if (msg->pos == msg->size)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Session %p/request %p: sent message with %lu bytes sent, removing message from queue\n",
-         s,
-         s->put.easyhandle,
-         (unsigned long) msg->size);
-    /* Calling transmit continuation  */
-    GNUNET_CONTAINER_DLL_remove (s->msg_head,
-                                 s->msg_tail,
-                                 msg);
-    GNUNET_assert (0 < s->msgs_in_queue);
-    s->msgs_in_queue--;
-    GNUNET_assert (msg->size <= s->bytes_in_queue);
-    s->bytes_in_queue -= msg->size;
-    if (NULL != msg->transmit_cont)
-      msg->transmit_cont (msg->transmit_cont_cls,
-                          &s->address->peer,
-                          GNUNET_OK,
-                          msg->size,
-                          msg->size + s->overhead);
-    s->overhead = 0;
-    GNUNET_free (msg);
-  }
-  notify_session_monitor (plugin,
-                          s,
-                          GNUNET_TRANSPORT_SS_UPDATE);
-  GNUNET_asprintf (&stat_txt,
-                   "# bytes currently in %s_client buffers",
-                   plugin->protocol);
-  GNUNET_STATISTICS_update (plugin->env->stats,
-                            stat_txt,
-                            -len,
-                            GNUNET_NO);
-  GNUNET_free (stat_txt);
-  GNUNET_asprintf (&stat_txt,
-                   "# bytes transmitted via %s_client",
-                   plugin->protocol);
-  GNUNET_STATISTICS_update (plugin->env->stats,
-                            stat_txt,
-                            len,
-                            GNUNET_NO);
-  GNUNET_free (stat_txt);
-  return len;
-}
-
-
-/**
- * Wake up a curl handle which was suspended
- *
- * @param cls the session
- */
-static void
-client_wake_up (void *cls)
-{
-  struct GNUNET_ATS_Session *s = cls;
-
-  s->recv_wakeup_task = NULL;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Session %p/request %p: Waking up GET handle\n",
-       s, s->get.easyhandle);
-  if (H_PAUSED == s->put.state)
-  {
-    /* PUT request was paused, unpause */
-    GNUNET_assert (s->put_disconnect_task != NULL);
-    GNUNET_SCHEDULER_cancel (s->put_disconnect_task);
-    s->put_disconnect_task = NULL;
-    s->put.state = H_CONNECTED;
-    if (NULL != s->put.easyhandle)
-      curl_easy_pause (s->put.easyhandle, CURLPAUSE_CONT);
-  }
-  if (NULL != s->get.easyhandle)
-    curl_easy_pause (s->get.easyhandle, CURLPAUSE_CONT);
-}
-
-
-/**
- * Callback for message stream tokenizer
- *
- * @param cls the session
- * @param message the message received
- * @return always #GNUNET_OK
- */
-static int
-client_receive_mst_cb (void *cls,
-                       const struct GNUNET_MessageHeader *message)
-{
-  struct GNUNET_ATS_Session *s = cls;
-  struct HTTP_Client_Plugin *plugin;
-  struct GNUNET_TIME_Relative delay;
-  char *stat_txt;
-
-  plugin = s->plugin;
-  delay = s->plugin->env->receive (plugin->env->cls,
-                                   s->address,
-                                   s,
-                                   message);
-  GNUNET_asprintf (&stat_txt,
-                   "# bytes received via %s_client",
-                   plugin->protocol);
-  GNUNET_STATISTICS_update (plugin->env->stats,
-                            stat_txt,
-                            ntohs (message->size),
-                            GNUNET_NO);
-  GNUNET_free (stat_txt);
-
-  s->next_receive = GNUNET_TIME_relative_to_absolute (delay);
-  if (GNUNET_TIME_absolute_get ().abs_value_us < s->next_receive.abs_value_us)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Client: peer `%s' address `%s' next read delayed for %s\n",
-         GNUNET_i2s (&s->address->peer),
-         http_common_plugin_address_to_string (s->plugin->protocol,
-                                               s->address->address,
-                                               s->address->address_length),
-         GNUNET_STRINGS_relative_time_to_string (delay,
-                                                 GNUNET_YES));
-  }
-  client_reschedule_session_timeout (s);
-  return GNUNET_OK;
-}
-
-
-/**
- * Callback method used with libcurl when data for a PUT request are
- * received.  We do not expect data here, so we just discard it.
- *
- * @param stream pointer where to write data
- * @param size size of an individual element
- * @param nmemb count of elements that can be written to the buffer
- * @param cls destination pointer, passed to the libcurl handle
- * @return bytes read from stream
- */
-static size_t
-client_receive_put (void *stream,
-                    size_t size,
-                    size_t nmemb,
-                    void *cls)
-{
-  return size * nmemb;
-}
-
-
-/**
- * Callback method used with libcurl when data for a GET request are
- * received. Forward to MST
- *
- * @param stream pointer where to write data
- * @param size size of an individual element
- * @param nmemb count of elements that can be written to the buffer
- * @param cls destination pointer, passed to the libcurl handle
- * @return bytes read from stream
- */
-static size_t
-client_receive (void *stream,
-                size_t size,
-                size_t nmemb,
-                void *cls)
-{
-  struct GNUNET_ATS_Session *s = cls;
-  struct GNUNET_TIME_Absolute now;
-  size_t len = size * nmemb;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Session %p / request %p: Received %lu bytes from peer `%s'\n",
-       s,
-       s->get.easyhandle,
-       (unsigned long) len,
-       GNUNET_i2s (&s->address->peer));
-  now = GNUNET_TIME_absolute_get ();
-  if (now.abs_value_us < s->next_receive.abs_value_us)
-  {
-    struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
-    struct GNUNET_TIME_Relative delta
-      = GNUNET_TIME_absolute_get_difference (now, s->next_receive);
-
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Session %p / request %p: No inbound bandwidth available! Next read was delayed for %s\n",
-         s,
-         s->get.easyhandle,
-         GNUNET_STRINGS_relative_time_to_string (delta,
-                                                 GNUNET_YES));
-    if (s->recv_wakeup_task != NULL)
-    {
-      GNUNET_SCHEDULER_cancel (s->recv_wakeup_task);
-      s->recv_wakeup_task = NULL;
-    }
-    s->recv_wakeup_task
-      = GNUNET_SCHEDULER_add_delayed (delta,
-                                      &client_wake_up,
-                                      s);
-    return CURL_WRITEFUNC_PAUSE;
-  }
-  if (NULL == s->msg_tk)
-    s->msg_tk = GNUNET_MST_create (&client_receive_mst_cb,
-                                   s);
-  GNUNET_MST_from_buffer (s->msg_tk,
-                          stream,
-                          len,
-                          GNUNET_NO,
-                          GNUNET_NO);
-  return len;
-}
-
-
-/**
- * Task performing curl operations
- *
- * @param cls plugin as closure
- */
-static void
-client_run (void *cls)
-{
-  struct HTTP_Client_Plugin *plugin = cls;
-  int running;
-  long http_statuscode;
-  CURLMcode mret;
-  CURLMsg *msg;
-  int put_request; /* GNUNET_YES if easy handle is put, GNUNET_NO for get */
-  int msgs_left;
-
-  plugin->client_perform_task = NULL;
-  /* While data are available or timeouts occurred */
-  do
-  {
-    running = 0;
-    /* Perform operations for all handles */
-    mret = curl_multi_perform (plugin->curl_multi_handle, &running);
-
-    /* Get additional information for all handles */
-    while (NULL != (msg = curl_multi_info_read (plugin->curl_multi_handle,
-                                                &msgs_left)))
-    {
-      CURL *easy_h = msg->easy_handle;
-      struct GNUNET_ATS_Session *s = NULL;
-      char *d = NULL;     /* curl requires 'd' to be a 'char *' */
-
-      GNUNET_assert (NULL != easy_h);
-
-      /* Obtain session from easy handle */
-      GNUNET_assert (CURLE_OK == curl_easy_getinfo (easy_h, CURLINFO_PRIVATE,
-                                                    &d));
-      s = (struct GNUNET_ATS_Session *) d;
-      GNUNET_assert (NULL != s);
-
-      if (msg->msg != CURLMSG_DONE)
-        continue;     /* This should not happen */
-
-      /* Get HTTP response code */
-      GNUNET_break (CURLE_OK == curl_easy_getinfo (easy_h,
-                                                   CURLINFO_RESPONSE_CODE,
-                                                   &http_statuscode));
-
-      if (easy_h == s->put.easyhandle)
-        put_request = GNUNET_YES;
-      else
-        put_request = GNUNET_NO;
-
-      /* Log status of terminated request */
-      if ((0 != msg->data.result) || (http_statuscode != 200))
-        LOG (GNUNET_ERROR_TYPE_DEBUG,
-             "Session %p/request %p: %s request to `%s' ended with status %li reason %i: `%s'\n",
-             s, msg->easy_handle,
-             (GNUNET_YES == put_request) ? "PUT" : "GET",
-             GNUNET_i2s (&s->address->peer),
-             http_statuscode,
-             msg->data.result,
-             curl_easy_strerror (msg->data.result));
-      else
-        LOG (GNUNET_ERROR_TYPE_DEBUG,
-             "Session %p/request %p: %s request to `%s' ended normal\n",
-             s, msg->easy_handle,
-             (GNUNET_YES == put_request) ? "PUT" : "GET",
-             GNUNET_i2s (&s->address->peer));
-
-      /* Remove easy handle from multi handle */
-      curl_multi_remove_handle (plugin->curl_multi_handle, easy_h);
-
-      /* Clean up easy handle */
-      curl_easy_cleanup (easy_h);
-
-      /* Remove information */
-      GNUNET_assert (plugin->cur_requests > 0);
-      plugin->cur_requests--;
-      LOG (GNUNET_ERROR_TYPE_INFO,
-           "%s request to %s done, number of requests decreased to %u\n",
-           (GNUNET_YES == put_request) ? "PUT" : "GET",
-           s->url,
-           plugin->cur_requests);
-
-      if (GNUNET_YES == put_request)
-      {
-        /* Clean up a PUT request */
-        s->put.easyhandle = NULL;
-        s->put.s = NULL;
-
-        switch (s->put.state)
-        {
-        case H_NOT_CONNECTED:
-        case H_DISCONNECTED:
-        case H_TMP_DISCONNECTED:
-          /* This must not happen */
-          GNUNET_break (0);
-          break;
-
-        case H_TMP_RECONNECT_REQUIRED:
-          /* Transport called send while disconnect in progress, reconnect */
-          if (GNUNET_SYSERR == client_connect_put (s))
-          {
-            /* Reconnect failed, disconnect session */
-            http_client_plugin_session_disconnect (plugin, s);
-          }
-          break;
-
-        case H_TMP_DISCONNECTING:
-          /* PUT gets temporarily disconnected */
-          s->put.state = H_TMP_DISCONNECTED;
-          break;
-
-        case H_PAUSED:
-        case H_CONNECTED:
-          /* PUT gets permanently disconnected */
-          s->put.state = H_DISCONNECTED;
-          http_client_plugin_session_disconnect (plugin, s);
-          break;
-
-        default:
-          GNUNET_break (0);
-          break;
-        }
-      }
-      else if (GNUNET_NO == put_request)
-      {
-        /* Clean up a GET request */
-        s->get.easyhandle = NULL;
-        s->get.s = NULL;
-
-        /* If we are emulating an XHR client we need to make another GET
-         * request.
-         */
-        if (GNUNET_YES == plugin->emulate_xhr)
-        {
-          if (GNUNET_SYSERR == client_connect_get (s))
-            http_client_plugin_session_disconnect (plugin, s);
-        }
-        else
-        {
-          /* GET request was terminated, so disconnect session */
-          http_client_plugin_session_disconnect (plugin, s);
-        }
-      }
-      else
-        GNUNET_break (0);    /* Must not happen */
-
-      GNUNET_STATISTICS_set (plugin->env->stats,
-                             HTTP_STAT_STR_CONNECTIONS,
-                             plugin->cur_requests,
-                             GNUNET_NO);
-    }
-  }
-  while (mret == CURLM_CALL_MULTI_PERFORM);
-  client_schedule (plugin, GNUNET_NO);
-}
-
-
-#ifdef TCP_STEALTH
-/**
- * Open TCP socket with TCP STEALTH enabled.
- *
- * @param clientp our `struct GNUNET_ATS_Session *`
- * @param purpose why does curl want to open a socket
- * @param address what kind of socket does curl want to have opened?
- * @return opened socket
- */
-static curl_socket_t
-open_tcp_stealth_socket_cb (void *clientp,
-                            curlsocktype purpose,
-                            struct curl_sockaddr *address)
-{
-  struct GNUNET_ATS_Session *s = clientp;
-  int ret;
-
-  switch (purpose)
-  {
-  case CURLSOCKTYPE_IPCXN:
-    ret = socket (address->family,
-                  address->socktype,
-                  address->protocol);
-    if (-1 == ret)
-      return CURL_SOCKET_BAD;
-    if (((SOCK_STREAM != address->socktype) ||
-         ((0 != address->protocol) &&
-          (IPPROTO_TCP != address->protocol))))
-      return (curl_socket_t) ret;
-    if ((0 != setsockopt (ret,
-                          IPPROTO_TCP,
-                          TCP_STEALTH,
-                          &s->address->peer,
-                          sizeof(struct GNUNET_PeerIdentity))))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _ ("TCP_STEALTH not supported on this platform.\n"));
-      (void) close (ret);
-      return CURL_SOCKET_BAD;
-    }
-    return (curl_socket_t) ret;
-
-  case CURLSOCKTYPE_ACCEPT:
-    GNUNET_break (0);
-    return CURL_SOCKET_BAD;
-    break;
-
-  case CURLSOCKTYPE_LAST:
-    GNUNET_break (0);
-    return CURL_SOCKET_BAD;
-
-  default:
-    GNUNET_break (0);
-    return CURL_SOCKET_BAD;
-  }
-}
-
-
-#endif
-
-
-/**
- * Connect GET request for a session
- *
- * @param s the session to connect
- * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
- */
-static int
-client_connect_get (struct GNUNET_ATS_Session *s)
-{
-  CURLMcode mret;
-  struct HttpAddress *ha;
-  uint32_t options;
-
-  ha = (struct HttpAddress *) s->address->address;
-  options = ntohl (ha->options);
-  /* create get request */
-  s->get.easyhandle = curl_easy_init ();
-  s->get.s = s;
-  if (0 != (options & HTTP_OPTIONS_TCP_STEALTH))
-  {
-#ifdef TCP_STEALTH
-    curl_easy_setopt (s->get.easyhandle,
-                      CURLOPT_OPENSOCKETFUNCTION,
-                      &open_tcp_stealth_socket_cb);
-    curl_easy_setopt (s->get.easyhandle,
-                      CURLOPT_OPENSOCKETDATA,
-                      s);
-#else
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Cannot connect, TCP STEALTH needed and not supported by kernel.\n");
-    curl_easy_cleanup (s->get.easyhandle);
-    s->get.easyhandle = NULL;
-    s->get.s = NULL;
-    return GNUNET_SYSERR;
-#endif
-  }
-
-#if VERBOSE_CURL
-  curl_easy_setopt (s->get.easyhandle,
-                    CURLOPT_VERBOSE,
-                    1L);
-  curl_easy_setopt (s->get.easyhandle,
-                    CURLOPT_DEBUGFUNCTION,
-                    &client_log);
-  curl_easy_setopt (s->get.easyhandle,
-                    CURLOPT_DEBUGDATA,
-                    &s->get);
-#endif
-#if BUILD_HTTPS
-  curl_easy_setopt (s->get.easyhandle, CURLOPT_SSLVERSION,
-                    CURL_SSLVERSION_TLSv1);
-  {
-    if (HTTP_OPTIONS_VERIFY_CERTIFICATE ==
-        (options & HTTP_OPTIONS_VERIFY_CERTIFICATE))
-    {
-      curl_easy_setopt (s->get.easyhandle,
-                        CURLOPT_SSL_VERIFYPEER, 1L);
-      curl_easy_setopt (s->get.easyhandle,
-                        CURLOPT_SSL_VERIFYHOST,
-                        2L);
-    }
-    else
-    {
-      curl_easy_setopt (s->get.easyhandle,
-                        CURLOPT_SSL_VERIFYPEER,
-                        0L);
-      curl_easy_setopt (s->get.easyhandle,
-                        CURLOPT_SSL_VERIFYHOST,
-                        0L);
-    }
-  }
-  curl_easy_setopt (s->get.easyhandle,
-                    CURLOPT_PROTOCOLS,
-                    CURLPROTO_HTTPS);
-  curl_easy_setopt (s->get.easyhandle,
-                    CURLOPT_REDIR_PROTOCOLS,
-                    CURLPROTO_HTTPS);
-#else
-  curl_easy_setopt (s->get.easyhandle,
-                    CURLOPT_PROTOCOLS,
-                    CURLPROTO_HTTP);
-  curl_easy_setopt (s->get.easyhandle,
-                    CURLOPT_REDIR_PROTOCOLS,
-                    CURLPROTO_HTTP);
-#endif
-
-  if (NULL != s->plugin->proxy_hostname)
-  {
-    curl_easy_setopt (s->get.easyhandle,
-                      CURLOPT_PROXY,
-                      s->plugin->proxy_hostname);
-    curl_easy_setopt (s->get.easyhandle,
-                      CURLOPT_PROXYTYPE,
-                      s->plugin->proxytype);
-    if (NULL != s->plugin->proxy_username)
-      curl_easy_setopt (s->get.easyhandle,
-                        CURLOPT_PROXYUSERNAME,
-                        s->plugin->proxy_username);
-    if (NULL != s->plugin->proxy_password)
-      curl_easy_setopt (s->get.easyhandle,
-                        CURLOPT_PROXYPASSWORD,
-                        s->plugin->proxy_password);
-    if (GNUNET_YES == s->plugin->proxy_use_httpproxytunnel)
-      curl_easy_setopt (s->get.easyhandle,
-                        CURLOPT_HTTPPROXYTUNNEL,
-                        s->plugin->proxy_use_httpproxytunnel);
-  }
-
-  if (GNUNET_YES == s->plugin->emulate_xhr)
-  {
-    char *url;
-
-    GNUNET_asprintf (&url,
-                     "%s,1",
-                     s->url);
-    curl_easy_setopt (s->get.easyhandle,
-                      CURLOPT_URL,
-                      url);
-    GNUNET_free (url);
-  }
-  else
-  {
-    curl_easy_setopt (s->get.easyhandle,
-                      CURLOPT_URL,
-                      s->url);
-  }
-  curl_easy_setopt (s->get.easyhandle,
-                    CURLOPT_READFUNCTION,
-                    &client_send_cb);
-  curl_easy_setopt (s->get.easyhandle,
-                    CURLOPT_READDATA,
-                    s);
-  curl_easy_setopt (s->get.easyhandle,
-                    CURLOPT_WRITEFUNCTION,
-                    &client_receive);
-  curl_easy_setopt (s->get.easyhandle,
-                    CURLOPT_WRITEDATA,
-                    s);
-  /* No timeout by default, timeout done with session timeout */
-  curl_easy_setopt (s->get.easyhandle,
-                    CURLOPT_TIMEOUT,
-                    0L);
-  curl_easy_setopt (s->get.easyhandle,
-                    CURLOPT_PRIVATE, s);
-  curl_easy_setopt (s->get.easyhandle,
-                    CURLOPT_CONNECTTIMEOUT_MS,
-                    (long) (HTTP_CLIENT_NOT_VALIDATED_TIMEOUT.rel_value_us
-                            / 1000LL));
-  curl_easy_setopt (s->get.easyhandle, CURLOPT_BUFFERSIZE,
-                    2 * GNUNET_MAX_MESSAGE_SIZE);
-#if CURL_TCP_NODELAY
-  curl_easy_setopt (ps->recv_endpoint,
-                    CURLOPT_TCP_NODELAY,
-                    1L);
-#endif
-  curl_easy_setopt (s->get.easyhandle,
-                    CURLOPT_FOLLOWLOCATION,
-                    0L);
-
-  mret = curl_multi_add_handle (s->plugin->curl_multi_handle,
-                                s->get.easyhandle);
-  if (CURLM_OK != mret)
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Session %p : Failed to add GET handle to multihandle: `%s'\n",
-         s,
-         curl_multi_strerror (mret));
-    curl_easy_cleanup (s->get.easyhandle);
-    s->get.easyhandle = NULL;
-    s->get.s = NULL;
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  s->plugin->cur_requests++;
-  LOG (GNUNET_ERROR_TYPE_INFO,
-       "GET request `%s' established, number of requests increased to %u\n",
-       s->url,
-       s->plugin->cur_requests);
-  return GNUNET_OK;
-}
-
-
-/**
- * Connect a HTTP put request
- *
- * @param s the session to connect
- * @return #GNUNET_SYSERR for hard failure, #GNUNET_OK for ok
- */
-static int
-client_connect_put (struct GNUNET_ATS_Session *s)
-{
-  CURLMcode mret;
-  struct HttpAddress *ha;
-  uint32_t options;
-
-  ha = (struct HttpAddress *) s->address->address;
-  options = ntohl (ha->options);
-  /* create put request */
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Session %p: Init PUT handle\n",
-       s);
-  s->put.easyhandle = curl_easy_init ();
-  s->put.s = s;
-#if VERBOSE_CURL
-  curl_easy_setopt (s->put.easyhandle,
-                    CURLOPT_VERBOSE,
-                    1L);
-  curl_easy_setopt (s->put.easyhandle,
-                    CURLOPT_DEBUGFUNCTION,
-                    &client_log);
-  curl_easy_setopt (s->put.easyhandle,
-                    CURLOPT_DEBUGDATA,
-                    &s->put);
-#endif
-  if (0 != (options & HTTP_OPTIONS_TCP_STEALTH))
-  {
-#ifdef TCP_STEALTH
-    curl_easy_setopt (s->put.easyhandle,
-                      CURLOPT_OPENSOCKETFUNCTION,
-                      &open_tcp_stealth_socket_cb);
-    curl_easy_setopt (s->put.easyhandle,
-                      CURLOPT_OPENSOCKETDATA,
-                      s);
-#else
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Cannot connect, TCP STEALTH needed and not supported by kernel.\n");
-    curl_easy_cleanup (s->put.easyhandle);
-    s->put.easyhandle = NULL;
-    s->put.s = NULL;
-    s->put.state = H_DISCONNECTED;
-    return GNUNET_SYSERR;
-#endif
-  }
-#if BUILD_HTTPS
-  curl_easy_setopt (s->put.easyhandle,
-                    CURLOPT_SSLVERSION,
-                    CURL_SSLVERSION_TLSv1);
-  {
-    struct HttpAddress *ha;
-    ha = (struct HttpAddress *) s->address->address;
-
-    if (HTTP_OPTIONS_VERIFY_CERTIFICATE ==
-        (ntohl (ha->options) & HTTP_OPTIONS_VERIFY_CERTIFICATE))
-    {
-      curl_easy_setopt (s->put.easyhandle,
-                        CURLOPT_SSL_VERIFYPEER,
-                        1L);
-      curl_easy_setopt (s->put.easyhandle,
-                        CURLOPT_SSL_VERIFYHOST,
-                        2L);
-    }
-    else
-    {
-      curl_easy_setopt (s->put.easyhandle,
-                        CURLOPT_SSL_VERIFYPEER,
-                        0L);
-      curl_easy_setopt (s->put.easyhandle,
-                        CURLOPT_SSL_VERIFYHOST,
-                        0L);
-    }
-  }
-  curl_easy_setopt (s->put.easyhandle,
-                    CURLOPT_PROTOCOLS,
-                    CURLPROTO_HTTPS);
-  curl_easy_setopt (s->put.easyhandle,
-                    CURLOPT_REDIR_PROTOCOLS,
-                    CURLPROTO_HTTPS);
-#else
-  curl_easy_setopt (s->put.easyhandle,
-                    CURLOPT_PROTOCOLS,
-                    CURLPROTO_HTTP);
-  curl_easy_setopt (s->put.easyhandle,
-                    CURLOPT_REDIR_PROTOCOLS,
-                    CURLPROTO_HTTP);
-#endif
-  if (NULL != s->plugin->proxy_hostname)
-  {
-    curl_easy_setopt (s->put.easyhandle,
-                      CURLOPT_PROXY,
-                      s->plugin->proxy_hostname);
-    curl_easy_setopt (s->put.easyhandle,
-                      CURLOPT_PROXYTYPE,
-                      s->plugin->proxytype);
-    if (NULL != s->plugin->proxy_username)
-      curl_easy_setopt (s->put.easyhandle,
-                        CURLOPT_PROXYUSERNAME,
-                        s->plugin->proxy_username);
-    if (NULL != s->plugin->proxy_password)
-      curl_easy_setopt (s->put.easyhandle,
-                        CURLOPT_PROXYPASSWORD,
-                        s->plugin->proxy_password);
-    if (GNUNET_YES == s->plugin->proxy_use_httpproxytunnel)
-      curl_easy_setopt (s->put.easyhandle,
-                        CURLOPT_HTTPPROXYTUNNEL,
-                        s->plugin->proxy_use_httpproxytunnel);
-  }
-
-  curl_easy_setopt (s->put.easyhandle,
-                    CURLOPT_URL,
-                    s->url);
-  curl_easy_setopt (s->put.easyhandle,
-                    CURLOPT_UPLOAD,
-                    1L);
-  curl_easy_setopt (s->put.easyhandle,
-                    CURLOPT_READFUNCTION,
-                    &client_send_cb);
-  curl_easy_setopt (s->put.easyhandle,
-                    CURLOPT_READDATA,
-                    s);
-  curl_easy_setopt (s->put.easyhandle,
-                    CURLOPT_WRITEFUNCTION,
-                    &client_receive_put);
-  curl_easy_setopt (s->put.easyhandle,
-                    CURLOPT_WRITEDATA,
-                    s);
-  /* No timeout by default, timeout done with session timeout */
-  curl_easy_setopt (s->put.easyhandle,
-                    CURLOPT_TIMEOUT,
-                    0L);
-  curl_easy_setopt (s->put.easyhandle,
-                    CURLOPT_PRIVATE,
-                    s);
-  curl_easy_setopt (s->put.easyhandle,
-                    CURLOPT_CONNECTTIMEOUT_MS,
-                    (long) (HTTP_CLIENT_NOT_VALIDATED_TIMEOUT.rel_value_us
-                            / 1000LL));
-  curl_easy_setopt (s->put.easyhandle, CURLOPT_BUFFERSIZE,
-                    2 * GNUNET_MAX_MESSAGE_SIZE);
-#if CURL_TCP_NODELAY
-  curl_easy_setopt (s->put.easyhandle, CURLOPT_TCP_NODELAY, 1);
-#endif
-  mret = curl_multi_add_handle (s->plugin->curl_multi_handle,
-                                s->put.easyhandle);
-  if (CURLM_OK != mret)
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Session %p : Failed to add PUT handle to multihandle: `%s'\n",
-         s, curl_multi_strerror (mret));
-    curl_easy_cleanup (s->put.easyhandle);
-    s->put.easyhandle = NULL;
-    s->put.s = NULL;
-    s->put.state = H_DISCONNECTED;
-    return GNUNET_SYSERR;
-  }
-  s->put.state = H_CONNECTED;
-  s->plugin->cur_requests++;
-
-  LOG (GNUNET_ERROR_TYPE_INFO,
-       "PUT request `%s' established, number of requests increased to %u\n",
-       s->url, s->plugin->cur_requests);
-
-  return GNUNET_OK;
-}
-
-
-/**
- * Connect both PUT and GET request for a session
- *
- * @param s the session to connect
- * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
- */
-static int
-client_connect (struct GNUNET_ATS_Session *s)
-{
-  struct HTTP_Client_Plugin *plugin = s->plugin;
-  int res = GNUNET_OK;
-
-  /* create url */
-  if (NULL ==
-      http_common_plugin_address_to_string (plugin->protocol,
-                                            s->address->address,
-                                            s->address->address_length))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Invalid address peer `%s'\n",
-         GNUNET_i2s (&s->address->peer));
-    return GNUNET_SYSERR;
-  }
-
-  GNUNET_asprintf (&s->url,
-                   "%s/%s;%u",
-                   http_common_plugin_address_to_url (NULL,
-                                                      s->address->address,
-                                                      s->address->address_length),
-                   GNUNET_i2s_full (plugin->env->my_identity),
-                   plugin->last_tag);
-
-  plugin->last_tag++;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Initiating outbound session peer `%s' using address `%s'\n",
-       GNUNET_i2s (&s->address->peer), s->url);
-
-  if (GNUNET_SYSERR == client_connect_get (s))
-    return GNUNET_SYSERR;
-  /* If we are emulating an XHR client then delay sending a PUT request until
-   * there is something to send.
-   */
-  if (GNUNET_YES == plugin->emulate_xhr)
-  {
-    s->put.state = H_TMP_DISCONNECTED;
-  }
-  else if (GNUNET_SYSERR == client_connect_put (s))
-    return GNUNET_SYSERR;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Session %p: connected with GET %p and PUT %p\n",
-       s, s->get.easyhandle,
-       s->put.easyhandle);
-  /* Perform connect */
-  GNUNET_STATISTICS_set (plugin->env->stats,
-                         HTTP_STAT_STR_CONNECTIONS,
-                         plugin->cur_requests,
-                         GNUNET_NO);
-  /* Re-schedule since handles have changed */
-  if (NULL != plugin->client_perform_task)
-  {
-    GNUNET_SCHEDULER_cancel (plugin->client_perform_task);
-    plugin->client_perform_task = NULL;
-  }
-
-  /* Schedule task to run immediately */
-  plugin->client_perform_task = GNUNET_SCHEDULER_add_now (client_run,
-                                                          plugin);
-  return res;
-}
-
-
-/**
- * Function obtain the network type for a session
- *
- * @param cls closure (`struct Plugin*`)
- * @param session the session
- * @return the network type
- */
-static enum GNUNET_NetworkType
-http_client_plugin_get_network (void *cls,
-                                struct GNUNET_ATS_Session *session)
-{
-  return session->scope;
-}
-
-
-/**
- * Function obtain the network type for an address.
- *
- * @param cls closure (`struct Plugin *`)
- * @param address the address
- * @return the network type
- */
-static enum GNUNET_NetworkType
-http_client_plugin_get_network_for_address (void *cls,
-                                            const struct
-                                            GNUNET_HELLO_Address *address)
-{
-  struct HTTP_Client_Plugin *plugin = cls;
-
-  return http_common_get_network_for_address (plugin->env,
-                                              address);
-}
-
-
-/**
- * Session was idle, so disconnect it
- *
- * @param cls the `struct GNUNET_ATS_Session` of the idle session
- */
-static void
-client_session_timeout (void *cls)
-{
-  struct GNUNET_ATS_Session *s = cls;
-  struct GNUNET_TIME_Relative left;
-
-  s->timeout_task = NULL;
-  left = GNUNET_TIME_absolute_get_remaining (s->timeout);
-  if (0 != left.rel_value_us)
-  {
-    /* not actually our turn yet, but let's at least update
-       the monitor, it may think we're about to die ... */
-    notify_session_monitor (s->plugin,
-                            s,
-                            GNUNET_TRANSPORT_SS_UPDATE);
-    s->timeout_task = GNUNET_SCHEDULER_add_delayed (left,
-                                                    &client_session_timeout,
-                                                    s);
-    return;
-  }
-  LOG (TIMEOUT_LOG,
-       "Session %p was idle for %s, disconnecting\n",
-       s,
-       GNUNET_STRINGS_relative_time_to_string (HTTP_CLIENT_SESSION_TIMEOUT,
-                                               GNUNET_YES));
-  GNUNET_assert (GNUNET_OK ==
-                 http_client_plugin_session_disconnect (s->plugin,
-                                                        s));
-}
-
-
-/**
- * Creates a new outbound session the transport service will use to
- * send data to the peer
- *
- * @param cls the plugin
- * @param address the address
- * @return the session or NULL of max connections exceeded
- */
-static struct GNUNET_ATS_Session *
-http_client_plugin_get_session (void *cls,
-                                const struct GNUNET_HELLO_Address *address)
-{
-  struct HTTP_Client_Plugin *plugin = cls;
-  struct GNUNET_ATS_Session *s;
-  struct sockaddr *sa;
-  enum GNUNET_NetworkType net_type;
-  size_t salen = 0;
-  int res;
-
-  GNUNET_assert (NULL != address->address);
-
-  /* find existing session */
-  s = client_lookup_session (plugin, address);
-  if (NULL != s)
-    return s;
-
-  /* create a new session */
-  if (plugin->max_requests <= plugin->cur_requests)
-  {
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         "Maximum number of requests (%u) reached: "
-         "cannot connect to peer `%s'\n",
-         plugin->max_requests,
-         GNUNET_i2s (&address->peer));
-    return NULL;
-  }
-
-  /* Determine network location */
-  net_type = GNUNET_NT_UNSPECIFIED;
-  sa = http_common_socket_from_address (address->address,
-                                        address->address_length,
-                                        &res);
-  if (GNUNET_SYSERR == res)
-    return NULL;
-  if (GNUNET_YES == res)
-  {
-    GNUNET_assert (NULL != sa);
-    if (AF_INET == sa->sa_family)
-    {
-      salen = sizeof(struct sockaddr_in);
-    }
-    else if (AF_INET6 == sa->sa_family)
-    {
-      salen = sizeof(struct sockaddr_in6);
-    }
-    net_type = plugin->env->get_address_type (plugin->env->cls, sa, salen);
-    GNUNET_free (sa);
-  }
-  else if (GNUNET_NO == res)
-  {
-    /* Cannot convert to sockaddr -> is external hostname */
-    net_type = GNUNET_NT_WAN;
-  }
-  if (GNUNET_NT_UNSPECIFIED == net_type)
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-
-  s = GNUNET_new (struct GNUNET_ATS_Session);
-  s->plugin = plugin;
-  s->address = GNUNET_HELLO_address_copy (address);
-  s->scope = net_type;
-
-  s->put.state = H_NOT_CONNECTED;
-  s->timeout = GNUNET_TIME_relative_to_absolute (HTTP_CLIENT_SESSION_TIMEOUT);
-  s->timeout_task = GNUNET_SCHEDULER_add_delayed (HTTP_CLIENT_SESSION_TIMEOUT,
-                                                  &client_session_timeout,
-                                                  s);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Created new session %p for `%s' address `%s''\n",
-       s,
-       http_common_plugin_address_to_string (plugin->protocol,
-                                             s->address->address,
-                                             s->address->address_length),
-       GNUNET_i2s (&s->address->peer));
-
-  /* add new session */
-  (void) GNUNET_CONTAINER_multipeermap_put (plugin->sessions,
-                                            &s->address->peer,
-                                            s,
-                                            GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-  /* initiate new connection */
-  if (GNUNET_SYSERR == client_connect (s))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Cannot connect to peer `%s' address `%s''\n",
-         http_common_plugin_address_to_string (plugin->protocol,
-                                               s->address->address,
-                                               s->address->address_length),
-         GNUNET_i2s (&s->address->peer));
-    client_delete_session (s);
-    return NULL;
-  }
-  notify_session_monitor (plugin,
-                          s,
-                          GNUNET_TRANSPORT_SS_INIT);
-  notify_session_monitor (plugin,
-                          s,
-                          GNUNET_TRANSPORT_SS_UP); /* or handshake? */
-  return s;
-}
-
-
-/**
- * Setup http_client plugin
- *
- * @param plugin the plugin handle
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
- */
-static int
-client_start (struct HTTP_Client_Plugin *plugin)
-{
-  curl_global_init (CURL_GLOBAL_ALL);
-  plugin->curl_multi_handle = curl_multi_init ();
-
-  if (NULL == plugin->curl_multi_handle)
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         _ (
-           "Could not initialize curl multi handle, failed to start %s plugin!\n"),
-         plugin->name);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Another peer has suggested an address for this
- * peer and transport plugin.  Check that this could be a valid
- * address.  If so, consider adding it to the list
- * of addresses.
- *
- * @param cls closure with the `struct Plugin`
- * @param addr pointer to the address
- * @param addrlen length of @a addr
- * @return #GNUNET_OK if this is a plausible address for this peer
- *         and transport; always returns #GNUNET_NO (this is the client!)
- */
-static int
-http_client_plugin_address_suggested (void *cls,
-                                      const void *addr,
-                                      size_t addrlen)
-{
-  /* A HTTP/S client does not have any valid address so:*/
-  return GNUNET_NO;
-}
-
-
-/**
- * Exit point from the plugin.
- *
- * @param cls api as closure
- * @return NULL
- */
-void *
-LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls)
-{
-  struct GNUNET_TRANSPORT_PluginFunctions *api = cls;
-  struct HTTP_Client_Plugin *plugin = api->cls;
-
-  if (NULL == api->cls)
-  {
-    /* Stub shutdown */
-    GNUNET_free (api);
-    return NULL;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       _ ("Shutting down plugin `%s'\n"),
-       plugin->name);
-  GNUNET_CONTAINER_multipeermap_iterate (plugin->sessions,
-                                         &destroy_session_cb,
-                                         plugin);
-  if (NULL != plugin->client_perform_task)
-  {
-    GNUNET_SCHEDULER_cancel (plugin->client_perform_task);
-    plugin->client_perform_task = NULL;
-  }
-  if (NULL != plugin->curl_multi_handle)
-  {
-    curl_multi_cleanup (plugin->curl_multi_handle);
-    plugin->curl_multi_handle = NULL;
-  }
-  curl_global_cleanup ();
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       _ ("Shutdown for plugin `%s' complete\n"),
-       plugin->name);
-  GNUNET_CONTAINER_multipeermap_destroy (plugin->sessions);
-  GNUNET_free (plugin->proxy_hostname);
-  GNUNET_free (plugin->proxy_username);
-  GNUNET_free (plugin->proxy_password);
-  GNUNET_free (plugin);
-  GNUNET_free (api);
-  return NULL;
-}
-
-
-/**
- * Configure plugin
- *
- * @param plugin the plugin handle
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
- */
-static int
-client_configure_plugin (struct HTTP_Client_Plugin *plugin)
-{
-  unsigned long long max_requests;
-  char *proxy_type;
-
-  /* Optional parameters */
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (plugin->env->cfg,
-                                             plugin->name,
-                                             "MAX_CONNECTIONS",
-                                             &max_requests))
-    max_requests = 128;
-  plugin->max_requests = max_requests;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       _ ("Maximum number of requests is %u\n"),
-       plugin->max_requests);
-
-  /* Read proxy configuration */
-  if (GNUNET_OK ==
-      GNUNET_CONFIGURATION_get_value_string (plugin->env->cfg,
-                                             plugin->name,
-                                             "PROXY",
-                                             &plugin->proxy_hostname))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Found proxy host: `%s'\n",
-         plugin->proxy_hostname);
-    /* proxy username */
-    if (GNUNET_OK ==
-        GNUNET_CONFIGURATION_get_value_string (plugin->env->cfg,
-                                               plugin->name,
-                                               "PROXY_USERNAME",
-                                               &plugin->proxy_username))
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Found proxy username name: `%s'\n",
-           plugin->proxy_username);
-    }
-
-    /* proxy password */
-    if (GNUNET_OK ==
-        GNUNET_CONFIGURATION_get_value_string (plugin->env->cfg,
-                                               plugin->name,
-                                               "PROXY_PASSWORD",
-                                               &plugin->proxy_password))
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Found proxy password name: `%s'\n",
-           plugin->proxy_password);
-    }
-
-    /* proxy type */
-    if (GNUNET_OK ==
-        GNUNET_CONFIGURATION_get_value_string (plugin->env->cfg,
-                                               plugin->name,
-                                               "PROXY_TYPE",
-                                               &proxy_type))
-    {
-      GNUNET_STRINGS_utf8_toupper (proxy_type, proxy_type);
-
-      if (0 == strcmp (proxy_type, "HTTP"))
-        plugin->proxytype = CURLPROXY_HTTP;
-      else if (0 == strcmp (proxy_type, "SOCKS4"))
-        plugin->proxytype = CURLPROXY_SOCKS4;
-      else if (0 == strcmp (proxy_type, "SOCKS5"))
-        plugin->proxytype = CURLPROXY_SOCKS5;
-      else if (0 == strcmp (proxy_type, "SOCKS4A"))
-        plugin->proxytype = CURLPROXY_SOCKS4A;
-      else if (0 == strcmp (proxy_type, "SOCKS5_HOSTNAME "))
-        plugin->proxytype = CURLPROXY_SOCKS5_HOSTNAME;
-      else
-      {
-        LOG (GNUNET_ERROR_TYPE_ERROR,
-             _ (
-               "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"),
-             proxy_type);
-
-        GNUNET_free (proxy_type);
-        GNUNET_free (plugin->proxy_hostname);
-        plugin->proxy_hostname = NULL;
-        GNUNET_free (plugin->proxy_username);
-        plugin->proxy_username = NULL;
-        GNUNET_free (plugin->proxy_password);
-        plugin->proxy_password = NULL;
-
-        return GNUNET_SYSERR;
-      }
-
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Found proxy type: `%s'\n",
-           proxy_type);
-    }
-
-    /* proxy http tunneling */
-    plugin->proxy_use_httpproxytunnel
-      = GNUNET_CONFIGURATION_get_value_yesno (plugin->env->cfg,
-                                              plugin->name,
-                                              "PROXY_HTTP_TUNNELING");
-    if (GNUNET_SYSERR == plugin->proxy_use_httpproxytunnel)
-      plugin->proxy_use_httpproxytunnel = GNUNET_NO;
-
-    GNUNET_free (proxy_type);
-  }
-
-  /* Should we emulate an XHR client for testing? */
-  plugin->emulate_xhr
-    = GNUNET_CONFIGURATION_get_value_yesno (plugin->env->cfg,
-                                            plugin->name,
-                                            "EMULATE_XHR");
-  return GNUNET_OK;
-}
-
-
-/**
- * Function to convert an address to a human-readable string.
- *
- * @param cls closure
- * @param addr address to convert
- * @param addrlen address length
- * @return res string if conversion was successful, NULL otherwise
- */
-static const char *
-http_client_plugin_address_to_string (void *cls,
-                                      const void *addr,
-                                      size_t addrlen)
-{
-  return http_common_plugin_address_to_string (PLUGIN_NAME,
-                                               addr,
-                                               addrlen);
-}
-
-
-/**
- * Function that will be called whenever the transport service wants to
- * notify the plugin that a session is still active and in use and
- * therefore the session timeout for this session has to be updated
- *
- * @param cls closure
- * @param peer which peer was the session for
- * @param session which session is being updated
- */
-static void
-http_client_plugin_update_session_timeout (void *cls,
-                                           const struct
-                                           GNUNET_PeerIdentity *peer,
-                                           struct GNUNET_ATS_Session *session)
-{
-  client_reschedule_session_timeout (session);
-}
-
-
-/**
- * Function that will be called whenever the transport service wants to
- * notify the plugin that the inbound quota changed and that the plugin
- * should update it's delay for the next receive value
- *
- * @param cls closure
- * @param peer which peer was the session for
- * @param s which session is being updated
- * @param delay new delay to use for receiving
- */
-static void
-http_client_plugin_update_inbound_delay (void *cls,
-                                         const struct GNUNET_PeerIdentity *peer,
-                                         struct GNUNET_ATS_Session *s,
-                                         struct GNUNET_TIME_Relative delay)
-{
-  s->next_receive = GNUNET_TIME_relative_to_absolute (delay);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "New inbound delay %s\n",
-       GNUNET_STRINGS_relative_time_to_string (delay,
-                                               GNUNET_NO));
-  if (s->recv_wakeup_task != NULL)
-  {
-    GNUNET_SCHEDULER_cancel (s->recv_wakeup_task);
-    s->recv_wakeup_task
-      = GNUNET_SCHEDULER_add_delayed (delay,
-                                      &client_wake_up,
-                                      s);
-  }
-}
-
-
-/**
- * Return information about the given session to the
- * monitor callback.
- *
- * @param cls the `struct Plugin` with the monitor callback (`sic`)
- * @param peer peer we send information about
- * @param value our `struct GNUNET_ATS_Session` to send information about
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-send_session_info_iter (void *cls,
-                        const struct GNUNET_PeerIdentity *peer,
-                        void *value)
-{
-  struct HTTP_Client_Plugin *plugin = cls;
-  struct GNUNET_ATS_Session *session = value;
-
-  notify_session_monitor (plugin,
-                          session,
-                          GNUNET_TRANSPORT_SS_INIT);
-  notify_session_monitor (plugin,
-                          session,
-                          GNUNET_TRANSPORT_SS_UP); /* FIXME: or handshake? */
-  return GNUNET_OK;
-}
-
-
-/**
- * Begin monitoring sessions of a plugin.  There can only
- * be one active monitor per plugin (i.e. if there are
- * multiple monitors, the transport service needs to
- * multiplex the generated events over all of them).
- *
- * @param cls closure of the plugin
- * @param sic callback to invoke, NULL to disable monitor;
- *            plugin will being by iterating over all active
- *            sessions immediately and then enter monitor mode
- * @param sic_cls closure for @a sic
- */
-static void
-http_client_plugin_setup_monitor (void *cls,
-                                  GNUNET_TRANSPORT_SessionInfoCallback sic,
-                                  void *sic_cls)
-{
-  struct HTTP_Client_Plugin *plugin = cls;
-
-  plugin->sic = sic;
-  plugin->sic_cls = sic_cls;
-  if (NULL != sic)
-  {
-    GNUNET_CONTAINER_multipeermap_iterate (plugin->sessions,
-                                           &send_session_info_iter,
-                                           plugin);
-    /* signal end of first iteration */
-    sic (sic_cls, NULL, NULL);
-  }
-}
-
-
-/**
- * Entry point for the plugin.
- */
-void *
-LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls)
-{
-  struct GNUNET_TRANSPORT_PluginEnvironment *env = cls;
-  struct GNUNET_TRANSPORT_PluginFunctions *api;
-  struct HTTP_Client_Plugin *plugin;
-
-  if (NULL == env->receive)
-  {
-    /* run in 'stub' mode (i.e. as part of gnunet-peerinfo), don't fully
-       initialize the plugin or the API */
-    api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
-    api->cls = NULL;
-    api->address_to_string = &http_client_plugin_address_to_string;
-    api->string_to_address = &http_common_plugin_string_to_address;
-    api->address_pretty_printer = &http_common_plugin_address_pretty_printer;
-    return api;
-  }
-
-  plugin = GNUNET_new (struct HTTP_Client_Plugin);
-  plugin->env = env;
-  plugin->sessions = GNUNET_CONTAINER_multipeermap_create (128,
-                                                           GNUNET_YES);
-  api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
-  api->cls = plugin;
-  api->send = &http_client_plugin_send;
-  api->disconnect_session = &http_client_plugin_session_disconnect;
-  api->query_keepalive_factor = &http_client_query_keepalive_factor;
-  api->disconnect_peer = &http_client_plugin_peer_disconnect;
-  api->check_address = &http_client_plugin_address_suggested;
-  api->get_session = &http_client_plugin_get_session;
-  api->address_to_string = &http_client_plugin_address_to_string;
-  api->string_to_address = &http_common_plugin_string_to_address;
-  api->address_pretty_printer = &http_common_plugin_address_pretty_printer;
-  api->get_network = &http_client_plugin_get_network;
-  api->get_network_for_address = &http_client_plugin_get_network_for_address;
-  api->update_session_timeout = &http_client_plugin_update_session_timeout;
-  api->update_inbound_delay = &http_client_plugin_update_inbound_delay;
-  api->setup_monitor = &http_client_plugin_setup_monitor;
-#if BUILD_HTTPS
-  plugin->name = "transport-https_client";
-  plugin->protocol = "https";
-#else
-  plugin->name = "transport-http_client";
-  plugin->protocol = "http";
-#endif
-  plugin->last_tag = 1;
-
-  if (GNUNET_SYSERR == client_configure_plugin (plugin))
-  {
-    LIBGNUNET_PLUGIN_TRANSPORT_DONE (api);
-    return NULL;
-  }
-
-  /* Start client */
-  if (GNUNET_SYSERR == client_start (plugin))
-  {
-    LIBGNUNET_PLUGIN_TRANSPORT_DONE (api);
-    return NULL;
-  }
-  return api;
-}
-
-
-/* end of plugin_transport_http_client.c */
diff --git a/src/transport/plugin_transport_http_common.c b/src/transport/plugin_transport_http_common.c
deleted file mode 100644
index 75bf8b74a..000000000
--- a/src/transport/plugin_transport_http_common.c
+++ /dev/null
@@ -1,948 +0,0 @@
-/*
-   This file is part of GNUnet
-   Copyright (C) 2002-2013 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/plugin_transport_http_common.c
- * @brief functionality shared between http(s)client plugins
- * @author Matthias Wachs
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_transport_plugin.h"
-#include "plugin_transport_http_common.h"
-#include "gnunet_resolver_service.h"
-
-static void
-http_clean_splitted (struct SplittedHTTPAddress *spa)
-{
-  if (NULL != spa)
-  {
-    GNUNET_free (spa->protocol);
-    GNUNET_free (spa->host);
-    GNUNET_free (spa->path);
-    GNUNET_free (spa);
-  }
-}
-
-
-struct SplittedHTTPAddress *
-http_split_address (const char *addr)
-{
-  struct SplittedHTTPAddress *sp;
-  char *src = GNUNET_strdup (addr);
-  char *protocol_start = NULL;
-  char *host_start = NULL;
-  char *v6_end = NULL;
-  char *port_start = NULL;
-  char *path_start = NULL;
-
-  protocol_start = src;
-
-  sp = GNUNET_new (struct SplittedHTTPAddress);
-  /* Address string consists of protocol://host[:port]path*/
-
-  host_start = strstr (src, "://");
-  if (NULL == host_start)
-  {
-    GNUNET_free (src);
-    GNUNET_free (sp);
-    return NULL;
-  }
-  host_start[0] = '\0';
-  sp->protocol = GNUNET_strdup (protocol_start);
-
-  host_start += strlen ("://");
-  if (strlen (host_start) == 0)
-  {
-    GNUNET_free (src);
-    GNUNET_free (sp->protocol);
-    GNUNET_free (sp);
-    return NULL;
-  }
-
-  /* Find path start */
-  path_start = strchr (host_start, '/');
-  if (NULL != path_start)
-  {
-    sp->path = GNUNET_strdup (path_start);
-    path_start[0] = '\0';
-  }
-  else
-    sp->path = GNUNET_strdup ("");
-
-  if (strlen (host_start) < 1)
-  {
-    GNUNET_free (src);
-    GNUNET_free (sp->protocol);
-    GNUNET_free (sp->path);
-    GNUNET_free (sp);
-    return NULL;
-  }
-
-  if (NULL != (port_start = strrchr (host_start, ':')))
-  {
-    /* *We COULD have a port, but also an IPv6 address! */
-    if (NULL != (v6_end = strchr (host_start, ']')))
-    {
-      if (v6_end < port_start)
-      {
-        /* IPv6 address + port */
-        port_start[0] = '\0';
-        port_start++;
-        sp->port = atoi (port_start);
-        if ((0 == sp->port) || (65535 < sp->port))
-        {
-          GNUNET_free (src);
-          GNUNET_free (sp->protocol);
-          GNUNET_free (sp->path);
-          GNUNET_free (sp);
-          return NULL;
-        }
-      }
-      else
-      {
-        /* IPv6 address + no port */
-        if (0 == strcmp (sp->protocol, "https"))
-          sp->port = HTTPS_DEFAULT_PORT;
-        else if (0 == strcmp (sp->protocol, "http"))
-          sp->port = HTTP_DEFAULT_PORT;
-      }
-    }
-    else
-    {
-      /* No IPv6 address */
-      port_start[0] = '\0';
-      port_start++;
-      sp->port = atoi (port_start);
-      if ((0 == sp->port) || (65535 < sp->port))
-      {
-        GNUNET_free (src);
-        GNUNET_free (sp->protocol);
-        GNUNET_free (sp->path);
-        GNUNET_free (sp);
-        return NULL;
-      }
-    }
-  }
-  else
-  {
-    /* No ':' as port separator, default port for protocol */
-    if (0 == strcmp (sp->protocol, "https"))
-      sp->port = HTTPS_DEFAULT_PORT;
-    else if (0 == strcmp (sp->protocol, "http"))
-      sp->port = HTTP_DEFAULT_PORT;
-    else
-    {
-      GNUNET_break (0);
-      GNUNET_free (src);
-      GNUNET_free (sp->protocol);
-      GNUNET_free (sp->path);
-      GNUNET_free (sp);
-      return NULL;
-    }
-  }
-  if (strlen (host_start) > 0)
-    sp->host = GNUNET_strdup (host_start);
-  else
-  {
-    GNUNET_break (0);
-    GNUNET_free (src);
-    GNUNET_free (sp->protocol);
-    GNUNET_free (sp->path);
-    GNUNET_free (sp);
-    return NULL;
-  }
-  GNUNET_free (src);
-  return sp;
-}
-
-
-/**
- * Closure for #append_port().
- */
-struct PrettyPrinterContext
-{
-  /**
-   * DLL
-   */
-  struct PrettyPrinterContext *next;
-
-  /**
-   * DLL
-   */
-  struct PrettyPrinterContext *prev;
-
-  /**
-   * Resolver handle
-   */
-  struct GNUNET_RESOLVER_RequestHandle *resolver_handle;
-
-  /**
-   * Function to call with the result.
-   */
-  GNUNET_TRANSPORT_AddressStringCallback asc;
-
-  /**
-   * Clsoure for @e asc.
-   */
-  void *asc_cls;
-
-  /**
-   * Timeout task
-   */
-  struct GNUNET_SCHEDULER_Task *timeout_task;
-
-  /**
-   * Split Address
-   */
-  struct SplittedHTTPAddress *saddr;
-
-  /**
-   * Plugin String
-   */
-  char *plugin;
-
-  /**
-   * Was conversion successful
-   */
-  int success;
-
-  /**
-   * Address options
-   */
-  uint32_t options;
-};
-
-/**
- * Head of PPC list
- */
-static struct PrettyPrinterContext *dll_ppc_head;
-
-/**
- * Tail of PPC list
- */
-static struct PrettyPrinterContext *dll_ppc_tail;
-
-/**
- * Function called for a quick conversion of the binary address to
- * a numeric address.  Note that the caller must not free the
- * address and that the next call to this function is allowed
- * to override the address again.
- *
- * @param plugin the name of the plugin
- * @param saddr the split http address
- * @param options address options
- * @param dnsresult dns name to include in address
- * @return string representing the same address or NULL on error
- */
-static const char *
-http_common_plugin_dnsresult_to_address (const char *plugin,
-                                         const struct
-                                         SplittedHTTPAddress *saddr,
-                                         uint32_t options,
-                                         const char *dnsresult)
-{
-  static char rbuf[1024];
-  char *res;
-
-  GNUNET_asprintf (&res, "%s.%u.%s://%s:%u%s", plugin, options, saddr->protocol,
-                   dnsresult, saddr->port, saddr->path);
-  if (strlen (res) + 1 < 500)
-  {
-    GNUNET_memcpy (rbuf, res, strlen (res) + 1);
-    GNUNET_free (res);
-    return rbuf;
-  }
-  GNUNET_break (0);
-  GNUNET_free (res);
-  return NULL;
-}
-
-
-static void
-http_common_dns_reverse_lookup_cb (void *cls, const char *hostname)
-{
-  struct PrettyPrinterContext *ppc = cls;
-
-  if (NULL != hostname)
-  {
-    ppc->asc (ppc->asc_cls,
-              http_common_plugin_dnsresult_to_address (ppc->plugin, ppc->saddr,
-                                                       ppc->options,
-                                                       hostname), GNUNET_OK);
-    ppc->success = GNUNET_YES;
-  }
-  else
-  {
-    ppc->asc (ppc->asc_cls, NULL,
-              (GNUNET_NO == ppc->success) ? GNUNET_SYSERR : GNUNET_OK);
-
-    GNUNET_CONTAINER_DLL_remove (dll_ppc_head, dll_ppc_tail, ppc);
-    http_clean_splitted (ppc->saddr);
-    GNUNET_free (ppc->plugin);
-    GNUNET_free (ppc);
-  }
-}
-
-
-static int
-http_common_dns_reverse_lookup (const struct sockaddr *sockaddr,
-                                socklen_t sockaddr_len,
-                                const char *type,
-                                struct SplittedHTTPAddress *saddr,
-                                uint32_t options,
-                                struct GNUNET_TIME_Relative timeout,
-                                GNUNET_TRANSPORT_AddressStringCallback asc,
-                                void *asc_cls)
-{
-  struct PrettyPrinterContext *ppc;
-
-  ppc = GNUNET_new (struct PrettyPrinterContext);
-  ppc->saddr = saddr;
-  ppc->asc = asc;
-  ppc->asc_cls = asc_cls;
-  ppc->plugin = GNUNET_strdup (type);
-  ppc->options = options;
-  ppc->resolver_handle = GNUNET_RESOLVER_hostname_get (sockaddr,
-                                                       sockaddr_len,
-                                                       GNUNET_YES,
-                                                       timeout,
-                                                       &
-                                                       http_common_dns_reverse_lookup_cb,
-                                                       ppc);
-  if (NULL == ppc->resolver_handle)
-  {
-    GNUNET_free (ppc->plugin);
-    GNUNET_free (ppc);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_CONTAINER_DLL_insert (dll_ppc_head,
-                               dll_ppc_tail,
-                               ppc);
-  return GNUNET_OK;
-}
-
-
-static void
-http_common_dns_ip_lookup_cb (void *cls,
-                              const struct sockaddr *addr,
-                              socklen_t addrlen)
-{
-  struct PrettyPrinterContext *ppc = cls;
-
-  if (NULL != addr)
-  {
-    ppc->asc (ppc->asc_cls,
-              http_common_plugin_dnsresult_to_address (ppc->plugin, ppc->saddr,
-                                                       ppc->options,
-                                                       GNUNET_a2s (addr,
-                                                                   addrlen)),
-              GNUNET_OK);
-    ppc->success = GNUNET_YES;
-    ppc->asc (ppc->asc_cls, GNUNET_a2s (addr, addrlen), GNUNET_OK);
-  }
-  else
-  {
-    ppc->asc (ppc->asc_cls, NULL,
-              (GNUNET_NO == ppc->success) ? GNUNET_SYSERR : GNUNET_OK);
-
-    GNUNET_CONTAINER_DLL_remove (dll_ppc_head, dll_ppc_tail, ppc);
-    GNUNET_free (ppc->plugin);
-    http_clean_splitted (ppc->saddr);
-    GNUNET_free (ppc);
-  }
-}
-
-
-static int
-http_common_dns_ip_lookup (const char *name,
-                           const char *type,
-                           struct SplittedHTTPAddress *saddr,
-                           uint32_t options,
-                           struct GNUNET_TIME_Relative timeout,
-                           GNUNET_TRANSPORT_AddressStringCallback asc,
-                           void *asc_cls)
-{
-  struct PrettyPrinterContext *ppc;
-
-  ppc = GNUNET_new (struct PrettyPrinterContext);
-  ppc->success = GNUNET_NO;
-  ppc->saddr = saddr;
-  ppc->asc = asc;
-  ppc->asc_cls = asc_cls;
-  ppc->plugin = GNUNET_strdup (type);
-  ppc->options = options;
-  ppc->resolver_handle = GNUNET_RESOLVER_ip_get (name,
-                                                 AF_UNSPEC,
-                                                 timeout,
-                                                 &http_common_dns_ip_lookup_cb,
-                                                 ppc);
-  if (NULL == ppc->resolver_handle)
-  {
-    GNUNET_free (ppc->plugin);
-    GNUNET_free (ppc);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_CONTAINER_DLL_insert (dll_ppc_head,
-                               dll_ppc_tail,
-                               ppc);
-  return GNUNET_OK;
-}
-
-
-/**
- * Convert the transports address to a nice, human-readable
- * format.
- *
- * @param cls closure
- * @param type name of the transport that generated the address
- * @param addr one of the addresses of the host, NULL for the last address
- *        the specific address format depends on the transport
- * @param addrlen length of the @a addr
- * @param numeric should (IP) addresses be displayed in numeric form?
- * @param timeout after how long should we give up?
- * @param asc function to call on each string
- * @param asc_cls closure for @a asc
- */
-void
-http_common_plugin_address_pretty_printer (void *cls, const char *type,
-                                           const void *addr,
-                                           size_t addrlen,
-                                           int numeric,
-                                           struct GNUNET_TIME_Relative timeout,
-                                           GNUNET_TRANSPORT_AddressStringCallback
-                                           asc,
-                                           void *asc_cls)
-{
-  const struct HttpAddress *address = addr;
-  struct SplittedHTTPAddress *saddr;
-  struct sockaddr *sock_addr;
-  const char *ret;
-  char *addr_str;
-  int res;
-  int have_ip;
-
-  saddr = NULL;
-  sock_addr = NULL;
-  if ((addrlen < sizeof(struct HttpAddress)) ||
-      (addrlen != http_common_address_get_size (address)))
-  {
-    GNUNET_break (0);
-    goto handle_error;
-  }
-
-  addr_str = (char *) &address[1];
-  if (addr_str[ntohl (address->urlen) - 1] != '\0')
-  {
-    GNUNET_break (0);
-    goto handle_error;
-  }
-
-  saddr = http_split_address (addr_str);
-  if (NULL == saddr)
-  {
-    GNUNET_break (0);
-    goto handle_error;
-  }
-
-  sock_addr = http_common_socket_from_address (addr, addrlen, &res);
-  if (GNUNET_SYSERR == res)
-  {
-    /* Malformed address */
-    GNUNET_break (0);
-    goto handle_error;
-  }
-  else if (GNUNET_NO == res)
-  {
-    /* Could not convert to IP */
-    have_ip = GNUNET_NO;
-  }
-  else if (GNUNET_YES == res)
-  {
-    /* Converted to IP */
-    have_ip = GNUNET_YES;
-  }
-  else
-  {
-    /* Must not happen */
-    GNUNET_break (0);
-    goto handle_error;
-  }
-
-  if ((GNUNET_YES == numeric) &&
-      (GNUNET_YES == have_ip))
-  {
-    /* No lookup required */
-    ret = http_common_plugin_address_to_string (type, address, addrlen);
-    asc (asc_cls, ret, (NULL == ret) ? GNUNET_SYSERR : GNUNET_OK);
-    asc (asc_cls, NULL, GNUNET_OK);
-    http_clean_splitted (saddr);
-    GNUNET_free (sock_addr);
-    return;
-  }
-  if ((GNUNET_YES == numeric) &&
-      (GNUNET_NO == have_ip))
-  {
-    /* Forward lookup */
-    if (GNUNET_SYSERR ==
-        http_common_dns_ip_lookup (saddr->host, type, saddr,
-                                   address->options, timeout,
-                                   asc, asc_cls))
-    {
-      GNUNET_break (0);
-      goto handle_error;
-    }
-    /* Wait for resolver callback */
-    GNUNET_free (sock_addr);
-    return;
-  }
-  if ((GNUNET_NO == numeric) &&
-      (GNUNET_YES == have_ip))
-  {
-    /* Reverse lookup */
-    if (GNUNET_SYSERR ==
-        http_common_dns_reverse_lookup (sock_addr,
-                                        (AF_INET == sock_addr->sa_family)
-                                        ? sizeof(struct sockaddr_in)
-                                        : sizeof(struct sockaddr_in6),
-                                        type,
-                                        saddr,
-                                        address->options, timeout,
-                                        asc, asc_cls))
-    {
-      GNUNET_break (0);
-      goto handle_error;
-    }
-    /* Wait for resolver callback */
-    GNUNET_free (sock_addr);
-    return;
-  }
-  if ((GNUNET_NO == numeric) &&
-      (GNUNET_NO == have_ip))
-  {
-    /* No lookup required */
-    ret = http_common_plugin_address_to_string (type, address, addrlen);
-    asc (asc_cls, ret, (NULL == ret) ? GNUNET_SYSERR : GNUNET_OK);
-    asc (asc_cls, NULL, GNUNET_OK);
-    GNUNET_free (sock_addr);
-    http_clean_splitted (saddr);
-    return;
-  }
-  /* Error (argument supplied not GNUNET_YES or GNUNET_NO) */
-  GNUNET_break (0);
-  goto handle_error;
-
-handle_error:
-  /* Report error */
-  asc (asc_cls, NULL, GNUNET_SYSERR);
-  asc (asc_cls, NULL, GNUNET_OK);
-  GNUNET_free (sock_addr);
-  if (NULL != saddr)
-    http_clean_splitted (saddr);
-}
-
-
-/**
- * FIXME.
- */
-const char *
-http_common_plugin_address_to_url (void *cls,
-                                   const void *addr,
-                                   size_t addrlen)
-{
-  static char rbuf[1024];
-  const struct HttpAddress *address = addr;
-  const char *addr_str;
-
-  if (NULL == addr)
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-  if (0 == addrlen)
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-  if (addrlen != http_common_address_get_size (address))
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-  addr_str = (char *) &address[1];
-  if (addr_str[ntohl (address->urlen) - 1] != '\0')
-    return NULL;
-
-  GNUNET_memcpy (rbuf,
-                 &address[1],
-                 ntohl (address->urlen));
-  return rbuf;
-}
-
-
-/**
- * Function called for a quick conversion of the binary address to
- * a numeric address.  Note that the caller must not free the
- * address and that the next call to this function is allowed
- * to override the address again.
- *
- * @param plugin the name of the plugin
- * @param addr binary address
- * @param addrlen length of the address
- * @return string representing the same address
- */
-const char *
-http_common_plugin_address_to_string (const char *plugin,
-                                      const void *addr,
-                                      size_t addrlen)
-{
-  static char rbuf[1024];
-  const struct HttpAddress *address = addr;
-  const char *addr_str;
-  char *res;
-
-  GNUNET_assert (NULL != plugin);
-  if (NULL == addr)
-    return NULL;
-  if (0 == addrlen)
-    return NULL;
-  if (addrlen != http_common_address_get_size (address))
-    return NULL;
-  addr_str = (char *) &address[1];
-  if (addr_str[ntohl (address->urlen) - 1] != '\0')
-    return NULL;
-  GNUNET_asprintf (&res, "%s.%u.%s", plugin, ntohl (address->options),
-                   (char*)&address[1]);
-  if (strlen (res) + 1 < 500)
-  {
-    GNUNET_memcpy (rbuf, res, strlen (res) + 1);
-    GNUNET_free (res);
-    return rbuf;
-  }
-  GNUNET_break (0);
-  GNUNET_free (res);
-  return NULL;
-}
-
-
-/**
- * Function called to convert a string address to
- * a binary address.
- *
- * @param cls closure ('struct Plugin*')
- * @param addr string address
- * @param addrlen length of the @a addr
- * @param buf location to store the buffer
- *        If the function returns #GNUNET_SYSERR, its contents are undefined.
- * @param added length of created address
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
- */
-int
-http_common_plugin_string_to_address (void *cls,
-                                      const char *addr,
-                                      uint16_t addrlen,
-                                      void **buf,
-                                      size_t *added)
-{
-  struct HttpAddress *a;
-  char *address;
-  char *plugin;
-  char *optionstr;
-  size_t urlen;
-  uint32_t options;
-
-  /* Format protocol.options.address:port */
-  address = NULL;
-  plugin = NULL;
-  optionstr = NULL;
-  if ((NULL == addr) || (addrlen == 0))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  if ('\0' != addr[addrlen - 1])
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  if (strlen (addr) != addrlen - 1)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  plugin = GNUNET_strdup (addr);
-  optionstr = strchr (plugin, '.');
-  if (NULL == optionstr)
-  {
-    GNUNET_break (0);
-    GNUNET_free (plugin);
-    return GNUNET_SYSERR;
-  }
-  optionstr[0] = '\0';
-  optionstr++;
-  options = atol (optionstr);  /* 0 on conversion error, that's ok */
-  address = strchr (optionstr, '.');
-  if (NULL == address)
-  {
-    GNUNET_break (0);
-    GNUNET_free (plugin);
-    return GNUNET_SYSERR;
-  }
-  address[0] = '\0';
-  address++;
-  urlen = strlen (address) + 1;
-
-  a = GNUNET_malloc (sizeof(struct HttpAddress) + urlen);
-  a->options = htonl (options);
-  a->urlen = htonl (urlen);
-  GNUNET_memcpy (&a[1], address, urlen);
-
-  (*buf) = a;
-  (*added) = sizeof(struct HttpAddress) + urlen;
-  GNUNET_free (plugin);
-  return GNUNET_OK;
-}
-
-
-/**
- * Create a HTTP address from a socketaddr
- *
- * @param protocol protocol
- * @param addr sockaddr * address
- * @param addrlen length of the address
- * @return the HttpAddress
- */
-struct HttpAddress *
-http_common_address_from_socket (const char *protocol,
-                                 const struct sockaddr *addr,
-                                 socklen_t addrlen)
-{
-  struct HttpAddress *address = NULL;
-  char *res;
-  size_t len;
-
-  GNUNET_asprintf (&res,
-                   "%s://%s",
-                   protocol,
-                   GNUNET_a2s (addr,
-                               addrlen));
-  len = strlen (res) + 1;
-  address = GNUNET_malloc (sizeof(struct HttpAddress) + len);
-  address->options = htonl (HTTP_OPTIONS_NONE);
-  address->urlen = htonl (len);
-  GNUNET_memcpy (&address[1], res, len);
-  GNUNET_free (res);
-  return address;
-}
-
-
-/**
- * Create a socketaddr from a HTTP address
- *
- * @param addr a `sockaddr *` address
- * @param addrlen length of the @a addr
- * @param res the result:
- *   #GNUNET_SYSERR, invalid input,
- *   #GNUNET_YES: could convert to ip,
- *   #GNUNET_NO: valid input but could not convert to ip (hostname?)
- * @return the string
- */
-struct sockaddr *
-http_common_socket_from_address (const void *addr,
-                                 size_t addrlen,
-                                 int *res)
-{
-  const struct HttpAddress *ha;
-  struct SplittedHTTPAddress *spa;
-  struct sockaddr_storage *s;
-  char *to_conv;
-  size_t urlen;
-
-  (*res) = GNUNET_SYSERR;
-  ha = (const struct HttpAddress *) addr;
-  if (NULL == addr)
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-  if (0 == addrlen)
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-  if (addrlen < sizeof(struct HttpAddress))
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-  urlen = ntohl (ha->urlen);
-  if (sizeof(struct HttpAddress) + urlen != addrlen)
-  {
-    /* This is a legacy addresses */
-    return NULL;
-  }
-  if (addrlen < sizeof(struct HttpAddress) + urlen)
-  {
-    /* This is a legacy addresses */
-    return NULL;
-  }
-  if (((char *) addr)[addrlen - 1] != '\0')
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-  spa = http_split_address ((const char *) &ha[1]);
-  if (NULL == spa)
-  {
-    (*res) = GNUNET_SYSERR;
-    return NULL;
-  }
-
-  s = GNUNET_new (struct sockaddr_storage);
-  GNUNET_asprintf (&to_conv, "%s:%u", spa->host, spa->port);
-  if (GNUNET_SYSERR
-      == GNUNET_STRINGS_to_address_ip (to_conv, strlen (to_conv), s))
-  {
-    /* could be a hostname */
-    GNUNET_free (s);
-    (*res) = GNUNET_NO;
-    s = NULL;
-  }
-  else if ((AF_INET != s->ss_family) && (AF_INET6 != s->ss_family))
-  {
-    GNUNET_free (s);
-    (*res) = GNUNET_SYSERR;
-    s = NULL;
-  }
-  else
-  {
-    (*res) = GNUNET_YES;
-  }
-  http_clean_splitted (spa);
-  GNUNET_free (to_conv);
-  return (struct sockaddr *) s;
-}
-
-
-/**
- * Get the length of an address
- *
- * @param addr address
- * @return the size
- */
-size_t
-http_common_address_get_size (const struct HttpAddress *addr)
-{
-  return sizeof(struct HttpAddress) + ntohl (addr->urlen);
-}
-
-
-/**
- * Compare addr1 to addr2
- *
- * @param addr1 address1
- * @param addrlen1 address 1 length
- * @param addr2 address2
- * @param addrlen2 address 2 length
- * @return #GNUNET_YES if equal, #GNUNET_NO if not, #GNUNET_SYSERR on error
- */
-size_t
-http_common_cmp_addresses (const void *addr1,
-                           size_t addrlen1,
-                           const void *addr2,
-                           size_t addrlen2)
-{
-  const char *a1 = addr1;
-  const char *a2 = addr2;
-  const struct HttpAddress *ha1;
-  const struct HttpAddress *ha2;
-
-  ha1 = (const struct HttpAddress *) a1;
-  ha2 = (const struct HttpAddress *) a2;
-
-  if (NULL == a1)
-    return GNUNET_SYSERR;
-  if (0 == addrlen1)
-    return GNUNET_SYSERR;
-  if (a1[addrlen1 - 1] != '\0')
-    return GNUNET_SYSERR;
-
-  if (NULL == a2)
-    return GNUNET_SYSERR;
-  if (0 == addrlen2)
-    return GNUNET_SYSERR;
-  if (a2[addrlen2 - 1] != '\0')
-    return GNUNET_SYSERR;
-
-  if (addrlen1 != addrlen2)
-    return GNUNET_NO;
-  if (ha1->urlen != ha2->urlen)
-    return GNUNET_NO;
-
-  if (0 == strcmp ((const char *) &ha1[1], (const char *) &ha2[1]))
-    return GNUNET_YES;
-  return GNUNET_NO;
-}
-
-
-/**
- * Function obtain the network type for an address.
- *
- * @param env the environment
- * @param address the address
- * @return the network type
- */
-enum GNUNET_NetworkType
-http_common_get_network_for_address (struct
-                                     GNUNET_TRANSPORT_PluginEnvironment *env,
-                                     const struct GNUNET_HELLO_Address *address)
-{
-  struct sockaddr *sa;
-  enum GNUNET_NetworkType net_type;
-  size_t salen = 0;
-  int res;
-
-  net_type = GNUNET_NT_UNSPECIFIED;
-  sa = http_common_socket_from_address (address->address,
-                                        address->address_length,
-                                        &res);
-  if (GNUNET_SYSERR == res)
-    return net_type;
-  if (GNUNET_YES == res)
-  {
-    GNUNET_assert (NULL != sa);
-    if (AF_INET == sa->sa_family)
-    {
-      salen = sizeof(struct sockaddr_in);
-    }
-    else if (AF_INET6 == sa->sa_family)
-    {
-      salen = sizeof(struct sockaddr_in6);
-    }
-    net_type = env->get_address_type (env->cls,
-                                      sa,
-                                      salen);
-    GNUNET_free (sa);
-  }
-  return net_type;
-}
-
-
-/* end of plugin_transport_http_common.c */
diff --git a/src/transport/plugin_transport_http_common.h b/src/transport/plugin_transport_http_common.h
deleted file mode 100644
index 299dc0e68..000000000
--- a/src/transport/plugin_transport_http_common.h
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
-     This file is part of GNUnet
-     Copyright (C) 2002-2014 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport/plugin_transport_http_common.c
- * @brief functionality shared by http client and server transport service plugin
- * @author Matthias Wachs
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_transport_plugin.h"
-
-/**
- * Timeout values for testing
- */
-#define TESTING GNUNET_NO
-
-#if TESTING
-#define HTTP_SERVER_NOT_VALIDATED_TIMEOUT GNUNET_TIME_relative_multiply ( \
-    GNUNET_TIME_UNIT_SECONDS, 3)
-#define HTTP_CLIENT_NOT_VALIDATED_TIMEOUT GNUNET_TIME_relative_multiply ( \
-    GNUNET_TIME_UNIT_SECONDS, 3)
-#define HTTP_CLIENT_SESSION_TIMEOUT GNUNET_TIME_relative_multiply ( \
-    GNUNET_TIME_UNIT_SECONDS, 7)
-#define SERVER_SESSION_TIMEOUT GNUNET_TIME_relative_multiply ( \
-    GNUNET_TIME_UNIT_SECONDS, 7)
-#define TIMEOUT_LOG GNUNET_ERROR_TYPE_DEBUG
-
-#else
-
-#if BUILD_HTTPS
-#define PROTOCOL "https"
-#else
-#define PROTOCOL "http"
-#endif
-
-#define HTTP_SERVER_NOT_VALIDATED_TIMEOUT GNUNET_TIME_relative_multiply ( \
-    GNUNET_TIME_UNIT_SECONDS, 15)
-#define HTTP_CLIENT_NOT_VALIDATED_TIMEOUT GNUNET_TIME_relative_multiply ( \
-    GNUNET_TIME_UNIT_SECONDS, 15)
-#define HTTP_CLIENT_SESSION_TIMEOUT GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT
-#define HTTP_SERVER_SESSION_TIMEOUT GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT
-#define TIMEOUT_LOG GNUNET_ERROR_TYPE_DEBUG
-
-#endif
-
-#define HTTP_DEFAULT_PORT 80
-#define HTTPS_DEFAULT_PORT 443
-
-/**
- * Bits in the `options` field of HTTP addresses.
- */
-enum HttpAddressOptions
-{
-  /**
-   * No bits set.
-   */
-  HTTP_OPTIONS_NONE = 0,
-
-  /**
-   * Verify X509 server certificate, it should be valid.
-   * (if this bit is not set, it is probably just self-
-   * signed and not expected to be verified).
-   */
-  HTTP_OPTIONS_VERIFY_CERTIFICATE = 1,
-
-  /**
-   * Enable TCP Stealth-style port knocking.
-   */
-  HTTP_OPTIONS_TCP_STEALTH = 2
-};
-
-
-GNUNET_NETWORK_STRUCT_BEGIN
-
-/**
- * HttpAddress
- */
-struct HttpAddress
-{
-  /**
-   * Address options
-   * see `enum HttpAddressOptions`
-   */
-  uint32_t options GNUNET_PACKED;
-
-  /**
-   * Length of URL located after struct
-   */
-  uint32_t urlen GNUNET_PACKED;
-};
-
-GNUNET_NETWORK_STRUCT_END
-
-/**
- * Representation of HTTP URL split into its components.
- */
-struct SplittedHTTPAddress
-{
-  char *protocol;
-  char *host;
-  char *path;
-  int port;
-};
-
-
-/**
- * Split an HTTP address into protocol, hostname, port
- * and path components.
- */
-struct SplittedHTTPAddress *
-http_split_address (const char *addr);
-
-
-/**
- * Convert the transports address to a nice, human-readable
- * format.
- *
- * @param cls closure
- * @param type name of the transport that generated the address
- * @param addr one of the addresses of the host, NULL for the last address
- *        the specific address format depends on the transport
- * @param addrlen length of the address
- * @param numeric should (IP) addresses be displayed in numeric form?
- * @param timeout after how long should we give up?
- * @param asc function to call on each string
- * @param asc_cls closure for @a asc
- */
-void
-http_common_plugin_address_pretty_printer (void *cls,
-                                           const char *type,
-                                           const void *addr,
-                                           size_t addrlen,
-                                           int numeric,
-                                           struct GNUNET_TIME_Relative timeout,
-                                           GNUNET_TRANSPORT_AddressStringCallback
-                                           asc,
-                                           void *asc_cls);
-
-
-/**
- * Function called for a quick conversion of the binary address to
- * a numeric address.  Note that the caller must not free the
- * address and that the next call to this function is allowed
- * to override the address again.
- *
- * @param plugin name of the plugin
- * @param addr binary address
- * @param addrlen length of @a addr
- * @return string representing the same address
- */
-const char *
-http_common_plugin_address_to_string (const char *plugin,
-                                      const void *addr,
-                                      size_t addrlen);
-
-
-/**
- * Function called to convert a string address to
- * a binary address.
- *
- * @param cls closure (`struct Plugin*`)
- * @param addr string address
- * @param addrlen length of the address
- * @param buf location to store the buffer
- *        If the function returns #GNUNET_SYSERR, its contents are undefined.
- * @param added length of created address
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
- */
-int
-http_common_plugin_string_to_address (void *cls,
-                                      const char *addr,
-                                      uint16_t addrlen,
-                                      void **buf,
-                                      size_t *added);
-
-
-/**
- * Create a HTTP address from a socketaddr
- *
- * @param protocol protocol
- * @param addr `sockaddr *` address
- * @param addrlen length of the @a addr
- * @return the string
- */
-struct HttpAddress *
-http_common_address_from_socket (const char *protocol,
-                                 const struct sockaddr *addr,
-                                 socklen_t addrlen);
-
-
-/**
- * Create a socketaddr from a HTTP address
- *
- * @param addr a `sockaddr *` address
- * @param addrlen length of the @a addr
- * @param res the result:
- *   #GNUNET_SYSERR, invalid input,
- *   #GNUNET_YES: could convert to ip,
- *   #GNUNET_NO: valid input but could not convert to ip (hostname?)
- * @return the string
- */
-struct sockaddr *
-http_common_socket_from_address (const void *addr,
-                                 size_t addrlen,
-                                 int *res);
-
-
-const char *
-http_common_plugin_address_to_url (void *cls,
-                                   const void *addr,
-                                   size_t addrlen);
-
-
-/**
- * Get the length of an address
- *
- * @param addr address
- * @return the size
- */
-size_t
-http_common_address_get_size (const struct HttpAddress *addr);
-
-
-/**
- * Compare addr1 to addr2
- *
- * @param addr1 address1
- * @param addrlen1 length of @a address1
- * @param addr2 address2
- * @param addrlen2 length of @a address2
- * @return #GNUNET_YES if equal, #GNUNET_NO else
- */
-size_t
-http_common_cmp_addresses (const void *addr1,
-                           size_t addrlen1,
-                           const void *addr2,
-                           size_t addrlen2);
-
-
-/**
- * Function obtain the network type for an address.
- *
- * @param env the environment
- * @param address the address
- * @return the network type
- */
-enum GNUNET_NetworkType
-http_common_get_network_for_address (struct
-                                     GNUNET_TRANSPORT_PluginEnvironment *env,
-                                     const struct
-                                     GNUNET_HELLO_Address *address);
-
-
-/* end of plugin_transport_http_common.h */
diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c
deleted file mode 100644
index 78b030e9a..000000000
--- a/src/transport/plugin_transport_http_server.c
+++ /dev/null
@@ -1,3603 +0,0 @@
-/*
-     This file is part of GNUnet
-     Copyright (C) 2002-2014, 2017 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/plugin_transport_http_server.c
- * @brief HTTP/S server transport plugin
- * @author Matthias Wachs
- * @author David Barksdale
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_statistics_service.h"
-#include "gnunet_transport_plugin.h"
-#include "gnunet_nat_service.h"
-#include "plugin_transport_http_common.h"
-#include <microhttpd.h>
-#include <regex.h>
-#include "gnunet_mhd_compat.h"
-
-#if BUILD_HTTPS
-#define PLUGIN_NAME "https_server"
-#define LIBGNUNET_PLUGIN_TRANSPORT_INIT \
-  libgnunet_plugin_transport_https_server_init
-#define LIBGNUNET_PLUGIN_TRANSPORT_DONE \
-  libgnunet_plugin_transport_https_server_done
-#else
-#define PLUGIN_NAME "http_server"
-#define LIBGNUNET_PLUGIN_TRANSPORT_INIT \
-  libgnunet_plugin_transport_http_server_init
-#define LIBGNUNET_PLUGIN_TRANSPORT_DONE \
-  libgnunet_plugin_transport_http_server_done
-#endif
-
-#define HTTP_ERROR_RESPONSE \
-  "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\"><HTML><HEAD><TITLE>404 Not Found</TITLE></HEAD><BODY><H1>Not Found</H1>The requested URL was not found on this server.<P><HR><ADDRESS></ADDRESS></BODY></HTML>"
-#define _RECEIVE 0
-#define _SEND 1
-
-
-#define LOG(kind, ...) GNUNET_log_from (kind, "transport-" PLUGIN_NAME, \
-                                        __VA_ARGS__)
-
-
-/**
- * Information we keep with MHD for an HTTP request.
- */
-struct ServerRequest
-{
-  /**
-   * The session this server request belongs to
-   * Can be NULL, when session was disconnected and freed
-   */
-  struct GNUNET_ATS_Session *session;
-
-  /**
-   * The MHD connection
-   */
-  struct MHD_Connection *mhd_conn;
-
-  /**
-   * The MHD daemon
-   */
-  struct MHD_Daemon *mhd_daemon;
-
-  /**
-   * Options requested by peer
-   */
-  uint32_t options;
-#define OPTION_LONG_POLL 1 /* GET request wants long-poll semantics */
-
-  /**
-   * _RECV or _SEND
-   */
-  int direction;
-
-  /**
-   * For PUT requests: Is this the first or last callback with size 0
-   * For GET requests: Have we sent a message
-   */
-  int connected;
-
-  /**
-   * Currently suspended
-   */
-  bool suspended;
-};
-
-
-/**
- * Wrapper to manage addresses
- */
-struct HttpAddressWrapper
-{
-  /**
-   * Linked list next
-   */
-  struct HttpAddressWrapper *next;
-
-  /**
-   * Linked list previous
-   */
-  struct HttpAddressWrapper *prev;
-
-  /**
-   * An address we are using.
-   */
-  struct HttpAddress *address;
-
-  /**
-   * Length of the address.
-   */
-  size_t addrlen;
-};
-
-
-/**
- *  Message to send using http
- */
-struct HTTP_Message
-{
-  /**
-   * next pointer for double linked list
-   */
-  struct HTTP_Message *next;
-
-  /**
-   * previous pointer for double linked list
-   */
-  struct HTTP_Message *prev;
-
-  /**
-   * buffer containing data to send
-   */
-  char *buf;
-
-  /**
-   * amount of data already sent
-   */
-  size_t pos;
-
-  /**
-   * buffer length
-   */
-  size_t size;
-
-  /**
-   * HTTP/S specific overhead
-   */
-  size_t overhead;
-
-  /**
-   * Continuation function to call once the transmission buffer
-   * has again space available.  NULL if there is no
-   * continuation to call.
-   */
-  GNUNET_TRANSPORT_TransmitContinuation transmit_cont;
-
-  /**
-   * Closure for transmit_cont.
-   */
-  void *transmit_cont_cls;
-};
-
-
-/**
- * Session handle for connections.
- */
-struct GNUNET_ATS_Session
-{
-  /**
-   * To whom are we talking to (set to our identity
-   * if we are still waiting for the welcome message)
-   */
-  struct GNUNET_PeerIdentity target;
-
-  /**
-   * Pointer to the global plugin struct.
-   */
-  struct HTTP_Server_Plugin *plugin;
-
-  /**
-   * next pointer for double linked list
-   */
-  struct HTTP_Message *msg_head;
-
-  /**
-   * previous pointer for double linked list
-   */
-  struct HTTP_Message *msg_tail;
-
-  /**
-   * Message stream tokenizer for incoming data
-   */
-  struct GNUNET_MessageStreamTokenizer *msg_tk;
-
-  /**
-   * Client recv handle
-   */
-  struct ServerRequest *server_recv;
-
-  /**
-   * Client send handle
-   */
-  struct ServerRequest *server_send;
-
-  /**
-   * Address
-   */
-  struct GNUNET_HELLO_Address *address;
-
-  /**
-   * Absolute time when to receive data again
-   * Used for receive throttling
-   */
-  struct GNUNET_TIME_Absolute next_receive;
-
-  /**
-   * Absolute time when this connection will time out.
-   */
-  struct GNUNET_TIME_Absolute timeout;
-
-  /**
-   * Session timeout task
-   */
-  struct GNUNET_SCHEDULER_Task *timeout_task;
-
-  /**
-   * Task to resume MHD handling when receiving is allowed again
-   */
-  struct GNUNET_SCHEDULER_Task *recv_wakeup_task;
-
-  /**
-   * Number of bytes waiting for transmission to this peer.
-   */
-  unsigned long long bytes_in_queue;
-
-  /**
-   * Number of messages waiting for transmission to this peer.
-   */
-  unsigned int msgs_in_queue;
-
-  /**
-   * Unique HTTP/S connection tag for this connection
-   */
-  uint32_t tag;
-
-  /**
-   * ATS network type.
-   */
-  enum GNUNET_NetworkType scope;
-
-  /**
-   * #GNUNET_YES if this session is known to the service.
-   */
-  int known_to_service;
-};
-
-
-/**
- * Encapsulation of all of the state of the plugin.
- */
-struct HTTP_Server_Plugin
-{
-  /**
-   * Our environment.
-   */
-  struct GNUNET_TRANSPORT_PluginEnvironment *env;
-
-  /**
-   * Hash map of open sessions.
-   */
-  struct GNUNET_CONTAINER_MultiPeerMap *sessions;
-
-  /**
-   * Function to call about session status changes.
-   */
-  GNUNET_TRANSPORT_SessionInfoCallback sic;
-
-  /**
-   * Closure for @e sic.
-   */
-  void *sic_cls;
-
-  /**
-   * Plugin name
-   */
-  char *name;
-
-  /**
-   * Protocol
-   */
-  char *protocol;
-
-  /**
-   * External address
-   */
-  char *external_hostname;
-
-  /**
-   * External hostname the plugin can be connected to, can be different to
-   * the host's FQDN, used e.g. for reverse proxying
-   */
-  struct GNUNET_HELLO_Address *ext_addr;
-
-  /**
-   * NAT handle & address management
-   */
-  struct GNUNET_NAT_Handle *nat;
-
-  /**
-   * IPv4 addresses DLL head
-   */
-  struct HttpAddressWrapper *addr_head;
-
-  /**
-   * IPv4 addresses DLL tail
-   */
-  struct HttpAddressWrapper *addr_tail;
-
-  /**
-   * IPv4 server socket to bind to
-   */
-  struct sockaddr_in *server_addr_v4;
-
-  /**
-   * IPv6 server socket to bind to
-   */
-  struct sockaddr_in6 *server_addr_v6;
-
-  /**
-   * MHD IPv4 daemon
-   */
-  struct MHD_Daemon *server_v4;
-
-  /**
-   * MHD IPv4 daemon
-   */
-  struct MHD_Daemon *server_v6;
-
-#if BUILD_HTTPS
-  /**
-   * Crypto related
-   *
-   * Example:
-   *
-   * Use RC4-128 instead of AES:
-   * NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
-   *
-   */
-  char *crypto_init;
-
-  /**
-   * TLS key
-   */
-  char *key;
-
-  /**
-   * TLS certificate
-   */
-  char *cert;
-#endif
-
-  /**
-   * MHD IPv4 task
-   */
-  struct GNUNET_SCHEDULER_Task *server_v4_task;
-
-  /**
-   * MHD IPv6 task
-   */
-  struct GNUNET_SCHEDULER_Task *server_v6_task;
-
-  /**
-   * Task calling transport service about external address
-   */
-  struct GNUNET_SCHEDULER_Task *notify_ext_task;
-
-  /**
-   * Notify transport only about external address
-   */
-  unsigned int external_only;
-
-  /**
-   * The IPv4 server is scheduled to run asap
-   */
-  int server_v4_immediately;
-
-  /**
-   * The IPv6 server is scheduled to run asap
-   */
-  int server_v6_immediately;
-
-  /**
-   * Verify external address
-   */
-  int verify_external_hostname;
-
-  /**
-   * Maximum number of sockets the plugin can use
-   * Each http request /request connections are two connections
-   */
-  unsigned int max_request;
-
-  /**
-   * Current number of sockets the plugin can use
-   * Each http connection are two requests
-   */
-  unsigned int cur_request;
-
-  /**
-   * Did we immediately end the session in disconnect_cb
-   */
-  int in_shutdown;
-
-  /**
-   * Length of peer id
-   */
-  int peer_id_length;
-
-  /**
-   * My options to be included in the address
-   */
-  uint32_t options;
-
-  /**
-   * use IPv6
-   */
-  uint16_t use_ipv6;
-
-  /**
-   * use IPv4
-   */
-  uint16_t use_ipv4;
-
-  /**
-   * Port used
-   */
-  uint16_t port;
-
-  /**
-   * Regex for parsing URLs. FIXME: this seems overkill.
-   */
-  regex_t url_regex;
-};
-
-
-/**
- * If a session monitor is attached, notify it about the new
- * session state.
- *
- * @param plugin our plugin
- * @param session session that changed state
- * @param state new state of the session
- */
-static void
-notify_session_monitor (struct HTTP_Server_Plugin *plugin,
-                        struct GNUNET_ATS_Session *session,
-                        enum GNUNET_TRANSPORT_SessionState state)
-{
-  struct GNUNET_TRANSPORT_SessionInfo info;
-
-  if (NULL == plugin->sic)
-    return;
-  memset (&info, 0, sizeof(info));
-  info.state = state;
-  info.is_inbound = GNUNET_YES;
-  info.num_msg_pending = session->msgs_in_queue;
-  info.num_bytes_pending = session->bytes_in_queue;
-  info.receive_delay = session->next_receive;
-  info.session_timeout = session->timeout;
-  info.address = session->address;
-  plugin->sic (plugin->sic_cls,
-               session,
-               &info);
-}
-
-
-/**
- * Wake up an MHD connection which was suspended
- *
- * @param cls the session
- */
-static void
-server_wake_up (void *cls)
-{
-  struct GNUNET_ATS_Session *s = cls;
-
-  s->recv_wakeup_task = NULL;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Session %p: Waking up PUT handle\n",
-       s);
-  GNUNET_assert (s->server_recv->suspended);
-  MHD_resume_connection (s->server_recv->mhd_conn);
-  s->server_recv->suspended = false;
-}
-
-
-/**
- * Reschedule the execution of both IPv4 and IPv6 server.
- *
- * @param plugin the plugin
- * @param server which server to schedule v4 or v6?
- * @param now #GNUNET_YES to schedule execution immediately, #GNUNET_NO to wait
- * until timeout
- */
-static void
-server_reschedule (struct HTTP_Server_Plugin *plugin,
-                   struct MHD_Daemon *server,
-                   int now);
-
-
-/**
- * Deletes the session.  Must not be used afterwards.
- *
- * @param s the session to delete
- */
-static void
-server_delete_session (struct GNUNET_ATS_Session *s)
-{
-  struct HTTP_Server_Plugin *plugin = s->plugin;
-  struct HTTP_Message *msg;
-
-  if (NULL != s->timeout_task)
-  {
-    GNUNET_SCHEDULER_cancel (s->timeout_task);
-    s->timeout_task = NULL;
-    s->timeout = GNUNET_TIME_UNIT_ZERO_ABS;
-  }
-  if (NULL != s->recv_wakeup_task)
-  {
-    GNUNET_SCHEDULER_cancel (s->recv_wakeup_task);
-    s->recv_wakeup_task = NULL;
-    if (NULL != s->server_recv)
-    {
-      GNUNET_assert (s->server_recv->suspended);
-      s->server_recv->suspended = false;
-      MHD_resume_connection (s->server_recv->mhd_conn);
-    }
-  }
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONTAINER_multipeermap_remove (plugin->sessions,
-                                                       &s->target,
-                                                       s));
-  while (NULL != (msg = s->msg_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (s->msg_head,
-                                 s->msg_tail,
-                                 msg);
-    if (NULL != msg->transmit_cont)
-      msg->transmit_cont (msg->transmit_cont_cls,
-                          &s->target,
-                          GNUNET_SYSERR,
-                          msg->size,
-                          msg->pos + msg->overhead);
-    GNUNET_assert (s->msgs_in_queue > 0);
-    s->msgs_in_queue--;
-    GNUNET_assert (s->bytes_in_queue >= msg->size);
-    s->bytes_in_queue -= msg->size;
-    GNUNET_free (msg);
-  }
-
-  GNUNET_assert (0 == s->msgs_in_queue);
-  GNUNET_assert (0 == s->bytes_in_queue);
-
-  if (NULL != s->server_send)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Server: %p / %p Terminating inbound PUT session to peer `%s'\n",
-         s, s->server_send,
-         GNUNET_i2s (&s->target));
-    s->server_send->session = NULL;
-    MHD_set_connection_option (s->server_send->mhd_conn,
-                               MHD_CONNECTION_OPTION_TIMEOUT,
-                               1 /* 0 = no timeout, so this is MIN */);
-    if (s->server_send->suspended)
-    {
-      s->server_send->suspended = false;
-      MHD_resume_connection (s->server_send->mhd_conn);
-    }
-    server_reschedule (plugin,
-                       s->server_send->mhd_daemon,
-                       GNUNET_YES);
-  }
-
-  if (NULL != s->server_recv)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Server: %p / %p Terminating inbound GET session to peer `%s'\n",
-         s, s->server_recv, GNUNET_i2s (&s->target));
-    s->server_recv->session = NULL;
-    MHD_set_connection_option (s->server_recv->mhd_conn,
-                               MHD_CONNECTION_OPTION_TIMEOUT,
-                               1 /* 0 = no timeout, so this is MIN */);
-    server_reschedule (plugin,
-                       s->server_recv->mhd_daemon,
-                       GNUNET_YES);
-  }
-  notify_session_monitor (plugin,
-                          s,
-                          GNUNET_TRANSPORT_SS_DONE);
-  if (GNUNET_YES == s->known_to_service)
-  {
-    plugin->env->session_end (plugin->env->cls,
-                              s->address,
-                              s);
-    s->known_to_service = GNUNET_NO;
-  }
-  if (NULL != s->msg_tk)
-  {
-    GNUNET_MST_destroy (s->msg_tk);
-    s->msg_tk = NULL;
-  }
-  GNUNET_HELLO_address_free (s->address);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Session %p destroyed\n",
-       s);
-  GNUNET_free (s);
-}
-
-
-/**
- * Disconnect session @a s by telling MHD to close the
- * connections (reducing timeout, etc.).
- *
- * @param cls closure with the `struct HTTP_Server_Plugin`
- * @param s the session
- * @return #GNUNET_OK on success
- */
-static int
-http_server_plugin_disconnect_session (void *cls,
-                                       struct GNUNET_ATS_Session *s)
-{
-  server_delete_session (s);
-  return GNUNET_OK;
-}
-
-
-/**
- * Session was idle, so disconnect it
- *
- * @param cls the session
- */
-static void
-server_session_timeout (void *cls)
-{
-  struct GNUNET_ATS_Session *s = cls;
-  struct GNUNET_TIME_Relative left;
-
-  s->timeout_task = NULL;
-  left = GNUNET_TIME_absolute_get_remaining (s->timeout);
-  if (0 != left.rel_value_us)
-  {
-    /* not actually our turn yet, but let's at least update
-       the monitor, it may think we're about to die ... */
-    notify_session_monitor (s->plugin,
-                            s,
-                            GNUNET_TRANSPORT_SS_UP);
-    s->timeout_task = GNUNET_SCHEDULER_add_delayed (left,
-                                                    &server_session_timeout,
-                                                    s);
-    return;
-  }
-  GNUNET_log (TIMEOUT_LOG,
-              "Session %p was idle for %s, disconnecting\n",
-              s,
-              GNUNET_STRINGS_relative_time_to_string (
-                HTTP_SERVER_SESSION_TIMEOUT,
-                GNUNET_YES));
-  server_delete_session (s);
-}
-
-
-/**
- * Increment session timeout due to activity session @a s
- *
- * @param s the session
- */
-static void
-server_reschedule_session_timeout (struct GNUNET_ATS_Session *s)
-{
-  GNUNET_assert (NULL != s->timeout_task);
-  s->timeout = GNUNET_TIME_relative_to_absolute (
-    GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
-}
-
-
-/**
- * Function that can be used by the transport service to transmit
- * a message using the plugin.   Note that in the case of a
- * peer disconnecting, the continuation MUST be called
- * prior to the disconnect notification itself.  This function
- * will be called with this peer's HELLO message to initiate
- * a fresh connection to another peer.
- *
- * @param cls closure
- * @param session which session must be used
- * @param msgbuf the message to transmit
- * @param msgbuf_size number of bytes in @a msgbuf
- * @param priority how important is the message (most plugins will
- *                 ignore message priority and just FIFO)
- * @param to how long to wait at most for the transmission (does not
- *                require plugins to discard the message after the timeout,
- *                just advisory for the desired delay; most plugins will ignore
- *                this as well)
- * @param cont continuation to call once the message has
- *        been transmitted (or if the transport is ready
- *        for the next transmission call; or if the
- *        peer disconnected...); can be NULL
- * @param cont_cls closure for @a cont
- * @return number of bytes used (on the physical network, with overheads);
- *         -1 on hard errors (i.e. address invalid); 0 is a legal value
- *         and does NOT mean that the message was not transmitted (DV)
- */
-static ssize_t
-http_server_plugin_send (void *cls,
-                         struct GNUNET_ATS_Session *session,
-                         const char *msgbuf,
-                         size_t msgbuf_size,
-                         unsigned int priority,
-                         struct GNUNET_TIME_Relative to,
-                         GNUNET_TRANSPORT_TransmitContinuation cont,
-                         void *cont_cls)
-{
-  struct HTTP_Server_Plugin *plugin = cls;
-  struct HTTP_Message *msg;
-  ssize_t bytes_sent = 0;
-  char *stat_txt;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Session %p/request %p: Sending message with %lu to peer `%s'\n",
-       session,
-       session->server_send,
-       (unsigned long) msgbuf_size,
-       GNUNET_i2s (&session->target));
-
-  /* create new message and schedule */
-  bytes_sent = sizeof(struct HTTP_Message) + msgbuf_size;
-  msg = GNUNET_malloc (bytes_sent);
-  msg->next = NULL;
-  msg->size = msgbuf_size;
-  msg->pos = 0;
-  msg->buf = (char *) &msg[1];
-  msg->transmit_cont = cont;
-  msg->transmit_cont_cls = cont_cls;
-  GNUNET_memcpy (msg->buf,
-                 msgbuf,
-                 msgbuf_size);
-  GNUNET_CONTAINER_DLL_insert_tail (session->msg_head,
-                                    session->msg_tail,
-                                    msg);
-  session->msgs_in_queue++;
-  session->bytes_in_queue += msg->size;
-  notify_session_monitor (plugin,
-                          session,
-                          GNUNET_TRANSPORT_SS_UP);
-  GNUNET_asprintf (&stat_txt,
-                   "# bytes currently in %s_server buffers",
-                   plugin->protocol);
-  GNUNET_STATISTICS_update (plugin->env->stats,
-                            stat_txt, msgbuf_size, GNUNET_NO);
-  GNUNET_free (stat_txt);
-
-  if (NULL != session->server_send)
-  {
-    if (session->server_send->suspended)
-    {
-      MHD_resume_connection (session->server_send->mhd_conn);
-      session->server_send->suspended = false;
-    }
-    server_reschedule (session->plugin,
-                       session->server_send->mhd_daemon,
-                       GNUNET_YES);
-  }
-  return bytes_sent;
-}
-
-
-/**
- * Terminate session during shutdown.
- *
- * @param cls the `struct HTTP_Server_Plugin *`
- * @param peer for which this is a session
- * @param value the `struct GNUNET_ATS_Session` to clean up
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-destroy_session_shutdown_cb (void *cls,
-                             const struct GNUNET_PeerIdentity *peer,
-                             void *value)
-{
-  struct GNUNET_ATS_Session *s = value;
-  struct ServerRequest *sc_send;
-  struct ServerRequest *sc_recv;
-
-  sc_send = s->server_send;
-  sc_recv = s->server_recv;
-  server_delete_session (s);
-  if (NULL != sc_send)
-    sc_send->session = NULL;
-  if (NULL != sc_recv)
-    sc_recv->session = NULL;
-
-  return GNUNET_OK;
-}
-
-
-/**
- * Terminate session.
- *
- * @param cls the `struct HTTP_Server_Plugin *`
- * @param peer for which this is a session
- * @param value the `struct GNUNET_ATS_Session` to clean up
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-destroy_session_cb (void *cls,
-                    const struct GNUNET_PeerIdentity *peer,
-                    void *value)
-{
-  struct GNUNET_ATS_Session *s = value;
-
-  server_delete_session (s);
-  return GNUNET_OK;
-}
-
-
-/**
- * Function that can be used to force the plugin to disconnect
- * from the given peer and cancel all previous transmissions
- * (and their continuationc).
- *
- * @param cls closure
- * @param target peer from which to disconnect
- */
-static void
-http_server_plugin_disconnect_peer (void *cls,
-                                    const struct GNUNET_PeerIdentity *target)
-{
-  struct HTTP_Server_Plugin *plugin = cls;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Transport tells me to disconnect `%s'\n",
-       GNUNET_i2s (target));
-  GNUNET_CONTAINER_multipeermap_get_multiple (plugin->sessions,
-                                              target,
-                                              &destroy_session_cb,
-                                              plugin);
-}
-
-
-/**
- * Another peer has suggested an address for this
- * peer and transport plugin.  Check that this could be a valid
- * address.  If so, consider adding it to the list
- * of addresses.
- *
- * @param cls closure
- * @param addr pointer to the address
- * @param addrlen length of @a addr
- * @return #GNUNET_OK if this is a plausible address for this peer
- *         and transport
- */
-static int
-http_server_plugin_address_suggested (void *cls,
-                                      const void *addr,
-                                      size_t addrlen)
-{
-  struct HTTP_Server_Plugin *plugin = cls;
-  struct HttpAddressWrapper *next;
-  struct HttpAddressWrapper *pos;
-  const struct HttpAddress *haddr = addr;
-
-  if ((NULL != plugin->ext_addr) &&
-      (GNUNET_YES == (http_common_cmp_addresses (addr, addrlen,
-                                                 plugin->ext_addr->address,
-                                                 plugin->ext_addr->
-                                                 address_length))) )
-  {
-    /* Checking HTTP_OPTIONS_VERIFY_CERTIFICATE option for external hostname */
-    if ((ntohl (haddr->options) & HTTP_OPTIONS_VERIFY_CERTIFICATE) !=
-        (plugin->options & HTTP_OPTIONS_VERIFY_CERTIFICATE))
-      return GNUNET_NO;   /* VERIFY option not set as required! */
-    return GNUNET_OK;
-  }
-  next = plugin->addr_head;
-  while (NULL != (pos = next))
-  {
-    next = pos->next;
-    if (GNUNET_YES == (http_common_cmp_addresses (addr,
-                                                  addrlen,
-                                                  pos->address,
-                                                  pos->addrlen)))
-      return GNUNET_OK;
-  }
-  return GNUNET_NO;
-}
-
-
-/**
- * Creates a new outbound session the transport
- * service will use to send data to the peer.
- *
- * Since HTTP/S server cannot create sessions, always returns NULL.
- *
- * @param cls the plugin
- * @param address the address
- * @return always NULL
- */
-static struct GNUNET_ATS_Session *
-http_server_plugin_get_session (void *cls,
-                                const struct GNUNET_HELLO_Address *address)
-{
-  return NULL;
-}
-
-
-/**
- * Call MHD IPv4 to process pending requests and then go back
- * and schedule the next run.
- *
- * @param cls plugin as closure
- */
-static void
-server_v4_run (void *cls)
-{
-  struct HTTP_Server_Plugin *plugin = cls;
-
-  plugin->server_v4_task = NULL;
-  plugin->server_v4_immediately = GNUNET_NO;
-  GNUNET_assert (MHD_YES == MHD_run (plugin->server_v4));
-  server_reschedule (plugin, plugin->server_v4, GNUNET_NO);
-}
-
-
-/**
- * Call MHD IPv6 to process pending requests and then go back
- * and schedule the next run.
- *
- * @param cls plugin as closure
- */
-static void
-server_v6_run (void *cls)
-{
-  struct HTTP_Server_Plugin *plugin = cls;
-
-  plugin->server_v6_task = NULL;
-  plugin->server_v6_immediately = GNUNET_NO;
-  GNUNET_assert (MHD_YES == MHD_run (plugin->server_v6));
-  server_reschedule (plugin, plugin->server_v6, GNUNET_NO);
-}
-
-
-/**
- * Function that queries MHD's select sets and
- * starts the task waiting for them.
- *
- * @param plugin plugin
- * @param daemon_handle the MHD daemon handle
- * @param now schedule now
- * @return gnunet task identifier
- */
-static struct GNUNET_SCHEDULER_Task *
-server_schedule (struct HTTP_Server_Plugin *plugin,
-                 struct MHD_Daemon *daemon_handle,
-                 int now)
-{
-  struct GNUNET_SCHEDULER_Task *ret;
-  fd_set rs;
-  fd_set ws;
-  fd_set es;
-  struct GNUNET_NETWORK_FDSet *wrs;
-  struct GNUNET_NETWORK_FDSet *wws;
-  int max;
-  MHD_UNSIGNED_LONG_LONG timeout;
-  static unsigned long long last_timeout = 0;
-  int haveto;
-  struct GNUNET_TIME_Relative tv;
-
-  if (GNUNET_YES == plugin->in_shutdown)
-    return NULL;
-
-  ret = NULL;
-  FD_ZERO (&rs);
-  FD_ZERO (&ws);
-  FD_ZERO (&es);
-  wrs = GNUNET_NETWORK_fdset_create ();
-  wws = GNUNET_NETWORK_fdset_create ();
-  max = -1;
-  GNUNET_assert (MHD_YES ==
-                 MHD_get_fdset (daemon_handle,
-                                &rs,
-                                &ws,
-                                &es,
-                                &max));
-  haveto = MHD_get_timeout (daemon_handle, &timeout);
-  if (haveto == MHD_YES)
-  {
-    if (timeout != last_timeout)
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "SELECT Timeout changed from %llu to %llu (ms)\n",
-           last_timeout, timeout);
-      last_timeout = timeout;
-    }
-    if (timeout <= GNUNET_TIME_UNIT_SECONDS.rel_value_us / 1000LL)
-      tv.rel_value_us = (uint64_t) timeout * 1000LL;
-    else
-      tv = GNUNET_TIME_UNIT_SECONDS;
-  }
-  else
-    tv = GNUNET_TIME_UNIT_SECONDS;
-  /* Force immediate run, since we have outbound data to send */
-  if (now == GNUNET_YES)
-    tv = GNUNET_TIME_UNIT_MILLISECONDS;
-  GNUNET_NETWORK_fdset_copy_native (wrs, &rs, max + 1);
-  GNUNET_NETWORK_fdset_copy_native (wws, &ws, max + 1);
-
-  if (daemon_handle == plugin->server_v4)
-  {
-    if (plugin->server_v4_task != NULL)
-    {
-      GNUNET_SCHEDULER_cancel (plugin->server_v4_task);
-      plugin->server_v4_task = NULL;
-    }
-#if 0
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Scheduling IPv4 server task in %llu ms\n",
-         tv);
-#endif
-    ret =
-      GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
-                                   tv, wrs, wws,
-                                   &server_v4_run, plugin);
-  }
-  if (daemon_handle == plugin->server_v6)
-  {
-    if (plugin->server_v6_task != NULL)
-    {
-      GNUNET_SCHEDULER_cancel (plugin->server_v6_task);
-      plugin->server_v6_task = NULL;
-    }
-#if 0
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Scheduling IPv6 server task in %llu ms\n", tv);
-#endif
-    ret =
-      GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
-                                   tv, wrs, wws,
-                                   &server_v6_run, plugin);
-  }
-  GNUNET_NETWORK_fdset_destroy (wrs);
-  GNUNET_NETWORK_fdset_destroy (wws);
-  return ret;
-}
-
-
-/**
- * Reschedule the execution of both IPv4 and IPv6 server
- *
- * @param plugin the plugin
- * @param server which server to schedule v4 or v6?
- * @param now #GNUNET_YES to schedule execution immediately, #GNUNET_NO to wait
- * until timeout
- */
-static void
-server_reschedule (struct HTTP_Server_Plugin *plugin,
-                   struct MHD_Daemon *server,
-                   int now)
-{
-  if ((server == plugin->server_v4) && (plugin->server_v4 != NULL))
-  {
-    if (GNUNET_YES == plugin->server_v4_immediately)
-      return;   /* No rescheduling, server will run asap */
-
-    if (GNUNET_YES == now)
-      plugin->server_v4_immediately = GNUNET_YES;
-
-    if (plugin->server_v4_task != NULL)
-    {
-      GNUNET_SCHEDULER_cancel (plugin->server_v4_task);
-      plugin->server_v4_task = NULL;
-    }
-    plugin->server_v4_task = server_schedule (plugin, plugin->server_v4, now);
-  }
-
-  if ((server == plugin->server_v6) && (plugin->server_v6 != NULL))
-  {
-    if (GNUNET_YES == plugin->server_v6_immediately)
-      return;   /* No rescheduling, server will run asap */
-
-    if (GNUNET_YES == now)
-      plugin->server_v6_immediately = GNUNET_YES;
-
-    if (plugin->server_v6_task != NULL)
-    {
-      GNUNET_SCHEDULER_cancel (plugin->server_v6_task);
-      plugin->server_v6_task = NULL;
-    }
-    plugin->server_v6_task = server_schedule (plugin, plugin->server_v6, now);
-  }
-}
-
-
-/**
- * Function that is called to get the keepalive factor.
- * GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT is divided by this number to
- * calculate the interval between keepalive packets.
- *
- * @param cls closure with the `struct HTTP_Server_Plugin`
- * @return keepalive factor
- */
-static unsigned int
-http_server_query_keepalive_factor (void *cls)
-{
-  return 3;
-}
-
-
-/**
- * Function that will be called whenever the transport service wants to
- * notify the plugin that a session is still active and in use and
- * therefore the session timeout for this session has to be updated
- *
- * @param cls closure
- * @param peer which peer was the session for
- * @param session which session is being updated
- */
-static void
-http_server_plugin_update_session_timeout (void *cls,
-                                           const struct
-                                           GNUNET_PeerIdentity *peer,
-                                           struct GNUNET_ATS_Session *session)
-{
-  server_reschedule_session_timeout (session);
-}
-
-
-/**
- * Tell MHD that the connection should timeout after @a to seconds.
- *
- * @param plugin our plugin
- * @param s session for which the timeout changes
- * @param to timeout in seconds
- */
-static void
-server_mhd_connection_timeout (struct HTTP_Server_Plugin *plugin,
-                               struct GNUNET_ATS_Session *s,
-                               unsigned int to)
-{
-  /* Setting timeouts for other connections */
-  if (NULL != s->server_recv)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Setting timeout for %p to %u sec.\n",
-         s->server_recv, to);
-    MHD_set_connection_option (s->server_recv->mhd_conn,
-                               MHD_CONNECTION_OPTION_TIMEOUT,
-                               to);
-    server_reschedule (plugin, s->server_recv->mhd_daemon, GNUNET_NO);
-  }
-  if (NULL != s->server_send)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Setting timeout for %p to %u sec.\n",
-         s->server_send, to);
-    MHD_set_connection_option (s->server_send->mhd_conn,
-                               MHD_CONNECTION_OPTION_TIMEOUT,
-                               to);
-    server_reschedule (plugin, s->server_send->mhd_daemon, GNUNET_NO);
-  }
-}
-
-
-/**
- * Parse incoming URL for tag and target
- *
- * @param plugin plugin
- * @param url incoming url
- * @param target where to store the target
- * @param tag where to store the tag
- * @param options where to store the options
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
- */
-static int
-server_parse_url (struct HTTP_Server_Plugin *plugin,
-                  const char *url,
-                  struct GNUNET_PeerIdentity *target,
-                  uint32_t *tag,
-                  uint32_t *options)
-{
-  regmatch_t matches[4];
-  const char *tag_start;
-  const char *target_start;
-  char *tag_end;
-  char *options_end;
-  size_t hash_length;
-  unsigned long int rc;
-
-  /* URL parsing */
-#define URL_REGEX \
-  ("^.*/([0-9A-Z]+);([0-9]+)(,[0-9]+)?$")
-
-  if (NULL == url)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-
-  if (regexec (&plugin->url_regex, url, 4, matches, 0))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "URL `%s' did not match regex\n", url);
-    return GNUNET_SYSERR;
-  }
-
-  target_start = &url[matches[1].rm_so];
-  tag_start = &url[matches[2].rm_so];
-
-  /* convert tag */
-  rc = strtoul (tag_start, &tag_end, 10);
-  if (&url[matches[2].rm_eo] != tag_end)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "URL tag did not line up with submatch\n");
-    return GNUNET_SYSERR;
-  }
-  if (rc == 0)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "URL tag is zero\n");
-    return GNUNET_SYSERR;
-  }
-  if ((rc == ULONG_MAX) && (ERANGE == errno))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "URL tag > ULONG_MAX\n");
-    return GNUNET_SYSERR;
-  }
-  if (rc > UINT32_MAX)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "URL tag > UINT32_MAX\n");
-    return GNUNET_SYSERR;
-  }
-  (*tag) = (uint32_t) rc;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Found tag `%u' in url\n",
-       *tag);
-
-  /* convert peer id */
-  hash_length = matches[1].rm_eo - matches[1].rm_so;
-  if (hash_length != plugin->peer_id_length)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "URL target is %lu bytes, expecting %u\n",
-         (unsigned long) hash_length, plugin->peer_id_length);
-    return GNUNET_SYSERR;
-  }
-  if (GNUNET_OK !=
-      GNUNET_CRYPTO_eddsa_public_key_from_string (target_start,
-                                                  hash_length,
-                                                  &target->public_key))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "URL target conversion failed\n");
-    return GNUNET_SYSERR;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Found target `%s' in URL\n",
-       GNUNET_i2s_full (target));
-
-  /* convert options */
-  if (-1 == matches[3].rm_so)
-  {
-    *options = 0;
-  }
-  else
-  {
-    rc = strtoul (&url[matches[3].rm_so + 1], &options_end, 10);
-    if (&url[matches[3].rm_eo] != options_end)
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "URL options did not line up with submatch\n");
-      return GNUNET_SYSERR;
-    }
-    if ((rc == ULONG_MAX) && (ERANGE == errno))
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "URL options > ULONG_MAX\n");
-      return GNUNET_SYSERR;
-    }
-    if (rc > UINT32_MAX)
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "URL options > UINT32_MAX\n");
-      return GNUNET_SYSERR;
-    }
-    (*options) = (uint32_t) rc;
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Found options `%u' in url\n",
-         *options);
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Closure for #session_tag_it().
- */
-struct GNUNET_ATS_SessionTagContext
-{
-  /**
-   * Set to session matching the tag.
-   */
-  struct GNUNET_ATS_Session *res;
-
-  /**
-   * Tag we are looking for.
-   */
-  uint32_t tag;
-};
-
-
-/**
- * Find a session with a matching tag.
- *
- * @param cls the `struct GNUNET_ATS_SessionTagContext *`
- * @param key peer identity (unused)
- * @param value the `struct GNUNET_ATS_Session *`
- * @return #GNUNET_NO if we found the session, #GNUNET_OK if not
- */
-static int
-session_tag_it (void *cls,
-                const struct GNUNET_PeerIdentity *key,
-                void *value)
-{
-  struct GNUNET_ATS_SessionTagContext *stc = cls;
-  struct GNUNET_ATS_Session *s = value;
-
-  if (s->tag == stc->tag)
-  {
-    stc->res = s;
-    return GNUNET_NO;
-  }
-  return GNUNET_YES;
-}
-
-
-/**
- * Lookup a mhd connection and create one if none is found
- *
- * @param plugin the plugin handle
- * @param mhd_connection the incoming mhd_connection
- * @param url incoming requested URL
- * @param method PUT or GET
- * @return the server connecetion
- */
-static struct ServerRequest *
-server_lookup_connection (struct HTTP_Server_Plugin *plugin,
-                          struct MHD_Connection *mhd_connection,
-                          const char *url,
-                          const char *method)
-{
-  struct GNUNET_ATS_Session *s = NULL;
-  struct ServerRequest *sc = NULL;
-  const union MHD_ConnectionInfo *conn_info;
-  struct HttpAddress *addr;
-  struct GNUNET_PeerIdentity target;
-  size_t addr_len;
-  struct GNUNET_ATS_SessionTagContext stc;
-  uint32_t options;
-  int direction = GNUNET_SYSERR;
-  unsigned int to;
-  enum GNUNET_NetworkType scope;
-
-  conn_info = MHD_get_connection_info (mhd_connection,
-                                       MHD_CONNECTION_INFO_CLIENT_ADDRESS);
-  if ((conn_info->client_addr->sa_family != AF_INET) &&
-      (conn_info->client_addr->sa_family != AF_INET6))
-    return NULL;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "New %s request from %s\n",
-       method,
-       url);
-  stc.tag = 0;
-  options = 0; /* make gcc happy */
-  if (GNUNET_SYSERR ==
-      server_parse_url (plugin, url, &target, &stc.tag, &options))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Invalid url %s\n", url);
-    return NULL;
-  }
-  if (0 == strcmp (MHD_HTTP_METHOD_PUT, method))
-    direction = _RECEIVE;
-  else if (0 == strcmp (MHD_HTTP_METHOD_GET, method))
-    direction = _SEND;
-  else
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Invalid method %s for request from %s\n",
-         method, url);
-    return NULL;
-  }
-
-  plugin->cur_request++;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "New %s request from %s with tag %u (%u of %u)\n",
-       method,
-       GNUNET_i2s (&target),
-       stc.tag,
-       plugin->cur_request, plugin->max_request);
-  /* find existing session */
-  stc.res = NULL;
-  GNUNET_CONTAINER_multipeermap_get_multiple (plugin->sessions,
-                                              &target,
-                                              &session_tag_it,
-                                              &stc);
-  if (NULL == (s = stc.res))
-  {
-    /* create new session */
-    addr = NULL;
-    switch (conn_info->client_addr->sa_family)
-    {
-    case (AF_INET):
-      addr = http_common_address_from_socket (plugin->protocol,
-                                              conn_info->client_addr,
-                                              sizeof(struct sockaddr_in));
-      addr_len = http_common_address_get_size (addr);
-      scope = plugin->env->get_address_type (plugin->env->cls,
-                                             conn_info->client_addr,
-                                             sizeof(struct sockaddr_in));
-      break;
-
-    case (AF_INET6):
-      addr = http_common_address_from_socket (plugin->protocol,
-                                              conn_info->client_addr,
-                                              sizeof(struct sockaddr_in6));
-      addr_len = http_common_address_get_size (addr);
-      scope = plugin->env->get_address_type (plugin->env->cls,
-                                             conn_info->client_addr,
-                                             sizeof(struct sockaddr_in6));
-      break;
-
-    default:
-      /* external host name */
-      return NULL;
-    }
-    s = GNUNET_new (struct GNUNET_ATS_Session);
-    s->target = target;
-    s->plugin = plugin;
-    s->scope = scope;
-    s->address = GNUNET_HELLO_address_allocate (&s->target,
-                                                PLUGIN_NAME,
-                                                addr,
-                                                addr_len,
-                                                GNUNET_HELLO_ADDRESS_INFO_INBOUND);
-    s->next_receive = GNUNET_TIME_UNIT_ZERO_ABS;
-    s->tag = stc.tag;
-    s->timeout = GNUNET_TIME_relative_to_absolute (HTTP_SERVER_SESSION_TIMEOUT);
-    s->timeout_task = GNUNET_SCHEDULER_add_delayed (HTTP_SERVER_SESSION_TIMEOUT,
-                                                    &server_session_timeout,
-                                                    s);
-    (void) GNUNET_CONTAINER_multipeermap_put (plugin->sessions,
-                                              &s->target,
-                                              s,
-                                              GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-    notify_session_monitor (plugin,
-                            s,
-                            GNUNET_TRANSPORT_SS_INIT);
-    notify_session_monitor (plugin,
-                            s,
-                            GNUNET_TRANSPORT_SS_HANDSHAKE);
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Creating new session %p for peer `%s' connecting from `%s'\n",
-         s, GNUNET_i2s (&target),
-         http_common_plugin_address_to_string (plugin->protocol,
-                                               addr,
-                                               addr_len));
-    GNUNET_free (addr);
-  }
-
-  if ((_RECEIVE == direction) &&
-      (NULL != s->server_recv))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Duplicate PUT request from `%s' tag %u, dismissing new request\n",
-         GNUNET_i2s (&target),
-         stc.tag);
-    return NULL;
-  }
-  if ((_SEND == direction) && (NULL != s->server_send))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Duplicate GET request from `%s' tag %u, dismissing new request\n",
-         GNUNET_i2s (&target),
-         stc.tag);
-    return NULL;
-  }
-  sc = GNUNET_new (struct ServerRequest);
-  if (conn_info->client_addr->sa_family == AF_INET)
-    sc->mhd_daemon = plugin->server_v4;
-  if (conn_info->client_addr->sa_family == AF_INET6)
-    sc->mhd_daemon = plugin->server_v6;
-  sc->mhd_conn = mhd_connection;
-  sc->direction = direction;
-  sc->connected = GNUNET_NO;
-  sc->session = s;
-  sc->options = options;
-  if (direction == _SEND)
-  {
-    s->server_send = sc;
-  }
-  if (direction == _RECEIVE)
-  {
-    s->server_recv = sc;
-  }
-
-  if ((GNUNET_NO == s->known_to_service) &&
-      (NULL != s->server_send) &&
-      (NULL != s->server_recv))
-  {
-    s->known_to_service = GNUNET_YES;
-    notify_session_monitor (plugin,
-                            s,
-                            GNUNET_TRANSPORT_SS_UP);
-    plugin->env->session_start (plugin->env->cls,
-                                s->address,
-                                s,
-                                s->scope);
-  }
-
-  to = (HTTP_SERVER_SESSION_TIMEOUT.rel_value_us / 1000LL / 1000LL);
-  server_mhd_connection_timeout (plugin, s, to);
-  return sc;
-}
-
-
-/**
- * Callback called by MHD when it needs data to send
- *
- * @param cls current session
- * @param pos position in buffer
- * @param buf the buffer to write data to
- * @param max max number of bytes available in @a buf
- * @return bytes written to @a buf
- */
-static ssize_t
-server_send_callback (void *cls,
-                      uint64_t pos,
-                      char *buf,
-                      size_t max)
-{
-  struct ServerRequest *sc = cls;
-  struct GNUNET_ATS_Session *s = sc->session;
-  ssize_t bytes_read = 0;
-  struct HTTP_Message *msg;
-  char *stat_txt;
-
-  if (NULL == s)
-  {
-    /* session is disconnecting */
-    return 0;
-  }
-
-  sc = s->server_send;
-  if (NULL == sc)
-    return 0;
-  msg = s->msg_head;
-  if (NULL != msg)
-  {
-    /* sending */
-    bytes_read = GNUNET_MIN (msg->size - msg->pos,
-                             max);
-    GNUNET_memcpy (buf, &msg->buf[msg->pos], bytes_read);
-    msg->pos += bytes_read;
-
-    /* removing message */
-    if (msg->pos == msg->size)
-    {
-      GNUNET_CONTAINER_DLL_remove (s->msg_head,
-                                   s->msg_tail,
-                                   msg);
-      if (NULL != msg->transmit_cont)
-        msg->transmit_cont (msg->transmit_cont_cls, &s->target, GNUNET_OK,
-                            msg->size, msg->size + msg->overhead);
-      GNUNET_assert (s->msgs_in_queue > 0);
-      s->msgs_in_queue--;
-      GNUNET_assert (s->bytes_in_queue >= msg->size);
-      s->bytes_in_queue -= msg->size;
-      GNUNET_free (msg);
-      notify_session_monitor (s->plugin,
-                              s,
-                              GNUNET_TRANSPORT_SS_UPDATE);
-    }
-  }
-  if (0 < bytes_read)
-  {
-    sc->connected = GNUNET_YES;
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Sent %lu bytes to peer `%s' with session %p \n",
-         (unsigned long) bytes_read,
-         GNUNET_i2s (&s->target),
-         s);
-    GNUNET_asprintf (&stat_txt,
-                     "# bytes currently in %s_server buffers",
-                     s->plugin->protocol);
-    GNUNET_STATISTICS_update (s->plugin->env->stats,
-                              stat_txt,
-                              -bytes_read,
-                              GNUNET_NO);
-    GNUNET_free (stat_txt);
-    GNUNET_asprintf (&stat_txt,
-                     "# bytes transmitted via %s_server",
-                     s->plugin->protocol);
-    GNUNET_STATISTICS_update (s->plugin->env->stats,
-                              stat_txt, bytes_read, GNUNET_NO);
-    GNUNET_free (stat_txt);
-  }
-  else if ((sc->options & OPTION_LONG_POLL) && sc->connected)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Completing GET response to peer `%s' with session %p\n",
-         GNUNET_i2s (&s->target),
-         s);
-    return MHD_CONTENT_READER_END_OF_STREAM;
-  }
-  else
-  {
-    MHD_suspend_connection (s->server_send->mhd_conn);
-    s->server_send->suspended = true;
-    return 0;
-  }
-  return bytes_read;
-}
-
-
-/**
- * Callback called by MessageStreamTokenizer when a message has arrived
- *
- * @param cls current session as closure
- * @param message the message to be forwarded to transport service
- * @return #GNUNET_OK (all OK)
- */
-static int
-server_receive_mst_cb (void *cls,
-                       const struct GNUNET_MessageHeader *message)
-{
-  struct GNUNET_ATS_Session *s = cls;
-  struct HTTP_Server_Plugin *plugin = s->plugin;
-  struct GNUNET_TIME_Relative delay;
-  char *stat_txt;
-
-  if (GNUNET_NO == s->known_to_service)
-  {
-    s->known_to_service = GNUNET_YES;
-    plugin->env->session_start (plugin->env->cls,
-                                s->address,
-                                s,
-                                s->scope);
-    notify_session_monitor (plugin,
-                            s,
-                            GNUNET_TRANSPORT_SS_UP);
-  }
-  delay = plugin->env->receive (plugin->env->cls,
-                                s->address,
-                                s,
-                                message);
-  GNUNET_asprintf (&stat_txt,
-                   "# bytes received via %s_server",
-                   plugin->protocol);
-  GNUNET_STATISTICS_update (plugin->env->stats,
-                            stat_txt,
-                            ntohs (message->size),
-                            GNUNET_NO);
-  GNUNET_free (stat_txt);
-  s->next_receive = GNUNET_TIME_relative_to_absolute (delay);
-  if (delay.rel_value_us > 0)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Peer `%s' address `%s' next read delayed for %s\n",
-         GNUNET_i2s (&s->target),
-         http_common_plugin_address_to_string (plugin->protocol,
-                                               s->address->address,
-                                               s->address->address_length),
-         GNUNET_STRINGS_relative_time_to_string (delay,
-                                                 GNUNET_YES));
-  }
-  server_reschedule_session_timeout (s);
-  return GNUNET_OK;
-}
-
-
-/**
- * Add headers to a request indicating that we allow Cross-Origin Resource
- * Sharing.
- *
- * @param response response object to modify
- */
-static void
-add_cors_headers (struct MHD_Response *response)
-{
-  MHD_add_response_header (response,
-                           "Access-Control-Allow-Origin",
-                           "*");
-  MHD_add_response_header (response,
-                           "Access-Control-Allow-Methods",
-                           "GET, PUT, OPTIONS");
-  MHD_add_response_header (response,
-                           "Access-Control-Max-Age",
-                           "86400");
-}
-
-
-/**
- * MHD callback for a new incoming connection
- *
- * @param cls the plugin handle
- * @param mhd_connection the mhd connection
- * @param url the requested URL
- * @param method GET or PUT
- * @param version HTTP version
- * @param upload_data upload data
- * @param upload_data_size size of @a upload_data
- * @param httpSessionCache the session cache to remember the connection
- * @return #MHD_YES if connection is accepted, #MHD_NO on reject
- */
-static MHD_RESULT
-server_access_cb (void *cls,
-                  struct MHD_Connection *mhd_connection,
-                  const char *url,
-                  const char *method,
-                  const char *version,
-                  const char *upload_data,
-                  size_t *upload_data_size,
-                  void **httpSessionCache)
-{
-  struct HTTP_Server_Plugin *plugin = cls;
-  struct ServerRequest *sc = *httpSessionCache;
-  struct GNUNET_ATS_Session *s;
-  struct MHD_Response *response;
-  MHD_RESULT res = MHD_YES;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       _ (
-         "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data size %lu\n"),
-       sc,
-       plugin->cur_request,
-       plugin->max_request,
-       method,
-       version,
-       url,
-       (unsigned long) (*upload_data_size));
-  if (NULL == sc)
-  {
-    /* CORS pre-flight request */
-    if (0 == strcmp (MHD_HTTP_METHOD_OPTIONS, method))
-    {
-      response = MHD_create_response_from_buffer (0, NULL,
-                                                  MHD_RESPMEM_PERSISTENT);
-      add_cors_headers (response);
-      res = MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
-      MHD_destroy_response (response);
-      return res;
-    }
-    /* new connection */
-    sc = server_lookup_connection (plugin, mhd_connection, url, method);
-    if (NULL != sc)
-    {
-      /* attach to new / existing session */
-      (*httpSessionCache) = sc;
-    }
-    else
-    {
-      /* existing session already has matching connection, refuse */
-      response = MHD_create_response_from_buffer (strlen (HTTP_ERROR_RESPONSE),
-                                                  HTTP_ERROR_RESPONSE,
-                                                  MHD_RESPMEM_PERSISTENT);
-      MHD_add_response_header (response,
-                               MHD_HTTP_HEADER_CONTENT_TYPE,
-                               "text/html");
-      add_cors_headers (response);
-      res = MHD_queue_response (mhd_connection, MHD_HTTP_NOT_FOUND, response);
-      MHD_destroy_response (response);
-      return res;
-    }
-  }
-  /* 'old' connection */
-  if (NULL == (s = sc->session))
-  {
-    /* Session was already disconnected;
-       sent HTTP/1.1: 200 OK as response */
-    response = MHD_create_response_from_buffer (strlen ("Thank you!"),
-                                                "Thank you!",
-                                                MHD_RESPMEM_PERSISTENT);
-    add_cors_headers (response);
-    MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
-    MHD_destroy_response (response);
-    return MHD_YES;
-  }
-
-  if (sc->direction == _SEND)
-  {
-    response = MHD_create_response_from_callback (MHD_SIZE_UNKNOWN, 32 * 1024,
-                                                  &server_send_callback, sc,
-                                                  NULL);
-    add_cors_headers (response);
-    MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
-    MHD_destroy_response (response);
-    return MHD_YES;
-  }
-  if (sc->direction == _RECEIVE)
-  {
-    if ((*upload_data_size == 0) && (sc->connected == GNUNET_NO))
-    {
-      /* (*upload_data_size == 0) first callback when header are passed */
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Session %p / Connection %p: Peer `%s' PUT on address `%s' connected\n",
-           s, sc,
-           GNUNET_i2s (&s->target),
-           http_common_plugin_address_to_string (plugin->protocol,
-                                                 s->address->address,
-                                                 s->address->address_length));
-      sc->connected = GNUNET_YES;
-      return MHD_YES;
-    }
-    else if ((*upload_data_size == 0) && (sc->connected == GNUNET_YES))
-    {
-      /* (*upload_data_size == 0) when upload is complete */
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Session %p / Connection %p: Peer `%s' PUT on address `%s' finished upload\n",
-           s, sc,
-           GNUNET_i2s (&s->target),
-           http_common_plugin_address_to_string (plugin->protocol,
-                                                 s->address->address,
-                                                 s->address->address_length));
-      sc->connected = GNUNET_NO;
-      /* Sent HTTP/1.1: 200 OK as PUT Response\ */
-      response = MHD_create_response_from_buffer (strlen ("Thank you!"),
-                                                  "Thank you!",
-                                                  MHD_RESPMEM_PERSISTENT);
-      add_cors_headers (response);
-      MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
-      MHD_destroy_response (response);
-      return MHD_YES;
-    }
-    else if ((*upload_data_size > 0) && (sc->connected == GNUNET_YES))
-    {
-      struct GNUNET_TIME_Relative delay;
-
-      /* (*upload_data_size > 0) for every segment received */
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Session %p / Connection %p: Peer `%s' PUT on address `%s' received %lu bytes\n",
-           s, sc,
-           GNUNET_i2s (&s->target),
-           http_common_plugin_address_to_string (plugin->protocol,
-                                                 s->address->address,
-                                                 s->address->address_length),
-           (unsigned long) *upload_data_size);
-      delay = GNUNET_TIME_absolute_get_remaining (s->next_receive);
-      if (0 == delay.rel_value_us)
-      {
-        LOG (GNUNET_ERROR_TYPE_DEBUG,
-             "PUT with %lu bytes forwarded to MST\n",
-             (unsigned long) *upload_data_size);
-        if (s->msg_tk == NULL)
-        {
-          s->msg_tk = GNUNET_MST_create (&server_receive_mst_cb,
-                                         s);
-        }
-        GNUNET_MST_from_buffer (s->msg_tk,
-                                upload_data,
-                                *upload_data_size,
-                                GNUNET_NO, GNUNET_NO);
-        server_mhd_connection_timeout (plugin, s,
-                                       GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.
-                                       rel_value_us / 1000LL
-                                       / 1000LL);
-        (*upload_data_size) = 0;
-      }
-      else
-      {
-        /* delay processing */
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                    "Session %p / Connection %p: no inbound bandwidth available! Next read was delayed by %s\n",
-                    s,
-                    sc,
-                    GNUNET_STRINGS_relative_time_to_string (delay,
-                                                            GNUNET_YES));
-        GNUNET_assert (s->server_recv->mhd_conn == mhd_connection);
-        MHD_suspend_connection (s->server_recv->mhd_conn);
-        s->server_recv->suspended = true;
-        if (NULL == s->recv_wakeup_task)
-          s->recv_wakeup_task
-            = GNUNET_SCHEDULER_add_delayed (delay,
-                                            &server_wake_up,
-                                            s);
-      }
-      return MHD_YES;
-    }
-    else
-    {
-      GNUNET_break (0);
-      return MHD_NO;
-    }
-  }
-  return res;
-}
-
-
-/**
- * Callback from MHD when a connection disconnects
- *
- * @param cls closure with the `struct HTTP_Server_Plugin *`
- * @param connection the disconnected MHD connection
- * @param httpSessionCache the pointer to distinguish
- */
-static void
-server_disconnect_cb (void *cls,
-                      struct MHD_Connection *connection,
-                      void **httpSessionCache)
-{
-  struct HTTP_Server_Plugin *plugin = cls;
-  struct ServerRequest *sc = *httpSessionCache;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Disconnect for connection %p\n",
-       sc);
-  if (NULL == sc)
-  {
-    /* CORS pre-flight request finished */
-    return;
-  }
-
-  if (NULL != sc->session)
-  {
-    if (sc->direction == _SEND)
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Peer `%s' connection  %p, GET on address `%s' disconnected\n",
-           GNUNET_i2s (&sc->session->target),
-           sc->session->server_send,
-           http_common_plugin_address_to_string (plugin->protocol,
-                                                 sc->session->address->address,
-                                                 sc->session->address->
-                                                 address_length));
-
-      sc->session->server_send = NULL;
-    }
-    else if (sc->direction == _RECEIVE)
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Peer `%s' connection %p PUT on address `%s' disconnected\n",
-           GNUNET_i2s (&sc->session->target),
-           sc->session->server_recv,
-           http_common_plugin_address_to_string (plugin->protocol,
-                                                 sc->session->address->address,
-                                                 sc->session->address->
-                                                 address_length));
-      sc->session->server_recv = NULL;
-      if (NULL != sc->session->msg_tk)
-      {
-        GNUNET_MST_destroy (sc->session->msg_tk);
-        sc->session->msg_tk = NULL;
-      }
-    }
-  }
-  GNUNET_free (sc);
-  plugin->cur_request--;
-}
-
-
-/**
- * Callback from MHD when a connection starts/stops
- *
- * @param cls closure with the `struct HTTP_Server_Plugin *`
- * @param connection connection handle
- * @param socket_context socket-specific pointer
- * @param toe reason for connection notification
- * @see #MHD_OPTION_NOTIFY_CONNECTION
- */
-static void
-server_connection_cb (void *cls,
-                      struct MHD_Connection *connection,
-                      void **socket_context,
-                      enum MHD_ConnectionNotificationCode toe)
-{
-  struct HTTP_Server_Plugin *plugin = cls;
-  const union MHD_ConnectionInfo *info;
-
-  if (MHD_CONNECTION_NOTIFY_STARTED == toe)
-    return;
-
-  /* Reschedule to remove closed socket from our select set */
-  info = MHD_get_connection_info (connection,
-                                  MHD_CONNECTION_INFO_DAEMON);
-  GNUNET_assert (NULL != info);
-  server_reschedule (plugin,
-                     info->daemon,
-                     GNUNET_YES);
-}
-
-
-/**
- * Check if incoming connection is accepted.
- *
- * @param cls plugin as closure
- * @param addr address of incoming connection
- * @param addr_len number of bytes in @a addr
- * @return #MHD_YES if connection is accepted, #MHD_NO if connection is rejected
- */
-static MHD_RESULT
-server_accept_cb (void *cls,
-                  const struct sockaddr *addr,
-                  socklen_t addr_len)
-{
-  struct HTTP_Server_Plugin *plugin = cls;
-
-  if (plugin->cur_request <= plugin->max_request)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         _ ("Accepting connection (%u of %u) from `%s'\n"),
-         plugin->cur_request, plugin->max_request,
-         GNUNET_a2s (addr, addr_len));
-    return MHD_YES;
-  }
-  else
-  {
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         _ (
-           "Server reached maximum number connections (%u), rejecting new connection\n"),
-         plugin->max_request);
-    return MHD_NO;
-  }
-}
-
-
-/**
- * Log function called by MHD.
- *
- * @param arg NULL
- * @param fmt format string
- * @param ap arguments for the format string (va_start() and va_end()
- *           will be called by MHD)
- */
-static void
-server_log (void *arg,
-            const char *fmt,
-            va_list ap)
-{
-  char text[1024];
-
-  vsnprintf (text,
-             sizeof(text),
-             fmt,
-             ap);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Server: %s\n",
-              text);
-}
-
-
-#if BUILD_HTTPS
-/**
- * Load ssl certificate from file
- *
- * @param file filename
- * @return content of the file
- */
-static char *
-server_load_file (const char *file)
-{
-  struct GNUNET_DISK_FileHandle *gn_file;
-  uint64_t fsize;
-  char *text = NULL;
-
-  if (GNUNET_OK != GNUNET_DISK_file_size (file,
-                                          &fsize, GNUNET_NO, GNUNET_YES))
-    return NULL;
-  text = GNUNET_malloc (fsize + 1);
-  gn_file =
-    GNUNET_DISK_file_open (file, GNUNET_DISK_OPEN_READ,
-                           GNUNET_DISK_PERM_USER_READ);
-  if (NULL == gn_file)
-  {
-    GNUNET_free (text);
-    return NULL;
-  }
-  if (GNUNET_SYSERR == GNUNET_DISK_file_read (gn_file, text, fsize))
-  {
-    GNUNET_free (text);
-    GNUNET_DISK_file_close (gn_file);
-    return NULL;
-  }
-  text[fsize] = '\0';
-  GNUNET_DISK_file_close (gn_file);
-  return text;
-}
-
-
-#endif
-
-
-#if BUILD_HTTPS
-/**
- * Load ssl certificate
- *
- * @param plugin the plugin
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
- */
-static int
-server_load_certificate (struct HTTP_Server_Plugin *plugin)
-{
-  int res = GNUNET_OK;
-  char *key_file;
-  char *cert_file;
-
-
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_filename (plugin->env->cfg,
-                                               plugin->name,
-                                               "KEY_FILE", &key_file))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               plugin->name, "CERT_FILE");
-    return GNUNET_SYSERR;
-  }
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_filename (plugin->env->cfg,
-                                               plugin->name,
-                                               "CERT_FILE", &cert_file))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               plugin->name, "CERT_FILE");
-    GNUNET_free (key_file);
-    return GNUNET_SYSERR;
-  }
-  /* Get crypto init string from config. If not present, use
-   * default values */
-  if (GNUNET_OK ==
-      GNUNET_CONFIGURATION_get_value_string (plugin->env->cfg,
-                                             plugin->name,
-                                             "CRYPTO_INIT",
-                                             &plugin->crypto_init))
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Using crypto init string `%s'\n",
-         plugin->crypto_init);
-  else
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Using default crypto init string \n");
-
-  /* read key & certificates from file */
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Trying to loading TLS certificate from key-file `%s' cert-file`%s'\n",
-              key_file, cert_file);
-
-  plugin->key = server_load_file (key_file);
-  plugin->cert = server_load_file (cert_file);
-
-  if ((plugin->key == NULL) || (plugin->cert == NULL))
-  {
-    struct GNUNET_OS_Process *cert_creation;
-
-    GNUNET_free (plugin->key);
-    plugin->key = NULL;
-    GNUNET_free (plugin->cert);
-    plugin->cert = NULL;
-
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "No usable TLS certificate found, creating certificate\n");
-    errno = 0;
-    cert_creation =
-      GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
-                               NULL, NULL, NULL,
-                               "gnunet-transport-certificate-creation",
-                               "gnunet-transport-certificate-creation",
-                               key_file,
-                               cert_file,
-                               NULL);
-    if (NULL == cert_creation)
-    {
-      LOG (GNUNET_ERROR_TYPE_ERROR,
-           _ (
-             "Could not create a new TLS certificate, program `gnunet-transport-certificate-creation' could not be started!\n"));
-      GNUNET_free (key_file);
-      GNUNET_free (cert_file);
-
-      GNUNET_free (plugin->key);
-      plugin->key = NULL;
-      GNUNET_free (plugin->cert);
-      plugin->cert = NULL;
-      GNUNET_free (plugin->crypto_init);
-      plugin->crypto_init = NULL;
-
-      return GNUNET_SYSERR;
-    }
-    GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (cert_creation));
-    GNUNET_OS_process_destroy (cert_creation);
-
-    plugin->key = server_load_file (key_file);
-    plugin->cert = server_load_file (cert_file);
-  }
-
-  if ((plugin->key == NULL) || (plugin->cert == NULL))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         _ (
-           "No usable TLS certificate found and creating one at `%s/%s' failed!\n"),
-         key_file, cert_file);
-    GNUNET_free (key_file);
-    GNUNET_free (cert_file);
-
-    GNUNET_free (plugin->key);
-    plugin->key = NULL;
-    GNUNET_free (plugin->cert);
-    plugin->cert = NULL;
-    GNUNET_free (plugin->crypto_init);
-    plugin->crypto_init = NULL;
-
-    return GNUNET_SYSERR;
-  }
-  GNUNET_free (key_file);
-  GNUNET_free (cert_file);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "TLS certificate loaded\n");
-  return res;
-}
-
-
-#endif
-
-
-/**
- * Invoke `MHD_start_daemon` with the various options we need to
- * setup the HTTP server with the given listen address.
- *
- * @param plugin our plugin
- * @param addr listen address to use
- * @param v6 MHD_NO_FLAG or MHD_USE_IPv6, depending on context
- * @return NULL on error
- */
-static struct MHD_Daemon *
-run_mhd_start_daemon (struct HTTP_Server_Plugin *plugin,
-                      const struct sockaddr_in *addr,
-                      int v6)
-{
-  struct MHD_Daemon *server;
-  unsigned int timeout;
-
-#if MHD_VERSION >= 0x00090E00
-  timeout = HTTP_SERVER_NOT_VALIDATED_TIMEOUT.rel_value_us / 1000LL / 1000LL;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "MHD can set timeout per connection! Default time out %u sec.\n",
-       timeout);
-#else
-  timeout = HTTP_SERVER_SESSION_TIMEOUT.rel_value_us / 1000LL / 1000LL;
-  LOG (GNUNET_ERROR_TYPE_WARNING,
-       "MHD cannot set timeout per connection! Default time out %u sec.\n",
-       timeout);
-#endif
-  server = MHD_start_daemon (
-#if VERBOSE_SERVER
-    MHD_USE_DEBUG |
-#endif
-#if BUILD_HTTPS
-    MHD_USE_SSL |
-#endif
-    MHD_USE_SUSPEND_RESUME
-    | v6,
-    plugin->port,
-    &server_accept_cb, plugin,
-    &server_access_cb, plugin,
-    MHD_OPTION_SOCK_ADDR,
-    addr,
-    MHD_OPTION_CONNECTION_LIMIT,
-    (unsigned int) plugin->max_request,
-#if BUILD_HTTPS
-    MHD_OPTION_HTTPS_PRIORITIES,
-    plugin->crypto_init,
-    MHD_OPTION_HTTPS_MEM_KEY,
-    plugin->key,
-    MHD_OPTION_HTTPS_MEM_CERT,
-    plugin->cert,
-#endif
-    MHD_OPTION_CONNECTION_TIMEOUT,
-    timeout,
-    MHD_OPTION_CONNECTION_MEMORY_LIMIT,
-    (size_t) (2
-              * GNUNET_MAX_MESSAGE_SIZE),
-    MHD_OPTION_NOTIFY_COMPLETED,
-    &server_disconnect_cb, plugin,
-    MHD_OPTION_NOTIFY_CONNECTION,
-    &server_connection_cb, plugin,
-    MHD_OPTION_EXTERNAL_LOGGER,
-    &server_log, NULL,
-    MHD_OPTION_END);
-#ifdef TCP_STEALTH
-  if ((NULL != server) &&
-      (0 != (plugin->options & HTTP_OPTIONS_TCP_STEALTH)))
-  {
-    const union MHD_DaemonInfo *di;
-
-    di = MHD_get_daemon_info (server,
-                              MHD_DAEMON_INFO_LISTEN_FD,
-                              NULL);
-    if ((0 != setsockopt ((int) di->listen_fd,
-                          IPPROTO_TCP,
-                          TCP_STEALTH,
-                          plugin->env->my_identity,
-                          sizeof(struct GNUNET_PeerIdentity))))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _ ("TCP_STEALTH not supported on this platform.\n"));
-      MHD_stop_daemon (server);
-      server = NULL;
-    }
-  }
-#endif
-  return server;
-}
-
-
-/**
- * Start the HTTP server
- *
- * @param plugin the plugin handle
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
- */
-static int
-server_start (struct HTTP_Server_Plugin *plugin)
-{
-  const char *msg;
-
-  GNUNET_assert (NULL != plugin);
-#if BUILD_HTTPS
-  if (GNUNET_SYSERR == server_load_certificate (plugin))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         _ (
-           "Could not load or create server certificate! Loading plugin failed!\n"));
-    return GNUNET_SYSERR;
-  }
-#endif
-
-
-  plugin->server_v4 = NULL;
-  if (GNUNET_YES == plugin->use_ipv4)
-  {
-    plugin->server_v4
-      = run_mhd_start_daemon (plugin,
-                              (const struct
-                               sockaddr_in *) plugin->server_addr_v4,
-                              MHD_NO_FLAG);
-
-    if (NULL == plugin->server_v4)
-    {
-      LOG (GNUNET_ERROR_TYPE_ERROR,
-           "Failed to start %s IPv4 server component on port %u\n",
-           plugin->name,
-           plugin->port);
-    }
-    else
-      server_reschedule (plugin,
-                         plugin->server_v4,
-                         GNUNET_NO);
-  }
-
-
-  plugin->server_v6 = NULL;
-  if (GNUNET_YES == plugin->use_ipv6)
-  {
-    plugin->server_v6
-      = run_mhd_start_daemon (plugin,
-                              (const struct
-                               sockaddr_in *) plugin->server_addr_v6,
-                              MHD_USE_IPv6);
-    if (NULL == plugin->server_v6)
-    {
-      LOG (GNUNET_ERROR_TYPE_ERROR,
-           "Failed to start %s IPv6 server component on port %u\n",
-           plugin->name,
-           plugin->port);
-    }
-    else
-    {
-      server_reschedule (plugin,
-                         plugin->server_v6,
-                         GNUNET_NO);
-    }
-  }
-  msg = "No";
-  if ((NULL == plugin->server_v6) &&
-      (NULL == plugin->server_v4))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "%s %s server component started on port %u\n",
-         msg,
-         plugin->name,
-         plugin->port);
-    return GNUNET_SYSERR;
-  }
-  if ((NULL != plugin->server_v6) &&
-      (NULL != plugin->server_v4))
-    msg = "IPv4 and IPv6";
-  else if (NULL != plugin->server_v6)
-    msg = "IPv6";
-  else if (NULL != plugin->server_v4)
-    msg = "IPv4";
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "%s %s server component started on port %u\n",
-       msg,
-       plugin->name,
-       plugin->port);
-  return GNUNET_OK;
-}
-
-
-/**
- * Add an address to the server's set of addresses and notify transport
- *
- * @param cls the plugin handle
- * @param add_remove #GNUNET_YES on add, #GNUNET_NO on remove
- * @param addr the address
- * @param addrlen address length
- */
-static void
-server_add_address (void *cls,
-                    int add_remove,
-                    const struct sockaddr *addr,
-                    socklen_t addrlen)
-{
-  struct HTTP_Server_Plugin *plugin = cls;
-  struct GNUNET_HELLO_Address *address;
-  struct HttpAddressWrapper *w = NULL;
-
-  w = GNUNET_new (struct HttpAddressWrapper);
-  w->address = http_common_address_from_socket (plugin->protocol,
-                                                addr,
-                                                addrlen);
-  if (NULL == w->address)
-  {
-    GNUNET_free (w);
-    return;
-  }
-  w->addrlen = http_common_address_get_size (w->address);
-
-  GNUNET_CONTAINER_DLL_insert (plugin->addr_head,
-                               plugin->addr_tail,
-                               w);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Notifying transport to add address `%s'\n",
-       http_common_plugin_address_to_string (plugin->protocol,
-                                             w->address,
-                                             w->addrlen));
-  /* modify our published address list */
-#if BUILD_HTTPS
-  address = GNUNET_HELLO_address_allocate (plugin->env->my_identity,
-                                           "https_client", w->address,
-                                           w->addrlen,
-                                           GNUNET_HELLO_ADDRESS_INFO_NONE);
-#else
-  address = GNUNET_HELLO_address_allocate (plugin->env->my_identity,
-                                           "http_client", w->address,
-                                           w->addrlen,
-                                           GNUNET_HELLO_ADDRESS_INFO_NONE);
-#endif
-
-  plugin->env->notify_address (plugin->env->cls,
-                               add_remove,
-                               address);
-  GNUNET_HELLO_address_free (address);
-}
-
-
-/**
- * Remove an address from the server's set of addresses and notify transport
- *
- * @param cls the plugin handle
- * @param add_remove #GNUNET_YES on add, #GNUNET_NO on remove
- * @param addr the address
- * @param addrlen address length
- */
-static void
-server_remove_address (void *cls,
-                       int add_remove,
-                       const struct sockaddr *addr,
-                       socklen_t addrlen)
-{
-  struct HTTP_Server_Plugin *plugin = cls;
-  struct GNUNET_HELLO_Address *address;
-  struct HttpAddressWrapper *w = plugin->addr_head;
-  size_t saddr_len;
-  void *saddr;
-
-  saddr = http_common_address_from_socket (plugin->protocol,
-                                           addr,
-                                           addrlen);
-  if (NULL == saddr)
-    return;
-  saddr_len = http_common_address_get_size (saddr);
-
-  while (NULL != w)
-  {
-    if (GNUNET_YES ==
-        http_common_cmp_addresses (w->address,
-                                   w->addrlen,
-                                   saddr,
-                                   saddr_len))
-      break;
-    w = w->next;
-  }
-  GNUNET_free (saddr);
-
-  if (NULL == w)
-    return;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Notifying transport to remove address `%s'\n",
-       http_common_plugin_address_to_string (plugin->protocol,
-                                             w->address,
-                                             w->addrlen));
-  GNUNET_CONTAINER_DLL_remove (plugin->addr_head,
-                               plugin->addr_tail,
-                               w);
-  /* modify our published address list */
-#if BUILD_HTTPS
-  address = GNUNET_HELLO_address_allocate (plugin->env->my_identity,
-                                           "https_client", w->address,
-                                           w->addrlen,
-                                           GNUNET_HELLO_ADDRESS_INFO_NONE);
-#else
-  address = GNUNET_HELLO_address_allocate (plugin->env->my_identity,
-                                           "http_client", w->address,
-                                           w->addrlen,
-                                           GNUNET_HELLO_ADDRESS_INFO_NONE);
-#endif
-  plugin->env->notify_address (plugin->env->cls, add_remove, address);
-  GNUNET_HELLO_address_free (address);
-  GNUNET_free (w->address);
-  GNUNET_free (w);
-}
-
-
-/**
- * Our external IP address/port mapping has changed.
- *
- * @param cls closure, the 'struct LocalAddrList'
- * @param app_ctx[in,out] location where the app can store stuff
- *                  on add and retrieve it on remove
- * @param add_remove #GNUNET_YES to mean the new public IP address, #GNUNET_NO to mean
- *     the previous (now invalid) one
- * @param ac address class the address belongs to
- * @param addr either the previous or the new public IP address
- * @param addrlen actual length of the address
- */
-static void
-server_nat_port_map_callback (void *cls,
-                              void **app_ctx,
-                              int add_remove,
-                              enum GNUNET_NAT_AddressClass ac,
-                              const struct sockaddr *addr,
-                              socklen_t addrlen)
-{
-  struct HTTP_Server_Plugin *plugin = cls;
-
-  (void) app_ctx;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "NAT called to %s address `%s'\n",
-       (add_remove == GNUNET_NO) ? "remove" : "add",
-       GNUNET_a2s (addr, addrlen));
-
-  if (AF_INET == addr->sa_family)
-  {
-    struct sockaddr_in *s4 = (struct sockaddr_in *) addr;
-
-    if (GNUNET_NO == plugin->use_ipv4)
-      return;
-
-    if ((NULL != plugin->server_addr_v4) &&
-        (0 != memcmp (&plugin->server_addr_v4->sin_addr,
-                      &s4->sin_addr,
-                      sizeof(struct in_addr))))
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Skipping address `%s' (not bindto address)\n",
-           GNUNET_a2s (addr, addrlen));
-      return;
-    }
-  }
-
-  if (AF_INET6 == addr->sa_family)
-  {
-    struct sockaddr_in6 *s6 = (struct sockaddr_in6 *) addr;
-    if (GNUNET_NO == plugin->use_ipv6)
-      return;
-
-    if ((NULL != plugin->server_addr_v6) &&
-        (0 != memcmp (&plugin->server_addr_v6->sin6_addr,
-                      &s6->sin6_addr, sizeof(struct in6_addr))))
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Skipping address `%s' (not bindto address)\n",
-           GNUNET_a2s (addr, addrlen));
-      return;
-    }
-  }
-
-  switch (add_remove)
-  {
-  case GNUNET_YES:
-    server_add_address (cls, add_remove, addr, addrlen);
-    break;
-
-  case GNUNET_NO:
-    server_remove_address (cls, add_remove, addr, addrlen);
-    break;
-  }
-}
-
-
-/**
- * Get valid server addresses
- *
- * @param plugin the plugin handle
- * @param service_name the servicename
- * @param cfg configuration handle
- * @param addrs addresses
- * @param addr_lens address length
- * @return number of addresses
- */
-static int
-server_get_addresses (struct HTTP_Server_Plugin *plugin,
-                      const char *service_name,
-                      const struct GNUNET_CONFIGURATION_Handle *cfg,
-                      struct sockaddr ***addrs,
-                      socklen_t **addr_lens)
-{
-  int disablev6;
-  unsigned long long port;
-  struct addrinfo hints;
-  struct addrinfo *res;
-  struct addrinfo *pos;
-  struct addrinfo *next;
-  unsigned int i;
-  int resi;
-  int ret;
-  struct sockaddr **saddrs;
-  socklen_t *saddrlens;
-  char *hostname;
-
-  *addrs = NULL;
-  *addr_lens = NULL;
-
-  disablev6 = ! plugin->use_ipv6;
-
-  port = 0;
-  if (GNUNET_CONFIGURATION_have_value (cfg, service_name, "PORT"))
-  {
-    GNUNET_break (GNUNET_OK ==
-                  GNUNET_CONFIGURATION_get_value_number (cfg, service_name,
-                                                         "PORT", &port));
-    if (port > 65535)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _ (
-                    "Require valid port number for service in configuration!\n"));
-      return GNUNET_SYSERR;
-    }
-  }
-  if (0 == port)
-  {
-    LOG (GNUNET_ERROR_TYPE_INFO,
-         "Starting in listen only mode\n");
-    return -1;   /* listen only */
-  }
-
-
-  if (GNUNET_CONFIGURATION_have_value (cfg, service_name,
-                                       "BINDTO"))
-  {
-    GNUNET_break (GNUNET_OK ==
-                  GNUNET_CONFIGURATION_get_value_string (cfg, service_name,
-                                                         "BINDTO", &hostname));
-  }
-  else
-    hostname = NULL;
-
-  if (NULL != hostname)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Resolving `%s' since that is where `%s' will bind to.\n",
-         hostname, service_name);
-    memset (&hints, 0, sizeof(struct addrinfo));
-    if (disablev6)
-      hints.ai_family = AF_INET;
-    if ((0 != (ret = getaddrinfo (hostname, NULL, &hints, &res))) ||
-        (NULL == res))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _ ("Failed to resolve `%s': %s\n"),
-                  hostname,
-                  gai_strerror (ret));
-      GNUNET_free (hostname);
-      return GNUNET_SYSERR;
-    }
-    next = res;
-    i = 0;
-    while (NULL != (pos = next))
-    {
-      next = pos->ai_next;
-      if ((disablev6) && (pos->ai_family == AF_INET6))
-        continue;
-      i++;
-    }
-    if (0 == i)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _ ("Failed to find %saddress for `%s'.\n"),
-                  disablev6 ? "IPv4 " : "", hostname);
-      freeaddrinfo (res);
-      GNUNET_free (hostname);
-      return GNUNET_SYSERR;
-    }
-    resi = i;
-    saddrs = GNUNET_malloc ((resi + 1) * sizeof(struct sockaddr *));
-    saddrlens = GNUNET_malloc ((resi + 1) * sizeof(socklen_t));
-    i = 0;
-    next = res;
-    while (NULL != (pos = next))
-    {
-      next = pos->ai_next;
-      if ((disablev6) && (pos->ai_family == AF_INET6))
-        continue;
-      if ((pos->ai_protocol != IPPROTO_TCP) && (0 != pos->ai_protocol))
-        continue;               /* not TCP */
-      if ((pos->ai_socktype != SOCK_STREAM) && (0 != pos->ai_socktype))
-        continue;               /* huh? */
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Service will bind to `%s'\n",
-           GNUNET_a2s (pos->ai_addr,
-                       pos->ai_addrlen));
-      if (pos->ai_family == AF_INET)
-      {
-        GNUNET_assert (pos->ai_addrlen == sizeof(struct sockaddr_in));
-        saddrlens[i] = pos->ai_addrlen;
-        saddrs[i] = GNUNET_malloc (saddrlens[i]);
-        GNUNET_memcpy (saddrs[i], pos->ai_addr, saddrlens[i]);
-        ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port);
-      }
-      else
-      {
-        GNUNET_assert (pos->ai_family == AF_INET6);
-        GNUNET_assert (pos->ai_addrlen == sizeof(struct sockaddr_in6));
-        saddrlens[i] = pos->ai_addrlen;
-        saddrs[i] = GNUNET_malloc (saddrlens[i]);
-        GNUNET_memcpy (saddrs[i], pos->ai_addr, saddrlens[i]);
-        ((struct sockaddr_in6 *) saddrs[i])->sin6_port = htons (port);
-      }
-      i++;
-    }
-    GNUNET_free (hostname);
-    freeaddrinfo (res);
-    resi = i;
-  }
-  else
-  {
-    /* will bind against everything, just set port */
-    if (disablev6)
-    {
-      /* V4-only */
-      resi = 1;
-      i = 0;
-      saddrs = GNUNET_malloc ((resi + 1) * sizeof(struct sockaddr *));
-      saddrlens = GNUNET_malloc ((resi + 1) * sizeof(socklen_t));
-
-      saddrlens[i] = sizeof(struct sockaddr_in);
-      saddrs[i] = GNUNET_malloc (saddrlens[i]);
-#if HAVE_SOCKADDR_IN_SIN_LEN
-      ((struct sockaddr_in *) saddrs[i])->sin_len = saddrlens[i];
-#endif
-      ((struct sockaddr_in *) saddrs[i])->sin_family = AF_INET;
-      ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port);
-    }
-    else
-    {
-      /* dual stack */
-      resi = 2;
-      saddrs = GNUNET_malloc ((resi + 1) * sizeof(struct sockaddr *));
-      saddrlens = GNUNET_malloc ((resi + 1) * sizeof(socklen_t));
-      i = 0;
-      saddrlens[i] = sizeof(struct sockaddr_in6);
-      saddrs[i] = GNUNET_malloc (saddrlens[i]);
-#if HAVE_SOCKADDR_IN_SIN_LEN
-      ((struct sockaddr_in6 *) saddrs[i])->sin6_len = saddrlens[0];
-#endif
-      ((struct sockaddr_in6 *) saddrs[i])->sin6_family = AF_INET6;
-      ((struct sockaddr_in6 *) saddrs[i])->sin6_port = htons (port);
-      i++;
-      saddrlens[i] = sizeof(struct sockaddr_in);
-      saddrs[i] = GNUNET_malloc (saddrlens[i]);
-#if HAVE_SOCKADDR_IN_SIN_LEN
-      ((struct sockaddr_in *) saddrs[i])->sin_len = saddrlens[1];
-#endif
-      ((struct sockaddr_in *) saddrs[i])->sin_family = AF_INET;
-      ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port);
-    }
-  }
-  *addrs = saddrs;
-  *addr_lens = saddrlens;
-  return resi;
-}
-
-
-/**
- * Ask NAT for addresses
- *
- * @param plugin the plugin handle
- */
-static void
-server_start_report_addresses (struct HTTP_Server_Plugin *plugin)
-{
-  int res = GNUNET_OK;
-  struct sockaddr **addrs;
-  socklen_t *addrlens;
-
-  res = server_get_addresses (plugin,
-                              plugin->name,
-                              plugin->env->cfg,
-                              &addrs, &addrlens);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       _ ("Found %u addresses to report to NAT service\n"),
-       res);
-
-  if (GNUNET_SYSERR == res)
-  {
-    plugin->nat = NULL;
-    return;
-  }
-
-  plugin->nat
-    = GNUNET_NAT_register (plugin->env->cfg,
-                           plugin->name,
-                           IPPROTO_TCP,
-                           (unsigned int) res,
-                           (const struct sockaddr **) addrs,
-                           addrlens,
-                           &server_nat_port_map_callback,
-                           NULL,
-                           plugin);
-  while (res > 0)
-  {
-    res--;
-    GNUNET_assert (NULL != addrs[res]);
-    GNUNET_free (addrs[res]);
-  }
-  GNUNET_free (addrs);
-  GNUNET_free (addrlens);
-}
-
-
-/**
- * Stop NAT for addresses
- *
- * @param plugin the plugin handle
- */
-static void
-server_stop_report_addresses (struct HTTP_Server_Plugin *plugin)
-{
-  struct HttpAddressWrapper *w;
-
-  /* Stop NAT handle */
-  if (NULL != plugin->nat)
-  {
-    GNUNET_NAT_unregister (plugin->nat);
-    plugin->nat = NULL;
-  }
-  /* Clean up addresses */
-  while (NULL != plugin->addr_head)
-  {
-    w = plugin->addr_head;
-    GNUNET_CONTAINER_DLL_remove (plugin->addr_head,
-                                 plugin->addr_tail,
-                                 w);
-    GNUNET_free (w->address);
-    GNUNET_free (w);
-  }
-}
-
-
-/**
- * Check if IPv6 supported on this system
- *
- * @param plugin the plugin handle
- * @return #GNUNET_YES on success, else #GNUNET_NO
- */
-static int
-server_check_ipv6_support (struct HTTP_Server_Plugin *plugin)
-{
-  struct GNUNET_NETWORK_Handle *desc = NULL;
-  int res = GNUNET_NO;
-
-  /* Probe IPv6 support */
-  desc = GNUNET_NETWORK_socket_create (PF_INET6,
-                                       SOCK_STREAM,
-                                       0);
-  if (NULL == desc)
-  {
-    if ((errno == ENOBUFS) ||
-        (errno == ENOMEM) ||
-        (errno == ENFILE) ||
-        (errno == EACCES))
-    {
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
-                           "socket");
-    }
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         _ ("Disabling IPv6 since it is not supported on this system!\n"));
-    res = GNUNET_NO;
-  }
-  else
-  {
-    GNUNET_break (GNUNET_OK ==
-                  GNUNET_NETWORK_socket_close (desc));
-    desc = NULL;
-    res = GNUNET_YES;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Testing IPv6 on this system: %s\n",
-       (res == GNUNET_YES) ? "successful" : "failed");
-  return res;
-}
-
-
-/**
- * Notify server about our external hostname
- *
- * @param cls plugin
- */
-static void
-server_notify_external_hostname (void *cls)
-{
-  struct HTTP_Server_Plugin *plugin = cls;
-  struct HttpAddress *ext_addr;
-  size_t ext_addr_len;
-  unsigned int urlen;
-  char *url;
-
-  plugin->notify_ext_task = NULL;
-  GNUNET_asprintf (&url,
-                   "%s://%s",
-                   plugin->protocol,
-                   plugin->external_hostname);
-  urlen = strlen (url) + 1;
-  ext_addr = GNUNET_malloc (sizeof(struct HttpAddress) + urlen);
-  ext_addr->options = htonl (plugin->options);
-  ext_addr->urlen = htonl (urlen);
-  ext_addr_len = sizeof(struct HttpAddress) + urlen;
-  GNUNET_memcpy (&ext_addr[1], url, urlen);
-  GNUNET_free (url);
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Notifying transport about external hostname address `%s'\n",
-       plugin->external_hostname);
-
-#if BUILD_HTTPS
-  if (GNUNET_YES == plugin->verify_external_hostname)
-    LOG (GNUNET_ERROR_TYPE_INFO,
-         "Enabling SSL verification for external hostname address `%s'\n",
-         plugin->external_hostname);
-  plugin->ext_addr
-    = GNUNET_HELLO_address_allocate (plugin->env->my_identity,
-                                     "https_client",
-                                     ext_addr,
-                                     ext_addr_len,
-                                     GNUNET_HELLO_ADDRESS_INFO_NONE);
-  plugin->env->notify_address (plugin->env->cls,
-                               GNUNET_YES,
-                               plugin->ext_addr);
-  GNUNET_free (ext_addr);
-#else
-  plugin->ext_addr
-    = GNUNET_HELLO_address_allocate (plugin->env->my_identity,
-                                     "http_client",
-                                     ext_addr,
-                                     ext_addr_len,
-                                     GNUNET_HELLO_ADDRESS_INFO_NONE);
-  plugin->env->notify_address (plugin->env->cls,
-                               GNUNET_YES,
-                               plugin->ext_addr);
-  GNUNET_free (ext_addr);
-#endif
-}
-
-
-/**
- * Configure the plugin
- *
- * @param plugin plugin handle
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
- */
-static int
-server_configure_plugin (struct HTTP_Server_Plugin *plugin)
-{
-  unsigned long long port;
-  unsigned long long max_connections;
-  char *bind4_address = NULL;
-  char *bind6_address = NULL;
-  char *eh_tmp = NULL;
-  int external_hostname_use_port;
-
-  /* Use IPv4? */
-  if (GNUNET_CONFIGURATION_have_value
-        (plugin->env->cfg, plugin->name, "USE_IPv4"))
-  {
-    plugin->use_ipv4 =
-      GNUNET_CONFIGURATION_get_value_yesno (plugin->env->cfg,
-                                            plugin->name,
-                                            "USE_IPv4");
-  }
-  else
-    plugin->use_ipv4 = GNUNET_YES;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       _ ("IPv4 support is %s\n"),
-       (plugin->use_ipv4 == GNUNET_YES) ? "enabled" : "disabled");
-
-  /* Use IPv6? */
-  if (GNUNET_CONFIGURATION_have_value
-        (plugin->env->cfg, plugin->name, "USE_IPv6"))
-  {
-    plugin->use_ipv6 =
-      GNUNET_CONFIGURATION_get_value_yesno (plugin->env->cfg,
-                                            plugin->name,
-                                            "USE_IPv6");
-  }
-  else
-    plugin->use_ipv6 = GNUNET_YES;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       _ ("IPv6 support is %s\n"),
-       (plugin->use_ipv6 == GNUNET_YES) ? "enabled" : "disabled");
-
-  if ((plugin->use_ipv4 == GNUNET_NO) && (plugin->use_ipv6 == GNUNET_NO))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         _ ("Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"));
-    return GNUNET_SYSERR;
-  }
-
-  /* Reading port number from config file */
-  if ((GNUNET_OK !=
-       GNUNET_CONFIGURATION_get_value_number (plugin->env->cfg,
-                                              plugin->name,
-                                              "PORT", &port)) || (port > 65535))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         _ ("Port is required! Fix in configuration\n"));
-    return GNUNET_SYSERR;
-  }
-  plugin->port = port;
-
-  LOG (GNUNET_ERROR_TYPE_INFO,
-       _ ("Using port %u\n"), plugin->port);
-
-  if ((plugin->use_ipv4 == GNUNET_YES) &&
-      (GNUNET_YES ==
-       GNUNET_CONFIGURATION_get_value_string (plugin->env->cfg,
-                                              plugin->name,
-                                              "BINDTO",
-                                              &bind4_address)))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Binding %s plugin to specific IPv4 address: `%s'\n",
-         plugin->protocol,
-         bind4_address);
-    plugin->server_addr_v4 = GNUNET_new (struct sockaddr_in);
-    if (1 != inet_pton (AF_INET,
-                        bind4_address,
-                        &plugin->server_addr_v4->sin_addr))
-    {
-      LOG (GNUNET_ERROR_TYPE_ERROR,
-           _ ("Specific IPv4 address `%s' in configuration file is invalid!\n"),
-           bind4_address);
-      GNUNET_free (bind4_address);
-      GNUNET_free (plugin->server_addr_v4);
-      plugin->server_addr_v4 = NULL;
-      return GNUNET_SYSERR;
-    }
-    else
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Binding to IPv4 address %s\n",
-           bind4_address);
-      plugin->server_addr_v4->sin_family = AF_INET;
-      plugin->server_addr_v4->sin_port = htons (plugin->port);
-    }
-    GNUNET_free (bind4_address);
-  }
-
-  if ((plugin->use_ipv6 == GNUNET_YES) &&
-      (GNUNET_YES ==
-       GNUNET_CONFIGURATION_get_value_string (plugin->env->cfg,
-                                              plugin->name,
-                                              "BINDTO6",
-                                              &bind6_address)))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Binding %s plugin to specific IPv6 address: `%s'\n",
-         plugin->protocol, bind6_address);
-    plugin->server_addr_v6 = GNUNET_new (struct sockaddr_in6);
-    if (1 !=
-        inet_pton (AF_INET6,
-                   bind6_address,
-                   &plugin->server_addr_v6->sin6_addr))
-    {
-      LOG (GNUNET_ERROR_TYPE_ERROR,
-           _ ("Specific IPv6 address `%s' in configuration file is invalid!\n"),
-           bind6_address);
-      GNUNET_free (bind6_address);
-      GNUNET_free (plugin->server_addr_v6);
-      plugin->server_addr_v6 = NULL;
-      return GNUNET_SYSERR;
-    }
-    else
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Binding to IPv6 address %s\n",
-           bind6_address);
-      plugin->server_addr_v6->sin6_family = AF_INET6;
-      plugin->server_addr_v6->sin6_port = htons (plugin->port);
-    }
-    GNUNET_free (bind6_address);
-  }
-
-  plugin->verify_external_hostname = GNUNET_NO;
-#if BUILD_HTTPS
-  plugin->verify_external_hostname
-    = GNUNET_CONFIGURATION_get_value_yesno (plugin->env->cfg,
-                                            plugin->name,
-                                            "VERIFY_EXTERNAL_HOSTNAME");
-  if (GNUNET_SYSERR == plugin->verify_external_hostname)
-    plugin->verify_external_hostname = GNUNET_NO;
-  if (GNUNET_YES == plugin->verify_external_hostname)
-    plugin->options |= HTTP_OPTIONS_VERIFY_CERTIFICATE;
-#endif
-  external_hostname_use_port
-    = GNUNET_CONFIGURATION_get_value_yesno (plugin->env->cfg,
-                                            plugin->name,
-                                            "EXTERNAL_HOSTNAME_USE_PORT");
-  if (GNUNET_SYSERR == external_hostname_use_port)
-    external_hostname_use_port = GNUNET_NO;
-
-
-  if (GNUNET_YES ==
-      GNUNET_CONFIGURATION_get_value_string (plugin->env->cfg,
-                                             plugin->name,
-                                             "EXTERNAL_HOSTNAME",
-                                             &eh_tmp))
-  {
-    char *tmp;
-    char *pos = NULL;
-    char *pos_url = NULL;
-
-    if (NULL != strstr (eh_tmp, "://"))
-      tmp = &strstr (eh_tmp, "://")[3];
-    else
-      tmp = eh_tmp;
-
-    if (GNUNET_YES == external_hostname_use_port)
-    {
-      if ((strlen (tmp) > 1) && (NULL != (pos = strchr (tmp, '/'))))
-      {
-        pos_url = pos + 1;
-        pos[0] = '\0';
-        GNUNET_asprintf (&plugin->external_hostname,
-                         "%s:%u/%s",
-                         tmp,
-                         (uint16_t) port,
-                         pos_url);
-      }
-      else
-        GNUNET_asprintf (&plugin->external_hostname,
-                         "%s:%u",
-                         tmp,
-                         (uint16_t) port);
-    }
-    else
-      plugin->external_hostname = GNUNET_strdup (tmp);
-    GNUNET_free (eh_tmp);
-
-    LOG (GNUNET_ERROR_TYPE_INFO,
-         _ ("Using external hostname `%s'\n"),
-         plugin->external_hostname);
-    plugin->notify_ext_task = GNUNET_SCHEDULER_add_now (
-      &server_notify_external_hostname,
-      plugin);
-
-    /* Use only configured external hostname */
-    if (GNUNET_CONFIGURATION_have_value
-          (plugin->env->cfg,
-          plugin->name,
-          "EXTERNAL_HOSTNAME_ONLY"))
-    {
-      plugin->external_only =
-        GNUNET_CONFIGURATION_get_value_yesno (plugin->env->cfg,
-                                              plugin->name,
-                                              "EXTERNAL_HOSTNAME_ONLY");
-    }
-    else
-      plugin->external_only = GNUNET_NO;
-
-    if (GNUNET_YES == plugin->external_only)
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           _ ("Notifying transport only about hostname `%s'\n"),
-           plugin->external_hostname);
-  }
-  else
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "No external hostname configured\n");
-
-  /* Optional parameters */
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (plugin->env->cfg,
-                                             plugin->name,
-                                             "MAX_CONNECTIONS",
-                                             &max_connections))
-    max_connections = 128;
-  plugin->max_request = max_connections;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       _ ("Maximum number of connections is %u\n"),
-       plugin->max_request);
-
-  plugin->peer_id_length = strlen (GNUNET_i2s_full (plugin->env->my_identity));
-
-  return GNUNET_OK;
-}
-
-
-/**
- * Exit point from the plugin.
- *
- * @param cls api
- * @return NULL
- */
-void *
-LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls)
-{
-  struct GNUNET_TRANSPORT_PluginFunctions *api = cls;
-  struct HTTP_Server_Plugin *plugin = api->cls;
-
-  if (NULL == api->cls)
-  {
-    /* Free for stub mode */
-    GNUNET_free (api);
-    return NULL;
-  }
-  plugin->in_shutdown = GNUNET_YES;
-  LOG (GNUNET_ERROR_TYPE_INFO,
-       _ ("Shutting down plugin `%s'\n"),
-       plugin->name);
-
-  if (NULL != plugin->notify_ext_task)
-  {
-    GNUNET_SCHEDULER_cancel (plugin->notify_ext_task);
-    plugin->notify_ext_task = NULL;
-  }
-
-  if (NULL != plugin->ext_addr)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Notifying transport to remove address `%s'\n",
-         http_common_plugin_address_to_string (plugin->protocol,
-                                               plugin->ext_addr->address,
-                                               plugin->ext_addr->address_length));
-#if BUILD_HTTPS
-    plugin->env->notify_address (plugin->env->cls,
-                                 GNUNET_NO,
-                                 plugin->ext_addr);
-#else
-    plugin->env->notify_address (plugin->env->cls,
-                                 GNUNET_NO,
-                                 plugin->ext_addr);
-#endif
-    GNUNET_HELLO_address_free (plugin->ext_addr);
-    plugin->ext_addr = NULL;
-  }
-
-  /* Stop to report addresses to transport service */
-  server_stop_report_addresses (plugin);
-  if (NULL != plugin->server_v4_task)
-  {
-    GNUNET_SCHEDULER_cancel (plugin->server_v4_task);
-    plugin->server_v4_task = NULL;
-  }
-
-  if (NULL != plugin->server_v6_task)
-  {
-    GNUNET_SCHEDULER_cancel (plugin->server_v6_task);
-    plugin->server_v6_task = NULL;
-  }
-#if BUILD_HTTPS
-  GNUNET_free (plugin->crypto_init);
-  GNUNET_free (plugin->cert);
-  GNUNET_free (plugin->key);
-#endif
-  GNUNET_CONTAINER_multipeermap_iterate (plugin->sessions,
-                                         &destroy_session_shutdown_cb,
-                                         plugin);
-  GNUNET_CONTAINER_multipeermap_destroy (plugin->sessions);
-  plugin->sessions = NULL;
-  if (NULL != plugin->server_v4)
-  {
-    MHD_stop_daemon (plugin->server_v4);
-    plugin->server_v4 = NULL;
-  }
-  if (NULL != plugin->server_v6)
-  {
-    MHD_stop_daemon (plugin->server_v6);
-    plugin->server_v6 = NULL;
-  }
-  /* Clean up */
-  GNUNET_free (plugin->external_hostname);
-  GNUNET_free (plugin->ext_addr);
-  GNUNET_free (plugin->server_addr_v4);
-  GNUNET_free (plugin->server_addr_v6);
-  regfree (&plugin->url_regex);
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       _ ("Shutdown for plugin `%s' complete\n"),
-       plugin->name);
-
-  GNUNET_free (plugin);
-  GNUNET_free (api);
-  return NULL;
-}
-
-
-/**
- * Function called for a quick conversion of the binary address to
- * a numeric address.  Note that the caller must not free the
- * address and that the next call to this function is allowed
- * to override the address again.
- *
- * @param cls unused
- * @param addr binary address
- * @param addrlen length of the address
- * @return string representing the same address
- */
-static const char *
-http_server_plugin_address_to_string (void *cls,
-                                      const void *addr,
-                                      size_t addrlen)
-{
-  return http_common_plugin_address_to_string (PLUGIN_NAME,
-                                               addr,
-                                               addrlen);
-}
-
-
-/**
- * Function obtain the network type for a session
- *
- * @param cls closure (`struct HTTP_Server_Plugin *`)
- * @param session the session
- * @return the network type in HBO or #GNUNET_SYSERR
- */
-static enum GNUNET_NetworkType
-http_server_plugin_get_network (void *cls,
-                                struct GNUNET_ATS_Session *session)
-{
-  return session->scope;
-}
-
-
-/**
- * Function obtain the network type for an address.
- *
- * @param cls closure (`struct Plugin *`)
- * @param address the address
- * @return the network type
- */
-static enum GNUNET_NetworkType
-http_server_plugin_get_network_for_address (void *cls,
-                                            const struct
-                                            GNUNET_HELLO_Address *address)
-{
-  struct HTTP_Server_Plugin *plugin = cls;
-
-  return http_common_get_network_for_address (plugin->env,
-                                              address);
-}
-
-
-/**
- * Function that will be called whenever the transport service wants to
- * notify the plugin that the inbound quota changed and that the plugin
- * should update it's delay for the next receive value
- *
- * @param cls closure
- * @param peer which peer was the session for
- * @param session which session is being updated
- * @param delay new delay to use for receiving
- */
-static void
-http_server_plugin_update_inbound_delay (void *cls,
-                                         const struct GNUNET_PeerIdentity *peer,
-                                         struct GNUNET_ATS_Session *session,
-                                         struct GNUNET_TIME_Relative delay)
-{
-  session->next_receive = GNUNET_TIME_relative_to_absolute (delay);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "New inbound delay %s\n",
-       GNUNET_STRINGS_relative_time_to_string (delay,
-                                               GNUNET_NO));
-  if (NULL != session->recv_wakeup_task)
-  {
-    GNUNET_SCHEDULER_cancel (session->recv_wakeup_task);
-    session->recv_wakeup_task
-      = GNUNET_SCHEDULER_add_delayed (delay,
-                                      &server_wake_up,
-                                      session);
-  }
-}
-
-
-/**
- * Return information about the given session to the
- * monitor callback.
- *
- * @param cls the `struct Plugin` with the monitor callback (`sic`)
- * @param peer peer we send information about
- * @param value our `struct GNUNET_ATS_Session` to send information about
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-send_session_info_iter (void *cls,
-                        const struct GNUNET_PeerIdentity *peer,
-                        void *value)
-{
-  struct HTTP_Server_Plugin *plugin = cls;
-  struct GNUNET_ATS_Session *session = value;
-
-  notify_session_monitor (plugin,
-                          session,
-                          GNUNET_TRANSPORT_SS_INIT);
-  return GNUNET_OK;
-}
-
-
-/**
- * Begin monitoring sessions of a plugin.  There can only
- * be one active monitor per plugin (i.e. if there are
- * multiple monitors, the transport service needs to
- * multiplex the generated events over all of them).
- *
- * @param cls closure of the plugin
- * @param sic callback to invoke, NULL to disable monitor;
- *            plugin will being by iterating over all active
- *            sessions immediately and then enter monitor mode
- * @param sic_cls closure for @a sic
- */
-static void
-http_server_plugin_setup_monitor (void *cls,
-                                  GNUNET_TRANSPORT_SessionInfoCallback sic,
-                                  void *sic_cls)
-{
-  struct HTTP_Server_Plugin *plugin = cls;
-
-  plugin->sic = sic;
-  plugin->sic_cls = sic_cls;
-  if (NULL != sic)
-  {
-    GNUNET_CONTAINER_multipeermap_iterate (plugin->sessions,
-                                           &send_session_info_iter,
-                                           plugin);
-    /* signal end of first iteration */
-    sic (sic_cls, NULL, NULL);
-  }
-}
-
-
-/**
- * Entry point for the plugin.
- *
- * @param cls env
- * @return api
- */
-void *
-LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls)
-{
-  struct GNUNET_TRANSPORT_PluginEnvironment *env = cls;
-  struct GNUNET_TRANSPORT_PluginFunctions *api;
-  struct HTTP_Server_Plugin *plugin;
-
-  if (NULL == env->receive)
-  {
-    /* run in 'stub' mode (i.e. as part of gnunet-peerinfo), don't fully
-       initialize the plugin or the API */
-    api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
-    api->cls = NULL;
-    api->address_to_string = &http_server_plugin_address_to_string;
-    api->string_to_address = &http_common_plugin_string_to_address;
-    api->address_pretty_printer = &http_common_plugin_address_pretty_printer;
-    return api;
-  }
-  plugin = GNUNET_new (struct HTTP_Server_Plugin);
-  plugin->env = env;
-  plugin->sessions = GNUNET_CONTAINER_multipeermap_create (128,
-                                                           GNUNET_YES);
-
-  api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
-  api->cls = plugin;
-  api->send = &http_server_plugin_send;
-  api->disconnect_peer = &http_server_plugin_disconnect_peer;
-  api->disconnect_session = &http_server_plugin_disconnect_session;
-  api->query_keepalive_factor = &http_server_query_keepalive_factor;
-  api->check_address = &http_server_plugin_address_suggested;
-  api->get_session = &http_server_plugin_get_session;
-
-  api->address_to_string = &http_server_plugin_address_to_string;
-  api->string_to_address = &http_common_plugin_string_to_address;
-  api->address_pretty_printer = &http_common_plugin_address_pretty_printer;
-  api->get_network = &http_server_plugin_get_network;
-  api->get_network_for_address = &http_server_plugin_get_network_for_address;
-  api->update_session_timeout = &http_server_plugin_update_session_timeout;
-  api->update_inbound_delay = &http_server_plugin_update_inbound_delay;
-  api->setup_monitor = &http_server_plugin_setup_monitor;
-#if BUILD_HTTPS
-  plugin->name = "transport-https_server";
-  plugin->protocol = "https";
-#else
-  plugin->name = "transport-http_server";
-  plugin->protocol = "http";
-#endif
-
-  if (GNUNET_YES ==
-      GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
-                                            plugin->name,
-                                            "TCP_STEALTH"))
-  {
-#ifdef TCP_STEALTH
-    plugin->options |= HTTP_OPTIONS_TCP_STEALTH;
-#else
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _ ("TCP_STEALTH not supported on this platform.\n"));
-    LIBGNUNET_PLUGIN_TRANSPORT_DONE (api);
-    return NULL;
-#endif
-  }
-
-  /* Compile URL regex */
-  if (regcomp (&plugin->url_regex,
-               URL_REGEX,
-               REG_EXTENDED))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         _ ("Unable to compile URL regex\n"));
-    LIBGNUNET_PLUGIN_TRANSPORT_DONE (api);
-    return NULL;
-  }
-
-  /* Configure plugin */
-  if (GNUNET_SYSERR == server_configure_plugin (plugin))
-  {
-    LIBGNUNET_PLUGIN_TRANSPORT_DONE (api);
-    return NULL;
-  }
-
-  /* Check IPv6 support */
-  if (GNUNET_YES == plugin->use_ipv6)
-    plugin->use_ipv6 = server_check_ipv6_support (plugin);
-
-  /* Report addresses to transport service */
-  if (GNUNET_NO == plugin->external_only)
-    server_start_report_addresses (plugin);
-
-  if (GNUNET_SYSERR == server_start (plugin))
-  {
-    LIBGNUNET_PLUGIN_TRANSPORT_DONE (api);
-    return NULL;
-  }
-  return api;
-}
-
-
-/* end of plugin_transport_http_server.c */
diff --git a/src/transport/plugin_transport_smtp.c b/src/transport/plugin_transport_smtp.c
deleted file mode 100644
index f3db4fc5a..000000000
--- a/src/transport/plugin_transport_smtp.c
+++ /dev/null
@@ -1,750 +0,0 @@
-/*
-     This file is part of GNUnet
-     Copyright (C) 2003-2013 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/plugin_transport_smtp.c
- * @brief Implementation of the SMTP transport service
- * @author Christian Grothoff
- * @author Renaldo Ferreira
- */
-
-#include "platform.h"
-#include "gnunet_util.h"
-#include "gnunet_constants.h"
-#include "gnunet_protocols.h"
-#include "gnunet_transport.h"
-#include "gnunet_stats_service.h"
-#include <libesmtp.h>
-#include <signal.h>
-
-
-/**
- * The default maximum size of each outbound SMTP message.
- */
-#define SMTP_MESSAGE_SIZE 65528
-
-#define DEBUG_SMTP GNUNET_EXTRA_LOGGING
-
-#define FILTER_STRING_SIZE 64
-
-/* how long can a line in base64 encoded
-   mime text be? (in characters, excluding "\n") */
-#define MAX_CHAR_PER_LINE 76
-
-#define EBUF_LEN 128
-
-/**
- * Host-Address in a SMTP network.
- */
-typedef struct
-{
-  /**
-   * Filter line that every sender must include in the E-mails such
-   * that the receiver can effectively filter out the GNUnet traffic
-   * from the E-mail.
-   */
-  char filter[FILTER_STRING_SIZE];
-
-  /**
-   * Claimed E-mail address of the sender.
-   * Format is "foo@bar.com" with null termination, padded to be
-   * of a multiple of 8 bytes long.
-   */
-  char senderAddress[0];
-} EmailAddress;
-
-GNUNET_NETWORK_STRUCT_BEGIN
-
-/**
- * Encapsulation of a GNUnet message in the SMTP mail body (before
- * base64 encoding).
- */
-typedef struct
-{
-  GNUNET_MessageHeader header;
-
-  /**
-   * What is the identity of the sender (GNUNET_hash of public key)
-   */
-  GNUNET_PeerIdentity sender;
-} SMTPMessage;
-GNUNET_NETWORK_STRUCT_END
-
-/* *********** globals ************* */
-
-/**
- * apis (our advertised API and the core api )
- */
-static GNUNET_CoreAPIForTransport *core_api;
-
-static struct GNUNET_GE_Context *ectx;
-
-/**
- * Thread that listens for inbound messages
- */
-static struct GNUNET_ThreadHandle *dispatchThread;
-
-/**
- * Flag to indicate that server has been shut down.
- */
-static int smtp_shutdown = GNUNET_YES;
-
-/**
- * Set to the SMTP server hostname (and port) for outgoing messages.
- */
-static char *smtp_server_name;
-
-static char *pipename;
-
-/**
- * Lock for uses of libesmtp (not thread-safe).
- */
-static struct GNUNET_Mutex *lock;
-
-/**
- * Old handler for SIGPIPE (kept to be able to restore).
- */
-static struct sigaction old_handler;
-
-static char *email;
-
-static GNUNET_TransportAPI smtpAPI;
-
-static GNUNET_Stats_ServiceAPI *stats;
-
-static int stat_bytesReceived;
-
-static int stat_bytesSent;
-
-static int stat_bytesDropped;
-
-/**
- * How many e-mails are we allowed to send per hour?
- */
-static unsigned long long rate_limit;
-
-static GNUNET_CronTime last_transmission;
-
-
-/* ********************* the real stuff ******************* */
-
-#define strAUTOncmp(a, b) strncmp (a, b, strlen (b))
-
-/**
- * Listen to the pipe, decode messages and send to core.
- */
-static void *
-listenAndDistribute (void *unused)
-{
-  char *line;
-  unsigned int linesize;
-  SMTPMessage *mp;
-  FILE *fdes;
-  char *retl;
-  char *out;
-  unsigned int size;
-  GNUNET_TransportPacket *coreMP;
-  int fd;
-  unsigned int pos;
-
-  linesize = ((GNUNET_MAX_BUFFER_SIZE * 4 / 3) + 8) * (MAX_CHAR_PER_LINE + 2)
-             / MAX_CHAR_PER_LINE;                                                                       /* maximum size of a line supported */
-  line = GNUNET_malloc (linesize + 2);   /* 2 bytes for off-by-one errors, just to be safe... */
-
-#define READLINE(l, limit) \
-  do { retl = fgets (l, (limit), fdes);                          \
-       if ((retl == NULL) || (smtp_shutdown == GNUNET_YES)) { \
-         goto END; \
-       } \
-       if (core_api->load_monitor != NULL) \
-       GNUNET_network_monitor_notify_transmission (core_api->load_monitor, \
-                                                   GNUNET_ND_DOWNLOAD, \
-                                                   strlen (retl)); \
-  } while (0)
-
-
-  while (smtp_shutdown == GNUNET_NO)
-  {
-    fd = OPEN (pipename, O_RDONLY | O_ASYNC);
-    if (fd == -1)
-    {
-      if (smtp_shutdown == GNUNET_NO)
-        GNUNET_thread_sleep (5 * GNUNET_CRON_SECONDS);
-      continue;
-    }
-    fdes = fdopen (fd, "r");
-    while (smtp_shutdown == GNUNET_NO)
-    {
-      /* skip until end of header */
-      do
-      {
-        READLINE (line, linesize);
-      }
-      while ((line[0] != '\r') && (line[0] != '\n'));     /* expect newline */
-      READLINE (line, linesize);        /* read base64 encoded message; decode, process */
-      pos = 0;
-      while (1)
-      {
-        pos = strlen (line) - 1;        /* ignore new line */
-        READLINE (&line[pos], linesize - pos);      /* read base64 encoded message; decode, process */
-        if ((line[pos] == '\r') || (line[pos] == '\n'))
-          break;                /* empty line => end of message! */
-      }
-      size = GNUNET_STRINGS_base64_decode (line, pos, &out);
-      if (size < sizeof(SMTPMessage))
-      {
-        GNUNET_GE_BREAK (ectx, 0);
-        GNUNET_free (out);
-        goto END;
-      }
-
-      mp = (SMTPMessage *) &out[size - sizeof(SMTPMessage)];
-      if (ntohs (mp->header.size) != size)
-      {
-        GNUNET_GE_LOG (ectx,
-                       GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
-                       _ ("Received malformed message via %s. Ignored.\n"),
-                       "SMTP");
-#if DEBUG_SMTP
-        GNUNET_GE_LOG (ectx,
-                       GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
-                       "Size returned by base64=%d, in the msg=%d.\n", size,
-                       ntohl (mp->size));
-#endif
-        GNUNET_free (out);
-        goto END;
-      }
-      if (stats != NULL)
-        stats->change (stat_bytesReceived, size);
-      coreMP = GNUNET_new (GNUNET_TransportPacket);
-      coreMP->msg = out;
-      coreMP->size = size - sizeof(SMTPMessage);
-      coreMP->tsession = NULL;
-      coreMP->sender = mp->sender;
-#if DEBUG_SMTP
-      GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
-                     "SMTP message passed to the core.\n");
-#endif
-
-      core_api->receive (coreMP);
-    }
-END:
-#if DEBUG_SMTP
-    GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
-                   "SMTP message processed.\n");
-#endif
-    if (fdes != NULL)
-      fclose (fdes);
-  }
-  GNUNET_free (line);
-  return NULL;
-}
-
-
-/* *************** API implementation *************** */
-
-/**
- * Verify that a hello-Message is correct (a node is reachable at that
- * address). Since the reply will be asynchronous, a method must be
- * called on success.
- *
- * @param hello the hello message to verify
- *        (the signature/crc have been verified before)
- * @return GNUNET_OK on success, GNUNET_SYSERR on error
- */
-static int
-api_verify_hello (const GNUNET_MessageHello *hello)
-{
-  const EmailAddress *maddr;
-
-  maddr = (const EmailAddress *) &hello[1];
-  if ((ntohs (hello->header.size) !=
-       sizeof(GNUNET_MessageHello) + ntohs (hello->senderAddressSize)) ||
-      (maddr->senderAddress
-       [ntohs (hello->senderAddressSize) - 1 - FILTER_STRING_SIZE] != '\0'))
-  {
-    GNUNET_GE_BREAK (ectx, 0);
-    return GNUNET_SYSERR;       /* obviously invalid */
-  }
-  if (NULL == strstr (maddr->filter, ": "))
-    return GNUNET_SYSERR;
-  return GNUNET_OK;
-}
-
-
-/**
- * Create a hello-Message for the current node. The hello is created
- * without signature and without a timestamp. The GNUnet core will
- * GNUNET_RSA_sign the message and add an expiration time.
- *
- * @return hello on success, NULL on error
- */
-static GNUNET_MessageHello *
-api_create_hello ()
-{
-  GNUNET_MessageHello *msg;
-  char *filter;
-  EmailAddress *haddr;
-  int i;
-
-  GNUNET_GC_get_configuration_value_string (core_api->cfg, "SMTP", "FILTER",
-                                            "X-mailer: GNUnet", &filter);
-  if (NULL == strstr (filter, ": "))
-  {
-    GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
-                   _ ("SMTP filter string to invalid, lacks ': '\n"));
-    GNUNET_free (filter);
-    return NULL;
-  }
-
-  if (strlen (filter) > FILTER_STRING_SIZE)
-  {
-    filter[FILTER_STRING_SIZE] = '\0';
-    GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
-                   _ ("SMTP filter string to long, capped to `%s'\n"), filter);
-  }
-  i = (strlen (email) + 8) & (~7);       /* make multiple of 8 */
-  msg =
-    GNUNET_malloc (sizeof(GNUNET_MessageHello) + sizeof(EmailAddress) + i);
-  memset (msg, 0, sizeof(GNUNET_MessageHello) + sizeof(EmailAddress) + i);
-  haddr = (EmailAddress *) &msg[1];
-  memset (&haddr->filter[0], 0, FILTER_STRING_SIZE);
-  strcpy (&haddr->filter[0], filter);
-  GNUNET_memcpy (&haddr->senderAddress[0], email, strlen (email) + 1);
-  msg->senderAddressSize = htons (strlen (email) + 1 + sizeof(EmailAddress));
-  msg->protocol = htons (GNUNET_TRANSPORT_PROTOCOL_NUMBER_SMTP);
-  msg->MTU = htonl (smtpAPI.mtu);
-  msg->header.size = htons (GNUNET_sizeof_hello (msg));
-  if (api_verify_hello (msg) == GNUNET_SYSERR)
-    GNUNET_GE_ASSERT (ectx, 0);
-  GNUNET_free (filter);
-  return msg;
-}
-
-
-struct GetMessageClosure
-{
-  unsigned int esize;
-  unsigned int pos;
-  char *ebody;
-};
-
-static const char *
-get_message (void **buf, int *len, void *cls)
-{
-  struct GetMessageClosure *gmc = cls;
-
-  *buf = NULL;
-  if (len == NULL)
-  {
-    gmc->pos = 0;
-    return NULL;
-  }
-  if (gmc->pos == gmc->esize)
-    return NULL;                /* done */
-  *len = gmc->esize;
-  gmc->pos = gmc->esize;
-  return gmc->ebody;
-}
-
-
-/**
- * Send a message to the specified remote node.
- *
- * @param tsession the GNUNET_MessageHello identifying the remote node
- * @param msg what to send
- * @param size the size of the message
- * @param important is this message important enough to override typical limits?
- * @return GNUNET_SYSERR on error, GNUNET_OK on success
- */
-static int
-api_send (GNUNET_TSession *tsession, const void *msg, const unsigned int size,
-          int important)
-{
-  const GNUNET_MessageHello *hello;
-  const EmailAddress *haddr;
-  char *m;
-  char *filter;
-  char *fvalue;
-  SMTPMessage *mp;
-  struct GetMessageClosure gm_cls;
-  smtp_session_t session;
-  smtp_message_t message;
-  smtp_recipient_t recipient;
-
-#define EBUF_LEN 128
-  char ebuf[EBUF_LEN];
-  GNUNET_CronTime now;
-
-  if (smtp_shutdown == GNUNET_YES)
-    return GNUNET_SYSERR;
-  if ((size == 0) || (size > smtpAPI.mtu))
-  {
-    GNUNET_GE_BREAK (ectx, 0);
-    return GNUNET_SYSERR;
-  }
-  now = GNUNET_get_time ();
-  if ((important != GNUNET_YES) &&
-      ( ((now - last_transmission) * rate_limit) < GNUNET_CRON_HOURS) )
-    return GNUNET_NO;           /* rate too high */
-  last_transmission = now;
-
-  hello = (const GNUNET_MessageHello *) tsession->internal;
-  if (hello == NULL)
-    return GNUNET_SYSERR;
-  GNUNET_mutex_lock (lock);
-  session = smtp_create_session ();
-  if (session == NULL)
-  {
-    GNUNET_GE_LOG (ectx,
-                   GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER
-                   | GNUNET_GE_IMMEDIATE, _ ("SMTP: `%s' failed: %s.\n"),
-                   "smtp_create_session", smtp_strerror (smtp_errno (), ebuf,
-                                                         EBUF_LEN));
-    GNUNET_mutex_unlock (lock);
-    return GNUNET_SYSERR;
-  }
-  if (0 == smtp_set_server (session, smtp_server_name))
-  {
-    GNUNET_GE_LOG (ectx,
-                   GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER
-                   | GNUNET_GE_IMMEDIATE, _ ("SMTP: `%s' failed: %s.\n"),
-                   "smtp_set_server", smtp_strerror (smtp_errno (), ebuf,
-                                                     EBUF_LEN));
-    smtp_destroy_session (session);
-    GNUNET_mutex_unlock (lock);
-    return GNUNET_SYSERR;
-  }
-  haddr = (const EmailAddress *) &hello[1];
-  message = smtp_add_message (session);
-  if (message == NULL)
-  {
-    GNUNET_GE_LOG (ectx,
-                   GNUNET_GE_WARNING | GNUNET_GE_ADMIN | GNUNET_GE_USER
-                   | GNUNET_GE_BULK, _ ("SMTP: `%s' failed: %s.\n"),
-                   "smtp_add_message", smtp_strerror (smtp_errno (), ebuf,
-                                                      EBUF_LEN));
-    smtp_destroy_session (session);
-    GNUNET_mutex_unlock (lock);
-    return GNUNET_SYSERR;
-  }
-  smtp_set_header (message, "To", NULL, haddr->senderAddress);
-  smtp_set_header (message, "From", NULL, email);
-
-  filter = GNUNET_strdup (haddr->filter);
-  fvalue = strstr (filter, ": ");
-  GNUNET_GE_ASSERT (NULL, NULL != fvalue);
-  fvalue[0] = '\0';
-  fvalue += 2;
-  if (0 == smtp_set_header (message, filter, fvalue))
-  {
-    GNUNET_GE_LOG (ectx,
-                   GNUNET_GE_WARNING | GNUNET_GE_ADMIN | GNUNET_GE_USER
-                   | GNUNET_GE_BULK, _ ("SMTP: `%s' failed: %s.\n"),
-                   "smtp_set_header", smtp_strerror (smtp_errno (), ebuf,
-                                                     EBUF_LEN));
-    smtp_destroy_session (session);
-    GNUNET_mutex_unlock (lock);
-    GNUNET_free (filter);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_free (filter);
-  m = GNUNET_malloc (size + sizeof(SMTPMessage));
-  GNUNET_memcpy (m, msg, size);
-  mp = (SMTPMessage *) &m[size];
-  mp->header.size = htons (size + sizeof(SMTPMessage));
-  mp->header.type = htons (0);
-  mp->sender = *core_api->my_identity;
-  gm_cls.ebody = NULL;
-  gm_cls.pos = 0;
-  gm_cls.esize = GNUNET_STRINGS_base64_encode (m, size + sizeof(SMTPMessage),
-                                               &gm_cls.ebody);
-  GNUNET_free (m);
-  if (0 == smtp_size_set_estimate (message, gm_cls.esize))
-  {
-    GNUNET_GE_LOG (ectx,
-                   GNUNET_GE_WARNING | GNUNET_GE_ADMIN | GNUNET_GE_USER
-                   | GNUNET_GE_BULK, _ ("SMTP: `%s' failed: %s.\n"),
-                   "smtp_size_set_estimate", smtp_strerror (smtp_errno (), ebuf,
-                                                            EBUF_LEN));
-  }
-  if (0 == smtp_set_messagecb (message, &get_message, &gm_cls))
-  {
-    GNUNET_GE_LOG (ectx,
-                   GNUNET_GE_WARNING | GNUNET_GE_ADMIN | GNUNET_GE_USER
-                   | GNUNET_GE_BULK, _ ("SMTP: `%s' failed: %s.\n"),
-                   "smtp_set_messagecb", smtp_strerror (smtp_errno (), ebuf,
-                                                        EBUF_LEN));
-    smtp_destroy_session (session);
-    GNUNET_mutex_unlock (lock);
-    GNUNET_free (gm_cls.ebody);
-    return GNUNET_SYSERR;
-  }
-  recipient = smtp_add_recipient (message, haddr->senderAddress);
-  if (recipient == NULL)
-  {
-    GNUNET_GE_LOG (ectx,
-                   GNUNET_GE_WARNING | GNUNET_GE_ADMIN | GNUNET_GE_USER
-                   | GNUNET_GE_BULK, _ ("SMTP: `%s' failed: %s.\n"),
-                   "smtp_add_recipient", smtp_strerror (smtp_errno (), ebuf,
-                                                        EBUF_LEN));
-    smtp_destroy_session (session);
-    GNUNET_mutex_unlock (lock);
-    return GNUNET_SYSERR;
-  }
-  if (0 == smtp_start_session (session))
-  {
-    GNUNET_GE_LOG (ectx,
-                   GNUNET_GE_WARNING | GNUNET_GE_ADMIN | GNUNET_GE_USER
-                   | GNUNET_GE_BULK, _ ("SMTP: `%s' failed: %s.\n"),
-                   "smtp_start_session", smtp_strerror (smtp_errno (), ebuf,
-                                                        EBUF_LEN));
-    smtp_destroy_session (session);
-    GNUNET_mutex_unlock (lock);
-    GNUNET_free (gm_cls.ebody);
-    return GNUNET_SYSERR;
-  }
-  if (stats != NULL)
-    stats->change (stat_bytesSent, size);
-  if (core_api->load_monitor != NULL)
-    GNUNET_network_monitor_notify_transmission (core_api->load_monitor,
-                                                GNUNET_ND_UPLOAD, gm_cls.esize);
-  smtp_message_reset_status (message);   /* this is needed to plug a 28-byte/message memory leak in libesmtp */
-  smtp_destroy_session (session);
-  GNUNET_mutex_unlock (lock);
-  GNUNET_free (gm_cls.ebody);
-  return GNUNET_OK;
-}
-
-
-/**
- * Establish a connection to a remote node.
- * @param hello the hello-Message for the target node
- * @param tsessionPtr the session handle that is to be set
- * @param may_reuse can we re-use an existing connection?
- * @return GNUNET_OK on success, GNUNET_SYSERR if the operation failed
- */
-static int
-api_connect (const GNUNET_MessageHello *hello, GNUNET_TSession **tsessionPtr,
-             int may_reuse)
-{
-  GNUNET_TSession *tsession;
-
-  tsession = GNUNET_new (GNUNET_TSession);
-  tsession->internal = GNUNET_malloc (GNUNET_sizeof_hello (hello));
-  tsession->peer = hello->senderIdentity;
-  GNUNET_memcpy (tsession->internal, hello, GNUNET_sizeof_hello (hello));
-  tsession->ttype = smtpAPI.protocol_number;
-  (*tsessionPtr) = tsession;
-  return GNUNET_OK;
-}
-
-
-/**
- * Disconnect from a remote node.
- *
- * @param tsession the session that is closed
- * @return GNUNET_OK on success, GNUNET_SYSERR if the operation failed
- */
-static int
-api_disconnect (GNUNET_TSession *tsession)
-{
-  if (tsession != NULL)
-  {
-    if (tsession->internal != NULL)
-      GNUNET_free (tsession->internal);
-    GNUNET_free (tsession);
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Start the server process to receive inbound traffic.
- * @return GNUNET_OK on success, GNUNET_SYSERR if the operation failed
- */
-static int
-api_start_transport_server ()
-{
-  smtp_shutdown = GNUNET_NO;
-  /* initialize SMTP network */
-  dispatchThread = GNUNET_thread_create (&listenAndDistribute, NULL, 1024 * 4);
-  if (dispatchThread == NULL)
-  {
-    GNUNET_GE_DIE_STRERROR (ectx,
-                            GNUNET_GE_ADMIN | GNUNET_GE_BULK | GNUNET_GE_FATAL,
-                            "pthread_create");
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Shutdown the server process (stop receiving inbound traffic). Maybe
- * restarted later!
- */
-static int
-api_stop_transport_server ()
-{
-  void *unused;
-
-  smtp_shutdown = GNUNET_YES;
-  GNUNET_thread_stop_sleep (dispatchThread);
-  GNUNET_thread_join (dispatchThread, &unused);
-  return GNUNET_OK;
-}
-
-
-/**
- * Convert SMTP hello to an IP address (always fails).
- */
-static int
-api_hello_to_address (const GNUNET_MessageHello *hello, void **sa,
-                      unsigned int *sa_len)
-{
-  return GNUNET_SYSERR;
-}
-
-
-/**
- * Always fails.
- */
-static int
-api_associate (GNUNET_TSession *tsession)
-{
-  return GNUNET_SYSERR;         /* SMTP connections can never be associated */
-}
-
-
-/**
- * Always succeeds (for now; we should look at adding
- * frequency limits to SMTP in the future!).
- */
-static int
-api_test_would_try (GNUNET_TSession *tsession, unsigned int size,
-                    int important)
-{
-  return GNUNET_OK;             /* we always try... */
-}
-
-
-/**
- * The exported method. Makes the core api available via a global and
- * returns the smtp transport API.
- */
-GNUNET_TransportAPI *
-inittransport_smtp (struct GNUNET_CoreAPIForTransport *core)
-{
-  unsigned long long mtu;
-  struct sigaction sa;
-
-  core_api = core;
-  ectx = core->ectx;
-  if (! GNUNET_GC_have_configuration_value (core_api->cfg, "SMTP", "EMAIL"))
-  {
-    GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
-                   _
-                   (
-                     "No email-address specified, can not start SMTP transport.\n"));
-    return NULL;
-  }
-  GNUNET_GC_get_configuration_value_number (core_api->cfg, "SMTP", "MTU", 1200,
-                                            SMTP_MESSAGE_SIZE,
-                                            SMTP_MESSAGE_SIZE, &mtu);
-  GNUNET_GC_get_configuration_value_number (core_api->cfg, "SMTP", "RATELIMIT",
-                                            0, 0, 1024 * 1024, &rate_limit);
-  stats = core_api->service_request ("stats");
-  if (stats != NULL)
-  {
-    stat_bytesReceived =
-      stats->create (gettext_noop ("# bytes received via SMTP"));
-    stat_bytesSent = stats->create (gettext_noop ("# bytes sent via SMTP"));
-    stat_bytesDropped =
-      stats->create (gettext_noop ("# bytes dropped by SMTP (outgoing)"));
-  }
-  GNUNET_GC_get_configuration_value_filename (core_api->cfg, "SMTP", "PIPE",
-                                              &pipename);
-  unlink (pipename);
-  if (0 != mkfifo (pipename, S_IWUSR | S_IRUSR | S_IWGRP | S_IWOTH))
-  {
-    GNUNET_GE_LOG_STRERROR (ectx,
-                            GNUNET_GE_ADMIN | GNUNET_GE_BULK | GNUNET_GE_FATAL,
-                            "mkfifo");
-    GNUNET_free (pipename);
-    core_api->service_release (stats);
-    stats = NULL;
-    return NULL;
-  }
-  /* we need to allow the mailer program to send us messages;
-   * easiest done by giving it write permissions (see Mantis #1142) */
-  if (0 != chmod (pipename, S_IWUSR | S_IRUSR | S_IWGRP | S_IWOTH))
-    GNUNET_GE_LOG_STRERROR (ectx,
-                            GNUNET_GE_ADMIN | GNUNET_GE_BULK
-                            | GNUNET_GE_WARNING, "chmod");
-  GNUNET_GC_get_configuration_value_string (core_api->cfg, "SMTP", "EMAIL",
-                                            NULL,
-                                            &email);
-  lock = GNUNET_mutex_create (GNUNET_NO);
-  GNUNET_GC_get_configuration_value_string (core_api->cfg, "SMTP", "SERVER",
-                                            "localhost:25", &smtp_server_name);
-  sa.sa_handler = SIG_IGN;
-  sigemptyset (&sa.sa_mask);
-  sa.sa_flags = 0;
-  sigaction (SIGPIPE, &sa, &old_handler);
-
-  smtpAPI.protocol_number = GNUNET_TRANSPORT_PROTOCOL_NUMBER_SMTP;
-  smtpAPI.mtu = mtu - sizeof(SMTPMessage);
-  smtpAPI.cost = 50;
-  smtpAPI.hello_verify = &api_verify_hello;
-  smtpAPI.hello_create = &api_create_hello;
-  smtpAPI.connect = &api_connect;
-  smtpAPI.send = &api_send;
-  smtpAPI.associate = &api_associate;
-  smtpAPI.disconnect = &api_disconnect;
-  smtpAPI.server_start = &api_start_transport_server;
-  smtpAPI.server_stop = &api_stop_transport_server;
-  smtpAPI.hello_to_address = &api_hello_to_address;
-  smtpAPI.send_now_test = &api_test_would_try;
-  return &smtpAPI;
-}
-
-
-void
-donetransport_smtp ()
-{
-  sigaction (SIGPIPE, &old_handler, NULL);
-  GNUNET_free (smtp_server_name);
-  if (stats != NULL)
-  {
-    core_api->service_release (stats);
-    stats = NULL;
-  }
-  GNUNET_mutex_destroy (lock);
-  lock = NULL;
-  unlink (pipename);
-  GNUNET_free (pipename);
-  pipename = NULL;
-  GNUNET_free (email);
-  email = NULL;
-}
-
-
-/* end of smtp.c */
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
deleted file mode 100644
index ac4cc672f..000000000
--- a/src/transport/plugin_transport_tcp.c
+++ /dev/null
@@ -1,3967 +0,0 @@
-/*
-   This file is part of GNUnet
-   Copyright (C) 2002--2015 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport/plugin_transport_tcp.c
- * @brief Implementation of the TCP transport service
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_constants.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_nat_service.h"
-#include "gnunet_protocols.h"
-#include "gnunet_resolver_service.h"
-#include "gnunet_signatures.h"
-#include "gnunet_statistics_service.h"
-#include "gnunet_transport_service.h"
-#include "gnunet_transport_plugin.h"
-#include "transport.h"
-
-#define LOG(kind, ...) GNUNET_log_from (kind, "transport-tcp", __VA_ARGS__)
-
-#define PLUGIN_NAME "tcp"
-
-/**
- * How long until we give up on establishing an NAT connection?
- * Must be > 4 RTT
- */
-#define NAT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
-
-/**
- * Opaque handle that can be used to cancel
- * a transmit-ready notification.
- */
-struct GNUNET_CONNECTION_TransmitHandle;
-
-/**
- * @brief handle for a server
- */
-struct GNUNET_SERVER_Handle;
-
-/**
- * @brief opaque handle for a client of the server
- */
-struct GNUNET_SERVER_Client;
-
-/**
- * @brief opaque handle server returns for aborting transmission to a client.
- */
-struct GNUNET_SERVER_TransmitHandle;
-
-/**
- * @brief handle for a network connection
- */
-struct GNUNET_CONNECTION_Handle;
-
-/**
- * @brief handle for a network service
- */
-struct LEGACY_SERVICE_Context;
-
-
-/**
- * Stops a service that was started with #GNUNET_SERVICE_start().
- *
- * @param srv service to stop
- */
-void
-LEGACY_SERVICE_stop (struct LEGACY_SERVICE_Context *srv);
-
-
-/**
- * Function called to notify a client about the connection begin ready
- * to queue more data.  @a buf will be NULL and @a size zero if the
- * connection was closed for writing in the meantime.
- *
- * @param cls closure
- * @param size number of bytes available in @a buf
- * @param buf where the callee should write the message
- * @return number of bytes written to @a buf
- */
-typedef size_t (*GNUNET_CONNECTION_TransmitReadyNotify) (void *cls,
-                                                         size_t size,
-                                                         void *buf);
-
-/**
- * Credentials for UNIX domain sockets.
- */
-struct GNUNET_CONNECTION_Credentials
-{
-  /**
-   * UID of the other end of the connection.
-   */
-  uid_t uid;
-
-  /**
-   * GID of the other end of the connection.
-   */
-  gid_t gid;
-};
-
-
-/**
- * Functions with this signature are called whenever a client
- * is disconnected on the network level.
- *
- * @param cls closure
- * @param client identification of the client; NULL
- *        for the last call when the server is destroyed
- */
-typedef void (*GNUNET_SERVER_DisconnectCallback) (
-  void *cls,
-  struct GNUNET_SERVER_Client *client);
-
-
-/**
- * Functions with this signature are called whenever a client
- * is connected on the network level.
- *
- * @param cls closure
- * @param client identification of the client
- */
-typedef void (*GNUNET_SERVER_ConnectCallback) (
-  void *cls,
-  struct GNUNET_SERVER_Client *client);
-
-
-/**
- * Function to call for access control checks.
- *
- * @param cls closure
- * @param ucred credentials, if available, otherwise NULL
- * @param addr address
- * @param addrlen length of address
- * @return GNUNET_YES to allow, GNUNET_NO to deny, GNUNET_SYSERR
- *   for unknown address family (will be denied).
- */
-typedef int (*GNUNET_CONNECTION_AccessCheck) (
-  void *cls,
-  const struct GNUNET_CONNECTION_Credentials *ucred,
-  const struct sockaddr *addr,
-  socklen_t addrlen);
-
-/**
- * Callback function for data received from the network.  Note that
- * both "available" and "err" would be 0 if the read simply timed out.
- *
- * @param cls closure
- * @param buf pointer to received data
- * @param available number of bytes available in "buf",
- *        possibly 0 (on errors)
- * @param addr address of the sender
- * @param addrlen size of addr
- * @param errCode value of errno (on errors receiving)
- */
-typedef void (*GNUNET_CONNECTION_Receiver) (void *cls,
-                                            const void *buf,
-                                            size_t available,
-                                            const struct sockaddr *addr,
-                                            socklen_t addrlen,
-                                            int errCode);
-
-
-/**
- * Close the connection and free associated resources.  There must
- * not be any pending requests for reading or writing to the
- * connection at this time.
- *
- * @param connection connection to destroy
- */
-void
-GNUNET_CONNECTION_destroy (struct GNUNET_CONNECTION_Handle *connection);
-
-
-/**
- * Signature of a function to create a custom tokenizer.
- *
- * @param cls closure from #GNUNET_SERVER_set_callbacks
- * @param client handle to client the tokenzier will be used for
- * @return handle to custom tokenizer ('mst')
- */
-typedef void *(*GNUNET_SERVER_MstCreateCallback) (
-  void *cls,
-  struct GNUNET_SERVER_Client *client);
-
-
-/**
- * Signature of a function to destroy a custom tokenizer.
- *
- * @param cls closure from #GNUNET_SERVER_set_callbacks
- * @param mst custom tokenizer handle
- */
-typedef void (*GNUNET_SERVER_MstDestroyCallback) (void *cls, void *mst);
-
-/**
- * Signature of a function to receive data for a custom tokenizer.
- *
- * @param cls closure from #GNUNET_SERVER_set_callbacks
- * @param mst custom tokenizer handle
- * @param client_identity ID of client for which this is a buffer,
- *        can be NULL (will be passed back to 'cb')
- * @param buf input data to add
- * @param size number of bytes in @a buf
- * @param purge should any excess bytes in the buffer be discarded
- *       (i.e. for packet-based services like UDP)
- * @param one_shot only call callback once, keep rest of message in buffer
- * @return #GNUNET_OK if we are done processing (need more data)
- *         #GNUNET_NO if one_shot was set and we have another message ready
- *         #GNUNET_SYSERR if the data stream is corrupt
- */
-typedef int (*GNUNET_SERVER_MstReceiveCallback) (
-  void *cls,
-  void *mst,
-  struct GNUNET_SERVER_Client *client,
-  const char *buf,
-  size_t size,
-  int purge,
-  int one_shot);
-/**
- * Functions with this signature are called whenever a message is
- * received.
- *
- * @param cls closure
- * @param client identification of the client
- * @param message the actual message
- */
-typedef void (*GNUNET_SERVER_MessageCallback) (
-  void *cls,
-  struct GNUNET_SERVER_Client *client,
-  const struct GNUNET_MessageHeader *message);
-
-/**
- * Message handler.  Each struct specifies how to handle on particular
- * type of message received.
- */
-struct GNUNET_SERVER_MessageHandler
-{
-  /**
-   * Function to call for messages of "type".
-   */
-  GNUNET_SERVER_MessageCallback callback;
-
-  /**
-   * Closure argument for @e callback.
-   */
-  void *callback_cls;
-
-  /**
-   * Type of the message this handler covers.
-   */
-  uint16_t type;
-
-  /**
-   * Expected size of messages of this type.  Use 0 for
-   * variable-size.  If non-zero, messages of the given
-   * type will be discarded (and the connection closed)
-   * if they do not have the right size.
-   */
-  uint16_t expected_size;
-};
-
-
-/**
- * Options for the service (bitmask).
- */
-enum LEGACY_SERVICE_Options
-{
-  /**
-   * Use defaults.  Terminates all client connections and the listen
-   * sockets immediately upon receiving the shutdown signal.
-   */
-  LEGACY_SERVICE_OPTION_NONE = 0,
-
-  /**
-   * Do not trigger server shutdown on signal at all; instead, allow
-   * for the user to terminate the server explicitly when needed
-   * by calling #LEGACY_SERVICE_shutdown().
-   */
-  LEGACY_SERVICE_OPTION_MANUAL_SHUTDOWN = 1,
-
-  /**
-   * Trigger a SOFT server shutdown on signals, allowing active
-   * non-monitor clients to complete their transactions.
-   */
-  LEGACY_SERVICE_OPTION_SOFT_SHUTDOWN = 2
-};
-
-
-/**
- * Ask the server to disconnect from the given client.  This is the
- * same as passing #GNUNET_SYSERR to #GNUNET_SERVER_receive_done,
- * except that it allows dropping of a client even when not handling a
- * message from that client.
- *
- * @param client the client to disconnect from
- */
-void
-GNUNET_SERVER_client_disconnect (struct GNUNET_SERVER_Client *client);
-
-/**
- * Return user context associated with the given client.
- * Note: you should probably use the macro (call without the underscore).
- *
- * @param client client to query
- * @param size number of bytes in user context struct (for verification only)
- * @return pointer to user context
- */
-void *
-GNUNET_SERVER_client_get_user_context_ (struct GNUNET_SERVER_Client *client,
-                                        size_t size);
-
-
-/**
- * Functions with this signature are called whenever a
- * complete message is received by the tokenizer.
- *
- * Do not call #GNUNET_SERVER_mst_destroy from within
- * the scope of this callback.
- *
- * @param cls closure
- * @param client identification of the client
- * @param message the actual message
- * @return #GNUNET_OK on success, #GNUNET_SYSERR to stop further processing
- */
-typedef int (*GNUNET_SERVER_MessageTokenizerCallback) (
-  void *cls,
-  void *client,
-  const struct GNUNET_MessageHeader *message);
-
-
-/**
- * Create a message stream tokenizer.
- *
- * @param cb function to call on completed messages
- * @param cb_cls closure for @a cb
- * @return handle to tokenizer
- */
-struct GNUNET_SERVER_MessageStreamTokenizer *
-GNUNET_SERVER_mst_create (GNUNET_SERVER_MessageTokenizerCallback cb,
-                          void *cb_cls);
-
-/**
- * Add incoming data to the receive buffer and call the
- * callback for all complete messages.
- *
- * @param mst tokenizer to use
- * @param client_identity ID of client for which this is a buffer,
- *        can be NULL (will be passed back to 'cb')
- * @param buf input data to add
- * @param size number of bytes in @a buf
- * @param purge should any excess bytes in the buffer be discarded
- *       (i.e. for packet-based services like UDP)
- * @param one_shot only call callback once, keep rest of message in buffer
- * @return #GNUNET_OK if we are done processing (need more data)
- *         #GNUNET_NO if one_shot was set and we have another message ready
- *         #GNUNET_SYSERR if the data stream is corrupt
- */
-int
-GNUNET_SERVER_mst_receive (struct GNUNET_SERVER_MessageStreamTokenizer *mst,
-                           void *client_identity,
-                           const char *buf,
-                           size_t size,
-                           int purge,
-                           int one_shot);
-
-
-/**
- * Destroys a tokenizer.
- *
- * @param mst tokenizer to destroy
- */
-void
-GNUNET_SERVER_mst_destroy (struct GNUNET_SERVER_MessageStreamTokenizer *mst);
-
-
-/**
- * Set user context to be associated with the given client.
- * Note: you should probably use the macro (call without the underscore).
- *
- * @param client client to query
- * @param ptr pointer to user context
- * @param size number of bytes in user context struct (for verification only)
- */
-void
-GNUNET_SERVER_client_set_user_context_ (struct GNUNET_SERVER_Client *client,
-                                        void *ptr,
-                                        size_t size);
-
-/**
- * Return user context associated with the given client.
- *
- * @param client client to query
- * @param type expected return type (i.e. 'struct Foo')
- * @return pointer to user context of type 'type *'.
- */
-#define GNUNET_SERVER_client_get_user_context(client, type) \
-  (type *) GNUNET_SERVER_client_get_user_context_ (client, sizeof(type))
-
-/**
- * Set user context to be associated with the given client.
- *
- * @param client client to query
- * @param value pointer to user context
- */
-#define GNUNET_SERVER_client_set_user_context(client, value) \
-  GNUNET_SERVER_client_set_user_context_ (client, value, sizeof(*value))
-
-
-/**
- * Notify us when the server has enough space to transmit
- * a message of the given size to the given client.
- *
- * @param client client to transmit message to
- * @param size requested amount of buffer space
- * @param timeout after how long should we give up (and call
- *        notify with buf NULL and size 0)?
- * @param callback function to call when space is available
- * @param callback_cls closure for @a callback
- * @return non-NULL if the notify callback was queued; can be used
- *           to cancel the request using
- *           #GNUNET_SERVER_notify_transmit_ready_cancel.
- *         NULL if we are already going to notify someone else (busy)
- */
-struct GNUNET_SERVER_TransmitHandle *
-GNUNET_SERVER_notify_transmit_ready (
-  struct GNUNET_SERVER_Client *client,
-  size_t size,
-  struct GNUNET_TIME_Relative timeout,
-  GNUNET_CONNECTION_TransmitReadyNotify callback,
-  void *callback_cls);
-
-/**
- * Abort transmission request.
- *
- * @param th request to abort
- */
-void
-GNUNET_SERVER_notify_transmit_ready_cancel (
-  struct GNUNET_SERVER_TransmitHandle *th);
-
-
-/**
- * Notify the server that the given client handle should
- * be kept (keeps the connection up if possible, increments
- * the internal reference counter).
- *
- * @param client the client to keep
- */
-void
-GNUNET_SERVER_client_keep (struct GNUNET_SERVER_Client *client);
-
-
-/**
- * Notify the server that the given client handle is no
- * longer required.  Decrements the reference counter.  If
- * that counter reaches zero an inactive connection maybe
- * closed.
- *
- * @param client the client to drop
- */
-void
-GNUNET_SERVER_client_drop (struct GNUNET_SERVER_Client *client);
-
-
-/**
- * Function called by the service's run
- * method to run service-specific setup code.
- *
- * @param cls closure
- * @param server the initialized server
- * @param cfg configuration to use
- */
-typedef void (*LEGACY_SERVICE_Main) (
-  void *cls,
-  struct GNUNET_SERVER_Handle *server,
-  const struct GNUNET_CONFIGURATION_Handle *cfg);
-
-
-/**
- * Suspend accepting connections from the listen socket temporarily.
- * Resume activity using #GNUNET_SERVER_resume.
- *
- * @param server server to stop accepting connections.
- */
-void
-GNUNET_SERVER_suspend (struct GNUNET_SERVER_Handle *server);
-
-/**
- * Notify us when the server has enough space to transmit
- * a message of the given size to the given client.
- *
- * @param client client to transmit message to
- * @param size requested amount of buffer space
- * @param timeout after how long should we give up (and call
- *        notify with buf NULL and size 0)?
- * @param callback function to call when space is available
- * @param callback_cls closure for @a callback
- * @return non-NULL if the notify callback was queued; can be used
- *           to cancel the request using
- *           #GNUNET_SERVER_notify_transmit_ready_cancel.
- *         NULL if we are already going to notify someone else (busy)
- */
-struct GNUNET_SERVER_TransmitHandle *
-GNUNET_SERVER_notify_transmit_ready (
-  struct GNUNET_SERVER_Client *client,
-  size_t size,
-  struct GNUNET_TIME_Relative timeout,
-  GNUNET_CONNECTION_TransmitReadyNotify callback,
-  void *callback_cls);
-
-
-/**
- * Add a TCP socket-based connection to the set of handles managed by
- * this server.  Use this function for outgoing (P2P) connections that
- * we initiated (and where this server should process incoming
- * messages).
- *
- * @param server the server to use
- * @param connection the connection to manage (client must
- *        stop using this connection from now on)
- * @return the client handle
- */
-struct GNUNET_SERVER_Client *
-GNUNET_SERVER_connect_socket (struct GNUNET_SERVER_Handle *server,
-                              struct GNUNET_CONNECTION_Handle *connection);
-
-
-/**
- * Resume accepting connections from the listen socket.
- *
- * @param server server to resume accepting connections.
- */
-void
-GNUNET_SERVER_resume (struct GNUNET_SERVER_Handle *server);
-
-/**
- * Free resources held by this server.
- *
- * @param server server to destroy
- */
-void
-GNUNET_SERVER_destroy (struct GNUNET_SERVER_Handle *server);
-
-
-#include "tcp_connection_legacy.c"
-#include "tcp_server_mst_legacy.c"
-#include "tcp_server_legacy.c"
-#include "tcp_service_legacy.c"
-
-GNUNET_NETWORK_STRUCT_BEGIN
-
-/**
- * Initial handshake message for a session.
- */
-struct WelcomeMessage
-{
-  /**
-   * Type is #GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Identity of the node connecting (TCP client)
-   */
-  struct GNUNET_PeerIdentity clientIdentity;
-};
-
-/**
- * Basically a WELCOME message, but with the purpose
- * of giving the waiting peer a client handle to use
- */
-struct TCP_NAT_ProbeMessage
-{
-  /**
-   * Type is #GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_NAT_PROBE.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Identity of the sender of the message.
-   */
-  struct GNUNET_PeerIdentity clientIdentity;
-};
-GNUNET_NETWORK_STRUCT_END
-
-/**
- * Context for sending a NAT probe via TCP.
- */
-struct TCPProbeContext
-{
-  /**
-   * Active probes are kept in a DLL.
-   */
-  struct TCPProbeContext *next;
-
-  /**
-   * Active probes are kept in a DLL.
-   */
-  struct TCPProbeContext *prev;
-
-  /**
-   * Probe connection.
-   */
-  struct GNUNET_CONNECTION_Handle *sock;
-
-  /**
-   * Message to be sent.
-   */
-  struct TCP_NAT_ProbeMessage message;
-
-  /**
-   * Handle to the transmission.
-   */
-  struct GNUNET_CONNECTION_TransmitHandle *transmit_handle;
-
-  /**
-   * Transport plugin handle.
-   */
-  struct Plugin *plugin;
-};
-
-/**
- * Bits in the `options` field of TCP addresses.
- */
-enum TcpAddressOptions
-{
-  /**
-   * No bits set.
-   */
-  TCP_OPTIONS_NONE = 0,
-
-  /**
-   * See #HTTP_OPTIONS_VERIFY_CERTIFICATE.
-   */
-  TCP_OPTIONS_RESERVED = 1,
-
-  /**
-   * Enable TCP Stealth-style port knocking.
-   */
-  TCP_OPTIONS_TCP_STEALTH = 2
-};
-
-GNUNET_NETWORK_STRUCT_BEGIN
-
-/**
- * Network format for IPv4 addresses.
- */
-struct IPv4TcpAddress
-{
-  /**
-   * Optional options and flags for this address,
-   * see `enum TcpAddressOptions`
-   */
-  uint32_t options GNUNET_PACKED;
-
-  /**
-   * IPv4 address, in network byte order.
-   */
-  uint32_t ipv4_addr GNUNET_PACKED;
-
-  /**
-   * Port number, in network byte order.
-   */
-  uint16_t t4_port GNUNET_PACKED;
-};
-
-/**
- * Network format for IPv6 addresses.
- */
-struct IPv6TcpAddress
-{
-  /**
-   * Optional flags for this address
-   * see `enum TcpAddressOptions`
-   */
-  uint32_t options GNUNET_PACKED;
-
-  /**
-   * IPv6 address.
-   */
-  struct in6_addr ipv6_addr GNUNET_PACKED;
-
-  /**
-   * Port number, in network byte order.
-   */
-  uint16_t t6_port GNUNET_PACKED;
-};
-GNUNET_NETWORK_STRUCT_END
-
-/**
- * Encapsulation of all of the state of the plugin.
- */
-struct Plugin;
-
-/**
- * Information kept for each message that is yet to
- * be transmitted.
- */
-struct PendingMessage
-{
-  /**
-   * This is a doubly-linked list.
-   */
-  struct PendingMessage *next;
-
-  /**
-   * This is a doubly-linked list.
-   */
-  struct PendingMessage *prev;
-
-  /**
-   * The pending message
-   */
-  const char *msg;
-
-  /**
-   * Continuation function to call once the message
-   * has been sent.  Can be NULL if there is no
-   * continuation to call.
-   */
-  GNUNET_TRANSPORT_TransmitContinuation transmit_cont;
-
-  /**
-   * Closure for @e transmit_cont.
-   */
-  void *transmit_cont_cls;
-
-  /**
-   * Timeout value for the pending message.
-   */
-  struct GNUNET_TIME_Absolute timeout;
-
-  /**
-   * So that the gnunet-service-transport can group messages together,
-   * these pending messages need to accept a message buffer and size
-   * instead of just a `struct GNUNET_MessageHeader`.
-   */
-  size_t message_size;
-};
-
-/**
- * Session handle for TCP connections.
- */
-struct GNUNET_ATS_Session
-{
-  /**
-   * To whom are we talking to (set to our identity
-   * if we are still waiting for the welcome message)
-   */
-  struct GNUNET_PeerIdentity target;
-
-  /**
-   * Pointer to the global plugin struct.
-   */
-  struct Plugin *plugin;
-
-  /**
-   * The client (used to identify this connection)
-   */
-  struct GNUNET_SERVER_Client *client;
-
-  /**
-   * Task cleaning up a NAT client connection establishment attempt;
-   */
-  struct GNUNET_SCHEDULER_Task *nat_connection_timeout;
-
-  /**
-   * Messages currently pending for transmission
-   * to this peer, if any.
-   */
-  struct PendingMessage *pending_messages_head;
-
-  /**
-   * Messages currently pending for transmission
-   * to this peer, if any.
-   */
-  struct PendingMessage *pending_messages_tail;
-
-  /**
-   * Handle for pending transmission request.
-   */
-  struct GNUNET_SERVER_TransmitHandle *transmit_handle;
-
-  /**
-   * Address of the other peer.
-   */
-  struct GNUNET_HELLO_Address *address;
-
-  /**
-   * ID of task used to delay receiving more to throttle sender.
-   */
-  struct GNUNET_SCHEDULER_Task *receive_delay_task;
-
-  /**
-   * Session timeout task
-   */
-  struct GNUNET_SCHEDULER_Task *timeout_task;
-
-  /**
-   * When will this session time out?
-   */
-  struct GNUNET_TIME_Absolute timeout;
-
-  /**
-   * When will we continue to read from the socket?
-   * (used to enforce inbound quota).
-   */
-  struct GNUNET_TIME_Absolute receive_delay;
-
-  /**
-   * Last activity on this connection.  Used to select preferred
-   * connection.
-   */
-  struct GNUNET_TIME_Absolute last_activity;
-
-  /**
-   * Number of bytes waiting for transmission to this peer.
-   */
-  unsigned long long bytes_in_queue;
-
-  /**
-   * Number of messages waiting for transmission to this peer.
-   */
-  unsigned int msgs_in_queue;
-
-  /**
-   * Network type of the address.
-   */
-  enum GNUNET_NetworkType scope;
-
-  /**
-   * Are we still expecting the welcome message? (#GNUNET_YES/#GNUNET_NO)
-   */
-  int expecting_welcome;
-
-  /**
-   * Was this session created using NAT traversal?
-   */
-  int is_nat;
-};
-
-
-/**
- * Context for address to string conversion, closure
- * for #append_port().
- */
-struct PrettyPrinterContext
-{
-  /**
-   * DLL
-   */
-  struct PrettyPrinterContext *next;
-
-  /**
-   * DLL
-   */
-  struct PrettyPrinterContext *prev;
-
-  /**
-   * Our plugin.
-   */
-  struct Plugin *plugin;
-
-  /**
-   * Timeout task
-   */
-  struct GNUNET_SCHEDULER_Task *timeout_task;
-
-  /**
-   * Resolver handle
-   */
-  struct GNUNET_RESOLVER_RequestHandle *resolver_handle;
-
-  /**
-   * Function to call with the result.
-   */
-  GNUNET_TRANSPORT_AddressStringCallback asc;
-
-  /**
-   * Clsoure for @e asc.
-   */
-  void *asc_cls;
-
-  /**
-   * IPv6 address
-   */
-  int ipv6;
-
-  /**
-   * Options
-   */
-  uint32_t options;
-
-  /**
-   * Port to add after the IP address.
-   */
-  uint16_t port;
-};
-
-
-/**
- * Encapsulation of all of the state of the plugin.
- */
-struct Plugin
-{
-  /**
-   * Our environment.
-   */
-  struct GNUNET_TRANSPORT_PluginEnvironment *env;
-
-  /**
-   * The listen socket.
-   */
-  struct GNUNET_CONNECTION_Handle *lsock;
-
-  /**
-   * Our handle to the NAT module.
-   */
-  struct GNUNET_NAT_Handle *nat;
-
-  /**
-   * Map from peer identities to sessions for the given peer.
-   */
-  struct GNUNET_CONTAINER_MultiPeerMap *sessionmap;
-
-  /**
-   * Handle to the network service.
-   */
-  struct LEGACY_SERVICE_Context *service;
-
-  /**
-   * Handle to the server for this service.
-   */
-  struct GNUNET_SERVER_Handle *server;
-
-  /**
-   * Copy of the handler array where the closures are
-   * set to this struct's instance.
-   */
-  struct GNUNET_SERVER_MessageHandler *handlers;
-
-  /**
-   * Map of peers we have tried to contact behind a NAT
-   */
-  struct GNUNET_CONTAINER_MultiPeerMap *nat_wait_conns;
-
-  /**
-   * List of active TCP probes.
-   */
-  struct TCPProbeContext *probe_head;
-
-  /**
-   * List of active TCP probes.
-   */
-  struct TCPProbeContext *probe_tail;
-
-  /**
-   * Function to call about session status changes.
-   */
-  GNUNET_TRANSPORT_SessionInfoCallback sic;
-
-  /**
-   * Closure for @e sic.
-   */
-  void *sic_cls;
-
-  /**
-   * ID of task used to update our addresses when one expires.
-   */
-  struct GNUNET_SCHEDULER_Task *address_update_task;
-
-  /**
-   * Running pretty printers: head
-   */
-  struct PrettyPrinterContext *ppc_dll_head;
-
-  /**
-   * Running pretty printers: tail
-   */
-  struct PrettyPrinterContext *ppc_dll_tail;
-
-  /**
-   * Welcome message used by this peer.
-   */
-  struct WelcomeMessage my_welcome;
-
-  /**
-   * How many more TCP sessions are we allowed to open right now?
-   */
-  unsigned long long max_connections;
-
-  /**
-   * How many more TCP sessions do we have right now?
-   */
-  unsigned long long cur_connections;
-
-  /**
-   * Address options
-   */
-  uint32_t myoptions;
-
-  /**
-   * Port that we are actually listening on.
-   */
-  uint16_t open_port;
-
-  /**
-   * Port that the user said we would have visible to the
-   * rest of the world.
-   */
-  uint16_t adv_port;
-};
-
-
-/**
- * Get the list of addresses that a server for the given service
- * should bind to.
- *
- * @param service_name name of the service
- * @param cfg configuration (which specifies the addresses)
- * @param addrs set (call by reference) to an array of pointers to the
- *              addresses the server should bind to and listen on; the
- *              array will be NULL-terminated (on success)
- * @param addr_lens set (call by reference) to an array of the lengths
- *              of the respective `struct sockaddr` struct in the @a addrs
- *              array (on success)
- * @return number of addresses found on success,
- *              #GNUNET_SYSERR if the configuration
- *              did not specify reasonable finding information or
- *              if it specified a hostname that could not be resolved;
- *              #GNUNET_NO if the number of addresses configured is
- *              zero (in this case, `*addrs` and `*addr_lens` will be
- *              set to NULL).
- */
-static int
-get_server_addresses (const char *service_name,
-                      const struct GNUNET_CONFIGURATION_Handle *cfg,
-                      struct sockaddr ***addrs,
-                      socklen_t **addr_lens)
-{
-  int disablev6;
-  struct GNUNET_NETWORK_Handle *desc;
-  unsigned long long port;
-  char *unixpath;
-  struct addrinfo hints;
-  struct addrinfo *res;
-  struct addrinfo *pos;
-  struct addrinfo *next;
-  unsigned int i;
-  int resi;
-  int ret;
-  int abstract;
-  struct sockaddr **saddrs;
-  socklen_t *saddrlens;
-  char *hostname;
-
-  *addrs = NULL;
-  *addr_lens = NULL;
-  desc = NULL;
-  if (GNUNET_CONFIGURATION_have_value (cfg, service_name, "DISABLEV6"))
-  {
-    if (GNUNET_SYSERR ==
-        (disablev6 = GNUNET_CONFIGURATION_get_value_yesno (cfg,
-                                                           service_name,
-                                                           "DISABLEV6")))
-      return GNUNET_SYSERR;
-  }
-  else
-    disablev6 = GNUNET_NO;
-
-  if (! disablev6)
-  {
-    /* probe IPv6 support */
-    desc = GNUNET_NETWORK_socket_create (PF_INET6, SOCK_STREAM, 0);
-    if (NULL == desc)
-    {
-      if ((ENOBUFS == errno) || (ENOMEM == errno) || (ENFILE == errno) ||
-          (EACCES == errno))
-      {
-        GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket");
-        return GNUNET_SYSERR;
-      }
-      LOG (GNUNET_ERROR_TYPE_INFO,
-           _ (
-             "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"),
-           service_name,
-           strerror (errno));
-      disablev6 = GNUNET_YES;
-    }
-    else
-    {
-      GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (desc));
-      desc = NULL;
-    }
-  }
-
-  port = 0;
-  if (GNUNET_CONFIGURATION_have_value (cfg, service_name, "PORT"))
-  {
-    if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg,
-                                                            service_name,
-                                                            "PORT",
-                                                            &port))
-    {
-      LOG (GNUNET_ERROR_TYPE_ERROR,
-           _ ("Require valid port number for service `%s' in configuration!\n"),
-           service_name);
-    }
-    if (port > 65535)
-    {
-      LOG (GNUNET_ERROR_TYPE_ERROR,
-           _ ("Require valid port number for service `%s' in configuration!\n"),
-           service_name);
-      return GNUNET_SYSERR;
-    }
-  }
-
-  if (GNUNET_CONFIGURATION_have_value (cfg, service_name, "BINDTO"))
-  {
-    GNUNET_break (GNUNET_OK ==
-                  GNUNET_CONFIGURATION_get_value_string (cfg,
-                                                         service_name,
-                                                         "BINDTO",
-                                                         &hostname));
-  }
-  else
-    hostname = NULL;
-
-  unixpath = NULL;
-  abstract = GNUNET_NO;
-#ifdef AF_UNIX
-  if ((GNUNET_YES ==
-       GNUNET_CONFIGURATION_have_value (cfg, service_name, "UNIXPATH")) &&
-      (GNUNET_OK == GNUNET_CONFIGURATION_get_value_filename (cfg,
-                                                             service_name,
-                                                             "UNIXPATH",
-                                                             &unixpath)) &&
-      (0 < strlen (unixpath)))
-  {
-    /* probe UNIX support */
-    struct sockaddr_un s_un;
-
-    if (strlen (unixpath) >= sizeof(s_un.sun_path))
-    {
-      LOG (GNUNET_ERROR_TYPE_WARNING,
-           _ ("UNIXPATH `%s' too long, maximum length is %llu\n"),
-           unixpath,
-           (unsigned long long) sizeof(s_un.sun_path));
-      unixpath = GNUNET_NETWORK_shorten_unixpath (unixpath);
-      LOG (GNUNET_ERROR_TYPE_INFO, _ ("Using `%s' instead\n"), unixpath);
-    }
-#ifdef __linux__
-    abstract = GNUNET_CONFIGURATION_get_value_yesno (cfg,
-                                                     "TESTING",
-                                                     "USE_ABSTRACT_SOCKETS");
-    if (GNUNET_SYSERR == abstract)
-      abstract = GNUNET_NO;
-#endif
-    if ((GNUNET_YES != abstract) &&
-        (GNUNET_OK != GNUNET_DISK_directory_create_for_file (unixpath)))
-      GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "mkdir", unixpath);
-  }
-  if (NULL != unixpath)
-  {
-    desc = GNUNET_NETWORK_socket_create (AF_UNIX, SOCK_STREAM, 0);
-    if (NULL == desc)
-    {
-      if ((ENOBUFS == errno) || (ENOMEM == errno) || (ENFILE == errno) ||
-          (EACCES == errno))
-      {
-        GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket");
-        GNUNET_free (hostname);
-        GNUNET_free (unixpath);
-        return GNUNET_SYSERR;
-      }
-      LOG (GNUNET_ERROR_TYPE_INFO,
-           _ (
-             "Disabling UNIX domain socket support for service `%s', failed to create UNIX domain socket: %s\n"),
-           service_name,
-           strerror (errno));
-      GNUNET_free (unixpath);
-      unixpath = NULL;
-    }
-    else
-    {
-      GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (desc));
-      desc = NULL;
-    }
-  }
-#endif
-
-  if ((0 == port) && (NULL == unixpath))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         _ (
-           "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"),
-         service_name);
-    GNUNET_free (hostname);
-    return GNUNET_SYSERR;
-  }
-  if (0 == port)
-  {
-    saddrs = GNUNET_malloc (2 * sizeof(struct sockaddr *));
-    saddrlens = GNUNET_malloc (2 * sizeof(socklen_t));
-    add_unixpath (saddrs, saddrlens, unixpath, abstract);
-    GNUNET_free (unixpath);
-    GNUNET_free (hostname);
-    *addrs = saddrs;
-    *addr_lens = saddrlens;
-    return 1;
-  }
-
-  if (NULL != hostname)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Resolving `%s' since that is where `%s' will bind to.\n",
-         hostname,
-         service_name);
-    memset (&hints, 0, sizeof(struct addrinfo));
-    if (disablev6)
-      hints.ai_family = AF_INET;
-    hints.ai_protocol = IPPROTO_TCP;
-    if ((0 != (ret = getaddrinfo (hostname, NULL, &hints, &res))) ||
-        (NULL == res))
-    {
-      LOG (GNUNET_ERROR_TYPE_ERROR,
-           _ ("Failed to resolve `%s': %s\n"),
-           hostname,
-           gai_strerror (ret));
-      GNUNET_free (hostname);
-      GNUNET_free (unixpath);
-      return GNUNET_SYSERR;
-    }
-    next = res;
-    i = 0;
-    while (NULL != (pos = next))
-    {
-      next = pos->ai_next;
-      if ((disablev6) && (pos->ai_family == AF_INET6))
-        continue;
-      i++;
-    }
-    if (0 == i)
-    {
-      LOG (GNUNET_ERROR_TYPE_ERROR,
-           _ ("Failed to find %saddress for `%s'.\n"),
-           disablev6 ? "IPv4 " : "",
-           hostname);
-      freeaddrinfo (res);
-      GNUNET_free (hostname);
-      GNUNET_free (unixpath);
-      return GNUNET_SYSERR;
-    }
-    resi = i;
-    if (NULL != unixpath)
-      resi++;
-    saddrs = GNUNET_malloc ((resi + 1) * sizeof(struct sockaddr *));
-    saddrlens = GNUNET_malloc ((resi + 1) * sizeof(socklen_t));
-    i = 0;
-    if (NULL != unixpath)
-    {
-      add_unixpath (saddrs, saddrlens, unixpath, abstract);
-      i++;
-    }
-    next = res;
-    while (NULL != (pos = next))
-    {
-      next = pos->ai_next;
-      if ((disablev6) && (AF_INET6 == pos->ai_family))
-        continue;
-      if ((IPPROTO_TCP != pos->ai_protocol) && (0 != pos->ai_protocol))
-        continue;     /* not TCP */
-      if ((SOCK_STREAM != pos->ai_socktype) && (0 != pos->ai_socktype))
-        continue;     /* huh? */
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Service `%s' will bind to `%s'\n",
-           service_name,
-           GNUNET_a2s (pos->ai_addr, pos->ai_addrlen));
-      if (AF_INET == pos->ai_family)
-      {
-        GNUNET_assert (sizeof(struct sockaddr_in) == pos->ai_addrlen);
-        saddrlens[i] = pos->ai_addrlen;
-        saddrs[i] = GNUNET_malloc (saddrlens[i]);
-        GNUNET_memcpy (saddrs[i], pos->ai_addr, saddrlens[i]);
-        ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port);
-      }
-      else
-      {
-        GNUNET_assert (AF_INET6 == pos->ai_family);
-        GNUNET_assert (sizeof(struct sockaddr_in6) == pos->ai_addrlen);
-        saddrlens[i] = pos->ai_addrlen;
-        saddrs[i] = GNUNET_malloc (saddrlens[i]);
-        GNUNET_memcpy (saddrs[i], pos->ai_addr, saddrlens[i]);
-        ((struct sockaddr_in6 *) saddrs[i])->sin6_port = htons (port);
-      }
-      i++;
-    }
-    GNUNET_free (hostname);
-    freeaddrinfo (res);
-    resi = i;
-  }
-  else
-  {
-    /* will bind against everything, just set port */
-    if (disablev6)
-    {
-      /* V4-only */
-      resi = 1;
-      if (NULL != unixpath)
-        resi++;
-      i = 0;
-      saddrs = GNUNET_malloc ((resi + 1) * sizeof(struct sockaddr *));
-      saddrlens = GNUNET_malloc ((resi + 1) * sizeof(socklen_t));
-      if (NULL != unixpath)
-      {
-        add_unixpath (saddrs, saddrlens, unixpath, abstract);
-        i++;
-      }
-      saddrlens[i] = sizeof(struct sockaddr_in);
-      saddrs[i] = GNUNET_malloc (saddrlens[i]);
-#if HAVE_SOCKADDR_IN_SIN_LEN
-      ((struct sockaddr_in *) saddrs[i])->sin_len = saddrlens[i];
-#endif
-      ((struct sockaddr_in *) saddrs[i])->sin_family = AF_INET;
-      ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port);
-    }
-    else
-    {
-      /* dual stack */
-      resi = 2;
-      if (NULL != unixpath)
-        resi++;
-      saddrs = GNUNET_malloc ((resi + 1) * sizeof(struct sockaddr *));
-      saddrlens = GNUNET_malloc ((resi + 1) * sizeof(socklen_t));
-      i = 0;
-      if (NULL != unixpath)
-      {
-        add_unixpath (saddrs, saddrlens, unixpath, abstract);
-        i++;
-      }
-      saddrlens[i] = sizeof(struct sockaddr_in6);
-      saddrs[i] = GNUNET_malloc (saddrlens[i]);
-#if HAVE_SOCKADDR_IN_SIN_LEN
-      ((struct sockaddr_in6 *) saddrs[i])->sin6_len = saddrlens[0];
-#endif
-      ((struct sockaddr_in6 *) saddrs[i])->sin6_family = AF_INET6;
-      ((struct sockaddr_in6 *) saddrs[i])->sin6_port = htons (port);
-      i++;
-      saddrlens[i] = sizeof(struct sockaddr_in);
-      saddrs[i] = GNUNET_malloc (saddrlens[i]);
-#if HAVE_SOCKADDR_IN_SIN_LEN
-      ((struct sockaddr_in *) saddrs[i])->sin_len = saddrlens[1];
-#endif
-      ((struct sockaddr_in *) saddrs[i])->sin_family = AF_INET;
-      ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port);
-    }
-  }
-  GNUNET_free (unixpath);
-  *addrs = saddrs;
-  *addr_lens = saddrlens;
-  return resi;
-}
-
-
-/* end ancient copy-and-paste */
-
-
-/**
- * If a session monitor is attached, notify it about the new
- * session state.
- *
- * @param plugin our plugin
- * @param session session that changed state
- * @param state new state of the session
- */
-static void
-notify_session_monitor (struct Plugin *plugin,
-                        struct GNUNET_ATS_Session *session,
-                        enum GNUNET_TRANSPORT_SessionState state)
-{
-  struct GNUNET_TRANSPORT_SessionInfo info;
-
-  if (NULL == plugin->sic)
-    return;
-  memset (&info, 0, sizeof(info));
-  info.state = state;
-  info.is_inbound =
-    GNUNET_HELLO_address_check_option (session->address,
-                                       GNUNET_HELLO_ADDRESS_INFO_INBOUND);
-  info.num_msg_pending = session->msgs_in_queue;
-  info.num_bytes_pending = session->bytes_in_queue;
-  if (NULL != session->receive_delay_task)
-    info.receive_delay = session->receive_delay;
-  info.session_timeout = session->timeout;
-  info.address = session->address;
-  plugin->sic (plugin->sic_cls, session, &info);
-}
-
-
-/**
- * Our external IP address/port mapping has changed.
- *
- * @param cls closure, the `struct Plugin`
- * @param app_ctx[in,out] location where the app can store stuff
- *                  on add and retrieve it on remove
- * @param add_remove #GNUNET_YES to mean the new public IP address, #GNUNET_NO to mean
- *     the previous (now invalid) one
- * @param ac address class the address belongs to
- * @param addr either the previous or the new public IP address
- * @param addrlen actual length of @a addr
- */
-static void
-tcp_nat_port_map_callback (void *cls,
-                           void **app_ctx,
-                           int add_remove,
-                           enum GNUNET_NAT_AddressClass ac,
-                           const struct sockaddr *addr,
-                           socklen_t addrlen)
-{
-  struct Plugin *plugin = cls;
-  struct GNUNET_HELLO_Address *address;
-  struct IPv4TcpAddress t4;
-  struct IPv6TcpAddress t6;
-  void *arg;
-  size_t args;
-
-  (void) app_ctx;
-  LOG (GNUNET_ERROR_TYPE_INFO,
-       "NAT notification to %s address `%s'\n",
-       (GNUNET_YES == add_remove) ? "add" : "remove",
-       GNUNET_a2s (addr, addrlen));
-  /* convert 'addr' to our internal format */
-  switch (addr->sa_family)
-  {
-  case AF_INET:
-    GNUNET_assert (addrlen == sizeof(struct sockaddr_in));
-    memset (&t4, 0, sizeof(t4));
-    t4.options = htonl (plugin->myoptions);
-    t4.ipv4_addr = ((struct sockaddr_in *) addr)->sin_addr.s_addr;
-    t4.t4_port = ((struct sockaddr_in *) addr)->sin_port;
-    arg = &t4;
-    args = sizeof(t4);
-    break;
-
-  case AF_INET6:
-    if (IN6_IS_ADDR_LINKLOCAL (&((struct sockaddr_in6 *) addr)->sin6_addr))
-    {
-      /* skip link local, we don't allow them in
-       #tcp_plugin_check_address() */
-      return;
-    }
-    GNUNET_assert (addrlen == sizeof(struct sockaddr_in6));
-    memset (&t6, 0, sizeof(t6));
-    GNUNET_memcpy (&t6.ipv6_addr,
-                   &((struct sockaddr_in6 *) addr)->sin6_addr,
-                   sizeof(struct in6_addr));
-    t6.options = htonl (plugin->myoptions);
-    t6.t6_port = ((struct sockaddr_in6 *) addr)->sin6_port;
-    arg = &t6;
-    args = sizeof(t6);
-    break;
-
-  default:
-    GNUNET_break (0);
-    return;
-  }
-  /* modify our published address list */
-  GNUNET_assert ((args == sizeof(struct IPv4TcpAddress)) ||
-                 (args == sizeof(struct IPv6TcpAddress)));
-  /* TODO: use 'ac' here in the future... */
-  address = GNUNET_HELLO_address_allocate (plugin->env->my_identity,
-                                           PLUGIN_NAME,
-                                           arg,
-                                           args,
-                                           GNUNET_HELLO_ADDRESS_INFO_NONE);
-  plugin->env->notify_address (plugin->env->cls, add_remove, address);
-  GNUNET_HELLO_address_free (address);
-}
-
-
-/**
- * Function called for a quick conversion of the binary address to
- * a numeric address.  Note that the caller must not free the
- * address and that the next call to this function is allowed
- * to override the address again.
- *
- * @param cls closure (`struct Plugin*`)
- * @param addr binary address
- * @param addrlen length of @a addr
- * @return string representing the same address
- */
-static const char *
-tcp_plugin_address_to_string (void *cls, const void *addr, size_t addrlen)
-{
-  static char rbuf[INET6_ADDRSTRLEN + 12];
-  char buf[INET6_ADDRSTRLEN];
-  const void *sb;
-  struct in_addr a4;
-  struct in6_addr a6;
-  const struct IPv4TcpAddress *t4;
-  const struct IPv6TcpAddress *t6;
-  int af;
-  uint16_t port;
-  uint32_t options;
-
-  switch (addrlen)
-  {
-  case sizeof(struct IPv6TcpAddress):
-    t6 = addr;
-    af = AF_INET6;
-    port = ntohs (t6->t6_port);
-    options = ntohl (t6->options);
-    GNUNET_memcpy (&a6, &t6->ipv6_addr, sizeof(a6));
-    sb = &a6;
-    break;
-
-  case sizeof(struct IPv4TcpAddress):
-    t4 = addr;
-    af = AF_INET;
-    port = ntohs (t4->t4_port);
-    options = ntohl (t4->options);
-    GNUNET_memcpy (&a4, &t4->ipv4_addr, sizeof(a4));
-    sb = &a4;
-    break;
-
-  default:
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         _ ("Unexpected address length: %u bytes\n"),
-         (unsigned int) addrlen);
-    return NULL;
-  }
-  if (NULL == inet_ntop (af, sb, buf, INET6_ADDRSTRLEN))
-  {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "inet_ntop");
-    return NULL;
-  }
-  GNUNET_snprintf (rbuf,
-                   sizeof(rbuf),
-                   (af == AF_INET6) ? "%s.%u.[%s]:%u" : "%s.%u.%s:%u",
-                   PLUGIN_NAME,
-                   options,
-                   buf,
-                   port);
-  return rbuf;
-}
-
-
-/**
- * Function called to convert a string address to
- * a binary address.
- *
- * @param cls closure (`struct Plugin*`)
- * @param addr string address
- * @param addrlen length of the address
- * @param buf location to store the buffer
- * @param added location to store the number of bytes in the buffer.
- *        If the function returns #GNUNET_SYSERR, its contents are undefined.
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
- */
-static int
-tcp_plugin_string_to_address (void *cls,
-                              const char *addr,
-                              uint16_t addrlen,
-                              void **buf,
-                              size_t *added)
-{
-  struct sockaddr_storage socket_address;
-  char *address;
-  char *plugin;
-  char *optionstr;
-  uint32_t options;
-
-  /* Format tcp.options.address:port */
-  address = NULL;
-  plugin = NULL;
-  optionstr = NULL;
-  if ((NULL == addr) || (0 == addrlen))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  if ('\0' != addr[addrlen - 1])
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  if (strlen (addr) != addrlen - 1)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  plugin = GNUNET_strdup (addr);
-  optionstr = strchr (plugin, '.');
-  if (NULL == optionstr)
-  {
-    GNUNET_break (0);
-    GNUNET_free (plugin);
-    return GNUNET_SYSERR;
-  }
-  optionstr[0] = '\0';
-  optionstr++;
-  options = atol (optionstr);
-  address = strchr (optionstr, '.');
-  if (NULL == address)
-  {
-    GNUNET_break (0);
-    GNUNET_free (plugin);
-    return GNUNET_SYSERR;
-  }
-  address[0] = '\0';
-  address++;
-
-  if (GNUNET_OK !=
-      GNUNET_STRINGS_to_address_ip (address, strlen (address), &socket_address))
-  {
-    GNUNET_break (0);
-    GNUNET_free (plugin);
-    return GNUNET_SYSERR;
-  }
-
-  GNUNET_free (plugin);
-  switch (socket_address.ss_family)
-  {
-  case AF_INET: {
-      struct IPv4TcpAddress *t4;
-      struct sockaddr_in *in4 = (struct sockaddr_in *) &socket_address;
-      t4 = GNUNET_new (struct IPv4TcpAddress);
-      t4->options = htonl (options);
-      t4->ipv4_addr = in4->sin_addr.s_addr;
-      t4->t4_port = in4->sin_port;
-      *buf = t4;
-      *added = sizeof(struct IPv4TcpAddress);
-      return GNUNET_OK;
-    }
-
-  case AF_INET6: {
-      struct IPv6TcpAddress *t6;
-      struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) &socket_address;
-      t6 = GNUNET_new (struct IPv6TcpAddress);
-      t6->options = htonl (options);
-      t6->ipv6_addr = in6->sin6_addr;
-      t6->t6_port = in6->sin6_port;
-      *buf = t6;
-      *added = sizeof(struct IPv6TcpAddress);
-      return GNUNET_OK;
-    }
-
-  default:
-    return GNUNET_SYSERR;
-  }
-}
-
-
-/**
- * Find the session handle for the given client.
- * Currently uses both the hashmap and the client
- * context, as the client context is new and the
- * logic still needs to be tested.
- *
- * @param plugin the plugin
- * @param client which client to find the session handle for
- * @return NULL if no matching session exists
- */
-static struct GNUNET_ATS_Session *
-lookup_session_by_client (struct Plugin *plugin,
-                          struct GNUNET_SERVER_Client *client)
-{
-  return GNUNET_SERVER_client_get_user_context (client,
-                                                struct GNUNET_ATS_Session);
-}
-
-
-/**
- * Functions with this signature are called whenever we need
- * to close a session due to a disconnect or failure to
- * establish a connection.
- *
- * @param cls the `struct Plugin`
- * @param session session to close down
- * @return #GNUNET_OK on success
- */
-static int
-tcp_plugin_disconnect_session (void *cls, struct GNUNET_ATS_Session *session)
-{
-  struct Plugin *plugin = cls;
-  struct PendingMessage *pm;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Disconnecting session of peer `%s' address `%s'\n",
-       GNUNET_i2s (&session->target),
-       tcp_plugin_address_to_string (session->plugin,
-                                     session->address->address,
-                                     session->address->address_length));
-
-  if (NULL != session->timeout_task)
-  {
-    GNUNET_SCHEDULER_cancel (session->timeout_task);
-    session->timeout_task = NULL;
-    session->timeout = GNUNET_TIME_UNIT_ZERO_ABS;
-  }
-
-  if (GNUNET_YES == GNUNET_CONTAINER_multipeermap_remove (plugin->sessionmap,
-                                                          &session->target,
-                                                          session))
-  {
-    GNUNET_STATISTICS_update (session->plugin->env->stats,
-                              gettext_noop ("# TCP sessions active"),
-                              -1,
-                              GNUNET_NO);
-  }
-  else
-  {
-    GNUNET_assert (GNUNET_YES ==
-                   GNUNET_CONTAINER_multipeermap_remove (plugin->nat_wait_conns,
-                                                         &session->target,
-                                                         session));
-  }
-  if (NULL != session->client)
-    GNUNET_SERVER_client_set_user_context (session->client, NULL);
-
-  /* clean up state */
-  if (NULL != session->transmit_handle)
-  {
-    GNUNET_SERVER_notify_transmit_ready_cancel (session->transmit_handle);
-    session->transmit_handle = NULL;
-  }
-  session->plugin->env->session_end (session->plugin->env->cls,
-                                     session->address,
-                                     session);
-
-  if (NULL != session->nat_connection_timeout)
-  {
-    GNUNET_SCHEDULER_cancel (session->nat_connection_timeout);
-    session->nat_connection_timeout = NULL;
-  }
-
-  while (NULL != (pm = session->pending_messages_head))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         (NULL != pm->transmit_cont)
-         ? "Could not deliver message to `%s' at %s.\n"
-         : "Could not deliver message to `%s' at %s, notifying.\n",
-         GNUNET_i2s (&session->target),
-         tcp_plugin_address_to_string (session->plugin,
-                                       session->address->address,
-                                       session->address->address_length));
-    GNUNET_STATISTICS_update (session->plugin->env->stats,
-                              gettext_noop ("# bytes currently in TCP buffers"),
-                              -(int64_t) pm->message_size,
-                              GNUNET_NO);
-    GNUNET_STATISTICS_update (session->plugin->env->stats,
-                              gettext_noop (
-                                "# bytes discarded by TCP (disconnect)"),
-                              pm->message_size,
-                              GNUNET_NO);
-    GNUNET_CONTAINER_DLL_remove (session->pending_messages_head,
-                                 session->pending_messages_tail,
-                                 pm);
-    GNUNET_assert (0 < session->msgs_in_queue);
-    session->msgs_in_queue--;
-    GNUNET_assert (pm->message_size <= session->bytes_in_queue);
-    session->bytes_in_queue -= pm->message_size;
-    if (NULL != pm->transmit_cont)
-      pm->transmit_cont (pm->transmit_cont_cls,
-                         &session->target,
-                         GNUNET_SYSERR,
-                         pm->message_size,
-                         0);
-    GNUNET_free (pm);
-  }
-  GNUNET_assert (0 == session->msgs_in_queue);
-  GNUNET_assert (0 == session->bytes_in_queue);
-  notify_session_monitor (session->plugin, session, GNUNET_TRANSPORT_SS_DONE);
-
-  if (NULL != session->receive_delay_task)
-  {
-    GNUNET_SCHEDULER_cancel (session->receive_delay_task);
-    session->receive_delay_task = NULL;
-  }
-  if (NULL != session->client)
-  {
-    GNUNET_SERVER_client_disconnect (session->client);
-    session->client = NULL;
-  }
-  GNUNET_HELLO_address_free (session->address);
-  GNUNET_assert (NULL == session->transmit_handle);
-  GNUNET_free (session);
-  return GNUNET_OK;
-}
-
-
-/**
- * Function that is called to get the keepalive factor.
- * #GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT is divided by this number to
- * calculate the interval between keepalive packets.
- *
- * @param cls closure with the `struct Plugin`
- * @return keepalive factor
- */
-static unsigned int
-tcp_plugin_query_keepalive_factor (void *cls)
-{
-  return 3;
-}
-
-
-/**
- * Session was idle for too long, so disconnect it
- *
- * @param cls the `struct GNUNET_ATS_Session` of the idle session
- */
-static void
-session_timeout (void *cls)
-{
-  struct GNUNET_ATS_Session *s = cls;
-  struct GNUNET_TIME_Relative left;
-
-  s->timeout_task = NULL;
-  left = GNUNET_TIME_absolute_get_remaining (s->timeout);
-  if (0 != left.rel_value_us)
-  {
-    /* not actually our turn yet, but let's at least update
-       the monitor, it may think we're about to die ... */
-    notify_session_monitor (s->plugin, s, GNUNET_TRANSPORT_SS_UPDATE);
-    s->timeout_task = GNUNET_SCHEDULER_add_delayed (left, &session_timeout, s);
-    return;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Session %p was idle for %s, disconnecting\n",
-       s,
-       GNUNET_STRINGS_relative_time_to_string (
-         GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
-         GNUNET_YES));
-  /* call session destroy function */
-  tcp_plugin_disconnect_session (s->plugin, s);
-}
-
-
-/**
- * Increment session timeout due to activity.
- *
- * @param s session to increment timeout for
- */
-static void
-reschedule_session_timeout (struct GNUNET_ATS_Session *s)
-{
-  GNUNET_assert (NULL != s->timeout_task);
-  s->timeout =
-    GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
-}
-
-
-/**
- * Create a new session.  Also queues a welcome message.
- *
- * @param plugin the plugin
- * @param address the address to create the session for
- * @param scope network scope the address is from
- * @param client client to use, reference counter must have already been increased
- * @param is_nat this a NAT session, we should wait for a client to
- *               connect to us from an address, then assign that to
- *               the session
- * @return new session object
- */
-static struct GNUNET_ATS_Session *
-create_session (struct Plugin *plugin,
-                const struct GNUNET_HELLO_Address *address,
-                enum GNUNET_NetworkType scope,
-                struct GNUNET_SERVER_Client *client,
-                int is_nat)
-{
-  struct GNUNET_ATS_Session *session;
-  struct PendingMessage *pm;
-
-  if (GNUNET_YES != is_nat)
-    GNUNET_assert (NULL != client);
-  else
-    GNUNET_assert (NULL == client);
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Creating new session for peer `%s' at address %s\n",
-       GNUNET_i2s (&address->peer),
-       tcp_plugin_address_to_string (plugin,
-                                     address->address,
-                                     address->address_length));
-  session = GNUNET_new (struct GNUNET_ATS_Session);
-  session->last_activity = GNUNET_TIME_absolute_get ();
-  session->plugin = plugin;
-  session->is_nat = is_nat;
-  if (NULL != client)
-  {
-    session->client = client;
-    GNUNET_SERVER_client_set_user_context (client, session);
-  }
-  session->address = GNUNET_HELLO_address_copy (address);
-  session->target = address->peer;
-  session->expecting_welcome = GNUNET_YES;
-  session->scope = scope;
-  pm = GNUNET_malloc (sizeof(struct PendingMessage)
-                      + sizeof(struct WelcomeMessage));
-  pm->msg = (const char *) &pm[1];
-  pm->message_size = sizeof(struct WelcomeMessage);
-  GNUNET_memcpy (&pm[1], &plugin->my_welcome, sizeof(struct WelcomeMessage));
-  pm->timeout = GNUNET_TIME_UNIT_FOREVER_ABS;
-  GNUNET_STATISTICS_update (plugin->env->stats,
-                            gettext_noop ("# bytes currently in TCP buffers"),
-                            pm->message_size,
-                            GNUNET_NO);
-  GNUNET_CONTAINER_DLL_insert (session->pending_messages_head,
-                               session->pending_messages_tail,
-                               pm);
-  session->msgs_in_queue++;
-  session->bytes_in_queue += pm->message_size;
-  session->timeout =
-    GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
-  session->timeout_task =
-    GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
-                                  &session_timeout,
-                                  session);
-  notify_session_monitor (session->plugin, session, GNUNET_TRANSPORT_SS_INIT);
-  if (GNUNET_YES != is_nat)
-  {
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              gettext_noop ("# TCP sessions active"),
-                              1,
-                              GNUNET_NO);
-    notify_session_monitor (session->plugin, session, GNUNET_TRANSPORT_SS_UP);
-  }
-  else
-  {
-    notify_session_monitor (session->plugin,
-                            session,
-                            GNUNET_TRANSPORT_SS_HANDSHAKE);
-  }
-  return session;
-}
-
-
-/**
- * If we have pending messages, ask the server to
- * transmit them (schedule the respective tasks, etc.)
- *
- * @param session for which session should we do this
- */
-static void
-process_pending_messages (struct GNUNET_ATS_Session *session);
-
-
-/**
- * Function called to notify a client about the socket
- * being ready to queue more data.  "buf" will be
- * NULL and "size" zero if the socket was closed for
- * writing in the meantime.
- *
- * @param cls closure
- * @param size number of bytes available in @a buf
- * @param buf where the callee should write the message
- * @return number of bytes written to @a buf
- */
-static size_t
-do_transmit (void *cls, size_t size, void *buf)
-{
-  struct GNUNET_ATS_Session *session = cls;
-  struct GNUNET_PeerIdentity pid;
-  struct Plugin *plugin;
-  struct PendingMessage *pos;
-  struct PendingMessage *hd;
-  struct PendingMessage *tl;
-  struct GNUNET_TIME_Absolute now;
-  char *cbuf;
-  size_t ret;
-
-  session->transmit_handle = NULL;
-  plugin = session->plugin;
-  if (NULL == buf)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Timeout trying to transmit to peer `%s', discarding message queue.\n",
-         GNUNET_i2s (&session->target));
-    /* timeout; cancel all messages that have already expired */
-    hd = NULL;
-    tl = NULL;
-    ret = 0;
-    now = GNUNET_TIME_absolute_get ();
-    while ((NULL != (pos = session->pending_messages_head)) &&
-           (pos->timeout.abs_value_us <= now.abs_value_us))
-    {
-      GNUNET_CONTAINER_DLL_remove (session->pending_messages_head,
-                                   session->pending_messages_tail,
-                                   pos);
-      GNUNET_assert (0 < session->msgs_in_queue);
-      session->msgs_in_queue--;
-      GNUNET_assert (pos->message_size <= session->bytes_in_queue);
-      session->bytes_in_queue -= pos->message_size;
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Failed to transmit %lu byte message to `%s'.\n",
-           (unsigned long) pos->message_size,
-           GNUNET_i2s (&session->target));
-      ret += pos->message_size;
-      GNUNET_CONTAINER_DLL_insert_after (hd, tl, tl, pos);
-    }
-    /* do this call before callbacks (so that if callbacks destroy
-     * session, they have a chance to cancel actions done by this
-     * call) */
-    process_pending_messages (session);
-    pid = session->target;
-    /* no do callbacks and do not use session again since
-     * the callbacks may abort the session */
-    while (NULL != (pos = hd))
-    {
-      GNUNET_CONTAINER_DLL_remove (hd, tl, pos);
-      if (NULL != pos->transmit_cont)
-        pos->transmit_cont (pos->transmit_cont_cls,
-                            &pid,
-                            GNUNET_SYSERR,
-                            pos->message_size,
-                            0);
-      GNUNET_free (pos);
-    }
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              gettext_noop ("# bytes currently in TCP buffers"),
-                              -(int64_t) ret,
-                              GNUNET_NO);
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              gettext_noop (
-                                "# bytes discarded by TCP (timeout)"),
-                              ret,
-                              GNUNET_NO);
-    if (0 < ret)
-      notify_session_monitor (session->plugin,
-                              session,
-                              GNUNET_TRANSPORT_SS_UPDATE);
-    return 0;
-  }
-  /* copy all pending messages that would fit */
-  ret = 0;
-  cbuf = buf;
-  hd = NULL;
-  tl = NULL;
-  while (NULL != (pos = session->pending_messages_head))
-  {
-    if (ret + pos->message_size > size)
-      break;
-    GNUNET_CONTAINER_DLL_remove (session->pending_messages_head,
-                                 session->pending_messages_tail,
-                                 pos);
-    GNUNET_assert (0 < session->msgs_in_queue);
-    session->msgs_in_queue--;
-    GNUNET_assert (pos->message_size <= session->bytes_in_queue);
-    session->bytes_in_queue -= pos->message_size;
-    GNUNET_assert (size >= pos->message_size);
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Transmitting message of type %u size %lu to peer %s at %s\n",
-         ntohs (((struct GNUNET_MessageHeader *) pos->msg)->type),
-         (unsigned long) pos->message_size,
-         GNUNET_i2s (&session->target),
-         tcp_plugin_address_to_string (session->plugin,
-                                       session->address->address,
-                                       session->address->address_length));
-    /* FIXME: this GNUNET_memcpy can be up to 7% of our total runtime */
-    GNUNET_memcpy (cbuf, pos->msg, pos->message_size);
-    cbuf += pos->message_size;
-    ret += pos->message_size;
-    size -= pos->message_size;
-    GNUNET_CONTAINER_DLL_insert_tail (hd, tl, pos);
-  }
-  notify_session_monitor (session->plugin, session, GNUNET_TRANSPORT_SS_UPDATE);
-  /* schedule 'continuation' before callbacks so that callbacks that
-   * cancel everything don't cause us to use a session that no longer
-   * exists... */
-  process_pending_messages (session);
-  session->last_activity = GNUNET_TIME_absolute_get ();
-  pid = session->target;
-  /* we'll now call callbacks that may cancel the session; hence
-   * we should not use 'session' after this point */
-  while (NULL != (pos = hd))
-  {
-    GNUNET_CONTAINER_DLL_remove (hd, tl, pos);
-    if (NULL != pos->transmit_cont)
-      pos->transmit_cont (pos->transmit_cont_cls,
-                          &pid,
-                          GNUNET_OK,
-                          pos->message_size,
-                          pos->message_size);  /* FIXME: include TCP overhead */
-    GNUNET_free (pos);
-  }
-  GNUNET_assert (NULL == hd);
-  GNUNET_assert (NULL == tl);
-  GNUNET_STATISTICS_update (plugin->env->stats,
-                            gettext_noop ("# bytes currently in TCP buffers"),
-                            -(int64_t) ret,
-                            GNUNET_NO);
-  GNUNET_STATISTICS_update (plugin->env->stats,
-                            gettext_noop ("# bytes transmitted via TCP"),
-                            ret,
-                            GNUNET_NO);
-  return ret;
-}
-
-
-/**
- * If we have pending messages, ask the server to
- * transmit them (schedule the respective tasks, etc.)
- *
- * @param session for which session should we do this
- */
-static void
-process_pending_messages (struct GNUNET_ATS_Session *session)
-{
-  struct PendingMessage *pm;
-
-  GNUNET_assert (NULL != session->client);
-  if (NULL != session->transmit_handle)
-    return;
-  if (NULL == (pm = session->pending_messages_head))
-    return;
-
-  session->transmit_handle =
-    GNUNET_SERVER_notify_transmit_ready (session->client,
-                                         pm->message_size,
-                                         GNUNET_TIME_absolute_get_remaining (
-                                           pm->timeout),
-                                         &do_transmit,
-                                         session);
-}
-
-
-/**
- * Function that can be used by the transport service to transmit
- * a message using the plugin.   Note that in the case of a
- * peer disconnecting, the continuation MUST be called
- * prior to the disconnect notification itself.  This function
- * will be called with this peer's HELLO message to initiate
- * a fresh connection to another peer.
- *
- * @param cls closure
- * @param session which session must be used
- * @param msgbuf the message to transmit
- * @param msgbuf_size number of bytes in @a msgbuf
- * @param priority how important is the message (most plugins will
- *                 ignore message priority and just FIFO)
- * @param to how long to wait at most for the transmission (does not
- *                require plugins to discard the message after the timeout,
- *                just advisory for the desired delay; most plugins will ignore
- *                this as well)
- * @param cont continuation to call once the message has
- *        been transmitted (or if the transport is ready
- *        for the next transmission call; or if the
- *        peer disconnected...); can be NULL
- * @param cont_cls closure for @a cont
- * @return number of bytes used (on the physical network, with overheads);
- *         -1 on hard errors (i.e. address invalid); 0 is a legal value
- *         and does NOT mean that the message was not transmitted (DV)
- */
-static ssize_t
-tcp_plugin_send (void *cls,
-                 struct GNUNET_ATS_Session *session,
-                 const char *msgbuf,
-                 size_t msgbuf_size,
-                 unsigned int priority,
-                 struct GNUNET_TIME_Relative to,
-                 GNUNET_TRANSPORT_TransmitContinuation cont,
-                 void *cont_cls)
-{
-  struct Plugin *plugin = cls;
-  struct PendingMessage *pm;
-
-  /* create new message entry */
-  pm = GNUNET_malloc (sizeof(struct PendingMessage) + msgbuf_size);
-  pm->msg = (const char *) &pm[1];
-  GNUNET_memcpy (&pm[1], msgbuf, msgbuf_size);
-  pm->message_size = msgbuf_size;
-  pm->timeout = GNUNET_TIME_relative_to_absolute (to);
-  pm->transmit_cont = cont;
-  pm->transmit_cont_cls = cont_cls;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Asked to transmit %lu bytes to `%s', added message to list.\n",
-       (unsigned long) msgbuf_size,
-       GNUNET_i2s (&session->target));
-
-  if (GNUNET_YES ==
-      GNUNET_CONTAINER_multipeermap_contains_value (plugin->sessionmap,
-                                                    &session->target,
-                                                    session))
-  {
-    GNUNET_assert (NULL != session->client);
-    GNUNET_SERVER_client_set_timeout (session->client,
-                                      GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              gettext_noop ("# bytes currently in TCP buffers"),
-                              msgbuf_size,
-                              GNUNET_NO);
-
-    /* append pm to pending_messages list */
-    GNUNET_CONTAINER_DLL_insert_tail (session->pending_messages_head,
-                                      session->pending_messages_tail,
-                                      pm);
-    notify_session_monitor (session->plugin,
-                            session,
-                            GNUNET_TRANSPORT_SS_UPDATE);
-    session->msgs_in_queue++;
-    session->bytes_in_queue += pm->message_size;
-    process_pending_messages (session);
-    return msgbuf_size;
-  }
-  if (GNUNET_YES ==
-      GNUNET_CONTAINER_multipeermap_contains_value (plugin->nat_wait_conns,
-                                                    &session->target,
-                                                    session))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "This NAT WAIT session for peer `%s' is not yet ready!\n",
-         GNUNET_i2s (&session->target));
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              gettext_noop ("# bytes currently in TCP buffers"),
-                              msgbuf_size,
-                              GNUNET_NO);
-    /* append pm to pending_messages list */
-    GNUNET_CONTAINER_DLL_insert_tail (session->pending_messages_head,
-                                      session->pending_messages_tail,
-                                      pm);
-    session->msgs_in_queue++;
-    session->bytes_in_queue += pm->message_size;
-    notify_session_monitor (session->plugin,
-                            session,
-                            GNUNET_TRANSPORT_SS_HANDSHAKE);
-    return msgbuf_size;
-  }
-  LOG (GNUNET_ERROR_TYPE_ERROR, "Invalid session %p\n", session);
-  if (NULL != cont)
-    cont (cont_cls, &session->target, GNUNET_SYSERR, pm->message_size, 0);
-  GNUNET_break (0);
-  GNUNET_free (pm);
-  return GNUNET_SYSERR; /* session does not exist here */
-}
-
-
-/**
- * Closure for #session_lookup_it().
- */
-struct GNUNET_ATS_SessionItCtx
-{
-  /**
-   * Address we are looking for.
-   */
-  const struct GNUNET_HELLO_Address *address;
-
-  /**
-   * Where to store the session (if we found it).
-   */
-  struct GNUNET_ATS_Session *result;
-};
-
-
-/**
- * Look for a session by address.
- *
- * @param cls the `struct GNUNET_ATS_SessionItCtx`
- * @param key unused
- * @param value a `struct GNUNET_ATS_Session`
- * @return #GNUNET_YES to continue looking, #GNUNET_NO if we found the session
- */
-static int
-session_lookup_it (void *cls,
-                   const struct GNUNET_PeerIdentity *key,
-                   void *value)
-{
-  struct GNUNET_ATS_SessionItCtx *si_ctx = cls;
-  struct GNUNET_ATS_Session *session = value;
-
-  if (0 != GNUNET_HELLO_address_cmp (si_ctx->address, session->address))
-    return GNUNET_YES;
-  si_ctx->result = session;
-  return GNUNET_NO;
-}
-
-
-/**
- * Task cleaning up a NAT connection attempt after timeout
- *
- * @param cls the `struct GNUNET_ATS_Session`
- */
-static void
-nat_connect_timeout (void *cls)
-{
-  struct GNUNET_ATS_Session *session = cls;
-
-  session->nat_connection_timeout = NULL;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "NAT WAIT connection to `%4s' at `%s' could not be established, removing session\n",
-       GNUNET_i2s (&session->target),
-       tcp_plugin_address_to_string (session->plugin,
-                                     session->address->address,
-                                     session->address->address_length));
-  tcp_plugin_disconnect_session (session->plugin, session);
-}
-
-
-/**
- * Function that will be called whenever the transport service wants to
- * notify the plugin that a session is still active and in use and
- * therefore the session timeout for this session has to be updated
- *
- * @param cls closure
- * @param peer which peer was the session for
- * @param session which session is being updated
- */
-static void
-tcp_plugin_update_session_timeout (void *cls,
-                                   const struct GNUNET_PeerIdentity *peer,
-                                   struct GNUNET_ATS_Session *session)
-{
-  reschedule_session_timeout (session);
-}
-
-
-/**
- * Task to signal the server that we can continue
- * receiving from the TCP client now.
- *
- * @param cls the `struct GNUNET_ATS_Session *`
- */
-static void
-delayed_done (void *cls)
-{
-  struct GNUNET_ATS_Session *session = cls;
-
-  session->receive_delay_task = NULL;
-  reschedule_session_timeout (session);
-  GNUNET_SERVER_receive_done (session->client, GNUNET_OK);
-}
-
-
-/**
- * Function that will be called whenever the transport service wants to
- * notify the plugin that the inbound quota changed and that the plugin
- * should update it's delay for the next receive value
- *
- * @param cls closure
- * @param peer which peer was the session for
- * @param session which session is being updated
- * @param delay new delay to use for receiving
- */
-static void
-tcp_plugin_update_inbound_delay (void *cls,
-                                 const struct GNUNET_PeerIdentity *peer,
-                                 struct GNUNET_ATS_Session *session,
-                                 struct GNUNET_TIME_Relative delay)
-{
-  if (NULL == session->receive_delay_task)
-    return;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "New inbound delay %s\n",
-       GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_NO));
-  session->receive_delay = GNUNET_TIME_relative_to_absolute (delay);
-  GNUNET_SCHEDULER_cancel (session->receive_delay_task);
-  session->receive_delay_task =
-    GNUNET_SCHEDULER_add_delayed (delay, &delayed_done, session);
-}
-
-
-/**
- * Create a new session to transmit data to the target
- * This session will used to send data to this peer and the plugin will
- * notify us by calling the env->session_end function
- *
- * @param cls closure
- * @param address the address to use
- * @return the session if the address is valid, NULL otherwise
- */
-static struct GNUNET_ATS_Session *
-tcp_plugin_get_session (void *cls, const struct GNUNET_HELLO_Address *address)
-{
-  struct Plugin *plugin = cls;
-  struct GNUNET_ATS_Session *session = NULL;
-  int af;
-  const void *sb;
-  size_t sbs;
-  struct GNUNET_CONNECTION_Handle *sa;
-  struct sockaddr_in a4;
-  struct sockaddr_in6 a6;
-  const struct IPv4TcpAddress *t4;
-  const struct IPv6TcpAddress *t6;
-  unsigned int options;
-  enum GNUNET_NetworkType net_type;
-  unsigned int is_natd = GNUNET_NO;
-  size_t addrlen;
-
-#ifdef TCP_STEALTH
-  struct GNUNET_NETWORK_Handle *s;
-#endif
-
-  addrlen = address->address_length;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Trying to get session for `%s' address of peer `%s'\n",
-       tcp_plugin_address_to_string (plugin,
-                                     address->address,
-                                     address->address_length),
-       GNUNET_i2s (&address->peer));
-
-  if (GNUNET_HELLO_address_check_option (address,
-                                         GNUNET_HELLO_ADDRESS_INFO_INBOUND))
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-
-  /* look for existing session */
-  if (GNUNET_YES == GNUNET_CONTAINER_multipeermap_contains (plugin->sessionmap,
-                                                            &address->peer))
-  {
-    struct GNUNET_ATS_SessionItCtx si_ctx;
-
-    si_ctx.address = address;
-    si_ctx.result = NULL;
-    GNUNET_CONTAINER_multipeermap_get_multiple (plugin->sessionmap,
-                                                &address->peer,
-                                                &session_lookup_it,
-                                                &si_ctx);
-    if (NULL != si_ctx.result)
-    {
-      session = si_ctx.result;
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Found existing session for `%s' address `%s'\n",
-           GNUNET_i2s (&address->peer),
-           tcp_plugin_address_to_string (plugin,
-                                         address->address,
-                                         address->address_length));
-      return session;
-    }
-    /* This is a bit of a hack, limiting TCP to never allow more than
-       one TCP connection to any given peer at the same time.
-       Without this, peers sometimes disagree about which of the TCP
-       connections they should use, causing one side to believe that
-       they transmit successfully, while the other receives nothing. */return NULL; /* Refuse to have more than one TCP connection per
-                      peer pair at the same time. */
-  }
-
-  if (addrlen == sizeof(struct IPv6TcpAddress))
-  {
-    GNUNET_assert (NULL != address->address);  /* make static analysis happy */
-    t6 = address->address;
-    options = t6->options;
-    af = AF_INET6;
-    memset (&a6, 0, sizeof(a6));
-#if HAVE_SOCKADDR_IN_SIN_LEN
-    a6.sin6_len = sizeof(a6);
-#endif
-    a6.sin6_family = AF_INET6;
-    a6.sin6_port = t6->t6_port;
-    if (t6->t6_port == 0)
-      is_natd = GNUNET_YES;
-    GNUNET_memcpy (&a6.sin6_addr, &t6->ipv6_addr, sizeof(struct in6_addr));
-    sb = &a6;
-    sbs = sizeof(a6);
-  }
-  else if (addrlen == sizeof(struct IPv4TcpAddress))
-  {
-    GNUNET_assert (NULL != address->address);  /* make static analysis happy */
-    t4 = address->address;
-    options = t4->options;
-    af = AF_INET;
-    memset (&a4, 0, sizeof(a4));
-#if HAVE_SOCKADDR_IN_SIN_LEN
-    a4.sin_len = sizeof(a4);
-#endif
-    a4.sin_family = AF_INET;
-    a4.sin_port = t4->t4_port;
-    if (t4->t4_port == 0)
-      is_natd = GNUNET_YES;
-    a4.sin_addr.s_addr = t4->ipv4_addr;
-    sb = &a4;
-    sbs = sizeof(a4);
-  }
-  else
-  {
-    GNUNET_STATISTICS_update (
-      plugin->env->stats,
-      gettext_noop ("# requests to create session with invalid address"),
-      1,
-      GNUNET_NO);
-    return NULL;
-  }
-
-  net_type = plugin->env->get_address_type (plugin->env->cls, sb, sbs);
-  GNUNET_break (net_type != GNUNET_NT_UNSPECIFIED);
-
-  if ((is_natd == GNUNET_YES) && (addrlen == sizeof(struct IPv6TcpAddress)))
-  {
-    /* NAT client only works with IPv4 addresses */
-    return NULL;
-  }
-
-  if (plugin->cur_connections >= plugin->max_connections)
-  {
-    /* saturated */
-    return NULL;
-  }
-
-  if ((is_natd == GNUNET_YES) &&
-      (GNUNET_YES ==
-       GNUNET_CONTAINER_multipeermap_contains (plugin->nat_wait_conns,
-                                               &address->peer)))
-  {
-    /* Only do one NAT punch attempt per peer identity */
-    return NULL;
-  }
-
-  if ((is_natd == GNUNET_YES) && (NULL != plugin->nat) &&
-      (GNUNET_NO ==
-       GNUNET_CONTAINER_multipeermap_contains (plugin->nat_wait_conns,
-                                               &address->peer)))
-  {
-    struct sockaddr_in local_sa;
-
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Found valid IPv4 NAT address (creating session)!\n");
-    session = create_session (plugin, address, net_type, NULL, GNUNET_YES);
-    session->nat_connection_timeout =
-      GNUNET_SCHEDULER_add_delayed (NAT_TIMEOUT, &nat_connect_timeout, session);
-    GNUNET_assert (GNUNET_OK ==
-                   GNUNET_CONTAINER_multipeermap_put (
-                     plugin->nat_wait_conns,
-                     &session->target,
-                     session,
-                     GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
-
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Created NAT WAIT connection to `%s' at `%s'\n",
-         GNUNET_i2s (&session->target),
-         GNUNET_a2s (sb, sbs));
-    memset (&local_sa, 0, sizeof(local_sa));
-    local_sa.sin_family = AF_INET;
-    local_sa.sin_port = htons (plugin->open_port);
-    /* We leave sin_address at 0, let the kernel figure it out,
-       even if our bind() is more specific.  (May want to reconsider
-       later.) */
-    if (GNUNET_OK == GNUNET_NAT_request_reversal (plugin->nat, &local_sa, &a4))
-      return session;
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Running NAT client for `%s' at `%s' failed\n",
-         GNUNET_i2s (&session->target),
-         GNUNET_a2s (sb, sbs));
-    tcp_plugin_disconnect_session (plugin, session);
-    return NULL;
-  }
-
-  /* create new outbound session */
-  if (0 != (options & TCP_OPTIONS_TCP_STEALTH))
-  {
-#ifdef TCP_STEALTH
-    s = GNUNET_NETWORK_socket_create (af, SOCK_STREAM, 0);
-    if (NULL == s)
-    {
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,
-                           "socket");
-      sa = NULL;
-    }
-    else
-    {
-      if ((GNUNET_OK !=
-           GNUNET_NETWORK_socket_setsockopt (s,
-                                             IPPROTO_TCP,
-                                             TCP_STEALTH,
-                                             &session->target,
-                                             sizeof(
-                                               struct GNUNET_PeerIdentity))) ||
-          (GNUNET_OK !=
-           GNUNET_NETWORK_socket_setsockopt (s,
-                                             IPPROTO_TCP,
-                                             TCP_STEALTH_INTEGRITY,
-                                             &plugin->my_welcome,
-                                             sizeof(struct WelcomeMessage))))
-      {
-        /* TCP STEALTH not supported by kernel */
-        GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (s));
-        sa = NULL;
-      }
-      else
-      {
-        sa = GNUNET_CONNECTION_connect_socket (s, sb, sbs);
-      }
-    }
-#else
-    sa = NULL;
-#endif
-  }
-  else
-  {
-    sa = GNUNET_CONNECTION_create_from_sockaddr (af, sb, sbs);
-  }
-  if (NULL == sa)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Failed to create connection to `%s' at `%s'\n",
-         GNUNET_i2s (&address->peer),
-         GNUNET_a2s (sb, sbs));
-    return NULL;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Asked to transmit to `%s', creating fresh session using address `%s'.\n",
-       GNUNET_i2s (&address->peer),
-       GNUNET_a2s (sb, sbs));
-
-  session = create_session (plugin,
-                            address,
-                            net_type,
-                            GNUNET_SERVER_connect_socket (plugin->server, sa),
-                            GNUNET_NO);
-  (void) GNUNET_CONTAINER_multipeermap_put (
-    plugin->sessionmap,
-    &session->target,
-    session,
-    GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-  /* Send TCP Welcome */
-  process_pending_messages (session);
-
-  return session;
-}
-
-
-/**
- * We have been asked to destroy all connections to a particular peer.
- * This function is called on each applicable session and must tear it
- * down.
- *
- * @param cls the `struct Plugin *`
- * @param key the peer which the session belongs to (unused)
- * @param value the `struct GNUNET_ATS_Session`
- * @return #GNUNET_YES (continue to iterate)
- */
-static int
-session_disconnect_it (void *cls,
-                       const struct GNUNET_PeerIdentity *key,
-                       void *value)
-{
-  struct Plugin *plugin = cls;
-  struct GNUNET_ATS_Session *session = value;
-
-  GNUNET_STATISTICS_update (session->plugin->env->stats,
-                            gettext_noop (
-                              "# transport-service disconnect requests for TCP"),
-                            1,
-                            GNUNET_NO);
-  tcp_plugin_disconnect_session (plugin, session);
-  return GNUNET_YES;
-}
-
-
-/**
- * Function that can be called to force a disconnect from the
- * specified neighbour.  This should also cancel all previously
- * scheduled transmissions.  Obviously the transmission may have been
- * partially completed already, which is OK.  The plugin is supposed
- * to close the connection (if applicable) and no longer call the
- * transmit continuation(s).
- *
- * Finally, plugin MUST NOT call the services's receive function to
- * notify the service that the connection to the specified target was
- * closed after a getting this call.
- *
- * @param cls closure
- * @param target peer for which the last transmission is
- *        to be cancelled
- */
-static void
-tcp_plugin_disconnect (void *cls, const struct GNUNET_PeerIdentity *target)
-{
-  struct Plugin *plugin = cls;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Disconnecting peer `%s'\n",
-       GNUNET_i2s (target));
-  GNUNET_CONTAINER_multipeermap_get_multiple (plugin->sessionmap,
-                                              target,
-                                              &session_disconnect_it,
-                                              plugin);
-  GNUNET_CONTAINER_multipeermap_get_multiple (plugin->nat_wait_conns,
-                                              target,
-                                              &session_disconnect_it,
-                                              plugin);
-}
-
-
-/**
- * We are processing an address pretty printing request and finished
- * the IP resolution (if applicable).  Append our port and forward the
- * result.  If called with @a hostname NULL, we are done and should
- * clean up the pretty printer (otherwise, there might be multiple
- * hostnames for the IP address and we might receive more).
- *
- * @param cls the `struct PrettyPrinterContext *`
- * @param hostname hostname part of the address
- */
-static void
-append_port (void *cls, const char *hostname)
-{
-  struct PrettyPrinterContext *ppc = cls;
-  struct Plugin *plugin = ppc->plugin;
-  char *ret;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "append_port called with hostname `%s'\n",
-              hostname);
-  if (NULL == hostname)
-  {
-    /* Final call, done */
-    ppc->resolver_handle = NULL;
-    GNUNET_CONTAINER_DLL_remove (plugin->ppc_dll_head,
-                                 plugin->ppc_dll_tail,
-                                 ppc);
-    ppc->asc (ppc->asc_cls, NULL, GNUNET_OK);
-    GNUNET_free (ppc);
-    return;
-  }
-  if (GNUNET_YES == ppc->ipv6)
-    GNUNET_asprintf (&ret,
-                     "%s.%u.[%s]:%d",
-                     PLUGIN_NAME,
-                     ppc->options,
-                     hostname,
-                     ppc->port);
-  else
-    GNUNET_asprintf (&ret,
-                     "%s.%u.%s:%d",
-                     PLUGIN_NAME,
-                     ppc->options,
-                     hostname,
-                     ppc->port);
-  ppc->asc (ppc->asc_cls, ret, GNUNET_OK);
-  GNUNET_free (ret);
-}
-
-
-/**
- * Convert the transports address to a nice, human-readable format.
- *
- * @param cls closure with the `struct Plugin`
- * @param type name of the transport that generated the address
- * @param addr one of the addresses of the host, NULL for the last address
- *        the specific address format depends on the transport
- * @param addrlen length of the @a addr
- * @param numeric should (IP) addresses be displayed in numeric form?
- * @param timeout after how long should we give up?
- * @param asc function to call on each string
- * @param asc_cls closure for @a asc
- */
-static void
-tcp_plugin_address_pretty_printer (void *cls,
-                                   const char *type,
-                                   const void *addr,
-                                   size_t addrlen,
-                                   int numeric,
-                                   struct GNUNET_TIME_Relative timeout,
-                                   GNUNET_TRANSPORT_AddressStringCallback asc,
-                                   void *asc_cls)
-{
-  struct Plugin *plugin = cls;
-  struct PrettyPrinterContext *ppc;
-  const void *sb;
-  size_t sbs;
-  struct sockaddr_in a4;
-  struct sockaddr_in6 a6;
-  const struct IPv4TcpAddress *t4;
-  const struct IPv6TcpAddress *t6;
-  uint16_t port;
-  uint32_t options;
-
-  if (sizeof(struct IPv6TcpAddress) == addrlen)
-  {
-    t6 = addr;
-    memset (&a6, 0, sizeof(a6));
-    a6.sin6_family = AF_INET6;
-    a6.sin6_port = t6->t6_port;
-    GNUNET_memcpy (&a6.sin6_addr, &t6->ipv6_addr, sizeof(struct in6_addr));
-    port = ntohs (t6->t6_port);
-    options = ntohl (t6->options);
-    sb = &a6;
-    sbs = sizeof(a6);
-  }
-  else if (sizeof(struct IPv4TcpAddress) == addrlen)
-  {
-    t4 = addr;
-    memset (&a4, 0, sizeof(a4));
-    a4.sin_family = AF_INET;
-    a4.sin_port = t4->t4_port;
-    a4.sin_addr.s_addr = t4->ipv4_addr;
-    port = ntohs (t4->t4_port);
-    options = ntohl (t4->options);
-    sb = &a4;
-    sbs = sizeof(a4);
-  }
-  else
-  {
-    /* invalid address */
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         _ ("Unexpected address length: %u bytes\n"),
-         (unsigned int) addrlen);
-    asc (asc_cls, NULL, GNUNET_SYSERR);
-    asc (asc_cls, NULL, GNUNET_OK);
-    return;
-  }
-  ppc = GNUNET_new (struct PrettyPrinterContext);
-  ppc->plugin = plugin;
-  if (addrlen == sizeof(struct IPv6TcpAddress))
-    ppc->ipv6 = GNUNET_YES;
-  else
-    ppc->ipv6 = GNUNET_NO;
-  ppc->asc = asc;
-  ppc->asc_cls = asc_cls;
-  ppc->port = port;
-  ppc->options = options;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting DNS reverse lookup\n");
-  ppc->resolver_handle = GNUNET_RESOLVER_hostname_get (sb,
-                                                       sbs,
-                                                       ! numeric,
-                                                       timeout,
-                                                       &append_port,
-                                                       ppc);
-  if (NULL == ppc->resolver_handle)
-  {
-    GNUNET_break (0);
-    GNUNET_free (ppc);
-    return;
-  }
-  GNUNET_CONTAINER_DLL_insert (plugin->ppc_dll_head, plugin->ppc_dll_tail, ppc);
-}
-
-
-/**
- * Function that will be called to check if a binary address for this
- * plugin is well-formed and corresponds to an address for THIS peer
- * (as per our configuration).  Naturally, if absolutely necessary,
- * plugins can be a bit conservative in their answer, but in general
- * plugins should make sure that the address does not redirect
- * traffic to a 3rd party that might try to man-in-the-middle our
- * traffic.
- *
- * @param cls closure, our `struct Plugin *`
- * @param addr pointer to the address
- * @param addrlen length of @a addr
- * @return #GNUNET_OK if this is a plausible address for this peer
- *         and transport, #GNUNET_SYSERR if not
- */
-static int
-tcp_plugin_check_address (void *cls, const void *addr, size_t addrlen)
-{
-  struct Plugin *plugin = cls;
-  const struct IPv4TcpAddress *v4;
-  const struct IPv6TcpAddress *v6;
-
-  if ((addrlen != sizeof(struct IPv4TcpAddress)) &&
-      (addrlen != sizeof(struct IPv6TcpAddress)))
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-
-  if (addrlen == sizeof(struct IPv4TcpAddress))
-  {
-    struct sockaddr_in s4;
-
-    v4 = (const struct IPv4TcpAddress *) addr;
-    if (0 != memcmp (&v4->options, &plugin->myoptions, sizeof(uint32_t)))
-    {
-      GNUNET_break (0);
-      return GNUNET_SYSERR;
-    }
-    memset (&s4, 0, sizeof(s4));
-    s4.sin_family = AF_INET;
-#if HAVE_SOCKADDR_IN_SIN_LEN
-    s4.sin_len = sizeof(s4);
-#endif
-    s4.sin_port = v4->t4_port;
-    s4.sin_addr.s_addr = v4->ipv4_addr;
-
-    if (GNUNET_OK !=
-        GNUNET_NAT_test_address (plugin->nat, &s4, sizeof(struct sockaddr_in)))
-      return GNUNET_SYSERR;
-  }
-  else
-  {
-    struct sockaddr_in6 s6;
-
-    v6 = (const struct IPv6TcpAddress *) addr;
-    if (IN6_IS_ADDR_LINKLOCAL (&v6->ipv6_addr))
-    {
-      GNUNET_break_op (0);
-      return GNUNET_SYSERR;
-    }
-    if (0 != memcmp (&v6->options, &plugin->myoptions, sizeof(uint32_t)))
-    {
-      GNUNET_break (0);
-      return GNUNET_SYSERR;
-    }
-    memset (&s6, 0, sizeof(s6));
-    s6.sin6_family = AF_INET6;
-#if HAVE_SOCKADDR_IN_SIN_LEN
-    s6.sin6_len = sizeof(s6);
-#endif
-    s6.sin6_port = v6->t6_port;
-    s6.sin6_addr = v6->ipv6_addr;
-
-    if (GNUNET_OK != GNUNET_NAT_test_address (plugin->nat,
-                                              &s6,
-                                              sizeof(struct sockaddr_in6)))
-      return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * We've received a nat probe from this peer via TCP.  Finish
- * creating the client session and resume sending of queued
- * messages.
- *
- * @param cls closure
- * @param client identification of the client
- * @param message the actual message
- */
-static void
-handle_tcp_nat_probe (void *cls,
-                      struct GNUNET_SERVER_Client *client,
-                      const struct GNUNET_MessageHeader *message)
-{
-  struct Plugin *plugin = cls;
-  struct GNUNET_ATS_Session *session;
-  const struct TCP_NAT_ProbeMessage *tcp_nat_probe;
-  size_t alen;
-  void *vaddr;
-  struct IPv4TcpAddress *t4;
-  struct IPv6TcpAddress *t6;
-  const struct sockaddr_in *s4;
-  const struct sockaddr_in6 *s6;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Received NAT probe\n");
-  /* We have received a TCP NAT probe, meaning we (hopefully) initiated
-   * a connection to this peer by running gnunet-nat-client.  This peer
-   * received the punch message and now wants us to use the new connection
-   * as the default for that peer.  Do so and then send a WELCOME message
-   * so we can really be connected!
-   */if (ntohs (message->size) != sizeof(struct TCP_NAT_ProbeMessage))
-  {
-    GNUNET_break_op (0);
-    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-    return;
-  }
-
-  tcp_nat_probe = (const struct TCP_NAT_ProbeMessage *) message;
-  if (0 == memcmp (&tcp_nat_probe->clientIdentity,
-                   plugin->env->my_identity,
-                   sizeof(struct GNUNET_PeerIdentity)))
-  {
-    /* refuse connections from ourselves */
-    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-    return;
-  }
-
-  session = GNUNET_CONTAINER_multipeermap_get (plugin->nat_wait_conns,
-                                               &tcp_nat_probe->clientIdentity);
-  if (NULL == session)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "Did NOT find session for NAT probe!\n");
-    GNUNET_SERVER_receive_done (client, GNUNET_OK);
-    return;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Found session for NAT probe!\n");
-
-  if (NULL != session->nat_connection_timeout)
-  {
-    GNUNET_SCHEDULER_cancel (session->nat_connection_timeout);
-    session->nat_connection_timeout = NULL;
-  }
-
-  if (GNUNET_OK != GNUNET_SERVER_client_get_address (client, &vaddr, &alen))
-  {
-    GNUNET_break (0);
-    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-    tcp_plugin_disconnect_session (plugin, session);
-    return;
-  }
-  GNUNET_assert (
-    GNUNET_YES ==
-    GNUNET_CONTAINER_multipeermap_remove (plugin->nat_wait_conns,
-                                          &tcp_nat_probe->clientIdentity,
-                                          session));
-  GNUNET_SERVER_client_set_user_context (client, session);
-  (void) GNUNET_CONTAINER_multipeermap_put (
-    plugin->sessionmap,
-    &session->target,
-    session,
-    GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-  session->last_activity = GNUNET_TIME_absolute_get ();
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Found address `%s' for incoming connection\n",
-       GNUNET_a2s (vaddr, alen));
-  switch (((const struct sockaddr *) vaddr)->sa_family)
-  {
-  case AF_INET:
-    s4 = vaddr;
-    t4 = GNUNET_new (struct IPv4TcpAddress);
-    t4->options = htonl (TCP_OPTIONS_NONE);
-    t4->t4_port = s4->sin_port;
-    t4->ipv4_addr = s4->sin_addr.s_addr;
-    session->address =
-      GNUNET_HELLO_address_allocate (&tcp_nat_probe->clientIdentity,
-                                     PLUGIN_NAME,
-                                     &t4,
-                                     sizeof(struct IPv4TcpAddress),
-                                     GNUNET_HELLO_ADDRESS_INFO_NONE);
-    break;
-
-  case AF_INET6:
-    s6 = vaddr;
-    t6 = GNUNET_new (struct IPv6TcpAddress);
-    t6->options = htonl (TCP_OPTIONS_NONE);
-    t6->t6_port = s6->sin6_port;
-    GNUNET_memcpy (&t6->ipv6_addr, &s6->sin6_addr, sizeof(struct in6_addr));
-    session->address =
-      GNUNET_HELLO_address_allocate (&tcp_nat_probe->clientIdentity,
-                                     PLUGIN_NAME,
-                                     &t6,
-                                     sizeof(struct IPv6TcpAddress),
-                                     GNUNET_HELLO_ADDRESS_INFO_NONE);
-    break;
-
-  default:
-    GNUNET_break_op (0);
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "Bad address for incoming connection!\n");
-    GNUNET_free (vaddr);
-    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-    tcp_plugin_disconnect_session (plugin, session);
-    return;
-  }
-  GNUNET_free (vaddr);
-  GNUNET_break (NULL == session->client);
-  session->client = client;
-  GNUNET_STATISTICS_update (plugin->env->stats,
-                            gettext_noop ("# TCP sessions active"),
-                            1,
-                            GNUNET_NO);
-  process_pending_messages (session);
-  GNUNET_SERVER_receive_done (client, GNUNET_OK);
-}
-
-
-/**
- * We've received a welcome from this peer via TCP.  Possibly create a
- * fresh client record and send back our welcome.
- *
- * @param cls closure
- * @param client identification of the client
- * @param message the actual message
- */
-static void
-handle_tcp_welcome (void *cls,
-                    struct GNUNET_SERVER_Client *client,
-                    const struct GNUNET_MessageHeader *message)
-{
-  struct Plugin *plugin = cls;
-  const struct WelcomeMessage *wm = (const struct WelcomeMessage *) message;
-  struct GNUNET_HELLO_Address *address;
-  struct GNUNET_ATS_Session *session;
-  size_t alen;
-  void *vaddr;
-  struct IPv4TcpAddress t4;
-  struct IPv6TcpAddress t6;
-  const struct sockaddr_in *s4;
-  const struct sockaddr_in6 *s6;
-
-  if (0 == memcmp (&wm->clientIdentity,
-                   plugin->env->my_identity,
-                   sizeof(struct GNUNET_PeerIdentity)))
-  {
-    /* refuse connections from ourselves */
-    if (GNUNET_OK == GNUNET_SERVER_client_get_address (client, &vaddr, &alen))
-    {
-      LOG (GNUNET_ERROR_TYPE_INFO,
-           "Received WELCOME message from my own identity `%s' on address `%s'\n",
-           GNUNET_i2s (&wm->clientIdentity),
-           GNUNET_a2s (vaddr, alen));
-      GNUNET_free (vaddr);
-    }
-    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-    return;
-  }
-
-  if (GNUNET_OK == GNUNET_SERVER_client_get_address (client, &vaddr, &alen))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Received WELCOME message from `%s' on address `%s'\n",
-         GNUNET_i2s (&wm->clientIdentity),
-         GNUNET_a2s (vaddr, alen));
-    GNUNET_free (vaddr);
-  }
-  GNUNET_STATISTICS_update (plugin->env->stats,
-                            gettext_noop ("# TCP WELCOME messages received"),
-                            1,
-                            GNUNET_NO);
-  session = lookup_session_by_client (plugin, client);
-  if (NULL != session)
-  {
-    if (GNUNET_OK == GNUNET_SERVER_client_get_address (client, &vaddr, &alen))
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Found existing session %p for peer `%s'\n",
-           session,
-           GNUNET_a2s (vaddr, alen));
-      GNUNET_free (vaddr);
-    }
-  }
-  else
-  {
-    if (GNUNET_OK == GNUNET_SERVER_client_get_address (client, &vaddr, &alen))
-    {
-      if (alen == sizeof(struct sockaddr_in))
-      {
-        s4 = vaddr;
-        memset (&t4, '\0', sizeof(t4));
-        t4.options = htonl (TCP_OPTIONS_NONE);
-        t4.t4_port = s4->sin_port;
-        t4.ipv4_addr = s4->sin_addr.s_addr;
-        address =
-          GNUNET_HELLO_address_allocate (&wm->clientIdentity,
-                                         PLUGIN_NAME,
-                                         &t4,
-                                         sizeof(t4),
-                                         GNUNET_HELLO_ADDRESS_INFO_INBOUND);
-      }
-      else if (alen == sizeof(struct sockaddr_in6))
-      {
-        s6 = vaddr;
-        memset (&t6, '\0', sizeof(t6));
-        t6.options = htonl (TCP_OPTIONS_NONE);
-        t6.t6_port = s6->sin6_port;
-        GNUNET_memcpy (&t6.ipv6_addr, &s6->sin6_addr, sizeof(struct in6_addr));
-        address =
-          GNUNET_HELLO_address_allocate (&wm->clientIdentity,
-                                         PLUGIN_NAME,
-                                         &t6,
-                                         sizeof(t6),
-                                         GNUNET_HELLO_ADDRESS_INFO_INBOUND);
-      }
-      else
-      {
-        GNUNET_break (0);
-        GNUNET_free (vaddr);
-        GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-        return;
-      }
-      session = create_session (plugin,
-                                address,
-                                plugin->env->get_address_type (plugin->env->cls,
-                                                               vaddr,
-                                                               alen),
-                                client,
-                                GNUNET_NO);
-      GNUNET_break (GNUNET_NT_UNSPECIFIED != session->scope);
-      GNUNET_HELLO_address_free (address);
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Creating new%s session %p for peer `%s' client %p\n",
-           GNUNET_HELLO_address_check_option (session->address,
-                                              GNUNET_HELLO_ADDRESS_INFO_INBOUND)
-           ? " inbound"
-           : "",
-           session,
-           tcp_plugin_address_to_string (plugin,
-                                         session->address->address,
-                                         session->address->address_length),
-           client);
-      GNUNET_free (vaddr);
-      (void) GNUNET_CONTAINER_multipeermap_put (
-        plugin->sessionmap,
-        &session->target,
-        session,
-        GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-      /* Notify transport and ATS about new session */
-      plugin->env->session_start (plugin->env->cls,
-                                  session->address,
-                                  session,
-                                  session->scope);
-    }
-    else
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Did not obtain TCP socket address for incoming connection\n");
-      GNUNET_break (0);
-      GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-      return;
-    }
-  }
-
-  if (GNUNET_YES != session->expecting_welcome)
-  {
-    GNUNET_break_op (0);
-    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-    return;
-  }
-  session->last_activity = GNUNET_TIME_absolute_get ();
-  session->expecting_welcome = GNUNET_NO;
-
-  process_pending_messages (session);
-  GNUNET_SERVER_client_set_timeout (client,
-                                    GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
-  GNUNET_SERVER_receive_done (client, GNUNET_OK);
-}
-
-
-/**
- * We've received data for this peer via TCP.  Unbox,
- * compute latency and forward.
- *
- * @param cls closure
- * @param client identification of the client
- * @param message the actual message
- */
-static void
-handle_tcp_data (void *cls,
-                 struct GNUNET_SERVER_Client *client,
-                 const struct GNUNET_MessageHeader *message)
-{
-  struct Plugin *plugin = cls;
-  struct GNUNET_ATS_Session *session;
-  struct GNUNET_TIME_Relative delay;
-  uint16_t type;
-
-  type = ntohs (message->type);
-  if ((GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME == type) ||
-      (GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_NAT_PROBE == type))
-  {
-    /* We don't want to propagate WELCOME and NAT Probe messages up! */
-    GNUNET_SERVER_receive_done (client, GNUNET_OK);
-    return;
-  }
-  session = lookup_session_by_client (plugin, client);
-  if (NULL == session)
-  {
-    /* No inbound session found */
-    void *vaddr = NULL;
-    size_t alen;
-
-    GNUNET_assert (GNUNET_OK ==
-                   GNUNET_SERVER_client_get_address (client, &vaddr, &alen));
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Received unexpected %u bytes of type %u from `%s'\n",
-         (unsigned int) ntohs (message->size),
-         (unsigned int) ntohs (message->type),
-         GNUNET_a2s (vaddr, alen));
-    GNUNET_break_op (0);
-    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-    GNUNET_free (vaddr);
-    return;
-  }
-  if (GNUNET_YES == session->expecting_welcome)
-  {
-    /* Session is expecting WELCOME message */
-    void *vaddr = NULL;
-    size_t alen;
-
-    GNUNET_SERVER_client_get_address (client, &vaddr, &alen);
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Received unexpected %u bytes of type %u from `%s'\n",
-         (unsigned int) ntohs (message->size),
-         (unsigned int) ntohs (message->type),
-         GNUNET_a2s (vaddr, alen));
-    GNUNET_break_op (0);
-    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-    GNUNET_free (vaddr);
-    return;
-  }
-
-  session->last_activity = GNUNET_TIME_absolute_get ();
-  {
-    void *vaddr = NULL;
-    size_t alen;
-
-    GNUNET_SERVER_client_get_address (client, &vaddr, &alen);
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Passing %u bytes of type %u from `%s' at %s to transport service.\n",
-         (unsigned int) ntohs (message->size),
-         (unsigned int) ntohs (message->type),
-         GNUNET_i2s (&session->target),
-         GNUNET_a2s (vaddr, alen));
-    GNUNET_free (vaddr);
-  }
-
-  GNUNET_STATISTICS_update (plugin->env->stats,
-                            gettext_noop ("# bytes received via TCP"),
-                            ntohs (message->size),
-                            GNUNET_NO);
-
-  GNUNET_assert (
-    GNUNET_CONTAINER_multipeermap_contains_value (plugin->sessionmap,
-                                                  &session->target,
-                                                  session));
-  delay =
-    plugin->env->receive (plugin->env->cls, session->address, session, message);
-  reschedule_session_timeout (session);
-  if (0 == delay.rel_value_us)
-  {
-    GNUNET_SERVER_receive_done (client, GNUNET_OK);
-  }
-  else
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Throttling receiving from `%s' for %s\n",
-         GNUNET_i2s (&session->target),
-         GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES));
-    GNUNET_SERVER_disable_receive_done_warning (client);
-    GNUNET_assert (NULL == session->receive_delay_task);
-    session->receive_delay_task =
-      GNUNET_SCHEDULER_add_delayed (delay, &delayed_done, session);
-  }
-}
-
-
-/**
- * Function called whenever a peer is connected on the "SERVER" level.
- * Increments number of active connections and suspends server if we
- * have reached the limit.
- *
- * @param cls closure
- * @param client identification of the client
- */
-static void
-connect_notify (void *cls, struct GNUNET_SERVER_Client *client)
-{
-  struct Plugin *plugin = cls;
-
-  if (NULL == client)
-    return;
-  plugin->cur_connections++;
-  GNUNET_STATISTICS_set (plugin->env->stats,
-                         gettext_noop ("# TCP server connections active"),
-                         plugin->cur_connections,
-                         GNUNET_NO);
-  GNUNET_STATISTICS_update (plugin->env->stats,
-                            gettext_noop ("# TCP server connect events"),
-                            1,
-                            GNUNET_NO);
-  if (plugin->cur_connections != plugin->max_connections)
-    return;
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-              _ ("TCP connection limit reached, suspending server\n"));
-  GNUNET_STATISTICS_update (plugin->env->stats,
-                            gettext_noop ("# TCP service suspended"),
-                            1,
-                            GNUNET_NO);
-  GNUNET_SERVER_suspend (
-    plugin->server); /* Maximum number of connections rechead */
-}
-
-
-/**
- * Function called whenever a peer is disconnected on the "SERVER"
- * level.  Cleans up the connection, decrements number of active
- * connections and if applicable resumes listening.
- *
- * @param cls closure
- * @param client identification of the client
- */
-static void
-disconnect_notify (void *cls, struct GNUNET_SERVER_Client *client)
-{
-  struct Plugin *plugin = cls;
-  struct GNUNET_ATS_Session *session;
-
-  if (NULL == client)
-    return;
-  GNUNET_assert (plugin->cur_connections >= 1);
-  plugin->cur_connections--;
-  session = lookup_session_by_client (plugin, client);
-  if (NULL == session)
-    return; /* unknown, nothing to do */
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Destroying session of `%s' with %s due to network-level disconnect.\n",
-       GNUNET_i2s (&session->target),
-       tcp_plugin_address_to_string (session->plugin,
-                                     session->address->address,
-                                     session->address->address_length));
-
-  if (plugin->cur_connections == plugin->max_connections)
-  {
-    GNUNET_STATISTICS_update (session->plugin->env->stats,
-                              gettext_noop ("# TCP service resumed"),
-                              1,
-                              GNUNET_NO);
-    GNUNET_SERVER_resume (plugin->server);  /* Resume server  */
-  }
-  GNUNET_STATISTICS_set (plugin->env->stats,
-                         gettext_noop ("# TCP server connections active"),
-                         plugin->cur_connections,
-                         GNUNET_NO);
-  GNUNET_STATISTICS_update (session->plugin->env->stats,
-                            gettext_noop (
-                              "# network-level TCP disconnect events"),
-                            1,
-                            GNUNET_NO);
-  tcp_plugin_disconnect_session (plugin, session);
-}
-
-
-/**
- * We can now send a probe message, copy into buffer to really send.
- *
- * @param cls closure, a `struct TCPProbeContext`
- * @param size max size to copy
- * @param buf buffer to copy message to
- * @return number of bytes copied into @a buf
- */
-static size_t
-notify_send_probe (void *cls, size_t size, void *buf)
-{
-  struct TCPProbeContext *tcp_probe_ctx = cls;
-  struct Plugin *plugin = tcp_probe_ctx->plugin;
-  size_t ret;
-
-  tcp_probe_ctx->transmit_handle = NULL;
-  GNUNET_CONTAINER_DLL_remove (plugin->probe_head,
-                               plugin->probe_tail,
-                               tcp_probe_ctx);
-  if (NULL == buf)
-  {
-    GNUNET_CONNECTION_destroy (tcp_probe_ctx->sock);
-    GNUNET_free (tcp_probe_ctx);
-    return 0;
-  }
-  GNUNET_assert (size >= sizeof(tcp_probe_ctx->message));
-  GNUNET_memcpy (buf, &tcp_probe_ctx->message, sizeof(tcp_probe_ctx->message));
-  GNUNET_SERVER_connect_socket (tcp_probe_ctx->plugin->server,
-                                tcp_probe_ctx->sock);
-  ret = sizeof(tcp_probe_ctx->message);
-  GNUNET_free (tcp_probe_ctx);
-  return ret;
-}
-
-
-/**
- * Function called by the NAT subsystem suggesting another peer wants
- * to connect to us via connection reversal.  Try to connect back to the
- * given IP.
- *
- * @param cls closure
- * @param addr address to try
- * @param addrlen number of bytes in @a addr
- */
-static void
-try_connection_reversal (void *cls,
-                         const struct sockaddr *addr,
-                         socklen_t addrlen)
-{
-  struct Plugin *plugin = cls;
-  struct GNUNET_CONNECTION_Handle *sock;
-  struct TCPProbeContext *tcp_probe_ctx;
-
-  /**
-   * We have received an ICMP response, ostensibly from a peer
-   * that wants to connect to us! Send a message to establish a connection.
-   */
-  sock = GNUNET_CONNECTION_create_from_sockaddr (AF_INET, addr, addrlen);
-  if (NULL == sock)
-  {
-    /* failed for some odd reason (out of sockets?); ignore attempt */
-    return;
-  }
-
-  tcp_probe_ctx = GNUNET_new (struct TCPProbeContext);
-  tcp_probe_ctx->message.header.size =
-    htons (sizeof(struct TCP_NAT_ProbeMessage));
-  tcp_probe_ctx->message.header.type =
-    htons (GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_NAT_PROBE);
-  tcp_probe_ctx->message.clientIdentity = *plugin->env->my_identity;
-  tcp_probe_ctx->plugin = plugin;
-  tcp_probe_ctx->sock = sock;
-  GNUNET_CONTAINER_DLL_insert (plugin->probe_head,
-                               plugin->probe_tail,
-                               tcp_probe_ctx);
-  tcp_probe_ctx->transmit_handle =
-    GNUNET_CONNECTION_notify_transmit_ready (sock,
-                                             ntohs (tcp_probe_ctx->message
-                                                    .header.size),
-                                             GNUNET_TIME_UNIT_FOREVER_REL,
-                                             &notify_send_probe,
-                                             tcp_probe_ctx);
-}
-
-
-/**
- * Function obtain the network type for a session
- *
- * @param cls closure (`struct Plugin *`)
- * @param session the session
- * @return the network type in HBO or #GNUNET_SYSERR
- */
-static enum GNUNET_NetworkType
-tcp_plugin_get_network (void *cls, struct GNUNET_ATS_Session *session)
-{
-  return session->scope;
-}
-
-
-/**
- * Function obtain the network type for an address.
- *
- * @param cls closure (`struct Plugin *`)
- * @param address the address
- * @return the network type
- */
-static enum GNUNET_NetworkType
-tcp_plugin_get_network_for_address (void *cls,
-                                    const struct GNUNET_HELLO_Address *address)
-{
-  struct Plugin *plugin = cls;
-  size_t addrlen;
-  struct sockaddr_in a4;
-  struct sockaddr_in6 a6;
-  const struct IPv4TcpAddress *t4;
-  const struct IPv6TcpAddress *t6;
-  const void *sb;
-  size_t sbs;
-
-  addrlen = address->address_length;
-  if (addrlen == sizeof(struct IPv6TcpAddress))
-  {
-    GNUNET_assert (NULL != address->address);  /* make static analysis happy */
-    t6 = address->address;
-    memset (&a6, 0, sizeof(a6));
-#if HAVE_SOCKADDR_IN_SIN_LEN
-    a6.sin6_len = sizeof(a6);
-#endif
-    a6.sin6_family = AF_INET6;
-    a6.sin6_port = t6->t6_port;
-    GNUNET_memcpy (&a6.sin6_addr, &t6->ipv6_addr, sizeof(struct in6_addr));
-    sb = &a6;
-    sbs = sizeof(a6);
-  }
-  else if (addrlen == sizeof(struct IPv4TcpAddress))
-  {
-    GNUNET_assert (NULL != address->address);  /* make static analysis happy */
-    t4 = address->address;
-    memset (&a4, 0, sizeof(a4));
-#if HAVE_SOCKADDR_IN_SIN_LEN
-    a4.sin_len = sizeof(a4);
-#endif
-    a4.sin_family = AF_INET;
-    a4.sin_port = t4->t4_port;
-    a4.sin_addr.s_addr = t4->ipv4_addr;
-    sb = &a4;
-    sbs = sizeof(a4);
-  }
-  else
-  {
-    GNUNET_break (0);
-    return GNUNET_NT_UNSPECIFIED;
-  }
-  return plugin->env->get_address_type (plugin->env->cls, sb, sbs);
-}
-
-
-/**
- * Return information about the given session to the
- * monitor callback.
- *
- * @param cls the `struct Plugin` with the monitor callback (`sic`)
- * @param peer peer we send information about
- * @param value our `struct GNUNET_ATS_Session` to send information about
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-send_session_info_iter (void *cls,
-                        const struct GNUNET_PeerIdentity *peer,
-                        void *value)
-{
-  struct Plugin *plugin = cls;
-  struct GNUNET_ATS_Session *session = value;
-
-  notify_session_monitor (plugin, session, GNUNET_TRANSPORT_SS_INIT);
-  /* FIXME: cannot tell if this is up or not from current
-     session state... */
-  notify_session_monitor (plugin, session, GNUNET_TRANSPORT_SS_UP);
-  return GNUNET_OK;
-}
-
-
-/**
- * Begin monitoring sessions of a plugin.  There can only
- * be one active monitor per plugin (i.e. if there are
- * multiple monitors, the transport service needs to
- * multiplex the generated events over all of them).
- *
- * @param cls closure of the plugin
- * @param sic callback to invoke, NULL to disable monitor;
- *            plugin will being by iterating over all active
- *            sessions immediately and then enter monitor mode
- * @param sic_cls closure for @a sic
- */
-static void
-tcp_plugin_setup_monitor (void *cls,
-                          GNUNET_TRANSPORT_SessionInfoCallback sic,
-                          void *sic_cls)
-{
-  struct Plugin *plugin = cls;
-
-  plugin->sic = sic;
-  plugin->sic_cls = sic_cls;
-  if (NULL != sic)
-  {
-    GNUNET_CONTAINER_multipeermap_iterate (plugin->sessionmap,
-                                           &send_session_info_iter,
-                                           plugin);
-    /* signal end of first iteration */
-    sic (sic_cls, NULL, NULL);
-  }
-}
-
-
-/**
- * Entry point for the plugin.
- *
- * @param cls closure, the `struct GNUNET_TRANSPORT_PluginEnvironment *`
- * @return the `struct GNUNET_TRANSPORT_PluginFunctions *` or NULL on error
- */
-void *
-libgnunet_plugin_transport_tcp_init (void *cls)
-{
-  static const struct GNUNET_SERVER_MessageHandler my_handlers[] =
-  { { &handle_tcp_welcome,
-      NULL,
-      GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME,
-      sizeof(struct WelcomeMessage) },
-    { &handle_tcp_nat_probe,
-      NULL,
-      GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_NAT_PROBE,
-      sizeof(struct TCP_NAT_ProbeMessage) },
-    { &handle_tcp_data, NULL, GNUNET_MESSAGE_TYPE_ALL, 0 },
-    { NULL, NULL, 0, 0 } };
-  struct GNUNET_TRANSPORT_PluginEnvironment *env = cls;
-  struct GNUNET_TRANSPORT_PluginFunctions *api;
-  struct Plugin *plugin;
-  struct LEGACY_SERVICE_Context *service;
-  unsigned long long aport;
-  unsigned long long bport;
-  unsigned long long max_connections;
-  unsigned int i;
-  struct GNUNET_TIME_Relative idle_timeout;
-
-#ifdef TCP_STEALTH
-  struct GNUNET_NETWORK_Handle *const *lsocks;
-#endif
-  int ret;
-  int ret_s;
-  struct sockaddr **addrs;
-  socklen_t *addrlens;
-
-  if (NULL == env->receive)
-  {
-    /* run in 'stub' mode (i.e. as part of gnunet-peerinfo), don't fully
-       initialize the plugin or the API */
-    api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
-    api->cls = NULL;
-    api->address_pretty_printer = &tcp_plugin_address_pretty_printer;
-    api->address_to_string = &tcp_plugin_address_to_string;
-    api->string_to_address = &tcp_plugin_string_to_address;
-    return api;
-  }
-
-  GNUNET_assert (NULL != env->cfg);
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (env->cfg,
-                                                          "transport-tcp",
-                                                          "MAX_CONNECTIONS",
-                                                          &max_connections))
-    max_connections = 128;
-
-  aport = 0;
-  if ((GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (env->cfg,
-                                                           "transport-tcp",
-                                                           "PORT",
-                                                           &bport)) ||
-      (bport > 65535) ||
-      ((GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (env->cfg,
-                                                            "transport-tcp",
-                                                            "ADVERTISED-PORT",
-                                                            &aport)) &&
-       (aport > 65535)))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         _ ("Require valid port number for service `%s' in configuration!\n"),
-         "transport-tcp");
-    return NULL;
-  }
-  if (0 == aport)
-    aport = bport;
-  if (0 == bport)
-    aport = 0;
-  if (0 != bport)
-  {
-    service = LEGACY_SERVICE_start ("transport-tcp",
-                                    env->cfg,
-                                    LEGACY_SERVICE_OPTION_NONE);
-    if (NULL == service)
-    {
-      LOG (GNUNET_ERROR_TYPE_WARNING, _ ("Failed to start service.\n"));
-      return NULL;
-    }
-  }
-  else
-    service = NULL;
-
-  api = NULL;
-  plugin = GNUNET_new (struct Plugin);
-  plugin->sessionmap =
-    GNUNET_CONTAINER_multipeermap_create (max_connections, GNUNET_YES);
-  plugin->max_connections = max_connections;
-  plugin->open_port = bport;
-  plugin->adv_port = aport;
-  plugin->env = env;
-  plugin->my_welcome.header.size = htons (sizeof(struct WelcomeMessage));
-  plugin->my_welcome.header.type =
-    htons (GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME);
-  plugin->my_welcome.clientIdentity = *plugin->env->my_identity;
-
-  if ((NULL != service) &&
-      (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
-                                                           "transport-tcp",
-                                                           "TCP_STEALTH")))
-  {
-#ifdef TCP_STEALTH
-    plugin->myoptions |= TCP_OPTIONS_TCP_STEALTH;
-    lsocks = LEGACY_SERVICE_get_listen_sockets (service);
-    if (NULL != lsocks)
-    {
-      uint32_t len = sizeof(struct WelcomeMessage);
-
-      for (i = 0; NULL != lsocks[i]; i++)
-      {
-        if (
-          (GNUNET_OK !=
-           GNUNET_NETWORK_socket_setsockopt (lsocks[i],
-                                             IPPROTO_TCP,
-                                             TCP_STEALTH,
-                                             env->my_identity,
-                                             sizeof(
-                                               struct GNUNET_PeerIdentity))) ||
-          (GNUNET_OK !=
-           GNUNET_NETWORK_socket_setsockopt (lsocks[i],
-                                             IPPROTO_TCP,
-                                             TCP_STEALTH_INTEGRITY_LEN,
-                                             &len,
-                                             sizeof(len))))
-        {
-          /* TCP STEALTH not supported by kernel */
-          GNUNET_assert (0 == i);
-          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                      _ ("TCP_STEALTH not supported on this platform.\n"));
-          goto die;
-        }
-      }
-    }
-#else
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _ ("TCP_STEALTH not supported on this platform.\n"));
-    goto die;
-#endif
-  }
-
-  if ((NULL != service) &&
-      (GNUNET_SYSERR !=
-       (ret_s =
-          get_server_addresses ("transport-tcp", env->cfg, &addrs, &addrlens))))
-  {
-    for (ret = ret_s - 1; ret >= 0; ret--)
-      LOG (GNUNET_ERROR_TYPE_INFO,
-           "Binding to address `%s'\n",
-           GNUNET_a2s (addrs[ret], addrlens[ret]));
-    plugin->nat = GNUNET_NAT_register (env->cfg,
-                                       "transport-tcp",
-                                       IPPROTO_TCP,
-                                       (unsigned int) ret_s,
-                                       (const struct sockaddr **) addrs,
-                                       addrlens,
-                                       &tcp_nat_port_map_callback,
-                                       &try_connection_reversal,
-                                       plugin);
-    for (ret = ret_s - 1; ret >= 0; ret--)
-      GNUNET_free (addrs[ret]);
-    GNUNET_free (addrs);
-    GNUNET_free (addrlens);
-  }
-  else
-  {
-    plugin->nat = GNUNET_NAT_register (plugin->env->cfg,
-                                       "transport-tcp",
-                                       IPPROTO_TCP,
-                                       0,
-                                       NULL,
-                                       NULL,
-                                       NULL,
-                                       &try_connection_reversal,
-                                       plugin);
-  }
-  api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
-  api->cls = plugin;
-  api->send = &tcp_plugin_send;
-  api->get_session = &tcp_plugin_get_session;
-  api->disconnect_session = &tcp_plugin_disconnect_session;
-  api->query_keepalive_factor = &tcp_plugin_query_keepalive_factor;
-  api->disconnect_peer = &tcp_plugin_disconnect;
-  api->address_pretty_printer = &tcp_plugin_address_pretty_printer;
-  api->check_address = &tcp_plugin_check_address;
-  api->address_to_string = &tcp_plugin_address_to_string;
-  api->string_to_address = &tcp_plugin_string_to_address;
-  api->get_network = &tcp_plugin_get_network;
-  api->get_network_for_address = &tcp_plugin_get_network_for_address;
-  api->update_session_timeout = &tcp_plugin_update_session_timeout;
-  api->update_inbound_delay = &tcp_plugin_update_inbound_delay;
-  api->setup_monitor = &tcp_plugin_setup_monitor;
-  plugin->service = service;
-  if (NULL != service)
-  {
-    plugin->server = LEGACY_SERVICE_get_server (service);
-  }
-  else
-  {
-    if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_time (env->cfg,
-                                                          "transport-tcp",
-                                                          "TIMEOUT",
-                                                          &idle_timeout))
-    {
-      GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                                 "transport-tcp",
-                                 "TIMEOUT");
-      goto die;
-    }
-    plugin->server = GNUNET_SERVER_create_with_sockets (NULL,
-                                                        plugin,
-                                                        NULL,
-                                                        idle_timeout,
-                                                        GNUNET_YES);
-  }
-  plugin->handlers = GNUNET_malloc (sizeof(my_handlers));
-  GNUNET_memcpy (plugin->handlers, my_handlers, sizeof(my_handlers));
-  for (i = 0;
-       i < sizeof(my_handlers) / sizeof(struct GNUNET_SERVER_MessageHandler);
-       i++)
-    plugin->handlers[i].callback_cls = plugin;
-
-  GNUNET_SERVER_add_handlers (plugin->server, plugin->handlers);
-  GNUNET_SERVER_connect_notify (plugin->server, &connect_notify, plugin);
-  GNUNET_SERVER_disconnect_notify (plugin->server, &disconnect_notify, plugin);
-  plugin->nat_wait_conns =
-    GNUNET_CONTAINER_multipeermap_create (16, GNUNET_YES);
-  if (0 != bport)
-    LOG (GNUNET_ERROR_TYPE_INFO,
-         _ ("TCP transport listening on port %llu\n"),
-         bport);
-  else
-    LOG (GNUNET_ERROR_TYPE_INFO,
-         _ ("TCP transport not listening on any port (client only)\n"));
-  if ((aport != bport) && (0 != bport))
-    LOG (GNUNET_ERROR_TYPE_INFO,
-         _ ("TCP transport advertises itself as being on port %llu\n"),
-         aport);
-  /* Initially set connections to 0 */
-  GNUNET_STATISTICS_set (plugin->env->stats,
-                         gettext_noop ("# TCP sessions active"),
-                         0,
-                         GNUNET_NO);
-  return api;
-
-die:
-  if (NULL != plugin->nat)
-    GNUNET_NAT_unregister (plugin->nat);
-  GNUNET_CONTAINER_multipeermap_destroy (plugin->sessionmap);
-  if (NULL != service)
-    LEGACY_SERVICE_stop (service);
-  GNUNET_free (plugin);
-  GNUNET_free (api);
-  return NULL;
-}
-
-
-/**
- * Exit point from the plugin.
- *
- * @param cls the `struct GNUNET_TRANSPORT_PluginFunctions`
- * @return NULL
- */
-void *
-libgnunet_plugin_transport_tcp_done (void *cls)
-{
-  struct GNUNET_TRANSPORT_PluginFunctions *api = cls;
-  struct Plugin *plugin = api->cls;
-  struct TCPProbeContext *tcp_probe;
-  struct PrettyPrinterContext *cur;
-  struct PrettyPrinterContext *next;
-
-  if (NULL == plugin)
-  {
-    GNUNET_free (api);
-    return NULL;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Shutting down TCP plugin\n");
-
-  /* Removing leftover sessions */
-  GNUNET_CONTAINER_multipeermap_iterate (plugin->sessionmap,
-                                         &session_disconnect_it,
-                                         plugin);
-  /* Removing leftover NAT sessions */
-  GNUNET_CONTAINER_multipeermap_iterate (plugin->nat_wait_conns,
-                                         &session_disconnect_it,
-                                         plugin);
-
-  for (cur = plugin->ppc_dll_head; NULL != cur; cur = next)
-  {
-    next = cur->next;
-    GNUNET_CONTAINER_DLL_remove (plugin->ppc_dll_head,
-                                 plugin->ppc_dll_tail,
-                                 cur);
-    GNUNET_RESOLVER_request_cancel (cur->resolver_handle);
-    cur->asc (cur->asc_cls, NULL, GNUNET_OK);
-    GNUNET_free (cur);
-  }
-
-  if (NULL != plugin->service)
-    LEGACY_SERVICE_stop (plugin->service);
-  else
-    GNUNET_SERVER_destroy (plugin->server);
-  GNUNET_free (plugin->handlers);
-  if (NULL != plugin->nat)
-    GNUNET_NAT_unregister (plugin->nat);
-  while (NULL != (tcp_probe = plugin->probe_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (plugin->probe_head,
-                                 plugin->probe_tail,
-                                 tcp_probe);
-    GNUNET_CONNECTION_destroy (tcp_probe->sock);
-    GNUNET_free (tcp_probe);
-  }
-  GNUNET_CONTAINER_multipeermap_destroy (plugin->nat_wait_conns);
-  GNUNET_CONTAINER_multipeermap_destroy (plugin->sessionmap);
-  GNUNET_break (0 == plugin->cur_connections);
-  GNUNET_free (plugin);
-  GNUNET_free (api);
-  return NULL;
-}
-
-
-/* end of plugin_transport_tcp.c */
diff --git a/src/transport/plugin_transport_template.c b/src/transport/plugin_transport_template.c
deleted file mode 100644
index c39c72178..000000000
--- a/src/transport/plugin_transport_template.c
+++ /dev/null
@@ -1,565 +0,0 @@
-/*
-     This file is part of GNUnet
-     Copyright (C) 2002-2014 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/plugin_transport_template.c
- * @brief template for a new transport service
- * @author Christian Grothoff
- */
-
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_protocols.h"
-#include "gnunet_statistics_service.h"
-#include "gnunet_transport_service.h"
-#include "gnunet_transport_plugin.h"
-
-#define LOG(kind, ...) GNUNET_log_from (kind, "transport-template", __VA_ARGS__)
-
-/**
- * After how long do we expire an address that we
- * learned from another peer if it is not reconfirmed
- * by anyone?
- */
-#define LEARNED_ADDRESS_EXPIRATION GNUNET_TIME_relative_multiply ( \
-    GNUNET_TIME_UNIT_HOURS, 6)
-
-#define PLUGIN_NAME "template"
-
-/**
- * Encapsulation of all of the state of the plugin.
- */
-struct Plugin;
-
-
-/**
- * Session handle for connections.
- */
-struct GNUNET_ATS_Session
-{
-  /**
-   * To whom are we talking to (set to our identity
-   * if we are still waiting for the welcome message)
-   */
-  struct GNUNET_PeerIdentity sender;
-
-  /**
-   * Stored in a linked list (or a peer map, or ...)
-   */
-  struct GNUNET_ATS_Session *next;
-
-  /**
-   * Pointer to the global plugin struct.
-   */
-  struct Plugin *plugin;
-
-  /**
-   * The client (used to identify this connection)
-   */
-  /* void *client; */
-
-  /**
-   * Continuation function to call once the transmission buffer
-   * has again space available.  NULL if there is no
-   * continuation to call.
-   */
-  GNUNET_TRANSPORT_TransmitContinuation transmit_cont;
-
-  /**
-   * Closure for @e transmit_cont.
-   */
-  void *transmit_cont_cls;
-
-  /**
-   * At what time did we reset @e last_received last?
-   */
-  struct GNUNET_TIME_Absolute last_quota_update;
-
-  /**
-   * How many bytes have we received since the @e last_quota_update
-   * timestamp?
-   */
-  uint64_t last_received;
-
-  /**
-   * Number of bytes per ms that this peer is allowed
-   * to send to us.
-   */
-  uint32_t quota;
-};
-
-GNUNET_NETWORK_STRUCT_BEGIN
-
-struct TemplateAddress
-{
-  /**
-   * Address options in NBO
-   */
-  uint32_t options GNUNET_PACKED;
-
-  /* Add address here */
-};
-
-GNUNET_NETWORK_STRUCT_END
-
-/**
- * Encapsulation of all of the state of the plugin.
- */
-struct Plugin
-{
-  /**
-   * Our environment.
-   */
-  struct GNUNET_TRANSPORT_PluginEnvironment *env;
-
-  /**
-   * List of open sessions (or peer map, or...)
-   */
-  struct GNUNET_ATS_Session *sessions;
-
-  /**
-   * Function to call about session status changes.
-   */
-  GNUNET_TRANSPORT_SessionInfoCallback sic;
-
-  /**
-   * Closure for @e sic.
-   */
-  void *sic_cls;
-
-  /**
-   * Options in HBO to be used with addresses
-   */
-};
-
-
-#if 0
-/**
- * If a session monitor is attached, notify it about the new
- * session state.
- *
- * @param plugin our plugin
- * @param session session that changed state
- * @param state new state of the session
- */
-static void
-notify_session_monitor (struct Plugin *plugin,
-                        struct GNUNET_ATS_Session *session,
-                        enum GNUNET_TRANSPORT_SessionState state)
-{
-  struct GNUNET_TRANSPORT_SessionInfo info;
-
-  if (NULL == plugin->sic)
-    return;
-  memset (&info, 0, sizeof(info));
-  info.state = state;
-  info.is_inbound = GNUNET_SYSERR; /* FIXME */
-  // info.num_msg_pending =
-  // info.num_bytes_pending =
-  // info.receive_delay =
-  // info.session_timeout = session->timeout;
-  // info.address = session->address;
-  plugin->sic (plugin->sic_cls,
-               session,
-               &info);
-}
-
-
-#endif
-
-
-/**
- * Function that can be used by the transport service to transmit
- * a message using the plugin.   Note that in the case of a
- * peer disconnecting, the continuation MUST be called
- * prior to the disconnect notification itself.  This function
- * will be called with this peer's HELLO message to initiate
- * a fresh connection to another peer.
- *
- * @param cls closure
- * @param session which session must be used
- * @param msgbuf the message to transmit
- * @param msgbuf_size number of bytes in @a msgbuf
- * @param priority how important is the message (most plugins will
- *                 ignore message priority and just FIFO)
- * @param to how long to wait at most for the transmission (does not
- *                require plugins to discard the message after the timeout,
- *                just advisory for the desired delay; most plugins will ignore
- *                this as well)
- * @param cont continuation to call once the message has
- *        been transmitted (or if the transport is ready
- *        for the next transmission call; or if the
- *        peer disconnected...); can be NULL
- * @param cont_cls closure for @a cont
- * @return number of bytes used (on the physical network, with overheads);
- *         -1 on hard errors (i.e. address invalid); 0 is a legal value
- *         and does NOT mean that the message was not transmitted (DV)
- */
-static ssize_t
-template_plugin_send (void *cls,
-                      struct GNUNET_ATS_Session *session,
-                      const char *msgbuf,
-                      size_t msgbuf_size,
-                      unsigned int priority,
-                      struct GNUNET_TIME_Relative to,
-                      GNUNET_TRANSPORT_TransmitContinuation cont,
-                      void *cont_cls)
-{
-  /*  struct Plugin *plugin = cls; */
-  ssize_t bytes_sent = 0;
-
-  return bytes_sent;
-}
-
-
-/**
- * Function that can be used to force the plugin to disconnect
- * from the given peer and cancel all previous transmissions
- * (and their continuationc).
- *
- * @param cls closure
- * @param target peer from which to disconnect
- */
-static void
-template_plugin_disconnect_peer (void *cls,
-                                 const struct GNUNET_PeerIdentity *target)
-{
-  // struct Plugin *plugin = cls;
-  // FIXME
-}
-
-
-/**
- * Function that can be used to force the plugin to disconnect
- * from the given peer and cancel all previous transmissions
- * (and their continuationc).
- *
- * @param cls closure
- * @param session session from which to disconnect
- * @return #GNUNET_OK on success
- */
-static int
-template_plugin_disconnect_session (void *cls,
-                                    struct GNUNET_ATS_Session *session)
-{
-  // struct Plugin *plugin = cls;
-  // FIXME
-  return GNUNET_SYSERR;
-}
-
-
-/**
- * Function that is called to get the keepalive factor.
- * GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT is divided by this number to
- * calculate the interval between keepalive packets.
- *
- * @param cls closure with the `struct Plugin`
- * @return keepalive factor
- */
-static unsigned int
-template_plugin_query_keepalive_factor (void *cls)
-{
-  return 3;
-}
-
-
-/**
- * Function obtain the network type for a session
- *
- * @param cls closure ('struct Plugin*')
- * @param session the session
- * @return the network type in HBO or #GNUNET_SYSERR
- */
-static enum GNUNET_NetworkType
-template_plugin_get_network (void *cls,
-                             struct GNUNET_ATS_Session *session)
-{
-  GNUNET_assert (NULL != session);
-  return GNUNET_NT_UNSPECIFIED; /* Change to correct network type */
-}
-
-
-/**
- * Function obtain the network type for an address.
- *
- * @param cls closure (`struct Plugin *`)
- * @param address the address
- * @return the network type
- */
-static enum GNUNET_NetworkType
-template_plugin_get_network_for_address (void *cls,
-                                         const struct
-                                         GNUNET_HELLO_Address *address)
-{
-  return GNUNET_NT_WAN; /* FOR NOW */
-}
-
-
-/**
- * Convert the transports address to a nice, human-readable
- * format.
- *
- * @param cls closure
- * @param type name of the transport that generated the address
- * @param addr one of the addresses of the host, NULL for the last address
- *        the specific address format depends on the transport
- * @param addrlen length of the address
- * @param numeric should (IP) addresses be displayed in numeric form?
- * @param timeout after how long should we give up?
- * @param asc function to call on each string
- * @param asc_cls closure for @a asc
- */
-static void
-template_plugin_address_pretty_printer (void *cls, const char *type,
-                                        const void *addr, size_t addrlen,
-                                        int numeric,
-                                        struct GNUNET_TIME_Relative timeout,
-                                        GNUNET_TRANSPORT_AddressStringCallback
-                                        asc, void *asc_cls)
-{
-  asc (asc_cls, "converted address", GNUNET_OK);  /* return address */
-  asc (asc_cls, NULL, GNUNET_OK);  /* done */
-}
-
-
-/**
- * Another peer has suggested an address for this
- * peer and transport plugin.  Check that this could be a valid
- * address.  If so, consider adding it to the list
- * of addresses.
- *
- * @param cls closure
- * @param addr pointer to the address
- * @param addrlen length of addr
- * @return #GNUNET_OK if this is a plausible address for this peer
- *         and transport
- */
-static int
-template_plugin_address_suggested (void *cls, const void *addr, size_t addrlen)
-{
-  /* struct Plugin *plugin = cls; */
-
-  /* check if the address is belonging to the plugin*/
-  return GNUNET_OK;
-}
-
-
-/**
- * Function called for a quick conversion of the binary address to
- * a numeric address.  Note that the caller must not free the
- * address and that the next call to this function is allowed
- * to override the address again.
- *
- * @param cls closure
- * @param addr binary address
- * @param addrlen length of the address
- * @return string representing the same address
- */
-static const char *
-template_plugin_address_to_string (void *cls, const void *addr, size_t addrlen)
-{
-  /*
-   * Print address in format template.options.address
-   */
-
-  if (0 == addrlen)
-  {
-    return TRANSPORT_SESSION_INBOUND_STRING;
-  }
-
-  GNUNET_break (0);
-  return NULL;
-}
-
-
-/**
- * Function called to convert a string address to
- * a binary address.
- *
- * @param cls closure ('struct Plugin*')
- * @param addr string address
- * @param addrlen length of the @a addr
- * @param buf location to store the buffer
- * @param added location to store the number of bytes in the buffer.
- *        If the function returns #GNUNET_SYSERR, its contents are undefined.
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
- */
-static int
-template_plugin_string_to_address (void *cls,
-                                   const char *addr,
-                                   uint16_t addrlen,
-                                   void **buf, size_t *added)
-{
-  /*
-   * Parse string in format template.options.address
-   */
-  GNUNET_break (0);
-  return GNUNET_SYSERR;
-}
-
-
-/**
- * Create a new session to transmit data to the target
- * This session will used to send data to this peer and the plugin will
- * notify us by calling the env->session_end function
- *
- * @param cls closure
- * @param address pointer to the GNUNET_HELLO_Address
- * @return the session if the address is valid, NULL otherwise
- */
-static struct GNUNET_ATS_Session *
-template_plugin_get_session (void *cls,
-                             const struct GNUNET_HELLO_Address *address)
-{
-  GNUNET_break (0);
-  return NULL;
-}
-
-
-static void
-template_plugin_update_session_timeout (void *cls,
-                                        const struct GNUNET_PeerIdentity *peer,
-                                        struct GNUNET_ATS_Session *session)
-{
-}
-
-
-#if 0
-/**
- * Return information about the given session to the
- * monitor callback.
- *
- * @param cls the `struct Plugin` with the monitor callback (`sic`)
- * @param peer peer we send information about
- * @param value our `struct GNUNET_ATS_Session` to send information about
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-send_session_info_iter (void *cls,
-                        const struct GNUNET_PeerIdentity *peer,
-                        void *value)
-{
-  struct Plugin *plugin = cls;
-  struct GNUNET_ATS_Session *session = value;
-
-  notify_session_monitor (plugin,
-                          session,
-                          GNUNET_TRANSPORT_SS_UP);
-  return GNUNET_OK;
-}
-
-
-#endif
-
-
-/**
- * Begin monitoring sessions of a plugin.  There can only
- * be one active monitor per plugin (i.e. if there are
- * multiple monitors, the transport service needs to
- * multiplex the generated events over all of them).
- *
- * @param cls closure of the plugin
- * @param sic callback to invoke, NULL to disable monitor;
- *            plugin will being by iterating over all active
- *            sessions immediately and then enter monitor mode
- * @param sic_cls closure for @a sic
- */
-static void
-template_plugin_setup_monitor (void *cls,
-                               GNUNET_TRANSPORT_SessionInfoCallback sic,
-                               void *sic_cls)
-{
-  struct Plugin *plugin = cls;
-
-  plugin->sic = sic;
-  plugin->sic_cls = sic_cls;
-  if (NULL != sic)
-  {
-#if 0
-    GNUNET_CONTAINER_multipeermap_iterate (NULL /* FIXME */,
-                                           &send_session_info_iter,
-                                           plugin);
-#endif
-    /* signal end of first iteration */
-    sic (sic_cls, NULL, NULL);
-  }
-}
-
-
-/**
- * Entry point for the plugin.
- */
-void *
-libgnunet_plugin_transport_template_init (void *cls)
-{
-  struct GNUNET_TRANSPORT_PluginEnvironment *env = cls;
-  struct GNUNET_TRANSPORT_PluginFunctions *api;
-  struct Plugin *plugin;
-
-  if (NULL == env->receive)
-  {
-    /* run in 'stub' mode (i.e. as part of gnunet-peerinfo), don't fully
-       initialize the plugin or the API */
-    api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
-    api->cls = NULL;
-    api->address_to_string = &template_plugin_address_to_string;
-    api->string_to_address = &template_plugin_string_to_address;
-    api->address_pretty_printer = &template_plugin_address_pretty_printer;
-    return api;
-  }
-
-  plugin = GNUNET_new (struct Plugin);
-  plugin->env = env;
-  api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
-  api->cls = plugin;
-  api->send = &template_plugin_send;
-  api->disconnect_peer = &template_plugin_disconnect_peer;
-  api->disconnect_session = &template_plugin_disconnect_session;
-  api->query_keepalive_factor = &template_plugin_query_keepalive_factor;
-  api->address_pretty_printer = &template_plugin_address_pretty_printer;
-  api->check_address = &template_plugin_address_suggested;
-  api->address_to_string = &template_plugin_address_to_string;
-  api->string_to_address = &template_plugin_string_to_address;
-  api->get_session = &template_plugin_get_session;
-  api->get_network = &template_plugin_get_network;
-  api->get_network_for_address = &template_plugin_get_network_for_address;
-  api->update_session_timeout = &template_plugin_update_session_timeout;
-  api->setup_monitor = &template_plugin_setup_monitor;
-  LOG (GNUNET_ERROR_TYPE_INFO, "Template plugin successfully loaded\n");
-  return api;
-}
-
-
-/**
- * Exit point from the plugin.
- */
-void *
-libgnunet_plugin_transport_template_done (void *cls)
-{
-  struct GNUNET_TRANSPORT_PluginFunctions *api = cls;
-  struct Plugin *plugin = api->cls;
-
-  GNUNET_free (plugin);
-  GNUNET_free (api);
-  return NULL;
-}
-
-
-/* end of plugin_transport_template.c */
diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c
deleted file mode 100644
index 2db31caa3..000000000
--- a/src/transport/plugin_transport_udp.c
+++ /dev/null
@@ -1,3897 +0,0 @@
-/*
-   This file is part of GNUnet
-   Copyright (C) 2010-2017 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/plugin_transport_udp.c
- * @brief Implementation of the UDP transport protocol
- * @author Christian Grothoff
- * @author Nathan Evans
- * @author Matthias Wachs
- */
-#include "platform.h"
-#include "plugin_transport_udp.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_fragmentation_lib.h"
-#include "gnunet_nat_service.h"
-#include "gnunet_protocols.h"
-#include "gnunet_resolver_service.h"
-#include "gnunet_signatures.h"
-#include "gnunet_constants.h"
-#include "gnunet_statistics_service.h"
-#include "gnunet_transport_service.h"
-#include "gnunet_transport_plugin.h"
-#include "transport.h"
-
-#define LOG(kind, ...) GNUNET_log_from (kind, "transport-udp", __VA_ARGS__)
-
-/**
- * After how much inactivity should a UDP session time out?
- */
-#define UDP_SESSION_TIME_OUT \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
-
-/**
- * Number of messages we can defragment in parallel.  We only really
- * defragment 1 message at a time, but if messages get re-ordered, we
- * may want to keep knowledge about the previous message to avoid
- * discarding the current message in favor of a single fragment of a
- * previous message.  3 should be good since we don't expect massive
- * message reorderings with UDP.
- */
-#define UDP_MAX_MESSAGES_IN_DEFRAG 3
-
-/**
- * We keep a defragmentation queue per sender address.  How many
- * sender addresses do we support at the same time? Memory consumption
- * is roughly a factor of 32k * #UDP_MAX_MESSAGES_IN_DEFRAG times this
- * value. (So 128 corresponds to 12 MB and should suffice for
- * connecting to roughly 128 peers via UDP).
- */
-#define UDP_MAX_SENDER_ADDRESSES_WITH_DEFRAG 128
-
-
-/**
- * UDP Message-Packet header (after defragmentation).
- */
-struct UDPMessage
-{
-  /**
-   * Message header.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Always zero for now.
-   */
-  uint32_t reserved;
-
-  /**
-   * What is the identity of the sender
-   */
-  struct GNUNET_PeerIdentity sender;
-};
-
-
-/**
- * Closure for #append_port().
- */
-struct PrettyPrinterContext
-{
-  /**
-   * DLL
-   */
-  struct PrettyPrinterContext *next;
-
-  /**
-   * DLL
-   */
-  struct PrettyPrinterContext *prev;
-
-  /**
-   * Our plugin.
-   */
-  struct Plugin *plugin;
-
-  /**
-   * Resolver handle
-   */
-  struct GNUNET_RESOLVER_RequestHandle *resolver_handle;
-
-  /**
-   * Function to call with the result.
-   */
-  GNUNET_TRANSPORT_AddressStringCallback asc;
-
-  /**
-   * Clsoure for @e asc.
-   */
-  void *asc_cls;
-
-  /**
-   * Timeout task
-   */
-  struct GNUNET_SCHEDULER_Task *timeout_task;
-
-  /**
-   * Is this an IPv6 address?
-   */
-  int ipv6;
-
-  /**
-   * Options
-   */
-  uint32_t options;
-
-  /**
-   * Port to add after the IP address.
-   */
-  uint16_t port;
-};
-
-
-/**
- * Session with another peer.
- */
-struct GNUNET_ATS_Session
-{
-  /**
-   * Which peer is this session for?
-   */
-  struct GNUNET_PeerIdentity target;
-
-  /**
-   * Tokenizer for inbound messages.
-   */
-  struct GNUNET_MessageStreamTokenizer *mst;
-
-  /**
-   * Plugin this session belongs to.
-   */
-  struct Plugin *plugin;
-
-  /**
-   * Context for dealing with fragments.
-   */
-  struct UDP_FragmentationContext *frag_ctx;
-
-  /**
-   * Desired delay for next sending we send to other peer
-   */
-  struct GNUNET_TIME_Relative flow_delay_for_other_peer;
-
-  /**
-   * Desired delay for transmissions we received from other peer.
-   * This is for full messages, the value needs to be adjusted for
-   * fragmented messages.
-   */
-  struct GNUNET_TIME_Relative flow_delay_from_other_peer;
-
-  /**
-   * Session timeout task
-   */
-  struct GNUNET_SCHEDULER_Task *timeout_task;
-
-  /**
-   * When does this session time out?
-   */
-  struct GNUNET_TIME_Absolute timeout;
-
-  /**
-   * What time did we last transmit?
-   */
-  struct GNUNET_TIME_Absolute last_transmit_time;
-
-  /**
-   * expected delay for ACKs
-   */
-  struct GNUNET_TIME_Relative last_expected_ack_delay;
-
-  /**
-   * desired delay between UDP messages
-   */
-  struct GNUNET_TIME_Relative last_expected_msg_delay;
-
-  /**
-   * Our own address.
-   */
-  struct GNUNET_HELLO_Address *address;
-
-  /**
-   * Number of bytes waiting for transmission to this peer.
-   */
-  unsigned long long bytes_in_queue;
-
-  /**
-   * Number of messages waiting for transmission to this peer.
-   */
-  unsigned int msgs_in_queue;
-
-  /**
-   * Reference counter to indicate that this session is
-   * currently being used and must not be destroyed;
-   * setting @e in_destroy will destroy it as soon as
-   * possible.
-   */
-  unsigned int rc;
-
-  /**
-   * Network type of the address.
-   */
-  enum GNUNET_NetworkType scope;
-
-  /**
-   * Is this session about to be destroyed (sometimes we cannot
-   * destroy a session immediately as below us on the stack
-   * there might be code that still uses it; in this case,
-   * @e rc is non-zero).
-   */
-  int in_destroy;
-};
-
-
-/**
- * Data structure to track defragmentation contexts based
- * on the source of the UDP traffic.
- */
-struct DefragContext
-{
-  /**
-   * Defragmentation context.
-   */
-  struct GNUNET_DEFRAGMENT_Context *defrag;
-
-  /**
-   * Reference to master plugin struct.
-   */
-  struct Plugin *plugin;
-
-  /**
-   * Node in the defrag heap.
-   */
-  struct GNUNET_CONTAINER_HeapNode *hnode;
-
-  /**
-   * Source address this receive context is for (allocated at the
-   * end of the struct).
-   */
-  const union UdpAddress *udp_addr;
-
-  /**
-   * Who's message(s) are we defragmenting here?
-   * Only initialized once we succeeded and
-   * @e have_sender is set.
-   */
-  struct GNUNET_PeerIdentity sender;
-
-  /**
-   * Length of @e udp_addr.
-   */
-  size_t udp_addr_len;
-
-  /**
-   * Network type the address belongs to.
-   */
-  enum GNUNET_NetworkType network_type;
-
-  /**
-   * Has the @e sender field been initialized yet?
-   */
-  int have_sender;
-};
-
-
-/**
- * Context to send fragmented messages
- */
-struct UDP_FragmentationContext
-{
-  /**
-   * Next in linked list
-   */
-  struct UDP_FragmentationContext *next;
-
-  /**
-   * Previous in linked list
-   */
-  struct UDP_FragmentationContext *prev;
-
-  /**
-   * The plugin
-   */
-  struct Plugin *plugin;
-
-  /**
-   * Handle for fragmentation.
-   */
-  struct GNUNET_FRAGMENT_Context *frag;
-
-  /**
-   * The session this fragmentation context belongs to
-   */
-  struct GNUNET_ATS_Session *session;
-
-  /**
-   * Function to call upon completion of the transmission.
-   */
-  GNUNET_TRANSPORT_TransmitContinuation cont;
-
-  /**
-   * Closure for @e cont.
-   */
-  void *cont_cls;
-
-  /**
-   * Start time.
-   */
-  struct GNUNET_TIME_Absolute start_time;
-
-  /**
-   * Transmission time for the next fragment.  Incremented by
-   * the @e flow_delay_from_other_peer for each fragment when
-   * we setup the fragments.
-   */
-  struct GNUNET_TIME_Absolute next_frag_time;
-
-  /**
-   * Desired delay for transmissions we received from other peer.
-   * Adjusted to be per fragment (UDP_MTU), even though on the
-   * wire it was for "full messages".
-   */
-  struct GNUNET_TIME_Relative flow_delay_from_other_peer;
-
-  /**
-   * Message timeout
-   */
-  struct GNUNET_TIME_Absolute timeout;
-
-  /**
-   * Payload size of original unfragmented message
-   */
-  size_t payload_size;
-
-  /**
-   * Bytes used to send all fragments on wire including UDP overhead
-   */
-  size_t on_wire_size;
-};
-
-
-/**
- * Function called when a message is removed from the
- * transmission queue.
- *
- * @param cls closure
- * @param udpw message wrapper finished
- * @param result #GNUNET_OK on success (message was sent)
- *               #GNUNET_SYSERR if the target disconnected
- *               or we had a timeout or other trouble sending
- */
-typedef void (*QueueContinuation) (void *cls,
-                                   struct UDP_MessageWrapper *udpw,
-                                   int result);
-
-
-/**
- * Information we track for each message in the queue.
- */
-struct UDP_MessageWrapper
-{
-  /**
-   * Session this message belongs to
-   */
-  struct GNUNET_ATS_Session *session;
-
-  /**
-   * DLL of messages, previous element
-   */
-  struct UDP_MessageWrapper *prev;
-
-  /**
-   * DLL of messages, next element
-   */
-  struct UDP_MessageWrapper *next;
-
-  /**
-   * Message with @e msg_size bytes including UDP-specific overhead.
-   */
-  char *msg_buf;
-
-  /**
-   * Function to call once the message wrapper is being removed
-   * from the queue (with success or failure).
-   */
-  QueueContinuation qc;
-
-  /**
-   * Closure for @e qc.
-   */
-  void *qc_cls;
-
-  /**
-   * External continuation to call upon completion of the
-   * transmission, NULL if this queue entry is not for a
-   * message from the application.
-   */
-  GNUNET_TRANSPORT_TransmitContinuation cont;
-
-  /**
-   * Closure for @e cont.
-   */
-  void *cont_cls;
-
-  /**
-   * Fragmentation context.
-   * frag_ctx == NULL if transport <= MTU
-   * frag_ctx != NULL if transport > MTU
-   */
-  struct UDP_FragmentationContext *frag_ctx;
-
-  /**
-   * Message enqueue time.
-   */
-  struct GNUNET_TIME_Absolute start_time;
-
-  /**
-   * Desired transmission time for this message, based on the
-   * flow limiting information we got from the other peer.
-   */
-  struct GNUNET_TIME_Absolute transmission_time;
-
-  /**
-   * Message timeout.
-   */
-  struct GNUNET_TIME_Absolute timeout;
-
-  /**
-   * Size of UDP message to send, including UDP-specific overhead.
-   */
-  size_t msg_size;
-
-  /**
-   * Payload size of original message.
-   */
-  size_t payload_size;
-};
-
-
-GNUNET_NETWORK_STRUCT_BEGIN
-
-/**
- * UDP ACK Message-Packet header.
- */
-struct UDP_ACK_Message
-{
-  /**
-   * Message header.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Desired delay for flow control, in us (in NBO).
-   * A value of UINT32_MAX indicates that the other
-   * peer wants us to disconnect.
-   */
-  uint32_t delay GNUNET_PACKED;
-
-  /**
-   * What is the identity of the sender
-   */
-  struct GNUNET_PeerIdentity sender;
-};
-
-GNUNET_NETWORK_STRUCT_END
-
-
-/* ************************* Monitoring *********** */
-
-
-/**
- * If a session monitor is attached, notify it about the new
- * session state.
- *
- * @param plugin our plugin
- * @param session session that changed state
- * @param state new state of the session
- */
-static void
-notify_session_monitor (struct Plugin *plugin,
-                        struct GNUNET_ATS_Session *session,
-                        enum GNUNET_TRANSPORT_SessionState state)
-{
-  struct GNUNET_TRANSPORT_SessionInfo info;
-
-  if (NULL == plugin->sic)
-    return;
-  if (GNUNET_YES == session->in_destroy)
-    return; /* already destroyed, just RC>0 left-over actions */
-  memset (&info, 0, sizeof(info));
-  info.state = state;
-  info.is_inbound = GNUNET_SYSERR; /* hard to say */
-  info.num_msg_pending = session->msgs_in_queue;
-  info.num_bytes_pending = session->bytes_in_queue;
-  /* info.receive_delay remains zero as this is not supported by UDP
-     (cannot selectively not receive from 'some' peer while continuing
-     to receive from others) */
-  info.session_timeout = session->timeout;
-  info.address = session->address;
-  plugin->sic (plugin->sic_cls, session, &info);
-}
-
-
-/**
- * Return information about the given session to the monitor callback.
- *
- * @param cls the `struct Plugin` with the monitor callback (`sic`)
- * @param peer peer we send information about
- * @param value our `struct GNUNET_ATS_Session` to send information about
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-send_session_info_iter (void *cls,
-                        const struct GNUNET_PeerIdentity *peer,
-                        void *value)
-{
-  struct Plugin *plugin = cls;
-  struct GNUNET_ATS_Session *session = value;
-
-  notify_session_monitor (plugin, session, GNUNET_TRANSPORT_SS_INIT);
-  notify_session_monitor (plugin, session, GNUNET_TRANSPORT_SS_UP);
-  return GNUNET_OK;
-}
-
-
-/**
- * Begin monitoring sessions of a plugin.  There can only
- * be one active monitor per plugin (i.e. if there are
- * multiple monitors, the transport service needs to
- * multiplex the generated events over all of them).
- *
- * @param cls closure of the plugin
- * @param sic callback to invoke, NULL to disable monitor;
- *            plugin will being by iterating over all active
- *            sessions immediately and then enter monitor mode
- * @param sic_cls closure for @a sic
- */
-static void
-udp_plugin_setup_monitor (void *cls,
-                          GNUNET_TRANSPORT_SessionInfoCallback sic,
-                          void *sic_cls)
-{
-  struct Plugin *plugin = cls;
-
-  plugin->sic = sic;
-  plugin->sic_cls = sic_cls;
-  if (NULL != sic)
-  {
-    GNUNET_CONTAINER_multipeermap_iterate (plugin->sessions,
-                                           &send_session_info_iter,
-                                           plugin);
-    /* signal end of first iteration */
-    sic (sic_cls, NULL, NULL);
-  }
-}
-
-
-/* ****************** Little Helpers ****************** */
-
-
-/**
- * Function to free last resources associated with a session.
- *
- * @param s session to free
- */
-static void
-free_session (struct GNUNET_ATS_Session *s)
-{
-  if (NULL != s->address)
-  {
-    GNUNET_HELLO_address_free (s->address);
-    s->address = NULL;
-  }
-  if (NULL != s->frag_ctx)
-  {
-    GNUNET_FRAGMENT_context_destroy (s->frag_ctx->frag, NULL, NULL);
-    GNUNET_free (s->frag_ctx);
-    s->frag_ctx = NULL;
-  }
-  if (NULL != s->mst)
-  {
-    GNUNET_MST_destroy (s->mst);
-    s->mst = NULL;
-  }
-  GNUNET_free (s);
-}
-
-
-/**
- * Function that is called to get the keepalive factor.
- * #GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT is divided by this number to
- * calculate the interval between keepalive packets.
- *
- * @param cls closure with the `struct Plugin`
- * @return keepalive factor
- */
-static unsigned int
-udp_query_keepalive_factor (void *cls)
-{
-  return 15;
-}
-
-
-/**
- * Function obtain the network type for a session
- *
- * @param cls closure (`struct Plugin *`)
- * @param session the session
- * @return the network type
- */
-static enum GNUNET_NetworkType
-udp_plugin_get_network (void *cls, struct GNUNET_ATS_Session *session)
-{
-  return session->scope;
-}
-
-
-/**
- * Function obtain the network type for an address.
- *
- * @param cls closure (`struct Plugin *`)
- * @param address the address
- * @return the network type
- */
-static enum GNUNET_NetworkType
-udp_plugin_get_network_for_address (void *cls,
-                                    const struct GNUNET_HELLO_Address *address)
-{
-  struct Plugin *plugin = cls;
-  size_t addrlen;
-  struct sockaddr_in a4;
-  struct sockaddr_in6 a6;
-  const struct IPv4UdpAddress *u4;
-  const struct IPv6UdpAddress *u6;
-  const void *sb;
-  size_t sbs;
-
-  addrlen = address->address_length;
-  if (addrlen == sizeof(struct IPv6UdpAddress))
-  {
-    GNUNET_assert (NULL != address->address);  /* make static analysis happy */
-    u6 = address->address;
-    memset (&a6, 0, sizeof(a6));
-#if HAVE_SOCKADDR_IN_SIN_LEN
-    a6.sin6_len = sizeof(a6);
-#endif
-    a6.sin6_family = AF_INET6;
-    a6.sin6_port = u6->u6_port;
-    GNUNET_memcpy (&a6.sin6_addr, &u6->ipv6_addr, sizeof(struct in6_addr));
-    sb = &a6;
-    sbs = sizeof(a6);
-  }
-  else if (addrlen == sizeof(struct IPv4UdpAddress))
-  {
-    GNUNET_assert (NULL != address->address);  /* make static analysis happy */
-    u4 = address->address;
-    memset (&a4, 0, sizeof(a4));
-#if HAVE_SOCKADDR_IN_SIN_LEN
-    a4.sin_len = sizeof(a4);
-#endif
-    a4.sin_family = AF_INET;
-    a4.sin_port = u4->u4_port;
-    a4.sin_addr.s_addr = u4->ipv4_addr;
-    sb = &a4;
-    sbs = sizeof(a4);
-  }
-  else
-  {
-    GNUNET_break (0);
-    return GNUNET_NT_UNSPECIFIED;
-  }
-  return plugin->env->get_address_type (plugin->env->cls, sb, sbs);
-}
-
-
-/* ******************* Event loop ******************** */
-
-/**
- * We have been notified that our readset has something to read.  We don't
- * know which socket needs to be read, so we have to check each one
- * Then reschedule this function to be called again once more is available.
- *
- * @param cls the plugin handle
- */
-static void
-udp_plugin_select_v4 (void *cls);
-
-
-/**
- * We have been notified that our readset has something to read.  We don't
- * know which socket needs to be read, so we have to check each one
- * Then reschedule this function to be called again once more is available.
- *
- * @param cls the plugin handle
- */
-static void
-udp_plugin_select_v6 (void *cls);
-
-
-/**
- * (re)schedule IPv4-select tasks for this plugin.
- *
- * @param plugin plugin to reschedule
- */
-static void
-schedule_select_v4 (struct Plugin *plugin)
-{
-  struct GNUNET_TIME_Relative min_delay;
-  struct GNUNET_TIME_Relative delay;
-  struct UDP_MessageWrapper *udpw;
-  struct UDP_MessageWrapper *min_udpw;
-
-  if ((GNUNET_YES == plugin->enable_ipv4) && (NULL != plugin->sockv4))
-  {
-    /* Find a message ready to send:
-     * Flow delay from other peer is expired or not set (0) */
-    min_delay = GNUNET_TIME_UNIT_FOREVER_REL;
-    min_udpw = NULL;
-    for (udpw = plugin->ipv4_queue_head; NULL != udpw; udpw = udpw->next)
-    {
-      delay = GNUNET_TIME_absolute_get_remaining (udpw->transmission_time);
-      if (delay.rel_value_us < min_delay.rel_value_us)
-      {
-        min_delay = delay;
-        min_udpw = udpw;
-      }
-    }
-    if (NULL != plugin->select_task_v4)
-      GNUNET_SCHEDULER_cancel (plugin->select_task_v4);
-    if (NULL != min_udpw)
-    {
-      if (min_delay.rel_value_us > GNUNET_CONSTANTS_LATENCY_WARN.rel_value_us)
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                    "Calculated flow delay for UDPv4 at %s for %s\n",
-                    GNUNET_STRINGS_relative_time_to_string (min_delay,
-                                                            GNUNET_YES),
-                    GNUNET_i2s (&min_udpw->session->target));
-      }
-      else
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                    "Calculated flow delay for UDPv4 at %s for %s\n",
-                    GNUNET_STRINGS_relative_time_to_string (min_delay,
-                                                            GNUNET_YES),
-                    GNUNET_i2s (&min_udpw->session->target));
-      }
-    }
-    plugin->select_task_v4 =
-      GNUNET_SCHEDULER_add_read_net (min_delay,
-                                     plugin->sockv4,
-                                     &udp_plugin_select_v4,
-                                     plugin);
-  }
-}
-
-
-/**
- * (re)schedule IPv6-select tasks for this plugin.
- *
- * @param plugin plugin to reschedule
- */
-static void
-schedule_select_v6 (struct Plugin *plugin)
-{
-  struct GNUNET_TIME_Relative min_delay;
-  struct GNUNET_TIME_Relative delay;
-  struct UDP_MessageWrapper *udpw;
-  struct UDP_MessageWrapper *min_udpw;
-
-  if ((GNUNET_YES == plugin->enable_ipv6) && (NULL != plugin->sockv6))
-  {
-    min_delay = GNUNET_TIME_UNIT_FOREVER_REL;
-    min_udpw = NULL;
-    for (udpw = plugin->ipv6_queue_head; NULL != udpw; udpw = udpw->next)
-    {
-      delay = GNUNET_TIME_absolute_get_remaining (udpw->transmission_time);
-      if (delay.rel_value_us < min_delay.rel_value_us)
-      {
-        min_delay = delay;
-        min_udpw = udpw;
-      }
-    }
-    if (NULL != plugin->select_task_v6)
-      GNUNET_SCHEDULER_cancel (plugin->select_task_v6);
-    if (NULL != min_udpw)
-    {
-      if (min_delay.rel_value_us > GNUNET_CONSTANTS_LATENCY_WARN.rel_value_us)
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                    "Calculated flow delay for UDPv6 at %s for %s\n",
-                    GNUNET_STRINGS_relative_time_to_string (min_delay,
-                                                            GNUNET_YES),
-                    GNUNET_i2s (&min_udpw->session->target));
-      }
-      else
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                    "Calculated flow delay for UDPv6 at %s for %s\n",
-                    GNUNET_STRINGS_relative_time_to_string (min_delay,
-                                                            GNUNET_YES),
-                    GNUNET_i2s (&min_udpw->session->target));
-      }
-    }
-    plugin->select_task_v6 =
-      GNUNET_SCHEDULER_add_read_net (min_delay,
-                                     plugin->sockv6,
-                                     &udp_plugin_select_v6,
-                                     plugin);
-  }
-}
-
-
-/* ******************* Address to string and back ***************** */
-
-
-/**
- * Function called for a quick conversion of the binary address to
- * a numeric address.  Note that the caller must not free the
- * address and that the next call to this function is allowed
- * to override the address again.
- *
- * @param cls closure
- * @param addr binary address (a `union UdpAddress`)
- * @param addrlen length of the @a addr
- * @return string representing the same address
- */
-const char *
-udp_address_to_string (void *cls, const void *addr, size_t addrlen)
-{
-  static char rbuf[INET6_ADDRSTRLEN + 10];
-  char buf[INET6_ADDRSTRLEN];
-  const void *sb;
-  struct in_addr a4;
-  struct in6_addr a6;
-  const struct IPv4UdpAddress *t4;
-  const struct IPv6UdpAddress *t6;
-  int af;
-  uint16_t port;
-  uint32_t options;
-
-  if (NULL == addr)
-  {
-    GNUNET_break_op (0);
-    return NULL;
-  }
-
-  if (addrlen == sizeof(struct IPv6UdpAddress))
-  {
-    t6 = addr;
-    af = AF_INET6;
-    options = ntohl (t6->options);
-    port = ntohs (t6->u6_port);
-    a6 = t6->ipv6_addr;
-    sb = &a6;
-  }
-  else if (addrlen == sizeof(struct IPv4UdpAddress))
-  {
-    t4 = addr;
-    af = AF_INET;
-    options = ntohl (t4->options);
-    port = ntohs (t4->u4_port);
-    a4.s_addr = t4->ipv4_addr;
-    sb = &a4;
-  }
-  else
-  {
-    GNUNET_break_op (0);
-    return NULL;
-  }
-  inet_ntop (af, sb, buf, INET6_ADDRSTRLEN);
-  GNUNET_snprintf (rbuf,
-                   sizeof(rbuf),
-                   (af == AF_INET6) ? "%s.%u.[%s]:%u" : "%s.%u.%s:%u",
-                   PLUGIN_NAME,
-                   options,
-                   buf,
-                   port);
-  return rbuf;
-}
-
-
-/**
- * Function called to convert a string address to a binary address.
- *
- * @param cls closure (`struct Plugin *`)
- * @param addr string address
- * @param addrlen length of the address
- * @param buf location to store the buffer
- * @param added location to store the number of bytes in the buffer.
- *        If the function returns #GNUNET_SYSERR, its contents are undefined.
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
- */
-static int
-udp_string_to_address (void *cls,
-                       const char *addr,
-                       uint16_t addrlen,
-                       void **buf,
-                       size_t *added)
-{
-  struct sockaddr_storage socket_address;
-  char *address;
-  char *plugin;
-  char *optionstr;
-  uint32_t options;
-
-  /* Format tcp.options.address:port */
-  address = NULL;
-  plugin = NULL;
-  optionstr = NULL;
-
-  if ((NULL == addr) || (0 == addrlen))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  if ('\0' != addr[addrlen - 1])
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  if (strlen (addr) != addrlen - 1)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  plugin = GNUNET_strdup (addr);
-  optionstr = strchr (plugin, '.');
-  if (NULL == optionstr)
-  {
-    GNUNET_break (0);
-    GNUNET_free (plugin);
-    return GNUNET_SYSERR;
-  }
-  optionstr[0] = '\0';
-  optionstr++;
-  options = atol (optionstr);
-  address = strchr (optionstr, '.');
-  if (NULL == address)
-  {
-    GNUNET_break (0);
-    GNUNET_free (plugin);
-    return GNUNET_SYSERR;
-  }
-  address[0] = '\0';
-  address++;
-
-  if (GNUNET_OK !=
-      GNUNET_STRINGS_to_address_ip (address, strlen (address), &socket_address))
-  {
-    GNUNET_break (0);
-    GNUNET_free (plugin);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_free (plugin);
-
-  switch (socket_address.ss_family)
-  {
-  case AF_INET: {
-      struct IPv4UdpAddress *u4;
-      const struct sockaddr_in *in4 =
-        (const struct sockaddr_in *) &socket_address;
-
-      u4 = GNUNET_new (struct IPv4UdpAddress);
-      u4->options = htonl (options);
-      u4->ipv4_addr = in4->sin_addr.s_addr;
-      u4->u4_port = in4->sin_port;
-      *buf = u4;
-      *added = sizeof(struct IPv4UdpAddress);
-      return GNUNET_OK;
-    }
-
-  case AF_INET6: {
-      struct IPv6UdpAddress *u6;
-      const struct sockaddr_in6 *in6 =
-        (const struct sockaddr_in6 *) &socket_address;
-
-      u6 = GNUNET_new (struct IPv6UdpAddress);
-      u6->options = htonl (options);
-      u6->ipv6_addr = in6->sin6_addr;
-      u6->u6_port = in6->sin6_port;
-      *buf = u6;
-      *added = sizeof(struct IPv6UdpAddress);
-      return GNUNET_OK;
-    }
-
-  default:
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-}
-
-
-/**
- * Append our port and forward the result.
- *
- * @param cls a `struct PrettyPrinterContext *`
- * @param hostname result from DNS resolver
- */
-static void
-append_port (void *cls, const char *hostname)
-{
-  struct PrettyPrinterContext *ppc = cls;
-  struct Plugin *plugin = ppc->plugin;
-  char *ret;
-
-  if (NULL == hostname)
-  {
-    /* Final call, done */
-    GNUNET_CONTAINER_DLL_remove (plugin->ppc_dll_head,
-                                 plugin->ppc_dll_tail,
-                                 ppc);
-    ppc->resolver_handle = NULL;
-    ppc->asc (ppc->asc_cls, NULL, GNUNET_OK);
-    GNUNET_free (ppc);
-    return;
-  }
-  if (GNUNET_YES == ppc->ipv6)
-    GNUNET_asprintf (&ret,
-                     "%s.%u.[%s]:%d",
-                     PLUGIN_NAME,
-                     ppc->options,
-                     hostname,
-                     ppc->port);
-  else
-    GNUNET_asprintf (&ret,
-                     "%s.%u.%s:%d",
-                     PLUGIN_NAME,
-                     ppc->options,
-                     hostname,
-                     ppc->port);
-  ppc->asc (ppc->asc_cls, ret, GNUNET_OK);
-  GNUNET_free (ret);
-}
-
-
-/**
- * Convert the transports address to a nice, human-readable format.
- *
- * @param cls closure with the `struct Plugin *`
- * @param type name of the transport that generated the address
- * @param addr one of the addresses of the host, NULL for the last address
- *        the specific address format depends on the transport;
- *        a `union UdpAddress`
- * @param addrlen length of the address
- * @param numeric should (IP) addresses be displayed in numeric form?
- * @param timeout after how long should we give up?
- * @param asc function to call on each string
- * @param asc_cls closure for @a asc
- */
-static void
-udp_plugin_address_pretty_printer (void *cls,
-                                   const char *type,
-                                   const void *addr,
-                                   size_t addrlen,
-                                   int numeric,
-                                   struct GNUNET_TIME_Relative timeout,
-                                   GNUNET_TRANSPORT_AddressStringCallback asc,
-                                   void *asc_cls)
-{
-  struct Plugin *plugin = cls;
-  struct PrettyPrinterContext *ppc;
-  const struct sockaddr *sb;
-  size_t sbs;
-  struct sockaddr_in a4;
-  struct sockaddr_in6 a6;
-  const struct IPv4UdpAddress *u4;
-  const struct IPv6UdpAddress *u6;
-  uint16_t port;
-  uint32_t options;
-
-  if (addrlen == sizeof(struct IPv6UdpAddress))
-  {
-    u6 = addr;
-    memset (&a6, 0, sizeof(a6));
-    a6.sin6_family = AF_INET6;
-#if HAVE_SOCKADDR_IN_SIN_LEN
-    a6.sin6_len = sizeof(a6);
-#endif
-    a6.sin6_port = u6->u6_port;
-    a6.sin6_addr = u6->ipv6_addr;
-    port = ntohs (u6->u6_port);
-    options = ntohl (u6->options);
-    sb = (const struct sockaddr *) &a6;
-    sbs = sizeof(a6);
-  }
-  else if (addrlen == sizeof(struct IPv4UdpAddress))
-  {
-    u4 = addr;
-    memset (&a4, 0, sizeof(a4));
-    a4.sin_family = AF_INET;
-#if HAVE_SOCKADDR_IN_SIN_LEN
-    a4.sin_len = sizeof(a4);
-#endif
-    a4.sin_port = u4->u4_port;
-    a4.sin_addr.s_addr = u4->ipv4_addr;
-    port = ntohs (u4->u4_port);
-    options = ntohl (u4->options);
-    sb = (const struct sockaddr *) &a4;
-    sbs = sizeof(a4);
-  }
-  else
-  {
-    /* invalid address */
-    GNUNET_break_op (0);
-    asc (asc_cls, NULL, GNUNET_SYSERR);
-    asc (asc_cls, NULL, GNUNET_OK);
-    return;
-  }
-  ppc = GNUNET_new (struct PrettyPrinterContext);
-  ppc->plugin = plugin;
-  ppc->asc = asc;
-  ppc->asc_cls = asc_cls;
-  ppc->port = port;
-  ppc->options = options;
-  if (addrlen == sizeof(struct IPv6UdpAddress))
-    ppc->ipv6 = GNUNET_YES;
-  else
-    ppc->ipv6 = GNUNET_NO;
-  GNUNET_CONTAINER_DLL_insert (plugin->ppc_dll_head, plugin->ppc_dll_tail, ppc);
-  ppc->resolver_handle = GNUNET_RESOLVER_hostname_get (sb,
-                                                       sbs,
-                                                       ! numeric,
-                                                       timeout,
-                                                       &append_port,
-                                                       ppc);
-}
-
-
-/**
- * Check if the given port is plausible (must be either our listen
- * port or our advertised port).  If it is neither, we return
- * #GNUNET_SYSERR.
- *
- * @param plugin global variables
- * @param in_port port number to check
- * @return #GNUNET_OK if port is either our open or advertised port
- */
-static int
-check_port (const struct Plugin *plugin, uint16_t in_port)
-{
-  if ((plugin->port == in_port) || (plugin->aport == in_port))
-    return GNUNET_OK;
-  return GNUNET_SYSERR;
-}
-
-
-/**
- * Function that will be called to check if a binary address for this
- * plugin is well-formed and corresponds to an address for THIS peer
- * (as per our configuration).  Naturally, if absolutely necessary,
- * plugins can be a bit conservative in their answer, but in general
- * plugins should make sure that the address does not redirect
- * traffic to a 3rd party that might try to man-in-the-middle our
- * traffic.
- *
- * @param cls closure, should be our handle to the Plugin
- * @param addr pointer to a `union UdpAddress`
- * @param addrlen length of @a addr
- * @return #GNUNET_OK if this is a plausible address for this peer
- *         and transport, #GNUNET_SYSERR if not
- */
-static int
-udp_plugin_check_address (void *cls, const void *addr, size_t addrlen)
-{
-  struct Plugin *plugin = cls;
-  const struct IPv4UdpAddress *v4;
-  const struct IPv6UdpAddress *v6;
-
-  if (sizeof(struct IPv4UdpAddress) == addrlen)
-  {
-    struct sockaddr_in s4;
-
-    v4 = (const struct IPv4UdpAddress *) addr;
-    if (GNUNET_OK != check_port (plugin, ntohs (v4->u4_port)))
-      return GNUNET_SYSERR;
-    memset (&s4, 0, sizeof(s4));
-    s4.sin_family = AF_INET;
-#if HAVE_SOCKADDR_IN_SIN_LEN
-    s4.sin_len = sizeof(s4);
-#endif
-    s4.sin_port = v4->u4_port;
-    s4.sin_addr.s_addr = v4->ipv4_addr;
-
-    if (GNUNET_OK !=
-        GNUNET_NAT_test_address (plugin->nat, &s4, sizeof(struct sockaddr_in)))
-      return GNUNET_SYSERR;
-  }
-  else if (sizeof(struct IPv6UdpAddress) == addrlen)
-  {
-    struct sockaddr_in6 s6;
-
-    v6 = (const struct IPv6UdpAddress *) addr;
-    if (IN6_IS_ADDR_LINKLOCAL (&v6->ipv6_addr))
-      return GNUNET_OK;   /* plausible, if unlikely... */
-    memset (&s6, 0, sizeof(s6));
-    s6.sin6_family = AF_INET6;
-#if HAVE_SOCKADDR_IN_SIN_LEN
-    s6.sin6_len = sizeof(s6);
-#endif
-    s6.sin6_port = v6->u6_port;
-    s6.sin6_addr = v6->ipv6_addr;
-
-    if (GNUNET_OK != GNUNET_NAT_test_address (plugin->nat,
-                                              &s6,
-                                              sizeof(struct sockaddr_in6)))
-      return GNUNET_SYSERR;
-  }
-  else
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Our external IP address/port mapping has changed.
- *
- * @param cls closure, the `struct Plugin`
- * @param app_ctx[in,out] location where the app can store stuff
- *                  on add and retrieve it on remove
- * @param add_remove #GNUNET_YES to mean the new public IP address,
- *                   #GNUNET_NO to mean the previous (now invalid) one
- * @param ac address class the address belongs to
- * @param addr either the previous or the new public IP address
- * @param addrlen actual length of the @a addr
- */
-static void
-udp_nat_port_map_callback (void *cls,
-                           void **app_ctx,
-                           int add_remove,
-                           enum GNUNET_NAT_AddressClass ac,
-                           const struct sockaddr *addr,
-                           socklen_t addrlen)
-{
-  struct Plugin *plugin = cls;
-  struct GNUNET_HELLO_Address *address;
-  struct IPv4UdpAddress u4;
-  struct IPv6UdpAddress u6;
-  void *arg;
-  size_t args;
-
-  (void) app_ctx;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       (GNUNET_YES == add_remove) ? "NAT notification to add address `%s'\n"
-       : "NAT notification to remove address `%s'\n",
-       GNUNET_a2s (addr, addrlen));
-  /* convert 'address' to our internal format */
-  switch (addr->sa_family)
-  {
-  case AF_INET: {
-      const struct sockaddr_in *i4;
-
-      GNUNET_assert (sizeof(struct sockaddr_in) == addrlen);
-      i4 = (const struct sockaddr_in *) addr;
-      if (0 == ntohs (i4->sin_port))
-        return; /* Port = 0 means unmapped, ignore these for UDP. */
-      memset (&u4, 0, sizeof(u4));
-      u4.options = htonl (plugin->myoptions);
-      u4.ipv4_addr = i4->sin_addr.s_addr;
-      u4.u4_port = i4->sin_port;
-      arg = &u4;
-      args = sizeof(struct IPv4UdpAddress);
-      break;
-    }
-
-  case AF_INET6: {
-      const struct sockaddr_in6 *i6;
-
-      GNUNET_assert (sizeof(struct sockaddr_in6) == addrlen);
-      i6 = (const struct sockaddr_in6 *) addr;
-      if (0 == ntohs (i6->sin6_port))
-        return; /* Port = 0 means unmapped, ignore these for UDP. */
-      memset (&u6, 0, sizeof(u6));
-      u6.options = htonl (plugin->myoptions);
-      u6.ipv6_addr = i6->sin6_addr;
-      u6.u6_port = i6->sin6_port;
-      arg = &u6;
-      args = sizeof(struct IPv6UdpAddress);
-      break;
-    }
-
-  default:
-    GNUNET_break (0);
-    return;
-  }
-  /* modify our published address list */
-  /* TODO: use 'ac' here in the future... */
-  address = GNUNET_HELLO_address_allocate (plugin->env->my_identity,
-                                           PLUGIN_NAME,
-                                           arg,
-                                           args,
-                                           GNUNET_HELLO_ADDRESS_INFO_NONE);
-  plugin->env->notify_address (plugin->env->cls, add_remove, address);
-  GNUNET_HELLO_address_free (address);
-}
-
-
-/* ********************* Finding sessions ******************* */
-
-
-/**
- * Closure for #session_cmp_it().
- */
-struct GNUNET_ATS_SessionCompareContext
-{
-  /**
-   * Set to session matching the address.
-   */
-  struct GNUNET_ATS_Session *res;
-
-  /**
-   * Address we are looking for.
-   */
-  const struct GNUNET_HELLO_Address *address;
-};
-
-
-/**
- * Find a session with a matching address.
- *
- * @param cls the `struct GNUNET_ATS_SessionCompareContext *`
- * @param key peer identity (unused)
- * @param value the `struct GNUNET_ATS_Session *`
- * @return #GNUNET_NO if we found the session, #GNUNET_OK if not
- */
-static int
-session_cmp_it (void *cls, const struct GNUNET_PeerIdentity *key, void *value)
-{
-  struct GNUNET_ATS_SessionCompareContext *cctx = cls;
-  struct GNUNET_ATS_Session *s = value;
-
-  if (0 == GNUNET_HELLO_address_cmp (s->address, cctx->address))
-  {
-    GNUNET_assert (GNUNET_NO == s->in_destroy);
-    cctx->res = s;
-    return GNUNET_NO;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Locate an existing session the transport service is using to
- * send data to another peer.  Performs some basic sanity checks
- * on the address and then tries to locate a matching session.
- *
- * @param cls the plugin
- * @param address the address we should locate the session by
- * @return the session if it exists, or NULL if it is not found
- */
-static struct GNUNET_ATS_Session *
-udp_plugin_lookup_session (void *cls,
-                           const struct GNUNET_HELLO_Address *address)
-{
-  struct Plugin *plugin = cls;
-  const struct IPv6UdpAddress *udp_a6;
-  const struct IPv4UdpAddress *udp_a4;
-  struct GNUNET_ATS_SessionCompareContext cctx;
-
-  if (NULL == address->address)
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-  if (sizeof(struct IPv4UdpAddress) == address->address_length)
-  {
-    if (NULL == plugin->sockv4)
-      return NULL;
-    udp_a4 = (const struct IPv4UdpAddress *) address->address;
-    if (0 == udp_a4->u4_port)
-    {
-      GNUNET_break (0);
-      return NULL;
-    }
-  }
-  else if (sizeof(struct IPv6UdpAddress) == address->address_length)
-  {
-    if (NULL == plugin->sockv6)
-      return NULL;
-    udp_a6 = (const struct IPv6UdpAddress *) address->address;
-    if (0 == udp_a6->u6_port)
-    {
-      GNUNET_break (0);
-      return NULL;
-    }
-  }
-  else
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-
-  /* check if session already exists */
-  cctx.address = address;
-  cctx.res = NULL;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Looking for existing session for peer `%s' with address `%s'\n",
-       GNUNET_i2s (&address->peer),
-       udp_address_to_string (plugin,
-                              address->address,
-                              address->address_length));
-  GNUNET_CONTAINER_multipeermap_get_multiple (plugin->sessions,
-                                              &address->peer,
-                                              &session_cmp_it,
-                                              &cctx);
-  if (NULL == cctx.res)
-    return NULL;
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Found existing session %p\n", cctx.res);
-  return cctx.res;
-}
-
-
-/* ********************** Timeout ****************** */
-
-
-/**
- * Increment session timeout due to activity.
- *
- * @param s session to reschedule timeout activity for
- */
-static void
-reschedule_session_timeout (struct GNUNET_ATS_Session *s)
-{
-  if (GNUNET_YES == s->in_destroy)
-    return;
-  GNUNET_assert (NULL != s->timeout_task);
-  s->timeout = GNUNET_TIME_relative_to_absolute (UDP_SESSION_TIME_OUT);
-}
-
-
-/**
- * Function that will be called whenever the transport service wants to
- * notify the plugin that a session is still active and in use and
- * therefore the session timeout for this session has to be updated
- *
- * @param cls closure with the `struct Plugin`
- * @param peer which peer was the session for
- * @param session which session is being updated
- */
-static void
-udp_plugin_update_session_timeout (void *cls,
-                                   const struct GNUNET_PeerIdentity *peer,
-                                   struct GNUNET_ATS_Session *session)
-{
-  struct Plugin *plugin = cls;
-
-  if (GNUNET_YES !=
-      GNUNET_CONTAINER_multipeermap_contains_value (plugin->sessions,
-                                                    peer,
-                                                    session))
-  {
-    GNUNET_break (0);
-    return;
-  }
-  /* Reschedule session timeout */
-  reschedule_session_timeout (session);
-}
-
-
-/* ************************* Sending ************************ */
-
-
-/**
- * Remove the given message from the transmission queue and
- * update all applicable statistics.
- *
- * @param plugin the UDP plugin
- * @param udpw message wrapper to dequeue
- */
-static void
-dequeue (struct Plugin *plugin, struct UDP_MessageWrapper *udpw)
-{
-  struct GNUNET_ATS_Session *session = udpw->session;
-
-  if (plugin->bytes_in_buffer < udpw->msg_size)
-  {
-    GNUNET_break (0);
-  }
-  else
-  {
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# UDP, total bytes in send buffers",
-                              -(long long) udpw->msg_size,
-                              GNUNET_NO);
-    plugin->bytes_in_buffer -= udpw->msg_size;
-  }
-  GNUNET_STATISTICS_update (plugin->env->stats,
-                            "# UDP, total messages in send buffers",
-                            -1,
-                            GNUNET_NO);
-  if (sizeof(struct IPv4UdpAddress) == udpw->session->address->address_length)
-  {
-    GNUNET_CONTAINER_DLL_remove (plugin->ipv4_queue_head,
-                                 plugin->ipv4_queue_tail,
-                                 udpw);
-  }
-  else if (sizeof(struct IPv6UdpAddress) ==
-           udpw->session->address->address_length)
-  {
-    GNUNET_CONTAINER_DLL_remove (plugin->ipv6_queue_head,
-                                 plugin->ipv6_queue_tail,
-                                 udpw);
-  }
-  else
-  {
-    GNUNET_break (0);
-    return;
-  }
-  GNUNET_assert (session->msgs_in_queue > 0);
-  session->msgs_in_queue--;
-  GNUNET_assert (session->bytes_in_queue >= udpw->msg_size);
-  session->bytes_in_queue -= udpw->msg_size;
-}
-
-
-/**
- * Enqueue a message for transmission and update statistics.
- *
- * @param plugin the UDP plugin
- * @param udpw message wrapper to queue
- */
-static void
-enqueue (struct Plugin *plugin, struct UDP_MessageWrapper *udpw)
-{
-  struct GNUNET_ATS_Session *session = udpw->session;
-
-  if (GNUNET_YES == session->in_destroy)
-  {
-    GNUNET_break (0);
-    GNUNET_free (udpw);
-    return;
-  }
-  if (plugin->bytes_in_buffer > INT64_MAX - udpw->msg_size)
-  {
-    GNUNET_break (0);
-  }
-  else
-  {
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# UDP, total bytes in send buffers",
-                              udpw->msg_size,
-                              GNUNET_NO);
-    plugin->bytes_in_buffer += udpw->msg_size;
-  }
-  GNUNET_STATISTICS_update (plugin->env->stats,
-                            "# UDP, total messages in send buffers",
-                            1,
-                            GNUNET_NO);
-  if (sizeof(struct IPv4UdpAddress) == udpw->session->address->address_length)
-  {
-    GNUNET_CONTAINER_DLL_insert (plugin->ipv4_queue_head,
-                                 plugin->ipv4_queue_tail,
-                                 udpw);
-  }
-  else if (sizeof(struct IPv6UdpAddress) ==
-           udpw->session->address->address_length)
-  {
-    GNUNET_CONTAINER_DLL_insert (plugin->ipv6_queue_head,
-                                 plugin->ipv6_queue_tail,
-                                 udpw);
-  }
-  else
-  {
-    GNUNET_break (0);
-    udpw->cont (udpw->cont_cls,
-                &session->target,
-                GNUNET_SYSERR,
-                udpw->msg_size,
-                0);
-    GNUNET_free (udpw);
-    return;
-  }
-  session->msgs_in_queue++;
-  session->bytes_in_queue += udpw->msg_size;
-}
-
-
-/**
- * We have completed our (attempt) to transmit a message that had to
- * be fragmented -- either because we got an ACK saying that all
- * fragments were received, or because of timeout / disconnect.  Clean
- * up our state.
- *
- * @param frag_ctx fragmentation context to clean up
- * @param result #GNUNET_OK if we succeeded (got ACK),
- *               #GNUNET_SYSERR if the transmission failed
- */
-static void
-fragmented_message_done (struct UDP_FragmentationContext *frag_ctx, int result)
-{
-  struct Plugin *plugin = frag_ctx->plugin;
-  struct GNUNET_ATS_Session *s = frag_ctx->session;
-  struct UDP_MessageWrapper *udpw;
-  struct UDP_MessageWrapper *tmp;
-  size_t overhead;
-  struct GNUNET_TIME_Relative delay;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "%p: Fragmented message removed with result %s\n",
-       frag_ctx,
-       (result == GNUNET_SYSERR) ? "FAIL" : "SUCCESS");
-  /* Call continuation for fragmented message */
-  if (frag_ctx->on_wire_size >= frag_ctx->payload_size)
-    overhead = frag_ctx->on_wire_size - frag_ctx->payload_size;
-  else
-    overhead = frag_ctx->on_wire_size;
-  delay = GNUNET_TIME_absolute_get_duration (frag_ctx->start_time);
-  if (delay.rel_value_us > GNUNET_CONSTANTS_LATENCY_WARN.rel_value_us)
-  {
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         "Fragmented message acknowledged after %s (expected at %s)\n",
-         GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES),
-         GNUNET_STRINGS_absolute_time_to_string (frag_ctx->next_frag_time));
-  }
-  else
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Fragmented message acknowledged after %s (expected at %s)\n",
-         GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES),
-         GNUNET_STRINGS_absolute_time_to_string (frag_ctx->next_frag_time));
-  }
-
-  if (NULL != frag_ctx->cont)
-    frag_ctx->cont (frag_ctx->cont_cls,
-                    &s->target,
-                    result,
-                    s->frag_ctx->payload_size,
-                    frag_ctx->on_wire_size);
-  GNUNET_STATISTICS_update (plugin->env->stats,
-                            "# UDP, fragmented messages active",
-                            -1,
-                            GNUNET_NO);
-
-  if (GNUNET_OK == result)
-  {
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# UDP, fragmented msgs, messages, sent, success",
-                              1,
-                              GNUNET_NO);
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# UDP, fragmented msgs, bytes payload, sent, success",
-                              s->frag_ctx->payload_size,
-                              GNUNET_NO);
-    GNUNET_STATISTICS_update (
-      plugin->env->stats,
-      "# UDP, fragmented msgs, bytes overhead, sent, success",
-      overhead,
-      GNUNET_NO);
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# UDP, total, bytes overhead, sent",
-                              overhead,
-                              GNUNET_NO);
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# UDP, total, bytes payload, sent",
-                              s->frag_ctx->payload_size,
-                              GNUNET_NO);
-  }
-  else
-  {
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# UDP, fragmented msgs, messages, sent, failure",
-                              1,
-                              GNUNET_NO);
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# UDP, fragmented msgs, bytes payload, sent, failure",
-                              s->frag_ctx->payload_size,
-                              GNUNET_NO);
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# UDP, fragmented msgs, bytes payload, sent, failure",
-                              overhead,
-                              GNUNET_NO);
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# UDP, fragmented msgs, bytes payload, sent, failure",
-                              overhead,
-                              GNUNET_NO);
-  }
-
-  /* Remove remaining fragments from queue, no need to transmit those
-     any longer. */
-  if (s->address->address_length == sizeof(struct IPv6UdpAddress))
-  {
-    udpw = plugin->ipv6_queue_head;
-    while (NULL != udpw)
-    {
-      tmp = udpw->next;
-      if ((udpw->frag_ctx != NULL) && (udpw->frag_ctx == frag_ctx))
-      {
-        dequeue (plugin, udpw);
-        GNUNET_free (udpw);
-      }
-      udpw = tmp;
-    }
-  }
-  if (s->address->address_length == sizeof(struct IPv4UdpAddress))
-  {
-    udpw = plugin->ipv4_queue_head;
-    while (NULL != udpw)
-    {
-      tmp = udpw->next;
-      if ((NULL != udpw->frag_ctx) && (udpw->frag_ctx == frag_ctx))
-      {
-        dequeue (plugin, udpw);
-        GNUNET_free (udpw);
-      }
-      udpw = tmp;
-    }
-  }
-  notify_session_monitor (s->plugin, s, GNUNET_TRANSPORT_SS_UPDATE);
-  GNUNET_FRAGMENT_context_destroy (frag_ctx->frag,
-                                   &s->last_expected_msg_delay,
-                                   &s->last_expected_ack_delay);
-  s->frag_ctx = NULL;
-  GNUNET_free (frag_ctx);
-}
-
-
-/**
- * We are finished with a fragment in the message queue.
- * Notify the continuation and update statistics.
- *
- * @param cls the `struct Plugin *`
- * @param udpw the queue entry
- * @param result #GNUNET_OK on success, #GNUNET_SYSERR on failure
- */
-static void
-qc_fragment_sent (void *cls, struct UDP_MessageWrapper *udpw, int result)
-{
-  struct Plugin *plugin = cls;
-
-  GNUNET_assert (NULL != udpw->frag_ctx);
-  if (GNUNET_OK == result)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Fragment of message with %u bytes transmitted to %s\n",
-                (unsigned int) udpw->payload_size,
-                GNUNET_i2s (&udpw->session->target));
-    GNUNET_FRAGMENT_context_transmission_done (udpw->frag_ctx->frag);
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# UDP, fragmented msgs, fragments, sent, success",
-                              1,
-                              GNUNET_NO);
-    GNUNET_STATISTICS_update (
-      plugin->env->stats,
-      "# UDP, fragmented msgs, fragments bytes, sent, success",
-      udpw->msg_size,
-      GNUNET_NO);
-  }
-  else
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Failed to transmit fragment of message with %u bytes to %s\n",
-                (unsigned int) udpw->payload_size,
-                GNUNET_i2s (&udpw->session->target));
-    fragmented_message_done (udpw->frag_ctx, GNUNET_SYSERR);
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# UDP, fragmented msgs, fragments, sent, failure",
-                              1,
-                              GNUNET_NO);
-    GNUNET_STATISTICS_update (
-      plugin->env->stats,
-      "# UDP, fragmented msgs, fragments bytes, sent, failure",
-      udpw->msg_size,
-      GNUNET_NO);
-  }
-}
-
-
-/**
- * Function that is called with messages created by the fragmentation
- * module.  In the case of the `proc` callback of the
- * #GNUNET_FRAGMENT_context_create() function, this function must
- * eventually call #GNUNET_FRAGMENT_context_transmission_done().
- *
- * @param cls closure, the `struct UDP_FragmentationContext`
- * @param msg the message that was created
- */
-static void
-enqueue_fragment (void *cls, const struct GNUNET_MessageHeader *msg)
-{
-  struct UDP_FragmentationContext *frag_ctx = cls;
-  struct Plugin *plugin = frag_ctx->plugin;
-  struct UDP_MessageWrapper *udpw;
-  struct GNUNET_ATS_Session *session = frag_ctx->session;
-  size_t msg_len = ntohs (msg->size);
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Enqueuing fragment with %lu bytes\n",
-       (unsigned long) msg_len);
-  udpw = GNUNET_malloc (sizeof(struct UDP_MessageWrapper) + msg_len);
-  udpw->session = session;
-  udpw->msg_buf = (char *) &udpw[1];
-  udpw->msg_size = msg_len;
-  udpw->payload_size = msg_len; /* FIXME: minus fragment overhead */
-  udpw->timeout = frag_ctx->timeout;
-  udpw->start_time = frag_ctx->start_time;
-  udpw->transmission_time = frag_ctx->next_frag_time;
-  frag_ctx->next_frag_time =
-    GNUNET_TIME_absolute_add (frag_ctx->next_frag_time,
-                              frag_ctx->flow_delay_from_other_peer);
-  udpw->frag_ctx = frag_ctx;
-  udpw->qc = &qc_fragment_sent;
-  udpw->qc_cls = plugin;
-  GNUNET_memcpy (udpw->msg_buf, msg, msg_len);
-  enqueue (plugin, udpw);
-  if (session->address->address_length == sizeof(struct IPv4UdpAddress))
-    schedule_select_v4 (plugin);
-  else
-    schedule_select_v6 (plugin);
-}
-
-
-/**
- * We are finished with a message from the message queue.
- * Notify the continuation and update statistics.
- *
- * @param cls the `struct Plugin *`
- * @param udpw the queue entry
- * @param result #GNUNET_OK on success, #GNUNET_SYSERR on failure
- */
-static void
-qc_message_sent (void *cls, struct UDP_MessageWrapper *udpw, int result)
-{
-  struct Plugin *plugin = cls;
-  size_t overhead;
-  struct GNUNET_TIME_Relative delay;
-
-  if (udpw->msg_size >= udpw->payload_size)
-    overhead = udpw->msg_size - udpw->payload_size;
-  else
-    overhead = udpw->msg_size;
-
-  if (NULL != udpw->cont)
-  {
-    delay = GNUNET_TIME_absolute_get_duration (udpw->start_time);
-    if (delay.rel_value_us > GNUNET_CONSTANTS_LATENCY_WARN.rel_value_us)
-    {
-      LOG (GNUNET_ERROR_TYPE_WARNING,
-           "Message sent via UDP with delay of %s\n",
-           GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES));
-    }
-    else
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Message sent via UDP with delay of %s\n",
-           GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES));
-    }
-    udpw->cont (udpw->cont_cls,
-                &udpw->session->target,
-                result,
-                udpw->payload_size,
-                overhead);
-  }
-  if (GNUNET_OK == result)
-  {
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# UDP, unfragmented msgs, messages, sent, success",
-                              1,
-                              GNUNET_NO);
-    GNUNET_STATISTICS_update (
-      plugin->env->stats,
-      "# UDP, unfragmented msgs, bytes payload, sent, success",
-      udpw->payload_size,
-      GNUNET_NO);
-    GNUNET_STATISTICS_update (
-      plugin->env->stats,
-      "# UDP, unfragmented msgs, bytes overhead, sent, success",
-      overhead,
-      GNUNET_NO);
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# UDP, total, bytes overhead, sent",
-                              overhead,
-                              GNUNET_NO);
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# UDP, total, bytes payload, sent",
-                              udpw->payload_size,
-                              GNUNET_NO);
-  }
-  else
-  {
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# UDP, unfragmented msgs, messages, sent, failure",
-                              1,
-                              GNUNET_NO);
-    GNUNET_STATISTICS_update (
-      plugin->env->stats,
-      "# UDP, unfragmented msgs, bytes payload, sent, failure",
-      udpw->payload_size,
-      GNUNET_NO);
-    GNUNET_STATISTICS_update (
-      plugin->env->stats,
-      "# UDP, unfragmented msgs, bytes overhead, sent, failure",
-      overhead,
-      GNUNET_NO);
-  }
-}
-
-
-/**
- * Function that can be used by the transport service to transmit a
- * message using the plugin.  Note that in the case of a peer
- * disconnecting, the continuation MUST be called prior to the
- * disconnect notification itself.  This function will be called with
- * this peer's HELLO message to initiate a fresh connection to another
- * peer.
- *
- * @param cls closure
- * @param s which session must be used
- * @param msgbuf the message to transmit
- * @param msgbuf_size number of bytes in @a msgbuf
- * @param priority how important is the message (most plugins will
- *                 ignore message priority and just FIFO)
- * @param to how long to wait at most for the transmission (does not
- *                require plugins to discard the message after the timeout,
- *                just advisory for the desired delay; most plugins will ignore
- *                this as well)
- * @param cont continuation to call once the message has
- *        been transmitted (or if the transport is ready
- *        for the next transmission call; or if the
- *        peer disconnected...); can be NULL
- * @param cont_cls closure for @a cont
- * @return number of bytes used (on the physical network, with overheads);
- *         -1 on hard errors (i.e. address invalid); 0 is a legal value
- *         and does NOT mean that the message was not transmitted (DV)
- */
-static ssize_t
-udp_plugin_send (void *cls,
-                 struct GNUNET_ATS_Session *s,
-                 const char *msgbuf,
-                 size_t msgbuf_size,
-                 unsigned int priority,
-                 struct GNUNET_TIME_Relative to,
-                 GNUNET_TRANSPORT_TransmitContinuation cont,
-                 void *cont_cls)
-{
-  struct Plugin *plugin = cls;
-  size_t udpmlen = msgbuf_size + sizeof(struct UDPMessage);
-  struct UDP_FragmentationContext *frag_ctx;
-  struct UDP_MessageWrapper *udpw;
-  struct UDPMessage *udp;
-  char mbuf[udpmlen] GNUNET_ALIGN;
-  struct GNUNET_TIME_Relative latency;
-
-  if ((sizeof(struct IPv6UdpAddress) == s->address->address_length) &&
-      (NULL == plugin->sockv6))
-    return GNUNET_SYSERR;
-  if ((sizeof(struct IPv4UdpAddress) == s->address->address_length) &&
-      (NULL == plugin->sockv4))
-    return GNUNET_SYSERR;
-  if (udpmlen >= GNUNET_MAX_MESSAGE_SIZE)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  if (GNUNET_YES !=
-      GNUNET_CONTAINER_multipeermap_contains_value (plugin->sessions,
-                                                    &s->target,
-                                                    s))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "UDP transmits %lu-byte message to `%s' using address `%s'\n",
-       (unsigned long) udpmlen,
-       GNUNET_i2s (&s->target),
-       udp_address_to_string (plugin,
-                              s->address->address,
-                              s->address->address_length));
-
-  udp = (struct UDPMessage *) mbuf;
-  udp->header.size = htons (udpmlen);
-  udp->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_MESSAGE);
-  udp->reserved = htonl (0);
-  udp->sender = *plugin->env->my_identity;
-
-  /* We do not update the session time out here!  Otherwise this
-   * session will not timeout since we send keep alive before session
-   * can timeout.
-   *
-   * For UDP we update session timeout only on receive, this will
-   * cover keep alives, since remote peer will reply with keep alive
-   * responses!
-   */if (udpmlen <= UDP_MTU)
-  {
-    /* unfragmented message */
-    udpw = GNUNET_malloc (sizeof(struct UDP_MessageWrapper) + udpmlen);
-    udpw->session = s;
-    udpw->msg_buf = (char *) &udpw[1];
-    udpw->msg_size = udpmlen;   /* message size with UDP overhead */
-    udpw->payload_size = msgbuf_size;   /* message size without UDP overhead */
-    udpw->start_time = GNUNET_TIME_absolute_get ();
-    udpw->timeout = GNUNET_TIME_relative_to_absolute (to);
-    udpw->transmission_time = s->last_transmit_time;
-    s->last_transmit_time =
-      GNUNET_TIME_absolute_add (s->last_transmit_time,
-                                s->flow_delay_from_other_peer);
-    udpw->cont = cont;
-    udpw->cont_cls = cont_cls;
-    udpw->frag_ctx = NULL;
-    udpw->qc = &qc_message_sent;
-    udpw->qc_cls = plugin;
-    GNUNET_memcpy (udpw->msg_buf, udp, sizeof(struct UDPMessage));
-    GNUNET_memcpy (&udpw->msg_buf[sizeof(struct UDPMessage)],
-                   msgbuf,
-                   msgbuf_size);
-    enqueue (plugin, udpw);
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# UDP, unfragmented messages queued total",
-                              1,
-                              GNUNET_NO);
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# UDP, unfragmented bytes payload queued total",
-                              msgbuf_size,
-                              GNUNET_NO);
-    if (s->address->address_length == sizeof(struct IPv4UdpAddress))
-      schedule_select_v4 (plugin);
-    else
-      schedule_select_v6 (plugin);
-  }
-  else
-  {
-    /* fragmented message */
-    if (NULL != s->frag_ctx)
-      return GNUNET_SYSERR;
-    GNUNET_memcpy (&udp[1], msgbuf, msgbuf_size);
-    frag_ctx = GNUNET_new (struct UDP_FragmentationContext);
-    frag_ctx->plugin = plugin;
-    frag_ctx->session = s;
-    frag_ctx->cont = cont;
-    frag_ctx->cont_cls = cont_cls;
-    frag_ctx->start_time = GNUNET_TIME_absolute_get ();
-    frag_ctx->next_frag_time = s->last_transmit_time;
-    frag_ctx->flow_delay_from_other_peer =
-      GNUNET_TIME_relative_divide (s->flow_delay_from_other_peer,
-                                   1 + (msgbuf_size / UDP_MTU));
-    frag_ctx->timeout = GNUNET_TIME_relative_to_absolute (to);
-    frag_ctx->payload_size =
-      msgbuf_size;   /* unfragmented message size without UDP overhead */
-    frag_ctx->on_wire_size = 0;   /* bytes with UDP and fragmentation overhead */
-    frag_ctx->frag = GNUNET_FRAGMENT_context_create (plugin->env->stats,
-                                                     UDP_MTU,
-                                                     &plugin->tracker,
-                                                     s->last_expected_msg_delay,
-                                                     s->last_expected_ack_delay,
-                                                     &udp->header,
-                                                     &enqueue_fragment,
-                                                     frag_ctx);
-    s->frag_ctx = frag_ctx;
-    s->last_transmit_time = frag_ctx->next_frag_time;
-    latency = GNUNET_TIME_absolute_get_remaining (s->last_transmit_time);
-    if (latency.rel_value_us > GNUNET_CONSTANTS_LATENCY_WARN.rel_value_us)
-      LOG (GNUNET_ERROR_TYPE_WARNING,
-           "Enqueued fragments will take %s for transmission to %s (queue size: %u)\n",
-           GNUNET_STRINGS_relative_time_to_string (latency, GNUNET_YES),
-           GNUNET_i2s (&s->target),
-           (unsigned int) s->msgs_in_queue);
-    else
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Enqueued fragments will take %s for transmission to %s (queue size: %u)\n",
-           GNUNET_STRINGS_relative_time_to_string (latency, GNUNET_YES),
-           GNUNET_i2s (&s->target),
-           (unsigned int) s->msgs_in_queue);
-
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# UDP, fragmented messages active",
-                              1,
-                              GNUNET_NO);
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# UDP, fragmented messages, total",
-                              1,
-                              GNUNET_NO);
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# UDP, fragmented bytes (payload)",
-                              frag_ctx->payload_size,
-                              GNUNET_NO);
-  }
-  notify_session_monitor (s->plugin, s, GNUNET_TRANSPORT_SS_UPDATE);
-  return udpmlen;
-}
-
-
-/* ********************** Receiving ********************** */
-
-
-/**
- * Closure for #find_receive_context().
- */
-struct FindReceiveContext
-{
-  /**
-   * Where to store the result.
-   */
-  struct DefragContext *rc;
-
-  /**
-   * Session associated with this context.
-   */
-  struct GNUNET_ATS_Session *session;
-
-  /**
-   * Address to find.
-   */
-  const union UdpAddress *udp_addr;
-
-  /**
-   * Number of bytes in @e udp_addr.
-   */
-  size_t udp_addr_len;
-};
-
-
-/**
- * Scan the heap for a receive context with the given address.
- *
- * @param cls the `struct FindReceiveContext`
- * @param node internal node of the heap
- * @param element value stored at the node (a `struct ReceiveContext`)
- * @param cost cost associated with the node
- * @return #GNUNET_YES if we should continue to iterate,
- *         #GNUNET_NO if not.
- */
-static int
-find_receive_context (void *cls,
-                      struct GNUNET_CONTAINER_HeapNode *node,
-                      void *element,
-                      GNUNET_CONTAINER_HeapCostType cost)
-{
-  struct FindReceiveContext *frc = cls;
-  struct DefragContext *e = element;
-
-  if ((frc->udp_addr_len == e->udp_addr_len) &&
-      (0 == memcmp (frc->udp_addr, e->udp_addr, frc->udp_addr_len)))
-  {
-    frc->rc = e;
-    return GNUNET_NO;
-  }
-  return GNUNET_YES;
-}
-
-
-/**
- * Functions with this signature are called whenever we need to close
- * a session due to a disconnect or failure to establish a connection.
- *
- * @param cls closure with the `struct Plugin`
- * @param s session to close down
- * @return #GNUNET_OK on success
- */
-static int
-udp_disconnect_session (void *cls, struct GNUNET_ATS_Session *s)
-{
-  struct Plugin *plugin = cls;
-  struct UDP_MessageWrapper *udpw;
-  struct UDP_MessageWrapper *next;
-  struct FindReceiveContext frc;
-
-  GNUNET_assert (GNUNET_YES != s->in_destroy);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Session %p to peer `%s' at address %s ended\n",
-       s,
-       GNUNET_i2s (&s->target),
-       udp_address_to_string (plugin,
-                              s->address->address,
-                              s->address->address_length));
-  if (NULL != s->timeout_task)
-  {
-    GNUNET_SCHEDULER_cancel (s->timeout_task);
-    s->timeout_task = NULL;
-  }
-  if (NULL != s->frag_ctx)
-  {
-    /* Remove fragmented message due to disconnect */
-    fragmented_message_done (s->frag_ctx, GNUNET_SYSERR);
-  }
-  GNUNET_assert (
-    GNUNET_YES ==
-    GNUNET_CONTAINER_multipeermap_remove (plugin->sessions, &s->target, s));
-  frc.rc = NULL;
-  frc.udp_addr = s->address->address;
-  frc.udp_addr_len = s->address->address_length;
-  /* Lookup existing receive context for this address */
-  if (NULL != plugin->defrag_ctxs)
-  {
-    GNUNET_CONTAINER_heap_iterate (plugin->defrag_ctxs,
-                                   &find_receive_context,
-                                   &frc);
-    if (NULL != frc.rc)
-    {
-      struct DefragContext *d_ctx = frc.rc;
-
-      GNUNET_CONTAINER_heap_remove_node (d_ctx->hnode);
-      GNUNET_DEFRAGMENT_context_destroy (d_ctx->defrag);
-      GNUNET_free (d_ctx);
-    }
-  }
-  s->in_destroy = GNUNET_YES;
-  next = plugin->ipv4_queue_head;
-  while (NULL != (udpw = next))
-  {
-    next = udpw->next;
-    if (udpw->session == s)
-    {
-      dequeue (plugin, udpw);
-      udpw->qc (udpw->qc_cls, udpw, GNUNET_SYSERR);
-      GNUNET_free (udpw);
-    }
-  }
-  next = plugin->ipv6_queue_head;
-  while (NULL != (udpw = next))
-  {
-    next = udpw->next;
-    if (udpw->session == s)
-    {
-      dequeue (plugin, udpw);
-      udpw->qc (udpw->qc_cls, udpw, GNUNET_SYSERR);
-      GNUNET_free (udpw);
-    }
-  }
-  if ((NULL != s->frag_ctx) && (NULL != s->frag_ctx->cont))
-  {
-    /* The 'frag_ctx' itself will be freed in #free_session() a bit
-       later, as it might be in use right now */
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Calling continuation for fragemented message to `%s' with result SYSERR\n",
-         GNUNET_i2s (&s->target));
-    s->frag_ctx->cont (s->frag_ctx->cont_cls,
-                       &s->target,
-                       GNUNET_SYSERR,
-                       s->frag_ctx->payload_size,
-                       s->frag_ctx->on_wire_size);
-  }
-  notify_session_monitor (s->plugin, s, GNUNET_TRANSPORT_SS_DONE);
-  plugin->env->session_end (plugin->env->cls, s->address, s);
-  GNUNET_STATISTICS_set (plugin->env->stats,
-                         "# UDP sessions active",
-                         GNUNET_CONTAINER_multipeermap_size (plugin->sessions),
-                         GNUNET_NO);
-  if (0 == s->rc)
-    free_session (s);
-  return GNUNET_OK;
-}
-
-
-/**
- * Handle a #GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_ACK message.
- *
- * @param plugin the UDP plugin
- * @param msg the (presumed) UDP ACK message
- * @param udp_addr sender address
- * @param udp_addr_len number of bytes in @a udp_addr
- */
-static void
-read_process_ack (struct Plugin *plugin,
-                  const struct GNUNET_MessageHeader *msg,
-                  const union UdpAddress *udp_addr,
-                  socklen_t udp_addr_len)
-{
-  const struct GNUNET_MessageHeader *ack;
-  const struct UDP_ACK_Message *udp_ack;
-  struct GNUNET_HELLO_Address *address;
-  struct GNUNET_ATS_Session *s;
-  struct GNUNET_TIME_Relative flow_delay;
-
-  /* check message format */
-  if (ntohs (msg->size) <
-      sizeof(struct UDP_ACK_Message) + sizeof(struct GNUNET_MessageHeader))
-  {
-    GNUNET_break_op (0);
-    return;
-  }
-  udp_ack = (const struct UDP_ACK_Message *) msg;
-  ack = (const struct GNUNET_MessageHeader *) &udp_ack[1];
-  if (ntohs (ack->size) != ntohs (msg->size) - sizeof(struct UDP_ACK_Message))
-  {
-    GNUNET_break_op (0);
-    return;
-  }
-
-  /* Locate session */
-  address = GNUNET_HELLO_address_allocate (&udp_ack->sender,
-                                           PLUGIN_NAME,
-                                           udp_addr,
-                                           udp_addr_len,
-                                           GNUNET_HELLO_ADDRESS_INFO_NONE);
-  s = udp_plugin_lookup_session (plugin, address);
-  if (NULL == s)
-  {
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         "UDP session of address %s for ACK not found\n",
-         udp_address_to_string (plugin,
-                                address->address,
-                                address->address_length));
-    GNUNET_HELLO_address_free (address);
-    return;
-  }
-  if (NULL == s->frag_ctx)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
-         "Fragmentation context of address %s for ACK (%s) not found\n",
-         udp_address_to_string (plugin,
-                                address->address,
-                                address->address_length),
-         GNUNET_FRAGMENT_print_ack (ack));
-    GNUNET_HELLO_address_free (address);
-    return;
-  }
-  GNUNET_HELLO_address_free (address);
-
-  /* evaluate flow delay: how long should we wait between messages? */
-  if (UINT32_MAX == ntohl (udp_ack->delay))
-  {
-    /* Other peer asked for us to terminate the session */
-    LOG (GNUNET_ERROR_TYPE_INFO,
-         "Asked to disconnect UDP session of %s\n",
-         GNUNET_i2s (&udp_ack->sender));
-    udp_disconnect_session (plugin, s);
-    return;
-  }
-  flow_delay.rel_value_us = (uint64_t) ntohl (udp_ack->delay);
-  if (flow_delay.rel_value_us > GNUNET_CONSTANTS_LATENCY_WARN.rel_value_us)
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         "We received a sending delay of %s for %s\n",
-         GNUNET_STRINGS_relative_time_to_string (flow_delay, GNUNET_YES),
-         GNUNET_i2s (&udp_ack->sender));
-  else
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "We received a sending delay of %s for %s\n",
-         GNUNET_STRINGS_relative_time_to_string (flow_delay, GNUNET_YES),
-         GNUNET_i2s (&udp_ack->sender));
-  /* Flow delay is for the reassembled packet, however, our delay
-     is per packet, so we need to adjust: */
-  s->flow_delay_from_other_peer = flow_delay;
-
-  /* Handle ACK */
-  if (GNUNET_OK != GNUNET_FRAGMENT_process_ack (s->frag_ctx->frag, ack))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "UDP processes %u-byte acknowledgement from `%s' at `%s'\n",
-         (unsigned int) ntohs (msg->size),
-         GNUNET_i2s (&udp_ack->sender),
-         udp_address_to_string (plugin, udp_addr, udp_addr_len));
-    /* Expect more ACKs to arrive */
-    return;
-  }
-
-  /* Remove fragmented message after successful sending */
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Message from %s at %s full ACK'ed\n",
-       GNUNET_i2s (&udp_ack->sender),
-       udp_address_to_string (plugin, udp_addr, udp_addr_len));
-  fragmented_message_done (s->frag_ctx, GNUNET_OK);
-}
-
-
-/**
- * Message tokenizer has broken up an incoming message. Pass it on
- * to the service.
- *
- * @param cls the `struct GNUNET_ATS_Session *`
- * @param hdr the actual message
- * @return #GNUNET_OK (always)
- */
-static int
-process_inbound_tokenized_messages (void *cls,
-                                    const struct GNUNET_MessageHeader *hdr)
-{
-  struct GNUNET_ATS_Session *session = cls;
-  struct Plugin *plugin = session->plugin;
-
-  if (GNUNET_YES == session->in_destroy)
-    return GNUNET_OK;
-  reschedule_session_timeout (session);
-  session->flow_delay_for_other_peer =
-    plugin->env->receive (plugin->env->cls, session->address, session, hdr);
-  return GNUNET_OK;
-}
-
-
-/**
- * Destroy a session, plugin is being unloaded.
- *
- * @param cls the `struct Plugin`
- * @param key hash of public key of target peer
- * @param value a `struct PeerSession *` to clean up
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-disconnect_and_free_it (void *cls,
-                        const struct GNUNET_PeerIdentity *key,
-                        void *value)
-{
-  struct Plugin *plugin = cls;
-
-  udp_disconnect_session (plugin, value);
-  return GNUNET_OK;
-}
-
-
-/**
- * Disconnect from a remote node.  Clean up session if we have one for
- * this peer.
- *
- * @param cls closure for this call (should be handle to Plugin)
- * @param target the peeridentity of the peer to disconnect
- * @return #GNUNET_OK on success, #GNUNET_SYSERR if the operation failed
- */
-static void
-udp_disconnect (void *cls, const struct GNUNET_PeerIdentity *target)
-{
-  struct Plugin *plugin = cls;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Disconnecting from peer `%s'\n",
-       GNUNET_i2s (target));
-  GNUNET_CONTAINER_multipeermap_get_multiple (plugin->sessions,
-                                              target,
-                                              &disconnect_and_free_it,
-                                              plugin);
-}
-
-
-/**
- * Session was idle, so disconnect it.
- *
- * @param cls the `struct GNUNET_ATS_Session` to time out
- */
-static void
-session_timeout (void *cls)
-{
-  struct GNUNET_ATS_Session *s = cls;
-  struct Plugin *plugin = s->plugin;
-  struct GNUNET_TIME_Relative left;
-
-  s->timeout_task = NULL;
-  left = GNUNET_TIME_absolute_get_remaining (s->timeout);
-  if (left.rel_value_us > 0)
-  {
-    /* not actually our turn yet, but let's at least update
-       the monitor, it may think we're about to die ... */
-    notify_session_monitor (s->plugin, s, GNUNET_TRANSPORT_SS_UPDATE);
-    s->timeout_task = GNUNET_SCHEDULER_add_delayed (left, &session_timeout, s);
-    return;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Session %p was idle for %s, disconnecting\n",
-       s,
-       GNUNET_STRINGS_relative_time_to_string (UDP_SESSION_TIME_OUT,
-                                               GNUNET_YES));
-  /* call session destroy function */
-  udp_disconnect_session (plugin, s);
-}
-
-
-/**
- * Allocate a new session for the given endpoint address.
- * Note that this function does not inform the service
- * of the new session, this is the responsibility of the
- * caller (if needed).
- *
- * @param cls the `struct Plugin`
- * @param address address of the other peer to use
- * @param network_type network type the address belongs to
- * @return NULL on error, otherwise session handle
- */
-static struct GNUNET_ATS_Session *
-udp_plugin_create_session (void *cls,
-                           const struct GNUNET_HELLO_Address *address,
-                           enum GNUNET_NetworkType network_type)
-{
-  struct Plugin *plugin = cls;
-  struct GNUNET_ATS_Session *s;
-
-  s = GNUNET_new (struct GNUNET_ATS_Session);
-  s->mst = GNUNET_MST_create (&process_inbound_tokenized_messages, s);
-  s->plugin = plugin;
-  s->address = GNUNET_HELLO_address_copy (address);
-  s->target = address->peer;
-  s->last_transmit_time = GNUNET_TIME_absolute_get ();
-  s->last_expected_ack_delay =
-    GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 250);
-  s->last_expected_msg_delay = GNUNET_TIME_UNIT_MILLISECONDS;
-  s->flow_delay_from_other_peer = GNUNET_TIME_UNIT_ZERO;
-  s->flow_delay_for_other_peer = GNUNET_TIME_UNIT_ZERO;
-  s->timeout = GNUNET_TIME_relative_to_absolute (UDP_SESSION_TIME_OUT);
-  s->timeout_task =
-    GNUNET_SCHEDULER_add_delayed (UDP_SESSION_TIME_OUT, &session_timeout, s);
-  s->scope = network_type;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Creating new session %p for peer `%s' address `%s'\n",
-       s,
-       GNUNET_i2s (&address->peer),
-       udp_address_to_string (plugin,
-                              address->address,
-                              address->address_length));
-  GNUNET_assert (GNUNET_OK == GNUNET_CONTAINER_multipeermap_put (
-                   plugin->sessions,
-                   &s->target,
-                   s,
-                   GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
-  GNUNET_STATISTICS_set (plugin->env->stats,
-                         "# UDP sessions active",
-                         GNUNET_CONTAINER_multipeermap_size (plugin->sessions),
-                         GNUNET_NO);
-  notify_session_monitor (plugin, s, GNUNET_TRANSPORT_SS_INIT);
-  return s;
-}
-
-
-/**
- * Creates a new outbound session the transport service will use to
- * send data to the peer.
- *
- * @param cls the `struct Plugin *`
- * @param address the address
- * @return the session or NULL of max connections exceeded
- */
-static struct GNUNET_ATS_Session *
-udp_plugin_get_session (void *cls, const struct GNUNET_HELLO_Address *address)
-{
-  struct Plugin *plugin = cls;
-  struct GNUNET_ATS_Session *s;
-  enum GNUNET_NetworkType network_type = GNUNET_NT_UNSPECIFIED;
-  const struct IPv4UdpAddress *udp_v4;
-  const struct IPv6UdpAddress *udp_v6;
-
-  if (NULL == address)
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-  if ((address->address_length != sizeof(struct IPv4UdpAddress)) &&
-      (address->address_length != sizeof(struct IPv6UdpAddress)))
-  {
-    GNUNET_break_op (0);
-    return NULL;
-  }
-  if (NULL != (s = udp_plugin_lookup_session (cls, address)))
-    return s;
-
-  /* need to create new session */
-  if (sizeof(struct IPv4UdpAddress) == address->address_length)
-  {
-    struct sockaddr_in v4;
-
-    udp_v4 = (const struct IPv4UdpAddress *) address->address;
-    memset (&v4, '\0', sizeof(v4));
-    v4.sin_family = AF_INET;
-#if HAVE_SOCKADDR_IN_SIN_LEN
-    v4.sin_len = sizeof(struct sockaddr_in);
-#endif
-    v4.sin_port = udp_v4->u4_port;
-    v4.sin_addr.s_addr = udp_v4->ipv4_addr;
-    network_type = plugin->env->get_address_type (plugin->env->cls,
-                                                  (const struct sockaddr *) &v4,
-                                                  sizeof(v4));
-  }
-  if (sizeof(struct IPv6UdpAddress) == address->address_length)
-  {
-    struct sockaddr_in6 v6;
-
-    udp_v6 = (const struct IPv6UdpAddress *) address->address;
-    memset (&v6, '\0', sizeof(v6));
-    v6.sin6_family = AF_INET6;
-#if HAVE_SOCKADDR_IN_SIN_LEN
-    v6.sin6_len = sizeof(struct sockaddr_in6);
-#endif
-    v6.sin6_port = udp_v6->u6_port;
-    v6.sin6_addr = udp_v6->ipv6_addr;
-    network_type = plugin->env->get_address_type (plugin->env->cls,
-                                                  (const struct sockaddr *) &v6,
-                                                  sizeof(v6));
-  }
-  GNUNET_break (GNUNET_NT_UNSPECIFIED != network_type);
-  return udp_plugin_create_session (cls, address, network_type);
-}
-
-
-/**
- * We've received a UDP Message.  Process it (pass contents to main service).
- *
- * @param plugin plugin context
- * @param msg the message
- * @param udp_addr sender address
- * @param udp_addr_len number of bytes in @a udp_addr
- * @param network_type network type the address belongs to
- */
-static void
-process_udp_message (struct Plugin *plugin,
-                     const struct UDPMessage *msg,
-                     const union UdpAddress *udp_addr,
-                     size_t udp_addr_len,
-                     enum GNUNET_NetworkType network_type)
-{
-  struct GNUNET_ATS_Session *s;
-  struct GNUNET_HELLO_Address *address;
-
-  GNUNET_break (GNUNET_NT_UNSPECIFIED != network_type);
-  if (0 != ntohl (msg->reserved))
-  {
-    GNUNET_break_op (0);
-    return;
-  }
-  if (ntohs (msg->header.size) <
-      sizeof(struct GNUNET_MessageHeader) + sizeof(struct UDPMessage))
-  {
-    GNUNET_break_op (0);
-    return;
-  }
-
-  address = GNUNET_HELLO_address_allocate (&msg->sender,
-                                           PLUGIN_NAME,
-                                           udp_addr,
-                                           udp_addr_len,
-                                           GNUNET_HELLO_ADDRESS_INFO_NONE);
-  if (NULL == (s = udp_plugin_lookup_session (plugin, address)))
-  {
-    s = udp_plugin_create_session (plugin, address, network_type);
-    plugin->env->session_start (plugin->env->cls, address, s, s->scope);
-    notify_session_monitor (plugin, s, GNUNET_TRANSPORT_SS_UP);
-  }
-  GNUNET_free (address);
-
-  s->rc++;
-  GNUNET_MST_from_buffer (s->mst,
-                          (const char *) &msg[1],
-                          ntohs (msg->header.size) - sizeof(struct UDPMessage),
-                          GNUNET_YES,
-                          GNUNET_NO);
-  s->rc--;
-  if ((0 == s->rc) && (GNUNET_YES == s->in_destroy))
-    free_session (s);
-}
-
-
-/**
- * Process a defragmented message.
- *
- * @param cls the `struct DefragContext *`
- * @param msg the message
- */
-static void
-fragment_msg_proc (void *cls, const struct GNUNET_MessageHeader *msg)
-{
-  struct DefragContext *dc = cls;
-  const struct UDPMessage *um;
-
-  if (ntohs (msg->type) != GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_MESSAGE)
-  {
-    GNUNET_break_op (0);
-    return;
-  }
-  if (ntohs (msg->size) < sizeof(struct UDPMessage))
-  {
-    GNUNET_break_op (0);
-    return;
-  }
-  um = (const struct UDPMessage *) msg;
-  dc->sender = um->sender;
-  dc->have_sender = GNUNET_YES;
-  process_udp_message (dc->plugin,
-                       um,
-                       dc->udp_addr,
-                       dc->udp_addr_len,
-                       dc->network_type);
-}
-
-
-/**
- * We finished sending an acknowledgement.  Update
- * statistics.
- *
- * @param cls the `struct Plugin`
- * @param udpw message queue entry of the ACK
- * @param result #GNUNET_OK if the transmission worked,
- *               #GNUNET_SYSERR if we failed to send the ACK
- */
-static void
-ack_message_sent (void *cls, struct UDP_MessageWrapper *udpw, int result)
-{
-  struct Plugin *plugin = cls;
-
-  if (GNUNET_OK == result)
-  {
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# UDP, ACK messages sent",
-                              1,
-                              GNUNET_NO);
-  }
-  else
-  {
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# UDP, ACK transmissions failed",
-                              1,
-                              GNUNET_NO);
-  }
-}
-
-
-/**
- * Transmit an acknowledgement.
- *
- * @param cls the `struct DefragContext *`
- * @param id message ID (unused)
- * @param msg ack to transmit
- */
-static void
-ack_proc (void *cls, uint32_t id, const struct GNUNET_MessageHeader *msg)
-{
-  struct DefragContext *rc = cls;
-  struct Plugin *plugin = rc->plugin;
-  size_t msize = sizeof(struct UDP_ACK_Message) + ntohs (msg->size);
-  struct UDP_ACK_Message *udp_ack;
-  uint32_t delay;
-  struct UDP_MessageWrapper *udpw;
-  struct GNUNET_ATS_Session *s;
-  struct GNUNET_HELLO_Address *address;
-
-  if (GNUNET_NO == rc->have_sender)
-  {
-    /* tried to defragment but never succeeded, hence will not ACK */
-    /* This can happen if we just lost msgs */
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# UDP, fragments discarded without ACK",
-                              1,
-                              GNUNET_NO);
-    return;
-  }
-  address = GNUNET_HELLO_address_allocate (&rc->sender,
-                                           PLUGIN_NAME,
-                                           rc->udp_addr,
-                                           rc->udp_addr_len,
-                                           GNUNET_HELLO_ADDRESS_INFO_NONE);
-  s = udp_plugin_lookup_session (plugin, address);
-  GNUNET_HELLO_address_free (address);
-  if (NULL == s)
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Trying to transmit ACK to peer `%s' but no session found!\n",
-         udp_address_to_string (plugin, rc->udp_addr, rc->udp_addr_len));
-    GNUNET_CONTAINER_heap_remove_node (rc->hnode);
-    GNUNET_DEFRAGMENT_context_destroy (rc->defrag);
-    GNUNET_free (rc);
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# UDP, ACK transmissions failed",
-                              1,
-                              GNUNET_NO);
-    return;
-  }
-  if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us ==
-      s->flow_delay_for_other_peer.rel_value_us)
-    delay = UINT32_MAX;
-  else if (s->flow_delay_for_other_peer.rel_value_us < UINT32_MAX)
-    delay = s->flow_delay_for_other_peer.rel_value_us;
-  else
-    delay = UINT32_MAX - 1; /* largest value we can communicate */
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Sending ACK to `%s' including delay of %s\n",
-       udp_address_to_string (plugin, rc->udp_addr, rc->udp_addr_len),
-       GNUNET_STRINGS_relative_time_to_string (s->flow_delay_for_other_peer,
-                                               GNUNET_YES));
-  udpw = GNUNET_malloc (sizeof(struct UDP_MessageWrapper) + msize);
-  udpw->msg_size = msize;
-  udpw->payload_size = 0;
-  udpw->session = s;
-  udpw->start_time = GNUNET_TIME_absolute_get ();
-  udpw->timeout = GNUNET_TIME_UNIT_FOREVER_ABS;
-  udpw->msg_buf = (char *) &udpw[1];
-  udpw->qc = &ack_message_sent;
-  udpw->qc_cls = plugin;
-  udp_ack = (struct UDP_ACK_Message *) udpw->msg_buf;
-  udp_ack->header.size = htons ((uint16_t) msize);
-  udp_ack->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_ACK);
-  udp_ack->delay = htonl (delay);
-  udp_ack->sender = *plugin->env->my_identity;
-  GNUNET_memcpy (&udp_ack[1], msg, ntohs (msg->size));
-  enqueue (plugin, udpw);
-  notify_session_monitor (plugin, s, GNUNET_TRANSPORT_SS_UPDATE);
-  if (s->address->address_length == sizeof(struct IPv4UdpAddress))
-    schedule_select_v4 (plugin);
-  else
-    schedule_select_v6 (plugin);
-}
-
-
-/**
- * We received a fragment, process it.
- *
- * @param plugin our plugin
- * @param msg a message of type #GNUNET_MESSAGE_TYPE_FRAGMENT
- * @param udp_addr sender address
- * @param udp_addr_len number of bytes in @a udp_addr
- * @param network_type network type the address belongs to
- */
-static void
-read_process_fragment (struct Plugin *plugin,
-                       const struct GNUNET_MessageHeader *msg,
-                       const union UdpAddress *udp_addr,
-                       size_t udp_addr_len,
-                       enum GNUNET_NetworkType network_type)
-{
-  struct DefragContext *d_ctx;
-  struct GNUNET_TIME_Absolute now;
-  struct FindReceiveContext frc;
-
-  frc.rc = NULL;
-  frc.udp_addr = udp_addr;
-  frc.udp_addr_len = udp_addr_len;
-
-  /* Lookup existing receive context for this address */
-  GNUNET_CONTAINER_heap_iterate (plugin->defrag_ctxs,
-                                 &find_receive_context,
-                                 &frc);
-  now = GNUNET_TIME_absolute_get ();
-  d_ctx = frc.rc;
-
-  if (NULL == d_ctx)
-  {
-    /* Create a new defragmentation context */
-    d_ctx = GNUNET_malloc (sizeof(struct DefragContext) + udp_addr_len);
-    GNUNET_memcpy (&d_ctx[1], udp_addr, udp_addr_len);
-    d_ctx->udp_addr = (const union UdpAddress *) &d_ctx[1];
-    d_ctx->udp_addr_len = udp_addr_len;
-    d_ctx->network_type = network_type;
-    d_ctx->plugin = plugin;
-    d_ctx->defrag =
-      GNUNET_DEFRAGMENT_context_create (plugin->env->stats,
-                                        UDP_MTU,
-                                        UDP_MAX_MESSAGES_IN_DEFRAG,
-                                        d_ctx,
-                                        &fragment_msg_proc,
-                                        &ack_proc);
-    d_ctx->hnode = GNUNET_CONTAINER_heap_insert (plugin->defrag_ctxs,
-                                                 d_ctx,
-                                                 (GNUNET_CONTAINER_HeapCostType)
-                                                 now.abs_value_us);
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Created new defragmentation context for %u-byte fragment from `%s'\n",
-         (unsigned int) ntohs (msg->size),
-         udp_address_to_string (plugin, udp_addr, udp_addr_len));
-  }
-  else
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Found existing defragmentation context for %u-byte fragment from `%s'\n",
-         (unsigned int) ntohs (msg->size),
-         udp_address_to_string (plugin, udp_addr, udp_addr_len));
-  }
-
-  if (GNUNET_OK == GNUNET_DEFRAGMENT_process_fragment (d_ctx->defrag, msg))
-  {
-    /* keep this 'rc' from expiring */
-    GNUNET_CONTAINER_heap_update_cost (d_ctx->hnode,
-                                       (GNUNET_CONTAINER_HeapCostType)
-                                       now.abs_value_us);
-  }
-  if (GNUNET_CONTAINER_heap_get_size (plugin->defrag_ctxs) >
-      UDP_MAX_SENDER_ADDRESSES_WITH_DEFRAG)
-  {
-    /* remove 'rc' that was inactive the longest */
-    d_ctx = GNUNET_CONTAINER_heap_remove_root (plugin->defrag_ctxs);
-    GNUNET_assert (NULL != d_ctx);
-    GNUNET_DEFRAGMENT_context_destroy (d_ctx->defrag);
-    GNUNET_free (d_ctx);
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# UDP, Defragmentations aborted",
-                              1,
-                              GNUNET_NO);
-  }
-}
-
-
-/**
- * Read and process a message from the given socket.
- *
- * @param plugin the overall plugin
- * @param rsock socket to read from
- */
-static void
-udp_select_read (struct Plugin *plugin, struct GNUNET_NETWORK_Handle *rsock)
-{
-  socklen_t fromlen;
-  struct sockaddr_storage addr;
-  char buf[65536] GNUNET_ALIGN;
-  ssize_t size;
-  const struct GNUNET_MessageHeader *msg;
-  struct IPv4UdpAddress v4;
-  struct IPv6UdpAddress v6;
-  const struct sockaddr *sa;
-  const struct sockaddr_in *sa4;
-  const struct sockaddr_in6 *sa6;
-  const union UdpAddress *int_addr;
-  size_t int_addr_len;
-  enum GNUNET_NetworkType network_type;
-
-  fromlen = sizeof(addr);
-  memset (&addr, 0, sizeof(addr));
-  size = GNUNET_NETWORK_socket_recvfrom (rsock,
-                                         buf,
-                                         sizeof(buf),
-                                         (struct sockaddr *) &addr,
-                                         &fromlen);
-  sa = (const struct sockaddr *) &addr;
-
-  if (-1 == size)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "UDP failed to receive data: %s\n",
-         strerror (errno));
-    /* Connection failure or something. Not a protocol violation. */
-    return;
-  }
-
-  /* Check if this is a STUN packet */
-  if (GNUNET_NO !=
-      GNUNET_NAT_stun_handle_packet (plugin->nat,
-                                     (const struct sockaddr *) &addr,
-                                     fromlen,
-                                     buf,
-                                     size))
-    return; /* was STUN, do not process further */
-
-  if (size < sizeof(struct GNUNET_MessageHeader))
-  {
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         "UDP got %u bytes from %s, which is not enough for a GNUnet message header\n",
-         (unsigned int) size,
-         GNUNET_a2s (sa, fromlen));
-    /* _MAY_ be a connection failure (got partial message) */
-    /* But it _MAY_ also be that the other side uses non-GNUnet protocol. */
-    GNUNET_break_op (0);
-    return;
-  }
-
-  msg = (const struct GNUNET_MessageHeader *) buf;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "UDP received %u-byte message from `%s' type %u\n",
-       (unsigned int) size,
-       GNUNET_a2s (sa, fromlen),
-       ntohs (msg->type));
-  if (size != ntohs (msg->size))
-  {
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         "UDP malformed message (size %u) header from %s\n",
-         (unsigned int) size,
-         GNUNET_a2s (sa, fromlen));
-    GNUNET_break_op (0);
-    return;
-  }
-  GNUNET_STATISTICS_update (plugin->env->stats,
-                            "# UDP, total bytes received",
-                            size,
-                            GNUNET_NO);
-  network_type = plugin->env->get_address_type (plugin->env->cls, sa, fromlen);
-  switch (sa->sa_family)
-  {
-  case AF_INET:
-    sa4 = (const struct sockaddr_in *) &addr;
-    v4.options = 0;
-    v4.ipv4_addr = sa4->sin_addr.s_addr;
-    v4.u4_port = sa4->sin_port;
-    int_addr = (union UdpAddress *) &v4;
-    int_addr_len = sizeof(v4);
-    break;
-
-  case AF_INET6:
-    sa6 = (const struct sockaddr_in6 *) &addr;
-    v6.options = 0;
-    v6.ipv6_addr = sa6->sin6_addr;
-    v6.u6_port = sa6->sin6_port;
-    int_addr = (union UdpAddress *) &v6;
-    int_addr_len = sizeof(v6);
-    break;
-
-  default:
-    GNUNET_break (0);
-    return;
-  }
-
-  switch (ntohs (msg->type))
-  {
-  case GNUNET_MESSAGE_TYPE_TRANSPORT_BROADCAST_BEACON:
-    if (GNUNET_YES == plugin->enable_broadcasting_receiving)
-      udp_broadcast_receive (plugin,
-                             buf,
-                             size,
-                             int_addr,
-                             int_addr_len,
-                             network_type);
-    return;
-
-  case GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_MESSAGE:
-    if (ntohs (msg->size) < sizeof(struct UDPMessage))
-    {
-      GNUNET_break_op (0);
-      return;
-    }
-    process_udp_message (plugin,
-                         (const struct UDPMessage *) msg,
-                         int_addr,
-                         int_addr_len,
-                         network_type);
-    return;
-
-  case GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_ACK:
-    read_process_ack (plugin, msg, int_addr, int_addr_len);
-    return;
-
-  case GNUNET_MESSAGE_TYPE_FRAGMENT:
-    read_process_fragment (plugin, msg, int_addr, int_addr_len, network_type);
-    return;
-
-  default:
-    GNUNET_break_op (0);
-    return;
-  }
-}
-
-
-/**
- * Removes messages from the transmission queue that have
- * timed out, and then selects a message that should be
- * transmitted next.
- *
- * @param plugin the UDP plugin
- * @param sock which socket should we process the queue for (v4 or v6)
- * @return message selected for transmission, or NULL for none
- */
-static struct UDP_MessageWrapper *
-remove_timeout_messages_and_select (struct Plugin *plugin,
-                                    struct GNUNET_NETWORK_Handle *sock)
-{
-  struct UDP_MessageWrapper *udpw;
-  struct GNUNET_TIME_Relative remaining;
-  struct GNUNET_ATS_Session *session;
-  int removed;
-
-  removed = GNUNET_NO;
-  udpw = (sock == plugin->sockv4) ? plugin->ipv4_queue_head
-         : plugin->ipv6_queue_head;
-  while (NULL != udpw)
-  {
-    session = udpw->session;
-    /* Find messages with timeout */
-    remaining = GNUNET_TIME_absolute_get_remaining (udpw->timeout);
-    if (GNUNET_TIME_UNIT_ZERO.rel_value_us == remaining.rel_value_us)
-    {
-      /* Message timed out */
-      removed = GNUNET_YES;
-      dequeue (plugin, udpw);
-      udpw->qc (udpw->qc_cls, udpw, GNUNET_SYSERR);
-      GNUNET_free (udpw);
-
-      if (sock == plugin->sockv4)
-      {
-        udpw = plugin->ipv4_queue_head;
-      }
-      else if (sock == plugin->sockv6)
-      {
-        udpw = plugin->ipv6_queue_head;
-      }
-      else
-      {
-        GNUNET_break (0);      /* should never happen */
-        udpw = NULL;
-      }
-      GNUNET_STATISTICS_update (plugin->env->stats,
-                                "# messages discarded due to timeout",
-                                1,
-                                GNUNET_NO);
-    }
-    else
-    {
-      /* Message did not time out, check transmission time */
-      remaining = GNUNET_TIME_absolute_get_remaining (udpw->transmission_time);
-      if (0 == remaining.rel_value_us)
-      {
-        /* this message is not delayed */
-        LOG (GNUNET_ERROR_TYPE_DEBUG,
-             "Message for peer `%s' (%lu bytes) is not delayed \n",
-             GNUNET_i2s (&udpw->session->target),
-             (unsigned long) udpw->payload_size);
-        break;       /* Found message to send, break */
-      }
-      else
-      {
-        /* Message is delayed, try next */
-        LOG (GNUNET_ERROR_TYPE_DEBUG,
-             "Message for peer `%s' (%lu bytes) is delayed for %s\n",
-             GNUNET_i2s (&udpw->session->target),
-             (unsigned long) udpw->payload_size,
-             GNUNET_STRINGS_relative_time_to_string (remaining, GNUNET_YES));
-        udpw = udpw->next;
-      }
-    }
-  }
-  if (GNUNET_YES == removed)
-    notify_session_monitor (session->plugin,
-                            session,
-                            GNUNET_TRANSPORT_SS_UPDATE);
-  return udpw;
-}
-
-
-/**
- * We failed to transmit a message via UDP. Generate
- * a descriptive error message.
- *
- * @param plugin our plugin
- * @param sa target address we were trying to reach
- * @param slen number of bytes in @a sa
- * @param error the errno value returned from the sendto() call
- */
-static void
-analyze_send_error (struct Plugin *plugin,
-                    const struct sockaddr *sa,
-                    socklen_t slen,
-                    int error)
-{
-  enum GNUNET_NetworkType type;
-
-  type = plugin->env->get_address_type (plugin->env->cls, sa, slen);
-  if (((GNUNET_NT_LAN == type) || (GNUNET_NT_WAN == type)) &&
-      ((ENETUNREACH == errno) || (ENETDOWN == errno)))
-  {
-    if (slen == sizeof(struct sockaddr_in))
-    {
-      /* IPv4: "Network unreachable" or "Network down"
-       *
-       * This indicates we do not have connectivity
-       */
-      LOG (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,
-           _ ("UDP could not transmit message to `%s': "
-              "Network seems down, please check your network configuration\n"),
-           GNUNET_a2s (sa, slen));
-    }
-    if (slen == sizeof(struct sockaddr_in6))
-    {
-      /* IPv6: "Network unreachable" or "Network down"
-       *
-       * This indicates that this system is IPv6 enabled, but does not
-       * have a valid global IPv6 address assigned or we do not have
-       * connectivity
-       */LOG (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,
-           _ (
-             "UDP could not transmit IPv6 message! "
-             "Please check your network configuration and disable IPv6 if your "
-             "connection does not have a global IPv6 address\n"));
-    }
-  }
-  else
-  {
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         "UDP could not transmit message to `%s': `%s'\n",
-         GNUNET_a2s (sa, slen),
-         strerror (error));
-  }
-}
-
-
-/**
- * It is time to try to transmit a UDP message.  Select one
- * and send.
- *
- * @param plugin the plugin
- * @param sock which socket (v4/v6) to send on
- */
-static void
-udp_select_send (struct Plugin *plugin, struct GNUNET_NETWORK_Handle *sock)
-{
-  ssize_t sent;
-  socklen_t slen;
-  const struct sockaddr *a;
-  const struct IPv4UdpAddress *u4;
-  struct sockaddr_in a4;
-  const struct IPv6UdpAddress *u6;
-  struct sockaddr_in6 a6;
-  struct UDP_MessageWrapper *udpw;
-
-  /* Find message(s) to send */
-  while (NULL != (udpw = remove_timeout_messages_and_select (plugin, sock)))
-  {
-    if (sizeof(struct IPv4UdpAddress) ==
-        udpw->session->address->address_length)
-    {
-      u4 = udpw->session->address->address;
-      memset (&a4, 0, sizeof(a4));
-      a4.sin_family = AF_INET;
-#if HAVE_SOCKADDR_IN_SIN_LEN
-      a4.sin_len = sizeof(a4);
-#endif
-      a4.sin_port = u4->u4_port;
-      a4.sin_addr.s_addr = u4->ipv4_addr;
-      a = (const struct sockaddr *) &a4;
-      slen = sizeof(a4);
-    }
-    else if (sizeof(struct IPv6UdpAddress) ==
-             udpw->session->address->address_length)
-    {
-      u6 = udpw->session->address->address;
-      memset (&a6, 0, sizeof(a6));
-      a6.sin6_family = AF_INET6;
-#if HAVE_SOCKADDR_IN_SIN_LEN
-      a6.sin6_len = sizeof(a6);
-#endif
-      a6.sin6_port = u6->u6_port;
-      a6.sin6_addr = u6->ipv6_addr;
-      a = (const struct sockaddr *) &a6;
-      slen = sizeof(a6);
-    }
-    else
-    {
-      GNUNET_break (0);
-      dequeue (plugin, udpw);
-      udpw->qc (udpw->qc_cls, udpw, GNUNET_SYSERR);
-      notify_session_monitor (plugin,
-                              udpw->session,
-                              GNUNET_TRANSPORT_SS_UPDATE);
-      GNUNET_free (udpw);
-      continue;
-    }
-    sent = GNUNET_NETWORK_socket_sendto (sock,
-                                         udpw->msg_buf,
-                                         udpw->msg_size,
-                                         a,
-                                         slen);
-    udpw->session->last_transmit_time =
-      GNUNET_TIME_absolute_max (GNUNET_TIME_absolute_get (),
-                                udpw->session->last_transmit_time);
-    dequeue (plugin, udpw);
-    if (GNUNET_SYSERR == sent)
-    {
-      /* Failure */
-      analyze_send_error (plugin, a, slen, errno);
-      udpw->qc (udpw->qc_cls, udpw, GNUNET_SYSERR);
-      GNUNET_STATISTICS_update (plugin->env->stats,
-                                "# UDP, total, bytes, sent, failure",
-                                sent,
-                                GNUNET_NO);
-      GNUNET_STATISTICS_update (plugin->env->stats,
-                                "# UDP, total, messages, sent, failure",
-                                1,
-                                GNUNET_NO);
-    }
-    else
-    {
-      /* Success */
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "UDP transmitted %u-byte message to  `%s' `%s' (%d: %s)\n",
-           (unsigned int) (udpw->msg_size),
-           GNUNET_i2s (&udpw->session->target),
-           GNUNET_a2s (a, slen),
-           (int) sent,
-           (sent < 0) ? strerror (errno) : "ok");
-      GNUNET_STATISTICS_update (plugin->env->stats,
-                                "# UDP, total, bytes, sent, success",
-                                sent,
-                                GNUNET_NO);
-      GNUNET_STATISTICS_update (plugin->env->stats,
-                                "# UDP, total, messages, sent, success",
-                                1,
-                                GNUNET_NO);
-      if (NULL != udpw->frag_ctx)
-        udpw->frag_ctx->on_wire_size += udpw->msg_size;
-      udpw->qc (udpw->qc_cls, udpw, GNUNET_OK);
-    }
-    notify_session_monitor (plugin, udpw->session, GNUNET_TRANSPORT_SS_UPDATE);
-    GNUNET_free (udpw);
-  }
-}
-
-
-/* ***************** Event loop (part 2) *************** */
-
-
-/**
- * We have been notified that our readset has something to read.  We don't
- * know which socket needs to be read, so we have to check each one
- * Then reschedule this function to be called again once more is available.
- *
- * @param cls the plugin handle
- */
-static void
-udp_plugin_select_v4 (void *cls)
-{
-  struct Plugin *plugin = cls;
-  const struct GNUNET_SCHEDULER_TaskContext *tc;
-
-  plugin->select_task_v4 = NULL;
-  if (NULL == plugin->sockv4)
-    return;
-  tc = GNUNET_SCHEDULER_get_task_context ();
-  if ((0 != (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) &&
-      (GNUNET_NETWORK_fdset_isset (tc->read_ready, plugin->sockv4)))
-    udp_select_read (plugin, plugin->sockv4);
-  udp_select_send (plugin, plugin->sockv4);
-  schedule_select_v4 (plugin);
-}
-
-
-/**
- * We have been notified that our readset has something to read.  We don't
- * know which socket needs to be read, so we have to check each one
- * Then reschedule this function to be called again once more is available.
- *
- * @param cls the plugin handle
- */
-static void
-udp_plugin_select_v6 (void *cls)
-{
-  struct Plugin *plugin = cls;
-  const struct GNUNET_SCHEDULER_TaskContext *tc;
-
-  plugin->select_task_v6 = NULL;
-  if (NULL == plugin->sockv6)
-    return;
-  tc = GNUNET_SCHEDULER_get_task_context ();
-  if ((0 != (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) &&
-      (GNUNET_NETWORK_fdset_isset (tc->read_ready, plugin->sockv6)))
-    udp_select_read (plugin, plugin->sockv6);
-
-  udp_select_send (plugin, plugin->sockv6);
-  schedule_select_v6 (plugin);
-}
-
-
-/* ******************* Initialization *************** */
-
-
-/**
- * Setup the UDP sockets (for IPv4 and IPv6) for the plugin.
- *
- * @param plugin the plugin to initialize
- * @param bind_v6 IPv6 address to bind to (can be NULL, for 'any')
- * @param bind_v4 IPv4 address to bind to (can be NULL, for 'any')
- * @return number of sockets that were successfully bound
- */
-static unsigned int
-setup_sockets (struct Plugin *plugin,
-               const struct sockaddr_in6 *bind_v6,
-               const struct sockaddr_in *bind_v4)
-{
-  int tries;
-  unsigned int sockets_created = 0;
-  struct sockaddr_in6 server_addrv6;
-  struct sockaddr_in server_addrv4;
-  const struct sockaddr *server_addr;
-  const struct sockaddr *addrs[2];
-  socklen_t addrlens[2];
-  socklen_t addrlen;
-  int eno;
-
-  /* Create IPv6 socket */
-  eno = EINVAL;
-  if (GNUNET_YES == plugin->enable_ipv6)
-  {
-    plugin->sockv6 = GNUNET_NETWORK_socket_create (PF_INET6, SOCK_DGRAM, 0);
-    if (NULL == plugin->sockv6)
-    {
-      LOG (GNUNET_ERROR_TYPE_INFO,
-           _ ("Disabling IPv6 since it is not supported on this system!\n"));
-      plugin->enable_ipv6 = GNUNET_NO;
-    }
-    else
-    {
-      memset (&server_addrv6, 0, sizeof(struct sockaddr_in6));
-#if HAVE_SOCKADDR_IN_SIN_LEN
-      server_addrv6.sin6_len = sizeof(struct sockaddr_in6);
-#endif
-      server_addrv6.sin6_family = AF_INET6;
-      if (NULL != bind_v6)
-        server_addrv6.sin6_addr = bind_v6->sin6_addr;
-      else
-        server_addrv6.sin6_addr = in6addr_any;
-
-      if (0 == plugin->port)     /* autodetect */
-        server_addrv6.sin6_port = htons (
-          GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 33537)
-          + 32000);
-      else
-        server_addrv6.sin6_port = htons (plugin->port);
-      addrlen = sizeof(struct sockaddr_in6);
-      server_addr = (const struct sockaddr *) &server_addrv6;
-
-      tries = 0;
-      while (tries < 10)
-      {
-        LOG (GNUNET_ERROR_TYPE_DEBUG,
-             "Binding to IPv6 `%s'\n",
-             GNUNET_a2s (server_addr, addrlen));
-        /* binding */
-        if (GNUNET_OK ==
-            GNUNET_NETWORK_socket_bind (plugin->sockv6, server_addr, addrlen))
-          break;
-        eno = errno;
-        if (0 != plugin->port)
-        {
-          tries = 10;         /* fail immediately */
-          break;         /* bind failed on specific port */
-        }
-        /* autodetect */
-        server_addrv6.sin6_port = htons (
-          GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 33537)
-          + 32000);
-        tries++;
-      }
-      if (tries >= 10)
-      {
-        GNUNET_NETWORK_socket_close (plugin->sockv6);
-        plugin->enable_ipv6 = GNUNET_NO;
-        plugin->sockv6 = NULL;
-      }
-      else
-      {
-        plugin->port = ntohs (server_addrv6.sin6_port);
-      }
-      if (NULL != plugin->sockv6)
-      {
-        LOG (GNUNET_ERROR_TYPE_DEBUG,
-             "IPv6 UDP socket created listinging at %s\n",
-             GNUNET_a2s (server_addr, addrlen));
-        addrs[sockets_created] = server_addr;
-        addrlens[sockets_created] = addrlen;
-        sockets_created++;
-      }
-      else
-      {
-        LOG (GNUNET_ERROR_TYPE_WARNING,
-             _ ("Failed to bind UDP socket to %s: %s\n"),
-             GNUNET_a2s (server_addr, addrlen),
-             strerror (eno));
-      }
-    }
-  }
-
-  /* Create IPv4 socket */
-  eno = EINVAL;
-  plugin->sockv4 = GNUNET_NETWORK_socket_create (PF_INET, SOCK_DGRAM, 0);
-  if (NULL == plugin->sockv4)
-  {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "socket");
-    LOG (GNUNET_ERROR_TYPE_INFO,
-         _ ("Disabling IPv4 since it is not supported on this system!\n"));
-    plugin->enable_ipv4 = GNUNET_NO;
-  }
-  else
-  {
-    memset (&server_addrv4, 0, sizeof(struct sockaddr_in));
-#if HAVE_SOCKADDR_IN_SIN_LEN
-    server_addrv4.sin_len = sizeof(struct sockaddr_in);
-#endif
-    server_addrv4.sin_family = AF_INET;
-    if (NULL != bind_v4)
-      server_addrv4.sin_addr = bind_v4->sin_addr;
-    else
-      server_addrv4.sin_addr.s_addr = INADDR_ANY;
-
-    if (0 == plugin->port)
-      /* autodetect */
-      server_addrv4.sin_port = htons (
-        GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000);
-    else
-      server_addrv4.sin_port = htons (plugin->port);
-
-    addrlen = sizeof(struct sockaddr_in);
-    server_addr = (const struct sockaddr *) &server_addrv4;
-
-    tries = 0;
-    while (tries < 10)
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Binding to IPv4 `%s'\n",
-           GNUNET_a2s (server_addr, addrlen));
-
-      /* binding */
-      if (GNUNET_OK ==
-          GNUNET_NETWORK_socket_bind (plugin->sockv4, server_addr, addrlen))
-        break;
-      eno = errno;
-      if (0 != plugin->port)
-      {
-        tries = 10;       /* fail */
-        break;       /* bind failed on specific port */
-      }
-
-      /* autodetect */
-      server_addrv4.sin_port = htons (
-        GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000);
-      tries++;
-    }
-    if (tries >= 10)
-    {
-      GNUNET_NETWORK_socket_close (plugin->sockv4);
-      plugin->enable_ipv4 = GNUNET_NO;
-      plugin->sockv4 = NULL;
-    }
-    else
-    {
-      plugin->port = ntohs (server_addrv4.sin_port);
-    }
-
-    if (NULL != plugin->sockv4)
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "IPv4 socket created on port %s\n",
-           GNUNET_a2s (server_addr, addrlen));
-      addrs[sockets_created] = server_addr;
-      addrlens[sockets_created] = addrlen;
-      sockets_created++;
-    }
-    else
-    {
-      LOG (GNUNET_ERROR_TYPE_ERROR,
-           _ ("Failed to bind UDP socket to %s: %s\n"),
-           GNUNET_a2s (server_addr, addrlen),
-           strerror (eno));
-    }
-  }
-
-  if (0 == sockets_created)
-  {
-    LOG (GNUNET_ERROR_TYPE_WARNING, _ ("Failed to open UDP sockets\n"));
-    return 0;   /* No sockets created, return */
-  }
-  schedule_select_v4 (plugin);
-  schedule_select_v6 (plugin);
-  plugin->nat = GNUNET_NAT_register (plugin->env->cfg,
-                                     "transport-udp",
-                                     IPPROTO_UDP,
-                                     sockets_created,
-                                     addrs,
-                                     addrlens,
-                                     &udp_nat_port_map_callback,
-                                     NULL,
-                                     plugin);
-  return sockets_created;
-}
-
-
-/**
- * The exported method. Makes the core api available via a global and
- * returns the udp transport API.
- *
- * @param cls our `struct GNUNET_TRANSPORT_PluginEnvironment`
- * @return our `struct GNUNET_TRANSPORT_PluginFunctions`
- */
-void *
-libgnunet_plugin_transport_udp_init (void *cls)
-{
-  struct GNUNET_TRANSPORT_PluginEnvironment *env = cls;
-  struct GNUNET_TRANSPORT_PluginFunctions *api;
-  struct Plugin *p;
-  unsigned long long port;
-  unsigned long long aport;
-  unsigned long long udp_max_bps;
-  int enable_v6;
-  int enable_broadcasting;
-  int enable_broadcasting_recv;
-  char *bind4_address;
-  char *bind6_address;
-  struct GNUNET_TIME_Relative interval;
-  struct sockaddr_in server_addrv4;
-  struct sockaddr_in6 server_addrv6;
-  unsigned int res;
-  int have_bind4;
-  int have_bind6;
-
-  if (NULL == env->receive)
-  {
-    /* run in 'stub' mode (i.e. as part of gnunet-peerinfo), don't fully
-       initialize the plugin or the API */
-    api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
-    api->cls = NULL;
-    api->address_pretty_printer = &udp_plugin_address_pretty_printer;
-    api->address_to_string = &udp_address_to_string;
-    api->string_to_address = &udp_string_to_address;
-    return api;
-  }
-
-  /* Get port number: port == 0 : autodetect a port,
-  * > 0 : use this port, not given : 2086 default */
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (env->cfg,
-                                                          "transport-udp",
-                                                          "PORT",
-                                                          &port))
-    port = 2086;
-  if (port > 65535)
-  {
-    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
-                               "transport-udp",
-                               "PORT",
-                               _ ("must be in [0,65535]"));
-    return NULL;
-  }
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (env->cfg,
-                                                          "transport-udp",
-                                                          "ADVERTISED_PORT",
-                                                          &aport))
-    aport = port;
-  if (aport > 65535)
-  {
-    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
-                               "transport-udp",
-                               "ADVERTISED_PORT",
-                               _ ("must be in [0,65535]"));
-    return NULL;
-  }
-
-  if (GNUNET_YES ==
-      GNUNET_CONFIGURATION_get_value_yesno (env->cfg, "nat", "DISABLEV6"))
-    enable_v6 = GNUNET_NO;
-  else
-    enable_v6 = GNUNET_YES;
-
-  have_bind4 = GNUNET_NO;
-  memset (&server_addrv4, 0, sizeof(server_addrv4));
-  if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_string (env->cfg,
-                                                           "transport-udp",
-                                                           "BINDTO",
-                                                           &bind4_address))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Binding UDP plugin to specific address: `%s'\n",
-         bind4_address);
-    if (1 != inet_pton (AF_INET, bind4_address, &server_addrv4.sin_addr))
-    {
-      GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
-                                 "transport-udp",
-                                 "BINDTO",
-                                 _ ("must be valid IPv4 address"));
-      GNUNET_free (bind4_address);
-      return NULL;
-    }
-    have_bind4 = GNUNET_YES;
-  }
-  GNUNET_free (bind4_address);
-  have_bind6 = GNUNET_NO;
-  memset (&server_addrv6, 0, sizeof(server_addrv6));
-  if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_string (env->cfg,
-                                                           "transport-udp",
-                                                           "BINDTO6",
-                                                           &bind6_address))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Binding udp plugin to specific address: `%s'\n",
-         bind6_address);
-    if (1 != inet_pton (AF_INET6, bind6_address, &server_addrv6.sin6_addr))
-    {
-      GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
-                                 "transport-udp",
-                                 "BINDTO6",
-                                 _ ("must be valid IPv6 address"));
-      GNUNET_free (bind6_address);
-      return NULL;
-    }
-    have_bind6 = GNUNET_YES;
-  }
-  GNUNET_free (bind6_address);
-
-  enable_broadcasting = GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
-                                                              "transport-udp",
-                                                              "BROADCAST");
-  if (enable_broadcasting == GNUNET_SYSERR)
-    enable_broadcasting = GNUNET_NO;
-
-  enable_broadcasting_recv =
-    GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
-                                          "transport-udp",
-                                          "BROADCAST_RECEIVE");
-  if (enable_broadcasting_recv == GNUNET_SYSERR)
-    enable_broadcasting_recv = GNUNET_YES;
-
-  if (GNUNET_SYSERR ==
-      GNUNET_CONFIGURATION_get_value_time (env->cfg,
-                                           "transport-udp",
-                                           "BROADCAST_INTERVAL",
-                                           &interval))
-  {
-    interval = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10);
-  }
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (env->cfg,
-                                                          "transport-udp",
-                                                          "MAX_BPS",
-                                                          &udp_max_bps))
-  {
-    /* 50 MB/s == infinity for practical purposes */
-    udp_max_bps = 1024 * 1024 * 50;
-  }
-
-  p = GNUNET_new (struct Plugin);
-  p->port = port;
-  p->aport = aport;
-  p->broadcast_interval = interval;
-  p->enable_ipv6 = enable_v6;
-  p->enable_ipv4 = GNUNET_YES; /* default */
-  p->enable_broadcasting = enable_broadcasting;
-  p->enable_broadcasting_receiving = enable_broadcasting_recv;
-  p->env = env;
-  p->sessions = GNUNET_CONTAINER_multipeermap_create (16, GNUNET_NO);
-  p->defrag_ctxs =
-    GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
-  GNUNET_BANDWIDTH_tracker_init (&p->tracker,
-                                 NULL,
-                                 NULL,
-                                 GNUNET_BANDWIDTH_value_init (
-                                   (uint32_t) udp_max_bps),
-                                 30);
-  res = setup_sockets (p,
-                       (GNUNET_YES == have_bind6) ? &server_addrv6 : NULL,
-                       (GNUNET_YES == have_bind4) ? &server_addrv4 : NULL);
-  if ((0 == res) || ((NULL == p->sockv4) && (NULL == p->sockv6)))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR, _ ("Failed to create UDP network sockets\n"));
-    GNUNET_CONTAINER_multipeermap_destroy (p->sessions);
-    GNUNET_CONTAINER_heap_destroy (p->defrag_ctxs);
-    if (NULL != p->nat)
-      GNUNET_NAT_unregister (p->nat);
-    GNUNET_free (p);
-    return NULL;
-  }
-
-  /* Setup broadcasting and receiving beacons */
-  setup_broadcast (p, &server_addrv6, &server_addrv4);
-
-  api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
-  api->cls = p;
-  api->disconnect_session = &udp_disconnect_session;
-  api->query_keepalive_factor = &udp_query_keepalive_factor;
-  api->disconnect_peer = &udp_disconnect;
-  api->address_pretty_printer = &udp_plugin_address_pretty_printer;
-  api->address_to_string = &udp_address_to_string;
-  api->string_to_address = &udp_string_to_address;
-  api->check_address = &udp_plugin_check_address;
-  api->get_session = &udp_plugin_get_session;
-  api->send = &udp_plugin_send;
-  api->get_network = &udp_plugin_get_network;
-  api->get_network_for_address = &udp_plugin_get_network_for_address;
-  api->update_session_timeout = &udp_plugin_update_session_timeout;
-  api->setup_monitor = &udp_plugin_setup_monitor;
-  return api;
-}
-
-
-/**
- * Function called on each entry in the defragmentation heap to
- * clean it up.
- *
- * @param cls NULL
- * @param node node in the heap (to be removed)
- * @param element a `struct DefragContext` to be cleaned up
- * @param cost unused
- * @return #GNUNET_YES
- */
-static int
-heap_cleanup_iterator (void *cls,
-                       struct GNUNET_CONTAINER_HeapNode *node,
-                       void *element,
-                       GNUNET_CONTAINER_HeapCostType cost)
-{
-  struct DefragContext *d_ctx = element;
-
-  GNUNET_CONTAINER_heap_remove_node (node);
-  GNUNET_DEFRAGMENT_context_destroy (d_ctx->defrag);
-  GNUNET_free (d_ctx);
-  return GNUNET_YES;
-}
-
-
-/**
- * The exported method. Makes the core api available via a global and
- * returns the udp transport API.
- *
- * @param cls our `struct GNUNET_TRANSPORT_PluginEnvironment`
- * @return NULL
- */
-void *
-libgnunet_plugin_transport_udp_done (void *cls)
-{
-  struct GNUNET_TRANSPORT_PluginFunctions *api = cls;
-  struct Plugin *plugin = api->cls;
-  struct PrettyPrinterContext *cur;
-  struct UDP_MessageWrapper *udpw;
-
-  if (NULL == plugin)
-  {
-    GNUNET_free (api);
-    return NULL;
-  }
-  stop_broadcast (plugin);
-  if (NULL != plugin->select_task_v4)
-  {
-    GNUNET_SCHEDULER_cancel (plugin->select_task_v4);
-    plugin->select_task_v4 = NULL;
-  }
-  if (NULL != plugin->select_task_v6)
-  {
-    GNUNET_SCHEDULER_cancel (plugin->select_task_v6);
-    plugin->select_task_v6 = NULL;
-  }
-  if (NULL != plugin->sockv4)
-  {
-    GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (plugin->sockv4));
-    plugin->sockv4 = NULL;
-  }
-  if (NULL != plugin->sockv6)
-  {
-    GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (plugin->sockv6));
-    plugin->sockv6 = NULL;
-  }
-  if (NULL != plugin->nat)
-  {
-    GNUNET_NAT_unregister (plugin->nat);
-    plugin->nat = NULL;
-  }
-  if (NULL != plugin->defrag_ctxs)
-  {
-    GNUNET_CONTAINER_heap_iterate (plugin->defrag_ctxs,
-                                   &heap_cleanup_iterator,
-                                   NULL);
-    GNUNET_CONTAINER_heap_destroy (plugin->defrag_ctxs);
-    plugin->defrag_ctxs = NULL;
-  }
-  while (NULL != (udpw = plugin->ipv4_queue_head))
-  {
-    dequeue (plugin, udpw);
-    udpw->qc (udpw->qc_cls, udpw, GNUNET_SYSERR);
-    GNUNET_free (udpw);
-  }
-  while (NULL != (udpw = plugin->ipv6_queue_head))
-  {
-    dequeue (plugin, udpw);
-    udpw->qc (udpw->qc_cls, udpw, GNUNET_SYSERR);
-    GNUNET_free (udpw);
-  }
-  GNUNET_CONTAINER_multipeermap_iterate (plugin->sessions,
-                                         &disconnect_and_free_it,
-                                         plugin);
-  GNUNET_CONTAINER_multipeermap_destroy (plugin->sessions);
-
-  while (NULL != (cur = plugin->ppc_dll_head))
-  {
-    GNUNET_break (0);
-    GNUNET_CONTAINER_DLL_remove (plugin->ppc_dll_head,
-                                 plugin->ppc_dll_tail,
-                                 cur);
-    GNUNET_RESOLVER_request_cancel (cur->resolver_handle);
-    if (NULL != cur->timeout_task)
-    {
-      GNUNET_SCHEDULER_cancel (cur->timeout_task);
-      cur->timeout_task = NULL;
-    }
-    GNUNET_free (cur);
-  }
-  GNUNET_free (plugin);
-  GNUNET_free (api);
-  return NULL;
-}
-
-
-/* end of plugin_transport_udp.c */
diff --git a/src/transport/plugin_transport_udp.h b/src/transport/plugin_transport_udp.h
deleted file mode 100644
index 7192da885..000000000
--- a/src/transport/plugin_transport_udp.h
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
-     This file is part of GNUnet
-     Copyright (C) 2010-2014 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/plugin_transport_udp.h
- * @brief Implementation of the UDP transport protocol
- * @author Christian Grothoff
- * @author Nathan Evans
- * @author Matthias Wachs
- */
-#ifndef PLUGIN_TRANSPORT_UDP_H
-#define PLUGIN_TRANSPORT_UDP_H
-
-#include "platform.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_fragmentation_lib.h"
-#include "gnunet_protocols.h"
-#include "gnunet_resolver_service.h"
-#include "gnunet_signatures.h"
-#include "gnunet_constants.h"
-#include "gnunet_statistics_service.h"
-#include "gnunet_transport_service.h"
-#include "gnunet_transport_plugin.h"
-#include "transport.h"
-
-#define LOG(kind, ...) GNUNET_log_from (kind, "transport-udp", __VA_ARGS__)
-
-#define PLUGIN_NAME "udp"
-
-#define DEBUG_UDP GNUNET_NO
-
-#define DEBUG_UDP_BROADCASTING GNUNET_NO
-
-/**
- * MTU for fragmentation subsystem.  Should be conservative since
- * all communicating peers MUST work with this MTU.
- */
-#define UDP_MTU 1400
-
-
-GNUNET_NETWORK_STRUCT_BEGIN
-/**
- * Network format for IPv4 addresses.
- */
-struct IPv4UdpAddress
-{
-  /**
-   * Optional options and flags for this address
-   */
-  uint32_t options GNUNET_PACKED;
-
-  /**
-   * IPv4 address, in network byte order.
-   */
-  uint32_t ipv4_addr GNUNET_PACKED;
-
-  /**
-   * Port number, in network byte order.
-   */
-  uint16_t u4_port GNUNET_PACKED;
-};
-
-
-/**
- * Network format for IPv6 addresses.
- */
-struct IPv6UdpAddress
-{
-  /**
-   * Optional options and flags for this address
-   */
-  uint32_t options GNUNET_PACKED;
-
-  /**
-   * IPv6 address.
-   */
-  struct in6_addr ipv6_addr GNUNET_PACKED;
-
-  /**
-   * Port number, in network byte order.
-   */
-  uint16_t u6_port GNUNET_PACKED;
-};
-GNUNET_NETWORK_STRUCT_END
-
-/**
- * Either an IPv4 or IPv6 UDP address.  Note that without a "length",
- * one cannot tell which one of the two types this address represents.
- */
-union UdpAddress
-{
-  /**
-   * IPv4 case.
-   */
-  struct IPv4UdpAddress v4;
-
-  /**
-   * IPv6 case.
-   */
-  struct IPv6UdpAddress v6;
-};
-
-
-/**
- * Information we track for each message in the queue.
- */
-struct UDP_MessageWrapper;
-
-
-/**
- * Closure for #append_port().
- */
-struct PrettyPrinterContext;
-
-
-/**
- * Encapsulation of all of the state of the plugin.
- */
-struct Plugin
-{
-  /**
-   * Our environment.
-   */
-  struct GNUNET_TRANSPORT_PluginEnvironment *env;
-
-  /**
-   * Session of peers with whom we are currently connected,
-   * map of peer identity to `struct GNUNET_ATS_Session *`.
-   */
-  struct GNUNET_CONTAINER_MultiPeerMap *sessions;
-
-  /**
-   * Heap with all of our defragmentation activities.
-   */
-  struct GNUNET_CONTAINER_Heap *defrag_ctxs;
-
-  /**
-   * ID of select task for IPv4
-   */
-  struct GNUNET_SCHEDULER_Task *select_task_v4;
-
-  /**
-   * ID of select task for IPv6
-   */
-  struct GNUNET_SCHEDULER_Task *select_task_v6;
-
-  /**
-   * Bandwidth tracker to limit global UDP traffic.
-   */
-  struct GNUNET_BANDWIDTH_Tracker tracker;
-
-  /**
-   * Address we were told to bind to exclusively (IPv4).
-   */
-  char *bind4_address;
-
-  /**
-   * Address we were told to bind to exclusively (IPv6).
-   */
-  char *bind6_address;
-
-  /**
-   * Handle to NAT traversal support.
-   */
-  struct GNUNET_NAT_Handle *nat;
-
-  /**
-   * Handle to NAT traversal support.
-   */
-  struct GNUNET_NAT_STUN_Handle *stun;
-
-  /**
-   * The read socket for IPv4
-   */
-  struct GNUNET_NETWORK_Handle *sockv4;
-
-  /**
-   * The read socket for IPv6
-   */
-  struct GNUNET_NETWORK_Handle *sockv6;
-
-  /**
-   * Head of DLL of broadcast addresses
-   */
-  struct BroadcastAddress *broadcast_tail;
-
-  /**
-   * Tail of DLL of broadcast addresses
-   */
-  struct BroadcastAddress *broadcast_head;
-
-  /**
-   * Head of messages in IPv4 queue.
-   */
-  struct UDP_MessageWrapper *ipv4_queue_head;
-
-  /**
-   * Tail of messages in IPv4 queue.
-   */
-  struct UDP_MessageWrapper *ipv4_queue_tail;
-
-  /**
-   * Head of messages in IPv6 queue.
-   */
-  struct UDP_MessageWrapper *ipv6_queue_head;
-
-  /**
-   * Tail of messages in IPv6 queue.
-   */
-  struct UDP_MessageWrapper *ipv6_queue_tail;
-
-  /**
-   * Running pretty printers: head
-   */
-  struct PrettyPrinterContext *ppc_dll_head;
-
-  /**
-   * Running pretty printers: tail
-   */
-  struct PrettyPrinterContext *ppc_dll_tail;
-
-  /**
-   * Function to call about session status changes.
-   */
-  GNUNET_TRANSPORT_SessionInfoCallback sic;
-
-  /**
-   * Closure for @e sic.
-   */
-  void *sic_cls;
-
-  /**
-   * IPv6 multicast address
-   */
-  struct sockaddr_in6 ipv6_multicast_address;
-
-  /**
-   * Broadcast interval
-   */
-  struct GNUNET_TIME_Relative broadcast_interval;
-
-  /**
-   * Bytes currently in buffer
-   */
-  int64_t bytes_in_buffer;
-
-  /**
-   * Address options
-   */
-  uint32_t myoptions;
-
-  /**
-   * Is IPv6 enabled: #GNUNET_YES or #GNUNET_NO
-   */
-  int enable_ipv6;
-
-  /**
-   * Is IPv4 enabled: #GNUNET_YES or #GNUNET_NO
-   */
-  int enable_ipv4;
-
-  /**
-   * Is broadcasting enabled: #GNUNET_YES or #GNUNET_NO
-   */
-  int enable_broadcasting;
-
-  /**
-   * Is receiving broadcasts enabled: #GNUNET_YES or #GNUNET_NO
-   */
-  int enable_broadcasting_receiving;
-
-  /**
-   * Port we broadcasting on.
-   */
-  uint16_t broadcast_port;
-
-  /**
-   * Port we listen on.
-   */
-  uint16_t port;
-
-  /**
-   * Port we advertise on.
-   */
-  uint16_t aport;
-};
-
-
-/**
- * Function called for a quick conversion of the binary address to
- * a numeric address.  Note that the caller must not free the
- * address and that the next call to this function is allowed
- * to override the address again.
- *
- * @param cls closure
- * @param addr binary address (a `union UdpAddress`)
- * @param addrlen length of the @a addr
- * @return string representing the same address
- */
-const char *
-udp_address_to_string (void *cls,
-                       const void *addr,
-                       size_t addrlen);
-
-
-/**
- * We received a broadcast message.  Process it and all subsequent
- * messages in the same packet.
- *
- * @param plugin the UDP plugin
- * @param buf the buffer with the message(s)
- * @param size number of bytes in @a buf
- * @param udp_addr address of the sender
- * @param udp_addr_len number of bytes in @a udp_addr
- * @param network_type network type of the sender's address
- */
-void
-udp_broadcast_receive (struct Plugin *plugin,
-                       const char *buf,
-                       ssize_t size,
-                       const union UdpAddress *udp_addr,
-                       size_t udp_addr_len,
-                       enum GNUNET_NetworkType network_type);
-
-
-void
-setup_broadcast (struct Plugin *plugin,
-                 struct sockaddr_in6 *server_addrv6,
-                 struct sockaddr_in *server_addrv4);
-
-
-void
-stop_broadcast (struct Plugin *plugin);
-
-/*#ifndef PLUGIN_TRANSPORT_UDP_H*/
-#endif
-/* end of plugin_transport_udp.h */
diff --git a/src/transport/plugin_transport_udp_broadcasting.c b/src/transport/plugin_transport_udp_broadcasting.c
deleted file mode 100644
index a65f5bd2f..000000000
--- a/src/transport/plugin_transport_udp_broadcasting.c
+++ /dev/null
@@ -1,647 +0,0 @@
-/*
-     This file is part of GNUnet
-     Copyright (C) 2010, 2011 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/plugin_transport_udp_broadcasting.c
- * @brief Neighbour discovery with UDP
- * @author Christian Grothoff
- * @author Matthias Wachs
- */
-#include "platform.h"
-#include "plugin_transport_udp.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_fragmentation_lib.h"
-#include "gnunet_protocols.h"
-#include "gnunet_resolver_service.h"
-#include "gnunet_signatures.h"
-#include "gnunet_constants.h"
-#include "gnunet_statistics_service.h"
-#include "gnunet_transport_service.h"
-#include "gnunet_transport_plugin.h"
-#include "transport.h"
-
-#define LOG(kind, ...) GNUNET_log_from (kind, "transport-udp", __VA_ARGS__)
-
-/* *********** Cryogenic ********** */
-#ifdef __linux__
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include <sys/ioctl.h>
-#include <sys/select.h>
-#include <sys/time.h>
-
-#define PM_MAGIC 'k'
-#define PM_SET_DELAY_AND_TIMEOUT _IOW (PM_MAGIC, 1, struct pm_times)
-
-struct pm_times
-{
-  unsigned long delay_msecs;
-  unsigned long timeout_msecs;
-};
-#endif
-/************************************/
-
-
-struct UDP_Beacon_Message
-{
-  /**
-   * Message header.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * What is the identity of the sender
-   */
-  struct GNUNET_PeerIdentity sender;
-};
-
-
-struct BroadcastAddress
-{
-  struct BroadcastAddress *next;
-
-  struct BroadcastAddress *prev;
-
-  /**
-   * ID of select broadcast task
-   */
-  struct GNUNET_SCHEDULER_Task *broadcast_task;
-
-  struct Plugin *plugin;
-
-  struct sockaddr *addr;
-
-  socklen_t addrlen;
-
-#ifdef __linux__
-  /**
-   * Cryogenic handle.
-   */
-  struct GNUNET_DISK_FileHandle *cryogenic_fd;
-
-  /**
-   * Time out for cryogenic.
-   */
-  struct pm_times cryogenic_times;
-#endif
-};
-
-
-/**
- * Client-specific context for #broadcast_mst_cb().
- */
-struct MstContext
-{
-  struct Plugin *plugin;
-
-  const union UdpAddress *udp_addr;
-
-  size_t udp_addr_len;
-
-  /**
-   * ATS network type.
-   */
-  enum GNUNET_NetworkType ats_address_network_type;
-};
-
-
-/**
- * Parse broadcast message received.
- *
- * @param cls the `struct Plugin`
- * @param client the `struct MstContext` with sender address
- * @param message the message we received
- * @return #GNUNET_OK (always)
- */
-static int
-broadcast_mst_cb (void *cls,
-                  const struct GNUNET_MessageHeader *message)
-{
-  struct MstContext *mc = cls;
-  struct Plugin *plugin = mc->plugin;
-  struct GNUNET_HELLO_Address *address;
-  const struct GNUNET_MessageHeader *hello;
-  const struct UDP_Beacon_Message *msg;
-
-  msg = (const struct UDP_Beacon_Message *) message;
-
-  if (GNUNET_MESSAGE_TYPE_TRANSPORT_BROADCAST_BEACON !=
-      ntohs (msg->header.type))
-    return GNUNET_OK;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Received beacon with %u bytes from peer `%s' via address `%s'\n",
-       ntohs (msg->header.size),
-       GNUNET_i2s (&msg->sender),
-       udp_address_to_string (NULL,
-                              mc->udp_addr,
-                              mc->udp_addr_len));
-  hello = (struct GNUNET_MessageHeader *) &msg[1];
-  address = GNUNET_HELLO_address_allocate (&msg->sender,
-                                           PLUGIN_NAME,
-                                           mc->udp_addr,
-                                           mc->udp_addr_len,
-                                           GNUNET_HELLO_ADDRESS_INFO_NONE);
-  plugin->env->receive (plugin->env->cls,
-                        address,
-                        NULL,
-                        hello);
-  GNUNET_HELLO_address_free (address);
-  GNUNET_STATISTICS_update (plugin->env->stats,
-                            _ ("# Multicast HELLO beacons received via UDP"),
-                            1, GNUNET_NO);
-  return GNUNET_OK;
-}
-
-
-/**
- * We received a broadcast message.  Process it and all subsequent
- * messages in the same packet.
- *
- * @param plugin the UDP plugin
- * @param buf the buffer with the message(s)
- * @param size number of bytes in @a buf
- * @param udp_addr address of the sender
- * @param udp_addr_len number of bytes in @a udp_addr
- * @param network_type network type of the sender's address
- */
-void
-udp_broadcast_receive (struct Plugin *plugin,
-                       const char *buf,
-                       ssize_t size,
-                       const union UdpAddress *udp_addr,
-                       size_t udp_addr_len,
-                       enum GNUNET_NetworkType network_type)
-{
-  struct GNUNET_MessageStreamTokenizer *broadcast_mst;
-  struct MstContext mc;
-
-  broadcast_mst = GNUNET_MST_create (&broadcast_mst_cb,
-                                     &mc);
-  mc.plugin = plugin;
-  mc.udp_addr = udp_addr;
-  mc.udp_addr_len = udp_addr_len;
-  mc.ats_address_network_type = network_type;
-  GNUNET_MST_from_buffer (broadcast_mst,
-                          buf, size,
-                          GNUNET_NO,
-                          GNUNET_NO);
-  GNUNET_MST_destroy (broadcast_mst);
-}
-
-
-static unsigned int
-prepare_beacon (struct Plugin *plugin,
-                struct UDP_Beacon_Message *msg)
-{
-  uint16_t hello_size;
-  uint16_t msg_size;
-
-  const struct GNUNET_MessageHeader *hello;
-
-  hello = plugin->env->get_our_hello ();
-  if (NULL == hello)
-    return 0;
-  hello_size = GNUNET_HELLO_size ((struct GNUNET_HELLO_Message *) hello);
-  msg_size = hello_size + sizeof(struct UDP_Beacon_Message);
-
-  if ((hello_size < (sizeof(struct GNUNET_MessageHeader))) ||
-      (msg_size > (UDP_MTU)))
-    return 0;
-
-  msg->sender = *(plugin->env->my_identity);
-  msg->header.size = htons (msg_size);
-  msg->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_BROADCAST_BEACON);
-  GNUNET_memcpy (&msg[1], hello, hello_size);
-  return msg_size;
-}
-
-
-static void
-udp_ipv4_broadcast_send (void *cls)
-{
-  struct BroadcastAddress *baddr = cls;
-  struct Plugin *plugin = baddr->plugin;
-  int sent;
-  uint16_t msg_size;
-  char buf[65536] GNUNET_ALIGN;
-
-  baddr->broadcast_task = NULL;
-
-  msg_size = prepare_beacon (plugin, (struct UDP_Beacon_Message *) &buf);
-  if (0 != msg_size)
-  {
-    struct sockaddr_in *addr = (struct sockaddr_in *) baddr->addr;
-
-    addr->sin_port = htons (plugin->port);
-    sent = GNUNET_NETWORK_socket_sendto (plugin->sockv4, &buf, msg_size,
-                                         (const struct sockaddr *) addr,
-                                         baddr->addrlen);
-    if (sent == GNUNET_SYSERR)
-    {
-      if ((ENETUNREACH == errno) || (ENETDOWN == errno))
-      {
-        /* "Network unreachable" or "Network down"
-         *
-         * This indicates that we just do not have network connectivity
-         */
-        GNUNET_log (GNUNET_ERROR_TYPE_BULK | GNUNET_ERROR_TYPE_WARNING,
-                    "Network connectivity is down, cannot send beacon!\n");
-      }
-      else
-        GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "sendto");
-    }
-    else
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Sent HELLO beacon broadcast with %i bytes to address %s\n", sent,
-           GNUNET_a2s (baddr->addr, baddr->addrlen));
-    }
-  }
-
-#ifdef __linux__
-  /*
-   * Cryogenic
-   */
-  if (NULL != baddr->cryogenic_fd)
-  {
-    baddr->cryogenic_times.delay_msecs =
-      (plugin->broadcast_interval.rel_value_us / 1000.0) * 0.5;
-    baddr->cryogenic_times.timeout_msecs =
-      (plugin->broadcast_interval.rel_value_us / 1000.0) * 1.5;
-
-    if (ioctl (baddr->cryogenic_fd->fd,
-               PM_SET_DELAY_AND_TIMEOUT,
-               &baddr->cryogenic_times) < 0)
-    {
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "ioctl");
-      baddr->broadcast_task =
-        GNUNET_SCHEDULER_add_delayed (plugin->broadcast_interval,
-                                      &udp_ipv4_broadcast_send, baddr);
-    }
-    else
-      GNUNET_SCHEDULER_add_write_file (GNUNET_TIME_UNIT_FOREVER_REL,
-                                       baddr->cryogenic_fd,
-                                       &udp_ipv4_broadcast_send,
-                                       baddr);
-  }
-  else
-#endif
-  baddr->broadcast_task =
-    GNUNET_SCHEDULER_add_delayed (plugin->broadcast_interval,
-                                  &udp_ipv4_broadcast_send, baddr);
-}
-
-
-static void
-udp_ipv6_broadcast_send (void *cls)
-{
-  struct BroadcastAddress *baddr = cls;
-  struct Plugin *plugin = baddr->plugin;
-  ssize_t sent;
-  uint16_t msg_size;
-  char buf[65536] GNUNET_ALIGN;
-  const struct sockaddr_in6 *s6 = (const struct sockaddr_in6 *) baddr->addr;
-
-  baddr->broadcast_task = NULL;
-
-  msg_size = prepare_beacon (plugin, (struct UDP_Beacon_Message *) &buf);
-  /* Note: unclear if this actually works to limit the multicast to
-     the specified interface as we're not (necessarily) using a
-     link-local multicast group and the kernel suggests that the
-     scope ID is only respected for link-local addresses; however,
-     if the scope ID is ignored, the kernel should just multicast
-     on ALL interfaces, which is merely slightly less efficient;
-     in that case, we might want to revert to only doing this
-     once, and not per interface (hard to test...) */plugin->ipv6_multicast_address.sin6_scope_id = s6->sin6_scope_id;
-  sent = GNUNET_NETWORK_socket_sendto (plugin->sockv6, &buf, msg_size,
-                                       (const struct sockaddr *)
-                                       &plugin->ipv6_multicast_address,
-                                       sizeof(struct sockaddr_in6));
-  plugin->ipv6_multicast_address.sin6_scope_id = 0;
-  if (sent == GNUNET_SYSERR)
-  {
-    if ((ENETUNREACH == errno) || (ENETDOWN == errno))
-    {
-      /* "Network unreachable" or "Network down"
-       *
-       * This indicates that this system is IPv6 enabled, but does not
-       * have a valid global IPv6 address assigned
-       */GNUNET_log (GNUNET_ERROR_TYPE_BULK | GNUNET_ERROR_TYPE_WARNING,
-                  "Network connectivity is down, cannot send beacon!\n");
-    }
-    else
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "sendto");
-  }
-  else
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Sending IPv6 HELLO beacon broadcast with %d bytes to address %s\n",
-         (int) sent,
-         GNUNET_a2s ((const struct sockaddr *) &plugin->ipv6_multicast_address,
-                     sizeof(struct sockaddr_in6)));
-  }
-#ifdef __linux__
-  /*
-   * Cryogenic
-   */
-  if (NULL != baddr->cryogenic_fd)
-  {
-    baddr->cryogenic_times.delay_msecs =
-      (plugin->broadcast_interval.rel_value_us / 1000.0) * 0.5;
-    baddr->cryogenic_times.timeout_msecs =
-      (plugin->broadcast_interval.rel_value_us / 1000.0) * 1.5;
-
-    if (ioctl (baddr->cryogenic_fd->fd,
-               PM_SET_DELAY_AND_TIMEOUT,
-               &baddr->cryogenic_times) < 0)
-    {
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "ioctl");
-      baddr->broadcast_task =
-        GNUNET_SCHEDULER_add_delayed (plugin->broadcast_interval,
-                                      &udp_ipv6_broadcast_send, baddr);
-    }
-    else
-      GNUNET_SCHEDULER_add_write_file (GNUNET_TIME_UNIT_FOREVER_REL,
-                                       baddr->cryogenic_fd,
-                                       &udp_ipv6_broadcast_send,
-                                       baddr);
-  }
-  else
-#endif
-  baddr->broadcast_task =
-    GNUNET_SCHEDULER_add_delayed (plugin->broadcast_interval,
-                                  &udp_ipv6_broadcast_send, baddr);
-}
-
-
-/**
- * Callback function invoked for each interface found.
- *
- * @param cls closure with the `struct Plugin`
- * @param name name of the interface (can be NULL for unknown)
- * @param isDefault is this presumably the default interface
- * @param addr address of this interface (can be NULL for unknown or unassigned)
- * @param broadcast_addr the broadcast address (can be NULL for unknown or unassigned)
- * @param netmask the network mask (can be NULL for unknown or unassigned)
- * @param addrlen length of the address
- * @return #GNUNET_OK to continue iteration, #GNUNET_SYSERR to abort
- */
-static int
-iface_proc (void *cls,
-            const char *name,
-            int isDefault,
-            const struct sockaddr *addr,
-            const struct sockaddr *broadcast_addr,
-            const struct sockaddr *netmask, socklen_t addrlen)
-{
-  struct Plugin *plugin = cls;
-  struct BroadcastAddress *ba;
-  enum GNUNET_NetworkType network;
-
-  if (NULL == addr)
-    return GNUNET_OK;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "address %s for interface %s %p\n ",
-              GNUNET_a2s (addr, addrlen), name, addr);
-  if (NULL == broadcast_addr)
-    return GNUNET_OK;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "broadcast address %s for interface %s %p\n ",
-              GNUNET_a2s (broadcast_addr, addrlen), name, broadcast_addr);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "netmask %s for interface %s %p\n ",
-              GNUNET_a2s (netmask, addrlen), name, netmask);
-
-  network = plugin->env->get_address_type (plugin->env->cls, broadcast_addr,
-                                           addrlen);
-  if (GNUNET_NT_LOOPBACK == network)
-  {
-    /* Broadcasting on loopback does not make sense */
-    return GNUNET_YES;
-  }
-
-  ba = GNUNET_new (struct BroadcastAddress);
-  ba->plugin = plugin;
-  ba->addr = GNUNET_malloc (addrlen);
-  GNUNET_memcpy (ba->addr, broadcast_addr, addrlen);
-  ba->addrlen = addrlen;
-
-  if ((GNUNET_YES == plugin->enable_ipv4) &&
-      (NULL != plugin->sockv4) &&
-      (addrlen == sizeof(struct sockaddr_in)))
-  {
-#ifdef __linux__
-    /*
-     * setup Cryogenic FD for ipv4 broadcasting
-     */
-    char *filename;
-
-    GNUNET_asprintf (&filename,
-                     "/dev/cryogenic/%s",
-                     name);
-    if (0 == access (name, R_OK))
-    {
-      ba->cryogenic_fd =
-        GNUNET_DISK_file_open (filename,
-                               GNUNET_DISK_OPEN_WRITE,
-                               GNUNET_DISK_PERM_NONE);
-    }
-    GNUNET_free (filename);
-#endif
-    ba->broadcast_task =
-      GNUNET_SCHEDULER_add_now (&udp_ipv4_broadcast_send, ba);
-  }
-  if ((GNUNET_YES == plugin->enable_ipv6) &&
-      (NULL != plugin->sockv6) &&
-      (addrlen == sizeof(struct sockaddr_in6)))
-  {
-    /* Create IPv6 multicast request */
-    struct ipv6_mreq multicastRequest;
-    const struct sockaddr_in6 *s6 = (const struct
-                                     sockaddr_in6 *) broadcast_addr;
-
-    multicastRequest.ipv6mr_multiaddr =
-      plugin->ipv6_multicast_address.sin6_addr;
-    /* http://tools.ietf.org/html/rfc2553#section-5.2:
-     *
-     * IPV6_JOIN_GROUP
-     *
-     * Join a multicast group on a specified local interface.  If the
-     * interface index is specified as 0, the kernel chooses the local
-     * interface.  For example, some kernels look up the multicast
-     * group in the normal IPv6 routing table and using the resulting
-     * interface; we do this for each interface, so no need to use
-     * zero (anymore...).
-     */multicastRequest.ipv6mr_interface = s6->sin6_scope_id;
-
-    /* Join the multicast group */
-    if (GNUNET_OK !=
-        GNUNET_NETWORK_socket_setsockopt
-          (plugin->sockv6, IPPROTO_IPV6, IPV6_JOIN_GROUP,
-          &multicastRequest, sizeof(multicastRequest)))
-    {
-      LOG (GNUNET_ERROR_TYPE_WARNING,
-           "Failed to join IPv6 multicast group: IPv6 broadcasting not running\n");
-    }
-    else
-    {
-#ifdef __linux__
-      /*
-       * setup Cryogenic FD for ipv6 broadcasting
-       */
-      char *filename;
-
-      GNUNET_asprintf (&filename,
-                       "/dev/cryogenic/%s",
-                       name);
-      if (0 == access (name, R_OK))
-      {
-        ba->cryogenic_fd =
-          GNUNET_DISK_file_open (filename,
-                                 GNUNET_DISK_OPEN_WRITE,
-                                 GNUNET_DISK_PERM_NONE);
-      }
-      GNUNET_free (filename);
-#endif
-      ba->broadcast_task =
-        GNUNET_SCHEDULER_add_now (&udp_ipv6_broadcast_send, ba);
-    }
-  }
-  GNUNET_CONTAINER_DLL_insert (plugin->broadcast_head,
-                               plugin->broadcast_tail, ba);
-  return GNUNET_OK;
-}
-
-
-/**
- * Setup broadcasting subsystem.
- *
- * @param plugin
- * @param server_addrv6
- * @param server_addrv4
- */
-void
-setup_broadcast (struct Plugin *plugin,
-                 struct sockaddr_in6 *server_addrv6,
-                 struct sockaddr_in *server_addrv4)
-{
-  if (GNUNET_YES ==
-      GNUNET_CONFIGURATION_get_value_yesno (plugin->env->cfg,
-                                            "topology",
-                                            "FRIENDS-ONLY"))
-  {
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         _ (
-           "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"));
-    return;
-  }
-
-  if (GNUNET_YES != plugin->enable_broadcasting)
-    return; /* We do not send, just receive */
-
-  /* create IPv4 broadcast socket */
-  if ((GNUNET_YES == plugin->enable_ipv4) && (NULL != plugin->sockv4))
-  {
-    static int yes = 1;
-
-    if (GNUNET_NETWORK_socket_setsockopt
-          (plugin->sockv4, SOL_SOCKET, SO_BROADCAST, &yes,
-          sizeof(int)) != GNUNET_OK)
-    {
-      LOG (GNUNET_ERROR_TYPE_WARNING,
-           _ (
-             "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"),
-           ntohs (server_addrv4->sin_port));
-    }
-  }
-  /* create IPv6 multicast socket */
-  if ((GNUNET_YES == plugin->enable_ipv6) && (plugin->sockv6 != NULL))
-  {
-    memset (&plugin->ipv6_multicast_address, 0, sizeof(struct sockaddr_in6));
-    GNUNET_assert (1 ==
-                   inet_pton (AF_INET6, "FF05::13B",
-                              &plugin->ipv6_multicast_address.sin6_addr));
-    plugin->ipv6_multicast_address.sin6_family = AF_INET6;
-    plugin->ipv6_multicast_address.sin6_port = htons (plugin->port);
-  }
-  GNUNET_OS_network_interfaces_list (&iface_proc, plugin);
-}
-
-
-/**
- * Stop broadcasting subsystem.
- *
- * @param plugin
- */
-void
-stop_broadcast (struct Plugin *plugin)
-{
-  if (GNUNET_YES == plugin->enable_broadcasting)
-  {
-    /* Disable broadcasting */
-    while (plugin->broadcast_head != NULL)
-    {
-      struct BroadcastAddress *p = plugin->broadcast_head;
-
-      if (p->broadcast_task != NULL)
-      {
-        GNUNET_SCHEDULER_cancel (p->broadcast_task);
-        p->broadcast_task = NULL;
-      }
-      if ((GNUNET_YES == plugin->enable_ipv6) &&
-          (NULL != plugin->sockv6) &&
-          (p->addrlen == sizeof(struct sockaddr_in6)))
-      {
-        /* Create IPv6 multicast request */
-        struct ipv6_mreq multicastRequest;
-        const struct sockaddr_in6 *s6 = (const struct sockaddr_in6 *) p->addr;
-
-        multicastRequest.ipv6mr_multiaddr =
-          plugin->ipv6_multicast_address.sin6_addr;
-        multicastRequest.ipv6mr_interface = s6->sin6_scope_id;
-
-        /* Leave the multicast group */
-        if (GNUNET_OK ==
-            GNUNET_NETWORK_socket_setsockopt
-              (plugin->sockv6, IPPROTO_IPV6, IPV6_LEAVE_GROUP,
-              &multicastRequest, sizeof(multicastRequest)))
-        {
-          GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "setsockopt");
-        }
-        else
-        {
-          LOG (GNUNET_ERROR_TYPE_DEBUG, "IPv6 multicasting stopped\n");
-        }
-      }
-
-#ifdef __linux__
-      GNUNET_DISK_file_close (p->cryogenic_fd);
-#endif
-      GNUNET_CONTAINER_DLL_remove (plugin->broadcast_head,
-                                   plugin->broadcast_tail, p);
-      GNUNET_free (p->addr);
-      GNUNET_free (p);
-    }
-  }
-}
-
-
-/* end of plugin_transport_udp_broadcasting.c */
diff --git a/src/transport/plugin_transport_unix.c b/src/transport/plugin_transport_unix.c
deleted file mode 100644
index 269949a99..000000000
--- a/src/transport/plugin_transport_unix.c
+++ /dev/null
@@ -1,1890 +0,0 @@
-/*
-     This file is part of GNUnet
-     Copyright (C) 2010-2014 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/plugin_transport_unix.c
- * @brief Transport plugin using unix domain sockets (!)
- *        Clearly, can only be used locally on Unix/Linux hosts...
- *        ONLY INTENDED FOR TESTING!!!
- * @author Christian Grothoff
- * @author Nathan Evans
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_protocols.h"
-#include "gnunet_statistics_service.h"
-#include "gnunet_transport_service.h"
-#include "gnunet_transport_plugin.h"
-#include "transport.h"
-
-
-/**
- * Return code we give on 'send' if we failed to send right now
- * but it makes sense to retry later. (Note: we might want to
- * move this to the plugin API!?).
- */
-#define RETRY 0
-
-/**
- * Name of the plugin.
- */
-#define PLUGIN_NAME "unix"
-
-/**
- * Options for UNIX Domain addresses.
- */
-enum UNIX_ADDRESS_OPTIONS
-{
-  /**
-   * No special options.
-   */
-  UNIX_OPTIONS_NONE = 0,
-
-  /**
-   * Linux abstract domain sockets should be used.
-   */
-  UNIX_OPTIONS_USE_ABSTRACT_SOCKETS = 1
-};
-
-
-/**
- * How long until we give up on transmitting the welcome message?
- */
-#define HOSTNAME_RESOLVE_TIMEOUT \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
-
-#define LOG(kind, ...) GNUNET_log_from (kind, "transport-unix", __VA_ARGS__)
-
-
-GNUNET_NETWORK_STRUCT_BEGIN
-
-/**
- * Binary format for an UNIX Domain Socket address in GNUnet.
- */
-struct UnixAddress
-{
-  /**
-   * Options to use for the address, in NBO
-   */
-  uint32_t options GNUNET_PACKED;
-
-  /**
-   * Length of the address (path length), in NBO
-   */
-  uint32_t addrlen GNUNET_PACKED;
-
-  /* followed by actual path */
-};
-
-
-/**
- * UNIX Message-Packet header.
- */
-struct UNIXMessage
-{
-  /**
-   * Message header.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * What is the identity of the sender (GNUNET_hash of public key)
-   */
-  struct GNUNET_PeerIdentity sender;
-};
-
-GNUNET_NETWORK_STRUCT_END
-
-
-/**
- * Information we track for a message awaiting transmission.
- */
-struct UNIXMessageWrapper
-{
-  /**
-   * We keep messages in a doubly linked list.
-   */
-  struct UNIXMessageWrapper *next;
-
-  /**
-   * We keep messages in a doubly linked list.
-   */
-  struct UNIXMessageWrapper *prev;
-
-  /**
-   * The actual payload (allocated separately right now).
-   */
-  struct UNIXMessage *msg;
-
-  /**
-   * Session this message belongs to.
-   */
-  struct GNUNET_ATS_Session *session;
-
-  /**
-   * Function to call upon transmission.
-   */
-  GNUNET_TRANSPORT_TransmitContinuation cont;
-
-  /**
-   * Closure for @e cont.
-   */
-  void *cont_cls;
-
-  /**
-   * Timeout for this message.
-   */
-  struct GNUNET_TIME_Absolute timeout;
-
-  /**
-   * Number of bytes in @e msg.
-   */
-  size_t msgsize;
-
-  /**
-   * Number of bytes of payload encapsulated in @e msg.
-   */
-  size_t payload;
-
-  /**
-   * Priority of the message (ignored, just dragged along in UNIX).
-   */
-  unsigned int priority;
-};
-
-
-/**
- * Handle for a session.
- */
-struct GNUNET_ATS_Session
-{
-  /**
-   * Sessions with pending messages (!) are kept in a DLL.
-   */
-  struct GNUNET_ATS_Session *next;
-
-  /**
-   * Sessions with pending messages (!) are kept in a DLL.
-   */
-  struct GNUNET_ATS_Session *prev;
-
-  /**
-   * To whom are we talking to (set to our identity
-   * if we are still waiting for the welcome message).
-   *
-   * FIXME: information duplicated with 'peer' in address!
-   */
-  struct GNUNET_PeerIdentity target;
-
-  /**
-   * Pointer to the global plugin struct.
-   */
-  struct Plugin *plugin;
-
-  /**
-   * Address of the other peer.
-   */
-  struct GNUNET_HELLO_Address *address;
-
-  /**
-   * Number of bytes we currently have in our write queue.
-   */
-  unsigned long long bytes_in_queue;
-
-  /**
-   * Timeout for this session.
-   */
-  struct GNUNET_TIME_Absolute timeout;
-
-  /**
-   * Session timeout task.
-   */
-  struct GNUNET_SCHEDULER_Task *timeout_task;
-
-  /**
-   * Number of messages we currently have in our write queue.
-   */
-  unsigned int msgs_in_queue;
-};
-
-
-/**
- * Encapsulation of all of the state of the plugin.
- */
-struct Plugin;
-
-
-/**
- * Information we keep for each of our listen sockets.
- */
-struct UNIX_Sock_Info
-{
-  /**
-   * The network handle
-   */
-  struct GNUNET_NETWORK_Handle *desc;
-};
-
-
-/**
- * Encapsulation of all of the state of the plugin.
- */
-struct Plugin
-{
-  /**
-   * ID of task used to update our addresses when one expires.
-   */
-  struct GNUNET_SCHEDULER_Task *address_update_task;
-
-  /**
-   * ID of read task
-   */
-  struct GNUNET_SCHEDULER_Task *read_task;
-
-  /**
-   * ID of write task
-   */
-  struct GNUNET_SCHEDULER_Task *write_task;
-
-  /**
-   * Number of bytes we currently have in our write queues.
-   */
-  unsigned long long bytes_in_queue;
-
-  /**
-   * Our environment.
-   */
-  struct GNUNET_TRANSPORT_PluginEnvironment *env;
-
-  /**
-   * Sessions (map from peer identity to `struct GNUNET_ATS_Session`)
-   */
-  struct GNUNET_CONTAINER_MultiPeerMap *session_map;
-
-  /**
-   * Head of queue of messages to transmit.
-   */
-  struct UNIXMessageWrapper *msg_head;
-
-  /**
-   * Tail of queue of messages to transmit.
-   */
-  struct UNIXMessageWrapper *msg_tail;
-
-  /**
-   * Path of our unix domain socket (/tmp/unix-plugin)
-   */
-  char *unix_socket_path;
-
-  /**
-   * Function to call about session status changes.
-   */
-  GNUNET_TRANSPORT_SessionInfoCallback sic;
-
-  /**
-   * Closure for @e sic.
-   */
-  void *sic_cls;
-
-  /**
-   * socket that we transmit all data with
-   */
-  struct UNIX_Sock_Info unix_sock;
-
-  /**
-   * Address options in HBO
-   */
-  uint32_t myoptions;
-
-  /**
-   * Are we using an abstract UNIX domain socket?
-   */
-  int is_abstract;
-};
-
-
-/**
- * If a session monitor is attached, notify it about the new
- * session state.
- *
- * @param plugin our plugin
- * @param session session that changed state
- * @param state new state of the session
- */
-static void
-notify_session_monitor (struct Plugin *plugin,
-                        struct GNUNET_ATS_Session *session,
-                        enum GNUNET_TRANSPORT_SessionState state)
-{
-  struct GNUNET_TRANSPORT_SessionInfo info;
-
-  if (NULL == plugin->sic)
-    return;
-  memset (&info, 0, sizeof(info));
-  info.state = state;
-  info.is_inbound = GNUNET_SYSERR; /* hard to say */
-  info.num_msg_pending = session->msgs_in_queue;
-  info.num_bytes_pending = session->bytes_in_queue;
-  /* info.receive_delay remains zero as this is not supported by UNIX
-     (cannot selectively not receive from 'some' peer while continuing
-     to receive from others) */
-  info.session_timeout = session->timeout;
-  info.address = session->address;
-  plugin->sic (plugin->sic_cls, session, &info);
-}
-
-
-/**
- * Function called for a quick conversion of the binary address to
- * a numeric address.  Note that the caller must not free the
- * address and that the next call to this function is allowed
- * to override the address again.
- *
- * @param cls closure
- * @param addr binary address
- * @param addrlen length of the @a addr
- * @return string representing the same address
- */
-static const char *
-unix_plugin_address_to_string (void *cls, const void *addr, size_t addrlen)
-{
-  static char rbuf[1024];
-  struct UnixAddress *ua = (struct UnixAddress *) addr;
-  char *addrstr;
-  size_t addr_str_len;
-  unsigned int off;
-
-  if ((NULL == addr) || (sizeof(struct UnixAddress) > addrlen))
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-  addrstr = (char *) &ua[1];
-  addr_str_len = ntohl (ua->addrlen);
-
-  if (addr_str_len != addrlen - sizeof(struct UnixAddress))
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-  if ('\0' != addrstr[addr_str_len - 1])
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-  if (strlen (addrstr) + 1 != addr_str_len)
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-
-  off = 0;
-  if ('\0' == addrstr[0])
-    off++;
-  memset (rbuf, 0, sizeof(rbuf));
-  GNUNET_snprintf (rbuf,
-                   sizeof(rbuf) - 1,
-                   "%s.%u.%s%.*s",
-                   PLUGIN_NAME,
-                   ntohl (ua->options),
-                   (off == 1) ? "@" : "",
-                   (int) (addr_str_len - off),
-                   &addrstr[off]);
-  return rbuf;
-}
-
-
-/**
- * Functions with this signature are called whenever we need
- * to close a session due to a disconnect or failure to
- * establish a connection.
- *
- * @param cls closure with the `struct Plugin *`
- * @param session session to close down
- * @return #GNUNET_OK on success
- */
-static int
-unix_plugin_session_disconnect (void *cls, struct GNUNET_ATS_Session *session)
-{
-  struct Plugin *plugin = cls;
-  struct UNIXMessageWrapper *msgw;
-  struct UNIXMessageWrapper *next;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Disconnecting session for peer `%s' `%s'\n",
-       GNUNET_i2s (&session->target),
-       unix_plugin_address_to_string (NULL,
-                                      session->address->address,
-                                      session->address->address_length));
-  plugin->env->session_end (plugin->env->cls, session->address, session);
-  next = plugin->msg_head;
-  while (NULL != next)
-  {
-    msgw = next;
-    next = msgw->next;
-    if (msgw->session != session)
-      continue;
-    GNUNET_CONTAINER_DLL_remove (plugin->msg_head, plugin->msg_tail, msgw);
-    session->msgs_in_queue--;
-    GNUNET_assert (session->bytes_in_queue >= msgw->msgsize);
-    session->bytes_in_queue -= msgw->msgsize;
-    GNUNET_assert (plugin->bytes_in_queue >= msgw->msgsize);
-    plugin->bytes_in_queue -= msgw->msgsize;
-    if (NULL != msgw->cont)
-      msgw->cont (msgw->cont_cls,
-                  &msgw->session->target,
-                  GNUNET_SYSERR,
-                  msgw->payload,
-                  0);
-    GNUNET_free (msgw->msg);
-    GNUNET_free (msgw);
-  }
-  GNUNET_assert (GNUNET_YES ==
-                 GNUNET_CONTAINER_multipeermap_remove (plugin->session_map,
-                                                       &session->target,
-                                                       session));
-  GNUNET_STATISTICS_set (plugin->env->stats,
-                         "# UNIX sessions active",
-                         GNUNET_CONTAINER_multipeermap_size (
-                           plugin->session_map),
-                         GNUNET_NO);
-  if (NULL != session->timeout_task)
-  {
-    GNUNET_SCHEDULER_cancel (session->timeout_task);
-    session->timeout_task = NULL;
-    session->timeout = GNUNET_TIME_UNIT_ZERO_ABS;
-  }
-  notify_session_monitor (plugin, session, GNUNET_TRANSPORT_SS_DONE);
-  GNUNET_HELLO_address_free (session->address);
-  GNUNET_break (0 == session->bytes_in_queue);
-  GNUNET_break (0 == session->msgs_in_queue);
-  GNUNET_free (session);
-  return GNUNET_OK;
-}
-
-
-/**
- * Session was idle for too long, so disconnect it
- *
- * @param cls the `struct GNUNET_ATS_Session *` to disconnect
- */
-static void
-session_timeout (void *cls)
-{
-  struct GNUNET_ATS_Session *session = cls;
-  struct GNUNET_TIME_Relative left;
-
-  session->timeout_task = NULL;
-  left = GNUNET_TIME_absolute_get_remaining (session->timeout);
-  if (0 != left.rel_value_us)
-  {
-    /* not actually our turn yet, but let's at least update
-       the monitor, it may think we're about to die ... */
-    notify_session_monitor (session->plugin,
-                            session,
-                            GNUNET_TRANSPORT_SS_UPDATE);
-    session->timeout_task =
-      GNUNET_SCHEDULER_add_delayed (left, &session_timeout, session);
-    return;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Session %p was idle for %s, disconnecting\n",
-       session,
-       GNUNET_STRINGS_relative_time_to_string (
-         GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
-         GNUNET_YES));
-  unix_plugin_session_disconnect (session->plugin, session);
-}
-
-
-/**
- * Increment session timeout due to activity.  We do not immediately
- * notify the monitor here as that might generate excessive
- * signalling.
- *
- * @param session session for which the timeout should be rescheduled
- */
-static void
-reschedule_session_timeout (struct GNUNET_ATS_Session *session)
-{
-  GNUNET_assert (NULL != session->timeout_task);
-  session->timeout =
-    GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
-}
-
-
-/**
- * Convert unix path to a `struct sockaddr_un *`
- *
- * @param unixpath path to convert
- * @param[out] sock_len set to the length of the address
- * @return converted unix path
- */
-static struct sockaddr_un *
-unix_address_to_sockaddr (const char *unixpath, socklen_t *sock_len)
-{
-  struct sockaddr_un *un;
-  size_t slen;
-
-  GNUNET_assert (0 < strlen (unixpath));   /* sanity check */
-  un = GNUNET_new (struct sockaddr_un);
-  un->sun_family = AF_UNIX;
-  slen = strlen (unixpath);
-  if (slen >= sizeof(un->sun_path))
-    slen = sizeof(un->sun_path) - 1;
-  GNUNET_memcpy (un->sun_path, unixpath, slen);
-  un->sun_path[slen] = '\0';
-  slen = sizeof(struct sockaddr_un);
-#if HAVE_SOCKADDR_UN_SUN_LEN
-  un->sun_len = (u_char) slen;
-#endif
-  (*sock_len) = slen;
-  return un;
-}
-
-
-/**
- * Closure to #lookup_session_it().
- */
-struct LookupCtx
-{
-  /**
-   * Location to store the session, if found.
-   */
-  struct GNUNET_ATS_Session *res;
-
-  /**
-   * Address we are looking for.
-   */
-  const struct GNUNET_HELLO_Address *address;
-};
-
-
-/**
- * Function called to find a session by address.
- *
- * @param cls the `struct LookupCtx *`
- * @param key peer we are looking for (unused)
- * @param value a session
- * @return #GNUNET_YES if not found (continue looking), #GNUNET_NO on success
- */
-static int
-lookup_session_it (void *cls,
-                   const struct GNUNET_PeerIdentity *key,
-                   void *value)
-{
-  struct LookupCtx *lctx = cls;
-  struct GNUNET_ATS_Session *session = value;
-
-  if (0 == GNUNET_HELLO_address_cmp (lctx->address, session->address))
-  {
-    lctx->res = session;
-    return GNUNET_NO;
-  }
-  return GNUNET_YES;
-}
-
-
-/**
- * Find an existing session by address.
- *
- * @param plugin the plugin
- * @param address the address to find
- * @return NULL if session was not found
- */
-static struct GNUNET_ATS_Session *
-lookup_session (struct Plugin *plugin,
-                const struct GNUNET_HELLO_Address *address)
-{
-  struct LookupCtx lctx;
-
-  lctx.address = address;
-  lctx.res = NULL;
-  GNUNET_CONTAINER_multipeermap_get_multiple (plugin->session_map,
-                                              &address->peer,
-                                              &lookup_session_it,
-                                              &lctx);
-  return lctx.res;
-}
-
-
-/**
- * Function that is called to get the keepalive factor.
- * #GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT is divided by this number to
- * calculate the interval between keepalive packets.
- *
- * @param cls closure with the `struct Plugin`
- * @return keepalive factor
- */
-static unsigned int
-unix_plugin_query_keepalive_factor (void *cls)
-{
-  return 3;
-}
-
-
-/**
- * Actually send out the message, assume we've got the address and
- * send_handle squared away!
- *
- * @param cls closure
- * @param send_handle which handle to send message on
- * @param target who should receive this message (ignored by UNIX)
- * @param msgbuf one or more GNUNET_MessageHeader(s) strung together
- * @param msgbuf_size the size of the @a msgbuf to send
- * @param priority how important is the message (ignored by UNIX)
- * @param timeout when should we time out (give up) if we can not transmit?
- * @param addr the addr to send the message to, needs to be a sockaddr for us
- * @param addrlen the len of @a addr
- * @param payload bytes payload to send
- * @param cont continuation to call once the message has
- *        been transmitted (or if the transport is ready
- *        for the next transmission call; or if the
- *        peer disconnected...)
- * @param cont_cls closure for @a cont
- * @return on success the number of bytes written, RETRY for retry, -1 on errors
- */
-static ssize_t
-unix_real_send (void *cls,
-                struct GNUNET_NETWORK_Handle *send_handle,
-                const struct GNUNET_PeerIdentity *target,
-                const char *msgbuf,
-                size_t msgbuf_size,
-                unsigned int priority,
-                struct GNUNET_TIME_Absolute timeout,
-                const struct UnixAddress *addr,
-                size_t addrlen,
-                size_t payload,
-                GNUNET_TRANSPORT_TransmitContinuation cont,
-                void *cont_cls)
-{
-  struct Plugin *plugin = cls;
-  ssize_t sent;
-  struct sockaddr_un *un;
-  socklen_t un_len;
-  const char *unixpath;
-
-  if (NULL == send_handle)
-  {
-    GNUNET_break (0);  /* We do not have a send handle */
-    return GNUNET_SYSERR;
-  }
-  if ((NULL == addr) || (0 == addrlen))
-  {
-    GNUNET_break (0);  /* Can never send if we don't have an address */
-    return GNUNET_SYSERR;
-  }
-
-  /* Prepare address */
-  unixpath = (const char *) &addr[1];
-  if (NULL == (un = unix_address_to_sockaddr (unixpath, &un_len)))
-  {
-    GNUNET_break (0);
-    return -1;
-  }
-
-  if ((GNUNET_YES == plugin->is_abstract) &&
-      (0 != (UNIX_OPTIONS_USE_ABSTRACT_SOCKETS & ntohl (addr->options))))
-  {
-    un->sun_path[0] = '\0';
-  }
-resend:
-  /* Send the data */
-  sent = GNUNET_NETWORK_socket_sendto (send_handle,
-                                       msgbuf,
-                                       msgbuf_size,
-                                       (const struct sockaddr *) un,
-                                       un_len);
-  if (GNUNET_SYSERR == sent)
-  {
-    if ((EAGAIN == errno) || (ENOBUFS == errno))
-    {
-      GNUNET_free (un);
-      return RETRY;     /* We have to retry later  */
-    }
-    if (EMSGSIZE == errno)
-    {
-      socklen_t size = 0;
-      socklen_t len = sizeof(size);
-
-      GNUNET_NETWORK_socket_getsockopt ((struct GNUNET_NETWORK_Handle *)
-                                        send_handle,
-                                        SOL_SOCKET,
-                                        SO_SNDBUF,
-                                        &size,
-                                        &len);
-      if (size < msgbuf_size)
-      {
-        LOG (GNUNET_ERROR_TYPE_DEBUG,
-             "Trying to increase socket buffer size from %u to %u for message size %u\n",
-             (unsigned int) size,
-             (unsigned int) ((msgbuf_size / 1000) + 2) * 1000,
-             (unsigned int) msgbuf_size);
-        size = ((msgbuf_size / 1000) + 2) * 1000;
-        if (GNUNET_OK ==
-            GNUNET_NETWORK_socket_setsockopt ((struct GNUNET_NETWORK_Handle *)
-                                              send_handle,
-                                              SOL_SOCKET,
-                                              SO_SNDBUF,
-                                              &size,
-                                              sizeof(size)))
-          goto resend;       /* Increased buffer size, retry sending */
-        else
-        {
-          /* Could not increase buffer size: error, no retry */
-          GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "setsockopt");
-          GNUNET_free (un);
-          return GNUNET_SYSERR;
-        }
-      }
-      else
-      {
-        /* Buffer is bigger than message:  error, no retry
-         * This should never happen!*/
-        GNUNET_break (0);
-        GNUNET_free (un);
-        return GNUNET_SYSERR;
-      }
-    }
-  }
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "UNIX transmitted %u-byte message to %s (%d: %s)\n",
-       (unsigned int) msgbuf_size,
-       GNUNET_a2s ((const struct sockaddr *) un, un_len),
-       (int) sent,
-       (sent < 0) ? strerror (errno) : "ok");
-  GNUNET_free (un);
-  return sent;
-}
-
-
-/**
- * Function obtain the network type for a session
- *
- * @param cls closure ('struct Plugin*')
- * @param session the session
- * @return the network type in HBO or #GNUNET_SYSERR
- */
-static enum GNUNET_NetworkType
-unix_plugin_get_network (void *cls, struct GNUNET_ATS_Session *session)
-{
-  GNUNET_assert (NULL != session);
-  return GNUNET_NT_LOOPBACK;
-}
-
-
-/**
- * Function obtain the network type for a session
- *
- * @param cls closure (`struct Plugin *`)
- * @param address the address
- * @return the network type
- */
-static enum GNUNET_NetworkType
-unix_plugin_get_network_for_address (void *cls,
-                                     const struct GNUNET_HELLO_Address *address)
-{
-  return GNUNET_NT_LOOPBACK;
-}
-
-
-/**
- * Creates a new outbound session the transport service will use to send data to the
- * peer
- *
- * @param cls the plugin
- * @param address the address
- * @return the session or NULL of max connections exceeded
- */
-static struct GNUNET_ATS_Session *
-unix_plugin_get_session (void *cls, const struct GNUNET_HELLO_Address *address)
-{
-  struct Plugin *plugin = cls;
-  struct GNUNET_ATS_Session *session;
-  struct UnixAddress *ua;
-  char *addrstr;
-  uint32_t addr_str_len;
-  uint32_t addr_option;
-
-  ua = (struct UnixAddress *) address->address;
-  if ((NULL == address->address) || (0 == address->address_length) ||
-      (sizeof(struct UnixAddress) > address->address_length))
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-  addrstr = (char *) &ua[1];
-  addr_str_len = ntohl (ua->addrlen);
-  addr_option = ntohl (ua->options);
-
-  if ((0 != (UNIX_OPTIONS_USE_ABSTRACT_SOCKETS & addr_option)) &&
-      (GNUNET_NO == plugin->is_abstract))
-  {
-    return NULL;
-  }
-
-  if (addr_str_len != address->address_length - sizeof(struct UnixAddress))
-  {
-    return NULL;   /* This can be a legacy address */
-  }
-
-  if ('\0' != addrstr[addr_str_len - 1])
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-  if (strlen (addrstr) + 1 != addr_str_len)
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-
-  /* Check if a session for this address already exists */
-  if (NULL != (session = lookup_session (plugin, address)))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Found existing session %p for address `%s'\n",
-         session,
-         unix_plugin_address_to_string (NULL,
-                                        address->address,
-                                        address->address_length));
-    return session;
-  }
-
-  /* create a new session */
-  session = GNUNET_new (struct GNUNET_ATS_Session);
-  session->target = address->peer;
-  session->address = GNUNET_HELLO_address_copy (address);
-  session->plugin = plugin;
-  session->timeout =
-    GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
-  session->timeout_task =
-    GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
-                                  &session_timeout,
-                                  session);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Creating a new session %p for address `%s'\n",
-       session,
-       unix_plugin_address_to_string (NULL,
-                                      address->address,
-                                      address->address_length));
-  (void) GNUNET_CONTAINER_multipeermap_put (
-    plugin->session_map,
-    &address->peer,
-    session,
-    GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-  GNUNET_STATISTICS_set (plugin->env->stats,
-                         "# UNIX sessions active",
-                         GNUNET_CONTAINER_multipeermap_size (
-                           plugin->session_map),
-                         GNUNET_NO);
-  notify_session_monitor (plugin, session, GNUNET_TRANSPORT_SS_INIT);
-  notify_session_monitor (plugin, session, GNUNET_TRANSPORT_SS_UP);
-  return session;
-}
-
-
-/**
- * Function that will be called whenever the transport service wants
- * to notify the plugin that a session is still active and in use and
- * therefore the session timeout for this session has to be updated
- *
- * @param cls closure with the `struct Plugin *`
- * @param peer which peer was the session for
- * @param session which session is being updated
- */
-static void
-unix_plugin_update_session_timeout (void *cls,
-                                    const struct GNUNET_PeerIdentity *peer,
-                                    struct GNUNET_ATS_Session *session)
-{
-  struct Plugin *plugin = cls;
-
-  if (GNUNET_OK !=
-      GNUNET_CONTAINER_multipeermap_contains_value (plugin->session_map,
-                                                    &session->target,
-                                                    session))
-  {
-    GNUNET_break (0);
-    return;
-  }
-  reschedule_session_timeout (session);
-}
-
-
-/**
- * Demultiplexer for UNIX messages
- *
- * @param plugin the main plugin for this transport
- * @param sender from which peer the message was received
- * @param currhdr pointer to the header of the message
- * @param ua address to look for
- * @param ua_len length of the address @a ua
- */
-static void
-unix_demultiplexer (struct Plugin *plugin,
-                    struct GNUNET_PeerIdentity *sender,
-                    const struct GNUNET_MessageHeader *currhdr,
-                    const struct UnixAddress *ua,
-                    size_t ua_len)
-{
-  struct GNUNET_ATS_Session *session;
-  struct GNUNET_HELLO_Address *address;
-
-  GNUNET_assert (ua_len >= sizeof(struct UnixAddress));
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Received message from %s\n",
-       unix_plugin_address_to_string (NULL, ua, ua_len));
-  GNUNET_STATISTICS_update (plugin->env->stats,
-                            "# bytes received via UNIX",
-                            ntohs (currhdr->size),
-                            GNUNET_NO);
-
-  /* Look for existing session */
-  address = GNUNET_HELLO_address_allocate (
-    sender,
-    PLUGIN_NAME,
-    ua,
-    ua_len,
-    GNUNET_HELLO_ADDRESS_INFO_NONE); /* UNIX does not have "inbound" sessions */
-  session = lookup_session (plugin, address);
-  if (NULL == session)
-  {
-    session = unix_plugin_get_session (plugin, address);
-    /* Notify transport and ATS about new inbound session */
-    plugin->env->session_start (NULL,
-                                session->address,
-                                session,
-                                GNUNET_NT_LOOPBACK);
-  }
-  else
-  {
-    reschedule_session_timeout (session);
-  }
-  GNUNET_HELLO_address_free (address);
-  plugin->env->receive (plugin->env->cls, session->address, session, currhdr);
-}
-
-
-/**
- * Read from UNIX domain socket (it is ready).
- *
- * @param plugin the plugin
- */
-static void
-unix_plugin_do_read (struct Plugin *plugin)
-{
-  char buf[65536] GNUNET_ALIGN;
-  struct UnixAddress *ua;
-  struct UNIXMessage *msg;
-  struct GNUNET_PeerIdentity sender;
-  struct sockaddr_un un;
-  socklen_t addrlen;
-  ssize_t ret;
-  int offset;
-  int tsize;
-  int is_abstract;
-  char *msgbuf;
-  const struct GNUNET_MessageHeader *currhdr;
-  uint16_t csize;
-  size_t ua_len;
-
-  addrlen = sizeof(un);
-  memset (&un, 0, sizeof(un));
-  ret = GNUNET_NETWORK_socket_recvfrom (plugin->unix_sock.desc,
-                                        buf,
-                                        sizeof(buf),
-                                        (struct sockaddr *) &un,
-                                        &addrlen);
-  if ((GNUNET_SYSERR == ret) && ((errno == EAGAIN) || (errno == ENOBUFS)))
-    return;
-  if (GNUNET_SYSERR == ret)
-  {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "recvfrom");
-    return;
-  }
-  else
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Read %d bytes from socket %s\n",
-         (int) ret,
-         un.sun_path);
-  }
-
-  GNUNET_assert (AF_UNIX == (un.sun_family));
-  is_abstract = GNUNET_NO;
-  if ('\0' == un.sun_path[0])
-  {
-    un.sun_path[0] = '@';
-    is_abstract = GNUNET_YES;
-  }
-
-  ua_len = sizeof(struct UnixAddress) + strlen (un.sun_path) + 1;
-  ua = GNUNET_malloc (ua_len);
-  ua->addrlen = htonl (strlen (&un.sun_path[0]) + 1);
-  GNUNET_memcpy (&ua[1], &un.sun_path[0], strlen (un.sun_path) + 1);
-  if (is_abstract)
-    ua->options = htonl (UNIX_OPTIONS_USE_ABSTRACT_SOCKETS);
-  else
-    ua->options = htonl (UNIX_OPTIONS_NONE);
-
-  msg = (struct UNIXMessage *) buf;
-  csize = ntohs (msg->header.size);
-  if ((csize < sizeof(struct UNIXMessage)) || (csize > ret))
-  {
-    GNUNET_break_op (0);
-    GNUNET_free (ua);
-    return;
-  }
-  msgbuf = (char *) &msg[1];
-  GNUNET_memcpy (&sender, &msg->sender, sizeof(struct GNUNET_PeerIdentity));
-  offset = 0;
-  tsize = csize - sizeof(struct UNIXMessage);
-  while (offset + sizeof(struct GNUNET_MessageHeader) <= tsize)
-  {
-    currhdr = (struct GNUNET_MessageHeader *) &msgbuf[offset];
-    csize = ntohs (currhdr->size);
-    if ((csize < sizeof(struct GNUNET_MessageHeader)) ||
-        (csize > tsize - offset))
-    {
-      GNUNET_break_op (0);
-      break;
-    }
-    unix_demultiplexer (plugin, &sender, currhdr, ua, ua_len);
-    offset += csize;
-  }
-  GNUNET_free (ua);
-}
-
-
-/**
- * Write to UNIX domain socket (it is ready).
- *
- * @param plugin handle to the plugin
- */
-static void
-unix_plugin_do_write (struct Plugin *plugin)
-{
-  ssize_t sent = 0;
-  struct UNIXMessageWrapper *msgw;
-  struct GNUNET_ATS_Session *session;
-  int did_delete;
-
-  session = NULL;
-  did_delete = GNUNET_NO;
-  while (NULL != (msgw = plugin->msg_head))
-  {
-    if (GNUNET_TIME_absolute_get_remaining (msgw->timeout).rel_value_us > 0)
-      break;   /* Message is ready for sending */
-    /* Message has a timeout */
-    did_delete = GNUNET_YES;
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Timeout for message with %u bytes \n",
-         (unsigned int) msgw->msgsize);
-    GNUNET_CONTAINER_DLL_remove (plugin->msg_head, plugin->msg_tail, msgw);
-    session = msgw->session;
-    session->msgs_in_queue--;
-    GNUNET_assert (session->bytes_in_queue >= msgw->msgsize);
-    session->bytes_in_queue -= msgw->msgsize;
-    GNUNET_assert (plugin->bytes_in_queue >= msgw->msgsize);
-    plugin->bytes_in_queue -= msgw->msgsize;
-    GNUNET_STATISTICS_set (plugin->env->stats,
-                           "# bytes currently in UNIX buffers",
-                           plugin->bytes_in_queue,
-                           GNUNET_NO);
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# UNIX bytes discarded",
-                              msgw->msgsize,
-                              GNUNET_NO);
-    if (NULL != msgw->cont)
-      msgw->cont (msgw->cont_cls,
-                  &msgw->session->target,
-                  GNUNET_SYSERR,
-                  msgw->payload,
-                  0);
-    GNUNET_free (msgw->msg);
-    GNUNET_free (msgw);
-  }
-  if (NULL == msgw)
-  {
-    if (GNUNET_YES == did_delete)
-      notify_session_monitor (plugin, session, GNUNET_TRANSPORT_SS_UPDATE);
-    return;   /* Nothing to send at the moment */
-  }
-  session = msgw->session;
-  sent = unix_real_send (plugin,
-                         plugin->unix_sock.desc,
-                         &session->target,
-                         (const char *) msgw->msg,
-                         msgw->msgsize,
-                         msgw->priority,
-                         msgw->timeout,
-                         msgw->session->address->address,
-                         msgw->session->address->address_length,
-                         msgw->payload,
-                         msgw->cont,
-                         msgw->cont_cls);
-  if (RETRY == sent)
-  {
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# UNIX retry attempts",
-                              1,
-                              GNUNET_NO);
-    notify_session_monitor (plugin, session, GNUNET_TRANSPORT_SS_UPDATE);
-    return;
-  }
-  GNUNET_CONTAINER_DLL_remove (plugin->msg_head, plugin->msg_tail, msgw);
-  session->msgs_in_queue--;
-  GNUNET_assert (session->bytes_in_queue >= msgw->msgsize);
-  session->bytes_in_queue -= msgw->msgsize;
-  GNUNET_assert (plugin->bytes_in_queue >= msgw->msgsize);
-  plugin->bytes_in_queue -= msgw->msgsize;
-  GNUNET_STATISTICS_set (plugin->env->stats,
-                         "# bytes currently in UNIX buffers",
-                         plugin->bytes_in_queue,
-                         GNUNET_NO);
-  notify_session_monitor (plugin, session, GNUNET_TRANSPORT_SS_UPDATE);
-  if (GNUNET_SYSERR == sent)
-  {
-    /* failed and no retry */
-    if (NULL != msgw->cont)
-      msgw->cont (msgw->cont_cls,
-                  &msgw->session->target,
-                  GNUNET_SYSERR,
-                  msgw->payload,
-                  0);
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# UNIX bytes discarded",
-                              msgw->msgsize,
-                              GNUNET_NO);
-    GNUNET_free (msgw->msg);
-    GNUNET_free (msgw);
-    return;
-  }
-  /* successfully sent bytes */
-  GNUNET_break (sent > 0);
-  GNUNET_STATISTICS_update (plugin->env->stats,
-                            "# bytes transmitted via UNIX",
-                            msgw->msgsize,
-                            GNUNET_NO);
-  if (NULL != msgw->cont)
-    msgw->cont (msgw->cont_cls,
-                &msgw->session->target,
-                GNUNET_OK,
-                msgw->payload,
-                msgw->msgsize);
-  GNUNET_free (msgw->msg);
-  GNUNET_free (msgw);
-}
-
-
-/**
- * We have been notified that our socket has something to read.
- * Then reschedule this function to be called again once more is available.
- *
- * @param cls the plugin handle
- */
-static void
-unix_plugin_select_read (void *cls)
-{
-  struct Plugin *plugin = cls;
-  const struct GNUNET_SCHEDULER_TaskContext *tc;
-
-  plugin->read_task = NULL;
-  tc = GNUNET_SCHEDULER_get_task_context ();
-  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY))
-    unix_plugin_do_read (plugin);
-  plugin->read_task =
-    GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
-                                   plugin->unix_sock.desc,
-                                   &unix_plugin_select_read,
-                                   plugin);
-}
-
-
-/**
- * We have been notified that our socket is ready to write.
- * Then reschedule this function to be called again once more is available.
- *
- * @param cls the plugin handle
- */
-static void
-unix_plugin_select_write (void *cls)
-{
-  struct Plugin *plugin = cls;
-  const struct GNUNET_SCHEDULER_TaskContext *tc;
-
-  plugin->write_task = NULL;
-  tc = GNUNET_SCHEDULER_get_task_context ();
-  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_WRITE_READY))
-    unix_plugin_do_write (plugin);
-  if (NULL == plugin->msg_head)
-    return; /* write queue empty */
-  plugin->write_task =
-    GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_UNIT_FOREVER_REL,
-                                    plugin->unix_sock.desc,
-                                    &unix_plugin_select_write,
-                                    plugin);
-}
-
-
-/**
- * Function that can be used by the transport service to transmit
- * a message using the plugin.   Note that in the case of a
- * peer disconnecting, the continuation MUST be called
- * prior to the disconnect notification itself.  This function
- * will be called with this peer's HELLO message to initiate
- * a fresh connection to another peer.
- *
- * @param cls closure
- * @param session which session must be used
- * @param msgbuf the message to transmit
- * @param msgbuf_size number of bytes in @a msgbuf
- * @param priority how important is the message (most plugins will
- *                 ignore message priority and just FIFO)
- * @param to how long to wait at most for the transmission (does not
- *                require plugins to discard the message after the timeout,
- *                just advisory for the desired delay; most plugins will ignore
- *                this as well)
- * @param cont continuation to call once the message has
- *        been transmitted (or if the transport is ready
- *        for the next transmission call; or if the
- *        peer disconnected...); can be NULL
- * @param cont_cls closure for @a cont
- * @return number of bytes used (on the physical network, with overheads);
- *         -1 on hard errors (i.e. address invalid); 0 is a legal value
- *         and does NOT mean that the message was not transmitted (DV)
- */
-static ssize_t
-unix_plugin_send (void *cls,
-                  struct GNUNET_ATS_Session *session,
-                  const char *msgbuf,
-                  size_t msgbuf_size,
-                  unsigned int priority,
-                  struct GNUNET_TIME_Relative to,
-                  GNUNET_TRANSPORT_TransmitContinuation cont,
-                  void *cont_cls)
-{
-  struct Plugin *plugin = cls;
-  struct UNIXMessageWrapper *wrapper;
-  struct UNIXMessage *message;
-  int ssize;
-
-  if (GNUNET_OK !=
-      GNUNET_CONTAINER_multipeermap_contains_value (plugin->session_map,
-                                                    &session->target,
-                                                    session))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Invalid session for peer `%s' `%s'\n",
-         GNUNET_i2s (&session->target),
-         unix_plugin_address_to_string (NULL,
-                                        session->address->address,
-                                        session->address->address_length));
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Sending %lu bytes with session for peer `%s' `%s'\n",
-       (unsigned long) msgbuf_size,
-       GNUNET_i2s (&session->target),
-       unix_plugin_address_to_string (NULL,
-                                      session->address->address,
-                                      session->address->address_length));
-  ssize = sizeof(struct UNIXMessage) + msgbuf_size;
-  message = GNUNET_malloc (sizeof(struct UNIXMessage) + msgbuf_size);
-  message->header.size = htons (ssize);
-  message->header.type = htons (0);
-  GNUNET_memcpy (&message->sender,
-                 plugin->env->my_identity,
-                 sizeof(struct GNUNET_PeerIdentity));
-  GNUNET_memcpy (&message[1], msgbuf, msgbuf_size);
-  wrapper = GNUNET_new (struct UNIXMessageWrapper);
-  wrapper->msg = message;
-  wrapper->msgsize = ssize;
-  wrapper->payload = msgbuf_size;
-  wrapper->priority = priority;
-  wrapper->timeout = GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get (), to);
-  wrapper->cont = cont;
-  wrapper->cont_cls = cont_cls;
-  wrapper->session = session;
-  GNUNET_CONTAINER_DLL_insert_tail (plugin->msg_head,
-                                    plugin->msg_tail,
-                                    wrapper);
-  plugin->bytes_in_queue += ssize;
-  session->bytes_in_queue += ssize;
-  session->msgs_in_queue++;
-  GNUNET_STATISTICS_set (plugin->env->stats,
-                         "# bytes currently in UNIX buffers",
-                         plugin->bytes_in_queue,
-                         GNUNET_NO);
-  notify_session_monitor (plugin, session, GNUNET_TRANSPORT_SS_UPDATE);
-  if (NULL == plugin->write_task)
-    plugin->write_task =
-      GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_UNIT_FOREVER_REL,
-                                      plugin->unix_sock.desc,
-                                      &unix_plugin_select_write,
-                                      plugin);
-  return ssize;
-}
-
-
-/**
- * Create a slew of UNIX sockets.  If possible, use IPv6 and IPv4.
- *
- * @param cls closure for server start, should be a `struct Plugin *`
- * @return number of sockets created or #GNUNET_SYSERR on error
- */
-static int
-unix_transport_server_start (void *cls)
-{
-  struct Plugin *plugin = cls;
-  struct sockaddr_un *un;
-  socklen_t un_len;
-
-  un = unix_address_to_sockaddr (plugin->unix_socket_path, &un_len);
-  if (GNUNET_YES == plugin->is_abstract)
-  {
-    plugin->unix_socket_path[0] = '@';
-    un->sun_path[0] = '\0';
-  }
-  plugin->unix_sock.desc =
-    GNUNET_NETWORK_socket_create (AF_UNIX, SOCK_DGRAM, 0);
-  if (NULL == plugin->unix_sock.desc)
-  {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket");
-    GNUNET_free (un);
-    return GNUNET_SYSERR;
-  }
-  if ('\0' != un->sun_path[0])
-  {
-    if (GNUNET_OK != GNUNET_DISK_directory_create_for_file (un->sun_path))
-    {
-      LOG (GNUNET_ERROR_TYPE_ERROR,
-           _ ("Cannot create path to `%s'\n"),
-           un->sun_path);
-      GNUNET_NETWORK_socket_close (plugin->unix_sock.desc);
-      plugin->unix_sock.desc = NULL;
-      GNUNET_free (un);
-      return GNUNET_SYSERR;
-    }
-  }
-  if (GNUNET_OK != GNUNET_NETWORK_socket_bind (plugin->unix_sock.desc,
-                                               (const struct sockaddr *) un,
-                                               un_len))
-  {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "bind");
-    LOG (GNUNET_ERROR_TYPE_ERROR, _ ("Cannot bind to `%s'\n"), un->sun_path);
-    GNUNET_NETWORK_socket_close (plugin->unix_sock.desc);
-    plugin->unix_sock.desc = NULL;
-    GNUNET_free (un);
-    return GNUNET_SYSERR;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Bound to `%s'\n", plugin->unix_socket_path);
-  plugin->read_task =
-    GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
-                                   plugin->unix_sock.desc,
-                                   &unix_plugin_select_read,
-                                   plugin);
-  GNUNET_free (un);
-  return 1;
-}
-
-
-/**
- * Function that will be called to check if a binary address for this
- * plugin is well-formed and corresponds to an address for THIS peer
- * (as per our configuration).  Naturally, if absolutely necessary,
- * plugins can be a bit conservative in their answer, but in general
- * plugins should make sure that the address does not redirect
- * traffic to a 3rd party that might try to man-in-the-middle our
- * traffic.
- *
- * @param cls closure, should be our handle to the Plugin
- * @param addr pointer to the address
- * @param addrlen length of @a addr
- * @return #GNUNET_OK if this is a plausible address for this peer
- *         and transport, #GNUNET_SYSERR if not
- *
- */
-static int
-unix_plugin_check_address (void *cls, const void *addr, size_t addrlen)
-{
-  struct Plugin *plugin = cls;
-  const struct UnixAddress *ua = addr;
-  char *addrstr;
-  size_t addr_str_len;
-
-  if ((NULL == addr) || (0 == addrlen) ||
-      (sizeof(struct UnixAddress) > addrlen))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  addrstr = (char *) &ua[1];
-  addr_str_len = ntohl (ua->addrlen);
-  if ('\0' != addrstr[addr_str_len - 1])
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  if (strlen (addrstr) + 1 != addr_str_len)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-
-  if (0 == strcmp (plugin->unix_socket_path, addrstr))
-    return GNUNET_OK;
-  return GNUNET_SYSERR;
-}
-
-
-/**
- * Convert the transports address to a nice, human-readable
- * format.
- *
- * @param cls closure
- * @param type name of the transport that generated the address
- * @param addr one of the addresses of the host, NULL for the last address
- *        the specific address format depends on the transport
- * @param addrlen length of the @a addr
- * @param numeric should (IP) addresses be displayed in numeric form?
- * @param timeout after how long should we give up?
- * @param asc function to call on each string
- * @param asc_cls closure for @a asc
- */
-static void
-unix_plugin_address_pretty_printer (void *cls,
-                                    const char *type,
-                                    const void *addr,
-                                    size_t addrlen,
-                                    int numeric,
-                                    struct GNUNET_TIME_Relative timeout,
-                                    GNUNET_TRANSPORT_AddressStringCallback asc,
-                                    void *asc_cls)
-{
-  const char *ret;
-
-  if ((NULL != addr) && (addrlen > 0))
-    ret = unix_plugin_address_to_string (NULL, addr, addrlen);
-  else
-    ret = NULL;
-  asc (asc_cls, ret, (NULL == ret) ? GNUNET_SYSERR : GNUNET_OK);
-  asc (asc_cls, NULL, GNUNET_OK);
-}
-
-
-/**
- * Function called to convert a string address to
- * a binary address.
- *
- * @param cls closure (`struct Plugin *`)
- * @param addr string address
- * @param addrlen length of the @a addr (strlen(addr) + '\0')
- * @param buf location to store the buffer
- *        If the function returns #GNUNET_SYSERR, its contents are undefined.
- * @param added length of created address
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
- */
-static int
-unix_plugin_string_to_address (void *cls,
-                               const char *addr,
-                               uint16_t addrlen,
-                               void **buf,
-                               size_t *added)
-{
-  struct UnixAddress *ua;
-  char *address;
-  char *plugin;
-  char *optionstr;
-  uint32_t options;
-  size_t ua_size;
-
-  /* Format unix.options.address */
-  address = NULL;
-  plugin = NULL;
-  optionstr = NULL;
-
-  if ((NULL == addr) || (addrlen == 0))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  if ('\0' != addr[addrlen - 1])
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  if (strlen (addr) != addrlen - 1)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  plugin = GNUNET_strdup (addr);
-  optionstr = strchr (plugin, '.');
-  if (NULL == optionstr)
-  {
-    GNUNET_break (0);
-    GNUNET_free (plugin);
-    return GNUNET_SYSERR;
-  }
-  optionstr[0] = '\0';
-  optionstr++;
-  options = atol (optionstr);
-  address = strchr (optionstr, '.');
-  if (NULL == address)
-  {
-    GNUNET_break (0);
-    GNUNET_free (plugin);
-    return GNUNET_SYSERR;
-  }
-  address[0] = '\0';
-  address++;
-  if (0 != strcmp (plugin, PLUGIN_NAME))
-  {
-    GNUNET_break (0);
-    GNUNET_free (plugin);
-    return GNUNET_SYSERR;
-  }
-
-  ua_size = sizeof(struct UnixAddress) + strlen (address) + 1;
-  ua = GNUNET_malloc (ua_size);
-  ua->options = htonl (options);
-  ua->addrlen = htonl (strlen (address) + 1);
-  GNUNET_memcpy (&ua[1], address, strlen (address) + 1);
-  GNUNET_free (plugin);
-
-  (*buf) = ua;
-  (*added) = ua_size;
-  return GNUNET_OK;
-}
-
-
-/**
- * Notify transport service about address
- *
- * @param cls the plugin
- */
-static void
-address_notification (void *cls)
-{
-  struct Plugin *plugin = cls;
-  struct GNUNET_HELLO_Address *address;
-  size_t len;
-  struct UnixAddress *ua;
-  char *unix_path;
-
-  len = sizeof(struct UnixAddress) + strlen (plugin->unix_socket_path) + 1;
-  ua = GNUNET_malloc (len);
-  ua->options = htonl (plugin->myoptions);
-  ua->addrlen = htonl (strlen (plugin->unix_socket_path) + 1);
-  unix_path = (char *) &ua[1];
-  GNUNET_memcpy (unix_path,
-                 plugin->unix_socket_path,
-                 strlen (plugin->unix_socket_path) + 1);
-
-  plugin->address_update_task = NULL;
-  address = GNUNET_HELLO_address_allocate (plugin->env->my_identity,
-                                           PLUGIN_NAME,
-                                           ua,
-                                           len,
-                                           GNUNET_HELLO_ADDRESS_INFO_NONE);
-  plugin->env->notify_address (plugin->env->cls, GNUNET_YES, address);
-  GNUNET_free (ua);
-  GNUNET_free (address);
-}
-
-
-/**
- * Function called on sessions to disconnect
- *
- * @param cls the plugin
- * @param key peer identity (unused)
- * @param value the `struct GNUNET_ATS_Session *` to disconnect
- * @return #GNUNET_YES (always, continue to iterate)
- */
-static int
-get_session_delete_it (void *cls,
-                       const struct GNUNET_PeerIdentity *key,
-                       void *value)
-{
-  struct Plugin *plugin = cls;
-  struct GNUNET_ATS_Session *session = value;
-
-  unix_plugin_session_disconnect (plugin, session);
-  return GNUNET_YES;
-}
-
-
-/**
- * Disconnect from a remote node.  Clean up session if we have one for this peer
- *
- * @param cls closure for this call (should be handle to Plugin)
- * @param target the peeridentity of the peer to disconnect
- * @return #GNUNET_OK on success, #GNUNET_SYSERR if the operation failed
- */
-static void
-unix_plugin_peer_disconnect (void *cls,
-                             const struct GNUNET_PeerIdentity *target)
-{
-  struct Plugin *plugin = cls;
-
-  GNUNET_CONTAINER_multipeermap_get_multiple (plugin->session_map,
-                                              target,
-                                              &get_session_delete_it,
-                                              plugin);
-}
-
-
-/**
- * Return information about the given session to the
- * monitor callback.
- *
- * @param cls the `struct Plugin` with the monitor callback (`sic`)
- * @param peer peer we send information about
- * @param value our `struct GNUNET_ATS_Session` to send information about
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-send_session_info_iter (void *cls,
-                        const struct GNUNET_PeerIdentity *peer,
-                        void *value)
-{
-  struct Plugin *plugin = cls;
-  struct GNUNET_ATS_Session *session = value;
-
-  notify_session_monitor (plugin, session, GNUNET_TRANSPORT_SS_INIT);
-  notify_session_monitor (plugin, session, GNUNET_TRANSPORT_SS_UP);
-  return GNUNET_OK;
-}
-
-
-/**
- * Begin monitoring sessions of a plugin.  There can only
- * be one active monitor per plugin (i.e. if there are
- * multiple monitors, the transport service needs to
- * multiplex the generated events over all of them).
- *
- * @param cls closure of the plugin
- * @param sic callback to invoke, NULL to disable monitor;
- *            plugin will being by iterating over all active
- *            sessions immediately and then enter monitor mode
- * @param sic_cls closure for @a sic
- */
-static void
-unix_plugin_setup_monitor (void *cls,
-                           GNUNET_TRANSPORT_SessionInfoCallback sic,
-                           void *sic_cls)
-{
-  struct Plugin *plugin = cls;
-
-  plugin->sic = sic;
-  plugin->sic_cls = sic_cls;
-  if (NULL != sic)
-  {
-    GNUNET_CONTAINER_multipeermap_iterate (plugin->session_map,
-                                           &send_session_info_iter,
-                                           plugin);
-    /* signal end of first iteration */
-    sic (sic_cls, NULL, NULL);
-  }
-}
-
-
-/**
- * The exported method.  Initializes the plugin and returns a
- * struct with the callbacks.
- *
- * @param cls the plugin's execution environment
- * @return NULL on error, plugin functions otherwise
- */
-void *
-libgnunet_plugin_transport_unix_init (void *cls)
-{
-  struct GNUNET_TRANSPORT_PluginEnvironment *env = cls;
-  struct GNUNET_TRANSPORT_PluginFunctions *api;
-  struct Plugin *plugin;
-  int sockets_created;
-
-  if (NULL == env->receive)
-  {
-    /* run in 'stub' mode (i.e. as part of gnunet-peerinfo), don't fully
-       initialize the plugin or the API */
-    api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
-    api->cls = NULL;
-    api->address_pretty_printer = &unix_plugin_address_pretty_printer;
-    api->address_to_string = &unix_plugin_address_to_string;
-    api->string_to_address = &unix_plugin_string_to_address;
-    return api;
-  }
-
-  plugin = GNUNET_new (struct Plugin);
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_filename (env->cfg,
-                                               "transport-unix",
-                                               "UNIXPATH",
-                                               &plugin->unix_socket_path))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "transport-unix",
-                               "UNIXPATH");
-    GNUNET_free (plugin);
-    return NULL;
-  }
-
-  plugin->env = env;
-
-  /* Initialize my flags */
-#ifdef __linux__
-  plugin->is_abstract =
-    GNUNET_CONFIGURATION_get_value_yesno (plugin->env->cfg,
-                                          "testing",
-                                          "USE_ABSTRACT_SOCKETS");
-#endif
-  plugin->myoptions = UNIX_OPTIONS_NONE;
-  if (GNUNET_YES == plugin->is_abstract)
-    plugin->myoptions = UNIX_OPTIONS_USE_ABSTRACT_SOCKETS;
-
-  api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
-  api->cls = plugin;
-  api->get_session = &unix_plugin_get_session;
-  api->send = &unix_plugin_send;
-  api->disconnect_peer = &unix_plugin_peer_disconnect;
-  api->disconnect_session = &unix_plugin_session_disconnect;
-  api->query_keepalive_factor = &unix_plugin_query_keepalive_factor;
-  api->address_pretty_printer = &unix_plugin_address_pretty_printer;
-  api->address_to_string = &unix_plugin_address_to_string;
-  api->check_address = &unix_plugin_check_address;
-  api->string_to_address = &unix_plugin_string_to_address;
-  api->get_network = &unix_plugin_get_network;
-  api->get_network_for_address = &unix_plugin_get_network_for_address;
-  api->update_session_timeout = &unix_plugin_update_session_timeout;
-  api->setup_monitor = &unix_plugin_setup_monitor;
-  sockets_created = unix_transport_server_start (plugin);
-  if ((0 == sockets_created) || (GNUNET_SYSERR == sockets_created))
-  {
-    LOG (GNUNET_ERROR_TYPE_WARNING, _ ("Failed to open UNIX listen socket\n"));
-    GNUNET_free (api);
-    GNUNET_free (plugin->unix_socket_path);
-    GNUNET_free (plugin);
-    return NULL;
-  }
-  plugin->session_map = GNUNET_CONTAINER_multipeermap_create (10, GNUNET_NO);
-  plugin->address_update_task =
-    GNUNET_SCHEDULER_add_now (&address_notification, plugin);
-  return api;
-}
-
-
-/**
- * Shutdown the plugin.
- *
- * @param cls the plugin API returned from the initialization function
- * @return NULL (always)
- */
-void *
-libgnunet_plugin_transport_unix_done (void *cls)
-{
-  struct GNUNET_TRANSPORT_PluginFunctions *api = cls;
-  struct Plugin *plugin = api->cls;
-  struct GNUNET_HELLO_Address *address;
-  struct UNIXMessageWrapper *msgw;
-  struct UnixAddress *ua;
-  size_t len;
-  struct GNUNET_ATS_Session *session;
-
-  if (NULL == plugin)
-  {
-    GNUNET_free (api);
-    return NULL;
-  }
-  len = sizeof(struct UnixAddress) + strlen (plugin->unix_socket_path) + 1;
-  ua = GNUNET_malloc (len);
-  ua->options = htonl (plugin->myoptions);
-  ua->addrlen = htonl (strlen (plugin->unix_socket_path) + 1);
-  GNUNET_memcpy (&ua[1],
-                 plugin->unix_socket_path,
-                 strlen (plugin->unix_socket_path) + 1);
-  address = GNUNET_HELLO_address_allocate (plugin->env->my_identity,
-                                           PLUGIN_NAME,
-                                           ua,
-                                           len,
-                                           GNUNET_HELLO_ADDRESS_INFO_NONE);
-  plugin->env->notify_address (plugin->env->cls, GNUNET_NO, address);
-
-  GNUNET_free (address);
-  GNUNET_free (ua);
-
-  while (NULL != (msgw = plugin->msg_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (plugin->msg_head, plugin->msg_tail, msgw);
-    session = msgw->session;
-    session->msgs_in_queue--;
-    GNUNET_assert (session->bytes_in_queue >= msgw->msgsize);
-    session->bytes_in_queue -= msgw->msgsize;
-    GNUNET_assert (plugin->bytes_in_queue >= msgw->msgsize);
-    plugin->bytes_in_queue -= msgw->msgsize;
-    if (NULL != msgw->cont)
-      msgw->cont (msgw->cont_cls,
-                  &msgw->session->target,
-                  GNUNET_SYSERR,
-                  msgw->payload,
-                  0);
-    GNUNET_free (msgw->msg);
-    GNUNET_free (msgw);
-  }
-
-  if (NULL != plugin->read_task)
-  {
-    GNUNET_SCHEDULER_cancel (plugin->read_task);
-    plugin->read_task = NULL;
-  }
-  if (NULL != plugin->write_task)
-  {
-    GNUNET_SCHEDULER_cancel (plugin->write_task);
-    plugin->write_task = NULL;
-  }
-  if (NULL != plugin->address_update_task)
-  {
-    GNUNET_SCHEDULER_cancel (plugin->address_update_task);
-    plugin->address_update_task = NULL;
-  }
-  if (NULL != plugin->unix_sock.desc)
-  {
-    GNUNET_break (GNUNET_OK ==
-                  GNUNET_NETWORK_socket_close (plugin->unix_sock.desc));
-    plugin->unix_sock.desc = NULL;
-  }
-  GNUNET_CONTAINER_multipeermap_iterate (plugin->session_map,
-                                         &get_session_delete_it,
-                                         plugin);
-  GNUNET_CONTAINER_multipeermap_destroy (plugin->session_map);
-  GNUNET_break (0 == plugin->bytes_in_queue);
-  GNUNET_free (plugin->unix_socket_path);
-  GNUNET_free (plugin);
-  GNUNET_free (api);
-  return NULL;
-}
-
-
-/* end of plugin_transport_unix.c */
diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c
deleted file mode 100644
index 138fb5080..000000000
--- a/src/transport/plugin_transport_wlan.c
+++ /dev/null
@@ -1,2404 +0,0 @@
-/*
-   This file is part of GNUnet
-   Copyright (C) 2010-2014 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/plugin_transport_wlan.c
- * @brief transport plugin for wlan and/or bluetooth
- * @author David Brodski
- * @author Christian Grothoff
- *
- * BUILD_WLAN or BUILD_BLUETOOTH must be defined such that the respective
- * variant of this code is compiled.
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_protocols.h"
-#include "gnunet_statistics_service.h"
-#include "gnunet_transport_service.h"
-#include "gnunet_transport_plugin.h"
-#include "plugin_transport_wlan.h"
-#include "gnunet_fragmentation_lib.h"
-#include "gnunet_constants.h"
-
-
-#if BUILD_WLAN
-/* begin case wlan */
-#define PLUGIN_NAME "wlan"
-#define CONFIG_NAME "transport-wlan"
-#define HELPER_NAME "gnunet-helper-transport-wlan"
-#define DUMMY_HELPER_NAME "gnunet-helper-transport-wlan-dummy"
-#define LIBGNUNET_PLUGIN_TRANSPORT_INIT libgnunet_plugin_transport_wlan_init
-#define LIBGNUNET_PLUGIN_TRANSPORT_DONE libgnunet_plugin_transport_wlan_done
-#define LOG(kind, ...) GNUNET_log_from (kind, "transport-wlan", __VA_ARGS__)
-
-
-/**
- * time out of a mac endpoint
- */
-#define MACENDPOINT_TIMEOUT GNUNET_TIME_relative_multiply ( \
-    GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, 2)
-
-/**
- * We reduce the frequence of HELLO beacons in relation to
- * the number of MAC addresses currently visible to us.
- * This is the multiplication factor.
- */
-#define HELLO_BEACON_SCALING_FACTOR GNUNET_TIME_relative_multiply ( \
-    GNUNET_TIME_UNIT_SECONDS, 2)
-
-
-/* end case wlan */
-#elif BUILD_BLUETOOTH
-/* begin case bluetooth */
-
-#define PLUGIN_NAME "bluetooth"
-#define CONFIG_NAME "transport-bluetooth"
-#define HELPER_NAME "gnunet-helper-transport-bluetooth"
-/* yes, this is correct, we use the same dummy driver as 'wlan' */
-#define DUMMY_HELPER_NAME "gnunet-helper-transport-wlan-dummy"
-#define LIBGNUNET_PLUGIN_TRANSPORT_INIT \
-  libgnunet_plugin_transport_bluetooth_init
-#define LIBGNUNET_PLUGIN_TRANSPORT_DONE \
-  libgnunet_plugin_transport_bluetooth_done
-#define LOG(kind, ...) GNUNET_log_from (kind, "transport-bluetooth", \
-                                        __VA_ARGS__)
-
-/**
- * time out of a mac endpoint
- */
-#define MACENDPOINT_TIMEOUT GNUNET_TIME_relative_multiply ( \
-    GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, 60)
-
-
-/**
- * We reduce the frequence of HELLO beacons in relation to
- * the number of MAC addresses currently visible to us.
- * This is the multiplication factor.
- */
-#define HELLO_BEACON_SCALING_FACTOR GNUNET_TIME_relative_multiply ( \
-    GNUNET_TIME_UNIT_SECONDS, 60)
-
-/* end case bluetooth */
-#else
-#error need to build wlan or bluetooth
-#endif
-
-
-/**
- * Functions with this signature are called whenever a
- * complete message is received by the tokenizer.
- *
- * Do not call #GNUNET_SERVER_mst_destroy from within
- * the scope of this callback.
- *
- * @param cls closure
- * @param client identification of the client
- * @param message the actual message
- * @return #GNUNET_OK on success, #GNUNET_SYSERR to stop further processing
- */
-typedef int
-(*GNUNET_SERVER_MessageTokenizerCallback) (void *cls,
-                                           void *client,
-                                           const struct
-                                           GNUNET_MessageHeader *message);
-
-
-/* Include legacy message stream tokenizer that was removed from util (for now) */
-#include "tcp_server_mst_legacy.c"
-
-
-/**
- * Max size of packet (that we give to the WLAN driver for transmission)
- */
-#define WLAN_MTU 1430
-
-
-/**
- * Which network scope do we belong to?
- */
-#if BUILD_WLAN
-static const enum GNUNET_NetworkType scope = GNUNET_NT_WLAN;
-#else
-static const enum GNUNET_NetworkType scope = GNUNET_NT_BT;
-#endif
-
-
-/**
- * Maximum number of messages in defragmentation queue per MAC
- */
-#define MESSAGES_IN_DEFRAG_QUEUE_PER_MAC 2
-
-/**
- * Link layer control fields for better compatibility
- * (i.e. GNUnet over WLAN is not IP-over-WLAN).
- */
-#define WLAN_LLC_DSAP_FIELD 0x1f
-#define WLAN_LLC_SSAP_FIELD 0x1f
-
-
-GNUNET_NETWORK_STRUCT_BEGIN
-/**
- * Header for messages which need fragmentation.  This is the format of
- * a message we obtain AFTER defragmentation.  We then need to check
- * the CRC and then tokenize the payload and pass it to the
- * 'receive' callback.
- */
-struct WlanHeader
-{
-  /**
-   * Message type is #GNUNET_MESSAGE_TYPE_WLAN_DATA.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * CRC32 checksum (only over the payload), in NBO.
-   */
-  uint32_t crc GNUNET_PACKED;
-
-  /**
-   * Sender of the message.
-   */
-  struct GNUNET_PeerIdentity sender;
-
-  /**
-   * Target of the message.
-   */
-  struct GNUNET_PeerIdentity target;
-
-  /* followed by payload, possibly including
-     multiple messages! */
-};
-
-
-/**
- * Address format for WLAN.
- */
-struct WlanAddress
-{
-  /**
-   * Options set for the WLAN, in NBO.
-   */
-  uint32_t options GNUNET_PACKED;
-
-  /**
-   * WLAN addresses using MACs.
-   */
-  struct GNUNET_TRANSPORT_WLAN_MacAddress mac;
-};
-
-
-GNUNET_NETWORK_STRUCT_END
-
-
-/**
- * Information kept for each message that is yet to be fragmented and
- * transmitted.
- */
-struct PendingMessage
-{
-  /**
-   * next entry in the DLL
-   */
-  struct PendingMessage *next;
-
-  /**
-   * previous entry in the DLL
-   */
-  struct PendingMessage *prev;
-
-  /**
-   * The pending message
-   */
-  struct WlanHeader *msg;
-
-  /**
-   * Continuation function to call once the message
-   * has been sent.  Can be NULL if there is no
-   * continuation to call.
-   */
-  GNUNET_TRANSPORT_TransmitContinuation transmit_cont;
-
-  /**
-   * Cls for @e transmit_cont
-   */
-  void *transmit_cont_cls;
-
-  /**
-   * Timeout task (for this message).
-   */
-  struct GNUNET_SCHEDULER_Task *timeout_task;
-};
-
-
-/**
- * Session handle for connections with other peers.
- */
-struct GNUNET_ATS_Session
-{
-  /**
-   * To whom are we talking to (set to our identity
-   * if we are still waiting for the welcome message)
-   */
-  struct GNUNET_PeerIdentity target;
-
-  /**
-   * We keep all sessions in a DLL at their respective
-   * `struct MACEndpoint *`.
-   */
-  struct GNUNET_ATS_Session *next;
-
-  /**
-   * We keep all sessions in a DLL at their respective
-   * `struct MACEndpoint *`.
-   */
-  struct GNUNET_ATS_Session *prev;
-
-  /**
-   * MAC endpoint with the address of this peer.
-   */
-  struct MacEndpoint *mac;
-
-  /**
-   * Address associated with this session and MAC endpoint
-   */
-  struct GNUNET_HELLO_Address *address;
-
-  /**
-   * When should this session time out?
-   */
-  struct GNUNET_TIME_Absolute timeout;
-
-  /**
-   * Timeout task (for the session).
-   */
-  struct GNUNET_SCHEDULER_Task *timeout_task;
-};
-
-
-/**
- * Struct for messages that are being fragmented in a MAC's transmission queue.
- */
-struct FragmentMessage
-{
-  /**
-   * This is a doubly-linked list.
-   */
-  struct FragmentMessage *next;
-
-  /**
-   * This is a doubly-linked list.
-   */
-  struct FragmentMessage *prev;
-
-  /**
-   * MAC endpoint this message belongs to
-   */
-  struct MacEndpoint *macendpoint;
-
-  /**
-   * Fragmentation context
-   */
-  struct GNUNET_FRAGMENT_Context *fragcontext;
-
-  /**
-   * Transmission handle to helper (to cancel if the frag context
-   * is destroyed early for some reason).
-   */
-  struct GNUNET_HELPER_SendHandle *sh;
-
-  /**
-   * Intended recipient.
-   */
-  struct GNUNET_PeerIdentity target;
-
-  /**
-   * Timeout value for the message.
-   */
-  struct GNUNET_TIME_Absolute timeout;
-
-  /**
-   * Timeout task.
-   */
-  struct GNUNET_SCHEDULER_Task *timeout_task;
-
-  /**
-   * Continuation to call when we're done with this message.
-   */
-  GNUNET_TRANSPORT_TransmitContinuation cont;
-
-  /**
-   * Message we need to fragment and transmit, NULL after the
-   * @e fragmentcontext has been created.
-   */
-  struct GNUNET_MessageHeader *msg;
-
-  /**
-   * Closure for @e cont
-   */
-  void *cont_cls;
-
-  /**
-   * Size of original message
-   */
-  size_t size_payload;
-
-  /**
-   * Number of bytes used to transmit message
-   */
-  size_t size_on_wire;
-};
-
-
-/**
- * Struct to represent one network card connection
- */
-struct MacEndpoint
-{
-  /**
-   * We keep all MACs in a DLL in the plugin.
-   */
-  struct MacEndpoint *next;
-
-  /**
-   * We keep all MACs in a DLL in the plugin.
-   */
-  struct MacEndpoint *prev;
-
-  /**
-   * Pointer to the global plugin struct.
-   */
-  struct Plugin *plugin;
-
-  /**
-   * Head of sessions that use this MAC.
-   */
-  struct GNUNET_ATS_Session *sessions_head;
-
-  /**
-   * Tail of sessions that use this MAC.
-   */
-  struct GNUNET_ATS_Session *sessions_tail;
-
-  /**
-   * Head of messages we are currently sending to this MAC.
-   */
-  struct FragmentMessage *sending_messages_head;
-
-  /**
-   * Tail of messages we are currently sending to this MAC.
-   */
-  struct FragmentMessage *sending_messages_tail;
-
-  /**
-   * Defrag context for this MAC
-   */
-  struct GNUNET_DEFRAGMENT_Context *defrag;
-
-  /**
-   * When should this endpoint time out?
-   */
-  struct GNUNET_TIME_Absolute timeout;
-
-  /**
-   * Timeout task.
-   */
-  struct GNUNET_SCHEDULER_Task *timeout_task;
-
-  /**
-   * count of messages in the fragment out queue for this mac endpoint
-   */
-  unsigned int fragment_messages_out_count;
-
-  /**
-   * peer MAC address
-   */
-  struct WlanAddress wlan_addr;
-
-  /**
-   * Message delay for fragmentation context
-   */
-  struct GNUNET_TIME_Relative msg_delay;
-
-  /**
-   * ACK delay for fragmentation context
-   */
-  struct GNUNET_TIME_Relative ack_delay;
-
-  /**
-   * Desired transmission power for this MAC
-   */
-  uint16_t tx_power;
-
-  /**
-   * Desired transmission rate for this MAC
-   */
-  uint8_t rate;
-
-  /**
-   * Antenna we should use for this MAC
-   */
-  uint8_t antenna;
-};
-
-
-/**
- * Encapsulation of all of the state of the plugin.
- */
-struct Plugin
-{
-  /**
-   * Our environment.
-   */
-  struct GNUNET_TRANSPORT_PluginEnvironment *env;
-
-  /**
-   * Handle to helper process for privileged operations.
-   */
-  struct GNUNET_HELPER_Handle *suid_helper;
-
-  /**
-   * Function to call about session status changes.
-   */
-  GNUNET_TRANSPORT_SessionInfoCallback sic;
-
-  /**
-   * Closure for @e sic.
-   */
-  void *sic_cls;
-
-  /**
-   * ARGV-vector for the helper (all helpers take only the binary
-   * name, one actual argument, plus the NULL terminator for 'argv').
-   */
-  char *helper_argv[3];
-
-  /**
-   * The interface of the wlan card given to us by the user.
-   */
-  char *wlan_interface;
-
-  /**
-   * Tokenizer for demultiplexing of data packets resulting from
-   * defragmentation.
-   */
-  struct GNUNET_SERVER_MessageStreamTokenizer *fragment_data_tokenizer;
-
-  /**
-   * Tokenizer for demultiplexing of data packets received from the suid helper
-   */
-  struct GNUNET_SERVER_MessageStreamTokenizer *helper_payload_tokenizer;
-
-  /**
-   * Tokenizer for demultiplexing of data packets that follow the WLAN Header
-   */
-  struct GNUNET_SERVER_MessageStreamTokenizer *wlan_header_payload_tokenizer;
-
-  /**
-   * Head of list of open connections.
-   */
-  struct MacEndpoint *mac_head;
-
-  /**
-   * Tail of list of open connections.
-   */
-  struct MacEndpoint *mac_tail;
-
-  /**
-   * Task that periodically sends a HELLO beacon via the helper.
-   */
-  struct GNUNET_SCHEDULER_Task *beacon_task;
-
-  /**
-   * Tracker for bandwidth limit
-   */
-  struct GNUNET_BANDWIDTH_Tracker tracker;
-
-  /**
-   * The mac_address of the wlan card given to us by the helper.
-   */
-  struct GNUNET_TRANSPORT_WLAN_MacAddress mac_address;
-
-  /**
-   * Have we received a control message with our MAC address yet?
-   */
-  int have_mac;
-
-  /**
-   * Number of connections
-   */
-  unsigned int mac_count;
-
-  /**
-   * Options for addresses
-   */
-  uint32_t options;
-};
-
-
-/**
- * Information associated with a message.  Can contain
- * the session or the MAC endpoint associated with the
- * message (or both).
- */
-struct MacAndSession
-{
-  /**
-   * NULL if the identity of the other peer is not known.
-   */
-  struct GNUNET_ATS_Session *session;
-
-  /**
-   * MAC address of the other peer, NULL if not known.
-   */
-  struct MacEndpoint *endpoint;
-};
-
-
-/**
- * Print MAC addresses nicely.
- *
- * @param mac the mac address
- * @return string to a static buffer with
- * the human-readable mac, will be overwritten during the next call to
- * this function
- */
-static const char *
-mac_to_string (const struct GNUNET_TRANSPORT_WLAN_MacAddress *mac)
-{
-  static char macstr[20];
-
-  GNUNET_snprintf (macstr,
-                   sizeof(macstr),
-                   "%.2X:%.2X:%.2X:%.2X:%.2X:%.2X",
-                   mac->mac[0], mac->mac[1],
-                   mac->mac[2], mac->mac[3],
-                   mac->mac[4], mac->mac[5]);
-  return macstr;
-}
-
-
-/**
- * Function called for a quick conversion of the binary address to
- * a numeric address.  Note that the caller must not free the
- * address and that the next call to this function is allowed
- * to override the address again.
- *
- * @param cls closure
- * @param addr binary address
- * @param addrlen length of the address
- * @return string representing the same address
- */
-static const char *
-wlan_plugin_address_to_string (void *cls,
-                               const void *addr,
-                               size_t addrlen)
-{
-  const struct GNUNET_TRANSPORT_WLAN_MacAddress *mac;
-  static char macstr[36];
-
-  if (sizeof(struct WlanAddress) != addrlen)
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-  mac = &((struct WlanAddress *) addr)->mac;
-  GNUNET_snprintf (macstr,
-                   sizeof(macstr),
-                   "%s.%u.%s",
-                   PLUGIN_NAME,
-                   ntohl (((struct WlanAddress *) addr)->options),
-                   mac_to_string (mac));
-  return macstr;
-}
-
-
-/**
- * If a session monitor is attached, notify it about the new
- * session state.
- *
- * @param plugin our plugin
- * @param session session that changed state
- * @param state new state of the session
- */
-static void
-notify_session_monitor (struct Plugin *plugin,
-                        struct GNUNET_ATS_Session *session,
-                        enum GNUNET_TRANSPORT_SessionState state)
-{
-  struct GNUNET_TRANSPORT_SessionInfo info;
-
-  if (NULL == plugin->sic)
-    return;
-  memset (&info, 0, sizeof(info));
-  info.state = state;
-  info.is_inbound = GNUNET_SYSERR; /* hard to say */
-  info.num_msg_pending = 0; /* we queue per MAC, not per peer */
-  info.num_bytes_pending = 0; /* we queue per MAC, not per peer */
-  info.receive_delay = GNUNET_TIME_UNIT_ZERO_ABS; /* not supported by WLAN */
-  info.session_timeout = session->timeout;
-  info.address = session->address;
-  plugin->sic (plugin->sic_cls,
-               session,
-               &info);
-}
-
-
-/**
- * Fill the radiotap header
- *
- * @param endpoint pointer to the endpoint, can be NULL
- * @param header pointer to the radiotap header
- * @param size total message size
- */
-static void
-get_radiotap_header (struct MacEndpoint *endpoint,
-                     struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage *header,
-                     uint16_t size)
-{
-  header->header.type = ntohs (GNUNET_MESSAGE_TYPE_WLAN_DATA_TO_HELPER);
-  header->header.size = ntohs (size);
-  if (NULL != endpoint)
-  {
-    header->rate = endpoint->rate;
-    header->tx_power = endpoint->tx_power;
-    header->antenna = endpoint->antenna;
-  }
-  else
-  {
-    header->rate = 255;
-    header->tx_power = 0;
-    header->antenna = 0;
-  }
-}
-
-
-/**
- * Generate the WLAN hardware header for one packet
- *
- * @param plugin the plugin handle
- * @param header address to write the header to
- * @param to_mac_addr address of the recipient
- * @param size size of the whole packet, needed to calculate the time to send the packet
- */
-static void
-get_wlan_header (struct Plugin *plugin,
-                 struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame *header,
-                 const struct GNUNET_TRANSPORT_WLAN_MacAddress *to_mac_addr,
-                 unsigned int size)
-{
-  const int rate = 11000000;
-
-  header->frame_control = htons (IEEE80211_FC0_TYPE_DATA);
-  header->addr1 = *to_mac_addr;
-  header->addr2 = plugin->mac_address;
-  header->addr3 = mac_bssid_gnunet;
-  header->duration = GNUNET_htole16 ((size * 1000000) / rate + 290);
-  header->sequence_control = 0; // FIXME?
-  header->llc[0] = WLAN_LLC_DSAP_FIELD;
-  header->llc[1] = WLAN_LLC_SSAP_FIELD;
-  header->llc[2] = 0;  // FIXME?
-  header->llc[3] = 0;  // FIXME?
-}
-
-
-/**
- * Send an ACK for a fragment we received.
- *
- * @param cls the `struct MacEndpoint *` the ACK must be sent to
- * @param msg_id id of the message
- * @param hdr pointer to the hdr where the ack is stored
- */
-static void
-send_ack (void *cls,
-          uint32_t msg_id,
-          const struct GNUNET_MessageHeader *hdr)
-{
-  struct MacEndpoint *endpoint = cls;
-  struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage*radio_header;
-  uint16_t msize = ntohs (hdr->size);
-  size_t size = sizeof(struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage)
-                + msize;
-  char buf[size];
-
-  if (NULL == endpoint)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  if (size >= GNUNET_MAX_MESSAGE_SIZE)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Sending ACK to %s\n",
-       mac_to_string (&endpoint->wlan_addr.mac));
-  radio_header = (struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage *) buf;
-  get_radiotap_header (endpoint, radio_header, size);
-  get_wlan_header (endpoint->plugin,
-                   &radio_header->frame,
-                   &endpoint->wlan_addr.mac,
-                   sizeof(endpoint->wlan_addr.mac));
-  GNUNET_memcpy (&radio_header[1], hdr, msize);
-  if (NULL !=
-      GNUNET_HELPER_send (endpoint->plugin->suid_helper,
-                          &radio_header->header,
-                          GNUNET_NO /* dropping ACKs is bad */,
-                          NULL, NULL))
-    GNUNET_STATISTICS_update (endpoint->plugin->env->stats,
-                              _ ("# ACKs sent"),
-                              1, GNUNET_NO);
-}
-
-
-/**
- * Handles the data after all fragments are put together
- *
- * @param cls macendpoint this messages belongs to
- * @param hdr pointer to the data
- */
-static void
-wlan_data_message_handler (void *cls,
-                           const struct GNUNET_MessageHeader *hdr)
-{
-  struct MacEndpoint *endpoint = cls;
-  struct Plugin *plugin = endpoint->plugin;
-  struct MacAndSession mas;
-
-  GNUNET_STATISTICS_update (plugin->env->stats,
-                            _ ("# Messages defragmented"),
-                            1,
-                            GNUNET_NO);
-  mas.session = NULL;
-  mas.endpoint = endpoint;
-  (void) GNUNET_SERVER_mst_receive (plugin->fragment_data_tokenizer,
-                                    &mas,
-                                    (const char *) hdr,
-                                    ntohs (hdr->size),
-                                    GNUNET_YES, GNUNET_NO);
-}
-
-
-/**
- * Free a session
- *
- * @param cls our `struct Plugin`.
- * @param session the session free
- */
-static int
-wlan_plugin_disconnect_session (void *cls,
-                                struct GNUNET_ATS_Session *session)
-{
-  struct MacEndpoint *endpoint = session->mac;
-  struct Plugin *plugin = endpoint->plugin;
-
-  plugin->env->session_end (plugin->env->cls,
-                            session->address,
-                            session);
-  notify_session_monitor (plugin,
-                          session,
-                          GNUNET_TRANSPORT_SS_DONE);
-  GNUNET_CONTAINER_DLL_remove (endpoint->sessions_head,
-                               endpoint->sessions_tail,
-                               session);
-  if (session->timeout_task != NULL)
-  {
-    GNUNET_SCHEDULER_cancel (session->timeout_task);
-    session->timeout_task = NULL;
-  }
-  GNUNET_STATISTICS_update (plugin->env->stats,
-                            _ ("# Sessions allocated"),
-                            -1,
-                            GNUNET_NO);
-  GNUNET_HELLO_address_free (session->address);
-  GNUNET_free (session);
-  return GNUNET_OK;
-}
-
-
-/**
- * Function that is called to get the keepalive factor.
- * #GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT is divided by this number to
- * calculate the interval between keepalive packets.
- *
- * @param cls closure with the `struct Plugin`
- * @return keepalive factor
- */
-static unsigned int
-wlan_plugin_query_keepalive_factor (void *cls)
-{
-  return 3;
-}
-
-
-/**
- * A session is timing out.  Clean up.
- *
- * @param cls pointer to the Session
- */
-static void
-session_timeout (void *cls)
-{
-  struct GNUNET_ATS_Session *session = cls;
-  struct GNUNET_TIME_Relative left;
-
-  session->timeout_task = NULL;
-  left = GNUNET_TIME_absolute_get_remaining (session->timeout);
-  if (0 != left.rel_value_us)
-  {
-    session->timeout_task =
-      GNUNET_SCHEDULER_add_delayed (left,
-                                    &session_timeout,
-                                    session);
-    return;
-  }
-  wlan_plugin_disconnect_session (session->mac->plugin,
-                                  session);
-}
-
-
-/**
- * Lookup a new session
- *
- * @param endpoint pointer to the mac endpoint of the peer
- * @param peer peer identity to use for this session
- * @return returns the session or NULL
- */
-static struct GNUNET_ATS_Session *
-lookup_session (struct MacEndpoint *endpoint,
-                const struct GNUNET_PeerIdentity *peer)
-{
-  struct GNUNET_ATS_Session *session;
-
-  for (session = endpoint->sessions_head; NULL != session; session =
-         session->next)
-    if (0 == memcmp (peer, &session->target, sizeof(struct
-                                                    GNUNET_PeerIdentity)))
-      return session;
-  return NULL;
-}
-
-
-/**
- * Create a new session
- *
- * @param endpoint pointer to the mac endpoint of the peer
- * @param peer peer identity to use for this session
- * @return returns the session or NULL
- */
-static struct GNUNET_ATS_Session *
-create_session (struct MacEndpoint *endpoint,
-                const struct GNUNET_PeerIdentity *peer)
-{
-  struct GNUNET_ATS_Session *session;
-
-  GNUNET_STATISTICS_update (endpoint->plugin->env->stats,
-                            _ ("# Sessions allocated"),
-                            1,
-                            GNUNET_NO);
-  session = GNUNET_new (struct GNUNET_ATS_Session);
-  GNUNET_CONTAINER_DLL_insert_tail (endpoint->sessions_head,
-                                    endpoint->sessions_tail,
-                                    session);
-  session->address = GNUNET_HELLO_address_allocate (peer,
-                                                    PLUGIN_NAME,
-                                                    &endpoint->wlan_addr,
-                                                    sizeof(endpoint->wlan_addr),
-                                                    GNUNET_HELLO_ADDRESS_INFO_NONE);
-  session->mac = endpoint;
-  session->target = *peer;
-  session->timeout = GNUNET_TIME_relative_to_absolute (
-    GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
-  session->timeout_task =
-    GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
-                                  &session_timeout,
-                                  session);
-  notify_session_monitor (endpoint->plugin,
-                          session,
-                          GNUNET_TRANSPORT_SS_INIT);
-  notify_session_monitor (endpoint->plugin,
-                          session,
-                          GNUNET_TRANSPORT_SS_UP);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Created new session %p for peer `%s' with endpoint %s\n",
-       session,
-       GNUNET_i2s (peer),
-       mac_to_string (&endpoint->wlan_addr.mac));
-
-  return session;
-}
-
-
-/**
- * Look up a session for a peer and create a new session if none is found
- *
- * @param endpoint pointer to the mac endpoint of the peer
- * @param peer peer identity to use for this session
- * @return returns the session
- */
-static struct GNUNET_ATS_Session *
-get_session (struct MacEndpoint *endpoint,
-             const struct GNUNET_PeerIdentity *peer)
-{
-  struct GNUNET_ATS_Session *session;
-
-  if (NULL != (session = lookup_session (endpoint, peer)))
-    return session;
-  return create_session (endpoint, peer);
-}
-
-
-/**
- * Function called once we have successfully given the fragment
- * message to the SUID helper process and we are thus ready for
- * the next fragment.
- *
- * @param cls the `struct FragmentMessage *`
- * @param result result of the operation (#GNUNET_OK on success,
- *        #GNUNET_NO if the helper died, #GNUNET_SYSERR
- *        if the helper was stopped)
- */
-static void
-fragment_transmission_done (void *cls,
-                            int result)
-{
-  struct FragmentMessage *fm = cls;
-
-  fm->sh = NULL;
-  GNUNET_FRAGMENT_context_transmission_done (fm->fragcontext);
-}
-
-
-/**
- * Transmit a fragment of a message.
- *
- * @param cls `struct FragmentMessage *` this fragment message belongs to
- * @param hdr pointer to the start of the fragment message
- */
-static void
-transmit_fragment (void *cls,
-                   const struct GNUNET_MessageHeader *hdr)
-{
-  struct FragmentMessage *fm = cls;
-  struct MacEndpoint *endpoint = fm->macendpoint;
-  size_t size;
-  uint16_t msize;
-
-  if (NULL == endpoint)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  msize = ntohs (hdr->size);
-  size = sizeof(struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage) + msize;
-  {
-    char buf[size];
-    struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage *radio_header;
-
-    radio_header = (struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage *) buf;
-    get_radiotap_header (endpoint, radio_header, size);
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Sending %u bytes of data to MAC `%s'\n",
-         (unsigned int) msize,
-         mac_to_string (&endpoint->wlan_addr.mac));
-
-    get_wlan_header (endpoint->plugin,
-                     &radio_header->frame,
-                     &endpoint->wlan_addr.mac,
-                     sizeof(endpoint->wlan_addr.mac));
-    GNUNET_memcpy (&radio_header[1], hdr, msize);
-    GNUNET_assert (NULL == fm->sh);
-    fm->sh = GNUNET_HELPER_send (endpoint->plugin->suid_helper,
-                                 &radio_header->header,
-                                 GNUNET_NO,
-                                 &fragment_transmission_done, fm);
-    fm->size_on_wire += size;
-    if (NULL != fm->sh)
-    {
-      GNUNET_STATISTICS_update (endpoint->plugin->env->stats,
-                                _ ("# message fragments sent"),
-                                1,
-                                GNUNET_NO);
-    }
-    else
-    {
-      GNUNET_FRAGMENT_context_transmission_done (fm->fragcontext);
-    }
-    GNUNET_STATISTICS_update (endpoint->plugin->env->stats,
-                              "# bytes currently in buffers",
-                              -msize, GNUNET_NO);
-    GNUNET_STATISTICS_update (endpoint->plugin->env->stats,
-                              "# bytes transmitted",
-                              msize, GNUNET_NO);
-  }
-}
-
-
-/**
- * Frees the space of a message in the fragment queue (send queue)
- *
- * @param fm message to free
- */
-static void
-free_fragment_message (struct FragmentMessage *fm)
-{
-  struct MacEndpoint *endpoint = fm->macendpoint;
-
-  GNUNET_STATISTICS_update (endpoint->plugin->env->stats,
-                            _ ("# messages pending (with fragmentation)"),
-                            -1, GNUNET_NO);
-  GNUNET_CONTAINER_DLL_remove (endpoint->sending_messages_head,
-                               endpoint->sending_messages_tail,
-                               fm);
-  if (NULL != fm->sh)
-  {
-    GNUNET_HELPER_send_cancel (fm->sh);
-    fm->sh = NULL;
-  }
-  if (NULL != fm->msg)
-  {
-    GNUNET_free (fm->msg);
-    fm->msg = NULL;
-  }
-  if (NULL != fm->fragcontext)
-  {
-    GNUNET_FRAGMENT_context_destroy (fm->fragcontext,
-                                     &endpoint->msg_delay,
-                                     &endpoint->ack_delay);
-    fm->fragcontext = NULL;
-  }
-  if (NULL != fm->timeout_task)
-  {
-    GNUNET_SCHEDULER_cancel (fm->timeout_task);
-    fm->timeout_task = NULL;
-  }
-  GNUNET_free (fm);
-}
-
-
-/**
- * A FragmentMessage has timed out.  Remove it.
- *
- * @param cls pointer to the 'struct FragmentMessage'
- */
-static void
-fragmentmessage_timeout (void *cls)
-{
-  struct FragmentMessage *fm = cls;
-
-  fm->timeout_task = NULL;
-  if (NULL != fm->cont)
-  {
-    fm->cont (fm->cont_cls,
-              &fm->target,
-              GNUNET_SYSERR,
-              fm->size_payload,
-              fm->size_on_wire);
-    fm->cont = NULL;
-  }
-  free_fragment_message (fm);
-}
-
-
-/**
- * Transmit a message to the given destination with fragmentation.
- *
- * @param endpoint desired destination
- * @param timeout how long can the message wait?
- * @param target peer that should receive the message
- * @param msg message to transmit
- * @param payload_size bytes of payload
- * @param cont continuation to call once the message has
- *        been transmitted (or if the transport is ready
- *        for the next transmission call; or if the
- *        peer disconnected...); can be NULL
- * @param cont_cls closure for @a cont
- */
-static void
-send_with_fragmentation (struct MacEndpoint *endpoint,
-                         struct GNUNET_TIME_Relative timeout,
-                         const struct GNUNET_PeerIdentity *target,
-                         const struct GNUNET_MessageHeader *msg,
-                         size_t payload_size,
-                         GNUNET_TRANSPORT_TransmitContinuation cont,
-                         void *cont_cls)
-
-{
-  struct FragmentMessage *fm;
-  struct Plugin *plugin;
-
-  plugin = endpoint->plugin;
-  fm = GNUNET_new (struct FragmentMessage);
-  fm->macendpoint = endpoint;
-  fm->target = *target;
-  fm->size_payload = payload_size;
-  fm->timeout = GNUNET_TIME_relative_to_absolute (timeout);
-  fm->cont = cont;
-  fm->cont_cls = cont_cls;
-  /* 1 MBit/s typical data rate, 1430 byte fragments => ~100 ms per message */
-  fm->timeout_task =
-    GNUNET_SCHEDULER_add_delayed (timeout,
-                                  &fragmentmessage_timeout,
-                                  fm);
-  if (GNUNET_YES == plugin->have_mac)
-  {
-    fm->fragcontext =
-      GNUNET_FRAGMENT_context_create (plugin->env->stats,
-                                      WLAN_MTU,
-                                      &plugin->tracker,
-                                      fm->macendpoint->msg_delay,
-                                      fm->macendpoint->ack_delay,
-                                      msg,
-                                      &transmit_fragment, fm);
-  }
-  else
-  {
-    fm->msg = GNUNET_copy_message (msg);
-  }
-  GNUNET_CONTAINER_DLL_insert_tail (endpoint->sending_messages_head,
-                                    endpoint->sending_messages_tail,
-                                    fm);
-}
-
-
-/**
- * Free a MAC endpoint.
- *
- * @param endpoint pointer to the MacEndpoint to free
- */
-static void
-free_macendpoint (struct MacEndpoint *endpoint)
-{
-  struct Plugin *plugin = endpoint->plugin;
-  struct FragmentMessage *fm;
-  struct GNUNET_ATS_Session *session;
-
-  GNUNET_STATISTICS_update (plugin->env->stats,
-                            _ ("# MAC endpoints allocated"),
-                            -1,
-                            GNUNET_NO);
-  while (NULL != (session = endpoint->sessions_head))
-    wlan_plugin_disconnect_session (plugin,
-                                    session);
-  while (NULL != (fm = endpoint->sending_messages_head))
-    free_fragment_message (fm);
-  GNUNET_CONTAINER_DLL_remove (plugin->mac_head,
-                               plugin->mac_tail,
-                               endpoint);
-
-  if (NULL != endpoint->defrag)
-  {
-    GNUNET_DEFRAGMENT_context_destroy (endpoint->defrag);
-    endpoint->defrag = NULL;
-  }
-
-  plugin->mac_count--;
-  if (NULL != endpoint->timeout_task)
-  {
-    GNUNET_SCHEDULER_cancel (endpoint->timeout_task);
-    endpoint->timeout_task = NULL;
-  }
-  GNUNET_free (endpoint);
-}
-
-
-/**
- * A MAC endpoint is timing out.  Clean up.
- *
- * @param cls pointer to the `struct MacEndpoint *`
- */
-static void
-macendpoint_timeout (void *cls)
-{
-  struct MacEndpoint *endpoint = cls;
-  struct GNUNET_TIME_Relative timeout;
-
-  endpoint->timeout_task = NULL;
-  timeout = GNUNET_TIME_absolute_get_remaining (endpoint->timeout);
-  if (0 == timeout.rel_value_us)
-  {
-    free_macendpoint (endpoint);
-    return;
-  }
-  endpoint->timeout_task =
-    GNUNET_SCHEDULER_add_delayed (timeout,
-                                  &macendpoint_timeout,
-                                  endpoint);
-}
-
-
-/**
- * Find (or create) a MacEndpoint with a specific MAC address
- *
- * @param plugin pointer to the plugin struct
- * @param mac the MAC address of the endpoint
- * @return handle to our data structure for this MAC
- */
-static struct MacEndpoint *
-create_macendpoint (struct Plugin *plugin,
-                    struct WlanAddress *mac)
-{
-  struct MacEndpoint *pos;
-
-  for (pos = plugin->mac_head; NULL != pos; pos = pos->next)
-    if (0 == memcmp (mac, &pos->wlan_addr, sizeof(pos->wlan_addr)))
-      return pos;
-  pos = GNUNET_new (struct MacEndpoint);
-  pos->wlan_addr = (*mac);
-  pos->plugin = plugin;
-  pos->defrag =
-    GNUNET_DEFRAGMENT_context_create (plugin->env->stats,
-                                      WLAN_MTU,
-                                      MESSAGES_IN_DEFRAG_QUEUE_PER_MAC,
-                                      pos,
-                                      &wlan_data_message_handler,
-                                      &send_ack);
-
-  pos->msg_delay = GNUNET_TIME_UNIT_MILLISECONDS;
-  pos->ack_delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
-                                                  100);
-  pos->timeout = GNUNET_TIME_relative_to_absolute (MACENDPOINT_TIMEOUT);
-  pos->timeout_task =
-    GNUNET_SCHEDULER_add_delayed (MACENDPOINT_TIMEOUT, &macendpoint_timeout,
-                                  pos);
-  GNUNET_CONTAINER_DLL_insert (plugin->mac_head,
-                               plugin->mac_tail,
-                               pos);
-  plugin->mac_count++;
-  GNUNET_STATISTICS_update (plugin->env->stats,
-                            _ ("# MAC endpoints allocated"),
-                            1, GNUNET_NO);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "New MAC endpoint `%s'\n",
-       wlan_plugin_address_to_string (NULL,
-                                      &pos->wlan_addr,
-                                      sizeof(struct WlanAddress)));
-  return pos;
-}
-
-
-/**
- * Function obtain the network type for a session
- *
- * @param cls closure (`struct Plugin*`)
- * @param session the session
- * @return the network type in HBO or #GNUNET_SYSERR
- */
-static enum GNUNET_NetworkType
-wlan_plugin_get_network (void *cls,
-                         struct GNUNET_ATS_Session *session)
-{
-#if BUILD_WLAN
-  return GNUNET_NT_WLAN;
-#else
-  return GNUNET_NT_BT;
-#endif
-}
-
-
-/**
- * Function obtain the network type for an address.
- *
- * @param cls closure (`struct Plugin *`)
- * @param address the address
- * @return the network type
- */
-static enum GNUNET_NetworkType
-wlan_plugin_get_network_for_address (void *cls,
-                                     const struct GNUNET_HELLO_Address *address)
-{
-#if BUILD_WLAN
-  return GNUNET_NT_WLAN;
-#else
-  return GNUNET_NT_BT;
-#endif
-}
-
-
-/**
- * Creates a new outbound session the transport service will use to
- * send data to the peer
- *
- * @param cls the `struct Plugin *`
- * @param address the address
- * @return the session or NULL of max connections exceeded
- */
-static struct GNUNET_ATS_Session *
-wlan_plugin_get_session (void *cls,
-                         const struct GNUNET_HELLO_Address *address)
-{
-  struct Plugin *plugin = cls;
-  struct MacEndpoint *endpoint;
-
-  if (NULL == address)
-    return NULL;
-  if (sizeof(struct WlanAddress) != address->address_length)
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Service asked to create session for peer `%s' with MAC `%s'\n",
-       GNUNET_i2s (&address->peer),
-       wlan_plugin_address_to_string (NULL,
-                                      address->address,
-                                      address->address_length));
-  endpoint = create_macendpoint (plugin,
-                                 (struct WlanAddress *) address->address);
-  return get_session (endpoint, &address->peer);
-}
-
-
-/**
- * Function that can be used to force the plugin to disconnect
- * from the given peer and cancel all previous transmissions
- * (and their continuation).
- *
- * @param cls closure
- * @param target peer from which to disconnect
- */
-static void
-wlan_plugin_disconnect_peer (void *cls,
-                             const struct GNUNET_PeerIdentity *target)
-{
-  struct Plugin *plugin = cls;
-  struct GNUNET_ATS_Session *session;
-  struct MacEndpoint *endpoint;
-
-  for (endpoint = plugin->mac_head; NULL != endpoint; endpoint = endpoint->next)
-    for (session = endpoint->sessions_head; NULL != session; session =
-           session->next)
-      if (0 == memcmp (target, &session->target,
-                       sizeof(struct GNUNET_PeerIdentity)))
-      {
-        wlan_plugin_disconnect_session (plugin, session);
-        break;   /* inner-loop only (in case peer has another MAC as well!) */
-      }
-}
-
-
-/**
- * Function that can be used by the transport service to transmit
- * a message using the plugin.   Note that in the case of a
- * peer disconnecting, the continuation MUST be called
- * prior to the disconnect notification itself.  This function
- * will be called with this peer's HELLO message to initiate
- * a fresh connection to another peer.
- *
- * @param cls closure
- * @param session which session must be used
- * @param msgbuf the message to transmit
- * @param msgbuf_size number of bytes in @a msgbuf
- * @param priority how important is the message (most plugins will
- *                 ignore message priority and just FIFO)
- * @param to how long to wait at most for the transmission (does not
- *                require plugins to discard the message after the timeout,
- *                just advisory for the desired delay; most plugins will ignore
- *                this as well)
- * @param cont continuation to call once the message has
- *        been transmitted (or if the transport is ready
- *        for the next transmission call; or if the
- *        peer disconnected...); can be NULL
- * @param cont_cls closure for @a cont
- * @return number of bytes used (on the physical network, with overheads);
- *         -1 on hard errors (i.e. address invalid); 0 is a legal value
- *         and does NOT mean that the message was not transmitted (DV)
- */
-static ssize_t
-wlan_plugin_send (void *cls,
-                  struct GNUNET_ATS_Session *session,
-                  const char *msgbuf, size_t msgbuf_size,
-                  unsigned int priority,
-                  struct GNUNET_TIME_Relative to,
-                  GNUNET_TRANSPORT_TransmitContinuation cont, void *cont_cls)
-{
-  struct Plugin *plugin = cls;
-  struct WlanHeader *wlanheader;
-  size_t size = msgbuf_size + sizeof(struct WlanHeader);
-  char buf[size] GNUNET_ALIGN;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Transmitting %llu bytes of payload to peer `%s' (starting with %u byte message of type %u)\n",
-       (unsigned long long) msgbuf_size,
-       GNUNET_i2s (&session->target),
-       (unsigned int) ntohs (((struct GNUNET_MessageHeader*) msgbuf)->size),
-       (unsigned int) ntohs (((struct GNUNET_MessageHeader*) msgbuf)->type));
-  wlanheader = (struct WlanHeader *) buf;
-  wlanheader->header.size = htons (msgbuf_size + sizeof(struct WlanHeader));
-  wlanheader->header.type = htons (GNUNET_MESSAGE_TYPE_WLAN_DATA);
-  wlanheader->sender = *plugin->env->my_identity;
-  wlanheader->target = session->target;
-  wlanheader->crc = htonl (GNUNET_CRYPTO_crc32_n (msgbuf, msgbuf_size));
-  GNUNET_memcpy (&wlanheader[1],
-                 msgbuf,
-                 msgbuf_size);
-  GNUNET_STATISTICS_update (plugin->env->stats,
-                            "# bytes currently in buffers",
-                            msgbuf_size,
-                            GNUNET_NO);
-  send_with_fragmentation (session->mac,
-                           to,
-                           &session->target,
-                           &wlanheader->header,
-                           msgbuf_size,
-                           cont, cont_cls);
-  return size;
-}
-
-
-/**
- * We have received data from the WLAN via some session.  Process depending
- * on the message type (HELLO, DATA, FRAGMENTATION or FRAGMENTATION-ACK).
- *
- * @param cls pointer to the plugin
- * @param client pointer to the session this message belongs to
- * @param hdr start of the message
- */
-static int
-process_data (void *cls,
-              void *client,
-              const struct GNUNET_MessageHeader *hdr)
-{
-  struct Plugin *plugin = cls;
-  struct GNUNET_HELLO_Address *address;
-  struct MacAndSession *mas = client;
-  struct FragmentMessage *fm;
-  struct GNUNET_PeerIdentity tmpsource;
-  const struct WlanHeader *wlanheader;
-  int ret;
-  uint16_t msize;
-
-  msize = ntohs (hdr->size);
-
-  GNUNET_STATISTICS_update (plugin->env->stats,
-                            "# bytes received",
-                            msize, GNUNET_NO);
-
-  switch (ntohs (hdr->type))
-  {
-  case GNUNET_MESSAGE_TYPE_HELLO:
-
-    if (GNUNET_OK !=
-        GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *) hdr,
-                             &tmpsource))
-    {
-      GNUNET_break_op (0);
-      break;
-    }
-    if (NULL == mas->endpoint)
-    {
-      GNUNET_break (0);
-      break;
-    }
-
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Processing %u bytes of HELLO from peer `%s' at MAC %s\n",
-         (unsigned int) msize,
-         GNUNET_i2s (&tmpsource),
-         wlan_plugin_address_to_string (NULL,
-                                        &mas->endpoint->wlan_addr,
-                                        sizeof(mas->endpoint->wlan_addr)));
-
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              _ ("# HELLO messages received"), 1,
-                              GNUNET_NO);
-    address = GNUNET_HELLO_address_allocate (&tmpsource,
-                                             PLUGIN_NAME,
-                                             &mas->endpoint->wlan_addr,
-                                             sizeof(mas->endpoint->wlan_addr),
-                                             GNUNET_HELLO_ADDRESS_INFO_NONE);
-    mas->session = lookup_session (mas->endpoint,
-                                   &tmpsource);
-    if (NULL == mas->session)
-    {
-      mas->session = create_session (mas->endpoint,
-                                     &tmpsource);
-      plugin->env->session_start (plugin->env->cls,
-                                  address,
-                                  mas->session,
-                                  scope);
-    }
-    plugin->env->receive (plugin->env->cls,
-                          address,
-                          mas->session,
-                          hdr);
-    GNUNET_HELLO_address_free (address);
-    break;
-
-  case GNUNET_MESSAGE_TYPE_FRAGMENT:
-    if (NULL == mas->endpoint)
-    {
-      GNUNET_break (0);
-      break;
-    }
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Processing %u bytes of FRAGMENT from MAC %s\n",
-         (unsigned int) msize,
-         wlan_plugin_address_to_string (NULL,
-                                        &mas->endpoint->wlan_addr,
-                                        sizeof(mas->endpoint->wlan_addr)));
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              _ ("# fragments received"),
-                              1,
-                              GNUNET_NO);
-    (void) GNUNET_DEFRAGMENT_process_fragment (mas->endpoint->defrag,
-                                               hdr);
-    break;
-
-  case GNUNET_MESSAGE_TYPE_FRAGMENT_ACK:
-    if (NULL == mas->endpoint)
-    {
-      GNUNET_break (0);
-      break;
-    }
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              _ ("# ACKs received"),
-                              1, GNUNET_NO);
-    for (fm = mas->endpoint->sending_messages_head; NULL != fm; fm = fm->next)
-    {
-      ret = GNUNET_FRAGMENT_process_ack (fm->fragcontext, hdr);
-      if (GNUNET_OK == ret)
-      {
-        LOG (GNUNET_ERROR_TYPE_DEBUG,
-             "Got last ACK, finished message transmission to `%s' (%p)\n",
-             wlan_plugin_address_to_string (NULL,
-                                            &mas->endpoint->wlan_addr,
-                                            sizeof(mas->endpoint->wlan_addr)),
-             fm);
-        mas->endpoint->timeout = GNUNET_TIME_relative_to_absolute (
-          MACENDPOINT_TIMEOUT);
-        if (NULL != fm->cont)
-        {
-          fm->cont (fm->cont_cls,
-                    &fm->target,
-                    GNUNET_OK,
-                    fm->size_payload,
-                    fm->size_on_wire);
-          fm->cont = NULL;
-        }
-        free_fragment_message (fm);
-        break;
-      }
-      if (GNUNET_NO == ret)
-      {
-        LOG (GNUNET_ERROR_TYPE_DEBUG,
-             "Got an ACK, message transmission to `%s' not yet finished\n",
-             wlan_plugin_address_to_string (NULL,
-                                            &mas->endpoint->wlan_addr,
-                                            sizeof(mas->endpoint->wlan_addr)));
-        break;
-      }
-    }
-    if (NULL == fm)
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "ACK not matched against any active fragmentation with MAC `%s'\n",
-           wlan_plugin_address_to_string (NULL,
-                                          &mas->endpoint->wlan_addr,
-                                          sizeof(mas->endpoint->wlan_addr)));
-    break;
-
-  case GNUNET_MESSAGE_TYPE_WLAN_DATA:
-    if (NULL == mas->endpoint)
-    {
-      GNUNET_break (0);
-      break;
-    }
-    if (msize < sizeof(struct WlanHeader))
-    {
-      GNUNET_break (0);
-      break;
-    }
-    wlanheader = (const struct WlanHeader *) hdr;
-    if (0 != memcmp (&wlanheader->target,
-                     plugin->env->my_identity,
-                     sizeof(struct GNUNET_PeerIdentity)))
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Data for `%s', not for me, ignoring\n",
-           GNUNET_i2s (&wlanheader->target));
-      break;
-    }
-    if (ntohl (wlanheader->crc) !=
-        GNUNET_CRYPTO_crc32_n (&wlanheader[1],
-                               msize - sizeof(struct WlanHeader)))
-    {
-      GNUNET_STATISTICS_update (plugin->env->stats,
-                                _ (
-                                  "# DATA messages discarded due to CRC32 error"),
-                                1,
-                                GNUNET_NO);
-      break;
-    }
-    mas->session = lookup_session (mas->endpoint,
-                                   &wlanheader->sender);
-    if (NULL == mas->session)
-    {
-      mas->session = create_session (mas->endpoint,
-                                     &wlanheader->sender);
-      address = GNUNET_HELLO_address_allocate (&wlanheader->sender,
-                                               PLUGIN_NAME,
-                                               &mas->endpoint->wlan_addr,
-                                               sizeof(struct WlanAddress),
-                                               GNUNET_HELLO_ADDRESS_INFO_NONE);
-      plugin->env->session_start (plugin->env->cls,
-                                  address,
-                                  mas->session,
-                                  scope);
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Notifying transport about peer `%s''s new session %p \n",
-           GNUNET_i2s (&wlanheader->sender),
-           mas->session);
-      GNUNET_HELLO_address_free (address);
-    }
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Processing %u bytes of DATA from peer `%s'\n",
-         (unsigned int) msize,
-         GNUNET_i2s (&wlanheader->sender));
-    mas->session->timeout = GNUNET_TIME_relative_to_absolute (
-      GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
-    (void) GNUNET_SERVER_mst_receive (plugin->wlan_header_payload_tokenizer,
-                                      mas,
-                                      (const char *) &wlanheader[1],
-                                      msize - sizeof(struct WlanHeader),
-                                      GNUNET_YES,
-                                      GNUNET_NO);
-    break;
-
-  default:
-    if (NULL == mas->endpoint)
-    {
-      GNUNET_break (0);
-      break;
-    }
-    if (NULL == mas->session)
-    {
-      GNUNET_break (0);
-      break;
-    }
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Received packet with %u bytes of type %u from peer %s\n",
-         (unsigned int) msize,
-         (unsigned int) ntohs (hdr->type),
-         GNUNET_i2s (&mas->session->target));
-    plugin->env->receive (plugin->env->cls,
-                          mas->session->address,
-                          mas->session,
-                          hdr);
-    break;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Task to (periodically) send a HELLO beacon
- *
- * @param cls pointer to the plugin struct
- */
-static void
-send_hello_beacon (void *cls)
-{
-  struct Plugin *plugin = cls;
-  uint16_t size;
-  uint16_t hello_size;
-  struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage *radioHeader;
-  const struct GNUNET_MessageHeader *hello;
-
-  hello = plugin->env->get_our_hello ();
-  if (NULL != hello)
-  {
-    hello_size = GNUNET_HELLO_size ((struct GNUNET_HELLO_Message *) hello);
-    GNUNET_assert (sizeof(struct WlanHeader) + hello_size <= WLAN_MTU);
-    size = sizeof(struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage)
-           + hello_size;
-    {
-      char buf[size] GNUNET_ALIGN;
-
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Sending %u byte HELLO beacon\n",
-           (unsigned int) size);
-      radioHeader = (struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage*) buf;
-      get_radiotap_header (NULL, radioHeader, size);
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Broadcasting %u bytes of data to MAC `%s'\n",
-           (unsigned int) size,
-           mac_to_string (&bc_all_mac));
-      get_wlan_header (plugin, &radioHeader->frame, &bc_all_mac, size);
-      GNUNET_memcpy (&radioHeader[1], hello, hello_size);
-      if (NULL !=
-          GNUNET_HELPER_send (plugin->suid_helper,
-                              &radioHeader->header,
-                              GNUNET_YES /* can drop */,
-                              NULL, NULL))
-        GNUNET_STATISTICS_update (plugin->env->stats,
-                                  _ ("# HELLO beacons sent"),
-                                  1, GNUNET_NO);
-    }
-  }
-  plugin->beacon_task =
-    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                    (HELLO_BEACON_SCALING_FACTOR,
-                                    plugin->mac_count + 1),
-                                  &send_hello_beacon,
-                                  plugin);
-}
-
-
-/**
- * Function used for to process the data from the suid process
- *
- * @param cls the plugin handle
- * @param hdr header of the GNUNET_MessageHeader
- */
-static int
-handle_helper_message (void *cls,
-                       const struct GNUNET_MessageHeader *hdr)
-{
-  struct Plugin *plugin = cls;
-  struct GNUNET_HELLO_Address *my_address;
-  const struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage *rxinfo;
-  const struct GNUNET_TRANSPORT_WLAN_HelperControlMessage *cm;
-  struct WlanAddress wa;
-  struct MacAndSession mas;
-  uint16_t msize;
-  struct FragmentMessage *fm;
-  struct MacEndpoint *endpoint;
-
-  msize = ntohs (hdr->size);
-  switch (ntohs (hdr->type))
-  {
-  case GNUNET_MESSAGE_TYPE_WLAN_HELPER_CONTROL:
-    if (msize != sizeof(struct GNUNET_TRANSPORT_WLAN_HelperControlMessage))
-    {
-      GNUNET_break (0);
-      break;
-    }
-    cm = (const struct GNUNET_TRANSPORT_WLAN_HelperControlMessage *) hdr;
-    if (GNUNET_YES == plugin->have_mac)
-    {
-      if (0 == memcmp (&plugin->mac_address,
-                       &cm->mac,
-                       sizeof(struct GNUNET_TRANSPORT_WLAN_MacAddress)))
-        break;     /* no change */
-      /* remove old address */
-      memset (&wa, 0, sizeof(struct WlanAddress));
-      wa.mac = plugin->mac_address;
-      wa.options = htonl (plugin->options);
-      my_address = GNUNET_HELLO_address_allocate (plugin->env->my_identity,
-                                                  PLUGIN_NAME,
-                                                  &wa, sizeof(wa),
-                                                  GNUNET_HELLO_ADDRESS_INFO_NONE);
-      plugin->env->notify_address (plugin->env->cls,
-                                   GNUNET_NO,
-                                   my_address);
-      GNUNET_HELLO_address_free (my_address);
-      plugin->mac_address = cm->mac;
-    }
-    else
-    {
-      plugin->mac_address = cm->mac;
-      plugin->have_mac = GNUNET_YES;
-      for (endpoint = plugin->mac_head; NULL != endpoint; endpoint =
-             endpoint->next)
-      {
-        for (fm = endpoint->sending_messages_head; NULL != fm; fm = fm->next)
-        {
-          if (NULL != fm->fragcontext)
-          {
-            GNUNET_break (0);          /* should not happen */
-            continue;
-          }
-          fm->fragcontext =
-            GNUNET_FRAGMENT_context_create (plugin->env->stats,
-                                            WLAN_MTU,
-                                            &plugin->tracker,
-                                            fm->macendpoint->msg_delay,
-                                            fm->macendpoint->ack_delay,
-                                            fm->msg,
-                                            &transmit_fragment, fm);
-          GNUNET_free (fm->msg);
-          fm->msg = NULL;
-        }
-      }
-      GNUNET_break (NULL == plugin->beacon_task);
-      plugin->beacon_task = GNUNET_SCHEDULER_add_now (&send_hello_beacon,
-                                                      plugin);
-    }
-
-    memset (&wa, 0, sizeof(struct WlanAddress));
-    wa.mac = plugin->mac_address;
-    wa.options = htonl (plugin->options);
-    my_address = GNUNET_HELLO_address_allocate (plugin->env->my_identity,
-                                                PLUGIN_NAME,
-                                                &wa, sizeof(wa),
-                                                GNUNET_HELLO_ADDRESS_INFO_NONE);
-
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Received WLAN_HELPER_CONTROL message with MAC address `%s' for peer `%s'\n",
-         mac_to_string (&cm->mac),
-         GNUNET_i2s (plugin->env->my_identity));
-    plugin->env->notify_address (plugin->env->cls,
-                                 GNUNET_YES,
-                                 my_address);
-    GNUNET_HELLO_address_free (my_address);
-    break;
-
-  case GNUNET_MESSAGE_TYPE_WLAN_DATA_FROM_HELPER:
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Got data message from helper with %u bytes\n",
-         msize);
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              _ ("# DATA messages received"), 1,
-                              GNUNET_NO);
-    if (msize < sizeof(struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage))
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Size of packet is too small (%llu bytes < %llu)\n",
-           (unsigned long long) msize,
-           (unsigned long long) sizeof(struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage));
-      break;
-    }
-    rxinfo = (const struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage *) hdr;
-
-    /* check if message is actually for us */
-    if (0 != memcmp (&rxinfo->frame.addr3, &mac_bssid_gnunet,
-                     sizeof(struct GNUNET_TRANSPORT_WLAN_MacAddress)))
-    {
-      /* Not the GNUnet BSSID */
-      break;
-    }
-    if ((0 != memcmp (&rxinfo->frame.addr1, &bc_all_mac,
-                      sizeof(struct GNUNET_TRANSPORT_WLAN_MacAddress))) &&
-        (0 != memcmp (&rxinfo->frame.addr1, &plugin->mac_address,
-                      sizeof(struct GNUNET_TRANSPORT_WLAN_MacAddress))))
-    {
-      /* Neither broadcast nor specifically for us */
-      break;
-    }
-    if (0 == memcmp (&rxinfo->frame.addr2, &plugin->mac_address,
-                     sizeof(struct GNUNET_TRANSPORT_WLAN_MacAddress)))
-    {
-      /* packet is FROM us, thus not FOR us */
-      break;
-    }
-
-    GNUNET_STATISTICS_update (plugin->env->stats,
-                              _ ("# DATA messages processed"),
-                              1, GNUNET_NO);
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Receiving %u bytes of data from MAC `%s'\n",
-         (unsigned int) (msize - sizeof(struct
-                                        GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage)),
-         mac_to_string (&rxinfo->frame.addr2));
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Receiving %u bytes of data to MAC `%s'\n",
-         (unsigned int) (msize - sizeof(struct
-                                        GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage)),
-         mac_to_string (&rxinfo->frame.addr1));
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Receiving %u bytes of data with BSSID MAC `%s'\n",
-         (unsigned int) (msize - sizeof(struct
-                                        GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage)),
-         mac_to_string (&rxinfo->frame.addr3));
-    wa.mac = rxinfo->frame.addr2;
-    wa.options = htonl (0);
-    mas.endpoint = create_macendpoint (plugin, &wa);
-    mas.session = NULL;
-    (void) GNUNET_SERVER_mst_receive (plugin->helper_payload_tokenizer,
-                                      &mas,
-                                      (const char *) &rxinfo[1],
-                                      msize - sizeof(struct
-                                                     GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage),
-                                      GNUNET_YES, GNUNET_NO);
-    break;
-
-  default:
-    GNUNET_break (0);
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Unexpected message of type %u (%u bytes)",
-         ntohs (hdr->type),
-         ntohs (hdr->size));
-    break;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Another peer has suggested an address for this
- * peer and transport plugin.  Check that this could be a valid
- * address.  If so, consider adding it to the list
- * of addresses.
- *
- * @param cls closure
- * @param addr pointer to the address
- * @param addrlen length of @a addr
- * @return #GNUNET_OK if this is a plausible address for this peer
- *         and transport
- */
-static int
-wlan_plugin_address_suggested (void *cls,
-                               const void *addr,
-                               size_t addrlen)
-{
-  struct Plugin *plugin = cls;
-  struct WlanAddress *wa = (struct WlanAddress *) addr;
-
-  if (addrlen != sizeof(struct WlanAddress))
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  if (GNUNET_YES != plugin->have_mac)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Rejecting MAC `%s': I don't know my MAC!\n",
-         mac_to_string (addr));
-    return GNUNET_NO;   /* don't know my MAC */
-  }
-  if (0 != memcmp (&wa->mac,
-                   &plugin->mac_address,
-                   sizeof(wa->mac)))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Rejecting MAC `%s': not my MAC!\n",
-         mac_to_string (addr));
-    return GNUNET_NO;   /* not my MAC */
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Convert the transports address to a nice, human-readable format.
- *
- * @param cls closure
- * @param type name of the transport that generated the address
- * @param addr one of the addresses of the host, NULL for the last address
- *        the specific address format depends on the transport
- * @param addrlen length of the address
- * @param numeric should (IP) addresses be displayed in numeric form?
- * @param timeout after how long should we give up?
- * @param asc function to call on each string
- * @param asc_cls closure for @a asc
- */
-static void
-wlan_plugin_address_pretty_printer (void *cls,
-                                    const char *type,
-                                    const void *addr,
-                                    size_t addrlen,
-                                    int numeric,
-                                    struct GNUNET_TIME_Relative timeout,
-                                    GNUNET_TRANSPORT_AddressStringCallback asc,
-                                    void *asc_cls)
-{
-  const char *ret;
-
-  if (sizeof(struct WlanAddress) == addrlen)
-    ret = wlan_plugin_address_to_string (NULL,
-                                         addr,
-                                         addrlen);
-  else
-    ret = NULL;
-  asc (asc_cls,
-       ret,
-       (NULL == ret) ? GNUNET_SYSERR : GNUNET_OK);
-  asc (asc_cls, NULL, GNUNET_OK);
-}
-
-
-/**
- * Exit point from the plugin.
- *
- * @param cls pointer to the api struct
- */
-void *
-LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls)
-{
-  struct WlanAddress wa;
-  struct GNUNET_HELLO_Address *address;
-  struct GNUNET_TRANSPORT_PluginFunctions *api = cls;
-  struct Plugin *plugin = api->cls;
-  struct MacEndpoint *endpoint;
-  struct MacEndpoint *endpoint_next;
-
-  if (NULL == plugin)
-  {
-    GNUNET_free (api);
-    return NULL;
-  }
-  if (GNUNET_YES == plugin->have_mac)
-  {
-    memset (&wa, 0, sizeof(wa));
-    wa.options = htonl (plugin->options);
-    wa.mac = plugin->mac_address;
-    address = GNUNET_HELLO_address_allocate (plugin->env->my_identity,
-                                             PLUGIN_NAME,
-                                             &wa, sizeof(struct WlanAddress),
-                                             GNUNET_HELLO_ADDRESS_INFO_NONE);
-
-    plugin->env->notify_address (plugin->env->cls,
-                                 GNUNET_NO,
-                                 address);
-    plugin->have_mac = GNUNET_NO;
-    GNUNET_HELLO_address_free (address);
-  }
-
-  if (NULL != plugin->beacon_task)
-  {
-    GNUNET_SCHEDULER_cancel (plugin->beacon_task);
-    plugin->beacon_task = NULL;
-  }
-  if (NULL != plugin->suid_helper)
-  {
-    GNUNET_HELPER_stop (plugin->suid_helper,
-                        GNUNET_NO);
-    plugin->suid_helper = NULL;
-  }
-  endpoint_next = plugin->mac_head;
-  while (NULL != (endpoint = endpoint_next))
-  {
-    endpoint_next = endpoint->next;
-    free_macendpoint (endpoint);
-  }
-  if (NULL != plugin->fragment_data_tokenizer)
-  {
-    GNUNET_SERVER_mst_destroy (plugin->fragment_data_tokenizer);
-    plugin->fragment_data_tokenizer = NULL;
-  }
-  if (NULL != plugin->wlan_header_payload_tokenizer)
-  {
-    GNUNET_SERVER_mst_destroy (plugin->wlan_header_payload_tokenizer);
-    plugin->wlan_header_payload_tokenizer = NULL;
-  }
-  if (NULL != plugin->helper_payload_tokenizer)
-  {
-    GNUNET_SERVER_mst_destroy (plugin->helper_payload_tokenizer);
-    plugin->helper_payload_tokenizer = NULL;
-  }
-  GNUNET_free (plugin->wlan_interface);
-  GNUNET_free (plugin);
-  GNUNET_free (api);
-  return NULL;
-}
-
-
-/**
- * Function called to convert a string address to
- * a binary address.
- *
- * @param cls closure (`struct Plugin *`)
- * @param addr string address
- * @param addrlen length of the address
- * @param buf location to store the buffer
- * @param added location to store the number of bytes in the buffer.
- *        If the function returns #GNUNET_SYSERR, its contents are undefined.
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
- */
-static int
-wlan_plugin_string_to_address (void *cls,
-                               const char *addr,
-                               uint16_t addrlen,
-                               void **buf,
-                               size_t *added)
-{
-  struct WlanAddress *wa;
-  unsigned int a[6];
-  unsigned int i;
-  char plugin[5];
-  uint32_t options;
-
-  if ((NULL == addr) || (0 == addrlen))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  if ('\0' != addr[addrlen - 1])
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  if (strlen (addr) != addrlen - 1)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-
-  if (8 != sscanf (addr,
-                   "%4s.%u.%X:%X:%X:%X:%X:%X",
-                   plugin, &options,
-                   &a[0], &a[1], &a[2],
-                   &a[3], &a[4], &a[5]))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  wa = GNUNET_new (struct WlanAddress);
-  for (i = 0; i < 6; i++)
-    wa->mac.mac[i] = a[i];
-  wa->options = htonl (0);
-  *buf = wa;
-  *added = sizeof(struct WlanAddress);
-  return GNUNET_OK;
-}
-
-
-/**
- * Begin monitoring sessions of a plugin.  There can only
- * be one active monitor per plugin (i.e. if there are
- * multiple monitors, the transport service needs to
- * multiplex the generated events over all of them).
- *
- * @param cls closure of the plugin
- * @param sic callback to invoke, NULL to disable monitor;
- *            plugin will being by iterating over all active
- *            sessions immediately and then enter monitor mode
- * @param sic_cls closure for @a sic
- */
-static void
-wlan_plugin_setup_monitor (void *cls,
-                           GNUNET_TRANSPORT_SessionInfoCallback sic,
-                           void *sic_cls)
-{
-  struct Plugin *plugin = cls;
-  struct MacEndpoint *mac;
-  struct GNUNET_ATS_Session *session;
-
-  plugin->sic = sic;
-  plugin->sic_cls = sic_cls;
-  if (NULL != sic)
-  {
-    for (mac = plugin->mac_head; NULL != mac; mac = mac->next)
-      for (session = mac->sessions_head; NULL != session; session =
-             session->next)
-      {
-        notify_session_monitor (plugin,
-                                session,
-                                GNUNET_TRANSPORT_SS_INIT);
-        notify_session_monitor (plugin,
-                                session,
-                                GNUNET_TRANSPORT_SS_UP);
-      }
-    sic (sic_cls, NULL, NULL);
-  }
-}
-
-
-/**
- * Function that will be called whenever the transport service wants to
- * notify the plugin that a session is still active and in use and
- * therefore the session timeout for this session has to be updated
- *
- * @param cls closure
- * @param peer which peer was the session for
- * @param session which session is being updated
- */
-static void
-wlan_plugin_update_session_timeout (void *cls,
-                                    const struct GNUNET_PeerIdentity *peer,
-                                    struct GNUNET_ATS_Session *session)
-{
-  GNUNET_assert (NULL != session->timeout_task);
-  session->timeout = GNUNET_TIME_relative_to_absolute (
-    GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
-}
-
-
-/**
- * Function that will be called whenever the transport service wants to
- * notify the plugin that the inbound quota changed and that the plugin
- * should update it's delay for the next receive value
- *
- * @param cls closure
- * @param peer which peer was the session for
- * @param session which session is being updated
- * @param delay new delay to use for receiving
- */
-static void
-wlan_plugin_update_inbound_delay (void *cls,
-                                  const struct GNUNET_PeerIdentity *peer,
-                                  struct GNUNET_ATS_Session *session,
-                                  struct GNUNET_TIME_Relative delay)
-{
-  /* does nothing, as inbound delay is not supported by WLAN */
-}
-
-
-/**
- * Entry point for the plugin.
- *
- * @param cls closure, the `struct GNUNET_TRANSPORT_PluginEnvironment *`
- * @return the `struct GNUNET_TRANSPORT_PluginFunctions *` or NULL on error
- */
-void *
-LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls)
-{
-  struct GNUNET_TRANSPORT_PluginEnvironment *env = cls;
-  struct GNUNET_TRANSPORT_PluginFunctions *api;
-  struct Plugin *plugin;
-  char *wlan_interface;
-  unsigned long long testmode;
-  char *binary;
-
-  /* check for 'special' mode */
-  if (NULL == env->receive)
-  {
-    /* run in 'stub' mode (i.e. as part of gnunet-peerinfo), don't fully
-       initialize the plugin or the API */
-    api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
-    api->cls = NULL;
-    api->address_pretty_printer = &wlan_plugin_address_pretty_printer;
-    api->address_to_string = &wlan_plugin_address_to_string;
-    api->string_to_address = &wlan_plugin_string_to_address;
-    return api;
-  }
-
-  testmode = 0;
-  /* check configuration */
-  if ((GNUNET_YES ==
-       GNUNET_CONFIGURATION_have_value (env->cfg,
-                                        CONFIG_NAME,
-                                        "TESTMODE")) &&
-      ((GNUNET_SYSERR ==
-        GNUNET_CONFIGURATION_get_value_number (env->cfg,
-                                               CONFIG_NAME,
-                                               "TESTMODE",
-                                               &testmode)) ||
-       (testmode > 2)))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               CONFIG_NAME,
-                               "TESTMODE");
-    return NULL;
-  }
-  binary = GNUNET_OS_get_libexec_binary_path (HELPER_NAME);
-  if ((0 == testmode) &&
-      (GNUNET_YES !=
-       GNUNET_OS_check_helper_binary (binary,
-                                      GNUNET_YES,
-                                      NULL)))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         _ ("Helper binary `%s' not SUID, cannot run WLAN transport\n"),
-         HELPER_NAME);
-    GNUNET_free (binary);
-    return NULL;
-  }
-  GNUNET_free (binary);
-  if (GNUNET_YES !=
-      GNUNET_CONFIGURATION_get_value_string (env->cfg,
-                                             CONFIG_NAME,
-                                             "INTERFACE",
-                                             &wlan_interface))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               CONFIG_NAME,
-                               "INTERFACE");
-    return NULL;
-  }
-
-  plugin = GNUNET_new (struct Plugin);
-  plugin->wlan_interface = wlan_interface;
-  plugin->env = env;
-  GNUNET_STATISTICS_set (plugin->env->stats,
-                         _ ("# sessions allocated"),
-                         0, GNUNET_NO);
-  GNUNET_STATISTICS_set (plugin->env->stats,
-                         _ ("# MAC endpoints allocated"),
-                         0, 0);
-  GNUNET_BANDWIDTH_tracker_init (&plugin->tracker, NULL, NULL,
-                                 GNUNET_BANDWIDTH_value_init (100 * 1024
-                                                              * 1024 / 8),
-                                 100);
-  plugin->fragment_data_tokenizer = GNUNET_SERVER_mst_create (&process_data,
-                                                              plugin);
-  plugin->wlan_header_payload_tokenizer = GNUNET_SERVER_mst_create (
-    &process_data,
-    plugin);
-  plugin->helper_payload_tokenizer = GNUNET_SERVER_mst_create (&process_data,
-                                                               plugin);
-
-  plugin->options = 0;
-
-  /* some compilers do not like switch on 'long long'... */
-  switch ((unsigned int) testmode)
-  {
-  case 0:   /* normal */
-    plugin->helper_argv[0] = (char *) HELPER_NAME;
-    plugin->helper_argv[1] = wlan_interface;
-    plugin->helper_argv[2] = NULL;
-    plugin->suid_helper = GNUNET_HELPER_start (GNUNET_NO,
-                                               HELPER_NAME,
-                                               plugin->helper_argv,
-                                               &handle_helper_message,
-                                               NULL,
-                                               plugin);
-    break;
-
-  case 1:   /* testmode, peer 1 */
-    plugin->helper_argv[0] = (char *) DUMMY_HELPER_NAME;
-    plugin->helper_argv[1] = (char *) "1";
-    plugin->helper_argv[2] = NULL;
-    plugin->suid_helper = GNUNET_HELPER_start (GNUNET_NO,
-                                               DUMMY_HELPER_NAME,
-                                               plugin->helper_argv,
-                                               &handle_helper_message,
-                                               NULL,
-                                               plugin);
-    break;
-
-  case 2:   /* testmode, peer 2 */
-    plugin->helper_argv[0] = (char *) DUMMY_HELPER_NAME;
-    plugin->helper_argv[1] = (char *) "2";
-    plugin->helper_argv[2] = NULL;
-    plugin->suid_helper = GNUNET_HELPER_start (GNUNET_NO,
-                                               DUMMY_HELPER_NAME,
-                                               plugin->helper_argv,
-                                               &handle_helper_message,
-                                               NULL,
-                                               plugin);
-    break;
-
-  default:
-    GNUNET_assert (0);
-  }
-
-  api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
-  api->cls = plugin;
-  api->send = &wlan_plugin_send;
-  api->get_session = &wlan_plugin_get_session;
-  api->disconnect_peer = &wlan_plugin_disconnect_peer;
-  api->disconnect_session = &wlan_plugin_disconnect_session;
-  api->query_keepalive_factor = &wlan_plugin_query_keepalive_factor;
-  api->address_pretty_printer = &wlan_plugin_address_pretty_printer;
-  api->check_address = &wlan_plugin_address_suggested;
-  api->address_to_string = &wlan_plugin_address_to_string;
-  api->string_to_address = &wlan_plugin_string_to_address;
-  api->get_network = &wlan_plugin_get_network;
-  api->get_network_for_address = &wlan_plugin_get_network_for_address;
-  api->update_session_timeout = &wlan_plugin_update_session_timeout;
-  api->update_inbound_delay = &wlan_plugin_update_inbound_delay;
-  api->setup_monitor = &wlan_plugin_setup_monitor;
-  return api;
-}
-
-
-/* end of plugin_transport_wlan.c */
diff --git a/src/transport/plugin_transport_wlan.h b/src/transport/plugin_transport_wlan.h
deleted file mode 100644
index d175f9377..000000000
--- a/src/transport/plugin_transport_wlan.h
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
-   This file is part of GNUnet
-   Copyright (C) 2010, 2011 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/plugin_transport_wlan.h
- * @brief header for transport plugin and the helper for wlan
- * @author David Brodski
- */
-#ifndef PLUGIN_TRANSPORT_WLAN
-#define PLUGIN_TRANSPORT_WLAN
-
-#include "gnunet_crypto_lib.h"
-#include "gnunet_common.h"
-
-/**
- * Number fo bytes in a mac address.
- */
-#define MAC_ADDR_SIZE 6
-
-/**
- * Value for "Management" in the 'frame_control' field of the
- * struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame.
- */
-#define IEEE80211_FC0_TYPE_MGT                  0x00
-
-/**
- * Value for "Control" in the 'frame_control' field of the
- * struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame.
- */
-#define IEEE80211_FC0_TYPE_CTL                  0x04
-
-/**
- * Value for DATA in the 'frame_control' field of the
- * struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame.
- */
-#define IEEE80211_FC0_TYPE_DATA                 0x08
-
-
-GNUNET_NETWORK_STRUCT_BEGIN
-
-/**
- * A MAC Address.
- */
-struct GNUNET_TRANSPORT_WLAN_MacAddress
-{
-  uint8_t mac[MAC_ADDR_SIZE];
-};
-
-/**
- * Format of a WLAN Control Message.
- */
-struct GNUNET_TRANSPORT_WLAN_HelperControlMessage
-{
-  /**
-   * Message header.  Type is
-   * GNUNET_MESSAGE_TYPE_WLAN_HELPER_CONTROL
-   */
-  struct GNUNET_MessageHeader hdr;
-
-  /**
-   * MAC Address of the local WLAN interface.
-   */
-  struct GNUNET_TRANSPORT_WLAN_MacAddress mac;
-};
-
-/**
- * generic definitions for IEEE 802.3 frames
- */
-struct GNUNET_TRANSPORT_WLAN_Ieee8023Frame
-{
-  /**
-   * Address 1: destination address in ad-hoc mode or AP, BSSID if station,
-   */
-  struct GNUNET_TRANSPORT_WLAN_MacAddress dst;
-
-  /**
-   * Address 2: source address if in ad-hoc-mode or station, BSSID if AP
-   */
-  struct GNUNET_TRANSPORT_WLAN_MacAddress src;
-
-  /**
-   * Packet type ID.
-   */
-  uint16_t type;
-};
-
-
-/**
- * generic definitions for IEEE 802.11 frames
- */
-struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame
-{
-  /**
-   * 802.11 Frame Control field.  A bitmask.  The overall field is a
-   * 16-bit mask of the respective fields.  The lowest two bits should
-   * be 0, then comes the "type" (2 bits, see IEEE80211_FC0_TYPE_*
-   * constants), followed by 4-bit subtype (all zeros for ad-hoc),
-   * followed by various flags (to DS, from DS, more frag, retry,
-   * power management, more data, WEP, strict), all of which we also
-   * keep at zero.
-   */
-  uint16_t frame_control GNUNET_PACKED;
-
-  /**
-   * Microseconds to reserve link (duration), 0 by default
-   */
-  uint16_t duration GNUNET_PACKED;
-
-  /**
-   * Address 1: destination address in ad-hoc mode or AP, BSSID if station,
-   */
-  struct GNUNET_TRANSPORT_WLAN_MacAddress addr1;
-
-  /**
-   * Address 2: source address if in ad-hoc-mode or station, BSSID if AP
-   */
-  struct GNUNET_TRANSPORT_WLAN_MacAddress addr2;
-
-  /**
-   * Address 3: BSSID in ad-hoc mode, Destination if station, source if AP
-   */
-  struct GNUNET_TRANSPORT_WLAN_MacAddress addr3;
-
-  /**
-   * 802.11 sequence control field; contains fragment number an sequence
-   * number (we set this to all zeros).
-   */
-  uint16_t sequence_control GNUNET_PACKED;
-
-  /**
-   * Link layer control (LLC).  Set to a GNUnet-specific value.
-   */
-  u_int8_t llc[4];
-
-  /* payload */
-} GNUNET_PACKED;
-
-
-/**
- * Message from the plugin to the WLAN helper: send the given message with the
- * given connection parameters.
- */
-struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage
-{
-  /**
-   * Type is 'GNUNET_MESSAGE_TYPE_WLAN_DATA_TO_HELPER'.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * wlan send rate
-   */
-  uint8_t rate;
-
-  /**
-   * Antenna; the first antenna is 0.
-   */
-  uint8_t antenna;
-
-  /**
-   * Transmit power expressed as unitless distance from max power set at factory calibration.
-   * 0 is max power. Monotonically nondecreasing with lower power levels.
-   */
-  uint16_t tx_power GNUNET_PACKED;
-
-  /**
-   * IEEE Frame to transmit (the sender MAC address will be overwritten by the helper as it does not
-   * trust the plugin to set it correctly).
-   */
-  struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame frame;
-
-  /* actual payload follows */
-};
-
-
-/**
- * Message from the WLAN helper to the plugin: we have received the given message with the
- * given performance characteristics.
- */
-/**
- * struct to represent infos gathered form the radiotap fields, see RadiotapHeader for more Infos
- */
-struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage
-{
-  /**
-   * Type is 'GNUNET_MESSAGE_TYPE_WLAN_DATA_FROM_HELPER'.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Information about which of the fields below are actually valid.
-   * 0 for none.  FIXME: not properly initialized so far (always zero).
-   */
-  uint32_t ri_present GNUNET_PACKED;
-
-  /**
-   * IEEE80211_RADIOTAP_TSFT, 0 if unknown.
-   */
-  uint64_t ri_mactime GNUNET_PACKED;
-
-  /**
-   * from radiotap
-   * either IEEE80211_RADIOTAP_DBM_ANTSIGNAL
-   * or IEEE80211_RADIOTAP_DB_ANTSIGNAL, 0 if unknown.
-   */
-  int32_t ri_power GNUNET_PACKED;
-
-  /**
-   * either IEEE80211_RADIOTAP_DBM_ANTNOISE
-   * or IEEE80211_RADIOTAP_DB_ANTNOISE, 0 if unknown.
-   */
-  int32_t ri_noise GNUNET_PACKED;
-
-  /**
-   * IEEE80211_RADIOTAP_CHANNEL, 0 if unknown.
-   */
-  uint32_t ri_channel GNUNET_PACKED;
-
-  /**
-   * Frequency we use.  0 if unknown.
-   */
-  uint32_t ri_freq GNUNET_PACKED;
-
-  /**
-   * IEEE80211_RADIOTAP_RATE * 50000, 0 if unknown.
-   */
-  uint32_t ri_rate GNUNET_PACKED;
-
-  /**
-   * IEEE80211_RADIOTAP_ANTENNA, 0 if unknown.
-   */
-  uint32_t ri_antenna GNUNET_PACKED;
-
-  /**
-   * IEEE Frame.
-   */
-  struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame frame;
-
-  /* followed by payload */
-};
-
-GNUNET_NETWORK_STRUCT_END
-
-/**
- * GNUnet bssid
- */
-static const struct GNUNET_TRANSPORT_WLAN_MacAddress mac_bssid_gnunet = {
-  { 0x13, 0x22, 0x33, 0x44, 0x55, 0x66 }
-};
-
-
-/**
- * Broadcast MAC
- */
-static const struct GNUNET_TRANSPORT_WLAN_MacAddress bc_all_mac = {
-  { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }
-};
-
-#endif
diff --git a/src/transport/profile_transport.sh b/src/transport/profile_transport.sh
deleted file mode 100755
index 0e6935fc7..000000000
--- a/src/transport/profile_transport.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-C_ITERATIONS=5
-C_MESSAGE_DELTA=10
-C_MESSAGE_START=10
-C_MESSAGE_END=2000
-
-#for i in {$C_MESSAGE_START..$C_MESSAGE_END..$C_MESSAGE_DELTA}
-#  do
-#     echo "Welcome $i times"
-# done
-
-
-for $((cur=$C_MESSAGE_START; cur<=$C_MESSAGE_END; cur = cur + $C_MESSAGE_DELTA))
-{
-        ./gnunet-transport-profiler -p  NSGWRTMHG2YJK9KZSTEWKJ5TK20AGRDBWHFA1ZNKKZ7T360MZ8S0 -s -c perf_https_peer1.conf -n 20240 -m $cur -i 4
-        sleep 1
-}
diff --git a/src/transport/tcp_connection_legacy.c b/src/transport/tcp_connection_legacy.c
deleted file mode 100644
index 551e79055..000000000
--- a/src/transport/tcp_connection_legacy.c
+++ /dev/null
@@ -1,1597 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2009-2013 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file util/connection.c
- * @brief  TCP connection management
- * @author Christian Grothoff
- *
- * This code is rather complex.  Only modify it if you
- * 1) Have a NEW testcase showing that the new code
- *    is needed and correct
- * 2) All EXISTING testcases pass with the new code
- * These rules should apply in general, but for this
- * module they are VERY, VERY important.
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_resolver_service.h"
-
-
-/**
- * Timeout we use on TCP connect before trying another
- * result from the DNS resolver.  Actual value used
- * is this value divided by the number of address families.
- * Default is 5s.
- */
-#define CONNECT_RETRY_TIMEOUT \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
-
-
-#define LOG_STRERROR(kind, syscall) \
-  GNUNET_log_from_strerror (kind, "util-connection", syscall)
-
-
-/**
- * Transmission handle.  There can only be one for each connection.
- */
-struct GNUNET_CONNECTION_TransmitHandle
-{
-  /**
-   * Function to call if the send buffer has notify_size
-   * bytes available.
-   */
-  GNUNET_CONNECTION_TransmitReadyNotify notify_ready;
-
-  /**
-   * Closure for notify_ready.
-   */
-  void *notify_ready_cls;
-
-  /**
-   * Our connection handle.
-   */
-  struct GNUNET_CONNECTION_Handle *connection;
-
-  /**
-   * Timeout for receiving (in absolute time).
-   */
-  struct GNUNET_TIME_Absolute transmit_timeout;
-
-  /**
-   * Task called on timeout.
-   */
-  struct GNUNET_SCHEDULER_Task *timeout_task;
-
-  /**
-   * At what number of bytes available in the
-   * write buffer should the notify method be called?
-   */
-  size_t notify_size;
-};
-
-
-/**
- * During connect, we try multiple possible IP addresses
- * to find out which one might work.
- */
-struct AddressProbe
-{
-  /**
-   * This is a linked list.
-   */
-  struct AddressProbe *next;
-
-  /**
-   * This is a doubly-linked list.
-   */
-  struct AddressProbe *prev;
-
-  /**
-   * The address; do not free (allocated at the end of this struct).
-   */
-  const struct sockaddr *addr;
-
-  /**
-   * Underlying OS's socket.
-   */
-  struct GNUNET_NETWORK_Handle *sock;
-
-  /**
-   * Connection for which we are probing.
-   */
-  struct GNUNET_CONNECTION_Handle *connection;
-
-  /**
-   * Length of addr.
-   */
-  socklen_t addrlen;
-
-  /**
-   * Task waiting for the connection to finish connecting.
-   */
-  struct GNUNET_SCHEDULER_Task *task;
-};
-
-
-/**
- * @brief handle for a network connection
- */
-struct GNUNET_CONNECTION_Handle
-{
-  /**
-   * Configuration to use.
-   */
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  /**
-   * Linked list of sockets we are currently trying out
-   * (during connect).
-   */
-  struct AddressProbe *ap_head;
-
-  /**
-   * Linked list of sockets we are currently trying out
-   * (during connect).
-   */
-  struct AddressProbe *ap_tail;
-
-  /**
-   * Network address of the other end-point, may be NULL.
-   */
-  struct sockaddr *addr;
-
-  /**
-   * Pointer to the hostname if connection was
-   * created using DNS lookup, otherwise NULL.
-   */
-  char *hostname;
-
-  /**
-   * Underlying OS's socket, set to NULL after fatal errors.
-   */
-  struct GNUNET_NETWORK_Handle *sock;
-
-  /**
-   * Function to call on data received, NULL if no receive is pending.
-   */
-  GNUNET_CONNECTION_Receiver receiver;
-
-  /**
-   * Closure for @e receiver.
-   */
-  void *receiver_cls;
-
-  /**
-   * Pointer to our write buffer.
-   */
-  char *write_buffer;
-
-  /**
-   * Current size of our @e write_buffer.
-   */
-  size_t write_buffer_size;
-
-  /**
-   * Current write-offset in @e write_buffer (where
-   * would we write next).
-   */
-  size_t write_buffer_off;
-
-  /**
-   * Current read-offset in @e write_buffer (how many
-   * bytes have already been sent).
-   */
-  size_t write_buffer_pos;
-
-  /**
-   * Length of @e addr.
-   */
-  socklen_t addrlen;
-
-  /**
-   * Read task that we may need to wait for.
-   */
-  struct GNUNET_SCHEDULER_Task *read_task;
-
-  /**
-   * Write task that we may need to wait for.
-   */
-  struct GNUNET_SCHEDULER_Task *write_task;
-
-  /**
-   * Handle to a pending DNS lookup request.
-   */
-  struct GNUNET_RESOLVER_RequestHandle *dns_active;
-
-  /**
-   * The handle we return for #GNUNET_CONNECTION_notify_transmit_ready().
-   */
-  struct GNUNET_CONNECTION_TransmitHandle nth;
-
-  /**
-   * Timeout for receiving (in absolute time).
-   */
-  struct GNUNET_TIME_Absolute receive_timeout;
-
-  /**
-   * Maximum number of bytes to read (for receiving).
-   */
-  size_t max;
-
-  /**
-   * Port to connect to.
-   */
-  uint16_t port;
-
-  /**
-   * When shutdown, do not ever actually close the socket, but
-   * free resources.  Only should ever be set if using program
-   * termination as a signal (because only then will the leaked
-   * socket be freed!)
-   */
-  int8_t persist;
-
-  /**
-   * Usually 0.  Set to 1 if this handle is in use, and should
-   * #GNUNET_CONNECTION_destroy() be called right now, the action needs
-   * to be deferred by setting it to -1.
-   */
-  int8_t destroy_later;
-
-  /**
-   * Handle to subsequent connection after proxy handshake completes,
-   */
-  struct GNUNET_CONNECTION_Handle *proxy_handshake;
-};
-
-
-/**
- * Set the persist option on this connection handle.  Indicates
- * that the underlying socket or fd should never really be closed.
- * Used for indicating process death.
- *
- * @param connection the connection to set persistent
- */
-void
-GNUNET_CONNECTION_persist_ (struct GNUNET_CONNECTION_Handle *connection)
-{
-  connection->persist = GNUNET_YES;
-}
-
-
-/**
- * Disable the "CORK" feature for communication with the given connection,
- * forcing the OS to immediately flush the buffer on transmission
- * instead of potentially buffering multiple messages.  Essentially
- * reduces the OS send buffers to zero.
- * Used to make sure that the last messages sent through the connection
- * reach the other side before the process is terminated.
- *
- * @param connection the connection to make flushing and blocking
- * @return #GNUNET_OK on success
- */
-int
-GNUNET_CONNECTION_disable_corking (struct GNUNET_CONNECTION_Handle *connection)
-{
-  return GNUNET_NETWORK_socket_disable_corking (connection->sock);
-}
-
-
-/**
- * Create a connection handle by boxing an existing OS socket.  The OS
- * socket should henceforth be no longer used directly.
- * #GNUNET_connection_destroy() will close it.
- *
- * @param osSocket existing socket to box
- * @return the boxed connection handle
- */
-struct GNUNET_CONNECTION_Handle *
-GNUNET_CONNECTION_create_from_existing (struct GNUNET_NETWORK_Handle *osSocket)
-{
-  struct GNUNET_CONNECTION_Handle *connection;
-
-  connection = GNUNET_new (struct GNUNET_CONNECTION_Handle);
-  connection->write_buffer_size = GNUNET_MIN_MESSAGE_SIZE;
-  connection->write_buffer = GNUNET_malloc (connection->write_buffer_size);
-  connection->sock = osSocket;
-  return connection;
-}
-
-
-/**
- * Create a connection handle by accepting on a listen socket.  This
- * function may block if the listen socket has no connection ready.
- *
- * @param access_cb function to use to check if access is allowed
- * @param access_cb_cls closure for @a access_cb
- * @param lsock listen socket
- * @return the connection handle, NULL on error
- */
-struct GNUNET_CONNECTION_Handle *
-GNUNET_CONNECTION_create_from_accept (GNUNET_CONNECTION_AccessCheck access_cb,
-                                      void *access_cb_cls,
-                                      struct GNUNET_NETWORK_Handle *lsock)
-{
-  struct GNUNET_CONNECTION_Handle *connection;
-  char addr[128];
-  socklen_t addrlen;
-  struct GNUNET_NETWORK_Handle *sock;
-  int aret;
-  struct sockaddr_in *v4;
-  struct sockaddr_in6 *v6;
-  struct sockaddr *sa;
-  void *uaddr;
-
-#ifdef SO_PEERCRED
-  struct ucred uc;
-  socklen_t olen;
-#endif
-  struct GNUNET_CONNECTION_Credentials *gcp;
-#if HAVE_GETPEEREID || defined(SO_PEERCRED) || HAVE_GETPEERUCRED
-  struct GNUNET_CONNECTION_Credentials gc;
-
-  gc.uid = 0;
-  gc.gid = 0;
-#endif
-
-  addrlen = sizeof(addr);
-  sock =
-    GNUNET_NETWORK_socket_accept (lsock, (struct sockaddr *) &addr, &addrlen);
-  if (NULL == sock)
-  {
-    if (EAGAIN != errno)
-      LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "accept");
-    return NULL;
-  }
-  if ((addrlen > sizeof(addr)) || (addrlen < sizeof(sa_family_t)))
-  {
-    GNUNET_break (0);
-    GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (sock));
-    return NULL;
-  }
-
-  sa = (struct sockaddr *) addr;
-  v6 = (struct sockaddr_in6 *) addr;
-  if ((AF_INET6 == sa->sa_family) && (IN6_IS_ADDR_V4MAPPED (&v6->sin6_addr)))
-  {
-    /* convert to V4 address */
-    v4 = GNUNET_new (struct sockaddr_in);
-    memset (v4, 0, sizeof(struct sockaddr_in));
-    v4->sin_family = AF_INET;
-#if HAVE_SOCKADDR_IN_SIN_LEN
-    v4->sin_len = (u_char) sizeof(struct sockaddr_in);
-#endif
-    GNUNET_memcpy (&v4->sin_addr,
-                   &((char *) &v6->sin6_addr)[sizeof(struct in6_addr)
-                                              - sizeof(struct in_addr)],
-                   sizeof(struct in_addr));
-    v4->sin_port = v6->sin6_port;
-    uaddr = v4;
-    addrlen = sizeof(struct sockaddr_in);
-  }
-  else
-  {
-    uaddr = GNUNET_malloc (addrlen);
-    GNUNET_memcpy (uaddr, addr, addrlen);
-  }
-  gcp = NULL;
-  if (AF_UNIX == sa->sa_family)
-  {
-#if HAVE_GETPEEREID
-    /* most BSDs */
-    if (0 == getpeereid (GNUNET_NETWORK_get_fd (sock), &gc.uid, &gc.gid))
-      gcp = &gc;
-#else
-#ifdef SO_PEERCRED
-    /* largely traditional GNU/Linux */
-    olen = sizeof(uc);
-    if ((0 == getsockopt (GNUNET_NETWORK_get_fd (sock),
-                          SOL_SOCKET,
-                          SO_PEERCRED,
-                          &uc,
-                          &olen)) &&
-        (olen == sizeof(uc)))
-    {
-      gc.uid = uc.uid;
-      gc.gid = uc.gid;
-      gcp = &gc;
-    }
-#else
-#if HAVE_GETPEERUCRED
-    /* this is for Solaris 10 */
-    ucred_t *uc;
-
-    uc = NULL;
-    if (0 == getpeerucred (GNUNET_NETWORK_get_fd (sock), &uc))
-    {
-      gc.uid = ucred_geteuid (uc);
-      gc.gid = ucred_getegid (uc);
-      gcp = &gc;
-    }
-    ucred_free (uc);
-#endif
-#endif
-#endif
-  }
-
-  if ((NULL != access_cb) &&
-      (GNUNET_YES != (aret = access_cb (access_cb_cls, gcp, uaddr, addrlen))))
-  {
-    if (GNUNET_NO == aret)
-      LOG (GNUNET_ERROR_TYPE_INFO,
-           _ ("Access denied to `%s'\n"),
-           GNUNET_a2s (uaddr, addrlen));
-    GNUNET_break (GNUNET_OK ==
-                  GNUNET_NETWORK_socket_shutdown (sock, SHUT_RDWR));
-    GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (sock));
-    GNUNET_free (uaddr);
-    return NULL;
-  }
-  connection = GNUNET_new (struct GNUNET_CONNECTION_Handle);
-  connection->write_buffer_size = GNUNET_MIN_MESSAGE_SIZE;
-  connection->write_buffer = GNUNET_malloc (connection->write_buffer_size);
-  connection->addr = uaddr;
-  connection->addrlen = addrlen;
-  connection->sock = sock;
-  LOG (GNUNET_ERROR_TYPE_INFO,
-       _ ("Accepting connection from `%s': %p\n"),
-       GNUNET_a2s (uaddr, addrlen),
-       connection);
-  return connection;
-}
-
-
-/**
- * Obtain the network address of the other party.
- *
- * @param connection the client to get the address for
- * @param addr where to store the address
- * @param addrlen where to store the length of the @a addr
- * @return #GNUNET_OK on success
- */
-int
-GNUNET_CONNECTION_get_address (struct GNUNET_CONNECTION_Handle *connection,
-                               void **addr,
-                               size_t *addrlen)
-{
-  if ((NULL == connection->addr) || (0 == connection->addrlen))
-    return GNUNET_NO;
-  *addr = GNUNET_malloc (connection->addrlen);
-  GNUNET_memcpy (*addr, connection->addr, connection->addrlen);
-  *addrlen = connection->addrlen;
-  return GNUNET_OK;
-}
-
-
-/**
- * Tell the receiver callback that we had an IO error.
- *
- * @param connection connection to signal error
- * @param errcode error code to send
- */
-static void
-signal_receive_error (struct GNUNET_CONNECTION_Handle *connection, int errcode)
-{
-  GNUNET_CONNECTION_Receiver receiver;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Receive encounters error (%s), connection closed (%p)\n",
-       strerror (errcode),
-       connection);
-  GNUNET_assert (NULL != (receiver = connection->receiver));
-  connection->receiver = NULL;
-  receiver (connection->receiver_cls,
-            NULL,
-            0,
-            connection->addr,
-            connection->addrlen,
-            errcode);
-}
-
-
-/**
- * Tell the receiver callback that a timeout was reached.
- *
- * @param connection connection to signal for
- */
-static void
-signal_receive_timeout (struct GNUNET_CONNECTION_Handle *connection)
-{
-  GNUNET_CONNECTION_Receiver receiver;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Connection signals timeout to receiver (%p)!\n",
-       connection);
-  GNUNET_assert (NULL != (receiver = connection->receiver));
-  connection->receiver = NULL;
-  receiver (connection->receiver_cls, NULL, 0, NULL, 0, 0);
-}
-
-
-/**
- * We failed to transmit data to the service, signal the error.
- *
- * @param connection handle that had trouble
- * @param ecode error code (errno)
- */
-static void
-signal_transmit_error (struct GNUNET_CONNECTION_Handle *connection, int ecode)
-{
-  GNUNET_CONNECTION_TransmitReadyNotify notify;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Transmission encountered error (%s), connection closed (%p)\n",
-       strerror (ecode),
-       connection);
-  if (NULL != connection->sock)
-  {
-    (void) GNUNET_NETWORK_socket_shutdown (connection->sock, SHUT_RDWR);
-    GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (connection->sock));
-    connection->sock = NULL;
-    GNUNET_assert (NULL == connection->write_task);
-  }
-  if (NULL != connection->read_task)
-  {
-    /* send errors trigger read errors... */
-    GNUNET_SCHEDULER_cancel (connection->read_task);
-    connection->read_task = NULL;
-    signal_receive_timeout (connection);
-    return;
-  }
-  if (NULL == connection->nth.notify_ready)
-    return; /* nobody to tell about it */
-  notify = connection->nth.notify_ready;
-  connection->nth.notify_ready = NULL;
-  notify (connection->nth.notify_ready_cls, 0, NULL);
-}
-
-
-/**
- * We've failed for good to establish a connection (timeout or
- * no more addresses to try).
- *
- * @param connection the connection we tried to establish
- */
-static void
-connect_fail_continuation (struct GNUNET_CONNECTION_Handle *connection)
-{
-  LOG (GNUNET_ERROR_TYPE_INFO,
-       "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n",
-       connection->hostname,
-       connection->port);
-  GNUNET_break (NULL == connection->ap_head);
-  GNUNET_break (NULL == connection->ap_tail);
-  GNUNET_break (GNUNET_NO == connection->dns_active);
-  GNUNET_break (NULL == connection->sock);
-  GNUNET_assert (NULL == connection->write_task);
-  GNUNET_assert (NULL == connection->proxy_handshake);
-
-  /* signal errors for jobs that used to wait on the connection */
-  connection->destroy_later = 1;
-  if (NULL != connection->receiver)
-    signal_receive_error (connection, ECONNREFUSED);
-  if (NULL != connection->nth.notify_ready)
-  {
-    GNUNET_assert (NULL != connection->nth.timeout_task);
-    GNUNET_SCHEDULER_cancel (connection->nth.timeout_task);
-    connection->nth.timeout_task = NULL;
-    signal_transmit_error (connection, ECONNREFUSED);
-  }
-  if (-1 == connection->destroy_later)
-  {
-    /* do it now */
-    connection->destroy_later = 0;
-    GNUNET_CONNECTION_destroy (connection);
-    return;
-  }
-  connection->destroy_later = 0;
-}
-
-
-/**
- * We are ready to transmit (or got a timeout).
- *
- * @param cls our connection handle
- */
-static void
-transmit_ready (void *cls);
-
-
-/**
- * This function is called once we either timeout or have data ready
- * to read.
- *
- * @param cls connection to read from
- */
-static void
-receive_ready (void *cls);
-
-
-/**
- * We've succeeded in establishing a connection.
- *
- * @param connection the connection we tried to establish
- */
-static void
-connect_success_continuation (struct GNUNET_CONNECTION_Handle *connection)
-{
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Connection to `%s' succeeded! (%p)\n",
-       GNUNET_a2s (connection->addr, connection->addrlen),
-       connection);
-  /* trigger jobs that waited for the connection */
-  if (NULL != connection->receiver)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Connection succeeded, starting with receiving data (%p)\n",
-         connection);
-    GNUNET_assert (NULL == connection->read_task);
-    connection->read_task =
-      GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_absolute_get_remaining (
-                                       connection->receive_timeout),
-                                     connection->sock,
-                                     &receive_ready,
-                                     connection);
-  }
-  if (NULL != connection->nth.notify_ready)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Connection succeeded, starting with sending data (%p)\n",
-         connection);
-    GNUNET_assert (connection->nth.timeout_task != NULL);
-    GNUNET_SCHEDULER_cancel (connection->nth.timeout_task);
-    connection->nth.timeout_task = NULL;
-    GNUNET_assert (connection->write_task == NULL);
-    connection->write_task =
-      GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_absolute_get_remaining (
-                                        connection->nth.transmit_timeout),
-                                      connection->sock,
-                                      &transmit_ready,
-                                      connection);
-  }
-}
-
-
-/**
- * Scheduler let us know that we're either ready to write on the
- * socket OR connect timed out.  Do the right thing.
- *
- * @param cls the `struct AddressProbe *` with the address that we are probing
- */
-static void
-connect_probe_continuation (void *cls)
-{
-  struct AddressProbe *ap = cls;
-  struct GNUNET_CONNECTION_Handle *connection = ap->connection;
-  const struct GNUNET_SCHEDULER_TaskContext *tc;
-  struct AddressProbe *pos;
-  int error;
-  socklen_t len;
-
-  GNUNET_assert (NULL != ap->sock);
-  GNUNET_CONTAINER_DLL_remove (connection->ap_head, connection->ap_tail, ap);
-  len = sizeof(error);
-  errno = 0;
-  error = 0;
-  tc = GNUNET_SCHEDULER_get_task_context ();
-  if ((0 == (tc->reason & GNUNET_SCHEDULER_REASON_WRITE_READY)) ||
-      (GNUNET_OK != GNUNET_NETWORK_socket_getsockopt (ap->sock,
-                                                      SOL_SOCKET,
-                                                      SO_ERROR,
-                                                      &error,
-                                                      &len)) ||
-      (0 != error))
-  {
-    GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (ap->sock));
-    GNUNET_free (ap);
-    if ((NULL == connection->ap_head) &&
-        (GNUNET_NO == connection->dns_active) &&
-        (NULL == connection->proxy_handshake))
-      connect_fail_continuation (connection);
-    return;
-  }
-  GNUNET_assert (NULL == connection->sock);
-  connection->sock = ap->sock;
-  GNUNET_assert (NULL == connection->addr);
-  connection->addr = GNUNET_malloc (ap->addrlen);
-  GNUNET_memcpy (connection->addr, ap->addr, ap->addrlen);
-  connection->addrlen = ap->addrlen;
-  GNUNET_free (ap);
-  /* cancel all other attempts */
-  while (NULL != (pos = connection->ap_head))
-  {
-    GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (pos->sock));
-    GNUNET_SCHEDULER_cancel (pos->task);
-    GNUNET_CONTAINER_DLL_remove (connection->ap_head, connection->ap_tail, pos);
-    GNUNET_free (pos);
-  }
-  connect_success_continuation (connection);
-}
-
-
-/**
- * Try to establish a connection given the specified address.
- * This function is called by the resolver once we have a DNS reply.
- *
- * @param cls our `struct GNUNET_CONNECTION_Handle *`
- * @param addr address to try, NULL for "last call"
- * @param addrlen length of @a addr
- */
-static void
-try_connect_using_address (void *cls,
-                           const struct sockaddr *addr,
-                           socklen_t addrlen)
-{
-  struct GNUNET_CONNECTION_Handle *connection = cls;
-  struct AddressProbe *ap;
-  struct GNUNET_TIME_Relative delay;
-
-  if (NULL == addr)
-  {
-    connection->dns_active = NULL;
-    if ((NULL == connection->ap_head) && (NULL == connection->sock) &&
-        (NULL == connection->proxy_handshake))
-      connect_fail_continuation (connection);
-    return;
-  }
-  if (NULL != connection->sock)
-    return; /* already connected */
-  GNUNET_assert (NULL == connection->addr);
-  /* try to connect */
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Trying to connect using address `%s:%u/%s:%u'\n",
-       connection->hostname,
-       connection->port,
-       GNUNET_a2s (addr, addrlen),
-       connection->port);
-  ap = GNUNET_malloc (sizeof(struct AddressProbe) + addrlen);
-  ap->addr = (const struct sockaddr *) &ap[1];
-  GNUNET_memcpy (&ap[1], addr, addrlen);
-  ap->addrlen = addrlen;
-  ap->connection = connection;
-
-  switch (ap->addr->sa_family)
-  {
-  case AF_INET:
-    ((struct sockaddr_in *) ap->addr)->sin_port = htons (connection->port);
-    break;
-
-  case AF_INET6:
-    ((struct sockaddr_in6 *) ap->addr)->sin6_port = htons (connection->port);
-    break;
-
-  default:
-    GNUNET_break (0);
-    GNUNET_free (ap);
-    return;   /* not supported by us */
-  }
-  ap->sock = GNUNET_NETWORK_socket_create (ap->addr->sa_family, SOCK_STREAM, 0);
-  if (NULL == ap->sock)
-  {
-    GNUNET_free (ap);
-    return;   /* not supported by OS */
-  }
-  LOG (GNUNET_ERROR_TYPE_INFO,
-       "Trying to connect to `%s' (%p)\n",
-       GNUNET_a2s (ap->addr, ap->addrlen),
-       connection);
-  if ((GNUNET_OK !=
-       GNUNET_NETWORK_socket_connect (ap->sock, ap->addr, ap->addrlen)) &&
-      (EINPROGRESS != errno))
-  {
-    /* maybe refused / unsupported address, try next */
-    LOG_STRERROR (GNUNET_ERROR_TYPE_INFO, "connect");
-    GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (ap->sock));
-    GNUNET_free (ap);
-    return;
-  }
-  GNUNET_CONTAINER_DLL_insert (connection->ap_head, connection->ap_tail, ap);
-  delay = CONNECT_RETRY_TIMEOUT;
-  if (NULL != connection->nth.notify_ready)
-    delay = GNUNET_TIME_relative_min (delay,
-                                      GNUNET_TIME_absolute_get_remaining (
-                                        connection->nth.transmit_timeout));
-  if (NULL != connection->receiver)
-    delay = GNUNET_TIME_relative_min (delay,
-                                      GNUNET_TIME_absolute_get_remaining (
-                                        connection->receive_timeout));
-  ap->task = GNUNET_SCHEDULER_add_write_net (delay,
-                                             ap->sock,
-                                             &connect_probe_continuation,
-                                             ap);
-}
-
-
-/**
- * Create a connection handle by (asynchronously) connecting to a host.
- * This function returns immediately, even if the connection has not
- * yet been established.  This function only creates TCP connections.
- *
- * @param cfg configuration to use
- * @param hostname name of the host to connect to
- * @param port port to connect to
- * @return the connection handle
- */
-struct GNUNET_CONNECTION_Handle *
-GNUNET_CONNECTION_create_from_connect (
-  const struct GNUNET_CONFIGURATION_Handle *cfg,
-  const char *hostname,
-  uint16_t port)
-{
-  struct GNUNET_CONNECTION_Handle *connection;
-
-  GNUNET_assert (0 < strlen (hostname));   /* sanity check */
-  connection = GNUNET_new (struct GNUNET_CONNECTION_Handle);
-  connection->cfg = cfg;
-  connection->write_buffer_size = GNUNET_MIN_MESSAGE_SIZE;
-  connection->write_buffer = GNUNET_malloc (connection->write_buffer_size);
-  connection->port = port;
-  connection->hostname = GNUNET_strdup (hostname);
-  connection->dns_active = GNUNET_RESOLVER_ip_get (connection->hostname,
-                                                   AF_UNSPEC,
-                                                   CONNECT_RETRY_TIMEOUT,
-                                                   &try_connect_using_address,
-                                                   connection);
-  return connection;
-}
-
-
-/**
- * Create a connection handle by connecting to a UNIX domain service.
- * This function returns immediately, even if the connection has not
- * yet been established.  This function only creates UNIX connections.
- *
- * @param cfg configuration to use
- * @param unixpath path to connect to
- * @return the connection handle, NULL on systems without UNIX support
- */
-struct GNUNET_CONNECTION_Handle *
-GNUNET_CONNECTION_create_from_connect_to_unixpath (
-  const struct GNUNET_CONFIGURATION_Handle *cfg,
-  const char *unixpath)
-{
-#ifdef AF_UNIX
-  struct GNUNET_CONNECTION_Handle *connection;
-  struct sockaddr_un *un;
-
-  GNUNET_assert (0 < strlen (unixpath));   /* sanity check */
-  un = GNUNET_new (struct sockaddr_un);
-  un->sun_family = AF_UNIX;
-  GNUNET_strlcpy (un->sun_path, unixpath, sizeof(un->sun_path));
-#ifdef __linux__
-  {
-    int abstract;
-
-    abstract = GNUNET_CONFIGURATION_get_value_yesno (cfg,
-                                                     "TESTING",
-                                                     "USE_ABSTRACT_SOCKETS");
-    if (GNUNET_YES == abstract)
-      un->sun_path[0] = '\0';
-  }
-#endif
-#if HAVE_SOCKADDR_UN_SUN_LEN
-  un->sun_len = (u_char) sizeof(struct sockaddr_un);
-#endif
-  connection = GNUNET_new (struct GNUNET_CONNECTION_Handle);
-  connection->cfg = cfg;
-  connection->write_buffer_size = GNUNET_MIN_MESSAGE_SIZE;
-  connection->write_buffer = GNUNET_malloc (connection->write_buffer_size);
-  connection->port = 0;
-  connection->hostname = NULL;
-  connection->addr = (struct sockaddr *) un;
-  connection->addrlen = sizeof(struct sockaddr_un);
-  connection->sock = GNUNET_NETWORK_socket_create (AF_UNIX, SOCK_STREAM, 0);
-  if (NULL == connection->sock)
-  {
-    GNUNET_free (connection->addr);
-    GNUNET_free (connection->write_buffer);
-    GNUNET_free (connection);
-    return NULL;
-  }
-  if ((GNUNET_OK != GNUNET_NETWORK_socket_connect (connection->sock,
-                                                   connection->addr,
-                                                   connection->addrlen)) &&
-      (EINPROGRESS != errno))
-  {
-    /* Just return; we expect everything to work eventually so don't fail HARD */
-    GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (connection->sock));
-    connection->sock = NULL;
-    return connection;
-  }
-  connect_success_continuation (connection);
-  return connection;
-#else
-  return NULL;
-#endif
-}
-
-
-/**
- * Create a connection handle by (asynchronously) connecting to a host.
- * This function returns immediately, even if the connection has not
- * yet been established.  This function only creates TCP connections.
- *
- * @param s socket to connect
- * @param serv_addr server address
- * @param addrlen length of @a serv_addr
- * @return the connection handle
- */
-struct GNUNET_CONNECTION_Handle *
-GNUNET_CONNECTION_connect_socket (struct GNUNET_NETWORK_Handle *s,
-                                  const struct sockaddr *serv_addr,
-                                  socklen_t addrlen)
-{
-  struct GNUNET_CONNECTION_Handle *connection;
-
-  if ((GNUNET_OK != GNUNET_NETWORK_socket_connect (s, serv_addr, addrlen)) &&
-      (EINPROGRESS != errno))
-  {
-    /* maybe refused / unsupported address, try next */
-    LOG_STRERROR (GNUNET_ERROR_TYPE_DEBUG, "connect");
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Attempt to connect to `%s' failed\n",
-         GNUNET_a2s (serv_addr, addrlen));
-    GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (s));
-    return NULL;
-  }
-  connection = GNUNET_CONNECTION_create_from_existing (s);
-  connection->addr = GNUNET_malloc (addrlen);
-  GNUNET_memcpy (connection->addr, serv_addr, addrlen);
-  connection->addrlen = addrlen;
-  LOG (GNUNET_ERROR_TYPE_INFO,
-       "Trying to connect to `%s' (%p)\n",
-       GNUNET_a2s (serv_addr, addrlen),
-       connection);
-  return connection;
-}
-
-
-/**
- * Create a connection handle by creating a socket and
- * (asynchronously) connecting to a host.  This function returns
- * immediately, even if the connection has not yet been established.
- * This function only creates TCP connections.
- *
- * @param af_family address family to use
- * @param serv_addr server address
- * @param addrlen length of @a serv_addr
- * @return the connection handle
- */
-struct GNUNET_CONNECTION_Handle *
-GNUNET_CONNECTION_create_from_sockaddr (int af_family,
-                                        const struct sockaddr *serv_addr,
-                                        socklen_t addrlen)
-{
-  struct GNUNET_NETWORK_Handle *s;
-
-  s = GNUNET_NETWORK_socket_create (af_family, SOCK_STREAM, 0);
-  if (NULL == s)
-  {
-    LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK, "socket");
-    return NULL;
-  }
-  return GNUNET_CONNECTION_connect_socket (s, serv_addr, addrlen);
-}
-
-
-/**
- * Check if connection is valid (no fatal errors have happened so far).
- * Note that a connection that is still trying to connect is considered
- * valid.
- *
- * @param connection connection to check
- * @return #GNUNET_YES if valid, #GNUNET_NO otherwise
- */
-int
-GNUNET_CONNECTION_check (struct GNUNET_CONNECTION_Handle *connection)
-{
-  if ((NULL != connection->ap_head) || (NULL != connection->dns_active) ||
-      (NULL != connection->proxy_handshake))
-    return GNUNET_YES; /* still trying to connect */
-  if ((0 != connection->destroy_later) || (NULL == connection->sock))
-    return GNUNET_NO;
-  return GNUNET_YES;
-}
-
-
-/**
- * Close the connection and free associated resources.  There must
- * not be any pending requests for reading or writing to the
- * connection at this time.
- *
- * @param connection connection to destroy
- */
-void
-GNUNET_CONNECTION_destroy (struct GNUNET_CONNECTION_Handle *connection)
-{
-  struct AddressProbe *pos;
-
-  if (0 != connection->destroy_later)
-  {
-    connection->destroy_later = -1;
-    return;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Shutting down connection (%p)\n", connection);
-  GNUNET_assert (NULL == connection->nth.notify_ready);
-  GNUNET_assert (NULL == connection->receiver);
-  if (NULL != connection->write_task)
-  {
-    GNUNET_SCHEDULER_cancel (connection->write_task);
-    connection->write_task = NULL;
-    connection->write_buffer_off = 0;
-  }
-  if (NULL != connection->read_task)
-  {
-    GNUNET_SCHEDULER_cancel (connection->read_task);
-    connection->read_task = NULL;
-  }
-  if (NULL != connection->nth.timeout_task)
-  {
-    GNUNET_SCHEDULER_cancel (connection->nth.timeout_task);
-    connection->nth.timeout_task = NULL;
-  }
-  connection->nth.notify_ready = NULL;
-  if (NULL != connection->dns_active)
-  {
-    GNUNET_RESOLVER_request_cancel (connection->dns_active);
-    connection->dns_active = NULL;
-  }
-  if (NULL != connection->proxy_handshake)
-  {
-    /* GNUNET_CONNECTION_destroy (connection->proxy_handshake); */
-    connection->proxy_handshake->destroy_later = -1;
-    connection->proxy_handshake = NULL;   /* Not leaked ??? */
-  }
-  while (NULL != (pos = connection->ap_head))
-  {
-    GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (pos->sock));
-    GNUNET_SCHEDULER_cancel (pos->task);
-    GNUNET_CONTAINER_DLL_remove (connection->ap_head, connection->ap_tail, pos);
-    GNUNET_free (pos);
-  }
-  if ((NULL != connection->sock) && (GNUNET_YES != connection->persist))
-  {
-    if ((GNUNET_OK !=
-         GNUNET_NETWORK_socket_shutdown (connection->sock, SHUT_RDWR)) &&
-        (ENOTCONN != errno) && (ECONNRESET != errno))
-      LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "shutdown");
-  }
-  if (NULL != connection->sock)
-  {
-    if (GNUNET_YES != connection->persist)
-    {
-      GNUNET_break (GNUNET_OK ==
-                    GNUNET_NETWORK_socket_close (connection->sock));
-    }
-    else
-    {
-      GNUNET_NETWORK_socket_free_memory_only_ (
-        connection->sock);     /* at least no memory leak (we deliberately
-                                * leak the socket in this special case) ... */
-    }
-  }
-  GNUNET_free (connection->addr);
-  GNUNET_free (connection->hostname);
-  GNUNET_free (connection->write_buffer);
-  GNUNET_free (connection);
-}
-
-
-/**
- * This function is called once we either timeout
- * or have data ready to read.
- *
- * @param cls connection to read from
- */
-static void
-receive_ready (void *cls)
-{
-  struct GNUNET_CONNECTION_Handle *connection = cls;
-  const struct GNUNET_SCHEDULER_TaskContext *tc;
-  char buffer[connection->max];
-  ssize_t ret;
-  GNUNET_CONNECTION_Receiver receiver;
-
-  connection->read_task = NULL;
-  tc = GNUNET_SCHEDULER_get_task_context ();
-  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Receive from `%s' encounters error: timeout (%s, %p)\n",
-         GNUNET_a2s (connection->addr, connection->addrlen),
-         GNUNET_STRINGS_relative_time_to_string (
-           GNUNET_TIME_absolute_get_duration (
-             connection->receive_timeout),
-           GNUNET_YES),
-         connection);
-    signal_receive_timeout (connection);
-    return;
-  }
-  if (NULL == connection->sock)
-  {
-    /* connect failed for good */
-    signal_receive_error (connection, ECONNREFUSED);
-    return;
-  }
-  GNUNET_assert (GNUNET_NETWORK_fdset_isset (tc->read_ready, connection->sock));
-RETRY:
-  ret = GNUNET_NETWORK_socket_recv (connection->sock, buffer, connection->max);
-  if (-1 == ret)
-  {
-    if (EINTR == errno)
-      goto RETRY;
-    signal_receive_error (connection, errno);
-    return;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "receive_ready read %lu/%lu bytes from `%s' (%p)!\n",
-       (unsigned long) ret,
-       (unsigned long) connection->max,
-       GNUNET_a2s (connection->addr, connection->addrlen),
-       connection);
-  GNUNET_assert (NULL != (receiver = connection->receiver));
-  connection->receiver = NULL;
-  receiver (connection->receiver_cls,
-            buffer,
-            ret,
-            connection->addr,
-            connection->addrlen,
-            0);
-}
-
-
-/**
- * Receive data from the given connection.  Note that this function
- * will call @a receiver asynchronously using the scheduler.  It will
- * "immediately" return.  Note that there MUST only be one active
- * receive call per connection at any given point in time (so do not
- * call receive again until the receiver callback has been invoked).
- *
- * @param connection connection handle
- * @param max maximum number of bytes to read
- * @param timeout maximum amount of time to wait
- * @param receiver function to call with received data
- * @param receiver_cls closure for @a receiver
- * @return #GNUNET_SYSERR if @a connection died (receiver was
- *          called with error)
- */
-int
-GNUNET_CONNECTION_receive (struct GNUNET_CONNECTION_Handle *connection,
-                           size_t max,
-                           struct GNUNET_TIME_Relative timeout,
-                           GNUNET_CONNECTION_Receiver receiver,
-                           void *receiver_cls)
-{
-  GNUNET_assert ((NULL == connection->read_task) &&
-                 (NULL == connection->receiver));
-  GNUNET_assert (NULL != receiver);
-  connection->receiver = receiver;
-  connection->receiver_cls = receiver_cls;
-  connection->receive_timeout = GNUNET_TIME_relative_to_absolute (timeout);
-  connection->max = max;
-  if (NULL != connection->sock)
-  {
-    connection->read_task =
-      GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_absolute_get_remaining (
-                                       connection->receive_timeout),
-                                     connection->sock,
-                                     &receive_ready,
-                                     connection);
-    return GNUNET_OK;
-  }
-  if ((NULL == connection->dns_active) && (NULL == connection->ap_head) &&
-      (NULL == connection->proxy_handshake))
-  {
-    connection->receiver = NULL;
-    receiver (receiver_cls, NULL, 0, NULL, 0, ETIMEDOUT);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Cancel receive job on the given connection.  Note that the
- * receiver callback must not have been called yet in order
- * for the cancellation to be valid.
- *
- * @param connection connection handle
- * @return closure of the original receiver callback closure
- */
-void *
-GNUNET_CONNECTION_receive_cancel (struct GNUNET_CONNECTION_Handle *connection)
-{
-  if (NULL != connection->read_task)
-  {
-    GNUNET_assert (connection ==
-                   GNUNET_SCHEDULER_cancel (connection->read_task));
-    connection->read_task = NULL;
-  }
-  connection->receiver = NULL;
-  return connection->receiver_cls;
-}
-
-
-/**
- * Try to call the transmit notify method (check if we do
- * have enough space available first)!
- *
- * @param connection connection for which we should do this processing
- * @return #GNUNET_YES if we were able to call notify
- */
-static int
-process_notify (struct GNUNET_CONNECTION_Handle *connection)
-{
-  size_t used;
-  size_t avail;
-  size_t size;
-  GNUNET_CONNECTION_TransmitReadyNotify notify;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "process_notify is running\n");
-  GNUNET_assert (NULL == connection->write_task);
-  if (NULL == (notify = connection->nth.notify_ready))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "No one to notify\n");
-    return GNUNET_NO;
-  }
-  used = connection->write_buffer_off - connection->write_buffer_pos;
-  avail = connection->write_buffer_size - used;
-  size = connection->nth.notify_size;
-  if (size > avail)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "Not enough buffer\n");
-    return GNUNET_NO;
-  }
-  connection->nth.notify_ready = NULL;
-  if (connection->write_buffer_size - connection->write_buffer_off < size)
-  {
-    /* need to compact */
-    memmove (connection->write_buffer,
-             &connection->write_buffer[connection->write_buffer_pos],
-             used);
-    connection->write_buffer_off -= connection->write_buffer_pos;
-    connection->write_buffer_pos = 0;
-  }
-  avail = connection->write_buffer_size - connection->write_buffer_off;
-  GNUNET_assert (avail >= size);
-  size = notify (connection->nth.notify_ready_cls,
-                 avail,
-                 &connection->write_buffer[connection->write_buffer_off]);
-  GNUNET_assert (size <= avail);
-  if (0 != size)
-    connection->write_buffer_off += size;
-  return GNUNET_YES;
-}
-
-
-/**
- * Task invoked by the scheduler when a call to transmit
- * is timing out (we never got enough buffer space to call
- * the callback function before the specified timeout
- * expired).
- *
- * This task notifies the client about the timeout.
- *
- * @param cls the `struct GNUNET_CONNECTION_Handle`
- */
-static void
-transmit_timeout (void *cls)
-{
-  struct GNUNET_CONNECTION_Handle *connection = cls;
-  GNUNET_CONNECTION_TransmitReadyNotify notify;
-
-  connection->nth.timeout_task = NULL;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Transmit to `%s:%u/%s' fails, time out reached (%p).\n",
-       connection->hostname,
-       connection->port,
-       GNUNET_a2s (connection->addr, connection->addrlen),
-       connection);
-  notify = connection->nth.notify_ready;
-  GNUNET_assert (NULL != notify);
-  connection->nth.notify_ready = NULL;
-  notify (connection->nth.notify_ready_cls, 0, NULL);
-}
-
-
-/**
- * Task invoked by the scheduler when we failed to connect
- * at the time of being asked to transmit.
- *
- * This task notifies the client about the error.
- *
- * @param cls the `struct GNUNET_CONNECTION_Handle`
- */
-static void
-connect_error (void *cls)
-{
-  struct GNUNET_CONNECTION_Handle *connection = cls;
-  GNUNET_CONNECTION_TransmitReadyNotify notify;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Transmission request of size %lu fails (%s/%u), connection failed (%p).\n",
-       (unsigned long) connection->nth.notify_size,
-       connection->hostname,
-       connection->port,
-       connection);
-  connection->write_task = NULL;
-  notify = connection->nth.notify_ready;
-  connection->nth.notify_ready = NULL;
-  notify (connection->nth.notify_ready_cls, 0, NULL);
-}
-
-
-/**
- * We are ready to transmit (or got a timeout).
- *
- * @param cls our connection handle
- */
-static void
-transmit_ready (void *cls)
-{
-  struct GNUNET_CONNECTION_Handle *connection = cls;
-  GNUNET_CONNECTION_TransmitReadyNotify notify;
-  const struct GNUNET_SCHEDULER_TaskContext *tc;
-  ssize_t ret;
-  size_t have;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "transmit_ready running (%p).\n", connection);
-  GNUNET_assert (NULL != connection->write_task);
-  connection->write_task = NULL;
-  GNUNET_assert (NULL == connection->nth.timeout_task);
-  tc = GNUNET_SCHEDULER_get_task_context ();
-  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Transmit to `%s' fails, time out reached (%p).\n",
-         GNUNET_a2s (connection->addr, connection->addrlen),
-         connection);
-    notify = connection->nth.notify_ready;
-    GNUNET_assert (NULL != notify);
-    connection->nth.notify_ready = NULL;
-    notify (connection->nth.notify_ready_cls, 0, NULL);
-    return;
-  }
-  GNUNET_assert (NULL != connection->sock);
-  if (NULL == tc->write_ready)
-  {
-    /* special circumstances (in particular, PREREQ_DONE after
-     * connect): not yet ready to write, but no "fatal" error either.
-     * Hence retry.  */
-    goto SCHEDULE_WRITE;
-  }
-  if (! GNUNET_NETWORK_fdset_isset (tc->write_ready, connection->sock))
-  {
-    GNUNET_assert (NULL == connection->write_task);
-    /* special circumstances (in particular, shutdown): not yet ready
-     * to write, but no "fatal" error either.  Hence retry.  */
-    goto SCHEDULE_WRITE;
-  }
-  GNUNET_assert (connection->write_buffer_off >= connection->write_buffer_pos);
-  if ((NULL != connection->nth.notify_ready) &&
-      (connection->write_buffer_size < connection->nth.notify_size))
-  {
-    connection->write_buffer =
-      GNUNET_realloc (connection->write_buffer, connection->nth.notify_size);
-    connection->write_buffer_size = connection->nth.notify_size;
-  }
-  process_notify (connection);
-  have = connection->write_buffer_off - connection->write_buffer_pos;
-  if (0 == have)
-  {
-    /* no data ready for writing, terminate write loop */
-    return;
-  }
-  GNUNET_assert (have <= connection->write_buffer_size);
-  GNUNET_assert (have + connection->write_buffer_pos <=
-                 connection->write_buffer_size);
-  GNUNET_assert (connection->write_buffer_pos <= connection->write_buffer_size);
-RETRY:
-  ret =
-    GNUNET_NETWORK_socket_send (connection->sock,
-                                &connection
-                                ->write_buffer[connection->write_buffer_pos],
-                                have);
-  if (-1 == ret)
-  {
-    if (EINTR == errno)
-      goto RETRY;
-    if (NULL != connection->write_task)
-    {
-      GNUNET_SCHEDULER_cancel (connection->write_task);
-      connection->write_task = NULL;
-    }
-    signal_transmit_error (connection, errno);
-    return;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Connection transmitted %lu/%lu bytes to `%s' (%p)\n",
-       (unsigned long) ret,
-       (unsigned long) have,
-       GNUNET_a2s (connection->addr, connection->addrlen),
-       connection);
-  connection->write_buffer_pos += ret;
-  if (connection->write_buffer_pos == connection->write_buffer_off)
-  {
-    /* transmitted all pending data */
-    connection->write_buffer_pos = 0;
-    connection->write_buffer_off = 0;
-  }
-  if ((0 == connection->write_buffer_off) &&
-      (NULL == connection->nth.notify_ready))
-    return; /* all data sent! */
-  /* not done writing, schedule more */
-SCHEDULE_WRITE:
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Re-scheduling transmit_ready (more to do) (%p).\n",
-       connection);
-  have = connection->write_buffer_off - connection->write_buffer_pos;
-  GNUNET_assert ((NULL != connection->nth.notify_ready) || (have > 0));
-  if (NULL == connection->write_task)
-    connection->write_task =
-      GNUNET_SCHEDULER_add_write_net ((connection->nth.notify_ready == NULL)
-                                      ? GNUNET_TIME_UNIT_FOREVER_REL
-                                      : GNUNET_TIME_absolute_get_remaining (
-                                        connection->nth.transmit_timeout),
-                                      connection->sock,
-                                      &transmit_ready,
-                                      connection);
-}
-
-
-/**
- * Ask the connection to call us once the specified number of bytes
- * are free in the transmission buffer.  Will never call the @a notify
- * callback in this task, but always first go into the scheduler.
- *
- * @param connection connection
- * @param size number of bytes to send
- * @param timeout after how long should we give up (and call
- *        @a notify with buf NULL and size 0)?
- * @param notify function to call
- * @param notify_cls closure for @a notify
- * @return non-NULL if the notify callback was queued,
- *         NULL if we are already going to notify someone else (busy)
- */
-struct GNUNET_CONNECTION_TransmitHandle *
-GNUNET_CONNECTION_notify_transmit_ready (
-  struct GNUNET_CONNECTION_Handle *connection,
-  size_t size,
-  struct GNUNET_TIME_Relative timeout,
-  GNUNET_CONNECTION_TransmitReadyNotify notify,
-  void *notify_cls)
-{
-  if (NULL != connection->nth.notify_ready)
-  {
-    GNUNET_assert (0);
-    return NULL;
-  }
-  GNUNET_assert (NULL != notify);
-  GNUNET_assert (size < GNUNET_MAX_MESSAGE_SIZE);
-  GNUNET_assert (connection->write_buffer_off <= connection->write_buffer_size);
-  GNUNET_assert (connection->write_buffer_pos <= connection->write_buffer_size);
-  GNUNET_assert (connection->write_buffer_pos <= connection->write_buffer_off);
-  connection->nth.notify_ready = notify;
-  connection->nth.notify_ready_cls = notify_cls;
-  connection->nth.connection = connection;
-  connection->nth.notify_size = size;
-  connection->nth.transmit_timeout = GNUNET_TIME_relative_to_absolute (timeout);
-  GNUNET_assert (NULL == connection->nth.timeout_task);
-  if ((NULL == connection->sock) && (NULL == connection->ap_head) &&
-      (NULL == connection->dns_active) && (NULL == connection->proxy_handshake))
-  {
-    if (NULL != connection->write_task)
-      GNUNET_SCHEDULER_cancel (connection->write_task);
-    connection->write_task =
-      GNUNET_SCHEDULER_add_now (&connect_error, connection);
-    return &connection->nth;
-  }
-  if (NULL != connection->write_task)
-    return &connection->nth; /* previous transmission still in progress */
-  if (NULL != connection->sock)
-  {
-    /* connected, try to transmit now */
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Scheduling transmission (%p).\n",
-         connection);
-    connection->write_task =
-      GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_absolute_get_remaining (
-                                        connection->nth.transmit_timeout),
-                                      connection->sock,
-                                      &transmit_ready,
-                                      connection);
-    return &connection->nth;
-  }
-  /* not yet connected, wait for connection */
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Need to wait to schedule transmission for connection, adding timeout task (%p).\n",
-       connection);
-  connection->nth.timeout_task =
-    GNUNET_SCHEDULER_add_delayed (timeout, &transmit_timeout, connection);
-  return &connection->nth;
-}
-
-
-/**
- * Cancel the specified transmission-ready notification.
- *
- * @param th notification to cancel
- */
-void
-GNUNET_CONNECTION_notify_transmit_ready_cancel (
-  struct GNUNET_CONNECTION_TransmitHandle *th)
-{
-  GNUNET_assert (NULL != th->notify_ready);
-  th->notify_ready = NULL;
-  if (NULL != th->timeout_task)
-  {
-    GNUNET_SCHEDULER_cancel (th->timeout_task);
-    th->timeout_task = NULL;
-  }
-  if (NULL != th->connection->write_task)
-  {
-    GNUNET_SCHEDULER_cancel (th->connection->write_task);
-    th->connection->write_task = NULL;
-  }
-}
-
-
-/**
- * Create a connection to be proxied using a given connection.
- *
- * @param cph connection to proxy server
- * @return connection to be proxied
- */
-struct GNUNET_CONNECTION_Handle *
-GNUNET_CONNECTION_create_proxied_from_handshake (
-  struct GNUNET_CONNECTION_Handle *cph)
-{
-  struct GNUNET_CONNECTION_Handle *proxied =
-    GNUNET_CONNECTION_create_from_existing (NULL);
-
-  proxied->proxy_handshake = cph;
-  return proxied;
-}
-
-
-/**
- * Activate proxied connection and destroy initial proxy handshake connection.
- * There must not be any pending requests for reading or writing to the
- * proxy hadshake connection at this time.
- *
- * @param proxied connection connection to proxy server
- */
-void
-GNUNET_CONNECTION_acivate_proxied (struct GNUNET_CONNECTION_Handle *proxied)
-{
-  struct GNUNET_CONNECTION_Handle *cph = proxied->proxy_handshake;
-
-  GNUNET_assert (NULL != cph);
-  GNUNET_assert (NULL == proxied->sock);
-  GNUNET_assert (NULL != cph->sock);
-  proxied->sock = cph->sock;
-  cph->sock = NULL;
-  GNUNET_CONNECTION_destroy (cph);
-  connect_success_continuation (proxied);
-}
-
-
-/* end of connection.c */
diff --git a/src/transport/tcp_server_legacy.c b/src/transport/tcp_server_legacy.c
deleted file mode 100644
index f4d48d4f6..000000000
--- a/src/transport/tcp_server_legacy.c
+++ /dev/null
@@ -1,1748 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2009-2013 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file util/server.c
- * @brief library for building GNUnet network servers
- * @author Christian Grothoff
- */
-
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_protocols.h"
-
-#define LOG_STRERROR_FILE(kind, syscall, \
-                          filename) GNUNET_log_from_strerror_file (kind, \
-                                                                   "util-server", \
-                                                                   syscall, \
-                                                                   filename)
-
-
-/**
- * List of arrays of message handlers.
- */
-struct HandlerList
-{
-  /**
-   * This is a linked list.
-   */
-  struct HandlerList *next;
-
-  /**
-   * NULL-terminated array of handlers.
-   */
-  const struct GNUNET_SERVER_MessageHandler *handlers;
-};
-
-
-/**
- * List of arrays of message handlers.
- */
-struct NotifyList
-{
-  /**
-   * This is a doubly linked list.
-   */
-  struct NotifyList *next;
-
-  /**
-   * This is a doubly linked list.
-   */
-  struct NotifyList *prev;
-
-  /**
-   * Function to call.
-   */
-  GNUNET_SERVER_DisconnectCallback callback;
-
-  /**
-   * Closure for callback.
-   */
-  void *callback_cls;
-};
-
-
-/**
- * @brief handle for a server
- */
-struct GNUNET_SERVER_Handle
-{
-  /**
-   * List of handlers for incoming messages.
-   */
-  struct HandlerList *handlers;
-
-  /**
-   * Head of list of our current clients.
-   */
-  struct GNUNET_SERVER_Client *clients_head;
-
-  /**
-   * Head of list of our current clients.
-   */
-  struct GNUNET_SERVER_Client *clients_tail;
-
-  /**
-   * Head of linked list of functions to call on disconnects by clients.
-   */
-  struct NotifyList *disconnect_notify_list_head;
-
-  /**
-   * Tail of linked list of functions to call on disconnects by clients.
-   */
-  struct NotifyList *disconnect_notify_list_tail;
-
-  /**
-   * Head of linked list of functions to call on connects by clients.
-   */
-  struct NotifyList *connect_notify_list_head;
-
-  /**
-   * Tail of linked list of functions to call on connects by clients.
-   */
-  struct NotifyList *connect_notify_list_tail;
-
-  /**
-   * Function to call for access control.
-   */
-  GNUNET_CONNECTION_AccessCheck access_cb;
-
-  /**
-   * Closure for @e access_cb.
-   */
-  void *access_cb_cls;
-
-  /**
-   * NULL-terminated array of sockets used to listen for new
-   * connections.
-   */
-  struct GNUNET_NETWORK_Handle **listen_sockets;
-
-  /**
-   * After how long should an idle connection time
-   * out (on write).
-   */
-  struct GNUNET_TIME_Relative idle_timeout;
-
-  /**
-   * Task scheduled to do the listening.
-   */
-  struct GNUNET_SCHEDULER_Task *listen_task;
-
-  /**
-   * Alternative function to create a MST instance.
-   */
-  GNUNET_SERVER_MstCreateCallback mst_create;
-
-  /**
-   * Alternative function to destroy a MST instance.
-   */
-  GNUNET_SERVER_MstDestroyCallback mst_destroy;
-
-  /**
-   * Alternative function to give data to a MST instance.
-   */
-  GNUNET_SERVER_MstReceiveCallback mst_receive;
-
-  /**
-   * Closure for 'mst_'-callbacks.
-   */
-  void *mst_cls;
-
-  /**
-   * Do we ignore messages of types that we do not understand or do we
-   * require that a handler is found (and if not kill the connection)?
-   */
-  int require_found;
-
-  /**
-   * Set to #GNUNET_YES once we are in 'soft' shutdown where we wait for
-   * all non-monitor clients to disconnect before we call
-   * #GNUNET_SERVER_destroy.  See test_monitor_clients().  Set to
-   * #GNUNET_SYSERR once the final destroy task has been scheduled
-   * (we cannot run it in the same task).
-   */
-  int in_soft_shutdown;
-};
-
-
-/**
- * Handle server returns for aborting transmission to a client.
- */
-struct GNUNET_SERVER_TransmitHandle
-{
-  /**
-   * Function to call to get the message.
-   */
-  GNUNET_CONNECTION_TransmitReadyNotify callback;
-
-  /**
-   * Closure for @e callback
-   */
-  void *callback_cls;
-
-  /**
-   * Active connection transmission handle.
-   */
-  struct GNUNET_CONNECTION_TransmitHandle *cth;
-};
-
-
-/**
- * @brief handle for a client of the server
- */
-struct GNUNET_SERVER_Client
-{
-  /**
-   * This is a doubly linked list.
-   */
-  struct GNUNET_SERVER_Client *next;
-
-  /**
-   * This is a doubly linked list.
-   */
-  struct GNUNET_SERVER_Client *prev;
-
-  /**
-   * Processing of incoming data.
-   */
-  void *mst;
-
-  /**
-   * Server that this client belongs to.
-   */
-  struct GNUNET_SERVER_Handle *server;
-
-  /**
-   * Client closure for callbacks.
-   */
-  struct GNUNET_CONNECTION_Handle *connection;
-
-  /**
-   * User context value, manipulated using
-   * 'GNUNET_SERVER_client_{get/set}_user_context' functions.
-   */
-  void *user_context;
-
-  /**
-   * ID of task used to restart processing.
-   */
-  struct GNUNET_SCHEDULER_Task *restart_task;
-
-  /**
-   * Task that warns about missing calls to #GNUNET_SERVER_receive_done.
-   */
-  struct GNUNET_SCHEDULER_Task *warn_task;
-
-  /**
-   * Time when the warn task was started.
-   */
-  struct GNUNET_TIME_Absolute warn_start;
-
-  /**
-   * Last activity on this socket (used to time it out
-   * if reference_count == 0).
-   */
-  struct GNUNET_TIME_Absolute last_activity;
-
-  /**
-   * Transmission handle we return for this client from
-   * #GNUNET_SERVER_notify_transmit_ready.
-   */
-  struct GNUNET_SERVER_TransmitHandle th;
-
-  /**
-   * After how long should an idle connection time
-   * out (on write).
-   */
-  struct GNUNET_TIME_Relative idle_timeout;
-
-  /**
-   * Number of external entities with a reference to
-   * this client object.
-   */
-  unsigned int reference_count;
-
-  /**
-   * Was processing if incoming messages suspended while
-   * we were still processing data already received?
-   * This is a counter saying how often processing was
-   * suspended (once per handler invoked).
-   */
-  unsigned int suspended;
-
-  /**
-   * Last size given when user context was initialized; used for
-   * sanity check.
-   */
-  size_t user_context_size;
-
-  /**
-   * Are we currently in the "process_client_buffer" function (and
-   * will hence restart the receive job on exit if suspended == 0 once
-   * we are done?).  If this is set, then "receive_done" will
-   * essentially only decrement suspended; if this is not set, then
-   * "receive_done" may need to restart the receive process (either
-   * from the side-buffer or via select/recv).
-   */
-  int in_process_client_buffer;
-
-  /**
-   * We're about to close down this client.
-   */
-  int shutdown_now;
-
-  /**
-   * Are we currently trying to receive? (#GNUNET_YES if we are,
-   * #GNUNET_NO if we are not, #GNUNET_SYSERR if data is already
-   * available in MST).
-   */
-  int receive_pending;
-
-  /**
-   * Persist the file handle for this client no matter what happens,
-   * force the OS to close once the process actually dies.  Should only
-   * be used in special cases!
-   */
-  int persist;
-
-  /**
-   * Is this client a 'monitor' client that should not be counted
-   * when deciding on destroying the server during soft shutdown?
-   * (see also #GNUNET_SERVICE_start)
-   */
-  int is_monitor;
-
-  /**
-   * Type of last message processed (for warn_no_receive_done).
-   */
-  uint16_t warn_type;
-};
-
-
-/**
- * Return user context associated with the given client.
- * Note: you should probably use the macro (call without the underscore).
- *
- * @param client client to query
- * @param size number of bytes in user context struct (for verification only)
- * @return pointer to user context
- */
-void *
-GNUNET_SERVER_client_get_user_context_ (struct GNUNET_SERVER_Client *client,
-                                        size_t size)
-{
-  if ((0 == client->user_context_size) &&
-      (NULL == client->user_context))
-    return NULL; /* never set */
-  GNUNET_assert (size == client->user_context_size);
-  return client->user_context;
-}
-
-
-/**
- * Set user context to be associated with the given client.
- * Note: you should probably use the macro (call without the underscore).
- *
- * @param client client to query
- * @param ptr pointer to user context
- * @param size number of bytes in user context struct (for verification only)
- */
-void
-GNUNET_SERVER_client_set_user_context_ (struct GNUNET_SERVER_Client *client,
-                                        void *ptr,
-                                        size_t size)
-{
-  if (NULL == ptr)
-  {
-    client->user_context_size = 0;
-    client->user_context = ptr;
-    return;
-  }
-  client->user_context_size = size;
-  client->user_context = ptr;
-}
-
-
-/**
- * Scheduler says our listen socket is ready.  Process it!
- *
- * @param cls handle to our server for which we are processing the listen
- *        socket
- */
-static void
-process_listen_socket (void *cls)
-{
-  struct GNUNET_SERVER_Handle *server = cls;
-  const struct GNUNET_SCHEDULER_TaskContext *tc;
-  struct GNUNET_CONNECTION_Handle *sock;
-  unsigned int i;
-
-  server->listen_task = NULL;
-  tc = GNUNET_SCHEDULER_get_task_context ();
-  for (i = 0; NULL != server->listen_sockets[i]; i++)
-  {
-    if (GNUNET_NETWORK_fdset_isset (tc->read_ready,
-                                    server->listen_sockets[i]))
-    {
-      sock =
-        GNUNET_CONNECTION_create_from_accept (server->access_cb,
-                                              server->access_cb_cls,
-                                              server->listen_sockets[i]);
-      if (NULL != sock)
-      {
-        LOG (GNUNET_ERROR_TYPE_DEBUG,
-             "Server accepted incoming connection.\n");
-        (void) GNUNET_SERVER_connect_socket (server,
-                                             sock);
-      }
-    }
-  }
-  /* listen for more! */
-  GNUNET_SERVER_resume (server);
-}
-
-
-/**
- * Create and initialize a listen socket for the server.
- *
- * @param server_addr address to listen on
- * @param socklen length of @a server_addr
- * @return NULL on error, otherwise the listen socket
- */
-static struct GNUNET_NETWORK_Handle *
-open_listen_socket (const struct sockaddr *server_addr,
-                    socklen_t socklen)
-{
-  struct GNUNET_NETWORK_Handle *sock;
-  uint16_t port;
-  int eno;
-
-  switch (server_addr->sa_family)
-  {
-  case AF_INET:
-    port = ntohs (((const struct sockaddr_in *) server_addr)->sin_port);
-    break;
-
-  case AF_INET6:
-    port = ntohs (((const struct sockaddr_in6 *) server_addr)->sin6_port);
-    break;
-
-  case AF_UNIX:
-    port = 0;
-    break;
-
-  default:
-    GNUNET_break (0);
-    port = 0;
-    break;
-  }
-  sock = GNUNET_NETWORK_socket_create (server_addr->sa_family, SOCK_STREAM, 0);
-  if (NULL == sock)
-  {
-    LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "socket");
-    errno = 0;
-    return NULL;
-  }
-  /* bind the socket */
-  if (GNUNET_OK != GNUNET_NETWORK_socket_bind (sock, server_addr, socklen))
-  {
-    eno = errno;
-    if (EADDRINUSE != errno)
-    {
-      /* we don't log 'EADDRINUSE' here since an IPv4 bind may
-       * fail if we already took the port on IPv6; if both IPv4 and
-       * IPv6 binds fail, then our caller will log using the
-       * errno preserved in 'eno' */
-      LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR,
-                    "bind");
-      if (0 != port)
-        LOG (GNUNET_ERROR_TYPE_ERROR,
-             _ ("`%s' failed for port %d (%s).\n"),
-             "bind",
-             port,
-             (AF_INET == server_addr->sa_family) ? "IPv4" : "IPv6");
-      eno = 0;
-    }
-    else
-    {
-      if (0 != port)
-        LOG (GNUNET_ERROR_TYPE_WARNING,
-             _ ("`%s' failed for port %d (%s): address already in use\n"),
-             "bind", port,
-             (AF_INET == server_addr->sa_family) ? "IPv4" : "IPv6");
-      else if (AF_UNIX == server_addr->sa_family)
-      {
-        LOG (GNUNET_ERROR_TYPE_WARNING,
-             _ ("`%s' failed for `%s': address already in use\n"),
-             "bind",
-             GNUNET_a2s (server_addr, socklen));
-      }
-    }
-    GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (sock));
-    errno = eno;
-    return NULL;
-  }
-  if (GNUNET_OK != GNUNET_NETWORK_socket_listen (sock, 5))
-  {
-    LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR,
-                  "listen");
-    GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (sock));
-    errno = 0;
-    return NULL;
-  }
-  if (0 != port)
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Server starts to listen on port %u.\n",
-         port);
-  return sock;
-}
-
-
-/**
- * Create a new server.
- *
- * @param access_cb function for access control
- * @param access_cb_cls closure for @a access_cb
- * @param lsocks NULL-terminated array of listen sockets
- * @param idle_timeout after how long should we timeout idle connections?
- * @param require_found if #GNUNET_YES, connections sending messages of unknown type
- *        will be closed
- * @return handle for the new server, NULL on error
- *         (typically, "port" already in use)
- */
-struct GNUNET_SERVER_Handle *
-GNUNET_SERVER_create_with_sockets (GNUNET_CONNECTION_AccessCheck access_cb,
-                                   void *access_cb_cls,
-                                   struct GNUNET_NETWORK_Handle **lsocks,
-                                   struct GNUNET_TIME_Relative idle_timeout,
-                                   int require_found)
-{
-  struct GNUNET_SERVER_Handle *server;
-
-  server = GNUNET_new (struct GNUNET_SERVER_Handle);
-  server->idle_timeout = idle_timeout;
-  server->listen_sockets = lsocks;
-  server->access_cb = access_cb;
-  server->access_cb_cls = access_cb_cls;
-  server->require_found = require_found;
-  if (NULL != lsocks)
-    GNUNET_SERVER_resume (server);
-  return server;
-}
-
-
-/**
- * Create a new server.
- *
- * @param access_cb function for access control
- * @param access_cb_cls closure for @a access_cb
- * @param server_addr address to listen on (including port), NULL terminated array
- * @param socklen length of server_addr
- * @param idle_timeout after how long should we timeout idle connections?
- * @param require_found if YES, connections sending messages of unknown type
- *        will be closed
- * @return handle for the new server, NULL on error
- *         (typically, "port" already in use)
- */
-struct GNUNET_SERVER_Handle *
-GNUNET_SERVER_create (GNUNET_CONNECTION_AccessCheck access_cb,
-                      void *access_cb_cls,
-                      struct sockaddr *const *server_addr,
-                      const socklen_t *socklen,
-                      struct GNUNET_TIME_Relative idle_timeout,
-                      int require_found)
-{
-  struct GNUNET_NETWORK_Handle **lsocks;
-  unsigned int i;
-  unsigned int j;
-  unsigned int k;
-  int seen;
-
-  i = 0;
-  while (NULL != server_addr[i])
-    i++;
-  if (i > 0)
-  {
-    lsocks = GNUNET_malloc (sizeof(struct GNUNET_NETWORK_Handle *) * (i + 1));
-    i = 0;
-    j = 0;
-    while (NULL != server_addr[i])
-    {
-      seen = 0;
-      for (k = 0; k < i; k++)
-        if ((socklen[k] == socklen[i]) &&
-            (0 == memcmp (server_addr[k], server_addr[i], socklen[i])))
-        {
-          seen = 1;
-          break;
-        }
-      if (0 != seen)
-      {
-        /* duplicate address, skip */
-        i++;
-        continue;
-      }
-      lsocks[j] = open_listen_socket (server_addr[i], socklen[i]);
-      if (NULL != lsocks[j])
-        j++;
-      i++;
-    }
-    if (0 == j)
-    {
-      if (0 != errno)
-        LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "bind");
-      GNUNET_free (lsocks);
-      lsocks = NULL;
-    }
-  }
-  else
-  {
-    lsocks = NULL;
-  }
-  return GNUNET_SERVER_create_with_sockets (access_cb,
-                                            access_cb_cls,
-                                            lsocks,
-                                            idle_timeout,
-                                            require_found);
-}
-
-
-/**
- * Set the 'monitor' flag on this client.  Clients which have been
- * marked as 'monitors' won't prevent the server from shutting down
- * once '#GNUNET_SERVER_stop_listening()' has been invoked.  The idea is
- * that for "normal" clients we likely want to allow them to process
- * their requests; however, monitor-clients are likely to 'never'
- * disconnect during shutdown and thus will not be considered when
- * determining if the server should continue to exist after
- * #GNUNET_SERVER_destroy() has been called.
- *
- * @param client the client to set the 'monitor' flag on
- */
-void
-GNUNET_SERVER_client_mark_monitor (struct GNUNET_SERVER_Client *client)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Marking client as monitor!\n");
-  client->is_monitor = GNUNET_YES;
-}
-
-
-/**
- * Helper function for #test_monitor_clients() to trigger
- * #GNUNET_SERVER_destroy() after the stack has unwound.
- *
- * @param cls the `struct GNUNET_SERVER_Handle *` to destroy
- */
-static void
-do_destroy (void *cls)
-{
-  struct GNUNET_SERVER_Handle *server = cls;
-
-  GNUNET_SERVER_destroy (server);
-}
-
-
-/**
- * Check if only 'monitor' clients are left.  If so, destroy the
- * server completely.
- *
- * @param server server to test for full shutdown
- */
-static void
-test_monitor_clients (struct GNUNET_SERVER_Handle *server)
-{
-  struct GNUNET_SERVER_Client *client;
-
-  if (GNUNET_YES != server->in_soft_shutdown)
-    return;
-  for (client = server->clients_head; NULL != client; client = client->next)
-    if (GNUNET_NO == client->is_monitor)
-      return;
-  /* not done yet */
-  server->in_soft_shutdown = GNUNET_SYSERR;
-  (void) GNUNET_SCHEDULER_add_now (&do_destroy, server);
-}
-
-
-/**
- * Suspend accepting connections from the listen socket temporarily.
- *
- * @param server server to stop accepting connections.
- */
-void
-GNUNET_SERVER_suspend (struct GNUNET_SERVER_Handle *server)
-{
-  if (NULL != server->listen_task)
-  {
-    GNUNET_SCHEDULER_cancel (server->listen_task);
-    server->listen_task = NULL;
-  }
-}
-
-
-/**
- * Resume accepting connections from the listen socket.
- *
- * @param server server to stop accepting connections.
- */
-void
-GNUNET_SERVER_resume (struct GNUNET_SERVER_Handle *server)
-{
-  struct GNUNET_NETWORK_FDSet *r;
-  unsigned int i;
-
-  if (NULL == server->listen_sockets)
-    return;
-  if (NULL == server->listen_sockets[0])
-    return; /* nothing to do, no listen sockets! */
-  if (NULL == server->listen_sockets[1])
-  {
-    /* simplified method: no fd set needed; this is then much simpler
-       and much more efficient */
-    server->listen_task =
-      GNUNET_SCHEDULER_add_read_net_with_priority (GNUNET_TIME_UNIT_FOREVER_REL,
-                                                   GNUNET_SCHEDULER_PRIORITY_HIGH,
-                                                   server->listen_sockets[0],
-                                                   &process_listen_socket,
-                                                   server);
-    return;
-  }
-  r = GNUNET_NETWORK_fdset_create ();
-  i = 0;
-  while (NULL != server->listen_sockets[i])
-    GNUNET_NETWORK_fdset_set (r, server->listen_sockets[i++]);
-  server->listen_task =
-    GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_HIGH,
-                                 GNUNET_TIME_UNIT_FOREVER_REL, r, NULL,
-                                 &process_listen_socket, server);
-  GNUNET_NETWORK_fdset_destroy (r);
-}
-
-
-/**
- * Stop the listen socket and get ready to shutdown the server
- * once only 'monitor' clients are left.
- *
- * @param server server to stop listening on
- */
-void
-GNUNET_SERVER_stop_listening (struct GNUNET_SERVER_Handle *server)
-{
-  unsigned int i;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Server in soft shutdown\n");
-  if (NULL != server->listen_task)
-  {
-    GNUNET_SCHEDULER_cancel (server->listen_task);
-    server->listen_task = NULL;
-  }
-  if (NULL != server->listen_sockets)
-  {
-    i = 0;
-    while (NULL != server->listen_sockets[i])
-      GNUNET_break (GNUNET_OK ==
-                    GNUNET_NETWORK_socket_close (server->listen_sockets[i++]));
-    GNUNET_free (server->listen_sockets);
-    server->listen_sockets = NULL;
-  }
-  if (GNUNET_NO == server->in_soft_shutdown)
-    server->in_soft_shutdown = GNUNET_YES;
-  test_monitor_clients (server);
-}
-
-
-/**
- * Free resources held by this server.
- *
- * @param server server to destroy
- */
-void
-GNUNET_SERVER_destroy (struct GNUNET_SERVER_Handle *server)
-{
-  struct HandlerList *hpos;
-  struct NotifyList *npos;
-  unsigned int i;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Server shutting down.\n");
-  if (NULL != server->listen_task)
-  {
-    GNUNET_SCHEDULER_cancel (server->listen_task);
-    server->listen_task = NULL;
-  }
-  if (NULL != server->listen_sockets)
-  {
-    i = 0;
-    while (NULL != server->listen_sockets[i])
-      GNUNET_break (GNUNET_OK ==
-                    GNUNET_NETWORK_socket_close (server->listen_sockets[i++]));
-    GNUNET_free (server->listen_sockets);
-    server->listen_sockets = NULL;
-  }
-  while (NULL != server->clients_head)
-    GNUNET_SERVER_client_disconnect (server->clients_head);
-  while (NULL != (hpos = server->handlers))
-  {
-    server->handlers = hpos->next;
-    GNUNET_free (hpos);
-  }
-  while (NULL != (npos = server->disconnect_notify_list_head))
-  {
-    npos->callback (npos->callback_cls,
-                    NULL);
-    GNUNET_CONTAINER_DLL_remove (server->disconnect_notify_list_head,
-                                 server->disconnect_notify_list_tail,
-                                 npos);
-    GNUNET_free (npos);
-  }
-  while (NULL != (npos = server->connect_notify_list_head))
-  {
-    npos->callback (npos->callback_cls,
-                    NULL);
-    GNUNET_CONTAINER_DLL_remove (server->connect_notify_list_head,
-                                 server->connect_notify_list_tail,
-                                 npos);
-    GNUNET_free (npos);
-  }
-  GNUNET_free (server);
-}
-
-
-/**
- * Add additional handlers to an existing server.
- *
- * @param server the server to add handlers to
- * @param handlers array of message handlers for
- *        incoming messages; the last entry must
- *        have "NULL" for the "callback"; multiple
- *        entries for the same type are allowed,
- *        they will be called in order of occurrence.
- *        These handlers can be removed later;
- *        the handlers array must exist until removed
- *        (or server is destroyed).
- */
-void
-GNUNET_SERVER_add_handlers (struct GNUNET_SERVER_Handle *server,
-                            const struct GNUNET_SERVER_MessageHandler *handlers)
-{
-  struct HandlerList *p;
-
-  p = GNUNET_new (struct HandlerList);
-  p->handlers = handlers;
-  p->next = server->handlers;
-  server->handlers = p;
-}
-
-
-/**
- * Change functions used by the server to tokenize the message stream.
- * (very rarely used).
- *
- * @param server server to modify
- * @param create new tokenizer initialization function
- * @param destroy new tokenizer destruction function
- * @param receive new tokenizer receive function
- * @param cls closure for @a create, @a receive, @a destroy
- */
-void
-GNUNET_SERVER_set_callbacks (struct GNUNET_SERVER_Handle *server,
-                             GNUNET_SERVER_MstCreateCallback create,
-                             GNUNET_SERVER_MstDestroyCallback destroy,
-                             GNUNET_SERVER_MstReceiveCallback receive,
-                             void *cls)
-{
-  server->mst_create = create;
-  server->mst_destroy = destroy;
-  server->mst_receive = receive;
-  server->mst_cls = cls;
-}
-
-
-/**
- * Task run to warn about missing calls to #GNUNET_SERVER_receive_done.
- *
- * @param cls our `struct GNUNET_SERVER_Client *` to process more requests from
- */
-static void
-warn_no_receive_done (void *cls)
-{
-  struct GNUNET_SERVER_Client *client = cls;
-
-  GNUNET_break (0 != client->warn_type);  /* type should never be 0 here, as we don't use 0 */
-  client->warn_task =
-    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
-                                  &warn_no_receive_done, client);
-  LOG (GNUNET_ERROR_TYPE_WARNING,
-       _ (
-         "Processing code for message of type %u did not call `GNUNET_SERVER_receive_done' after %s\n"),
-       (unsigned int) client->warn_type,
-       GNUNET_STRINGS_relative_time_to_string (
-         GNUNET_TIME_absolute_get_duration (client->warn_start),
-         GNUNET_YES));
-}
-
-
-/**
- * Disable the warning the server issues if a message is not acknowledged
- * in a timely fashion.  Use this call if a client is intentionally delayed
- * for a while.  Only applies to the current message.
- *
- * @param client client for which to disable the warning
- */
-void
-GNUNET_SERVER_disable_receive_done_warning (struct GNUNET_SERVER_Client *client)
-{
-  if (NULL != client->warn_task)
-  {
-    GNUNET_SCHEDULER_cancel (client->warn_task);
-    client->warn_task = NULL;
-  }
-}
-
-
-/**
- * Inject a message into the server, pretend it came
- * from the specified client.  Delivery of the message
- * will happen instantly (if a handler is installed;
- * otherwise the call does nothing).
- *
- * @param server the server receiving the message
- * @param sender the "pretended" sender of the message
- *        can be NULL!
- * @param message message to transmit
- * @return #GNUNET_OK if the message was OK and the
- *                   connection can stay open
- *         #GNUNET_SYSERR if the connection to the
- *         client should be shut down
- */
-int
-GNUNET_SERVER_inject (struct GNUNET_SERVER_Handle *server,
-                      struct GNUNET_SERVER_Client *sender,
-                      const struct GNUNET_MessageHeader *message)
-{
-  struct HandlerList *pos;
-  const struct GNUNET_SERVER_MessageHandler *mh;
-  unsigned int i;
-  uint16_t type;
-  uint16_t size;
-  int found;
-
-  type = ntohs (message->type);
-  size = ntohs (message->size);
-  LOG (GNUNET_ERROR_TYPE_INFO,
-       "Received message of type %u and size %u from client\n",
-       type, size);
-  found = GNUNET_NO;
-  for (pos = server->handlers; NULL != pos; pos = pos->next)
-  {
-    i = 0;
-    while (pos->handlers[i].callback != NULL)
-    {
-      mh = &pos->handlers[i];
-      if ((mh->type == type) || (mh->type == GNUNET_MESSAGE_TYPE_ALL))
-      {
-        if ((0 != mh->expected_size) && (mh->expected_size != size))
-        {
-#if GNUNET8_NETWORK_IS_DEAD
-          LOG (GNUNET_ERROR_TYPE_WARNING,
-               "Expected %u bytes for message of type %u, got %u\n",
-               mh->expected_size, mh->type, size);
-          GNUNET_break_op (0);
-#else
-          LOG (GNUNET_ERROR_TYPE_DEBUG,
-               "Expected %u bytes for message of type %u, got %u\n",
-               mh->expected_size, mh->type, size);
-#endif
-          return GNUNET_SYSERR;
-        }
-        if (NULL != sender)
-        {
-          if ((0 == sender->suspended) &&
-              (NULL == sender->warn_task))
-          {
-            GNUNET_break (0 != type);          /* type should never be 0 here, as we don't use 0 */
-            sender->warn_start = GNUNET_TIME_absolute_get ();
-            sender->warn_task =
-              GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
-                                            &warn_no_receive_done,
-                                            sender);
-            sender->warn_type = type;
-          }
-          sender->suspended++;
-        }
-        mh->callback (mh->callback_cls, sender, message);
-        found = GNUNET_YES;
-      }
-      i++;
-    }
-  }
-  if (GNUNET_NO == found)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
-         "Received message of unknown type %d\n", type);
-    if (GNUNET_YES == server->require_found)
-      return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * We are receiving an incoming message.  Process it.
- *
- * @param cls our closure (handle for the client)
- * @param buf buffer with data received from network
- * @param available number of bytes available in buf
- * @param addr address of the sender
- * @param addrlen length of @a addr
- * @param errCode code indicating errors receiving, 0 for success
- */
-static void
-process_incoming (void *cls,
-                  const void *buf,
-                  size_t available,
-                  const struct sockaddr *addr,
-                  socklen_t addrlen,
-                  int errCode);
-
-
-/**
- * Process messages from the client's message tokenizer until either
- * the tokenizer is empty (and then schedule receiving more), or
- * until some handler is not immediately done (then wait for restart_processing)
- * or shutdown.
- *
- * @param client the client to process, RC must have already been increased
- *        using #GNUNET_SERVER_client_keep and will be decreased by one in this
- *        function
- * @param ret #GNUNET_NO to start processing from the buffer,
- *            #GNUNET_OK if the mst buffer is drained and we should instantly go back to receiving
- *            #GNUNET_SYSERR if we should instantly abort due to error in a previous step
- */
-static void
-process_mst (struct GNUNET_SERVER_Client *client,
-             int ret)
-{
-  while ((GNUNET_SYSERR != ret) && (NULL != client->server) &&
-         (GNUNET_YES != client->shutdown_now) && (0 == client->suspended))
-  {
-    if (GNUNET_OK == ret)
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Server re-enters receive loop, timeout: %s.\n",
-           GNUNET_STRINGS_relative_time_to_string (client->idle_timeout,
-                                                   GNUNET_YES));
-      client->receive_pending = GNUNET_YES;
-      if (GNUNET_OK !=
-          GNUNET_CONNECTION_receive (client->connection,
-                                     GNUNET_MAX_MESSAGE_SIZE - 1,
-                                     client->idle_timeout,
-                                     &process_incoming,
-                                     client))
-        return;
-      break;
-    }
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Server processes additional messages instantly.\n");
-    if (NULL != client->server->mst_receive)
-      ret =
-        client->server->mst_receive (client->server->mst_cls, client->mst,
-                                     client, NULL, 0, GNUNET_NO, GNUNET_YES);
-    else
-      ret =
-        GNUNET_SERVER_mst_receive (client->mst, client, NULL, 0, GNUNET_NO,
-                                   GNUNET_YES);
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Server leaves instant processing loop: ret = %d, server = %p, shutdown = %d, suspended = %u\n",
-       ret, client->server,
-       client->shutdown_now,
-       client->suspended);
-  if (GNUNET_NO == ret)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Server has more data pending but is suspended.\n");
-    client->receive_pending = GNUNET_SYSERR;    /* data pending */
-  }
-  if ((GNUNET_SYSERR == ret) ||
-      (GNUNET_YES == client->shutdown_now))
-    GNUNET_SERVER_client_disconnect (client);
-}
-
-
-/**
- * We are receiving an incoming message.  Process it.
- *
- * @param cls our closure (handle for the client)
- * @param buf buffer with data received from network
- * @param available number of bytes available in buf
- * @param addr address of the sender
- * @param addrlen length of @a addr
- * @param errCode code indicating errors receiving, 0 for success
- */
-static void
-process_incoming (void *cls,
-                  const void *buf,
-                  size_t available,
-                  const struct sockaddr *addr,
-                  socklen_t addrlen,
-                  int errCode)
-{
-  struct GNUNET_SERVER_Client *client = cls;
-  struct GNUNET_SERVER_Handle *server = client->server;
-  struct GNUNET_TIME_Absolute end;
-  struct GNUNET_TIME_Absolute now;
-  int ret;
-
-  GNUNET_assert (GNUNET_YES == client->receive_pending);
-  client->receive_pending = GNUNET_NO;
-  now = GNUNET_TIME_absolute_get ();
-  end = GNUNET_TIME_absolute_add (client->last_activity,
-                                  client->idle_timeout);
-
-  if ((NULL == buf) &&
-      (0 == available) &&
-      (NULL == addr) &&
-      (0 == errCode) &&
-      (GNUNET_YES != client->shutdown_now) &&
-      (NULL != server) &&
-      (GNUNET_YES == GNUNET_CONNECTION_check (client->connection)) &&
-      (end.abs_value_us > now.abs_value_us))
-  {
-    /* wait longer, timeout changed (i.e. due to us sending) */
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Receive time out, but no disconnect due to sending (%p)\n",
-         client);
-    client->receive_pending = GNUNET_YES;
-    GNUNET_CONNECTION_receive (client->connection,
-                               GNUNET_MAX_MESSAGE_SIZE - 1,
-                               GNUNET_TIME_absolute_get_remaining (end),
-                               &process_incoming,
-                               client);
-    return;
-  }
-  if ((NULL == buf) ||
-      (0 == available) ||
-      (0 != errCode) ||
-      (NULL == server) ||
-      (GNUNET_YES == client->shutdown_now) ||
-      (GNUNET_YES != GNUNET_CONNECTION_check (client->connection)))
-  {
-    /* other side closed connection, error connecting, etc. */
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Failed to connect or other side closed connection (%p)\n",
-         client);
-    GNUNET_SERVER_client_disconnect (client);
-    return;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Server receives %u bytes from `%s'.\n",
-       (unsigned int) available,
-       GNUNET_a2s (addr, addrlen));
-  GNUNET_SERVER_client_keep (client);
-  client->last_activity = now;
-
-  if (NULL != server->mst_receive)
-  {
-    ret = client->server->mst_receive (client->server->mst_cls,
-                                       client->mst,
-                                       client,
-                                       buf,
-                                       available,
-                                       GNUNET_NO,
-                                       GNUNET_YES);
-  }
-  else if (NULL != client->mst)
-  {
-    ret =
-      GNUNET_SERVER_mst_receive (client->mst,
-                                 client,
-                                 buf,
-                                 available,
-                                 GNUNET_NO,
-                                 GNUNET_YES);
-  }
-  else
-  {
-    GNUNET_break (0);
-    return;
-  }
-  process_mst (client,
-               ret);
-  GNUNET_SERVER_client_drop (client);
-}
-
-
-/**
- * Task run to start again receiving from the network
- * and process requests.
- *
- * @param cls our `struct GNUNET_SERVER_Client *` to process more requests from
- */
-static void
-restart_processing (void *cls)
-{
-  struct GNUNET_SERVER_Client *client = cls;
-
-  GNUNET_assert (GNUNET_YES != client->shutdown_now);
-  client->restart_task = NULL;
-  if (GNUNET_NO == client->receive_pending)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "Server begins to read again from client.\n");
-    client->receive_pending = GNUNET_YES;
-    GNUNET_CONNECTION_receive (client->connection,
-                               GNUNET_MAX_MESSAGE_SIZE - 1,
-                               client->idle_timeout,
-                               &process_incoming,
-                               client);
-    return;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Server continues processing messages still in the buffer.\n");
-  GNUNET_SERVER_client_keep (client);
-  client->receive_pending = GNUNET_NO;
-  process_mst (client,
-               GNUNET_NO);
-  GNUNET_SERVER_client_drop (client);
-}
-
-
-/**
- * This function is called whenever our inbound message tokenizer has
- * received a complete message.
- *
- * @param cls closure (struct GNUNET_SERVER_Handle)
- * @param client identification of the client (`struct GNUNET_SERVER_Client *`)
- * @param message the actual message
- *
- * @return #GNUNET_OK on success, #GNUNET_SYSERR to stop further processing
- */
-static int
-client_message_tokenizer_callback (void *cls,
-                                   void *client,
-                                   const struct GNUNET_MessageHeader *message)
-{
-  struct GNUNET_SERVER_Handle *server = cls;
-  struct GNUNET_SERVER_Client *sender = client;
-  int ret;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Tokenizer gives server message of type %u and size %u from client\n",
-       ntohs (message->type), ntohs (message->size));
-  sender->in_process_client_buffer = GNUNET_YES;
-  ret = GNUNET_SERVER_inject (server, sender, message);
-  sender->in_process_client_buffer = GNUNET_NO;
-  if ((GNUNET_OK != ret) || (GNUNET_YES == sender->shutdown_now))
-  {
-    GNUNET_SERVER_client_disconnect (sender);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Add a TCP socket-based connection to the set of handles managed by
- * this server.  Use this function for outgoing (P2P) connections that
- * we initiated (and where this server should process incoming
- * messages).
- *
- * @param server the server to use
- * @param connection the connection to manage (client must
- *        stop using this connection from now on)
- * @return the client handle
- */
-struct GNUNET_SERVER_Client *
-GNUNET_SERVER_connect_socket (struct GNUNET_SERVER_Handle *server,
-                              struct GNUNET_CONNECTION_Handle *connection)
-{
-  struct GNUNET_SERVER_Client *client;
-  struct NotifyList *n;
-
-  client = GNUNET_new (struct GNUNET_SERVER_Client);
-  client->connection = connection;
-  client->server = server;
-  client->last_activity = GNUNET_TIME_absolute_get ();
-  client->idle_timeout = server->idle_timeout;
-  GNUNET_CONTAINER_DLL_insert (server->clients_head,
-                               server->clients_tail,
-                               client);
-  if (NULL != server->mst_create)
-    client->mst =
-      server->mst_create (server->mst_cls, client);
-  else
-    client->mst =
-      GNUNET_SERVER_mst_create (&client_message_tokenizer_callback,
-                                server);
-  GNUNET_assert (NULL != client->mst);
-  for (n = server->connect_notify_list_head; NULL != n; n = n->next)
-    n->callback (n->callback_cls, client);
-  client->receive_pending = GNUNET_YES;
-  if (GNUNET_SYSERR ==
-      GNUNET_CONNECTION_receive (client->connection,
-                                 GNUNET_MAX_MESSAGE_SIZE - 1,
-                                 client->idle_timeout,
-                                 &process_incoming,
-                                 client))
-    return NULL;
-  return client;
-}
-
-
-/**
- * Change the timeout for a particular client.  Decreasing the timeout
- * may not go into effect immediately (only after the previous timeout
- * times out or activity happens on the socket).
- *
- * @param client the client to update
- * @param timeout new timeout for activities on the socket
- */
-void
-GNUNET_SERVER_client_set_timeout (struct GNUNET_SERVER_Client *client,
-                                  struct GNUNET_TIME_Relative timeout)
-{
-  client->idle_timeout = timeout;
-}
-
-
-/**
- * Notify the server that the given client handle should
- * be kept (keeps the connection up if possible, increments
- * the internal reference counter).
- *
- * @param client the client to keep
- */
-void
-GNUNET_SERVER_client_keep (struct GNUNET_SERVER_Client *client)
-{
-  client->reference_count++;
-}
-
-
-/**
- * Notify the server that the given client handle is no
- * longer required.  Decrements the reference counter.  If
- * that counter reaches zero an inactive connection maybe
- * closed.
- *
- * @param client the client to drop
- */
-void
-GNUNET_SERVER_client_drop (struct GNUNET_SERVER_Client *client)
-{
-  GNUNET_assert (client->reference_count > 0);
-  client->reference_count--;
-  if ((GNUNET_YES == client->shutdown_now) && (0 == client->reference_count))
-    GNUNET_SERVER_client_disconnect (client);
-}
-
-
-/**
- * Obtain the network address of the other party.
- *
- * @param client the client to get the address for
- * @param addr where to store the address
- * @param addrlen where to store the length of the @a addr
- * @return #GNUNET_OK on success
- */
-int
-GNUNET_SERVER_client_get_address (struct GNUNET_SERVER_Client *client,
-                                  void **addr, size_t *addrlen)
-{
-  return GNUNET_CONNECTION_get_address (client->connection, addr, addrlen);
-}
-
-
-/**
- * Ask the server to notify us whenever a client disconnects.
- * This function is called whenever the actual network connection
- * is closed; the reference count may be zero or larger than zero
- * at this point.
- *
- * @param server the server manageing the clients
- * @param callback function to call on disconnect
- * @param callback_cls closure for @a callback
- */
-void
-GNUNET_SERVER_disconnect_notify (struct GNUNET_SERVER_Handle *server,
-                                 GNUNET_SERVER_DisconnectCallback callback,
-                                 void *callback_cls)
-{
-  struct NotifyList *n;
-
-  n = GNUNET_new (struct NotifyList);
-  n->callback = callback;
-  n->callback_cls = callback_cls;
-  GNUNET_CONTAINER_DLL_insert (server->disconnect_notify_list_head,
-                               server->disconnect_notify_list_tail,
-                               n);
-}
-
-
-/**
- * Ask the server to notify us whenever a client connects.
- * This function is called whenever the actual network connection
- * is opened. If the server is destroyed before this
- * notification is explicitly cancelled, the 'callback' will
- * once be called with a 'client' argument of NULL to indicate
- * that the server itself is now gone (and that the callback
- * won't be called anymore and also can no longer be cancelled).
- *
- * @param server the server manageing the clients
- * @param callback function to call on sconnect
- * @param callback_cls closure for @a callback
- */
-void
-GNUNET_SERVER_connect_notify (struct GNUNET_SERVER_Handle *server,
-                              GNUNET_SERVER_ConnectCallback callback,
-                              void *callback_cls)
-{
-  struct NotifyList *n;
-  struct GNUNET_SERVER_Client *client;
-
-  n = GNUNET_new (struct NotifyList);
-  n->callback = callback;
-  n->callback_cls = callback_cls;
-  GNUNET_CONTAINER_DLL_insert (server->connect_notify_list_head,
-                               server->connect_notify_list_tail,
-                               n);
-  for (client = server->clients_head; NULL != client; client = client->next)
-    callback (callback_cls, client);
-}
-
-
-/**
- * Ask the server to stop notifying us whenever a client connects.
- *
- * @param server the server manageing the clients
- * @param callback function to call on connect
- * @param callback_cls closure for @a callback
- */
-void
-GNUNET_SERVER_disconnect_notify_cancel (struct GNUNET_SERVER_Handle *server,
-                                        GNUNET_SERVER_DisconnectCallback
-                                        callback,
-                                        void *callback_cls)
-{
-  struct NotifyList *pos;
-
-  for (pos = server->disconnect_notify_list_head; NULL != pos; pos = pos->next)
-    if ((pos->callback == callback) && (pos->callback_cls == callback_cls))
-      break;
-  if (NULL == pos)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  GNUNET_CONTAINER_DLL_remove (server->disconnect_notify_list_head,
-                               server->disconnect_notify_list_tail,
-                               pos);
-  GNUNET_free (pos);
-}
-
-
-/**
- * Ask the server to stop notifying us whenever a client disconnects.
- *
- * @param server the server manageing the clients
- * @param callback function to call on disconnect
- * @param callback_cls closure for @a callback
- */
-void
-GNUNET_SERVER_connect_notify_cancel (struct GNUNET_SERVER_Handle *server,
-                                     GNUNET_SERVER_ConnectCallback callback,
-                                     void *callback_cls)
-{
-  struct NotifyList *pos;
-
-  for (pos = server->connect_notify_list_head; NULL != pos; pos = pos->next)
-    if ((pos->callback == callback) && (pos->callback_cls == callback_cls))
-      break;
-  if (NULL == pos)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  GNUNET_CONTAINER_DLL_remove (server->connect_notify_list_head,
-                               server->connect_notify_list_tail,
-                               pos);
-  GNUNET_free (pos);
-}
-
-
-/**
- * Ask the server to disconnect from the given client.
- * This is the same as returning #GNUNET_SYSERR from a message
- * handler, except that it allows dropping of a client even
- * when not handling a message from that client.
- *
- * @param client the client to disconnect from
- */
-void
-GNUNET_SERVER_client_disconnect (struct GNUNET_SERVER_Client *client)
-{
-  struct GNUNET_SERVER_Handle *server = client->server;
-  struct NotifyList *n;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Client is being disconnected from the server.\n");
-  if (NULL != client->restart_task)
-  {
-    GNUNET_SCHEDULER_cancel (client->restart_task);
-    client->restart_task = NULL;
-  }
-  if (NULL != client->warn_task)
-  {
-    GNUNET_SCHEDULER_cancel (client->warn_task);
-    client->warn_task = NULL;
-  }
-  if (GNUNET_YES == client->receive_pending)
-  {
-    GNUNET_CONNECTION_receive_cancel (client->connection);
-    client->receive_pending = GNUNET_NO;
-  }
-  client->shutdown_now = GNUNET_YES;
-  client->reference_count++; /* make sure nobody else clean up client... */
-  if ((NULL != client->mst) &&
-      (NULL != server))
-  {
-    GNUNET_CONTAINER_DLL_remove (server->clients_head,
-                                 server->clients_tail,
-                                 client);
-    if (NULL != server->mst_destroy)
-      server->mst_destroy (server->mst_cls,
-                           client->mst);
-    else
-      GNUNET_SERVER_mst_destroy (client->mst);
-    client->mst = NULL;
-    for (n = server->disconnect_notify_list_head; NULL != n; n = n->next)
-      n->callback (n->callback_cls,
-                   client);
-  }
-  client->reference_count--;
-  if (client->reference_count > 0)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "RC of %p still positive, not destroying everything.\n",
-         client);
-    client->server = NULL;
-    return;
-  }
-  if (GNUNET_YES == client->in_process_client_buffer)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Still processing inputs of %p, not destroying everything.\n",
-         client);
-    return;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "RC of %p now zero, destroying everything.\n",
-       client);
-  if (GNUNET_YES == client->persist)
-    GNUNET_CONNECTION_persist_ (client->connection);
-  if (NULL != client->th.cth)
-    GNUNET_SERVER_notify_transmit_ready_cancel (&client->th);
-  GNUNET_CONNECTION_destroy (client->connection);
-  /* need to cancel again, as it might have been re-added
-     in the meantime (i.e. during callbacks) */
-  if (NULL != client->warn_task)
-  {
-    GNUNET_SCHEDULER_cancel (client->warn_task);
-    client->warn_task = NULL;
-  }
-  if (GNUNET_YES == client->receive_pending)
-  {
-    GNUNET_CONNECTION_receive_cancel (client->connection);
-    client->receive_pending = GNUNET_NO;
-  }
-  GNUNET_free (client);
-  /* we might be in soft-shutdown, test if we're done */
-  if (NULL != server)
-    test_monitor_clients (server);
-}
-
-
-/**
- * Disable the "CORK" feature for communication with the given client,
- * forcing the OS to immediately flush the buffer on transmission
- * instead of potentially buffering multiple messages.
- *
- * @param client handle to the client
- * @return #GNUNET_OK on success
- */
-int
-GNUNET_SERVER_client_disable_corking (struct GNUNET_SERVER_Client *client)
-{
-  return GNUNET_CONNECTION_disable_corking (client->connection);
-}
-
-
-/**
- * Wrapper for transmission notification that calls the original
- * callback and update the last activity time for our connection.
- *
- * @param cls the `struct GNUNET_SERVER_Client *`
- * @param size number of bytes we can transmit
- * @param buf where to copy the message
- * @return number of bytes actually transmitted
- */
-static size_t
-transmit_ready_callback_wrapper (void *cls, size_t size, void *buf)
-{
-  struct GNUNET_SERVER_Client *client = cls;
-  GNUNET_CONNECTION_TransmitReadyNotify callback;
-
-  client->th.cth = NULL;
-  callback = client->th.callback;
-  client->th.callback = NULL;
-  client->last_activity = GNUNET_TIME_absolute_get ();
-  return callback (client->th.callback_cls, size, buf);
-}
-
-
-/**
- * Notify us when the server has enough space to transmit
- * a message of the given size to the given client.
- *
- * @param client client to transmit message to
- * @param size requested amount of buffer space
- * @param timeout after how long should we give up (and call
- *        notify with buf NULL and size 0)?
- * @param callback function to call when space is available
- * @param callback_cls closure for @a callback
- * @return non-NULL if the notify callback was queued; can be used
- *         to cancel the request using
- *         #GNUNET_SERVER_notify_transmit_ready_cancel().
- *         NULL if we are already going to notify someone else (busy)
- */
-struct GNUNET_SERVER_TransmitHandle *
-GNUNET_SERVER_notify_transmit_ready (struct GNUNET_SERVER_Client *client,
-                                     size_t size,
-                                     struct GNUNET_TIME_Relative timeout,
-                                     GNUNET_CONNECTION_TransmitReadyNotify
-                                     callback,
-                                     void *callback_cls)
-{
-  if (NULL != client->th.callback)
-    return NULL;
-  client->th.callback_cls = callback_cls;
-  client->th.callback = callback;
-  client->th.cth = GNUNET_CONNECTION_notify_transmit_ready (client->connection,
-                                                            size,
-                                                            timeout,
-                                                            &
-                                                            transmit_ready_callback_wrapper,
-                                                            client);
-  return &client->th;
-}
-
-
-/**
- * Abort transmission request.
- *
- * @param th request to abort
- */
-void
-GNUNET_SERVER_notify_transmit_ready_cancel (struct
-                                            GNUNET_SERVER_TransmitHandle *th)
-{
-  GNUNET_CONNECTION_notify_transmit_ready_cancel (th->cth);
-  th->cth = NULL;
-  th->callback = NULL;
-}
-
-
-/**
- * Set the persistent flag on this client, used to setup client connection
- * to only be killed when the service it's connected to is actually dead.
- *
- * @param client the client to set the persistent flag on
- */
-void
-GNUNET_SERVER_client_persist_ (struct GNUNET_SERVER_Client *client)
-{
-  client->persist = GNUNET_YES;
-}
-
-
-/**
- * Resume receiving from this client, we are done processing the
- * current request.  This function must be called from within each
- * GNUNET_SERVER_MessageCallback (or its respective continuations).
- *
- * @param client client we were processing a message of
- * @param success #GNUNET_OK to keep the connection open and
- *                          continue to receive
- *                #GNUNET_NO to close the connection (normal behavior)
- *                #GNUNET_SYSERR to close the connection (signal
- *                          serious error)
- */
-void
-GNUNET_SERVER_receive_done (struct GNUNET_SERVER_Client *client,
-                            int success)
-{
-  if (NULL == client)
-    return;
-  GNUNET_assert (client->suspended > 0);
-  client->suspended--;
-  if (GNUNET_OK != success)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "GNUNET_SERVER_receive_done called with failure indication\n");
-    if ((client->reference_count > 0) || (client->suspended > 0))
-      client->shutdown_now = GNUNET_YES;
-    else
-      GNUNET_SERVER_client_disconnect (client);
-    return;
-  }
-  if (client->suspended > 0)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "GNUNET_SERVER_receive_done called, but more clients pending\n");
-    return;
-  }
-  if (NULL != client->warn_task)
-  {
-    GNUNET_SCHEDULER_cancel (client->warn_task);
-    client->warn_task = NULL;
-  }
-  if (GNUNET_YES == client->in_process_client_buffer)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "GNUNET_SERVER_receive_done called while still in processing loop\n");
-    return;
-  }
-  if ((NULL == client->server) || (GNUNET_YES == client->shutdown_now))
-  {
-    GNUNET_SERVER_client_disconnect (client);
-    return;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "GNUNET_SERVER_receive_done causes restart in reading from the socket\n");
-  GNUNET_assert (NULL == client->restart_task);
-  client->restart_task = GNUNET_SCHEDULER_add_now (&restart_processing,
-                                                   client);
-}
-
-
-/* end of server.c */
diff --git a/src/transport/tcp_server_mst_legacy.c b/src/transport/tcp_server_mst_legacy.c
deleted file mode 100644
index bed6874c9..000000000
--- a/src/transport/tcp_server_mst_legacy.c
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2010 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file util/server_mst.c
- * @brief convenience functions for handling inbound message buffers
- * @author Christian Grothoff
- */
-
-#include "platform.h"
-#include "gnunet_util_lib.h"
-
-
-#if HAVE_UNALIGNED_64_ACCESS
-#define ALIGN_FACTOR 4
-#else
-#define ALIGN_FACTOR 8
-#endif
-
-
-/**
- * Handle to a message stream tokenizer.
- */
-struct GNUNET_SERVER_MessageStreamTokenizer
-{
-  /**
-   * Function to call on completed messages.
-   */
-  GNUNET_SERVER_MessageTokenizerCallback cb;
-
-  /**
-   * Closure for @e cb.
-   */
-  void *cb_cls;
-
-  /**
-   * Size of the buffer (starting at @e hdr).
-   */
-  size_t curr_buf;
-
-  /**
-   * How many bytes in buffer have we already processed?
-   */
-  size_t off;
-
-  /**
-   * How many bytes in buffer are valid right now?
-   */
-  size_t pos;
-
-  /**
-   * Beginning of the buffer.  Typed like this to force alignment.
-   */
-  struct GNUNET_MessageHeader *hdr;
-};
-
-
-/**
- * Create a message stream tokenizer.
- *
- * @param cb function to call on completed messages
- * @param cb_cls closure for @a cb
- * @return handle to tokenizer
- */
-struct GNUNET_SERVER_MessageStreamTokenizer *
-GNUNET_SERVER_mst_create (GNUNET_SERVER_MessageTokenizerCallback cb,
-                          void *cb_cls)
-{
-  struct GNUNET_SERVER_MessageStreamTokenizer *ret;
-
-  ret = GNUNET_new (struct GNUNET_SERVER_MessageStreamTokenizer);
-  ret->hdr = GNUNET_malloc (GNUNET_MIN_MESSAGE_SIZE);
-  ret->curr_buf = GNUNET_MIN_MESSAGE_SIZE;
-  ret->cb = cb;
-  ret->cb_cls = cb_cls;
-  return ret;
-}
-
-
-/**
- * Add incoming data to the receive buffer and call the
- * callback for all complete messages.
- *
- * @param mst tokenizer to use
- * @param client_identity ID of client for which this is a buffer
- * @param buf input data to add
- * @param size number of bytes in @a buf
- * @param purge should any excess bytes in the buffer be discarded
- *       (i.e. for packet-based services like UDP)
- * @param one_shot only call callback once, keep rest of message in buffer
- * @return #GNUNET_OK if we are done processing (need more data)
- *         #GNUNET_NO if @a one_shot was set and we have another message ready
- *         #GNUNET_SYSERR if the data stream is corrupt
- */
-int
-GNUNET_SERVER_mst_receive (struct GNUNET_SERVER_MessageStreamTokenizer *mst,
-                           void *client_identity,
-                           const char *buf, size_t size,
-                           int purge, int one_shot)
-{
-  const struct GNUNET_MessageHeader *hdr;
-  size_t delta;
-  uint16_t want;
-  char *ibuf;
-  int need_align;
-  unsigned long offset;
-  int ret;
-
-  GNUNET_assert (mst->off <= mst->pos);
-  GNUNET_assert (mst->pos <= mst->curr_buf);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Server-mst receives %u bytes with %u bytes already in private buffer\n",
-       (unsigned int) size, (unsigned int) (mst->pos - mst->off));
-  ret = GNUNET_OK;
-  ibuf = (char *) mst->hdr;
-  while (mst->pos > 0)
-  {
-do_align:
-    GNUNET_assert (mst->pos >= mst->off);
-    if ((mst->curr_buf - mst->off < sizeof(struct GNUNET_MessageHeader)) ||
-        (0 != (mst->off % ALIGN_FACTOR)))
-    {
-      /* need to align or need more space */
-      mst->pos -= mst->off;
-      memmove (ibuf, &ibuf[mst->off], mst->pos);
-      mst->off = 0;
-    }
-    if (mst->pos - mst->off < sizeof(struct GNUNET_MessageHeader))
-    {
-      delta =
-        GNUNET_MIN (sizeof(struct GNUNET_MessageHeader)
-                    - (mst->pos - mst->off), size);
-      GNUNET_memcpy (&ibuf[mst->pos], buf, delta);
-      mst->pos += delta;
-      buf += delta;
-      size -= delta;
-    }
-    if (mst->pos - mst->off < sizeof(struct GNUNET_MessageHeader))
-    {
-      if (purge)
-      {
-        mst->off = 0;
-        mst->pos = 0;
-      }
-      return GNUNET_OK;
-    }
-    hdr = (const struct GNUNET_MessageHeader *) &ibuf[mst->off];
-    want = ntohs (hdr->size);
-    if (want < sizeof(struct GNUNET_MessageHeader))
-    {
-      GNUNET_break_op (0);
-      return GNUNET_SYSERR;
-    }
-    if ((mst->curr_buf - mst->off < want) &&
-        (mst->off > 0))
-    {
-      /* can get more space by moving */
-      mst->pos -= mst->off;
-      memmove (ibuf, &ibuf[mst->off], mst->pos);
-      mst->off = 0;
-    }
-    if (mst->curr_buf < want)
-    {
-      /* need to get more space by growing buffer */
-      GNUNET_assert (0 == mst->off);
-      mst->hdr = GNUNET_realloc (mst->hdr, want);
-      ibuf = (char *) mst->hdr;
-      mst->curr_buf = want;
-    }
-    hdr = (const struct GNUNET_MessageHeader *) &ibuf[mst->off];
-    if (mst->pos - mst->off < want)
-    {
-      delta = GNUNET_MIN (want - (mst->pos - mst->off), size);
-      GNUNET_assert (mst->pos + delta <= mst->curr_buf);
-      GNUNET_memcpy (&ibuf[mst->pos], buf, delta);
-      mst->pos += delta;
-      buf += delta;
-      size -= delta;
-    }
-    if (mst->pos - mst->off < want)
-    {
-      if (purge)
-      {
-        mst->off = 0;
-        mst->pos = 0;
-      }
-      return GNUNET_OK;
-    }
-    if (one_shot == GNUNET_SYSERR)
-    {
-      /* cannot call callback again, but return value saying that
-       * we have another full message in the buffer */
-      ret = GNUNET_NO;
-      goto copy;
-    }
-    if (one_shot == GNUNET_YES)
-      one_shot = GNUNET_SYSERR;
-    mst->off += want;
-    if (GNUNET_SYSERR == mst->cb (mst->cb_cls, client_identity, hdr))
-      return GNUNET_SYSERR;
-    if (mst->off == mst->pos)
-    {
-      /* reset to beginning of buffer, it's free right now! */
-      mst->off = 0;
-      mst->pos = 0;
-    }
-  }
-  GNUNET_assert (0 == mst->pos);
-  while (size > 0)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Server-mst has %u bytes left in inbound buffer\n",
-         (unsigned int) size);
-    if (size < sizeof(struct GNUNET_MessageHeader))
-      break;
-    offset = (unsigned long) buf;
-    need_align = (0 != (offset % ALIGN_FACTOR)) ? GNUNET_YES : GNUNET_NO;
-    if (GNUNET_NO == need_align)
-    {
-      /* can try to do zero-copy and process directly from original buffer */
-      hdr = (const struct GNUNET_MessageHeader *) buf;
-      want = ntohs (hdr->size);
-      if (want < sizeof(struct GNUNET_MessageHeader))
-      {
-        GNUNET_break_op (0);
-        mst->off = 0;
-        return GNUNET_SYSERR;
-      }
-      if (size < want)
-        break;                  /* or not: buffer incomplete, so copy to private buffer... */
-      if (one_shot == GNUNET_SYSERR)
-      {
-        /* cannot call callback again, but return value saying that
-         * we have another full message in the buffer */
-        ret = GNUNET_NO;
-        goto copy;
-      }
-      if (one_shot == GNUNET_YES)
-        one_shot = GNUNET_SYSERR;
-      if (GNUNET_SYSERR == mst->cb (mst->cb_cls, client_identity, hdr))
-        return GNUNET_SYSERR;
-      buf += want;
-      size -= want;
-    }
-    else
-    {
-      /* need to copy to private buffer to align;
-       * yes, we go a bit more spaghetti than usual here */
-      goto do_align;
-    }
-  }
-copy:
-  if ((size > 0) && (! purge))
-  {
-    if (size + mst->pos > mst->curr_buf)
-    {
-      mst->hdr = GNUNET_realloc (mst->hdr, size + mst->pos);
-      ibuf = (char *) mst->hdr;
-      mst->curr_buf = size + mst->pos;
-    }
-    GNUNET_assert (size + mst->pos <= mst->curr_buf);
-    GNUNET_memcpy (&ibuf[mst->pos], buf, size);
-    mst->pos += size;
-  }
-  if (purge)
-  {
-    mst->off = 0;
-    mst->pos = 0;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Server-mst leaves %u bytes in private buffer\n",
-       (unsigned int) (mst->pos - mst->off));
-  return ret;
-}
-
-
-/**
- * Destroys a tokenizer.
- *
- * @param mst tokenizer to destroy
- */
-void
-GNUNET_SERVER_mst_destroy (struct GNUNET_SERVER_MessageStreamTokenizer *mst)
-{
-  GNUNET_free (mst->hdr);
-  GNUNET_free (mst);
-}
-
-
-/* end of server_mst.c */
diff --git a/src/transport/tcp_service_legacy.c b/src/transport/tcp_service_legacy.c
deleted file mode 100644
index 65b090187..000000000
--- a/src/transport/tcp_service_legacy.c
+++ /dev/null
@@ -1,1646 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2009, 2012 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file util/service.c
- * @brief functions related to starting services
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_protocols.h"
-#include "gnunet_constants.h"
-#include "gnunet_resolver_service.h"
-
-#if HAVE_MALLINFO2
-#include <malloc.h>
-#include "gauger.h"
-#endif
-
-
-/* ******************* access control ******************** */
-
-/**
- * Check if the given IP address is in the list of IP addresses.
- *
- * @param list a list of networks
- * @param add the IP to check (in network byte order)
- * @return #GNUNET_NO if the IP is not in the list, #GNUNET_YES if it it is
- */
-static int
-check_ipv4_listed (const struct GNUNET_STRINGS_IPv4NetworkPolicy *list,
-                   const struct in_addr *add)
-{
-  unsigned int i;
-
-  if (NULL == list)
-    return GNUNET_NO;
-  i = 0;
-  while ((list[i].network.s_addr != 0) || (list[i].netmask.s_addr != 0))
-  {
-    if ((add->s_addr & list[i].netmask.s_addr) ==
-        (list[i].network.s_addr & list[i].netmask.s_addr))
-      return GNUNET_YES;
-    i++;
-  }
-  return GNUNET_NO;
-}
-
-
-/**
- * Check if the given IP address is in the list of IP addresses.
- *
- * @param list a list of networks
- * @param ip the IP to check (in network byte order)
- * @return #GNUNET_NO if the IP is not in the list, #GNUNET_YES if it it is
- */
-static int
-check_ipv6_listed (const struct GNUNET_STRINGS_IPv6NetworkPolicy *list,
-                   const struct in6_addr *ip)
-{
-  unsigned int i;
-  unsigned int j;
-  struct in6_addr zero;
-
-  if (NULL == list)
-    return GNUNET_NO;
-  memset (&zero, 0, sizeof(struct in6_addr));
-  i = 0;
-NEXT:
-  while (0 != memcmp (&zero, &list[i].network, sizeof(struct in6_addr)))
-  {
-    for (j = 0; j < sizeof(struct in6_addr) / sizeof(int); j++)
-      if (((((int *) ip)[j] & ((int *) &list[i].netmask)[j])) !=
-          (((int *) &list[i].network)[j] & ((int *) &list[i].netmask)[j]))
-      {
-        i++;
-        goto NEXT;
-      }
-    return GNUNET_YES;
-  }
-  return GNUNET_NO;
-}
-
-
-/* ****************** service struct ****************** */
-
-
-/**
- * Context for "service_task".
- */
-struct LEGACY_SERVICE_Context
-{
-  /**
-   * Our configuration.
-   */
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  /**
-   * Handle for the server.
-   */
-  struct GNUNET_SERVER_Handle *server;
-
-  /**
-   * NULL-terminated array of addresses to bind to, NULL if we got pre-bound
-   * listen sockets.
-   */
-  struct sockaddr **addrs;
-
-  /**
-   * Name of our service.
-   */
-  const char *service_name;
-
-  /**
-   * Main service-specific task to run.
-   */
-  LEGACY_SERVICE_Main task;
-
-  /**
-   * Closure for @e task.
-   */
-  void *task_cls;
-
-  /**
-   * IPv4 addresses that are not allowed to connect.
-   */
-  struct GNUNET_STRINGS_IPv4NetworkPolicy *v4_denied;
-
-  /**
-   * IPv6 addresses that are not allowed to connect.
-   */
-  struct GNUNET_STRINGS_IPv6NetworkPolicy *v6_denied;
-
-  /**
-   * IPv4 addresses that are allowed to connect (if not
-   * set, all are allowed).
-   */
-  struct GNUNET_STRINGS_IPv4NetworkPolicy *v4_allowed;
-
-  /**
-   * IPv6 addresses that are allowed to connect (if not
-   * set, all are allowed).
-   */
-  struct GNUNET_STRINGS_IPv6NetworkPolicy *v6_allowed;
-
-  /**
-   * My (default) message handlers.  Adjusted copy
-   * of "defhandlers".
-   */
-  struct GNUNET_SERVER_MessageHandler *my_handlers;
-
-  /**
-   * Array of the lengths of the entries in addrs.
-   */
-  socklen_t *addrlens;
-
-  /**
-   * NULL-terminated array of listen sockets we should take over.
-   */
-  struct GNUNET_NETWORK_Handle **lsocks;
-
-  /**
-   * Task ID of the shutdown task.
-   */
-  struct GNUNET_SCHEDULER_Task *shutdown_task;
-
-  /**
-   * Idle timeout for server.
-   */
-  struct GNUNET_TIME_Relative timeout;
-
-  /**
-   * Overall success/failure of the service start.
-   */
-  int ret;
-
-  /**
-   * If we are daemonizing, this FD is set to the
-   * pipe to the parent.  Send '.' if we started
-   * ok, '!' if not.  -1 if we are not daemonizing.
-   */
-  int ready_confirm_fd;
-
-  /**
-   * Do we close connections if we receive messages
-   * for which we have no handler?
-   */
-  int require_found;
-
-  /**
-   * Do we require a matching UID for UNIX domain socket connections?
-   * #GNUNET_NO means that the UID does not have to match (however,
-   * @e match_gid may still impose other access control checks).
-   */
-  int match_uid;
-
-  /**
-   * Do we require a matching GID for UNIX domain socket connections?
-   * Ignored if @e match_uid is #GNUNET_YES.  Note that this is about
-   * checking that the client's UID is in our group OR that the
-   * client's GID is our GID.  If both "match_gid" and @e match_uid are
-   * #GNUNET_NO, all users on the local system have access.
-   */
-  int match_gid;
-
-  /**
-   * Our options.
-   */
-  enum LEGACY_SERVICE_Options options;
-};
-
-
-/* ****************** message handlers ****************** */
-
-/**
- * Send a 'TEST' message back to the client.
- *
- * @param cls the 'struct GNUNET_SERVER_Client' to send TEST to
- * @param size number of bytes available in 'buf'
- * @param buf where to copy the message
- * @return number of bytes written to 'buf'
- */
-static size_t
-write_test (void *cls, size_t size, void *buf)
-{
-  struct GNUNET_SERVER_Client *client = cls;
-  struct GNUNET_MessageHeader *msg;
-
-  if (size < sizeof(struct GNUNET_MessageHeader))
-  {
-    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-    return 0;   /* client disconnected */
-  }
-  msg = (struct GNUNET_MessageHeader *) buf;
-  msg->type = htons (GNUNET_MESSAGE_TYPE_TEST);
-  msg->size = htons (sizeof(struct GNUNET_MessageHeader));
-  GNUNET_SERVER_receive_done (client, GNUNET_OK);
-  return sizeof(struct GNUNET_MessageHeader);
-}
-
-
-/**
- * Handler for TEST message.
- *
- * @param cls closure (refers to service)
- * @param client identification of the client
- * @param message the actual message
- */
-static void
-handle_test (void *cls,
-             struct GNUNET_SERVER_Client *client,
-             const struct GNUNET_MessageHeader *message)
-{
-  /* simply bounce message back to acknowledge */
-  if (NULL ==
-      GNUNET_SERVER_notify_transmit_ready (client,
-                                           sizeof(struct GNUNET_MessageHeader),
-                                           GNUNET_TIME_UNIT_FOREVER_REL,
-                                           &write_test,
-                                           client))
-    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-}
-
-
-/**
- * Default handlers for all services.  Will be copied and the
- * "callback_cls" fields will be replaced with the specific service
- * struct.
- */
-static const struct GNUNET_SERVER_MessageHandler defhandlers[] =
-{ { &handle_test,
-    NULL,
-    GNUNET_MESSAGE_TYPE_TEST,
-    sizeof(struct GNUNET_MessageHeader) },
-  { NULL, NULL, 0, 0 } };
-
-
-/* ****************** service core routines ************** */
-
-
-/**
- * Check if access to the service is allowed from the given address.
- *
- * @param cls closure
- * @param uc credentials, if available, otherwise NULL
- * @param addr address
- * @param addrlen length of address
- * @return #GNUNET_YES to allow, #GNUNET_NO to deny, #GNUNET_SYSERR
- *   for unknown address family (will be denied).
- */
-static int
-check_access (void *cls,
-              const struct GNUNET_CONNECTION_Credentials *uc,
-              const struct sockaddr *addr,
-              socklen_t addrlen)
-{
-  struct LEGACY_SERVICE_Context *sctx = cls;
-  const struct sockaddr_in *i4;
-  const struct sockaddr_in6 *i6;
-  int ret;
-
-  switch (addr->sa_family)
-  {
-  case AF_INET:
-    GNUNET_assert (addrlen == sizeof(struct sockaddr_in));
-    i4 = (const struct sockaddr_in *) addr;
-    ret = ((NULL == sctx->v4_allowed) ||
-           (check_ipv4_listed (sctx->v4_allowed, &i4->sin_addr))) &&
-          ((NULL == sctx->v4_denied) ||
-           (! check_ipv4_listed (sctx->v4_denied, &i4->sin_addr)));
-    break;
-
-  case AF_INET6:
-    GNUNET_assert (addrlen == sizeof(struct sockaddr_in6));
-    i6 = (const struct sockaddr_in6 *) addr;
-    ret = ((NULL == sctx->v6_allowed) ||
-           (check_ipv6_listed (sctx->v6_allowed, &i6->sin6_addr))) &&
-          ((NULL == sctx->v6_denied) ||
-           (! check_ipv6_listed (sctx->v6_denied, &i6->sin6_addr)));
-    break;
-
-  case AF_UNIX:
-    ret = GNUNET_OK;   /* controlled using file-system ACL now */
-    break;
-
-  default:
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         _ ("Unknown address family %d\n"),
-         addr->sa_family);
-    return GNUNET_SYSERR;
-  }
-  if (GNUNET_OK != ret)
-  {
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         _ ("Access from `%s' denied to service `%s'\n"),
-         GNUNET_a2s (addr, addrlen),
-         sctx->service_name);
-  }
-  return ret;
-}
-
-
-/**
- * Get the name of the file where we will
- * write the PID of the service.
- *
- * @param sctx service context
- * @return name of the file for the process ID
- */
-static char *
-get_pid_file_name (struct LEGACY_SERVICE_Context *sctx)
-{
-  char *pif;
-
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (sctx->cfg,
-                                                            sctx->service_name,
-                                                            "PIDFILE",
-                                                            &pif))
-    return NULL;
-  return pif;
-}
-
-
-/**
- * Parse an IPv4 access control list.
- *
- * @param ret location where to write the ACL (set)
- * @param sctx service context to use to get the configuration
- * @param option name of the ACL option to parse
- * @return #GNUNET_SYSERR on parse error, #GNUNET_OK on success (including
- *         no ACL configured)
- */
-static int
-process_acl4 (struct GNUNET_STRINGS_IPv4NetworkPolicy **ret,
-              struct LEGACY_SERVICE_Context *sctx,
-              const char *option)
-{
-  char *opt;
-
-  if (! GNUNET_CONFIGURATION_have_value (sctx->cfg, sctx->service_name, option))
-  {
-    *ret = NULL;
-    return GNUNET_OK;
-  }
-  GNUNET_break (GNUNET_OK ==
-                GNUNET_CONFIGURATION_get_value_string (sctx->cfg,
-                                                       sctx->service_name,
-                                                       option,
-                                                       &opt));
-  if (NULL == (*ret = GNUNET_STRINGS_parse_ipv4_policy (opt)))
-  {
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         _ ("Could not parse IPv4 network specification `%s' for `%s:%s'\n"),
-         opt,
-         sctx->service_name,
-         option);
-    GNUNET_free (opt);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_free (opt);
-  return GNUNET_OK;
-}
-
-
-/**
- * Parse an IPv6 access control list.
- *
- * @param ret location where to write the ACL (set)
- * @param sctx service context to use to get the configuration
- * @param option name of the ACL option to parse
- * @return #GNUNET_SYSERR on parse error, #GNUNET_OK on success (including
- *         no ACL configured)
- */
-static int
-process_acl6 (struct GNUNET_STRINGS_IPv6NetworkPolicy **ret,
-              struct LEGACY_SERVICE_Context *sctx,
-              const char *option)
-{
-  char *opt;
-
-  if (! GNUNET_CONFIGURATION_have_value (sctx->cfg, sctx->service_name, option))
-  {
-    *ret = NULL;
-    return GNUNET_OK;
-  }
-  GNUNET_break (GNUNET_OK ==
-                GNUNET_CONFIGURATION_get_value_string (sctx->cfg,
-                                                       sctx->service_name,
-                                                       option,
-                                                       &opt));
-  if (NULL == (*ret = GNUNET_STRINGS_parse_ipv6_policy (opt)))
-  {
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         _ ("Could not parse IPv6 network specification `%s' for `%s:%s'\n"),
-         opt,
-         sctx->service_name,
-         option);
-    GNUNET_free (opt);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_free (opt);
-  return GNUNET_OK;
-}
-
-
-/**
- * Add the given UNIX domain path as an address to the
- * list (as the first entry).
- *
- * @param saddrs array to update
- * @param saddrlens where to store the address length
- * @param unixpath path to add
- * @param abstract #GNUNET_YES to add an abstract UNIX domain socket.  This
- *          parameter is ignore on systems other than LINUX
- */
-static void
-add_unixpath (struct sockaddr **saddrs,
-              socklen_t *saddrlens,
-              const char *unixpath,
-              int abstract)
-{
-#ifdef AF_UNIX
-  struct sockaddr_un *un;
-
-  un = GNUNET_new (struct sockaddr_un);
-  un->sun_family = AF_UNIX;
-  GNUNET_strlcpy (un->sun_path, unixpath, sizeof(un->sun_path));
-#ifdef __linux__
-  if (GNUNET_YES == abstract)
-    un->sun_path[0] = '\0';
-#endif
-#if HAVE_SOCKADDR_UN_SUN_LEN
-  un->sun_len = (u_char) sizeof(struct sockaddr_un);
-#endif
-  *saddrs = (struct sockaddr *) un;
-  *saddrlens = sizeof(struct sockaddr_un);
-#else
-  /* this function should never be called
-   * unless AF_UNIX is defined! */
-  GNUNET_assert (0);
-#endif
-}
-
-
-/**
- * Get the list of addresses that a server for the given service
- * should bind to.
- *
- * @param service_name name of the service
- * @param cfg configuration (which specifies the addresses)
- * @param addrs set (call by reference) to an array of pointers to the
- *              addresses the server should bind to and listen on; the
- *              array will be NULL-terminated (on success)
- * @param addr_lens set (call by reference) to an array of the lengths
- *              of the respective `struct sockaddr` struct in the @a addrs
- *              array (on success)
- * @return number of addresses found on success,
- *              #GNUNET_SYSERR if the configuration
- *              did not specify reasonable finding information or
- *              if it specified a hostname that could not be resolved;
- *              #GNUNET_NO if the number of addresses configured is
- *              zero (in this case, `*addrs` and `*addr_lens` will be
- *              set to NULL).
- */
-int
-LEGACY_SERVICE_get_server_addresses (
-  const char *service_name,
-  const struct GNUNET_CONFIGURATION_Handle *cfg,
-  struct sockaddr ***addrs,
-  socklen_t **addr_lens)
-{
-  int disablev6;
-  struct GNUNET_NETWORK_Handle *desc;
-  unsigned long long port;
-  char *unixpath;
-  struct addrinfo hints;
-  struct addrinfo *res;
-  struct addrinfo *pos;
-  struct addrinfo *next;
-  unsigned int i;
-  int resi;
-  int ret;
-  int abstract;
-  struct sockaddr **saddrs;
-  socklen_t *saddrlens;
-  char *hostname;
-
-  *addrs = NULL;
-  *addr_lens = NULL;
-  desc = NULL;
-  if (GNUNET_CONFIGURATION_have_value (cfg, service_name, "DISABLEV6"))
-  {
-    if (GNUNET_SYSERR ==
-        (disablev6 = GNUNET_CONFIGURATION_get_value_yesno (cfg,
-                                                           service_name,
-                                                           "DISABLEV6")))
-      return GNUNET_SYSERR;
-  }
-  else
-    disablev6 = GNUNET_NO;
-
-  if (! disablev6)
-  {
-    /* probe IPv6 support */
-    desc = GNUNET_NETWORK_socket_create (PF_INET6, SOCK_STREAM, 0);
-    if (NULL == desc)
-    {
-      if ((ENOBUFS == errno) || (ENOMEM == errno) || (ENFILE == errno) ||
-          (EACCES == errno))
-      {
-        LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "socket");
-        return GNUNET_SYSERR;
-      }
-      LOG (GNUNET_ERROR_TYPE_INFO,
-           _ (
-             "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"),
-           service_name,
-           strerror (errno));
-      disablev6 = GNUNET_YES;
-    }
-    else
-    {
-      GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (desc));
-      desc = NULL;
-    }
-  }
-
-  port = 0;
-  if (GNUNET_CONFIGURATION_have_value (cfg, service_name, "PORT"))
-  {
-    if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg,
-                                                            service_name,
-                                                            "PORT",
-                                                            &port))
-    {
-      LOG (GNUNET_ERROR_TYPE_ERROR,
-           _ ("Require valid port number for service `%s' in configuration!\n"),
-           service_name);
-    }
-    if (port > 65535)
-    {
-      LOG (GNUNET_ERROR_TYPE_ERROR,
-           _ ("Require valid port number for service `%s' in configuration!\n"),
-           service_name);
-      return GNUNET_SYSERR;
-    }
-  }
-
-  if (GNUNET_CONFIGURATION_have_value (cfg, service_name, "BINDTO"))
-  {
-    GNUNET_break (GNUNET_OK ==
-                  GNUNET_CONFIGURATION_get_value_string (cfg,
-                                                         service_name,
-                                                         "BINDTO",
-                                                         &hostname));
-  }
-  else
-    hostname = NULL;
-
-  unixpath = NULL;
-  abstract = GNUNET_NO;
-#ifdef AF_UNIX
-  if ((GNUNET_YES ==
-       GNUNET_CONFIGURATION_have_value (cfg, service_name, "UNIXPATH")) &&
-      (GNUNET_OK == GNUNET_CONFIGURATION_get_value_filename (cfg,
-                                                             service_name,
-                                                             "UNIXPATH",
-                                                             &unixpath)) &&
-      (0 < strlen (unixpath)))
-  {
-    /* probe UNIX support */
-    struct sockaddr_un s_un;
-
-    if (strlen (unixpath) >= sizeof(s_un.sun_path))
-    {
-      LOG (GNUNET_ERROR_TYPE_WARNING,
-           _ ("UNIXPATH `%s' too long, maximum length is %llu\n"),
-           unixpath,
-           (unsigned long long) sizeof(s_un.sun_path));
-      unixpath = GNUNET_NETWORK_shorten_unixpath (unixpath);
-      LOG (GNUNET_ERROR_TYPE_INFO, _ ("Using `%s' instead\n"), unixpath);
-    }
-#ifdef __linux__
-    abstract = GNUNET_CONFIGURATION_get_value_yesno (cfg,
-                                                     "TESTING",
-                                                     "USE_ABSTRACT_SOCKETS");
-    if (GNUNET_SYSERR == abstract)
-      abstract = GNUNET_NO;
-#endif
-    if ((GNUNET_YES != abstract) &&
-        (GNUNET_OK != GNUNET_DISK_directory_create_for_file (unixpath)))
-      GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "mkdir", unixpath);
-  }
-  if (NULL != unixpath)
-  {
-    desc = GNUNET_NETWORK_socket_create (AF_UNIX, SOCK_STREAM, 0);
-    if (NULL == desc)
-    {
-      if ((ENOBUFS == errno) || (ENOMEM == errno) || (ENFILE == errno) ||
-          (EACCES == errno))
-      {
-        LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "socket");
-        GNUNET_free (hostname);
-        GNUNET_free (unixpath);
-        return GNUNET_SYSERR;
-      }
-      LOG (GNUNET_ERROR_TYPE_INFO,
-           _ (
-             "Disabling UNIX domain socket support for service `%s', failed to create UNIX domain socket: %s\n"),
-           service_name,
-           strerror (errno));
-      GNUNET_free (unixpath);
-      unixpath = NULL;
-    }
-    else
-    {
-      GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (desc));
-      desc = NULL;
-    }
-  }
-#endif
-
-  if ((0 == port) && (NULL == unixpath))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         _ (
-           "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"),
-         service_name);
-    GNUNET_free (hostname);
-    return GNUNET_SYSERR;
-  }
-  if (0 == port)
-  {
-    saddrs = GNUNET_malloc (2 * sizeof(struct sockaddr *));
-    saddrlens = GNUNET_malloc (2 * sizeof(socklen_t));
-    add_unixpath (saddrs, saddrlens, unixpath, abstract);
-    GNUNET_free (unixpath);
-    GNUNET_free (hostname);
-    *addrs = saddrs;
-    *addr_lens = saddrlens;
-    return 1;
-  }
-
-  if (NULL != hostname)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Resolving `%s' since that is where `%s' will bind to.\n",
-         hostname,
-         service_name);
-    memset (&hints, 0, sizeof(struct addrinfo));
-    if (disablev6)
-      hints.ai_family = AF_INET;
-    hints.ai_protocol = IPPROTO_TCP;
-    if ((0 != (ret = getaddrinfo (hostname, NULL, &hints, &res))) ||
-        (NULL == res))
-    {
-      LOG (GNUNET_ERROR_TYPE_ERROR,
-           _ ("Failed to resolve `%s': %s\n"),
-           hostname,
-           gai_strerror (ret));
-      GNUNET_free (hostname);
-      GNUNET_free (unixpath);
-      return GNUNET_SYSERR;
-    }
-    next = res;
-    i = 0;
-    while (NULL != (pos = next))
-    {
-      next = pos->ai_next;
-      if ((disablev6) && (pos->ai_family == AF_INET6))
-        continue;
-      i++;
-    }
-    if (0 == i)
-    {
-      LOG (GNUNET_ERROR_TYPE_ERROR,
-           _ ("Failed to find %saddress for `%s'.\n"),
-           disablev6 ? "IPv4 " : "",
-           hostname);
-      freeaddrinfo (res);
-      GNUNET_free (hostname);
-      GNUNET_free (unixpath);
-      return GNUNET_SYSERR;
-    }
-    resi = i;
-    if (NULL != unixpath)
-      resi++;
-    saddrs = GNUNET_malloc ((resi + 1) * sizeof(struct sockaddr *));
-    saddrlens = GNUNET_malloc ((resi + 1) * sizeof(socklen_t));
-    i = 0;
-    if (NULL != unixpath)
-    {
-      add_unixpath (saddrs, saddrlens, unixpath, abstract);
-      i++;
-    }
-    next = res;
-    while (NULL != (pos = next))
-    {
-      next = pos->ai_next;
-      if ((disablev6) && (AF_INET6 == pos->ai_family))
-        continue;
-      if ((IPPROTO_TCP != pos->ai_protocol) && (0 != pos->ai_protocol))
-        continue;     /* not TCP */
-      if ((SOCK_STREAM != pos->ai_socktype) && (0 != pos->ai_socktype))
-        continue;     /* huh? */
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Service `%s' will bind to `%s'\n",
-           service_name,
-           GNUNET_a2s (pos->ai_addr, pos->ai_addrlen));
-      if (AF_INET == pos->ai_family)
-      {
-        GNUNET_assert (sizeof(struct sockaddr_in) == pos->ai_addrlen);
-        saddrlens[i] = pos->ai_addrlen;
-        saddrs[i] = GNUNET_malloc (saddrlens[i]);
-        GNUNET_memcpy (saddrs[i], pos->ai_addr, saddrlens[i]);
-        ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port);
-      }
-      else
-      {
-        GNUNET_assert (AF_INET6 == pos->ai_family);
-        GNUNET_assert (sizeof(struct sockaddr_in6) == pos->ai_addrlen);
-        saddrlens[i] = pos->ai_addrlen;
-        saddrs[i] = GNUNET_malloc (saddrlens[i]);
-        GNUNET_memcpy (saddrs[i], pos->ai_addr, saddrlens[i]);
-        ((struct sockaddr_in6 *) saddrs[i])->sin6_port = htons (port);
-      }
-      i++;
-    }
-    GNUNET_free (hostname);
-    freeaddrinfo (res);
-    resi = i;
-  }
-  else
-  {
-    /* will bind against everything, just set port */
-    if (disablev6)
-    {
-      /* V4-only */
-      resi = 1;
-      if (NULL != unixpath)
-        resi++;
-      i = 0;
-      saddrs = GNUNET_malloc ((resi + 1) * sizeof(struct sockaddr *));
-      saddrlens = GNUNET_malloc ((resi + 1) * sizeof(socklen_t));
-      if (NULL != unixpath)
-      {
-        add_unixpath (saddrs, saddrlens, unixpath, abstract);
-        i++;
-      }
-      saddrlens[i] = sizeof(struct sockaddr_in);
-      saddrs[i] = GNUNET_malloc (saddrlens[i]);
-#if HAVE_SOCKADDR_IN_SIN_LEN
-      ((struct sockaddr_in *) saddrs[i])->sin_len = saddrlens[i];
-#endif
-      ((struct sockaddr_in *) saddrs[i])->sin_family = AF_INET;
-      ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port);
-    }
-    else
-    {
-      /* dual stack */
-      resi = 2;
-      if (NULL != unixpath)
-        resi++;
-      saddrs = GNUNET_malloc ((resi + 1) * sizeof(struct sockaddr *));
-      saddrlens = GNUNET_malloc ((resi + 1) * sizeof(socklen_t));
-      i = 0;
-      if (NULL != unixpath)
-      {
-        add_unixpath (saddrs, saddrlens, unixpath, abstract);
-        i++;
-      }
-      saddrlens[i] = sizeof(struct sockaddr_in6);
-      saddrs[i] = GNUNET_malloc (saddrlens[i]);
-#if HAVE_SOCKADDR_IN_SIN_LEN
-      ((struct sockaddr_in6 *) saddrs[i])->sin6_len = saddrlens[0];
-#endif
-      ((struct sockaddr_in6 *) saddrs[i])->sin6_family = AF_INET6;
-      ((struct sockaddr_in6 *) saddrs[i])->sin6_port = htons (port);
-      i++;
-      saddrlens[i] = sizeof(struct sockaddr_in);
-      saddrs[i] = GNUNET_malloc (saddrlens[i]);
-#if HAVE_SOCKADDR_IN_SIN_LEN
-      ((struct sockaddr_in *) saddrs[i])->sin_len = saddrlens[1];
-#endif
-      ((struct sockaddr_in *) saddrs[i])->sin_family = AF_INET;
-      ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port);
-    }
-  }
-  GNUNET_free (unixpath);
-  *addrs = saddrs;
-  *addr_lens = saddrlens;
-  return resi;
-}
-
-
-/**
- * Setup addr, addrlen, idle_timeout
- * based on configuration!
- *
- * Configuration may specify:
- * - PORT (where to bind to for TCP)
- * - UNIXPATH (where to bind to for UNIX domain sockets)
- * - TIMEOUT (after how many ms does an inactive service timeout);
- * - DISABLEV6 (disable support for IPv6, otherwise we use dual-stack)
- * - BINDTO (hostname or IP address to bind to, otherwise we take everything)
- * - ACCEPT_FROM  (only allow connections from specified IPv4 subnets)
- * - ACCEPT_FROM6 (only allow connections from specified IPv6 subnets)
- * - REJECT_FROM  (disallow allow connections from specified IPv4 subnets)
- * - REJECT_FROM6 (disallow allow connections from specified IPv6 subnets)
- *
- * @param sctx service context to initialize
- * @return #GNUNET_OK if configuration succeeded
- */
-static int
-setup_service (struct LEGACY_SERVICE_Context *sctx)
-{
-  struct GNUNET_TIME_Relative idleout;
-  int tolerant;
-  const char *nfds;
-  unsigned int cnt;
-  int flags;
-
-  if (GNUNET_CONFIGURATION_have_value (sctx->cfg,
-                                       sctx->service_name,
-                                       "TIMEOUT"))
-  {
-    if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_time (sctx->cfg,
-                                                          sctx->service_name,
-                                                          "TIMEOUT",
-                                                          &idleout))
-    {
-      LOG (GNUNET_ERROR_TYPE_ERROR,
-           _ ("Specified value for `%s' of service `%s' is invalid\n"),
-           "TIMEOUT",
-           sctx->service_name);
-      return GNUNET_SYSERR;
-    }
-    sctx->timeout = idleout;
-  }
-  else
-    sctx->timeout = GNUNET_TIME_UNIT_FOREVER_REL;
-
-  if (GNUNET_CONFIGURATION_have_value (sctx->cfg,
-                                       sctx->service_name,
-                                       "TOLERANT"))
-  {
-    if (GNUNET_SYSERR ==
-        (tolerant = GNUNET_CONFIGURATION_get_value_yesno (sctx->cfg,
-                                                          sctx->service_name,
-                                                          "TOLERANT")))
-    {
-      LOG (GNUNET_ERROR_TYPE_ERROR,
-           _ ("Specified value for `%s' of service `%s' is invalid\n"),
-           "TOLERANT",
-           sctx->service_name);
-      return GNUNET_SYSERR;
-    }
-  }
-  else
-    tolerant = GNUNET_NO;
-
-  errno = 0;
-  if ((NULL != (nfds = getenv ("LISTEN_FDS"))) &&
-      (1 == sscanf (nfds, "%u", &cnt)) && (cnt > 0) && (cnt < FD_SETSIZE) &&
-      (cnt + 4 < FD_SETSIZE))
-  {
-    sctx->lsocks =
-      GNUNET_malloc (sizeof(struct GNUNET_NETWORK_Handle *) * (cnt + 1));
-    while (0 < cnt--)
-    {
-      flags = fcntl (3 + cnt, F_GETFD);
-      if ((flags < 0) || (0 != (flags & FD_CLOEXEC)) ||
-          (NULL ==
-           (sctx->lsocks[cnt] = GNUNET_NETWORK_socket_box_native (3 + cnt))))
-      {
-        LOG (GNUNET_ERROR_TYPE_ERROR,
-             _ (
-               "Could not access pre-bound socket %u, will try to bind myself\n"),
-             (unsigned int) 3 + cnt);
-        cnt++;
-        while (sctx->lsocks[cnt] != NULL)
-          GNUNET_break (0 == GNUNET_NETWORK_socket_close (sctx->lsocks[cnt++]));
-        GNUNET_free (sctx->lsocks);
-        sctx->lsocks = NULL;
-        break;
-      }
-    }
-    unsetenv ("LISTEN_FDS");
-  }
-
-  if ((NULL == sctx->lsocks) &&
-      (GNUNET_SYSERR == LEGACY_SERVICE_get_server_addresses (sctx->service_name,
-                                                             sctx->cfg,
-                                                             &sctx->addrs,
-                                                             &sctx->addrlens)))
-    return GNUNET_SYSERR;
-  sctx->require_found = tolerant ? GNUNET_NO : GNUNET_YES;
-  sctx->match_uid = GNUNET_CONFIGURATION_get_value_yesno (sctx->cfg,
-                                                          sctx->service_name,
-                                                          "UNIX_MATCH_UID");
-  sctx->match_gid = GNUNET_CONFIGURATION_get_value_yesno (sctx->cfg,
-                                                          sctx->service_name,
-                                                          "UNIX_MATCH_GID");
-  process_acl4 (&sctx->v4_denied, sctx, "REJECT_FROM");
-  process_acl4 (&sctx->v4_allowed, sctx, "ACCEPT_FROM");
-  process_acl6 (&sctx->v6_denied, sctx, "REJECT_FROM6");
-  process_acl6 (&sctx->v6_allowed, sctx, "ACCEPT_FROM6");
-
-  return GNUNET_OK;
-}
-
-
-/**
- * Get the name of the user that'll be used
- * to provide the service.
- *
- * @param sctx service context
- * @return value of the 'USERNAME' option
- */
-static char *
-get_user_name (struct LEGACY_SERVICE_Context *sctx)
-{
-  char *un;
-
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (sctx->cfg,
-                                                            sctx->service_name,
-                                                            "USERNAME",
-                                                            &un))
-    return NULL;
-  return un;
-}
-
-
-/**
- * Write PID file.
- *
- * @param sctx service context
- * @param pid PID to write (should be equal to 'getpid()'
- * @return  #GNUNET_OK on success (including no work to be done)
- */
-static int
-write_pid_file (struct LEGACY_SERVICE_Context *sctx, pid_t pid)
-{
-  FILE *pidfd;
-  char *pif;
-  char *user;
-  char *rdir;
-  int len;
-
-  if (NULL == (pif = get_pid_file_name (sctx)))
-    return GNUNET_OK; /* no file desired */
-  user = get_user_name (sctx);
-  rdir = GNUNET_strdup (pif);
-  len = strlen (rdir);
-  while ((len > 0) && (rdir[len] != DIR_SEPARATOR))
-    len--;
-  rdir[len] = '\0';
-  if (0 != access (rdir, F_OK))
-  {
-    /* we get to create a directory -- and claim it
-     * as ours! */
-    (void) GNUNET_DISK_directory_create (rdir);
-    if ((NULL != user) && (0 < strlen (user)))
-      GNUNET_DISK_file_change_owner (rdir, user);
-  }
-  if (0 != access (rdir, W_OK | X_OK))
-  {
-    LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_ERROR, "access", rdir);
-    GNUNET_free (rdir);
-    GNUNET_free (user);
-    GNUNET_free (pif);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_free (rdir);
-  pidfd = fopen (pif, "w");
-  if (NULL == pidfd)
-  {
-    LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_ERROR, "fopen", pif);
-    GNUNET_free (pif);
-    GNUNET_free (user);
-    return GNUNET_SYSERR;
-  }
-  if (0 > fprintf (pidfd, "%u", pid))
-    LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "fprintf", pif);
-  GNUNET_break (0 == fclose (pidfd));
-  if ((NULL != user) && (0 < strlen (user)))
-    GNUNET_DISK_file_change_owner (pif, user);
-  GNUNET_free (user);
-  GNUNET_free (pif);
-  return GNUNET_OK;
-}
-
-
-/**
- * Task run during shutdown.  Stops the server/service.
- *
- * @param cls the `struct LEGACY_SERVICE_Context`
- */
-static void
-shutdown_task (void *cls)
-{
-  struct LEGACY_SERVICE_Context *service = cls;
-  struct GNUNET_SERVER_Handle *server = service->server;
-
-  service->shutdown_task = NULL;
-  if (0 != (service->options & LEGACY_SERVICE_OPTION_SOFT_SHUTDOWN))
-    GNUNET_SERVER_stop_listening (server);
-  else
-    GNUNET_SERVER_destroy (server);
-}
-
-
-/**
- * Initial task for the service.
- *
- * @param cls service context
- */
-static void
-service_task (void *cls)
-{
-  struct LEGACY_SERVICE_Context *sctx = cls;
-  unsigned int i;
-
-  GNUNET_RESOLVER_connect (sctx->cfg);
-  if (NULL != sctx->lsocks)
-    sctx->server = GNUNET_SERVER_create_with_sockets (&check_access,
-                                                      sctx,
-                                                      sctx->lsocks,
-                                                      sctx->timeout,
-                                                      sctx->require_found);
-  else
-    sctx->server = GNUNET_SERVER_create (&check_access,
-                                         sctx,
-                                         sctx->addrs,
-                                         sctx->addrlens,
-                                         sctx->timeout,
-                                         sctx->require_found);
-  if (NULL == sctx->server)
-  {
-    if (NULL != sctx->addrs)
-      for (i = 0; NULL != sctx->addrs[i]; i++)
-        LOG (GNUNET_ERROR_TYPE_INFO,
-             _ ("Failed to start `%s' at `%s'\n"),
-             sctx->service_name,
-             GNUNET_a2s (sctx->addrs[i], sctx->addrlens[i]));
-    sctx->ret = GNUNET_SYSERR;
-    return;
-  }
-
-  if (NULL != sctx->addrs)
-    for (i = 0; NULL != sctx->addrs[i]; i++)
-      if ((AF_UNIX == sctx->addrs[i]->sa_family) &&
-          ('\0' != ((const struct sockaddr_un *) sctx->addrs[i])->sun_path[0]))
-        GNUNET_DISK_fix_permissions (((const struct sockaddr_un *)
-                                      sctx->addrs[i])
-                                     ->sun_path,
-                                     sctx->match_uid,
-                                     sctx->match_gid);
-
-  if (0 == (sctx->options & LEGACY_SERVICE_OPTION_MANUAL_SHUTDOWN))
-  {
-    /* install a task that will kill the server
-     * process if the scheduler ever gets a shutdown signal */
-    sctx->shutdown_task = GNUNET_SCHEDULER_add_shutdown (&shutdown_task, sctx);
-  }
-  sctx->my_handlers = GNUNET_malloc (sizeof(defhandlers));
-  GNUNET_memcpy (sctx->my_handlers, defhandlers, sizeof(defhandlers));
-  i = 0;
-  while (NULL != sctx->my_handlers[i].callback)
-    sctx->my_handlers[i++].callback_cls = sctx;
-  GNUNET_SERVER_add_handlers (sctx->server, sctx->my_handlers);
-  if (-1 != sctx->ready_confirm_fd)
-  {
-    GNUNET_break (1 == write (sctx->ready_confirm_fd, ".", 1));
-    GNUNET_break (0 == close (sctx->ready_confirm_fd));
-    sctx->ready_confirm_fd = -1;
-    write_pid_file (sctx, getpid ());
-  }
-  if (NULL != sctx->addrs)
-  {
-    i = 0;
-    while (NULL != sctx->addrs[i])
-    {
-      LOG (GNUNET_ERROR_TYPE_INFO,
-           _ ("Service `%s' runs at %s\n"),
-           sctx->service_name,
-           GNUNET_a2s (sctx->addrs[i], sctx->addrlens[i]));
-      i++;
-    }
-  }
-  sctx->task (sctx->task_cls, sctx->server, sctx->cfg);
-}
-
-
-/**
- * Detach from terminal.
- *
- * @param sctx service context
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
- */
-static int
-detach_terminal (struct LEGACY_SERVICE_Context *sctx)
-{
-  pid_t pid;
-  int nullfd;
-  int filedes[2];
-
-  if (0 != pipe (filedes))
-  {
-    LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "pipe");
-    return GNUNET_SYSERR;
-  }
-  pid = fork ();
-  if (pid < 0)
-  {
-    LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "fork");
-    return GNUNET_SYSERR;
-  }
-  if (0 != pid)
-  {
-    /* Parent */
-    char c;
-
-    GNUNET_break (0 == close (filedes[1]));
-    c = 'X';
-    if (1 != read (filedes[0], &c, sizeof(char)))
-      LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "read");
-    fflush (stdout);
-    switch (c)
-    {
-    case '.':
-      exit (0);
-
-    case 'I':
-      LOG (GNUNET_ERROR_TYPE_INFO,
-           _ ("Service process failed to initialize\n"));
-      break;
-
-    case 'S':
-      LOG (GNUNET_ERROR_TYPE_INFO,
-           _ ("Service process could not initialize server function\n"));
-      break;
-
-    case 'X':
-      LOG (GNUNET_ERROR_TYPE_INFO,
-           _ ("Service process failed to report status\n"));
-      break;
-    }
-    exit (1);  /* child reported error */
-  }
-  GNUNET_break (0 == close (0));
-  GNUNET_break (0 == close (1));
-  GNUNET_break (0 == close (filedes[0]));
-  nullfd = open ("/dev/null", O_RDWR | O_APPEND);
-  if (nullfd < 0)
-    return GNUNET_SYSERR;
-  /* set stdin/stdout to /dev/null */
-  if ((dup2 (nullfd, 0) < 0) || (dup2 (nullfd, 1) < 0))
-  {
-    LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "dup2");
-    (void) close (nullfd);
-    return GNUNET_SYSERR;
-  }
-  (void) close (nullfd);
-  /* Detach from controlling terminal */
-  pid = setsid ();
-  if (-1 == pid)
-    LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "setsid");
-  sctx->ready_confirm_fd = filedes[1];
-
-  return GNUNET_OK;
-}
-
-
-/**
- * Set user ID.
- *
- * @param sctx service context
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
- */
-static int
-set_user_id (struct LEGACY_SERVICE_Context *sctx)
-{
-  char *user;
-
-  if (NULL == (user = get_user_name (sctx)))
-    return GNUNET_OK; /* keep */
-
-  struct passwd *pws;
-
-  errno = 0;
-  pws = getpwnam (user);
-  if (NULL == pws)
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         _ ("Cannot obtain information about user `%s': %s\n"),
-         user,
-         errno == 0 ? _ ("No such user") : strerror (errno));
-    GNUNET_free (user);
-    return GNUNET_SYSERR;
-  }
-  if ((0 != setgid (pws->pw_gid)) || (0 != setegid (pws->pw_gid)) ||
-#if HAVE_INITGROUPS
-      (0 != initgroups (user, pws->pw_gid)) ||
-#endif
-      (0 != setuid (pws->pw_uid)) || (0 != seteuid (pws->pw_uid)))
-  {
-    if ((0 != setregid (pws->pw_gid, pws->pw_gid)) ||
-        (0 != setreuid (pws->pw_uid, pws->pw_uid)))
-    {
-      LOG (GNUNET_ERROR_TYPE_ERROR,
-           _ ("Cannot change user/group to `%s': %s\n"),
-           user,
-           strerror (errno));
-      GNUNET_free (user);
-      return GNUNET_SYSERR;
-    }
-  }
-
-  GNUNET_free (user);
-  return GNUNET_OK;
-}
-
-
-/**
- * Delete the PID file that was created by our parent.
- *
- * @param sctx service context
- */
-static void
-pid_file_delete (struct LEGACY_SERVICE_Context *sctx)
-{
-  char *pif = get_pid_file_name (sctx);
-
-  if (NULL == pif)
-    return; /* no PID file */
-  if (0 != unlink (pif))
-    LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "unlink", pif);
-  GNUNET_free (pif);
-}
-
-
-/**
- * Run a standard GNUnet service startup sequence (initialize loggers
- * and configuration, parse options).
- *
- * @param argc number of command line arguments
- * @param argv command line arguments
- * @param service_name our service name
- * @param options service options
- * @param task main task of the service
- * @param task_cls closure for @a task
- * @return #GNUNET_SYSERR on error, #GNUNET_OK
- *         if we shutdown nicely
- */
-int
-LEGACY_SERVICE_run (int argc,
-                    char *const *argv,
-                    const char *service_name,
-                    enum LEGACY_SERVICE_Options options,
-                    LEGACY_SERVICE_Main task,
-                    void *task_cls)
-{
-#define HANDLE_ERROR  \
-  do                  \
-  {                   \
-    GNUNET_break (0); \
-    goto shutdown;    \
-  } while (0)
-
-  int err;
-  int ret;
-  char *cfg_fn;
-  char *opt_cfg_fn;
-  char *loglev;
-  char *logfile;
-  int do_daemonize;
-  unsigned int i;
-  unsigned long long skew_offset;
-  unsigned long long skew_variance;
-  long long clock_offset;
-  struct LEGACY_SERVICE_Context sctx;
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-  const char *xdg;
-
-  struct GNUNET_GETOPT_CommandLineOption service_options[] =
-  { GNUNET_GETOPT_option_cfgfile (&opt_cfg_fn),
-    GNUNET_GETOPT_option_flag ('d',
-                               "daemonize",
-                               gettext_noop (
-                                 "do daemonize (detach from terminal)"),
-                               &do_daemonize),
-    GNUNET_GETOPT_option_help (NULL),
-    GNUNET_GETOPT_option_loglevel (&loglev),
-    GNUNET_GETOPT_option_logfile (&logfile),
-    GNUNET_GETOPT_option_version (PACKAGE_VERSION " " VCS_VERSION),
-    GNUNET_GETOPT_OPTION_END };
-  err = 1;
-  do_daemonize = 0;
-  logfile = NULL;
-  loglev = NULL;
-  opt_cfg_fn = NULL;
-  xdg = getenv ("XDG_CONFIG_HOME");
-  if (NULL != xdg)
-    GNUNET_asprintf (&cfg_fn,
-                     "%s%s%s",
-                     xdg,
-                     DIR_SEPARATOR_STR,
-                     GNUNET_OS_project_data_get ()->config_file);
-  else
-    cfg_fn = GNUNET_strdup (GNUNET_OS_project_data_get ()->user_config_file);
-  memset (&sctx, 0, sizeof(sctx));
-  sctx.options = options;
-  sctx.ready_confirm_fd = -1;
-  sctx.ret = GNUNET_OK;
-  sctx.timeout = GNUNET_TIME_UNIT_FOREVER_REL;
-  sctx.task = task;
-  sctx.task_cls = task_cls;
-  sctx.service_name = service_name;
-  sctx.cfg = cfg = GNUNET_CONFIGURATION_create ();
-
-  /* setup subsystems */
-  ret = GNUNET_GETOPT_run (service_name, service_options, argc, argv);
-  if (GNUNET_SYSERR == ret)
-    goto shutdown;
-  if (GNUNET_NO == ret)
-  {
-    err = 0;
-    goto shutdown;
-  }
-  if (GNUNET_OK != GNUNET_log_setup (service_name, loglev, logfile))
-    HANDLE_ERROR;
-  if (NULL == opt_cfg_fn)
-    opt_cfg_fn = GNUNET_strdup (cfg_fn);
-  if (GNUNET_YES == GNUNET_DISK_file_test (opt_cfg_fn))
-  {
-    if (GNUNET_SYSERR == GNUNET_CONFIGURATION_load (cfg, opt_cfg_fn))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _ ("Malformed configuration file `%s', exit ...\n"),
-                  opt_cfg_fn);
-      goto shutdown;
-    }
-  }
-  else
-  {
-    if (GNUNET_SYSERR == GNUNET_CONFIGURATION_load (cfg, NULL))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _ ("Malformed configuration, exit ...\n"));
-      goto shutdown;
-    }
-    if (0 != strcmp (opt_cfg_fn, cfg_fn))
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _ ("Could not access configuration file `%s'\n"),
-                  opt_cfg_fn);
-  }
-  if (GNUNET_OK != setup_service (&sctx))
-    goto shutdown;
-  if ((1 == do_daemonize) && (GNUNET_OK != detach_terminal (&sctx)))
-    HANDLE_ERROR;
-  if (GNUNET_OK != set_user_id (&sctx))
-    goto shutdown;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Service `%s' runs with configuration from `%s'\n",
-       service_name,
-       opt_cfg_fn);
-  if ((GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (sctx.cfg,
-                                                           "TESTING",
-                                                           "SKEW_OFFSET",
-                                                           &skew_offset)) &&
-      (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (sctx.cfg,
-                                                           "TESTING",
-                                                           "SKEW_VARIANCE",
-                                                           &skew_variance)))
-  {
-    clock_offset = skew_offset - skew_variance;
-    GNUNET_TIME_set_offset (clock_offset);
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "Skewing clock by %lld ms\n", clock_offset);
-  }
-  /* actually run service */
-  err = 0;
-  GNUNET_SCHEDULER_run (&service_task, &sctx);
-  /* shutdown */
-  if ((1 == do_daemonize) && (NULL != sctx.server))
-    pid_file_delete (&sctx);
-  GNUNET_free (sctx.my_handlers);
-
-shutdown:
-  if (-1 != sctx.ready_confirm_fd)
-  {
-    if (1 != write (sctx.ready_confirm_fd, err ? "I" : "S", 1))
-      LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "write");
-    GNUNET_break (0 == close (sctx.ready_confirm_fd));
-  }
-#if HAVE_MALLINFO2
-  {
-    char *counter;
-
-    if ((GNUNET_YES == GNUNET_CONFIGURATION_have_value (sctx.cfg,
-                                                        service_name,
-                                                        "GAUGER_HEAP")) &&
-        (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (sctx.cfg,
-                                                             service_name,
-                                                             "GAUGER_HEAP",
-                                                             &counter)))
-    {
-      struct mallinfo2 mi;
-
-      mi = mallinfo2 ();
-      GAUGER (service_name, counter, mi.usmblks, "blocks");
-      GNUNET_free (counter);
-    }
-  }
-#endif
-  GNUNET_CONFIGURATION_destroy (cfg);
-  i = 0;
-  if (NULL != sctx.addrs)
-    while (NULL != sctx.addrs[i])
-      GNUNET_free_nz (sctx.addrs[i++]);
-  GNUNET_free (sctx.addrs);
-  GNUNET_free (sctx.addrlens);
-  GNUNET_free (logfile);
-  GNUNET_free (loglev);
-  GNUNET_free (cfg_fn);
-  GNUNET_free (opt_cfg_fn);
-  GNUNET_free (sctx.v4_denied);
-  GNUNET_free (sctx.v6_denied);
-  GNUNET_free (sctx.v4_allowed);
-  GNUNET_free (sctx.v6_allowed);
-
-  return err ? GNUNET_SYSERR : sctx.ret;
-}
-
-
-/**
- * Run a service startup sequence within an existing
- * initialized system.
- *
- * @param service_name our service name
- * @param cfg configuration to use
- * @param options service options
- * @return NULL on error, service handle
- */
-struct LEGACY_SERVICE_Context *
-LEGACY_SERVICE_start (const char *service_name,
-                      const struct GNUNET_CONFIGURATION_Handle *cfg,
-                      enum LEGACY_SERVICE_Options options)
-{
-  int i;
-  struct LEGACY_SERVICE_Context *sctx;
-
-  sctx = GNUNET_new (struct LEGACY_SERVICE_Context);
-  sctx->ready_confirm_fd = -1; /* no daemonizing */
-  sctx->ret = GNUNET_OK;
-  sctx->timeout = GNUNET_TIME_UNIT_FOREVER_REL;
-  sctx->service_name = service_name;
-  sctx->cfg = cfg;
-  sctx->options = options;
-
-  /* setup subsystems */
-  if (GNUNET_OK != setup_service (sctx))
-  {
-    LEGACY_SERVICE_stop (sctx);
-    return NULL;
-  }
-  if (NULL != sctx->lsocks)
-    sctx->server = GNUNET_SERVER_create_with_sockets (&check_access,
-                                                      sctx,
-                                                      sctx->lsocks,
-                                                      sctx->timeout,
-                                                      sctx->require_found);
-  else
-    sctx->server = GNUNET_SERVER_create (&check_access,
-                                         sctx,
-                                         sctx->addrs,
-                                         sctx->addrlens,
-                                         sctx->timeout,
-                                         sctx->require_found);
-
-  if (NULL == sctx->server)
-  {
-    LEGACY_SERVICE_stop (sctx);
-    return NULL;
-  }
-
-  if (NULL != sctx->addrs)
-    for (i = 0; NULL != sctx->addrs[i]; i++)
-      if ((AF_UNIX == sctx->addrs[i]->sa_family) &&
-          ('\0' != ((const struct sockaddr_un *) sctx->addrs[i])->sun_path[0]))
-        GNUNET_DISK_fix_permissions (((const struct sockaddr_un *)
-                                      sctx->addrs[i])
-                                     ->sun_path,
-                                     sctx->match_uid,
-                                     sctx->match_gid);
-
-  sctx->my_handlers = GNUNET_malloc (sizeof(defhandlers));
-  GNUNET_memcpy (sctx->my_handlers, defhandlers, sizeof(defhandlers));
-  i = 0;
-  while ((sctx->my_handlers[i].callback != NULL))
-    sctx->my_handlers[i++].callback_cls = sctx;
-  GNUNET_SERVER_add_handlers (sctx->server, sctx->my_handlers);
-  return sctx;
-}
-
-
-/**
- * Obtain the server used by a service.  Note that the server must NOT
- * be destroyed by the caller.
- *
- * @param ctx the service context returned from the start function
- * @return handle to the server for this service, NULL if there is none
- */
-struct GNUNET_SERVER_Handle *
-LEGACY_SERVICE_get_server (struct LEGACY_SERVICE_Context *ctx)
-{
-  return ctx->server;
-}
-
-
-/**
- * Get the NULL-terminated array of listen sockets for this service.
- *
- * @param ctx service context to query
- * @return NULL if there are no listen sockets, otherwise NULL-terminated
- *              array of listen sockets.
- */
-struct GNUNET_NETWORK_Handle *const *
-LEGACY_SERVICE_get_listen_sockets (struct LEGACY_SERVICE_Context *ctx)
-{
-  return ctx->lsocks;
-}
-
-
-/**
- * Stop a service that was started with "LEGACY_SERVICE_start".
- *
- * @param sctx the service context returned from the start function
- */
-void
-LEGACY_SERVICE_stop (struct LEGACY_SERVICE_Context *sctx)
-{
-  unsigned int i;
-
-#if HAVE_MALLINFO2
-  {
-    char *counter;
-
-    if ((GNUNET_YES == GNUNET_CONFIGURATION_have_value (sctx->cfg,
-                                                        sctx->service_name,
-                                                        "GAUGER_HEAP")) &&
-        (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (sctx->cfg,
-                                                             sctx->service_name,
-                                                             "GAUGER_HEAP",
-                                                             &counter)))
-    {
-      struct mallinfo2 mi;
-
-      mi = mallinfo2 ();
-      GAUGER (sctx->service_name, counter, mi.usmblks, "blocks");
-      GNUNET_free (counter);
-    }
-  }
-#endif
-  if (NULL != sctx->shutdown_task)
-  {
-    GNUNET_SCHEDULER_cancel (sctx->shutdown_task);
-    sctx->shutdown_task = NULL;
-  }
-  if (NULL != sctx->server)
-    GNUNET_SERVER_destroy (sctx->server);
-  GNUNET_free (sctx->my_handlers);
-  if (NULL != sctx->addrs)
-  {
-    i = 0;
-    while (NULL != sctx->addrs[i])
-      GNUNET_free_nz (sctx->addrs[i++]);
-    GNUNET_free (sctx->addrs);
-  }
-  GNUNET_free (sctx->addrlens);
-  GNUNET_free (sctx->v4_denied);
-  GNUNET_free (sctx->v6_denied);
-  GNUNET_free (sctx->v4_allowed);
-  GNUNET_free (sctx->v6_allowed);
-  GNUNET_free (sctx);
-}
-
-
-/* end of service.c */
diff --git a/src/transport/template_cfg_peer1.conf b/src/transport/template_cfg_peer1.conf
deleted file mode 100644
index 5ba198450..000000000
--- a/src/transport/template_cfg_peer1.conf
+++ /dev/null
@@ -1,50 +0,0 @@
-@INLINE@ test_transport_defaults.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
-GNUNET_RUNTIME_DIR = $GNUNET_TEST_HOME/runtime/
-GNUNET_USER_RUNTIME_DIR = $GNUNET_TEST_HOME/runtime/
-
-[nat]
-RETURN_LOCAL_ADDRESSES = YES
-DISABLEV6 = NO
-
-[transport-tcp]
-PORT = 12000
-TIMEOUT = 5 s
-
-[transport-udp]
-BROADCAST = NO
-
-[transport-unix]
-PORT = 12007
-
-[arm]
-PORT = 12005
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12004
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12003
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12002
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-USE_INCLUDED_HELLOS = NO
-
-[transport]
-#PREFIX = valgrind --leak-check=full
-PORT = 12001
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-
-[ats]
-WAN_QUOTA_IN = unlimited
-WAN_QUOTA_OUT = unlimited
-PORT = 12006
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-ats.sock
-
-[hostlist]
-SERVERS = dummy
diff --git a/src/transport/template_cfg_peer2.conf b/src/transport/template_cfg_peer2.conf
deleted file mode 100644
index 6ac610fec..000000000
--- a/src/transport/template_cfg_peer2.conf
+++ /dev/null
@@ -1,58 +0,0 @@
-@INLINE@ test_transport_defaults.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
-GNUNET_RUNTIME_DIR = $GNUNET_TEST_HOME/runtime/
-GNUNET_USER_RUNTIME_DIR = $GNUNET_TEST_HOME/runtime/
-
-[nat]
-RETURN_LOCAL_ADDRESSES = YES
-DISABLEV6 = NO
-
-[transport-tcp]
-PORT = 12100
-TIMEOUT = 5 s
-
-[transport-udp]
-BROADCAST = NO
-
-[transport-unix]
-PORT = 12017
-
-[transport-http_server]
-PORT = 12018
-USE_IPv6 = YES
-
-[transport-https_server]
-PORT = 12019
-KEY_FILE = $GNUNET_TEST_HOME/https_key_p1.key
-CERT_FILE = $GNUNET_TEST_HOME/https_cert_p1.crt
-USE_IPv6 = YES
-
-[arm]
-PORT = 12014
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12013
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12012
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12011
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-USE_INCLUDED_HELLOS = NO
-
-[transport]
-#PREFIX = valgrind --leak-check=full
-PORT = 12010
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
-[ats]
-PORT = 12016
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-ats.sock
-
-[hostlist]
-SERVERS = dummy
diff --git a/src/transport/test_communicator_basic.c b/src/transport/test_communicator_basic.c
deleted file mode 100644
index f43cdaaf3..000000000
--- a/src/transport/test_communicator_basic.c
+++ /dev/null
@@ -1,1203 +0,0 @@
-/*
-    This file is part of GNUnet.
-    Copyright (C) 2019 GNUnet e.V.
-
-    GNUnet is free software: you can redistribute it and/or modify it
-    under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License,
-    or (at your option) any later version.
-
-    GNUnet is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-    SPDX-License-Identifier: AGPL3.0-or-later
-*/
-
-/**
-* @file transport/test_communicator_basic.c
-* @brief test the communicators
-* @author Julius Bünger
-* @author Martin Schanzenbach
-*/
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "transport-testing-communicator.h"
-#include "gnunet_ats_transport_service.h"
-#include "gnunet_signatures.h"
-#include "gnunet_testing_lib.h"
-#include "transport.h"
-#include "gnunet_statistics_service.h"
-
-#include <inttypes.h>
-
-
-#define LOG(kind, ...) GNUNET_log_from (kind, \
-                                        "test_transport_communicator", \
-                                        __VA_ARGS__)
-
-#define NUM_PEERS 2
-
-static struct GNUNET_SCHEDULER_Task *to_task[NUM_PEERS];
-
-static int queue_est = GNUNET_NO;
-
-static struct GNUNET_PeerIdentity peer_id[NUM_PEERS];
-
-static char *communicator_binary;
-
-static struct
-GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_hs[NUM_PEERS];
-
-static struct GNUNET_CONFIGURATION_Handle *cfg_peers[NUM_PEERS];
-
-static struct GNUNET_STATISTICS_Handle *stats[NUM_PEERS];
-
-static char *cfg_peers_name[NUM_PEERS];
-
-static int finished[NUM_PEERS];
-
-static int ret;
-
-static int bidirect = GNUNET_NO;
-
-static size_t long_message_size;
-
-static struct GNUNET_TIME_Absolute start_short[NUM_PEERS];
-
-static struct GNUNET_TIME_Absolute start_long[NUM_PEERS];
-
-static struct GNUNET_TIME_Absolute timeout[NUM_PEERS];
-
-// static struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *my_tc;
-
-static char *communicator_name;
-
-static char *test_name;
-
-static struct GNUNET_STATISTICS_GetHandle *box_stats[NUM_PEERS];
-
-static struct GNUNET_STATISTICS_GetHandle *rekey_stats[NUM_PEERS];
-
-#define TEST_SECTION "test-setup"
-
-#define SHORT_MESSAGE_SIZE 128
-
-#define LONG_MESSAGE_SIZE 32000 /* FIXME */
-
-#define ALLOWED_PACKET_LOSS 91
-
-#define BURST_PACKETS 5000
-
-#define TOTAL_ITERATIONS 1
-
-#define PEER_A 0
-
-#define PEER_B 1
-
-static unsigned int iterations_left[NUM_PEERS];
-
-#define TIMEOUT_MULTIPLIER 1
-
-#define DELAY \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MICROSECONDS,200)
-
-#define SHORT_BURST_WINDOW \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,2)
-
-#define LONG_BURST_WINDOW \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,2)
-
-enum TestPhase
-{
-  TP_INIT,
-  TP_BURST_SHORT,
-  TP_BURST_LONG,
-  TP_SIZE_CHECK
-};
-
-static unsigned int phase_short[NUM_PEERS];
-
-static unsigned int phase_long[NUM_PEERS];
-
-static unsigned int phase_size[NUM_PEERS];
-
-static long long unsigned int allowed_packet_loss_short;
-
-static long long unsigned int allowed_packet_loss_long;
-
-static long long unsigned int burst_packets_short;
-
-static long long unsigned int burst_packets_long;
-
-static long long unsigned int delay_long_value;
-
-static long long unsigned int delay_short_value;
-
-static struct GNUNET_TIME_Relative delay_short;
-
-static struct GNUNET_TIME_Relative delay_long;
-
-static size_t num_sent_short[NUM_PEERS];
-
-static size_t num_sent_long[NUM_PEERS];
-
-static size_t num_sent_size[NUM_PEERS];
-
-static uint32_t ack[NUM_PEERS];
-
-static enum TestPhase phase[NUM_PEERS];
-
-static size_t num_received_short[NUM_PEERS];
-
-static size_t num_received_long[NUM_PEERS];
-
-static size_t num_received_size[NUM_PEERS];
-
-static uint64_t avg_latency[NUM_PEERS];
-
-static void
-communicator_available_cb (
-  void *cls,
-  struct
-  GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h,
-  enum GNUNET_TRANSPORT_CommunicatorCharacteristics cc,
-  char *address_prefix)
-{
-  LOG (GNUNET_ERROR_TYPE_INFO,
-       "Communicator available. (cc: %u, prefix: %s)\n",
-       cc,
-       address_prefix);
-}
-
-
-static void
-open_queue (void *cls)
-{
-  const char *address = cls;
-
-  if (NULL != tc_hs[PEER_A]->c_mq)
-  {
-    queue_est = GNUNET_YES;
-    GNUNET_TRANSPORT_TESTING_transport_communicator_open_queue (tc_hs[PEER_A],
-                                                                &peer_id[PEER_B],
-                                                                address);
-  }
-  else
-  {
-    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                  &open_queue,
-                                  (void *) address);
-  }
-}
-
-
-static void
-add_address_cb (
-  void *cls,
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h,
-  const char *address,
-  struct GNUNET_TIME_Relative expiration,
-  uint32_t aid,
-  enum GNUNET_NetworkType nt)
-{
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "New address. (addr: %s, expir: %s, ID: %" PRIu32 ", nt: %u\n",
-       address,
-       GNUNET_STRINGS_relative_time_to_string (expiration,
-                                               GNUNET_NO),
-       aid,
-       (int) nt);
-  // addresses[1] = GNUNET_strdup (address);
-  if ((0 == strcmp ((char*) cls, cfg_peers_name[PEER_B])) &&
-      (GNUNET_NO == queue_est))
-  {
-    open_queue ((void *) address);
-  }
-}
-
-
-/**
- * @brief Callback that informs whether the requested queue will be
- * established
- *
- * Implements #GNUNET_TRANSPORT_TESTING_QueueCreateReplyCallback.
- *
- * @param cls Closure - unused
- * @param tc_h Communicator handle - unused
- * @param will_try #GNUNET_YES if queue will be established
- *                #GNUNET_NO if queue will not be established (bogous address)
- */
-static void
-queue_create_reply_cb (
-  void *cls,
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h,
-  int will_try)
-{
-  (void) cls;
-  (void) tc_h;
-  if (GNUNET_YES == will_try)
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Queue will be established!\n");
-  else
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         "Queue won't be established (bougus address?)!\n");
-}
-
-
-static struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *
-handle_backchannel_cb (void *cls,
-                       struct GNUNET_MessageHeader *msg,
-                       struct GNUNET_PeerIdentity *pid)
-{
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h = cls;
-
-  (void) tc_h;
-  (void) msg;
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Handling BC message...\n");
-  if (0 == memcmp (&peer_id[PEER_A], pid, sizeof (*pid)))
-    return tc_hs[PEER_A];
-  else
-    return tc_hs[PEER_B];
-}
-
-
-static char*
-make_payload (size_t payload_size)
-{
-  struct GNUNET_TIME_Absolute ts;
-  struct GNUNET_TIME_AbsoluteNBO ts_n;
-  char *payload = GNUNET_malloc (payload_size);
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Making payload of size %lu\n", payload_size);
-  GNUNET_assert (payload_size >= 8); // So that out timestamp fits
-  ts = GNUNET_TIME_absolute_get ();
-  ts_n = GNUNET_TIME_absolute_hton (ts);
-  memset (payload, 'a', payload_size);
-  memcpy (payload, &ts_n, sizeof (struct GNUNET_TIME_AbsoluteNBO));
-  return payload;
-}
-
-static struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *
-get_tc_h (unsigned int peer_nr)
-{
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Got peer %u\n",
-       peer_nr);
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Handle %p peer 0\n",
-       tc_hs[0]);
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Handle %p peer 1\n",
-       tc_hs[1]);
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Handle %p get\n",
-       tc_hs[peer_nr]);
-
-  return tc_hs[peer_nr];
-}
-
-
-static unsigned int
-get_peer_nr_from_tc (struct
-                     GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h)
-{
-  if (tc_h == get_tc_h (0))
-    return PEER_A;
-  else
-    return PEER_B;
-}
-
-static unsigned int
-get_peer_nr (void *cls, unsigned int get_the_other_one)
-{
-  if (0 == strcmp ((char*) cls, cfg_peers_name[0]))
-    return get_the_other_one ? PEER_B : PEER_A;
-  else
-    return get_the_other_one ? PEER_A : PEER_B;
-}
-
-static void
-process_statistics_box_done (void *cls, int success)
-{
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h = cls;
-  unsigned int peer_nr;
-
-  peer_nr = get_peer_nr_from_tc (tc_h);
-
-  if (NULL != box_stats[peer_nr])
-    box_stats[peer_nr] = NULL;
-  if (NULL == rekey_stats[peer_nr])
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Finished\n");
-    GNUNET_SCHEDULER_shutdown ();
-  }
-}
-
-
-static void
-process_statistics_rekey_done (void *cls, int success)
-{
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h = cls;
-  unsigned int peer_nr;
-
-  peer_nr = get_peer_nr_from_tc (tc_h);
-
-  if (NULL != rekey_stats[peer_nr])
-    rekey_stats[peer_nr] = NULL;
-  if (NULL == box_stats[peer_nr])
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Finished\n");
-    GNUNET_SCHEDULER_shutdown ();
-  }
-}
-
-static int
-process_statistics (void *cls,
-                    const char *subsystem,
-                    const char *name,
-                    uint64_t value,
-                    int is_persistent)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Statistic: Name %s and value %lu\n",
-              name,
-              value);
-  if ((0 == strcmp ("rekey", test_name)) && (0 == strcmp (
-                                               "# rekeying successful",
-                                               name)) && (0 == value))
-  {
-    ret = 2;
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "No successful rekeying!\n");
-    GNUNET_SCHEDULER_shutdown ();
-  }
-  if ((0 == strcmp ("backchannel", test_name)) &&
-      (0 == strcmp (
-         "# messages decrypted with BOX",
-         name))
-      && (9000 > value))
-  {
-    ret = 2;
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Not enough BOX messages!\n");
-    GNUNET_SCHEDULER_shutdown ();
-  }
-  if ((0 == strcmp ("rekey", test_name)) &&
-      (0 == strcmp (
-         "# messages decrypted with BOX",
-         name))
-      && (6000 > value))
-  {
-    ret = 2;
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Not enough BOX messages!\n");
-    GNUNET_SCHEDULER_shutdown ();
-  }
-  return GNUNET_OK;
-}
-
-static void
-short_test (void *cls);
-
-static void
-short_test_cb (void *cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h = cls;
-  unsigned int peer_nr;
-  char *payload;
-
-  peer_nr = get_peer_nr_from_tc (tc_h);
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "short_test_cb %u/%u for peer %u and handle %p\n",
-       (unsigned int) num_sent_short[peer_nr],
-       (unsigned int) num_received_short[peer_nr],
-       peer_nr,
-       tc_h);
-  payload = make_payload (SHORT_MESSAGE_SIZE);
-  num_sent_short[peer_nr]++;
-  GNUNET_TRANSPORT_TESTING_transport_communicator_send (tc_h,
-                                                        (burst_packets_short ==
-                                                         num_sent_short[peer_nr])
-                                                        ? NULL
-                                                        : &short_test,
-                                                        cls,
-                                                        payload,
-                                                        SHORT_MESSAGE_SIZE);
-  GNUNET_free (payload);
-  timeout[peer_nr] = GNUNET_TIME_relative_to_absolute (
-    GNUNET_TIME_relative_multiply (
-      GNUNET_TIME_UNIT_SECONDS,
-      TIMEOUT_MULTIPLIER));
-}
-
-static void
-short_test (void *cls)
-{
-  GNUNET_SCHEDULER_add_delayed (delay_short,
-                                &short_test_cb,
-                                cls);
-}
-
-static void
-size_test (void *cls)
-{
-  unsigned int peer_nr;
-  char *payload;
-  size_t max_size = 64000;
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h = cls;
-
-  peer_nr = get_peer_nr_from_tc (tc_h);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "size_test_cb %u\n",
-       (unsigned int) num_sent_size[peer_nr]);
-  GNUNET_assert (TP_SIZE_CHECK == phase[peer_nr]);
-  if (LONG_MESSAGE_SIZE != long_message_size)
-    max_size = long_message_size;
-  if (ack[peer_nr] + 10 > max_size)
-    return; /* Leave some room for our protocol, so not 2^16 exactly */
-  ack[peer_nr] += 10;
-  payload = make_payload (ack[peer_nr]);
-  num_sent_size[peer_nr]++;
-  GNUNET_TRANSPORT_TESTING_transport_communicator_send (tc_h,
-                                                        (ack[peer_nr] <
-                                                         max_size)
-                                                        ? &size_test
-                                                        : NULL,
-                                                        cls,
-                                                        payload,
-                                                        ack[peer_nr]);
-  GNUNET_free (payload);
-  timeout[peer_nr] = GNUNET_TIME_relative_to_absolute (
-    GNUNET_TIME_relative_multiply (
-      GNUNET_TIME_UNIT_SECONDS,
-      TIMEOUT_MULTIPLIER));
-}
-
-static void
-long_test (void *cls);
-
-static void
-long_test_cb (void *cls)
-{
-  unsigned int peer_nr;
-  char *payload;
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h = cls;
-
-  peer_nr = get_peer_nr_from_tc (tc_h);
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "long_test_cb %u/%u\n",
-       (unsigned int) num_sent_long[peer_nr],
-       (unsigned int) num_received_long[peer_nr]);
-  payload = make_payload (long_message_size);
-  num_sent_long[peer_nr]++;
-  GNUNET_TRANSPORT_TESTING_transport_communicator_send (tc_h,
-                                                        (burst_packets_long ==
-                                                         num_sent_long[peer_nr])
-                                                        ? NULL
-                                                        : &long_test,
-                                                        cls,
-                                                        payload,
-                                                        long_message_size);
-  GNUNET_free (payload);
-  timeout[peer_nr] = GNUNET_TIME_relative_to_absolute (
-    GNUNET_TIME_relative_multiply (
-      GNUNET_TIME_UNIT_SECONDS,
-      TIMEOUT_MULTIPLIER));
-}
-
-
-static void
-long_test (void *cls)
-{
-  GNUNET_SCHEDULER_add_delayed (delay_long,
-                                &long_test_cb,
-                                cls);
-}
-
-static void
-choose_phase (struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h)
-{
-  unsigned int peer_nr;
-
-  peer_nr = get_peer_nr_from_tc (tc_h);
-
-  if (GNUNET_YES == phase_short[peer_nr])
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Choose phase short with peer %u and Handle %p\n",
-                peer_nr,
-                tc_h);
-    phase[peer_nr] =  TP_BURST_SHORT;
-    start_short[peer_nr] = GNUNET_TIME_absolute_get ();
-    short_test (tc_h);
-  }
-  else if (GNUNET_YES == phase_long[peer_nr])
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Choose phase long with peer %u\n",
-                peer_nr);
-    phase[peer_nr] =  TP_BURST_LONG;
-    start_long[peer_nr] = GNUNET_TIME_absolute_get ();
-    long_test (tc_h);
-  }
-  else if (GNUNET_YES == phase_size[peer_nr])
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Choose phase size\n");
-    phase[peer_nr] =  TP_SIZE_CHECK;
-    size_test (tc_h);
-  }
-  else
-  {
-    if ((0 == strcmp ("udp", communicator_name)) && ((0 == strcmp ("rekey",
-                                                                   test_name))
-                                                     ||(0 == strcmp (
-                                                          "backchannel",
-                                                          test_name))) )
-    {
-      if (NULL != box_stats[peer_nr])
-        GNUNET_STATISTICS_get_cancel (box_stats[peer_nr]);
-      box_stats[peer_nr] = GNUNET_STATISTICS_get (stats[1],
-                                                  "C-UDP",
-                                                  "# messages decrypted with BOX",
-                                                  process_statistics_box_done,
-                                                  &process_statistics,
-                                                  tc_h);
-      if (NULL != rekey_stats[peer_nr])
-        GNUNET_STATISTICS_get_cancel (rekey_stats[peer_nr]);
-      rekey_stats[peer_nr] = GNUNET_STATISTICS_get (stats[0],
-                                                    "C-UDP",
-                                                    "# rekeying successful",
-                                                    process_statistics_rekey_done,
-                                                    &process_statistics,
-                                                    tc_h);
-    }
-    else
-    {
-      if ((GNUNET_NO == bidirect)|| (((PEER_A == peer_nr) &&
-                                      finished[PEER_B]) || ((PEER_B ==
-                                                             peer_nr) &&
-                                                            finished
-                                                            [PEER_A])))
-      {
-        LOG (GNUNET_ERROR_TYPE_DEBUG,
-             "Finished\n");
-        GNUNET_SCHEDULER_shutdown ();
-      }
-      finished[peer_nr] = GNUNET_YES;
-    }
-  }
-}
-
-static void finish_phase_long (unsigned int peer_nr)
-{
-  static struct GNUNET_TIME_Relative duration;
-
-  duration = GNUNET_TIME_absolute_get_duration (start_long[peer_nr]);
-  LOG (GNUNET_ERROR_TYPE_MESSAGE,
-       "Long size packet test  for peer %u done.\n",
-       peer_nr);
-  char *goodput = GNUNET_STRINGS_byte_size_fancy (
-    (long_message_size * num_received_long[peer_nr] * 1000 * 1000)
-    / duration.
-    rel_value_us);
-
-  LOG (GNUNET_ERROR_TYPE_MESSAGE,
-       "%lu/%lu packets in %llu us (%s/s) -- avg latency: %llu us\n",
-       (unsigned long) num_received_long[peer_nr],
-       (unsigned long) num_sent_long[peer_nr],
-       (unsigned long long) duration.rel_value_us,
-       goodput,
-       (unsigned long long) avg_latency[peer_nr]);
-  GNUNET_free (goodput);
-  ack[peer_nr] = 0;
-  // phase = TP_SIZE_CHECK;
-  // num_received = 0;
-  // num_sent_long = 0;
-  avg_latency[peer_nr] = 0;
-  // size_test (NULL);
-  phase_long[peer_nr] = GNUNET_NO;
-  choose_phase (get_tc_h (peer_nr));
-}
-
-static void
-finish_phase_short (unsigned int peer_nr)
-{
-  static struct GNUNET_TIME_Relative duration;
-
-  duration = GNUNET_TIME_absolute_get_duration (start_short[peer_nr]);
-  LOG (GNUNET_ERROR_TYPE_MESSAGE,
-       "Short size packet test for peer %u done.\n",
-       peer_nr);
-  char *goodput = GNUNET_STRINGS_byte_size_fancy (
-    (SHORT_MESSAGE_SIZE * num_received_short[peer_nr] * 1000 * 1000)
-    / duration.rel_value_us);
-  LOG (GNUNET_ERROR_TYPE_MESSAGE,
-       "%lu/%lu packets in %llu us (%s/s) -- avg latency: %llu us\n",
-       (unsigned long) num_received_short[peer_nr],
-       (unsigned long) num_sent_short[peer_nr],
-       (unsigned long long) duration.rel_value_us,
-       goodput,
-       (unsigned long long) avg_latency[peer_nr]);
-  GNUNET_free (goodput);
-  // start_long = GNUNET_TIME_absolute_get ();
-  // phase = TP_BURST_LONG;
-  // num_sent_short = 0;
-  avg_latency[peer_nr] = 0;
-  // num_received = 0;
-  phase_short[peer_nr] = GNUNET_NO;
-  choose_phase (get_tc_h (peer_nr));
-  // long_test (NULL);
-}
-
-static void
-latency_timeout (void *cls)
-{
-
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h = cls;
-  unsigned int peer_nr;
-  size_t num_sent = 0;
-  size_t num_received = 0;
-
-  peer_nr = get_peer_nr_from_tc (tc_h);
-  to_task[peer_nr] = NULL;
-
-  switch (phase[peer_nr])
-  {
-  case TP_INIT:
-    GNUNET_assert (0);
-    break;
-  case TP_BURST_SHORT:
-    num_sent = num_sent_short[peer_nr];
-    num_received = num_received_short[peer_nr];
-    if ((num_sent_short[peer_nr] == burst_packets_short) &&
-        (num_received_short[peer_nr] >
-         burst_packets_short
-         / 100
-         *
-         allowed_packet_loss_short) )
-    {
-      finish_phase_short (peer_nr);
-      to_task[peer_nr] = GNUNET_SCHEDULER_add_at (timeout[peer_nr],
-                                                  &latency_timeout,
-                                                  cls);
-      return;
-    }
-    break;
-  case TP_BURST_LONG:
-    num_sent = num_sent_long[peer_nr];
-    num_received = num_received_long[peer_nr];
-    if ((num_sent_long[peer_nr] == burst_packets_long) &&
-        (num_received_long[peer_nr] >
-         burst_packets_long
-         / 100
-         *
-         allowed_packet_loss_long) )
-    {
-      finish_phase_long (peer_nr);
-      to_task[peer_nr] = GNUNET_SCHEDULER_add_at (timeout[peer_nr],
-                                                  &latency_timeout,
-                                                  cls);
-      return;
-    }
-    break;
-  case TP_SIZE_CHECK:
-    num_sent = num_sent_size[peer_nr];
-    num_received = num_received_size[peer_nr];
-    break;
-  }
-  if (GNUNET_TIME_absolute_get_remaining (timeout[peer_nr]).rel_value_us > 0)
-  {
-    to_task[peer_nr] = GNUNET_SCHEDULER_add_at (timeout[peer_nr],
-                                                &latency_timeout,
-                                                cls);
-    return;
-  }
-  LOG (GNUNET_ERROR_TYPE_ERROR,
-       "Latency too high. Test failed. (Phase: %d. Sent: %lu, Received: %lu)\n",
-       phase[peer_nr], num_sent, num_received);
-  ret = 2;
-  GNUNET_SCHEDULER_shutdown ();
-}
-
-/**
- * @brief Handle opening of queue
- *
- * Issues sending of test data
- *
- * Implements #GNUNET_TRANSPORT_TESTING_AddQueueCallback
- *
- * @param cls Closure
- * @param tc_h Communicator handle
- * @param tc_queue Handle to newly opened queue
- */
-static void
-add_queue_cb (void *cls,
-              struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h,
-              struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorQueue *
-              tc_queue,
-              size_t mtu)
-{
-
-  unsigned int peer_nr;
-
-  peer_nr = get_peer_nr (cls, GNUNET_NO);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Handle %p add %u %u\n",
-       tc_h,
-       peer_nr,
-       get_peer_nr_from_tc (tc_h));
-  if ((GNUNET_NO == bidirect)&&(0 != strcmp ((char*) cls, cfg_peers_name[0])))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Queue available at receiving peer\n");
-    return; // TODO?
-  }
-  else if (TP_INIT != phase[peer_nr])
-    return;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Queue established, starting test...\n");
-  if (UINT32_MAX != mtu) /* Message header overhead */
-    long_message_size = mtu - sizeof(struct GNUNET_TRANSPORT_SendMessageTo)
-                        - sizeof(struct GNUNET_MessageHeader);
-  else
-    long_message_size = LONG_MESSAGE_SIZE;
-  timeout[peer_nr] = GNUNET_TIME_relative_to_absolute (
-    GNUNET_TIME_relative_multiply (
-      GNUNET_TIME_UNIT_SECONDS,
-      TIMEOUT_MULTIPLIER));
-  GNUNET_assert (NULL == to_task[peer_nr]);
-  to_task[peer_nr] = GNUNET_SCHEDULER_add_delayed (
-    GNUNET_TIME_relative_multiply (
-      GNUNET_TIME_UNIT_SECONDS,
-      TIMEOUT_MULTIPLIER),
-    &latency_timeout,
-    tc_h);
-  choose_phase (tc_h);
-}
-
-
-static void
-update_avg_latency (const char *payload, unsigned int peer_nr)
-{
-  struct GNUNET_TIME_AbsoluteNBO *ts_n;
-  struct GNUNET_TIME_Absolute ts;
-  struct GNUNET_TIME_Relative latency;
-  size_t num_received = 0;
-
-  ts_n = (struct GNUNET_TIME_AbsoluteNBO *) payload;
-  ts = GNUNET_TIME_absolute_ntoh (*ts_n);
-  latency = GNUNET_TIME_absolute_get_duration (ts);
-
-  switch (phase[peer_nr])
-  {
-  case TP_INIT:
-    GNUNET_assert (0);
-    break;
-  case TP_BURST_SHORT:
-    num_received = num_received_short[peer_nr];
-    break;
-  case TP_BURST_LONG:
-    num_received = num_received_long[peer_nr];
-    break;
-  case TP_SIZE_CHECK:
-    num_received = num_received_size[peer_nr];
-    break;
-  }
-  if (1 >= num_received)
-    avg_latency[peer_nr] = latency.rel_value_us;
-  else
-    avg_latency[peer_nr] = ((avg_latency[peer_nr] * (num_received - 1))
-                            + latency.rel_value_us)
-                           / num_received;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Latency of received packet by peer %u: %s with avg latency %lu\n",
-       peer_nr,
-       GNUNET_STRINGS_relative_time_to_string (latency,
-                                               GNUNET_YES),
-       avg_latency[peer_nr]);
-}
-
-
-
-
-static void
-load_phase_config ()
-{
-
-  phase_short[0] =  GNUNET_CONFIGURATION_get_value_yesno (cfg_peers[0],
-                                                          TEST_SECTION,
-                                                          "PHASE_SHORT");
-  if (GNUNET_SYSERR == phase_short[0])
-    phase_short[0] = GNUNET_YES;
-
-  phase_short[1] = phase_short[0];
-
-  phase_long[0] =  GNUNET_CONFIGURATION_get_value_yesno (cfg_peers[0],
-                                                         TEST_SECTION,
-                                                         "PHASE_LONG");
-
-  if (GNUNET_SYSERR == phase_long[0])
-    phase_long[0] = GNUNET_YES;
-
-  phase_long[1] = phase_long[0];
-
-  phase_size[0] =   GNUNET_CONFIGURATION_get_value_yesno (cfg_peers[0],
-                                                          TEST_SECTION,
-                                                          "PHASE_SIZE");
-
-  if (GNUNET_SYSERR == phase_size[0])
-    phase_size[0] = GNUNET_YES;
-
-  phase_size[1] = phase_size[0];
-}
-
-
-
-/**
- * @brief Handle an incoming message
- *
- * Implements #GNUNET_TRANSPORT_TESTING_IncomingMessageCallback
-
- * @param cls Closure
- * @param tc_h Handle to the receiving communicator
- * @param msg Received message
- */
-static void
-incoming_message_cb (
-  void *cls,
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h,
-  const char *payload,
-  size_t payload_len)
-{
-  unsigned int peer_nr;
-
-
-  peer_nr = get_peer_nr (cls, GNUNET_YES);
-
-  if ((GNUNET_NO == bidirect)&&(0 != strcmp ((char*) cls,
-                                             cfg_peers_name[NUM_PEERS - 1])))
-  {
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         "unexpected receiver...\n");
-    return;
-  }
-  /* Reset timeout */
-  timeout[peer_nr] = GNUNET_TIME_relative_to_absolute (
-    GNUNET_TIME_relative_multiply (
-      GNUNET_TIME_UNIT_SECONDS,
-      TIMEOUT_MULTIPLIER));
-  switch (phase[peer_nr])
-  {
-  case TP_INIT:
-    GNUNET_break (0);
-    break;
-  case TP_BURST_SHORT:
-    {
-      GNUNET_assert (SHORT_MESSAGE_SIZE == payload_len);
-      num_received_short[peer_nr]++;
-
-      update_avg_latency (payload, peer_nr);
-      if ((num_sent_short[peer_nr] == burst_packets_short) &&
-          (num_received_short[peer_nr] ==
-           burst_packets_short))
-      {
-        finish_phase_short (peer_nr);
-      }
-      break;
-    }
-  case TP_BURST_LONG:
-    {
-      if (long_message_size != payload_len)
-      {
-        LOG (GNUNET_ERROR_TYPE_WARNING,
-             "Ignoring packet with wrong length\n");
-        return;   // Ignore
-      }
-      num_received_long[peer_nr]++;
-
-      update_avg_latency (payload, peer_nr);
-      if ((num_sent_long[peer_nr] == burst_packets_long) &&
-          (num_received_long[peer_nr] >
-           burst_packets_long))
-      {
-        finish_phase_long (peer_nr);
-      }
-      break;
-    }
-  case TP_SIZE_CHECK:
-    {
-      size_t max_size = 64000;
-
-      GNUNET_assert (TP_SIZE_CHECK == phase[peer_nr]);
-      if (LONG_MESSAGE_SIZE != long_message_size)
-        max_size = long_message_size;
-      num_received_size[peer_nr]++;
-      update_avg_latency (payload, peer_nr);
-      if ((GNUNET_YES == phase_size[peer_nr]) && (num_received_size[peer_nr] >=
-                                                  (max_size) / 10) )
-      {
-        LOG (GNUNET_ERROR_TYPE_MESSAGE,
-             "Size packet test  for peer %u done.\n",
-             peer_nr);
-        LOG (GNUNET_ERROR_TYPE_MESSAGE,
-             "%lu/%lu packets -- avg latency: %llu us\n",
-             (unsigned long) num_received_size[peer_nr],
-             (unsigned long) num_sent_size[peer_nr],
-             (unsigned long long) avg_latency[peer_nr]);
-        iterations_left[peer_nr]--;
-        phase_size[peer_nr] = GNUNET_NO;
-        if (0 != iterations_left[peer_nr])
-        {
-          // start_short = GNUNET_TIME_absolute_get ();
-          // phase = TP_BURST_SHORT;
-          num_received_size[peer_nr] = 0;
-          num_sent_size[peer_nr] = 0;
-          avg_latency[peer_nr] = 0;
-          num_sent_short[peer_nr] = 0;
-          num_sent_long[peer_nr] = 0;
-          num_received_short[peer_nr] = 0;
-          num_received_long[peer_nr] = 0;
-          // short_test (NULL);
-          if (((PEER_A == peer_nr) && finished[PEER_B]) || ((PEER_B ==
-                                                             peer_nr) &&
-                                                            finished[PEER_A]))
-          {
-            load_phase_config ();
-          }
-        }
-        choose_phase (get_tc_h (peer_nr));
-      }
-      break;
-    }
-  }
-}
-
-
-static void
-do_shutdown (void *cls)
-{
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "shutting down test.\n");
-
-  for (unsigned int i = 0; i < NUM_PEERS; i++)
-  {
-    if (NULL != box_stats[i])
-    {
-      GNUNET_STATISTICS_get_cancel (box_stats[i]);
-      box_stats[i] = NULL;
-    }
-    if (NULL != rekey_stats[i])
-    {
-      GNUNET_STATISTICS_get_cancel (rekey_stats[i]);
-      rekey_stats[i] = NULL;
-    }
-    if (NULL != to_task[i])
-    {
-      GNUNET_SCHEDULER_cancel (to_task[i]);
-      to_task[i] = NULL;
-    }
-    GNUNET_TRANSPORT_TESTING_transport_communicator_service_stop (tc_hs[i]);
-    GNUNET_STATISTICS_destroy (stats[i], GNUNET_NO);
-  }
-}
-
-
-
-/**
- * @brief Main function called by the scheduler
- *
- * @param cls Closure - Handle to confiation
- */
-static void
-run (void *cls)
-{
-  ret = 0;
-  // num_received = 0;
-  // num_sent = 0;
-  for (unsigned int i = 0; i < NUM_PEERS; i++)
-  {
-    tc_hs[i] = GNUNET_TRANSPORT_TESTING_transport_communicator_service_start (
-      "transport",
-      communicator_binary,
-      cfg_peers_name[i],
-      &peer_id[i],
-      &communicator_available_cb,
-      &add_address_cb,
-      &queue_create_reply_cb,
-      &add_queue_cb,
-      &incoming_message_cb,
-      &handle_backchannel_cb,
-      cfg_peers_name[i]);   /* cls */
-
-    if ((0 == strcmp ("udp", communicator_name)) && ((0 == strcmp ("rekey",
-                                                                   test_name))||
-                                                     (0 == strcmp (
-                                                        "backchannel",
-                                                        test_name))) )
-    {
-      stats[i] = GNUNET_STATISTICS_create ("C-UDP",
-                                           cfg_peers[i]);
-    }
-    else if ((0 == strcmp ("bidirect", test_name)))
-    {
-      bidirect = GNUNET_YES;
-    }
-  }
-  GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
-                                 NULL);
-}
-
-int
-main (int argc,
-      char *const *argv)
-{
-  struct GNUNET_CRYPTO_EddsaPrivateKey *private_key;
-  char *test_mode;
-  char *cfg_peer;
-
-  iterations_left[0] = TOTAL_ITERATIONS;
-  iterations_left[1] = TOTAL_ITERATIONS;
-  phase[0] = TP_INIT;
-  phase[1] = TP_INIT;
-  ret = 1;
-  test_name = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
-  communicator_name = strchr (test_name, '-');
-  communicator_name[0] = '\0';
-  communicator_name++;
-  test_mode = test_name;
-
-  GNUNET_asprintf (&communicator_binary,
-                   "gnunet-communicator-%s",
-                   communicator_name);
-
-  if (GNUNET_OK !=
-      GNUNET_log_setup ("test_communicator_basic",
-                        "DEBUG",
-                        NULL))
-  {
-    fprintf (stderr, "Unable to setup log\n");
-    GNUNET_break (0);
-    return 2;
-  }
-  for (unsigned int i = 0; i < NUM_PEERS; i++)
-  {
-    GNUNET_asprintf ((&cfg_peer),
-                     "test_communicator_%s_%s_peer%u.conf",
-                     communicator_name, test_mode, i + 1);
-    cfg_peers_name[i] = cfg_peer;
-    cfg_peers[i] = GNUNET_CONFIGURATION_create ();
-    if (GNUNET_YES ==
-        GNUNET_DISK_file_test (cfg_peers_name[i]))
-    {
-      if (GNUNET_SYSERR ==
-          GNUNET_CONFIGURATION_load (cfg_peers[i],
-                                     cfg_peers_name[i]))
-      {
-        fprintf (stderr,
-                 "Malformed configuration file `%s', exiting ...\n",
-                 cfg_peers_name[i]);
-        return 1;
-      }
-    }
-    else
-    {
-      if (GNUNET_SYSERR ==
-          GNUNET_CONFIGURATION_load (cfg_peers[i],
-                                     NULL))
-      {
-        fprintf (stderr,
-                 "Configuration file %s does not exist, exiting ...\n",
-                 cfg_peers_name[i]);
-        return 1;
-      }
-    }
-    private_key =
-      GNUNET_CRYPTO_eddsa_key_create_from_configuration (cfg_peers[i]);
-    if (NULL == private_key)
-    {
-      LOG (GNUNET_ERROR_TYPE_ERROR,
-           "Unable to get peer ID\n");
-      return 1;
-    }
-    GNUNET_CRYPTO_eddsa_key_get_public (private_key,
-                                        &peer_id[i].public_key);
-    GNUNET_free (private_key);
-    LOG (GNUNET_ERROR_TYPE_INFO,
-         "Identity of peer %u is %s\n",
-         i,
-         GNUNET_i2s_full (&peer_id[i]));
-  }
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (cfg_peers[0],
-                                             TEST_SECTION,
-                                             "ALLOWED_PACKET_LOSS_SHORT",
-                                             &allowed_packet_loss_short))
-    allowed_packet_loss_short = ALLOWED_PACKET_LOSS;
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (cfg_peers[0],
-                                             TEST_SECTION,
-                                             "ALLOWED_PACKET_LOSS_LONG",
-                                             &allowed_packet_loss_long))
-    allowed_packet_loss_long = ALLOWED_PACKET_LOSS;
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (cfg_peers[0],
-                                             TEST_SECTION,
-                                             "BURST_PACKETS_SHORT",
-                                             &burst_packets_short))
-    burst_packets_short = BURST_PACKETS;
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (cfg_peers[0],
-                                             TEST_SECTION,
-                                             "BURST_ÃœACKETS_LONG",
-                                             &burst_packets_long))
-    burst_packets_long = BURST_PACKETS;
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (cfg_peers[0],
-                                             TEST_SECTION,
-                                             "DELAY_SHORT",
-                                             &delay_short_value))
-    delay_short = DELAY;
-  else
-    GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MICROSECONDS,
-                                   delay_short_value);
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (cfg_peers[0],
-                                             TEST_SECTION,
-                                             "DELAY_SHORT",
-                                             &delay_long_value))
-    delay_long = DELAY;
-  else
-    GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MICROSECONDS,
-                                   delay_long_value);
-  load_phase_config ();
-  LOG (GNUNET_ERROR_TYPE_MESSAGE, "Starting test...\n");
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "argv[0]: %s\n",
-       argv[0]);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "test_name: %s\n",
-       test_name);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "communicator_name: %s\n",
-       communicator_name);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "communicator_binary: %s\n",
-       communicator_binary);
-  GNUNET_SCHEDULER_run (&run,
-                        NULL);
-  return ret;
-}
diff --git a/src/transport/test_communicator_tcp_basic_peer1.conf b/src/transport/test_communicator_tcp_basic_peer1.conf
deleted file mode 100644
index dbc227ac6..000000000
--- a/src/transport/test_communicator_tcp_basic_peer1.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-@INLINE@ test_transport_defaults.conf
-
-[test-setup]
-#PHASE_LONG=NO
-#PHASE_SIZE=NO
-#BURST_PACKETS_SHORT=1
-
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-communicator-unix-1/
-
-[PEER]
-PRIVATE_KEY = $GNUNET_TMP/test-communicator-unix-1/private.key
-
-[transport-tcp]
-PORT = 52400
-
-[transport-udp]
-PORT = 52401
-
-[transport]
-PORT = 60000
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport_test_1.sock
-
-[nat]
-UNIXPATH = $GNUNET_TMP/test-communicator-unix-1/nat.sock
-
-[peerstore]
-UNIXPATH = $GNUNET_TMP/test-communicator-unix-1/peerstore.sock
-
-[statistics]
-PORT = 22461
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics_test_1.sock
-
-[communicator-unix]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_gnunet-communicator-unix_1.sock
-
-[communicator-tcp]
-#PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
-#PREFIX = valgrind --leak-check=full --track-origins=yes
-BINDTO = 60002
-DISABLE_V6 = YES
-
-[communicator-udp]
-BINDTO = 60002
-
-[resolver]
-PORT = 62089
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver_test_1.sock
diff --git a/src/transport/test_communicator_tcp_basic_peer2.conf b/src/transport/test_communicator_tcp_basic_peer2.conf
deleted file mode 100644
index b73157f0d..000000000
--- a/src/transport/test_communicator_tcp_basic_peer2.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-@INLINE@ test_transport_defaults.conf
-
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunetd-plugin-transport/
-
-[PEER]
-PRIVATE_KEY = $GNUNET_TMP/test-communicator-unix-2/private.key
-
-
-[transport-tcp]
-PORT = 52400
-
-[transport-udp]
-PORT = 52401
-
-[transport]
-PORT = 60001
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport_test_2.sock
-
-[nat]
-UNIXPATH = $GNUNET_TMP/test-communicator-unix-2/nat.sock
-
-[peerstore]
-UNIXPATH = $GNUNET_TMP/test-communicator-unix-2/peerstore.sock
-
-[statistics]
-PORT = 22462
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics_test_2.sock
-
-[communicator-unix]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_gnunet-communicator-unix_2.sock
-
-[communicator-tcp]
-#PREFIX = xterm -geometry 100x85 -T peer2 -e gdb --args
-#PREFIX = valgrind --leak-check=full --track-origins=yes 
-BINDTO = 60003
-DISABLE_V6 = YES
-
-[communicator-udp]
-BINDTO = 60003
-
-[resolver]
-PORT = 62090
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver_test_2.sock
diff --git a/src/transport/test_communicator_tcp_bidirect_peer1.conf b/src/transport/test_communicator_tcp_bidirect_peer1.conf
deleted file mode 100644
index dbc227ac6..000000000
--- a/src/transport/test_communicator_tcp_bidirect_peer1.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-@INLINE@ test_transport_defaults.conf
-
-[test-setup]
-#PHASE_LONG=NO
-#PHASE_SIZE=NO
-#BURST_PACKETS_SHORT=1
-
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-communicator-unix-1/
-
-[PEER]
-PRIVATE_KEY = $GNUNET_TMP/test-communicator-unix-1/private.key
-
-[transport-tcp]
-PORT = 52400
-
-[transport-udp]
-PORT = 52401
-
-[transport]
-PORT = 60000
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport_test_1.sock
-
-[nat]
-UNIXPATH = $GNUNET_TMP/test-communicator-unix-1/nat.sock
-
-[peerstore]
-UNIXPATH = $GNUNET_TMP/test-communicator-unix-1/peerstore.sock
-
-[statistics]
-PORT = 22461
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics_test_1.sock
-
-[communicator-unix]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_gnunet-communicator-unix_1.sock
-
-[communicator-tcp]
-#PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
-#PREFIX = valgrind --leak-check=full --track-origins=yes
-BINDTO = 60002
-DISABLE_V6 = YES
-
-[communicator-udp]
-BINDTO = 60002
-
-[resolver]
-PORT = 62089
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver_test_1.sock
diff --git a/src/transport/test_communicator_tcp_bidirect_peer2.conf b/src/transport/test_communicator_tcp_bidirect_peer2.conf
deleted file mode 100644
index b73157f0d..000000000
--- a/src/transport/test_communicator_tcp_bidirect_peer2.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-@INLINE@ test_transport_defaults.conf
-
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunetd-plugin-transport/
-
-[PEER]
-PRIVATE_KEY = $GNUNET_TMP/test-communicator-unix-2/private.key
-
-
-[transport-tcp]
-PORT = 52400
-
-[transport-udp]
-PORT = 52401
-
-[transport]
-PORT = 60001
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport_test_2.sock
-
-[nat]
-UNIXPATH = $GNUNET_TMP/test-communicator-unix-2/nat.sock
-
-[peerstore]
-UNIXPATH = $GNUNET_TMP/test-communicator-unix-2/peerstore.sock
-
-[statistics]
-PORT = 22462
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics_test_2.sock
-
-[communicator-unix]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_gnunet-communicator-unix_2.sock
-
-[communicator-tcp]
-#PREFIX = xterm -geometry 100x85 -T peer2 -e gdb --args
-#PREFIX = valgrind --leak-check=full --track-origins=yes 
-BINDTO = 60003
-DISABLE_V6 = YES
-
-[communicator-udp]
-BINDTO = 60003
-
-[resolver]
-PORT = 62090
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver_test_2.sock
diff --git a/src/transport/test_communicator_tcp_rekey_peer1.conf b/src/transport/test_communicator_tcp_rekey_peer1.conf
deleted file mode 100644
index 82fbf353a..000000000
--- a/src/transport/test_communicator_tcp_rekey_peer1.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-@INLINE@ test_transport_defaults.conf
-
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-communicator-unix-1/
-
-[PEER]
-PRIVATE_KEY = $GNUNET_TMP/test-communicator-unix-1/private.key
-
-[transport-tcp]
-PORT = 52400
-
-[transport-udp]
-PORT = 52401
-
-[transport]
-PORT = 60000
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport_test_1.sock
-
-[nat]
-UNIXPATH = $GNUNET_TMP/test-communicator-unix-1/nat.sock
-ENABLE_IPSCAN = YES
-
-[peerstore]
-UNIXPATH = $GNUNET_TMP/test-communicator-unix-1/peerstore.sock
-
-[statistics]
-PORT = 22461
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics_test_1.sock
-
-[resolver]
-PORT = 62089
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver_test_1.sock
-
-[communicator-unix]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_gnunet-communicator-unix_1.sock
-
-[communicator-tcp]
-#PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
-#PREFIX = valgrind --leak-check=full --track-origins=yes
-BINDTO = 60002
-DISABLE_V6 = YES
-REKEY_INTERVAL = 100ms
-
-[communicator-udp]
-BINDTO = 60002
diff --git a/src/transport/test_communicator_tcp_rekey_peer2.conf b/src/transport/test_communicator_tcp_rekey_peer2.conf
deleted file mode 100644
index 086a996ae..000000000
--- a/src/transport/test_communicator_tcp_rekey_peer2.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-@INLINE@ test_transport_defaults.conf
-
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunetd-plugin-transport/
-
-[PEER]
-PRIVATE_KEY = $GNUNET_TMP/test-communicator-unix-2/private.key
-
-
-[transport-tcp]
-PORT = 52400
-
-[transport-udp]
-PORT = 52401
-
-[transport]
-PORT = 60001
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport_test_2.sock
-
-[nat]
-UNIXPATH = $GNUNET_TMP/test-communicator-unix-2/nat.sock
-
-[peerstore]
-UNIXPATH = $GNUNET_TMP/test-communicator-unix-2/peerstore.sock
-
-[statistics]
-PORT = 22462
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics_test_2.sock
-
-[resolver]
-PORT = 62090
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver_test_2.sock
-
-[communicator-unix]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_gnunet-communicator-unix_2.sock
-
-[communicator-tcp]
-#PREFIX = xterm -geometry 100x85 -T peer2 -e gdb --args
-#PREFIX = valgrind --leak-check=full --track-origins=yes
-BINDTO = 60003
-DISABLE_V6 = YES
-REKEY_INTERVAL = 100ms
-
-[communicator-udp]
-BINDTO = 60003
diff --git a/src/transport/test_communicator_udp_backchannel_peer1.conf b/src/transport/test_communicator_udp_backchannel_peer1.conf
deleted file mode 100644
index 59e6d68e3..000000000
--- a/src/transport/test_communicator_udp_backchannel_peer1.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-@INLINE@ test_transport_defaults.conf
-
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-communicator-unix-1/
-
-[PEER]
-PRIVATE_KEY = $GNUNET_TMP/test-communicator-unix-1/private.key
-
-[transport-tcp]
-PORT = 52400
-
-[transport-udp]
-PORT = 52401
-
-[transport]
-PORT = 60000
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport_test_1.sock
-
-[nat]
-UNIXPATH = $GNUNET_TMP/test-communicator-unix-1/nat.sock
-ENABLE_IPSCAN = YES
-
-[peerstore]
-UNIXPATH = $GNUNET_TMP/test-communicator-unix-1/peerstore.sock
-
-[statistics]
-PORT = 22461
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics_test_1.sock
-
-[resolver]
-PORT = 62089
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver_test_1.sock
-
-[communicator-unix]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_gnunet-communicator-unix_1.sock
-
-[communicator-tcp]
-BINDTO = 60002
-DISABLE_V6 = YES
-
-[communicator-udp]
-#PREFIX = valgrind --leak-check=full --track-origins=yes
-BINDTO = 60002
-DISABLE_V6 = YES
-MAX_QUEUE_LENGTH=5000
-
-[communicator-test]
-BACKCHANNEL_ENABLED = YES
diff --git a/src/transport/test_communicator_udp_backchannel_peer2.conf b/src/transport/test_communicator_udp_backchannel_peer2.conf
deleted file mode 100644
index 3abf7999b..000000000
--- a/src/transport/test_communicator_udp_backchannel_peer2.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-@INLINE@ test_transport_defaults.conf
-
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunetd-plugin-transport/
-
-[PEER]
-PRIVATE_KEY = $GNUNET_TMP/test-communicator-unix-2/private.key
-
-
-[transport-tcp]
-PORT = 52400
-
-[transport-udp]
-PORT = 52401
-
-[transport]
-PORT = 60001
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport_test_2.sock
-
-[nat]
-UNIXPATH = $GNUNET_TMP/test-communicator-unix-2/nat.sock
-
-[peerstore]
-UNIXPATH = $GNUNET_TMP/test-communicator-unix-2/peerstore.sock
-
-[statistics]
-PORT = 22462
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics_test_2.sock
-
-[resolver]
-PORT = 62090
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver_test_2.sock
-
-[communicator-unix]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_gnunet-communicator-unix_2.sock
-
-[communicator-tcp]
-BINDTO = 60003
-DISABLE_V6 = YES
-
-[communicator-udp]
-#PREFIX = valgrind --leak-check=full --track-origins=yes
-BINDTO = 60003
-DISABLE_V6 = YES
-MAX_QUEUE_LENGTH=5000
-
-[communicator-test]
-BACKCHANNEL_ENABLED = YES
diff --git a/src/transport/test_communicator_udp_basic_peer1.conf b/src/transport/test_communicator_udp_basic_peer1.conf
deleted file mode 100644
index c6ff024ee..000000000
--- a/src/transport/test_communicator_udp_basic_peer1.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-@INLINE@ test_transport_defaults.conf
-
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-communicator-unix-1/
-
-[PEER]
-PRIVATE_KEY = $GNUNET_TMP/test-communicator-unix-1/private.key
-
-[transport-tcp]
-PORT = 52400
-
-[transport-udp]
-PORT = 52401
-
-[transport]
-#PORT = 60000
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport_test_1.sock
-
-[nat]
-UNIXPATH = $GNUNET_TMP/test-communicator-unix-1/nat.sock
-ENABLE_IPSCAN = YES
-
-[peerstore]
-UNIXPATH = $GNUNET_TMP/test-communicator-unix-1/peerstore.sock
-
-[statistics]
-PORT = 22461
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics_test_1.sock
-
-[resolver]
-PORT = 62089
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver_test_1.sock
-
-[communicator-udp]
-#PREFIX = valgrind --leak-check=full --track-origins=yes
-BINDTO = 60002
-DISABLE_V6 = YES
-MAX_QUEUE_LENGTH=5000
diff --git a/src/transport/test_communicator_udp_basic_peer2.conf b/src/transport/test_communicator_udp_basic_peer2.conf
deleted file mode 100644
index b353b03e9..000000000
--- a/src/transport/test_communicator_udp_basic_peer2.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-@INLINE@ test_transport_defaults.conf
-
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunetd-plugin-transport/
-
-[PEER]
-PRIVATE_KEY = $GNUNET_TMP/test-communicator-unix-2/private.key
-
-
-[transport-tcp]
-PORT = 52400
-
-[transport-udp]
-PORT = 52402
-
-[transport]
-#PORT = 60001
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport_test_2.sock
-
-[nat]
-UNIXPATH = $GNUNET_TMP/test-communicator-unix-2/nat.sock
-
-
-[peerstore]
-UNIXPATH = $GNUNET_TMP/test-communicator-unix-2/peerstore.sock
-
-[statistics]
-PORT = 22462
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics_test_2.sock
-
-[resolver]
-PORT = 62090
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver_test_2.sock
-
-[communicator-udp]
-#PREFIX = valgrind --leak-check=full --track-origins=yes
-BINDTO = 60003
-DISABLE_V6 = YES
-MAX_QUEUE_LENGTH=5000
diff --git a/src/transport/test_communicator_udp_rekey_peer1.conf b/src/transport/test_communicator_udp_rekey_peer1.conf
deleted file mode 100644
index 6bfeafe33..000000000
--- a/src/transport/test_communicator_udp_rekey_peer1.conf
+++ /dev/null
@@ -1,51 +0,0 @@
-@INLINE@ test_transport_defaults.conf
-
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-communicator-unix-1/
-
-[PEER]
-PRIVATE_KEY = $GNUNET_TMP/test-communicator-unix-1/private.key
-
-[transport-tcp]
-PORT = 52400
-
-[transport-udp]
-PORT = 52401
-
-[transport]
-PORT = 60000
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport_test_1.sock
-
-[nat]
-UNIXPATH = $GNUNET_TMP/test-communicator-unix-1/nat.sock
-ENABLE_IPSCAN = YES
-
-[peerstore]
-UNIXPATH = $GNUNET_TMP/test-communicator-unix-1/peerstore.sock
-
-[statistics]
-PORT = 22461
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics_test_1.sock
-
-[resolver]
-PORT = 62089
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver_test_1.sock
-
-[communicator-unix]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_gnunet-communicator-unix_1.sock
-
-[communicator-tcp]
-BINDTO = 60002
-DISABLE_V6 = YES
-REKEY_INTERVAL = 100ms
-
-[communicator-udp]
-#PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
-#PREFIX = valgrind --leak-check=full --track-origins=yes
-BINDTO = 60002
-DISABLE_V6 = YES
-MAX_QUEUE_LENGTH=5000
-REKEY_MAX_BYTES=9MiB
-
-[communicator-test]
-BACKCHANNEL_ENABLED = YES
diff --git a/src/transport/test_communicator_udp_rekey_peer2.conf b/src/transport/test_communicator_udp_rekey_peer2.conf
deleted file mode 100644
index 474ca0c15..000000000
--- a/src/transport/test_communicator_udp_rekey_peer2.conf
+++ /dev/null
@@ -1,51 +0,0 @@
-@INLINE@ test_transport_defaults.conf
-
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunetd-plugin-transport/
-
-[PEER]
-PRIVATE_KEY = $GNUNET_TMP/test-communicator-unix-2/private.key
-
-
-[transport-tcp]
-PORT = 52400
-
-[transport-udp]
-PORT = 52401
-
-[transport]
-PORT = 60001
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport_test_2.sock
-
-[nat]
-UNIXPATH = $GNUNET_TMP/test-communicator-unix-2/nat.sock
-
-[peerstore]
-UNIXPATH = $GNUNET_TMP/test-communicator-unix-2/peerstore.sock
-
-[statistics]
-PORT = 22462
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics_test_2.sock
-
-[resolver]
-PORT = 62090
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver_test_2.sock
-
-[communicator-unix]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_gnunet-communicator-unix_2.sock
-
-[communicator-tcp]
-BINDTO = 60003
-DISABLE_V6 = YES
-REKEY_INTERVAL = 100ms
-
-[communicator-udp]
-#PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
-#PREFIX = valgrind --leak-check=full --track-origins=yes
-BINDTO = 60003
-DISABLE_V6 = YES
-MAX_QUEUE_LENGTH=5000
-REKEY_MAX_BYTES=9MiB
-
-[communicator-test]
-BACKCHANNEL_ENABLED = YES
diff --git a/src/transport/test_communicator_unix_basic_peer1.conf b/src/transport/test_communicator_unix_basic_peer1.conf
deleted file mode 100644
index 13ba2d16b..000000000
--- a/src/transport/test_communicator_unix_basic_peer1.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-@INLINE@ test_transport_defaults.conf
-
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-communicator-unix-1/
-
-[PEER]
-PRIVATE_KEY = $GNUNET_TMP/test-communicator-unix-1/private.key
-
-[transport-tcp]
-PORT = 52400
-
-[transport-udp]
-PORT = 52401
-
-[transport]
-PORT = 60000
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport_test_1.sock
-
-[nat]
-UNIXPATH = $GNUNET_TMP/communicator-unix-1/nat.sock
-ENABLE_IPSCAN = YES
-
-[peerstore]
-UNIXPATH = $GNUNET_TMP/test-communicator-unix-1/peerstore.sock
-
-[statistics]
-PORT = 22461
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics_test_1.sock
-
-[resolver]
-PORT = 62089
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver_test_1.sock
-
-[communicator-unix]
-#PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
-#PREFIX = valgrind --leak-check=full --track-origins=yes
-UNIXPATH = $GNUNET_RUNTIME_DIR/communicator-unix-1.sock
-
-[communicator-tcp]
-BINDTO = 60002
-
-[communicator-udp]
-BINDTO = 60002
diff --git a/src/transport/test_communicator_unix_basic_peer2.conf b/src/transport/test_communicator_unix_basic_peer2.conf
deleted file mode 100644
index 727e844a7..000000000
--- a/src/transport/test_communicator_unix_basic_peer2.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-@INLINE@ test_transport_defaults.conf
-
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunetd-plugin-transport/
-
-[PEER]
-PRIVATE_KEY = $GNUNET_TMP/test-communicator-unix-2/private.key
-
-
-[transport-tcp]
-PORT = 52400
-
-[transport-udp]
-PORT = 52401
-
-[transport]
-PORT = 60001
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport_test_2.sock
-
-[nat]
-UNIXPATH = $GNUNET_TMP/communicator-unix-2/nat.sock
-
-[peerstore]
-UNIXPATH = $GNUNET_TMP/test-communicator-unix-2/peerstore.sock
-
-[statistics]
-PORT = 22462
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics_test_2.sock
-
-[resolver]
-PORT = 62090
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver_test_2.sock
-
-[communicator-unix]
-#PREFIX = xterm -geometry 100x85 -T peer2 -e gdb --args
-#PREFIX = valgrind --leak-check=full --track-origins=yes
-UNIXPATH = $GNUNET_RUNTIME_DIR/communicator-unix-2.sock
-
-[communicator-tcp]
-BINDTO = 60003
-
-[communicator-udp]
-BINDTO = 60003
diff --git a/src/transport/test_delay b/src/transport/test_delay
deleted file mode 100755
index 5f82b65fb..000000000
--- a/src/transport/test_delay
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-TEMP=$(getopt t: "$*")
-
-if [ $? != 0 ] ; then
-  exit 1
-fi
-
-eval set -- "$TEMP"
-
-while true ; do
-  case "$1" in
-    (-t) sleep "$2" ; shift 2 ;;
-    (--) shift ; break ;;
-    (*) echo "Error parsing getopt output" ; exit 1 ;;
-  esac
-done
-echo "exec $@"
-exec "$@"
diff --git a/src/transport/test_http_common.c b/src/transport/test_http_common.c
deleted file mode 100644
index fe6e4faa3..000000000
--- a/src/transport/test_http_common.c
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2009, 2010 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport/test_http_common.c
- * @brief base test case for common http functionality
- */
-#include "platform.h"
-#include "gnunet_transport_service.h"
-#include "transport-testing.h"
-#include "plugin_transport_http_common.h"
-
-
-static void
-clean (struct SplittedHTTPAddress *addr)
-{
-  if (NULL == addr)
-    return;
-  GNUNET_free (addr->host);
-  GNUNET_free (addr->path);
-  GNUNET_free (addr->protocol);
-  GNUNET_free (addr);
-}
-
-
-static int
-check (struct SplittedHTTPAddress *addr,
-       const char *protocol,
-       const char *host,
-       int port,
-       const char *path)
-{
-  if (NULL == addr)
-    return GNUNET_NO;
-  if (((NULL == addr->protocol) && (NULL != protocol)) ||
-      ((NULL != addr->protocol) && (NULL == protocol)))
-  {
-    GNUNET_break (0);
-    return GNUNET_NO;
-  }
-  else if ((NULL != addr->protocol) && (NULL != protocol))
-  {
-    if (0 != strcmp (addr->protocol, protocol))
-    {
-      GNUNET_break (0);
-      return GNUNET_NO;
-    }
-  }
-
-  if (((NULL == addr->host) && (NULL != host)) ||
-      ((NULL != addr->host) && (NULL == host)))
-  {
-    GNUNET_break (0);
-    return GNUNET_NO;
-  }
-  else if ((NULL != addr->host) && (NULL != host))
-  {
-    if (0 != strcmp (addr->host, host))
-    {
-      GNUNET_break (0);
-      return GNUNET_NO;
-    }
-  }
-
-  if (((NULL == addr->path) && (NULL != path)) ||
-      ((NULL != addr->path) && (NULL == path)))
-  {
-    GNUNET_break (0);
-    return GNUNET_NO;
-  }
-  else if ((NULL != addr->path) && (NULL != path))
-  {
-    if (0 != strcmp (addr->path, path))
-    {
-      GNUNET_break (0);
-      return GNUNET_NO;
-    }
-  }
-
-  if ((addr->port != port))
-  {
-    GNUNET_break (0);
-    return GNUNET_NO;
-  }
-  return GNUNET_OK;
-}
-
-
-static int
-check_pass (const char *src,
-            const char *protocol,
-            const char *host,
-            int port,
-            const char *path)
-{
-  struct SplittedHTTPAddress *spa;
-
-  spa = http_split_address (src);
-  if (NULL == spa)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  if (GNUNET_OK != check (spa, protocol, host, port, path))
-  {
-    clean (spa);
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  clean (spa);
-  return GNUNET_OK;
-}
-
-
-static int
-check_fail (const char *src)
-{
-  struct SplittedHTTPAddress *spa;
-
-  spa = http_split_address (src);
-  if (NULL != spa)
-  {
-    GNUNET_break (0);
-    clean (spa);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-static void
-test_pass_hostname ()
-{
-  check_pass ("http://test.local", "http", "test.local", HTTP_DEFAULT_PORT, "");
-  check_pass ("http://test.local/", "http", "test.local", HTTP_DEFAULT_PORT,
-              "/");
-  check_pass ("http://test.local/path", "http", "test.local", HTTP_DEFAULT_PORT,
-              "/path");
-  check_pass ("http://test.local/path/", "http", "test.local",
-              HTTP_DEFAULT_PORT, "/path/");
-  check_pass ("http://test.local/path/more", "http", "test.local",
-              HTTP_DEFAULT_PORT, "/path/more");
-  check_pass ("http://test.local:81", "http", "test.local", 81, "");
-  check_pass ("http://test.local:81/", "http", "test.local", 81, "/");
-  check_pass ("http://test.local:81/path", "http", "test.local", 81, "/path");
-  check_pass ("http://test.local:81/path/", "http", "test.local", 81, "/path/");
-  check_pass ("http://test.local:81/path/more", "http", "test.local", 81,
-              "/path/more");
-}
-
-
-static void
-test_pass_ipv4 ()
-{
-  check_pass ("http://127.0.0.1", "http", "127.0.0.1", HTTP_DEFAULT_PORT, "");
-  check_pass ("http://127.0.0.1/", "http", "127.0.0.1", HTTP_DEFAULT_PORT, "/");
-  check_pass ("http://127.0.0.1/path", "http", "127.0.0.1", HTTP_DEFAULT_PORT,
-              "/path");
-  check_pass ("http://127.0.0.1/path/", "http", "127.0.0.1", HTTP_DEFAULT_PORT,
-              "/path/");
-  check_pass ("http://127.0.0.1:81", "http", "127.0.0.1", 81, "");
-  check_pass ("http://127.0.0.1:81/", "http", "127.0.0.1", 81, "/");
-  check_pass ("http://127.0.0.1:81/path", "http", "127.0.0.1", 81, "/path");
-  check_pass ("http://127.0.0.1:81/path/", "http", "127.0.0.1", 81, "/path/");
-  check_pass ("http://127.0.0.1:81/path/more", "http", "127.0.0.1", 81,
-              "/path/more");
-}
-
-
-static void
-test_fail_ipv6 ()
-{
-  check_pass ("http://[::1]", "http", "[::1]", HTTP_DEFAULT_PORT, "");
-  check_pass ("http://[::1]/", "http", "[::1]", HTTP_DEFAULT_PORT, "/");
-  check_pass ("http://[::1]/path", "http", "[::1]", HTTP_DEFAULT_PORT, "/path");
-  check_pass ("http://[::1]/path/", "http", "[::1]", HTTP_DEFAULT_PORT,
-              "/path/");
-  check_pass ("http://[::1]:81", "http", "[::1]", 81, "");
-  check_pass ("http://[::1]:81/", "http", "[::1]", 81, "/");
-  check_pass ("http://[::1]:81/path", "http", "[::1]", 81, "/path");
-  check_pass ("http://[::1]:81/path/", "http", "[::1]", 81, "/path/");
-  check_pass ("http://[::1]:81/path/more", "http", "[::1]", 81, "/path/more");
-}
-
-
-static void
-test_fail ()
-{
-  if (GNUNET_SYSERR == check_fail (""))
-    GNUNET_break (0);
-  if (GNUNET_SYSERR == check_fail ("http"))
-    GNUNET_break (0);
-  if (GNUNET_SYSERR == check_fail ("://"))
-    GNUNET_break (0);
-  if (GNUNET_SYSERR == check_fail ("http://"))
-    GNUNET_break (0);
-  if (GNUNET_SYSERR == check_fail ("//localhost"))
-    GNUNET_break (0);
-  if (GNUNET_SYSERR == check_fail ("//:80"))
-    GNUNET_break (0);
-  if (GNUNET_SYSERR == check_fail ("//:80/"))
-    GNUNET_break (0);
-  if (GNUNET_SYSERR == check_fail ("//:80:"))
-    GNUNET_break (0);
-  if (GNUNET_SYSERR == check_fail ("http://localhost:a/"))
-    GNUNET_break (0);
-  if (GNUNET_SYSERR == check_fail ("http://127.0.0.1:a/"))
-    GNUNET_break (0);
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  int ret = 0;
-  struct SplittedHTTPAddress *spa;
-
-  GNUNET_log_setup ("test", "DEBUG", NULL);
-  spa = http_split_address ("");
-  if (NULL != spa)
-  {
-    clean (spa);
-    spa = NULL;
-    GNUNET_break (0);
-  }
-
-  spa = http_split_address ("http://");
-  if (NULL != spa)
-  {
-    clean (spa);
-    GNUNET_break (0);
-  }
-
-  spa = http_split_address ("://");
-  if (NULL != spa)
-  {
-    clean (spa);
-    GNUNET_break (0);
-  }
-
-  test_pass_hostname ();
-  test_pass_ipv4 ();
-  test_fail_ipv6 ();
-  test_fail ();
-
-  return ret;
-}
-
-
-/* end of test_http_common.c */
diff --git a/src/transport/test_plugin_hostkey b/src/transport/test_plugin_hostkey
deleted file mode 100644
index e7b1ad012..000000000
--- a/src/transport/test_plugin_hostkey
+++ /dev/null
diff --git a/src/transport/test_plugin_hostkey.ecc b/src/transport/test_plugin_hostkey.ecc
deleted file mode 100644
index 18641b798..000000000
--- a/src/transport/test_plugin_hostkey.ecc
+++ /dev/null
@@ -1 +0,0 @@
-‚”ˆÖ’ÛËy¢/HÒc
ȃ§¿±;¼»f?¶@…~áJ
\ No newline at end of file
diff --git a/src/transport/test_plugin_transport.c b/src/transport/test_plugin_transport.c
deleted file mode 100644
index 04687d845..000000000
--- a/src/transport/test_plugin_transport.c
+++ /dev/null
@@ -1,797 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2009, 2018 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport/test_plugin_transport.c
- * @brief testcase for transport_api.c
- * @author Sailor Siraj
- * @author Christian Grothoff
- */
-
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_peerinfo_service.h"
-#include "gnunet_statistics_service.h"
-#include "gnunet_protocols.h"
-#include "gnunet_transport_plugin.h"
-#include "transport.h"
-
-/**
- * How long until we give up on transmitting the message?
- */
-#define WAIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
-
-#define HOSTKEY_FILE "test_plugin_hostkey.ecc"
-
-/**
- * Our public key.
- */
-static struct GNUNET_PeerIdentity my_identity;
-
-/**
- * Our private key.
- */
-static struct GNUNET_CRYPTO_EddsaPrivateKey my_private_key;
-
-/**
- * Our configuration.
- */
-const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-/**
- * Our configuration.
- */
-struct GNUNET_STATISTICS_Handle *stats;
-
-/**
- * Our HELLO
- */
-struct GNUNET_HELLO_Message *hello;
-
-/**
- * Number of neighbours we'd like to have.
- */
-static uint32_t max_connect_per_transport;
-
-/**
- * Environment for this plugin.
- */
-struct GNUNET_TRANSPORT_PluginEnvironment env;
-
-/**
- * handle for the api provided by this plugin
- */
-struct GNUNET_TRANSPORT_PluginFunctions *api;
-
-/**
- * Helper handler
- */
-struct GNUNET_HELPER_Handle *suid_helper;
-
-/**
- * Timeout task
- */
-static struct GNUNET_SCHEDULER_Task *timeout_endbadly;
-
-/**
- * Timeout task
- */
-static struct GNUNET_SCHEDULER_Task *timeout_wait;
-
-/**
- * Library name
- */
-static char *libname;
-
-/**
- * Plugin addresses head
- */
-struct AddressWrapper *head;
-
-/**
- * Plugin addresses tail
- */
-struct AddressWrapper *tail;
-
-unsigned int addresses_reported;
-
-unsigned int pretty_printers_running;
-
-/**
- * Did the test pass or fail?
- */
-static int ok;
-
-struct AddressWrapper
-{
-  struct AddressWrapper *next;
-
-  struct AddressWrapper *prev;
-
-  struct GNUNET_HELLO_Address *address;
-
-  char *addrstring;
-
-  struct GNUNET_SCHEDULER_Task *test_task;
-};
-
-
-static void
-end ()
-{
-  struct AddressWrapper *w;
-  int c = 0;
-
-  ok = 0;
-
-  if (NULL != timeout_endbadly)
-  {
-    GNUNET_SCHEDULER_cancel (timeout_endbadly);
-    timeout_endbadly = NULL;
-  }
-  if (NULL != api)
-    GNUNET_PLUGIN_unload (libname, api);
-
-  while (NULL != head)
-  {
-    w = head;
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Plugin did not remove address `%s'\n",
-                w->addrstring);
-    GNUNET_CONTAINER_DLL_remove (head, tail, w);
-    c++;
-    GNUNET_HELLO_address_free (w->address);
-    GNUNET_free (w->addrstring);
-    GNUNET_free (w);
-  }
-  if (c > 0)
-  {
-    GNUNET_break (0);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Plugin did not remove %u addresses \n",
-                c);
-    ok = 1;
-  }
-
-  GNUNET_free (libname);
-  libname = NULL;
-  GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
-  stats = NULL;
-
-  if (NULL != suid_helper)
-  {
-    GNUNET_HELPER_stop (suid_helper, GNUNET_NO);
-    suid_helper = NULL;
-  }
-}
-
-
-static void
-end_badly (void *cls)
-{
-  struct AddressWrapper *w;
-  int c = 0;
-
-  timeout_endbadly = NULL;
-  if (NULL != timeout_wait)
-  {
-    GNUNET_SCHEDULER_cancel (timeout_wait);
-    timeout_wait = NULL;
-  }
-
-  if (pretty_printers_running > 0)
-  {
-    timeout_endbadly = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                                     &end_badly, &ok);
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Have pending calls to pretty_printer ... deferring shutdown\n");
-    return;
-  }
-
-  if (NULL != cls)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Test took too long to execute, timeout .... \n");
-  }
-
-  if (NULL != libname)
-  {
-    if (NULL != api)
-      GNUNET_PLUGIN_unload (libname, api);
-    GNUNET_free (libname);
-    libname = NULL;
-  }
-
-  while (NULL != head)
-  {
-    w = head;
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Plugin did not remove address `%s'\n",
-                w->addrstring);
-    GNUNET_CONTAINER_DLL_remove (head, tail, w);
-    c++;
-    GNUNET_HELLO_address_free (w->address);
-    if (NULL != w->test_task)
-      GNUNET_SCHEDULER_cancel (w->test_task);
-    GNUNET_free (w->addrstring);
-    GNUNET_free (w);
-  }
-  if (c > 0)
-  {
-    GNUNET_break (0);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Plugin did not remove %u addresses\n",
-                c);
-  }
-
-  if (NULL != stats)
-  {
-    GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
-    stats = NULL;
-  }
-
-  if (NULL != suid_helper)
-  {
-    GNUNET_HELPER_stop (suid_helper, GNUNET_NO);
-    suid_helper = NULL;
-  }
-
-  ok = 1;
-}
-
-
-static void
-wait_end (void *cls)
-{
-  timeout_wait = NULL;
-  if (0 == addresses_reported)
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Plugin did not report any addresses, could not check address conversion functions\n");
-  end ();
-}
-
-
-static void
-end_badly_now ()
-{
-  if (NULL != timeout_wait)
-  {
-    GNUNET_SCHEDULER_cancel (timeout_wait);
-    timeout_wait = NULL;
-  }
-  if (NULL != timeout_endbadly)
-  {
-    GNUNET_SCHEDULER_cancel (timeout_endbadly);
-    timeout_endbadly = NULL;
-  }
-  timeout_endbadly = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-}
-
-
-static struct GNUNET_TIME_Relative
-env_receive (void *cls,
-             const struct GNUNET_HELLO_Address *address,
-             struct GNUNET_ATS_Session *session,
-             const struct GNUNET_MessageHeader *message)
-{
-  /* do nothing */
-  return GNUNET_TIME_relative_get_zero_ ();
-}
-
-
-static int got_reply;
-
-
-/**
- * Take the given address and append it to the set of results sent back to
- * the client.
- *
- * @param cls closure
- * @param address the address to print
- * @param res result code
- */
-static void
-address_pretty_printer_cb (void *cls, const char *address, int res)
-{
-  if (NULL != address)
-  {
-    got_reply = GNUNET_YES;
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Pretty address : `%s'\n", address);
-    pretty_printers_running--;
-  }
-  else
-  {
-    if (GNUNET_NO == got_reply)
-    {
-      pretty_printers_running--;
-      GNUNET_break (0);
-      end_badly_now ();
-    }
-  }
-}
-
-
-static void
-test_addr_string (void *cls)
-{
-  struct AddressWrapper *w = cls;
-  void *s2a;
-  size_t s2a_len;
-
-  w->test_task = NULL;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Testing: address_to_string \n");
-  w->addrstring = GNUNET_strdup (api->address_to_string (api,
-                                                         w->address->address,
-                                                         w->address->
-                                                         address_length));
-  if (NULL == w->addrstring)
-  {
-    GNUNET_break (0);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Plugin cannot convert address to string!\n");
-    end_badly_now ();
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Plugin added address `%s'\n",
-              w->addrstring);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Testing address_to_string: OK\n");
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Testing: string_to_address \n");
-  s2a = NULL;
-  s2a_len = 0;
-  if ((GNUNET_OK !=
-       api->string_to_address (api, w->addrstring,
-                               strlen (w->addrstring) + 1,
-                               &s2a, &s2a_len)) ||
-      (NULL == s2a))
-  {
-    GNUNET_break (0);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Plugin cannot convert string to address!\n");
-    end_badly_now ();
-    return;
-  }
-
-  /*
-     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-     "Plugin creates `%s' %u\n",api->address_to_string (api, s2a, s2a_len), s2a_len);
-
-     int c1;
-     for (c1 = 0; c1 < s2a_len; c1++ )
-     fprintf (stderr, "%u == %u\n", ((char *) s2a)[c1], ((char *) w->addr)[c1]);
-   */if (s2a_len != w->address->address_length)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Plugin creates different address length when converting address->string->address: %u != %u\n",
-                (unsigned int) w->address->address_length,
-                (unsigned int) s2a_len);
-  }
-  else if (0 != memcmp (s2a, w->address->address, s2a_len))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Plugin creates different address length when converting back and forth %i!\n",
-                memcmp (s2a,
-                        w->address->address,
-                        s2a_len));
-  }
-  else
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Testing string_to_address: OK\n");
-  }
-  GNUNET_free (s2a);
-
-  pretty_printers_running++;
-  api->address_pretty_printer (api->cls,
-                               w->address->transport_name,
-                               w->address->address,
-                               w->address->address_length,
-                               GNUNET_YES,
-                               GNUNET_TIME_UNIT_MINUTES,
-                               &address_pretty_printer_cb, w);
-
-  if (GNUNET_OK !=
-      api->check_address (api->cls,
-                          w->address->address,
-                          w->address->address_length))
-  {
-    GNUNET_break (0);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Plugin refuses added address!\n");
-    end_badly_now ();
-    return;
-  }
-  if (NULL != timeout_wait)
-  {
-    GNUNET_SCHEDULER_cancel (timeout_wait);
-    timeout_wait = NULL;
-  }
-  timeout_wait = GNUNET_SCHEDULER_add_delayed (WAIT, &wait_end, NULL);
-}
-
-
-static void
-env_notify_address (void *cls,
-                    int add_remove,
-                    const struct GNUNET_HELLO_Address *address)
-{
-  struct AddressWrapper *w;
-  struct AddressWrapper *wtmp;
-
-  if (GNUNET_YES == add_remove)
-  {
-    addresses_reported++;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Adding address of length %u\n",
-                (unsigned int) address->address_length);
-
-    for (wtmp = head; NULL != wtmp; wtmp = wtmp->next)
-    {
-      if ((address->address_length == wtmp->address->address_length) &&
-          (0 == memcmp (address->address, wtmp->address->address,
-                        address->address_length)))
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    "Duplicate address notification .... \n");
-        return;
-      }
-    }
-
-    w = GNUNET_new (struct AddressWrapper);
-    w->address = GNUNET_HELLO_address_copy (address);
-    GNUNET_CONTAINER_DLL_insert (head, tail, w);
-    got_reply = GNUNET_NO;
-    w->test_task = GNUNET_SCHEDULER_add_now (&test_addr_string,
-                                             w);
-    return;
-  }
-
-  if (GNUNET_NO == add_remove)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Removing address of length %u\n",
-                (unsigned int) address->address_length);
-    w = head;
-    while (NULL != w)
-    {
-      if ((address->address_length == w->address->address_length) &&
-          (0 == memcmp (w->address->address, address->address,
-                        address->address_length)))
-      {
-        break;
-      }
-      w = w->next;
-    }
-
-    if (w == NULL)
-    {
-      GNUNET_break (0);
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Plugin removes address never added!\n");
-      end_badly_now ();
-      return;
-    }
-
-    GNUNET_CONTAINER_DLL_remove (head, tail, w);
-    GNUNET_HELLO_address_free (w->address);
-    GNUNET_free (w->addrstring);
-    GNUNET_free (w);
-    return;
-  }
-  GNUNET_break (0);
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              "Invalid operation: %u\n",
-              add_remove);
-  end_badly_now ();
-}
-
-
-static enum GNUNET_NetworkType
-env_get_address_type (void *cls,
-                      const struct sockaddr *addr,
-                      size_t addrlen)
-{
-  return GNUNET_NT_LOOPBACK;
-}
-
-
-static const struct GNUNET_MessageHeader *
-env_get_our_hello ()
-{
-  return (const struct GNUNET_MessageHeader *) hello;
-}
-
-
-static void
-env_session_end (void *cls,
-                 const struct GNUNET_HELLO_Address *address,
-                 struct GNUNET_ATS_Session *session)
-{
-}
-
-
-static void
-env_update_distance (void *cls,
-                     const struct GNUNET_HELLO_Address *address,
-                     uint32_t distance)
-{
-}
-
-
-static void
-setup_plugin_environment ()
-{
-  env.cfg = cfg;
-  env.cls = &env;
-  env.my_identity = &my_identity;
-  env.max_connections = max_connect_per_transport;
-  env.stats = stats;
-  env.receive = &env_receive;
-  env.notify_address = &env_notify_address;
-  env.get_address_type = &env_get_address_type;
-  env.update_address_distance = &env_update_distance;
-  env.get_our_hello = &env_get_our_hello;
-  env.session_end = &env_session_end;
-}
-
-
-static int
-handle_helper_message (void *cls,
-                       const struct GNUNET_MessageHeader *hdr)
-{
-  return GNUNET_OK;
-}
-
-
-/**
- * Runs the test.
- *
- * @param cls closure
- * @param c configuration to use
- */
-static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *c)
-{
-  char *const *argv = cls;
-  unsigned long long tneigh;
-  char *keyfile;
-  char *plugin;
-  char *sep;
-
-  timeout_endbadly = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
-                                                   &end_badly,
-                                                   &ok);
-  cfg = c;
-  /* parse configuration */
-  if ((GNUNET_OK !=
-       GNUNET_CONFIGURATION_get_value_number (c,
-                                              "TRANSPORT",
-                                              "NEIGHBOUR_LIMIT",
-                                              &tneigh)) ||
-      (GNUNET_OK !=
-       GNUNET_CONFIGURATION_get_value_filename (c,
-                                                "PEER",
-                                                "PRIVATE_KEY",
-                                                &keyfile)))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Transport service is lacking key configuration settings.  Exiting.\n");
-    return;
-  }
-
-  if (NULL == (stats = GNUNET_STATISTICS_create ("transport",
-                                                 cfg)))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Could not create statistics.  Exiting.\n");
-    GNUNET_free (keyfile);
-    end_badly_now ();
-    return;
-  }
-
-  if (GNUNET_OK != GNUNET_DISK_file_test (HOSTKEY_FILE))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Hostkey `%s' missing.  Exiting.\n",
-                HOSTKEY_FILE);
-    GNUNET_free (keyfile);
-    end_badly_now ();
-    return;
-  }
-
-  if (GNUNET_OK !=
-      GNUNET_DISK_directory_create_for_file (keyfile))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Could not create a directory for hostkey `%s'.  Exiting.\n",
-                keyfile);
-    GNUNET_free (keyfile);
-    end_badly_now ();
-    return;
-  }
-
-  if (GNUNET_OK !=
-      GNUNET_DISK_file_copy (HOSTKEY_FILE,
-                             keyfile))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Could not copy hostkey `%s' to destination `%s'.  Exiting.\n",
-                HOSTKEY_FILE,
-                keyfile);
-    GNUNET_free (keyfile);
-    end_badly_now ();
-    return;
-  }
-
-  max_connect_per_transport = (uint32_t) tneigh;
-  if (GNUNET_SYSERR ==
-      GNUNET_CRYPTO_eddsa_key_from_file (keyfile,
-                                         GNUNET_YES,
-                                         &my_private_key))
-  {
-    GNUNET_free (keyfile);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Could not access hostkey.  Exiting.\n");
-    end_badly_now ();
-    return;
-  }
-  GNUNET_free (keyfile);
-  GNUNET_CRYPTO_eddsa_key_get_public (&my_private_key,
-                                      &my_identity.public_key);
-
-  hello = GNUNET_HELLO_create (&my_identity.public_key, NULL, NULL, GNUNET_NO);
-
-  /* load plugins... */
-  setup_plugin_environment ();
-
-  GNUNET_assert (strlen (argv[0]) > strlen ("test_plugin_"));
-  plugin = strstr (argv[0], "test_plugin_");
-  sep = strrchr (argv[0], '.');
-  if (NULL == plugin)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Not a valid test name\n");
-    end_badly_now ();
-    return;
-  }
-  plugin += strlen ("test_plugin_");
-  if (NULL != sep)
-    sep[0] = '\0';
-
-  /* Hack for WLAN: start a second helper */
-  if (0 == strcmp (plugin, "wlan"))
-  {
-    char *helper_argv[3];
-    helper_argv[0] = (char *) "gnunet-helper-transport-wlan-dummy";
-    helper_argv[1] = (char *) "2";
-    helper_argv[2] = NULL;
-    suid_helper = GNUNET_HELPER_start (GNUNET_NO,
-                                       "gnunet-helper-transport-wlan-dummy",
-                                       helper_argv,
-                                       &handle_helper_message, NULL, NULL);
-  }
-
-  /* Loading plugin */
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Loading transport plugin %s\n", plugin);
-  GNUNET_asprintf (&libname, "libgnunet_plugin_transport_%s", plugin);
-  api = GNUNET_PLUGIN_load (libname, &env);
-  if (NULL == api)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to load transport plugin for %s\n", plugin);
-    end_badly_now ();
-    return;
-  }
-
-  timeout_wait = GNUNET_SCHEDULER_add_delayed (WAIT, &wait_end, NULL);
-
-  /* Check if all functions are implemented */
-  if (NULL == api->address_pretty_printer)
-  {
-    GNUNET_break (0);
-    end_badly_now ();
-    return;
-  }
-  if (NULL == api->address_to_string)
-  {
-    GNUNET_break (0);
-    end_badly_now ();
-    return;
-  }
-  GNUNET_assert (NULL != api->check_address);
-  if (NULL == api->check_address)
-  {
-    GNUNET_break (0);
-    end_badly_now ();
-    return;
-  }
-  GNUNET_assert (NULL != api->disconnect_peer);
-  if (NULL == api->disconnect_peer)
-  {
-    GNUNET_break (0);
-    end_badly_now ();
-    return;
-  }
-  GNUNET_assert (NULL != api->get_session);
-  if (NULL == api->get_session)
-  {
-    GNUNET_break (0);
-    end_badly_now ();
-    return;
-  }
-  if (NULL == api->address_pretty_printer)
-  {
-    GNUNET_break (0);
-    end_badly_now ();
-    return;
-  }
-  if (NULL == api->string_to_address)
-  {
-    GNUNET_break (0);
-    end_badly_now ();
-    return;
-  }
-}
-
-
-/**
- * The main function for the test
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc,
-      char *const *argv)
-{
-  static struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-  int ret;
-  char *const argv_prog[] = {
-    "test_plugin_transport",
-    "-c",
-    "test_plugin_transport_data.conf",
-    NULL
-  };
-
-  GNUNET_log_setup ("test-plugin-transport",
-                    "WARNING",
-                    NULL);
-  GNUNET_DISK_purge_cfg_dir ("test_plugin_transport_data.conf",
-                             "GNUNET_TEST_HOME");
-  ok = 1; /* set to fail */
-  ret =
-    (GNUNET_OK
-     == GNUNET_PROGRAM_run (3, argv_prog, "test-plugin-transport",
-                            "testcase", options, &run, (void *) argv)) ? ok : 1;
-  GNUNET_DISK_purge_cfg_dir ("test_plugin_transport_data.conf",
-                             "GNUNET_TEST_HOME");
-  return ret;
-}
-
-
-/* end of test_plugin_transport.c */
diff --git a/src/transport/test_plugin_transport_data.conf b/src/transport/test_plugin_transport_data.conf
deleted file mode 100644
index b667a4854..000000000
--- a/src/transport/test_plugin_transport_data.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-@INLINE@ test_transport_defaults.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunetd-plugin-transport/
-
-[transport-tcp]
-PORT = 52400
-
-[transport-udp]
-PORT = 52401
-
-[transport-wlan]
-INTERFACE = mon0
-TESTMODE = 1
-
-[transport-bluetooth]
-INTERFACE = hci0
-TESTMODE = 1
-
-[transport-http_server]
-PORT = 52402
-
-[transport-https_server]
-PORT = 52403
-
-[arm]
-PORT = 52360
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-arm.sock
-
-[statistics]
-PORT = 52361
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics.sock
-
-[resolver]
-PORT = 52362
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver.sock
-
-[peerinfo]
-PORT = 52363
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-peerinfo.sock
-
-[transport]
-PORT = 52364
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport.sock
-
-[nat]
-RETURN_LOCAL_ADDRESSES = YES
-DISABLEV6 = NO
diff --git a/src/transport/test_plugin_transport_data_udp.conf b/src/transport/test_plugin_transport_data_udp.conf
deleted file mode 100644
index 8b1378917..000000000
--- a/src/transport/test_plugin_transport_data_udp.conf
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c
deleted file mode 100644
index c3c46db37..000000000
--- a/src/transport/test_quota_compliance.c
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2009, 2010, 2011, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport/test_quota_compliance.c
- * @brief base test case for transport implementations
- *
- * This test case tests quota compliance both on transport level
- */
-#include "platform.h"
-#include "gnunet_transport_service.h"
-#include "gnunet_ats_service.h"
-#include "gauger.h"
-#include "transport-testing.h"
-
-/**
- * Testcase timeout
- */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 480)
-
-#define DURATION GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 80)
-
-
-static struct GNUNET_SCHEDULER_Task *measure_task;
-
-static char *gen_cfgs[2];
-
-static unsigned long long quota_in[] = { 10000, 10000 };
-
-static unsigned long long quota_out[] = { 10000, 10000 };
-
-static struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc;
-
-
-/**
- * Note that this value must not significantly exceed
- * 'MAX_PENDING' in 'gnunet-service-transport.c', otherwise
- * messages may be dropped even for a reliable transport.
- */
-#define TOTAL_MSGS (1024 * 32)
-
-static unsigned long long total_bytes_recv;
-
-static struct GNUNET_TIME_Absolute start_time;
-
-
-static void
-report ()
-{
-  unsigned long long delta;
-  unsigned long long datarate;
-
-  delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value_us;
-  if (0 == delta)
-    delta = 1;
-  datarate = (total_bytes_recv * 1000 * 1000) / delta;
-
-  fprintf (stderr,
-           "Throughput was %llu b/s\n",
-           datarate);
-  ccc->global_ret = GNUNET_OK;
-  if (datarate > 1.5 * quota_in[1])
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Datarate of %llu b/s significantly higher than allowed inbound quota of %llu b/s\n",
-                datarate,
-                quota_in[1]);
-    ccc->global_ret = GNUNET_SYSERR;
-  }
-  if (datarate > 1.5 * quota_out[0])
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Datarate of %llu b/s significantly higher than allowed outbound quota of %llu b/s\n",
-                datarate,
-                quota_out[0]);
-    ccc->global_ret = GNUNET_SYSERR;
-  }
-  if (GNUNET_OK == ccc->global_ret)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Datarate of %llu b/s complied to allowed outbound quota of %llu b/s and inbound quota of %llu b/s\n",
-                datarate,
-                quota_out[0],
-                quota_in[1]);
-  }
-}
-
-
-static void
-custom_shutdown (void *cls)
-{
-  if (NULL != measure_task)
-  {
-    GNUNET_SCHEDULER_cancel (measure_task);
-    measure_task = NULL;
-  }
-  report ();
-}
-
-
-static size_t
-get_size (unsigned int iter)
-{
-  size_t ret;
-
-  ret = (iter * iter * iter) % 60000;
-  ret += sizeof(struct GNUNET_TRANSPORT_TESTING_TestMessage);
-  return ret;
-}
-
-
-static void
-notify_receive (void *cls,
-                struct GNUNET_TRANSPORT_TESTING_PeerContext *receiver,
-                const struct GNUNET_PeerIdentity *sender,
-                const struct GNUNET_TRANSPORT_TESTING_TestMessage *hdr)
-{
-  if (GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE != ntohs (hdr->header.type))
-    return;
-  total_bytes_recv += ntohs (hdr->header.size);
-
-  {
-    char *ps = GNUNET_strdup (GNUNET_i2s (&receiver->id));
-
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Peer %u (`%s') got message %u of size %u from peer (`%s')\n",
-                receiver->no,
-                ps,
-                ntohl (hdr->num),
-                ntohs (hdr->header.size),
-                GNUNET_i2s (sender));
-    GNUNET_free (ps);
-  }
-}
-
-
-static void
-measure (void *cls)
-{
-  static int counter;
-
-  measure_task = NULL;
-  counter++;
-  if ((DURATION.rel_value_us / 1000 / 1000LL) < counter)
-  {
-    fprintf (stderr, "%s", ".\n");
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-  fprintf (stderr, "%s", ".");
-  measure_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                               &measure,
-                                               NULL);
-}
-
-
-static void
-start_task (void *cls)
-{
-  static struct GNUNET_TRANSPORT_TESTING_SendClosure sc = {
-    .num_messages = TOTAL_MSGS,
-    .get_size_cb = &get_size
-  };
-
-  sc.ccc = ccc;
-  measure_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                               &measure,
-                                               NULL);
-  start_time = GNUNET_TIME_absolute_get ();
-  GNUNET_SCHEDULER_add_now (&GNUNET_TRANSPORT_TESTING_simple_send,
-                            &sc);
-}
-
-
-static char *
-generate_config (const char *cfg_file,
-                 unsigned long long quota_in,
-                 unsigned long long quota_out)
-{
-  char *in_name;
-  char *out_name;
-  char *fname = NULL;
-  struct GNUNET_CONFIGURATION_Handle *cfg = GNUNET_CONFIGURATION_create ();
-
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONFIGURATION_load (cfg,
-                                            cfg_file));
-  GNUNET_asprintf (&fname,
-                   "q_in_%llu_q_out_%llu_%s",
-                   quota_in,
-                   quota_out,
-                   cfg_file);
-  GNUNET_CONFIGURATION_set_value_string (cfg,
-                                         "PATHS",
-                                         "DEFAULTCONFIG",
-                                         fname);
-  for (int c = 0; c < GNUNET_NT_COUNT; c++)
-  {
-    GNUNET_asprintf (&in_name,
-                     "%s_QUOTA_IN",
-                     GNUNET_NT_to_string (c));
-    GNUNET_asprintf (&out_name,
-                     "%s_QUOTA_OUT",
-                     GNUNET_NT_to_string (c));
-    GNUNET_CONFIGURATION_set_value_number (cfg,
-                                           "ats",
-                                           in_name,
-                                           quota_in);
-    GNUNET_CONFIGURATION_set_value_number (cfg,
-                                           "ats",
-                                           out_name,
-                                           quota_out);
-    GNUNET_free (in_name);
-    GNUNET_free (out_name);
-  }
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONFIGURATION_write (cfg,
-                                             fname));
-  GNUNET_CONFIGURATION_destroy (cfg);
-  return fname;
-}
-
-
-static int
-check (void *cls,
-       struct GNUNET_TRANSPORT_TESTING_Handle *tth_,
-       const char *test_plugin_,
-       const char *test_name_,
-       unsigned int num_peers,
-       char *cfg_files[])
-{
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext my_ccc = {
-    .connect_continuation = &start_task,
-    .config_file = "test_quota_compliance_data.conf",
-    .rec = &notify_receive,
-    .nc = &GNUNET_TRANSPORT_TESTING_log_connect,
-    .nd = &GNUNET_TRANSPORT_TESTING_log_disconnect,
-    .shutdown_task = &custom_shutdown,
-    .timeout = TIMEOUT
-  };
-
-  ccc = &my_ccc;
-
-  if (NULL != strstr (test_name_,
-                      "asymmetric"))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Running asymmetric test with sending peer unlimited, receiving peer (in/out): %llu/%llu b/s \n",
-                quota_in[1],
-                quota_out[1]);
-    quota_out[0] = 1024 * 1024 * 1024;
-    quota_in[0] = 1024 * 1024 * 1024;
-  }
-  else
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Running symmetric test with (in/out) %llu/%llu b/s \n",
-                quota_in[1],
-                quota_out[1]);
-  }
-  for (unsigned int i = 0; i < 2; i++)
-  {
-    gen_cfgs[i] = generate_config (cfg_files[i],
-                                   quota_in[i],
-                                   quota_out[i]);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Generated config file `%s'\n",
-                gen_cfgs[i]);
-  }
-
-  return GNUNET_TRANSPORT_TESTING_connect_check (&my_ccc,
-                                                 tth_,
-                                                 test_plugin_,
-                                                 test_name_,
-                                                 num_peers,
-                                                 gen_cfgs);
-}
-
-
-int
-main (int argc,
-      char *argv[])
-{
-  if (GNUNET_OK !=
-      GNUNET_TRANSPORT_TESTING_main (2,
-                                     &check,
-                                     NULL))
-  {
-    GNUNET_break (0);
-    return 1;
-  }
-  for (unsigned int i = 0; i < 2; i++)
-  {
-    if ((NULL != gen_cfgs[i]) &&
-        (GNUNET_YES == GNUNET_DISK_file_test (gen_cfgs[i])))
-    {
-      GNUNET_DISK_directory_remove (gen_cfgs[i]);
-      GNUNET_free (gen_cfgs[i]);
-    }
-  }
-  return 0;
-}
-
-
-/* end of test_quota_compliance.c */
diff --git a/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf b/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf
deleted file mode 100644
index 86bdf6db4..000000000
--- a/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-bluetooth-p1/
-
-[transport-bluetooth]
-INTERFACE = hci0
-TESTMODE = 1
-
-[transport]
-PLUGINS = bluetooth
-
-
diff --git a/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf b/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf
deleted file mode 100644
index 086688e73..000000000
--- a/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-bluetooth-p2/
-
-[transport-bluetooth]
-INTERFACE = hci1
-TESTMODE = 2
-
-[transport]
-PLUGINS = bluetooth
-
diff --git a/src/transport/test_quota_compliance_bluetooth_peer1.conf b/src/transport/test_quota_compliance_bluetooth_peer1.conf
deleted file mode 100644
index 3f86ee940..000000000
--- a/src/transport/test_quota_compliance_bluetooth_peer1.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-bluetooth-p1/
-
-[transport-bluetooth]
-INTERFACE = hci0
-TESTMODE = 1
-
-[arm]
-PORT = 12164
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12163
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12162
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12161
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12160
-PLUGINS = bluetooth
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-
-
diff --git a/src/transport/test_quota_compliance_bluetooth_peer2.conf b/src/transport/test_quota_compliance_bluetooth_peer2.conf
deleted file mode 100644
index 5fc178395..000000000
--- a/src/transport/test_quota_compliance_bluetooth_peer2.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-bluetooth-p2/
-
-[transport-bluetooth]
-INTERFACE = hci1
-TESTMODE = 2
-
-[arm]
-PORT = 12174
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12173
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12172
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12171
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12170
-PLUGINS = bluetooth
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
diff --git a/src/transport/test_quota_compliance_data.conf b/src/transport/test_quota_compliance_data.conf
deleted file mode 100644
index 1bc607770..000000000
--- a/src/transport/test_quota_compliance_data.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-@INLINE@ test_transport_defaults.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunetd-plugin-transport/
-
-[transport-tcp]
-PORT = 52368
-TIMEOUT = 5 s
-
-[arm]
-PORT = 52366
-
-[statistics]
-PORT = 52367
-
-[resolver]
-PORT = 52364
-
-[peerinfo]
-PORT = 52369
-
-[transport]
-PORT = 52365
-
-
diff --git a/src/transport/test_quota_compliance_http_asymmetric_peer1.conf b/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
deleted file mode 100644
index b2ff1913f..000000000
--- a/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test_quota_compliance_peer1
-
-[transport-http_client]
-
-[arm]
-PORT = 54015
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_arm_peer1.sock
-
-[statistics]
-PORT = 54014
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_statistics_peer1.sock
-
-[resolver]
-PORT = 54013
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_resolver_peer1.sock
-
-[peerinfo]
-PORT = 54012
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_peerinfo_peer1.sock
-
-[transport]
-PORT = 54011
-PLUGINS = http_client
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_transport_peer1.sock
-
-
diff --git a/src/transport/test_quota_compliance_http_asymmetric_peer2.conf b/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
deleted file mode 100644
index 3408d9f2e..000000000
--- a/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test_quota_compliance_peer2
-
-[transport-http_server]
-PORT = 53010
-USE_IPv6 = NO
-BINDTO = 127.0.0.1
-
-
-[arm]
-PORT = 53015
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_arm_peer2.sock
-
-[statistics]
-PORT = 53014
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_statistics_peer2.sock
-
-[resolver]
-PORT = 53013
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_resolver_peer2.sock
-
-[peerinfo]
-PORT = 53012
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_peerinfo_peer2.sock
-
-[transport]
-PORT = 53011
-PLUGINS = http_server
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_transport_peer2.sock
-
-
diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf
deleted file mode 100644
index b2ff1913f..000000000
--- a/src/transport/test_quota_compliance_http_peer1.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test_quota_compliance_peer1
-
-[transport-http_client]
-
-[arm]
-PORT = 54015
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_arm_peer1.sock
-
-[statistics]
-PORT = 54014
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_statistics_peer1.sock
-
-[resolver]
-PORT = 54013
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_resolver_peer1.sock
-
-[peerinfo]
-PORT = 54012
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_peerinfo_peer1.sock
-
-[transport]
-PORT = 54011
-PLUGINS = http_client
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_transport_peer1.sock
-
-
diff --git a/src/transport/test_quota_compliance_http_peer2.conf b/src/transport/test_quota_compliance_http_peer2.conf
deleted file mode 100644
index 3408d9f2e..000000000
--- a/src/transport/test_quota_compliance_http_peer2.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test_quota_compliance_peer2
-
-[transport-http_server]
-PORT = 53010
-USE_IPv6 = NO
-BINDTO = 127.0.0.1
-
-
-[arm]
-PORT = 53015
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_arm_peer2.sock
-
-[statistics]
-PORT = 53014
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_statistics_peer2.sock
-
-[resolver]
-PORT = 53013
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_resolver_peer2.sock
-
-[peerinfo]
-PORT = 53012
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_peerinfo_peer2.sock
-
-[transport]
-PORT = 53011
-PLUGINS = http_server
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_transport_peer2.sock
-
-
diff --git a/src/transport/test_quota_compliance_https_asymmetric_peer1.conf b/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
deleted file mode 100644
index 94aa534ef..000000000
--- a/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test_quota_compliance_peer1/
-
-[transport-https_client]
-
-[arm]
-PORT = 54006
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_arm_peer1.sock
-
-[statistics]
-PORT = 54005
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_statistics_peer1.sock
-
-[resolver]
-PORT = 54004
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_resolver_peer1.sock
-
-[peerinfo]
-PORT = 54003
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_peerinfo_peer1.sock
-
-[transport]
-PORT = 54002
-PLUGINS = https_client
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_transport_peer1.sock
-
-
diff --git a/src/transport/test_quota_compliance_https_asymmetric_peer2.conf b/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
deleted file mode 100644
index 8fb8861cd..000000000
--- a/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test_quota_compliance_peer2
-
-[transport-https_server]
-PORT = 53001
-KEY_FILE = https_key_quota_p2.key
-CERT_FILE = https_cert_qutoa_p2.crt
-
-[arm]
-PORT = 53006
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_arm_peer2.sock
-
-[statistics]
-PORT = 53005
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_statistics_peer2.sock
-
-[resolver]
-PORT = 53004
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_resolver_peer2.sock
-
-[peerinfo]
-PORT = 53003
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_peerinfo_peer2.sock
-
-[transport]
-PORT = 53002
-PLUGINS = https_server
-UNIXPATH = $GNUNET_RUNTIME_DIR/https_transport_peer2.sock
-
-
diff --git a/src/transport/test_quota_compliance_https_peer1.conf b/src/transport/test_quota_compliance_https_peer1.conf
deleted file mode 100644
index 94aa534ef..000000000
--- a/src/transport/test_quota_compliance_https_peer1.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test_quota_compliance_peer1/
-
-[transport-https_client]
-
-[arm]
-PORT = 54006
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_arm_peer1.sock
-
-[statistics]
-PORT = 54005
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_statistics_peer1.sock
-
-[resolver]
-PORT = 54004
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_resolver_peer1.sock
-
-[peerinfo]
-PORT = 54003
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_peerinfo_peer1.sock
-
-[transport]
-PORT = 54002
-PLUGINS = https_client
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_transport_peer1.sock
-
-
diff --git a/src/transport/test_quota_compliance_https_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf
deleted file mode 100644
index 8fb8861cd..000000000
--- a/src/transport/test_quota_compliance_https_peer2.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test_quota_compliance_peer2
-
-[transport-https_server]
-PORT = 53001
-KEY_FILE = https_key_quota_p2.key
-CERT_FILE = https_cert_qutoa_p2.crt
-
-[arm]
-PORT = 53006
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_arm_peer2.sock
-
-[statistics]
-PORT = 53005
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_statistics_peer2.sock
-
-[resolver]
-PORT = 53004
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_resolver_peer2.sock
-
-[peerinfo]
-PORT = 53003
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_peerinfo_peer2.sock
-
-[transport]
-PORT = 53002
-PLUGINS = https_server
-UNIXPATH = $GNUNET_RUNTIME_DIR/https_transport_peer2.sock
-
-
diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
deleted file mode 100644
index 0e0cbff24..000000000
--- a/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/quota-tcp-p1/
-
-[transport-tcp]
-PORT = 54094
-
-[transport-udp]
-PORT = 54094
-
-[arm]
-PORT = 54087
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_arm_peer1.sock
-
-[statistics]
-PORT = 54088
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_statistics_peer1.sock
-
-[resolver]
-PORT = 54089
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_resolver_peer1.sock
-
-[peerinfo]
-PORT = 54090
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_peerinfo_peer1.sock
-
-[transport]
-PORT = 54091
-PLUGINS = tcp
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_transport_peer1.sock
-
-
diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
deleted file mode 100644
index e9757b080..000000000
--- a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/quota-tcp-p2/
-
-[transport-tcp]
-PORT = 12015
-TIMEOUT = 5 s
-
-[arm]
-PORT = 12014
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12013
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12012
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12011
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12010
-PLUGINS = tcp
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
diff --git a/src/transport/test_quota_compliance_tcp_peer1.conf b/src/transport/test_quota_compliance_tcp_peer1.conf
deleted file mode 100644
index 0e0cbff24..000000000
--- a/src/transport/test_quota_compliance_tcp_peer1.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/quota-tcp-p1/
-
-[transport-tcp]
-PORT = 54094
-
-[transport-udp]
-PORT = 54094
-
-[arm]
-PORT = 54087
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_arm_peer1.sock
-
-[statistics]
-PORT = 54088
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_statistics_peer1.sock
-
-[resolver]
-PORT = 54089
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_resolver_peer1.sock
-
-[peerinfo]
-PORT = 54090
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_peerinfo_peer1.sock
-
-[transport]
-PORT = 54091
-PLUGINS = tcp
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_transport_peer1.sock
-
-
diff --git a/src/transport/test_quota_compliance_tcp_peer2.conf b/src/transport/test_quota_compliance_tcp_peer2.conf
deleted file mode 100644
index a7b2cf90b..000000000
--- a/src/transport/test_quota_compliance_tcp_peer2.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
-
-[transport-tcp]
-PORT = 12015
-TIMEOUT = 5 s
-
-[arm]
-PORT = 12014
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12013
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12012
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12011
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12010
-PLUGINS = tcp
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
diff --git a/src/transport/test_quota_compliance_udp_peer1.conf b/src/transport/test_quota_compliance_udp_peer1.conf
deleted file mode 100644
index bba75c168..000000000
--- a/src/transport/test_quota_compliance_udp_peer1.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test_quota_compliance_peer1/
-
-[transport-udp]
-PORT = 54368
-MAX_BPS = 50000000
-
-[arm]
-PORT = 54087
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_arm_peer1.sock
-
-[statistics]
-PORT = 54088
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_statistics_peer1.sock
-
-[resolver]
-PORT = 54089
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_resolver_peer1.sock
-
-[peerinfo]
-PORT = 54090
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_peerinfo_peer1.sock
-
-[transport]
-PORT = 54091
-PLUGINS = udp
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_transport_peer1.sock
-
diff --git a/src/transport/test_quota_compliance_udp_peer2.conf b/src/transport/test_quota_compliance_udp_peer2.conf
deleted file mode 100644
index 1cb04038c..000000000
--- a/src/transport/test_quota_compliance_udp_peer2.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test_quota_compliance_peer2
-
-[transport-udp]
-PORT = 53368
-MAX_BPS = 50000000
-
-[arm]
-PORT = 53087
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_arm_peer2.sock
-
-[statistics]
-PORT = 53088
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_statistics_peer2.sock
-
-[resolver]
-PORT = 53089
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_resolver_peer2.sock
-
-[peerinfo]
-PORT = 53090
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_peerinfo_peer2.sock
-
-[transport]
-PORT = 53091
-PLUGINS = udp
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_transport_peer2.sock
-
-
diff --git a/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf b/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf
deleted file mode 100644
index a8ee6d77a..000000000
--- a/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test_quota_compliance_peer1/
-
-[arm]
-PORT = 54087
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_arm_peer1.sock
-
-[statistics]
-PORT = 54088
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_statistics_peer1.sock
-
-[resolver]
-PORT = 54089
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_resolver_peer1.sock
-
-[peerinfo]
-PORT = 54090
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_peerinfo_peer1.sock
-
-[transport]
-PORT = 54091
-PLUGINS = unix
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_transport_peer1.sock
-
-[transport-unix]
-PORT = 54092
-
diff --git a/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf b/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
deleted file mode 100644
index 6edbcac9f..000000000
--- a/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test_quota_compliance_peer2
-
-[arm]
-PORT = 53087
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_arm_peer2.sock
-
-[statistics]
-PORT = 53088
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_statistics_peer2.sock
-
-[resolver]
-PORT = 53089
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_resolver_peer2.sock
-
-[peerinfo]
-PORT = 53090
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_peerinfo_peer2.sock
-
-[transport]
-PORT = 53091
-PLUGINS = unix
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_transport_peer2.sock
-
-[transport-unix]
-PORT = 53368
-
diff --git a/src/transport/test_quota_compliance_unix_peer1.conf b/src/transport/test_quota_compliance_unix_peer1.conf
deleted file mode 100644
index 59c8d6d9e..000000000
--- a/src/transport/test_quota_compliance_unix_peer1.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test_quota_compliance_peer1/
-
-[transport-unix]
-PORT = 12120
-
-[arm]
-PORT = 54087
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_arm_peer1.sock
-
-[statistics]
-PORT = 54088
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_statistics_peer1.sock
-
-[resolver]
-PORT = 54089
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_resolver_peer1.sock
-
-[peerinfo]
-PORT = 54090
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_peerinfo_peer1.sock
-
-[transport]
-PORT = 54091
-PLUGINS = unix
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_transport_peer1.sock
diff --git a/src/transport/test_quota_compliance_unix_peer2.conf b/src/transport/test_quota_compliance_unix_peer2.conf
deleted file mode 100644
index 8c2f9989e..000000000
--- a/src/transport/test_quota_compliance_unix_peer2.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test_quota_compliance_peer2
-
-[transport-unix]
-PORT = 12136
-
-[arm]
-PORT = 53087
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_arm_peer2.sock
-
-[statistics]
-PORT = 53088
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_statistics_peer2.sock
-
-[resolver]
-PORT = 53089
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_resolver_peer2.sock
-
-[peerinfo]
-PORT = 53090
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_peerinfo_peer2.sock
-
-[transport]
-PORT = 53091
-PLUGINS = unix
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_transport_peer2.sock
-
-[transport-unix]
-PORT = 53368
-
diff --git a/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf b/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf
deleted file mode 100644
index 78e280b68..000000000
--- a/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-wlan-p1/
-
-[transport-wlan]
-TESTMODE = 1
-
-[arm]
-PORT = 12164
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12163
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12162
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12161
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12160
-PLUGINS = wlan
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-
-
diff --git a/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf b/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf
deleted file mode 100644
index e97ab3f38..000000000
--- a/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-wlan-p2/
-
-[transport-wlan]
-INTERFACE = mon1
-TESTMODE = 2
-
-[arm]
-PORT = 12174
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12173
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12172
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12171
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12170
-PLUGINS = wlan
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
diff --git a/src/transport/test_quota_compliance_wlan_peer1.conf b/src/transport/test_quota_compliance_wlan_peer1.conf
deleted file mode 100644
index 78e280b68..000000000
--- a/src/transport/test_quota_compliance_wlan_peer1.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-wlan-p1/
-
-[transport-wlan]
-TESTMODE = 1
-
-[arm]
-PORT = 12164
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12163
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12162
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12161
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12160
-PLUGINS = wlan
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-
-
diff --git a/src/transport/test_quota_compliance_wlan_peer2.conf b/src/transport/test_quota_compliance_wlan_peer2.conf
deleted file mode 100644
index e97ab3f38..000000000
--- a/src/transport/test_quota_compliance_wlan_peer2.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-wlan-p2/
-
-[transport-wlan]
-INTERFACE = mon1
-TESTMODE = 2
-
-[arm]
-PORT = 12174
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12173
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12172
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12171
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12170
-PLUGINS = wlan
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
diff --git a/src/transport/test_transport_address_switch.c b/src/transport/test_transport_address_switch.c
deleted file mode 100644
index ce5117bd1..000000000
--- a/src/transport/test_transport_address_switch.c
+++ /dev/null
@@ -1,433 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2009, 2010, 2011, 2016 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport/test_transport_address_switch.c
- * @brief base test case for transport implementations
- *
- * This test case tests if peers can successfully switch addresses when
- * connected for plugins supporting multiple addresses by monitoring transport's
- * statistic values.
- *
- * This test starts 2 peers and connects them. When connected test messages
- * are transmitted from peer 2 to peer 1. The test monitors transport's
- * statistics values for information about address switch attempts.
- *
- * The test passes with success if one of the peers could successfully switch
- * addresses in connected state and a test message was successfully transmitted
- * after this switch.
- *
- * Since it is not possible to trigger an address switch from outside,
- * the test returns "77" (skipped) when no address switching attempt
- * takes place. It fails if an address switch attempt fails.
- *
- * NOTE: The test seems largely useless right now, as we simply NEVER
- * switch addresses under the test conditions.  However, it may be a
- * good starting point for a future test.  For now, it always times
- * out and returns "77" (skipped), so we set the timeout suitably low.
- */
-#include "platform.h"
-#include "gnunet_transport_service.h"
-#include "gnunet_ats_service.h"
-#include "transport-testing.h"
-
-
-/**
- * Testcase timeout (set aggressively as we know this test doesn't work right now)
- */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
-
-
-static struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc;
-
-static struct GNUNET_SCHEDULER_Task *measure_task;
-
-
-/**
- * Statistics we track per peer.
- */
-struct PeerStats
-{
-  struct GNUNET_STATISTICS_Handle *stat;
-
-  unsigned int addresses_avail;
-
-  unsigned int switch_attempts;
-
-  unsigned int switch_success;
-
-  unsigned int switch_fail;
-};
-
-static struct PeerStats stats[2];
-
-/* Amount of data transferred since last switch attempt */
-static unsigned long long bytes_sent_after_switch;
-
-static unsigned long long bytes_recv_after_switch;
-
-
-static int
-stat_start_attempt_cb (void *cls,
-                       const char *subsystem,
-                       const char *name,
-                       uint64_t value,
-                       int is_persistent)
-{
-  struct PeerStats *stat = cls;
-
-  stat->switch_attempts++;
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Switch attempted (%p)", stat);
-  bytes_recv_after_switch = 0;
-  bytes_sent_after_switch = 0;
-
-  return GNUNET_OK;
-}
-
-
-static int
-stat_success_attempt_cb (void *cls,
-                         const char *subsystem,
-                         const char *name,
-                         uint64_t value,
-                         int is_persistent)
-{
-  struct PeerStats *stat = cls;
-
-  stat->switch_success++;
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Switch succeeded (%p)", stat);
-  return GNUNET_OK;
-}
-
-
-static int
-stat_fail_attempt_cb (void *cls,
-                      const char *subsystem,
-                      const char *name,
-                      uint64_t value,
-                      int is_persistent)
-{
-  struct PeerStats *stat = cls;
-
-  if (value == 0)
-    return GNUNET_OK;
-
-  stat->switch_fail++;
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Switch failed (%p)", stat);
-  return GNUNET_OK;
-}
-
-
-static int
-stat_addresses_available (void *cls,
-                          const char *subsystem,
-                          const char *name,
-                          uint64_t value,
-                          int is_persistent)
-{
-  struct PeerStats *stat = cls;
-
-  stat->addresses_avail++;
-  return GNUNET_OK;
-}
-
-
-/**
- * List of statistics entries we care about.
- */
-static struct WatchEntry
-{
-  /**
-   * Name of the statistic we watch.
-   */
-  const char *stat_name;
-
-  /**
-   * Handler to register;
-   */
-  GNUNET_STATISTICS_Iterator stat_handler;
-} watches[] =
-{ { "# Attempts to switch addresses", &stat_start_attempt_cb },
-  { "# Successful attempts to switch addresses", &stat_success_attempt_cb },
-  { "# Failed attempts to switch addresses (failed to send CONNECT CONT)",
-    &stat_fail_attempt_cb },
-  { "# Failed attempts to switch addresses (failed to send CONNECT)",
-    &stat_fail_attempt_cb },
-  { "# Failed attempts to switch addresses (no response)",
-    &stat_fail_attempt_cb },
-  { "# transport addresses", &stat_addresses_available },
-  { NULL, NULL } };
-
-
-static void
-custom_shutdown (void *cls)
-{
-  int result;
-
-  if (NULL != measure_task)
-  {
-    GNUNET_SCHEDULER_cancel (measure_task);
-    measure_task = NULL;
-  }
-  if (0 == stats[0].switch_attempts + stats[1].switch_attempts)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Test did not work, as peers didn't switch (flawed testcase)!\n");
-    ccc->global_ret = 77;
-  }
-  else
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Fail (timeout)! No transmission after switch! Stopping peers\n");
-    ccc->global_ret = 77;   /* GNUNET_SYSERR; */
-  }
-
-  /* stop statistics */
-  for (unsigned int i = 0; i < 2; i++)
-  {
-    if (NULL != stats[i].stat)
-    {
-      for (unsigned int j = 0; NULL != watches[j].stat_name; j++)
-        GNUNET_assert (GNUNET_OK ==
-                       GNUNET_STATISTICS_watch_cancel (stats[i].stat,
-                                                       "transport",
-                                                       watches[j].stat_name,
-                                                       watches[j].stat_handler,
-                                                       &stats[i]));
-      GNUNET_STATISTICS_destroy (stats[i].stat, GNUNET_NO);
-      stats[i].stat = NULL;
-    }
-  }
-
-  result = 0;
-  fprintf (stderr, "\n");
-  if (stats[0].switch_attempts > 0)
-  {
-    fprintf (
-      stderr,
-      "Peer 1 tried %u times to switch and succeeded %u times, failed %u times\n",
-      stats[0].switch_attempts,
-      stats[0].switch_success,
-      stats[0].switch_fail);
-    if (stats[0].switch_success != stats[0].switch_attempts)
-    {
-      GNUNET_break (0);
-      result++;
-    }
-  }
-  else if (stats[0].addresses_avail > 1)
-  {
-    fprintf (stderr,
-             "Peer 1 had %u addresses available, but did not try to switch\n",
-             stats[0].addresses_avail);
-  }
-  if (stats[1].switch_attempts > 0)
-  {
-    fprintf (
-      stderr,
-      "Peer 2 tried %u times to switch and succeeded %u times, failed %u times\n",
-      stats[1].switch_attempts,
-      stats[1].switch_success,
-      stats[1].switch_fail);
-    if (stats[1].switch_success != stats[1].switch_attempts)
-    {
-      GNUNET_break (0);
-      result++;
-    }
-  }
-  else if (stats[1].addresses_avail > 1)
-  {
-    fprintf (stderr,
-             "Peer 2 had %u addresses available, but did not try to switch\n",
-             stats[1].addresses_avail);
-  }
-
-  if (((stats[0].switch_attempts > 0) || (stats[1].switch_attempts > 0)) &&
-      (bytes_sent_after_switch == 0))
-  {
-    fprintf (stderr, "No data sent after switching!\n");
-    GNUNET_break (0);
-    result++;
-  }
-  if (((stats[0].switch_attempts > 0) || (stats[1].switch_attempts > 0)) &&
-      (bytes_recv_after_switch == 0))
-  {
-    fprintf (stderr, "No data received after switching!\n");
-    GNUNET_break (0);
-    result++;
-  }
-#if 0
-  /* This test is not really expected to pass right now... */
-  if (0 != result)
-    ccc->global_ret = GNUNET_SYSERR;
-#endif
-}
-
-
-static void
-notify_receive (void *cls,
-                struct GNUNET_TRANSPORT_TESTING_PeerContext *receiver,
-                const struct GNUNET_PeerIdentity *sender,
-                const struct GNUNET_TRANSPORT_TESTING_TestMessage *hdr)
-{
-  if (GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE != ntohs (hdr->header.type))
-    return;
-
-  {
-    char *ps = GNUNET_strdup (GNUNET_i2s (&receiver->id));
-
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Peer %u (`%s') got message %u of size %u from peer (`%s')\n",
-                receiver->no,
-                ps,
-                (uint32_t) ntohl (hdr->num),
-                ntohs (hdr->header.size),
-                GNUNET_i2s (sender));
-    GNUNET_free (ps);
-  }
-  if (((stats[0].switch_attempts >= 1) || (stats[1].switch_attempts >= 1)) &&
-      (stats[0].switch_attempts ==
-       stats[0].switch_fail + stats[0].switch_success) &&
-      (stats[1].switch_attempts ==
-       stats[1].switch_fail + stats[1].switch_success))
-  {
-    bytes_recv_after_switch += ntohs (hdr->header.size);
-    if ((bytes_sent_after_switch > 0) && (bytes_recv_after_switch > 0))
-    {
-      /* A peer switched addresses and sent and received data after the
-       * switch operations */
-      GNUNET_SCHEDULER_shutdown ();
-    }
-  }
-}
-
-
-static void
-notify_send (void *cls)
-{
-  static uint32_t cnt;
-
-  GNUNET_assert (
-    GNUNET_OK ==
-    GNUNET_TRANSPORT_TESTING_send (ccc->p[1],
-                                   ccc->p[0],
-                                   GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE,
-                                   GNUNET_TRANSPORT_TESTING_LARGE_MESSAGE_SIZE,
-                                   ++cnt,
-                                   &notify_send,
-                                   NULL));
-  if (((stats[0].switch_attempts >= 1) || (stats[1].switch_attempts >= 1)) &&
-      (stats[0].switch_attempts ==
-       stats[0].switch_fail + stats[0].switch_success) &&
-      (stats[1].switch_attempts ==
-       stats[1].switch_fail + stats[1].switch_success))
-  {
-    bytes_sent_after_switch += GNUNET_TRANSPORT_TESTING_LARGE_MESSAGE_SIZE;
-  }
-}
-
-
-static void
-progress_indicator (void *cls)
-{
-  static int counter;
-
-  measure_task = NULL;
-  counter++;
-  if ((TIMEOUT.rel_value_us / 1000 / 1000LL) < counter)
-  {
-    fprintf (stderr, "%s", ".\n");
-  }
-  else
-  {
-    fprintf (stderr, "%s", ".");
-    measure_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                                 &progress_indicator,
-                                                 NULL);
-  }
-}
-
-
-static void
-connected_cb (void *cls)
-{
-  for (unsigned int i = 0; i < 2; i++)
-  {
-    stats[i].stat = GNUNET_STATISTICS_create ("transport", ccc->p[i]->cfg);
-    if (NULL == stats[i].stat)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Fail! Could not create statistics for peers!\n");
-      ccc->global_ret = GNUNET_SYSERR;
-      GNUNET_SCHEDULER_shutdown ();
-      return;
-    }
-    for (unsigned int j = 0; NULL != watches[j].stat_name; j++)
-    {
-      GNUNET_STATISTICS_watch (stats[i].stat,
-                               "transport",
-                               watches[j].stat_name,
-                               watches[j].stat_handler,
-                               &stats[i]);
-    }
-  }
-  /* Show progress */
-  ccc->global_ret = GNUNET_OK;
-  measure_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                               &progress_indicator,
-                                               NULL);
-  /* Peers are connected, start transmit test messages */
-  GNUNET_assert (
-    GNUNET_OK ==
-    GNUNET_TRANSPORT_TESTING_send (ccc->p[1],
-                                   ccc->p[0],
-                                   GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE,
-                                   GNUNET_TRANSPORT_TESTING_LARGE_MESSAGE_SIZE,
-                                   0,
-                                   &notify_send,
-                                   NULL));
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext my_ccc =
-  { .connect_continuation = &connected_cb,
-    .config_file = "test_transport_api_data.conf",
-    .rec = &notify_receive,
-    .nc = &GNUNET_TRANSPORT_TESTING_log_connect,
-    .shutdown_task = &custom_shutdown,
-    .timeout = TIMEOUT };
-
-  ccc = &my_ccc;
-  int ret;
-
-  ret = GNUNET_TRANSPORT_TESTING_main (2,
-                                       &GNUNET_TRANSPORT_TESTING_connect_check,
-                                       ccc);
-  if (77 == ret)
-    return 77;
-  if (GNUNET_OK != ret)
-    return 1;
-  return 0;
-}
-
-
-/* end of test_transport_address_switch.c */
diff --git a/src/transport/test_transport_address_switch_http_peer1.conf b/src/transport/test_transport_address_switch_http_peer1.conf
deleted file mode 100644
index b48c5f47f..000000000
--- a/src/transport/test_transport_address_switch_http_peer1.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
-
-[ats]
-UNSPECIFIED_QUOTA_IN = 8 KiB
-UNSPECIFIED_QUOTA_OUT = 8 KiB
-# LOOPBACK
-LOOPBACK_QUOTA_IN = 8 KiB
-LOOPBACK_QUOTA_OUT = 8 KiB
-# LAN
-LAN_QUOTA_IN = 8 KiB
-LAN_QUOTA_OUT = 8 KiB
-# WAN
-WAN_QUOTA_IN = 8 KiB
-WAN_QUOTA_OUT = 8 KiB
-# WLAN
-WLAN_QUOTA_IN = 8 KiB
-WLAN_QUOTA_OUT = 8 KiB
-# BLUETOOTH
-BLUETOOTH_QUOTA_IN = 8 KiB
-BLUETOOTH_QUOTA_OUT = 8 KiB
-
-[transport]
-PLUGINS = http_server http_client
-
diff --git a/src/transport/test_transport_address_switch_http_peer2.conf b/src/transport/test_transport_address_switch_http_peer2.conf
deleted file mode 100644
index be8fb506c..000000000
--- a/src/transport/test_transport_address_switch_http_peer2.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
-
-[ats]
-UNSPECIFIED_QUOTA_IN = 8 KiB
-UNSPECIFIED_QUOTA_OUT = 8 KiB
-# LOOPBACK
-LOOPBACK_QUOTA_IN = 8 KiB
-LOOPBACK_QUOTA_OUT = 8 KiB
-# LAN
-LAN_QUOTA_IN = 8 KiB
-LAN_QUOTA_OUT = 8 KiB
-# WAN
-WAN_QUOTA_IN = 8 KiB
-WAN_QUOTA_OUT = 8 KiB
-# WLAN
-WLAN_QUOTA_IN = 8 KiB
-WLAN_QUOTA_OUT = 8 KiB
-# BLUETOOTH
-BLUETOOTH_QUOTA_IN = 8 KiB
-BLUETOOTH_QUOTA_OUT = 8 KiB
-
-[transport]
-PLUGINS = http_client http_server
-
diff --git a/src/transport/test_transport_address_switch_https_peer1.conf b/src/transport/test_transport_address_switch_https_peer1.conf
deleted file mode 100644
index 1f9210130..000000000
--- a/src/transport/test_transport_address_switch_https_peer1.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
-
-[ats]
-UNSPECIFIED_QUOTA_IN = 8 KiB
-UNSPECIFIED_QUOTA_OUT = 8 KiB
-# LOOPBACK
-LOOPBACK_QUOTA_IN = 8 KiB
-LOOPBACK_QUOTA_OUT = 8 KiB
-# LAN
-LAN_QUOTA_IN = 8 KiB
-LAN_QUOTA_OUT = 8 KiB
-# WAN
-WAN_QUOTA_IN = 8 KiB
-WAN_QUOTA_OUT = 8 KiB
-# WLAN
-WLAN_QUOTA_IN = 8 KiB
-WLAN_QUOTA_OUT = 8 KiB
-# BLUETOOTH
-BLUETOOTH_QUOTA_IN = 8 KiB
-BLUETOOTH_QUOTA_OUT = 8 KiB
-
-[arm]
-PORT = 12005
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12004
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12003
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12002
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12001
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-PLUGINS = https_client https_server
-
diff --git a/src/transport/test_transport_address_switch_https_peer2.conf b/src/transport/test_transport_address_switch_https_peer2.conf
deleted file mode 100644
index c58839868..000000000
--- a/src/transport/test_transport_address_switch_https_peer2.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
-
-[ats]
-UNSPECIFIED_QUOTA_IN = 8 KiB
-UNSPECIFIED_QUOTA_OUT = 8 KiB
-# LOOPBACK
-LOOPBACK_QUOTA_IN = 8 KiB
-LOOPBACK_QUOTA_OUT = 8 KiB
-# LAN
-LAN_QUOTA_IN = 8 KiB
-LAN_QUOTA_OUT = 8 KiB
-# WAN
-WAN_QUOTA_IN = 8 KiB
-WAN_QUOTA_OUT = 8 KiB
-# WLAN
-WLAN_QUOTA_IN = 8 KiB
-WLAN_QUOTA_OUT = 8 KiB
-# BLUETOOTH
-BLUETOOTH_QUOTA_IN = 8 KiB
-BLUETOOTH_QUOTA_OUT = 8 KiB
-
-[arm]
-PORT = 12014
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12013
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12012
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12011
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12010
-PLUGINS = https_client https_server
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
diff --git a/src/transport/test_transport_address_switch_tcp_peer1.conf b/src/transport/test_transport_address_switch_tcp_peer1.conf
deleted file mode 100644
index cfcbfe41c..000000000
--- a/src/transport/test_transport_address_switch_tcp_peer1.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
-
-[ats]
-UNSPECIFIED_QUOTA_IN = 8 KiB
-UNSPECIFIED_QUOTA_OUT = 8 KiB
-# LOOPBACK
-LOOPBACK_QUOTA_IN = 8 KiB
-LOOPBACK_QUOTA_OUT = 8 KiB
-# LAN
-LAN_QUOTA_IN = 8 KiB
-LAN_QUOTA_OUT = 8 KiB
-# WAN
-WAN_QUOTA_IN = 8 KiB
-WAN_QUOTA_OUT = 8 KiB
-# WLAN
-WLAN_QUOTA_IN = 8 KiB
-WLAN_QUOTA_OUT = 8 KiB
-# BLUETOOTH
-BLUETOOTH_QUOTA_IN = 8 KiB
-BLUETOOTH_QUOTA_OUT = 8 KiB
-
-[transport-tcp]
-PORT = 12000
-TIMEOUT = 5 s
-
-[arm]
-PORT = 12005
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12004
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12003
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12002
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12001
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-PLUGINS = tcp
-
diff --git a/src/transport/test_transport_address_switch_tcp_peer2.conf b/src/transport/test_transport_address_switch_tcp_peer2.conf
deleted file mode 100644
index bda2354b6..000000000
--- a/src/transport/test_transport_address_switch_tcp_peer2.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
-
-[ats]
-UNSPECIFIED_QUOTA_IN = 8 KiB
-UNSPECIFIED_QUOTA_OUT = 8 KiB
-# LOOPBACK
-LOOPBACK_QUOTA_IN = 8 KiB
-LOOPBACK_QUOTA_OUT = 8 KiB
-# LAN
-LAN_QUOTA_IN = 8 KiB
-LAN_QUOTA_OUT = 8 KiB
-# WAN
-WAN_QUOTA_IN = 8 KiB
-WAN_QUOTA_OUT = 8 KiB
-# WLAN
-WLAN_QUOTA_IN = 8 KiB
-WLAN_QUOTA_OUT = 8 KiB
-# BLUETOOTH
-BLUETOOTH_QUOTA_IN = 8 KiB
-BLUETOOTH_QUOTA_OUT = 8 KiB
-
-[transport-tcp]
-PORT = 12015
-TIMEOUT = 5 s
-
-[arm]
-PORT = 12014
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12013
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12012
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12011
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12010
-PLUGINS = tcp
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
diff --git a/src/transport/test_transport_address_switch_udp_peer1.conf b/src/transport/test_transport_address_switch_udp_peer1.conf
deleted file mode 100644
index bdc3a2253..000000000
--- a/src/transport/test_transport_address_switch_udp_peer1.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
-
-[ats]
-UNSPECIFIED_QUOTA_IN = 8 KiB
-UNSPECIFIED_QUOTA_OUT = 8 KiB
-# LOOPBACK
-LOOPBACK_QUOTA_IN = 8 KiB
-LOOPBACK_QUOTA_OUT = 8 KiB
-# LAN
-LAN_QUOTA_IN = 8 KiB
-LAN_QUOTA_OUT = 8 KiB
-# WAN
-WAN_QUOTA_IN = 8 KiB
-WAN_QUOTA_OUT = 8 KiB
-# WLAN
-WLAN_QUOTA_IN = 8 KiB
-WLAN_QUOTA_OUT = 8 KiB
-# BLUETOOTH
-BLUETOOTH_QUOTA_IN = 8 KiB
-BLUETOOTH_QUOTA_OUT = 8 KiB
-
-[transport-tcp]
-PORT = 12000
-TIMEOUT = 5 s
-
-[arm]
-PORT = 12005
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12004
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12003
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12002
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12001
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-PLUGINS = udp
-
diff --git a/src/transport/test_transport_address_switch_udp_peer2.conf b/src/transport/test_transport_address_switch_udp_peer2.conf
deleted file mode 100644
index ae6397db4..000000000
--- a/src/transport/test_transport_address_switch_udp_peer2.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
-
-[ats]
-UNSPECIFIED_QUOTA_IN = 8 KiB
-UNSPECIFIED_QUOTA_OUT = 8 KiB
-# LOOPBACK
-LOOPBACK_QUOTA_IN = 8 KiB
-LOOPBACK_QUOTA_OUT = 8 KiB
-# LAN
-LAN_QUOTA_IN = 8 KiB
-LAN_QUOTA_OUT = 8 KiB
-# WAN
-WAN_QUOTA_IN = 8 KiB
-WAN_QUOTA_OUT = 8 KiB
-# WLAN
-WLAN_QUOTA_IN = 8 KiB
-WLAN_QUOTA_OUT = 8 KiB
-# BLUETOOTH
-BLUETOOTH_QUOTA_IN = 8 KiB
-BLUETOOTH_QUOTA_OUT = 8 KiB
-
-[transport-tcp]
-PORT = 12015
-TIMEOUT = 5 s
-
-[arm]
-PORT = 12014
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12013
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12012
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12011
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12010
-PLUGINS = udp
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
deleted file mode 100644
index 5f5e03a9e..000000000
--- a/src/transport/test_transport_api.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2009, 2010, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport/test_transport_api.c
- * @brief base test case for transport implementations
- * @author Christian Grothoff
- *
- * This test case serves as a base for tcp, udp, and udp-nat
- * transport test cases.  Based on the executable being run
- * the correct test case will be performed.  Conservation of
- * C code apparently.
- */
-#include "platform.h"
-#include "gnunet_transport_service.h"
-#include "transport-testing.h"
-
-/**
- * How long until we give up on transmitting the message?
- */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
-
-static struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc;
-
-
-static void
-notify_receive (void *cls,
-                struct GNUNET_TRANSPORT_TESTING_PeerContext *receiver,
-                const struct GNUNET_PeerIdentity *sender,
-                const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
-  {
-    char *ps = GNUNET_strdup (GNUNET_i2s (&receiver->id));
-
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Peer %u (`%s') received message of type %d and size %u size from peer %s!\n",
-                receiver->no,
-                ps,
-                ntohs (message->header.type),
-                ntohs (message->header.size),
-                GNUNET_i2s (sender));
-    GNUNET_free (ps);
-  }
-
-  if ((GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE == ntohs (message->header.type)) &&
-      (GNUNET_TRANSPORT_TESTING_LARGE_MESSAGE_SIZE == ntohs (
-         message->header.size)))
-  {
-    ccc->global_ret = GNUNET_OK;
-    GNUNET_SCHEDULER_shutdown ();
-  }
-  else
-  {
-    GNUNET_break (0);
-    ccc->global_ret = GNUNET_SYSERR;
-    GNUNET_SCHEDULER_shutdown ();
-  }
-}
-
-
-/**
- * Runs the test.
- *
- * @param argv the argv argument from main()
- * @param bi_directional should we try to establish connections
- *        in both directions simultaneously?
- */
-static int
-test (char *argv[],
-      int bi_directional)
-{
-  struct GNUNET_TRANSPORT_TESTING_SendClosure sc = {
-    .num_messages = 1
-  };
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext my_ccc = {
-    .connect_continuation = &GNUNET_TRANSPORT_TESTING_large_send,
-    .connect_continuation_cls = &sc,
-    .config_file = "test_transport_api_data.conf",
-    .rec = &notify_receive,
-    .nc = &GNUNET_TRANSPORT_TESTING_log_connect,
-    .nd = &GNUNET_TRANSPORT_TESTING_log_disconnect,
-    .timeout = TIMEOUT,
-    .bi_directional = bi_directional
-  };
-
-  ccc = &my_ccc;
-  sc.ccc = ccc;
-  if (GNUNET_OK !=
-      GNUNET_TRANSPORT_TESTING_main (2,
-                                     &GNUNET_TRANSPORT_TESTING_connect_check,
-                                     ccc))
-    return 1;
-  return 0;
-}
-
-
-int
-main (int argc,
-      char *argv[])
-{
-  if ((0 != test (argv,
-                  GNUNET_NO)) ||
-      (0 != test (argv,
-                  GNUNET_YES)))
-    return 1;
-  return 0;
-}
-
-
-/* end of test_transport_api.c */
diff --git a/src/transport/test_transport_api2.c b/src/transport/test_transport_api2.c
deleted file mode 100644
index e1606e0be..000000000
--- a/src/transport/test_transport_api2.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2009, 2010, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport/test_transport_api.c
- * @brief base test case for transport implementations
- * @author Christian Grothoff
- *
- * This test case serves as a base for tcp, udp, and udp-nat
- * transport test cases.  Based on the executable being run
- * the correct test case will be performed.  Conservation of
- * C code apparently.
- */
-#include "platform.h"
-//#include "gnunet_transport_service.h"
-#include "transport-testing2.h"
-
-/**
- * How long until we give up on transmitting the message?
- */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
-
-static struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc;
-
-
-static void
-notify_receive (void *cls,
-                struct GNUNET_TRANSPORT_TESTING_PeerContext *receiver,
-                const struct GNUNET_PeerIdentity *sender,
-                const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
-  {
-    char *ps = GNUNET_strdup (GNUNET_i2s (&receiver->id));
-
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Peer %u (`%s') received message of type %d and size %u size from peer %s!\n",
-                receiver->no,
-                ps,
-                ntohs (message->header.type),
-                ntohs (message->header.size),
-                GNUNET_i2s (sender));
-    GNUNET_free (ps);
-  }
-
-  if ((GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE == ntohs (message->header.type)) &&
-      (GNUNET_TRANSPORT_TESTING_LARGE_MESSAGE_SIZE == ntohs (
-         message->header.size)))
-  {
-    ccc->global_ret = GNUNET_OK;
-    GNUNET_SCHEDULER_shutdown ();
-  }
-  else
-  {
-    GNUNET_break (0);
-    ccc->global_ret = GNUNET_SYSERR;
-    GNUNET_SCHEDULER_shutdown ();
-  }
-}
-
-
-/**
- * Runs the test.
- *
- * @param argv the argv argument from main()
- * @param bi_directional should we try to establish connections
- *        in both directions simultaneously?
- */
-static int
-test (char *argv[],
-      int bi_directional)
-{
-  struct GNUNET_TRANSPORT_TESTING_SendClosure sc = {
-    .num_messages = 1
-  };
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext my_ccc = {
-    .connect_continuation = &GNUNET_TRANSPORT_TESTING_large_send,
-    .connect_continuation_cls = &sc,
-    .config_file = "test_transport_api_data.conf",
-    .rec = &notify_receive,
-    .nc = &GNUNET_TRANSPORT_TESTING_log_connect,
-    .nd = &GNUNET_TRANSPORT_TESTING_log_disconnect,
-    .timeout = TIMEOUT,
-    .bi_directional = bi_directional
-  };
-
-  ccc = &my_ccc;
-  sc.ccc = ccc;
-  if (GNUNET_OK !=
-      GNUNET_TRANSPORT_TESTING_main (2,
-                                     &GNUNET_TRANSPORT_TESTING_connect_check,
-                                     ccc))
-    return 1;
-  return 0;
-}
-
-
-int
-main (int argc,
-      char *argv[])
-{
-  if ((0 != test (argv,
-                  GNUNET_NO)) ||
-      (0 != test (argv,
-                  GNUNET_YES)))
-    return 1;
-  return 0;
-}
-
-
-/* end of test_transport_api.c */
diff --git a/src/transport/test_transport_api2_tcp_node1.conf b/src/transport/test_transport_api2_tcp_node1.conf
deleted file mode 100644
index b8a743a3b..000000000
--- a/src/transport/test_transport_api2_tcp_node1.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
-
-[transport]
-BINARY = gnunet-service-tng
-PLUGINS = tcp
-#PREFIX = valgrind --leak-check=full --track-origins=yes --trace-children=yes --log-file=/tmp/vg_peer1-%p 
-UNIXPATH = $GNUNET_RUNTIME_DIR/tng-p1.sock
-
-[communicator-tcp]
-BINARY = gnunet-communicator-tcp
-BINDTO = 192.168.15.1:60002
-DISABLE_V6 = YES
-IMMEDIATE_START = YES
-UNIXPATH = $GNUNET_RUNTIME_DIR/tcp-comm-p1.sock
-#PREFIX = valgrind --leak-check=full --track-origins=yes --trace-children=yes --log-file=/tmp/vg_ctpeer1-%p
-#PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
-
-[communicator-udp]
-#PREFIX = valgrind --leak-check=full --track-origins=yes --trace-children=yes --log-file=/tmp/vg_cupeer1-%p
-BINARY = gnunet-communicator-udp
-BINDTO = 192.168.15.1:60002
-DISABLE_V6 = YES
-IMMEDIATE_START = YES
-UNIXPATH = $GNUNET_RUNTIME_DIR/udp-comm-p1.sock
-
-[peerstore]
-IMMEDIATE_START = YES
-
-#[transport]
-#PREFIX = valgrind
diff --git a/src/transport/test_transport_api2_tcp_node2.conf b/src/transport/test_transport_api2_tcp_node2.conf
deleted file mode 100644
index f94368b3f..000000000
--- a/src/transport/test_transport_api2_tcp_node2.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
-
-[transport]
-BINARY = gnunet-service-tng
-#PREFIX = valgrind --log-file=/tmp/vg_peer2-%p
-UNIXPATH = $GNUNET_RUNTIME_DIR/tng-p2.sock
-
-[communicator-tcp]
-BINARY = gnunet-communicator-tcp
-BINDTO = 192.168.15.2:60003
-DISABLE_V6 = YES
-IMMEDIATE_START = YES
-#PREFIX = valgrind --log-file=/tmp/vg_comm2-%p
-UNIXPATH = $GNUNET_RUNTIME_DIR/tcp-comm-p2.sock
-
-[peerstore]
-IMMEDIATE_START = YES
-
-#[transport]
-#PREFIX = valgrind
diff --git a/src/transport/test_transport_api2_tcp_peer1.conf b/src/transport/test_transport_api2_tcp_peer1.conf
deleted file mode 100644
index 745ed6887..000000000
--- a/src/transport/test_transport_api2_tcp_peer1.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
-
-[transport]
-BINARY = gnunet-service-tng
-PLUGINS = tcp
-#PREFIX = valgrind --log-file=/tmp/vg_peer1-%p
-UNIXPATH = $GNUNET_RUNTIME_DIR/tng-p1.sock
-
-[communicator-tcp]
-BINARY = gnunet-communicator-tcp
-BINDTO = 60002
-DISABLE_V6 = YES
-IMMEDIATE_START = YES
-UNIXPATH = $GNUNET_RUNTIME_DIR/tcp-comm-p1.sock
-#PREFIX = valgrind --log-file=/tmp/vg_cpeer1-%p
-
-[peerstore]
-IMMEDIATE_START = YES
-
-#[transport]
-#PREFIX = valgrind
diff --git a/src/transport/test_transport_api2_tcp_peer2.conf b/src/transport/test_transport_api2_tcp_peer2.conf
deleted file mode 100644
index 022468bcd..000000000
--- a/src/transport/test_transport_api2_tcp_peer2.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
-
-[transport]
-BINARY = gnunet-service-tng
-#PREFIX = valgrind --log-file=/tmp/vg_peer2-%p
-UNIXPATH = $GNUNET_RUNTIME_DIR/tng-p2.sock
-
-[communicator-tcp]
-BINARY = gnunet-communicator-tcp
-BINDTO = 60003
-DISABLE_V6 = YES
-IMMEDIATE_START = YES
-#PREFIX = valgrind --log-file=/tmp/vg_comm2-%p
-UNIXPATH = $GNUNET_RUNTIME_DIR/tcp-comm-p2.sock
-
-[peerstore]
-IMMEDIATE_START = YES
-
-#[transport]
-#PREFIX = valgrind
diff --git a/src/transport/test_transport_api_blacklisting.c b/src/transport/test_transport_api_blacklisting.c
deleted file mode 100644
index 2ba88a863..000000000
--- a/src/transport/test_transport_api_blacklisting.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2009, 2010, 2011, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/test_transport_api_blacklisting.c
- * @brief test for the blacklisting API
- * @author Matthias Wachs
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "gnunet_transport_service.h"
-#include "transport-testing.h"
-
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
-
-static struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc;
-
-static int connected;
-
-static int blacklist_request_p1;
-
-static int blacklist_request_p2;
-
-static struct GNUNET_TRANSPORT_Blacklist *blacklist_p1;
-
-static struct GNUNET_TRANSPORT_Blacklist *blacklist_p2;
-
-static struct GNUNET_SCHEDULER_Task *shutdown_task;
-
-
-static void
-end (void *cls)
-{
-  shutdown_task = NULL;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Stopping\n");
-  if ((GNUNET_YES == blacklist_request_p1) &&
-      (GNUNET_YES == blacklist_request_p2) &&
-      (GNUNET_NO == connected))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Peers were never connected, success\n");
-    ccc->global_ret = GNUNET_OK;
-  }
-  else
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Peers were not connected, fail\n");
-    ccc->global_ret = GNUNET_SYSERR;
-  }
-  GNUNET_SCHEDULER_shutdown ();
-}
-
-
-static void
-custom_shutdown (void *cls)
-{
-  if (NULL != shutdown_task)
-  {
-    GNUNET_SCHEDULER_cancel (shutdown_task);
-    shutdown_task = NULL;
-  }
-  if (NULL != blacklist_p1)
-  {
-    GNUNET_TRANSPORT_blacklist_cancel (blacklist_p1);
-    blacklist_p1 = NULL;
-  }
-  if (NULL != blacklist_p2)
-  {
-    GNUNET_TRANSPORT_blacklist_cancel (blacklist_p2);
-    blacklist_p2 = NULL;
-  }
-}
-
-
-static void
-notify_receive (void *cls,
-                struct GNUNET_TRANSPORT_TESTING_PeerContext *receiver,
-                const struct GNUNET_PeerIdentity *sender,
-                const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              "Unexpectedly even received the message despite blacklist\n");
-  connected = GNUNET_YES;
-  GNUNET_SCHEDULER_cancel (shutdown_task);
-  end (NULL);
-}
-
-
-static void
-notify_connect (void *cls,
-                struct GNUNET_TRANSPORT_TESTING_PeerContext *me,
-                const struct GNUNET_PeerIdentity *other)
-{
-  GNUNET_TRANSPORT_TESTING_log_connect (cls,
-                                        me,
-                                        other);
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-              "Peers connected despite blacklist!\n");
-  connected = GNUNET_YES; /* this test now failed */
-  GNUNET_SCHEDULER_cancel (shutdown_task);
-  end (NULL);
-}
-
-
-static int
-blacklist_cb (void *cls,
-              const struct GNUNET_PeerIdentity *pid)
-{
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls;
-  int res = GNUNET_SYSERR;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Peer %u: Blacklist request for peer `%s'\n",
-              p->no,
-              GNUNET_i2s (pid));
-
-  if (p == ccc->p[0])
-  {
-    blacklist_request_p1 = GNUNET_YES;
-    res = GNUNET_OK;
-  }
-  if (p == ccc->p[1])
-  {
-    blacklist_request_p2 = GNUNET_YES;
-    res = GNUNET_SYSERR;
-  }
-
-  if ((GNUNET_YES == blacklist_request_p2) &&
-      (GNUNET_YES == blacklist_request_p1) &&
-      (NULL == shutdown_task))
-  {
-    shutdown_task
-      = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (
-                                        GNUNET_TIME_UNIT_SECONDS, 3),
-                                      &end,
-                                      NULL);
-  }
-  return res;
-}
-
-
-static void
-start_blacklist (void *cls)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Starting blacklists\n");
-  blacklist_p1 = GNUNET_TRANSPORT_blacklist (ccc->p[0]->cfg,
-                                             &blacklist_cb,
-                                             ccc->p[0]);
-  GNUNET_assert (NULL != blacklist_p1);
-  blacklist_p2 = GNUNET_TRANSPORT_blacklist (ccc->p[1]->cfg,
-                                             &blacklist_cb,
-                                             ccc->p[1]);
-  GNUNET_assert (NULL != blacklist_p2);
-}
-
-
-int
-main (int argc,
-      char *argv[])
-{
-  struct GNUNET_TRANSPORT_TESTING_SendClosure sc = {
-    .num_messages = 1
-  };
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext my_ccc = {
-    .pre_connect_task = &start_blacklist,
-    .connect_continuation = &GNUNET_TRANSPORT_TESTING_simple_send,
-    .connect_continuation_cls = &sc,
-    .config_file = "test_transport_api_data.conf",
-    .rec = &notify_receive,
-    .nc = &notify_connect,
-    .nd = &GNUNET_TRANSPORT_TESTING_log_disconnect,
-    .shutdown_task = &custom_shutdown,
-    .timeout = TIMEOUT,
-    .bi_directional = GNUNET_YES
-  };
-
-  ccc = &my_ccc;
-  if (GNUNET_OK !=
-      GNUNET_TRANSPORT_TESTING_main (2,
-                                     &GNUNET_TRANSPORT_TESTING_connect_check,
-                                     ccc))
-    return 1;
-  return 0;
-}
-
-
-/* end of transport_api_blacklisting.c */
diff --git a/src/transport/test_transport_api_blacklisting_tcp_peer1.conf b/src/transport/test_transport_api_blacklisting_tcp_peer1.conf
deleted file mode 100644
index eabd6b701..000000000
--- a/src/transport/test_transport_api_blacklisting_tcp_peer1.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
-
-[transport]
-PLUGINS = tcp
-
-#[transport]
-#PREFIX = valgrind
diff --git a/src/transport/test_transport_api_blacklisting_tcp_peer2.conf b/src/transport/test_transport_api_blacklisting_tcp_peer2.conf
deleted file mode 100644
index 58ce0777f..000000000
--- a/src/transport/test_transport_api_blacklisting_tcp_peer2.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
-
-[transport]
-PLUGINS = tcp
-
-#[transport]
-#PREFIX = valgrind
diff --git a/src/transport/test_transport_api_bluetooth_peer1.conf b/src/transport/test_transport_api_bluetooth_peer1.conf
deleted file mode 100644
index b1209e44b..000000000
--- a/src/transport/test_transport_api_bluetooth_peer1.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-bluetooth-p1/
-
-[transport-bluetooth]
-INTERFACE = hci0
-TESTMODE = 1
-
-[transport]
-PLUGINS = bluetooth
diff --git a/src/transport/test_transport_api_bluetooth_peer2.conf b/src/transport/test_transport_api_bluetooth_peer2.conf
deleted file mode 100644
index 371a5d3b0..000000000
--- a/src/transport/test_transport_api_bluetooth_peer2.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-bluetooth-p2/
-
-[transport-bluetooth]
-INTERFACE = hci1
-TESTMODE = 2
-
-[transport]
-PLUGINS = bluetooth
diff --git a/src/transport/test_transport_api_data.conf b/src/transport/test_transport_api_data.conf
deleted file mode 100644
index c06235a0a..000000000
--- a/src/transport/test_transport_api_data.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-@INLINE@ test_transport_defaults.conf
-[PATHS]
-
-[transport-tcp]
-PORT = 52094
-
-[transport-udp]
-PORT = 52094
-
diff --git a/src/transport/test_transport_api_disconnect.c b/src/transport/test_transport_api_disconnect.c
deleted file mode 100644
index c469f28bc..000000000
--- a/src/transport/test_transport_api_disconnect.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2009, 2010, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport/test_transport_api_disconnect.c
- * @brief base test case for transport implementations
- *
- * This test case tests disconnect notifications in peer shutdown.
- * Starts two peers, has them connect, sends a message in between,
- * stops one peer, expects the others to send a disconnect notification.
- */
-#include "platform.h"
-#include "gnunet_transport_service.h"
-#include "transport-testing.h"
-
-/**
- * How long until we give up on transmitting the message?
- */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120)
-
-
-static struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc;
-
-static int shutdown_;
-
-
-static void
-notify_disconnect (void *cls,
-                   struct GNUNET_TRANSPORT_TESTING_PeerContext *me,
-                   const struct GNUNET_PeerIdentity *other)
-{
-  if (me != ccc->p[0])
-    return;
-  GNUNET_TRANSPORT_TESTING_log_disconnect (cls,
-                                           me,
-                                           other);
-  if (GNUNET_YES == shutdown_)
-  {
-    ccc->global_ret = GNUNET_OK;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Test good, shutting down...\n");
-    GNUNET_SCHEDULER_shutdown ();
-  }
-}
-
-
-static void
-stop_peer (void *cls)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Shutting down peer %u (`%s')\n",
-              ccc->p[1]->no,
-              GNUNET_i2s (&ccc->p[1]->id));
-  shutdown_ = GNUNET_YES;
-  GNUNET_TRANSPORT_TESTING_stop_peer (ccc->p[1]);
-  ccc->p[1] = NULL;
-}
-
-
-static void
-notify_receive (void *cls,
-                struct GNUNET_TRANSPORT_TESTING_PeerContext *receiver,
-                const struct GNUNET_PeerIdentity *sender,
-                const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
-  {
-    char *ps = GNUNET_strdup (GNUNET_i2s (&receiver->id));
-
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Peer %u (`%s') received message of type %d and size %u size from peer %s!\n",
-                receiver->no,
-                ps,
-                ntohs (message->header.type),
-                ntohs (message->header.size),
-                GNUNET_i2s (sender));
-    GNUNET_free (ps);
-  }
-  if ((GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE == ntohs (message->header.type)) &&
-      (sizeof(struct GNUNET_TRANSPORT_TESTING_TestMessage) == ntohs (
-         message->header.size)))
-  {
-    GNUNET_SCHEDULER_add_now (&stop_peer,
-                              NULL);
-    return;
-  }
-}
-
-
-int
-main (int argc,
-      char *argv[])
-{
-  struct GNUNET_TRANSPORT_TESTING_SendClosure sc = {
-    .num_messages = 1
-  };
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext my_ccc = {
-    .connect_continuation = &GNUNET_TRANSPORT_TESTING_simple_send,
-    .connect_continuation_cls = &sc,
-    .config_file = "test_transport_api_data.conf",
-    .rec = &notify_receive,
-    .nc = &GNUNET_TRANSPORT_TESTING_log_connect,
-    .nd = &notify_disconnect,
-    .timeout = TIMEOUT,
-    .global_ret = GNUNET_SYSERR
-  };
-
-  ccc = &my_ccc;
-  sc.ccc = ccc;
-  if (GNUNET_OK !=
-      GNUNET_TRANSPORT_TESTING_main (2,
-                                     &GNUNET_TRANSPORT_TESTING_connect_check,
-                                     ccc))
-    return 1;
-  return 0;
-}
-
-
-/* end of test_transport_api_disconnect.c */
diff --git a/src/transport/test_transport_api_disconnect_tcp_peer1.conf b/src/transport/test_transport_api_disconnect_tcp_peer1.conf
deleted file mode 100644
index 8530ba310..000000000
--- a/src/transport/test_transport_api_disconnect_tcp_peer1.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
-
-[transport]
-PLUGINS = tcp
-
diff --git a/src/transport/test_transport_api_disconnect_tcp_peer2.conf b/src/transport/test_transport_api_disconnect_tcp_peer2.conf
deleted file mode 100644
index ce9c2f885..000000000
--- a/src/transport/test_transport_api_disconnect_tcp_peer2.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
-
-[transport]
-PLUGINS = tcp
-
-
diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf
deleted file mode 100644
index 2a622ae02..000000000
--- a/src/transport/test_transport_api_http_peer1.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-http-p1/
-
-[transport]
-PLUGINS = http_client
diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf
deleted file mode 100644
index aca41804b..000000000
--- a/src/transport/test_transport_api_http_peer2.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-http-p2/
-
-[transport]
-PLUGINS = http_server
diff --git a/src/transport/test_transport_api_http_reverse_peer1.conf b/src/transport/test_transport_api_http_reverse_peer1.conf
deleted file mode 100644
index 67640d7bb..000000000
--- a/src/transport/test_transport_api_http_reverse_peer1.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-http-p1/
-
-[transport]
-PLUGINS = http_client
-
-[ats]
-WAN_QUOTA_IN = unlimited
-WAN_QUOTA_OUT = unlimited
-
diff --git a/src/transport/test_transport_api_http_reverse_peer2.conf b/src/transport/test_transport_api_http_reverse_peer2.conf
deleted file mode 100644
index 0e7a2ea05..000000000
--- a/src/transport/test_transport_api_http_reverse_peer2.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-http-p2/
-
-[transport-http_server]
-PORT = 8080
-EXTERNAL_HOSTNAME = fulcrum.net.in.tum.de/gnunet
-EXTERNAL_HOSTNAME_ONLY = YES
-
-[transport]
-PLUGINS = http_server
-
diff --git a/src/transport/test_transport_api_https_peer1.conf b/src/transport/test_transport_api_https_peer1.conf
deleted file mode 100644
index 55d119259..000000000
--- a/src/transport/test_transport_api_https_peer1.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-https-p1/
-
-[arm]
-PORT = 12105
-
-[statistics]
-PORT = 12104
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12103
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12102
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12101
-PLUGINS = https_client
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-#PREFIX = valgrind
-
-
diff --git a/src/transport/test_transport_api_https_peer2.conf b/src/transport/test_transport_api_https_peer2.conf
deleted file mode 100644
index 3b1d55b0a..000000000
--- a/src/transport/test_transport_api_https_peer2.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-https-p2/
-
-[transport-https_server]
-EXTERNAL_HOSTNAME = localhost
-EXTERNAL_HOSTNAME_ONLY = yes
-EXTERNAL_HOSTNAME_USE_PORT = YES
-
-[arm]
-PORT = 12115
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12114
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12113
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12112
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12111
-PLUGINS = https_server
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-#PREFIX = valgrind
-
-
diff --git a/src/transport/test_transport_api_limited_sockets.c b/src/transport/test_transport_api_limited_sockets.c
deleted file mode 100644
index 0e47800e8..000000000
--- a/src/transport/test_transport_api_limited_sockets.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2009, 2010 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport/test_transport_api_limited_sockets.c
- * @brief base test case for transport implementations
- *
- * This test case serves as a base for tcp, udp, and udp-nat
- * transport test cases.  Based on the executable being run
- * the correct test case will be performed.  Conservation of
- * C code apparently.
- */
-#include "platform.h"
-#include "gnunet_transport_service.h"
-#include "transport-testing.h"
-
-/**
- * How long until we give up on transmitting the message?
- */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
-
-#define MAX_FILES 50
-
-
-#if HAVE_SETRLIMIT
-
-static struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc;
-
-
-static void
-notify_receive (void *cls,
-                struct GNUNET_TRANSPORT_TESTING_PeerContext *receiver,
-                const struct GNUNET_PeerIdentity *sender,
-                const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received message of type %d from peer %s!\n",
-              ntohs (message->header.type),
-              GNUNET_i2s (sender));
-  if ((GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE ==
-       ntohs (message->header.type)) &&
-      (sizeof(struct GNUNET_TRANSPORT_TESTING_TestMessage) ==
-       ntohs (message->header.size)))
-  {
-    ccc->global_ret = GNUNET_OK;
-  }
-  else
-  {
-    GNUNET_break (0);
-  }
-  GNUNET_SCHEDULER_shutdown ();
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  struct GNUNET_TRANSPORT_TESTING_SendClosure sc = {
-    .num_messages = 1
-  };
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext my_ccc = {
-    .connect_continuation = &GNUNET_TRANSPORT_TESTING_simple_send,
-    .connect_continuation_cls = &sc,
-    .config_file = "test_transport_api_data.conf",
-    .rec = &notify_receive,
-    .nc = &GNUNET_TRANSPORT_TESTING_log_connect,
-    .nd = &GNUNET_TRANSPORT_TESTING_log_disconnect,
-    .timeout = TIMEOUT,
-    .global_ret = GNUNET_SYSERR
-  };
-  struct rlimit r_file_old;
-  struct rlimit r_file_new;
-  int res;
-
-  sc.ccc = &my_ccc;
-  res = getrlimit (RLIMIT_NOFILE,
-                   &r_file_old);
-  r_file_new.rlim_cur = MAX_FILES;
-  r_file_new.rlim_max = r_file_old.rlim_max;
-  res = setrlimit (RLIMIT_NOFILE,
-                   &r_file_new);
-  if (0 != res)
-  {
-    fprintf (stderr,
-             "Setting limit failed: %s\n",
-             strerror (errno));
-    return 77;
-  }
-
-  ccc = &my_ccc;
-  ccc->global_ret = GNUNET_SYSERR;
-  if (GNUNET_OK !=
-      GNUNET_TRANSPORT_TESTING_main (2,
-                                     &GNUNET_TRANSPORT_TESTING_connect_check,
-                                     ccc))
-    return 1;
-  return 0;
-}
-
-
-#else
-/* cannot setrlimit */
-
-
-int
-main (int argc, char *argv[])
-{
-  fprintf (stderr,
-           "Cannot run test on this system\n");
-  return 77;
-}
-
-
-#endif
-
-/* end of test_transport_api_limited_sockets.c */
diff --git a/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf b/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
deleted file mode 100644
index e0ad5f847..000000000
--- a/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
-
-[transport]
-PLUGINS = tcp
diff --git a/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf b/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
deleted file mode 100644
index bb466abba..000000000
--- a/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf
-
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
-
-[transport]
-PLUGINS = tcp
diff --git a/src/transport/test_transport_api_manipulation_cfg.c b/src/transport/test_transport_api_manipulation_cfg.c
deleted file mode 100644
index 73c81114e..000000000
--- a/src/transport/test_transport_api_manipulation_cfg.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2009, 2010, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport/test_transport_api_manipulation_cfg.c
- * @brief base test case for transport traffic manipulation implementation
- * based on cfg
- *
- * Peer 1 has inbound and outbound delay of 100ms
- * Peer 2 has no inbound and outbound delay
- *
- * We send a request from P1 to P2 and expect delay of >= TEST_DELAY us
- * Then we send response from P2 to P1 and expect delay of >= TEST_DELAY us
- */
-#include "platform.h"
-#include "gnunet_transport_service.h"
-#include "transport-testing.h"
-
-/**
- * How long until we give up on transmitting the message?
- */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120)
-
-
-#define TEST_MESSAGE_SIZE 2600
-
-#define TEST_RESPONSE_MESSAGE_TYPE
-
-/**
- * Test delay, in microseconds.
- */
-#define TEST_DELAY 100 * 1000LL
-
-
-static struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc;
-
-static struct GNUNET_TIME_Absolute start_request;
-
-static struct GNUNET_TIME_Absolute start_response;
-
-
-static void
-sendtask_response_task (void *cls)
-{
-  int ret;
-
-  start_response = GNUNET_TIME_absolute_get ();
-  ret = GNUNET_TRANSPORT_TESTING_send (ccc->p[1],
-                                       ccc->p[0],
-                                       GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE2,
-                                       TEST_MESSAGE_SIZE,
-                                       1,
-                                       NULL,
-                                       NULL);
-  if (GNUNET_NO == ret)
-  {
-    GNUNET_break (0);
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-  GNUNET_assert (GNUNET_SYSERR != ret);
-}
-
-
-static void
-notify_receive (void *cls,
-                struct GNUNET_TRANSPORT_TESTING_PeerContext *receiver,
-                const struct GNUNET_PeerIdentity *sender,
-                const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
-  struct GNUNET_TIME_Relative duration;
-
-  {
-    char *ps = GNUNET_strdup (GNUNET_i2s (&receiver->id));
-
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Peer %u (`%s') received message of type %d and size %u size from peer %s)!\n",
-                receiver->no,
-                ps,
-                ntohs (message->header.type),
-                ntohs (message->header.size),
-                GNUNET_i2s (sender));
-    GNUNET_free (ps);
-  }
-
-  switch (ntohs (message->header.type))
-  {
-  case GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE:
-    duration = GNUNET_TIME_absolute_get_difference (start_request,
-                                                    GNUNET_TIME_absolute_get ());
-    if (duration.rel_value_us >= TEST_DELAY)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Request message was delayed for %s\n",
-                  GNUNET_STRINGS_relative_time_to_string (duration,
-                                                          GNUNET_YES));
-    }
-    else
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Request message was delayed for unexpected duration %s\n",
-                  GNUNET_STRINGS_relative_time_to_string (duration,
-                                                          GNUNET_YES));
-      ccc->global_ret = GNUNET_SYSERR;
-      GNUNET_SCHEDULER_shutdown ();
-    }
-    /* Send response */
-    GNUNET_SCHEDULER_add_now (&sendtask_response_task,
-                              NULL);
-    return;
-
-  case GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE2:
-    duration = GNUNET_TIME_absolute_get_difference (start_response,
-                                                    GNUNET_TIME_absolute_get ());
-    if (duration.rel_value_us >= TEST_DELAY)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Response message was delayed for %s\n",
-                  GNUNET_STRINGS_relative_time_to_string (duration,
-                                                          GNUNET_YES));
-      ccc->global_ret = GNUNET_OK;
-    }
-    else
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Response message was delayed for unexpected duration %s\n",
-                  GNUNET_STRINGS_relative_time_to_string (duration,
-                                                          GNUNET_YES));
-      ccc->global_ret = GNUNET_SYSERR;
-    }
-    GNUNET_SCHEDULER_shutdown ();
-    break;
-
-  default:
-    GNUNET_break (0);
-    break;
-  }
-}
-
-
-int
-main (int argc,
-      char *argv[])
-{
-  struct GNUNET_TRANSPORT_TESTING_SendClosure sc = {
-    .num_messages = 1
-  };
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext my_ccc = {
-    .connect_continuation = &GNUNET_TRANSPORT_TESTING_large_send,
-    .connect_continuation_cls = &sc,
-    .config_file = "test_transport_api_data.conf",
-    .rec = &notify_receive,
-    .nc = &GNUNET_TRANSPORT_TESTING_log_connect,
-    .nd = &GNUNET_TRANSPORT_TESTING_log_disconnect,
-    .timeout = TIMEOUT
-  };
-
-  ccc = &my_ccc;
-  sc.ccc = ccc;
-  start_request = GNUNET_TIME_absolute_get ();
-  if (GNUNET_OK !=
-      GNUNET_TRANSPORT_TESTING_main (2,
-                                     &GNUNET_TRANSPORT_TESTING_connect_check,
-                                     ccc))
-    return 1;
-  return 0;
-}
-
-
-/* end of test_transport_api_manipulation_cfg.c */
diff --git a/src/transport/test_transport_api_manipulation_cfg_peer1.conf b/src/transport/test_transport_api_manipulation_cfg_peer1.conf
deleted file mode 100644
index 77cdce2e2..000000000
--- a/src/transport/test_transport_api_manipulation_cfg_peer1.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
-
-[transport]
-PLUGINS = tcp
-MANIPULATE_DELAY_IN = 100 ms
-MANIPULATE_DELAY_OUT = 100 ms
diff --git a/src/transport/test_transport_api_manipulation_cfg_peer2.conf b/src/transport/test_transport_api_manipulation_cfg_peer2.conf
deleted file mode 100644
index 9cbaaddef..000000000
--- a/src/transport/test_transport_api_manipulation_cfg_peer2.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
-
-[transport]
-PLUGINS = tcp
-#MANIPULATE_DELAY_IN = 0 ms
-#MANIPULATE_DELAY_OUT = 0 ms
diff --git a/src/transport/test_transport_api_manipulation_recv_tcp.c b/src/transport/test_transport_api_manipulation_recv_tcp.c
deleted file mode 100644
index 207c4416f..000000000
--- a/src/transport/test_transport_api_manipulation_recv_tcp.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2009, 2010, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport/test_transport_api_manipulation_recv_tcp.c
- * @brief base test case for transport traffic manipulation implementation
- *
- * This test case will setup 2 peers and connect them, the first message
- * will be sent without manipulation, then a receive delay of 1 second will
- * be configured and 2 more message will be sent. Time will be measured
- *
- * In addition the distance on receiver side will be manipulated to be 10
- */
-#include "platform.h"
-#include "gnunet_transport_service.h"
-#include "transport-testing.h"
-
-/**
- * How long until we give up on transmitting the message?
- */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120)
-
-
-static struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc;
-
-static int messages_recv;
-
-static struct GNUNET_TIME_Absolute start_normal;
-
-static struct GNUNET_TIME_Relative dur_normal;
-
-static struct GNUNET_TIME_Absolute start_delayed;
-
-static struct GNUNET_TIME_Relative dur_delayed;
-
-
-static void
-do_free (void *cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_SendClosure *sc = cls;
-
-  GNUNET_free (sc);
-}
-
-
-static void
-delayed_transmit (void *cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_SendClosure *sc = cls;
-
-  start_delayed = GNUNET_TIME_absolute_get ();
-  GNUNET_TRANSPORT_TESTING_large_send (sc);
-}
-
-
-static void
-sendtask (void *cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_SendClosure *sc;
-  struct GNUNET_ATS_Properties prop;
-  struct GNUNET_TIME_Relative delay;
-
-  sc = GNUNET_new (struct GNUNET_TRANSPORT_TESTING_SendClosure);
-  sc->num_messages = 1;
-  sc->ccc = ccc;
-  sc->cont = &do_free;
-  sc->cont_cls = sc;
-  if (0 == messages_recv)
-  {
-    start_normal = GNUNET_TIME_absolute_get ();
-  }
-  if (0 < messages_recv)
-  {
-    memset (&prop,
-            0,
-            sizeof(prop));
-    delay = GNUNET_TIME_UNIT_SECONDS;
-    GNUNET_TRANSPORT_manipulation_set (ccc->p[1]->tmh,
-                                       &ccc->p[0]->id,
-                                       &prop,
-                                       delay,
-                                       GNUNET_TIME_UNIT_ZERO);
-    /* wait 1s to allow manipulation to go into effect */
-    if (1 == messages_recv)
-    {
-      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                    &delayed_transmit,
-                                    sc);
-      return;
-    }
-  }
-  GNUNET_TRANSPORT_TESTING_large_send (sc);
-}
-
-
-static void
-notify_receive (void *cls,
-                struct GNUNET_TRANSPORT_TESTING_PeerContext *receiver,
-                const struct GNUNET_PeerIdentity *sender,
-                const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
-  {
-    char *ps = GNUNET_strdup (GNUNET_i2s (&receiver->id));
-
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Peer %u (`%s') received message of type %d and size %u size from peer %s)!\n",
-                receiver->no,
-                ps,
-                ntohs (message->header.type),
-                ntohs (message->header.size),
-                GNUNET_i2s (sender));
-    GNUNET_free (ps);
-  }
-  if ((GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE != ntohs (message->header.type)) ||
-      (GNUNET_TRANSPORT_TESTING_LARGE_MESSAGE_SIZE != ntohs (
-         message->header.size)))
-  {
-    GNUNET_break (0);
-    ccc->global_ret = GNUNET_SYSERR;
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-
-  if (messages_recv <= 2)
-  {
-    /* Received non-delayed message */
-    dur_normal = GNUNET_TIME_absolute_get_duration (start_normal);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Received non-delayed message %u after %s\n",
-                messages_recv,
-                GNUNET_STRINGS_relative_time_to_string (dur_normal,
-                                                        GNUNET_YES));
-    GNUNET_SCHEDULER_add_now (&sendtask,
-                              NULL);
-    messages_recv++;
-    return;
-  }
-  /* Received manipulated message */
-  dur_delayed = GNUNET_TIME_absolute_get_duration (start_delayed);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received delayed message %u after %s\n",
-              messages_recv,
-              GNUNET_STRINGS_relative_time_to_string (dur_delayed,
-                                                      GNUNET_YES));
-  if (dur_delayed.rel_value_us < GNUNET_TIME_UNIT_SECONDS.rel_value_us)
-  {
-    GNUNET_break (0);
-    ccc->global_ret = GNUNET_SYSERR;
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Delayed message was not delayed correctly: took only %s\n",
-                GNUNET_STRINGS_relative_time_to_string (dur_delayed,
-                                                        GNUNET_YES));
-  }
-  else
-  {
-    ccc->global_ret = GNUNET_OK;
-  }
-  /* shutdown */
-  GNUNET_SCHEDULER_shutdown ();
-}
-
-
-int
-main (int argc,
-      char *argv[])
-{
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext my_ccc = {
-    .connect_continuation = &sendtask,
-    .config_file = "test_transport_api_data.conf",
-    .rec = &notify_receive,
-    .nc = &GNUNET_TRANSPORT_TESTING_log_connect,
-    .nd = &GNUNET_TRANSPORT_TESTING_log_disconnect,
-    .timeout = TIMEOUT,
-    .global_ret = GNUNET_NO
-  };
-
-  ccc = &my_ccc;
-  if (GNUNET_OK !=
-      GNUNET_TRANSPORT_TESTING_main (2,
-                                     &GNUNET_TRANSPORT_TESTING_connect_check,
-                                     ccc))
-    return 1;
-  return 0;
-}
-
-
-/* end of test_transport_api_manipulation_recv_tcp.c */
diff --git a/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf b/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf
deleted file mode 100644
index 9150c7faf..000000000
--- a/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
-
-[transport-tcp]
-PORT = 12000
-TIMEOUT = 5 s
-
-[arm]
-PORT = 12005
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12004
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12003
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12002
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12001
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-PLUGINS = tcp
-
diff --git a/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf b/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf
deleted file mode 100644
index a7b2cf90b..000000000
--- a/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
-
-[transport-tcp]
-PORT = 12015
-TIMEOUT = 5 s
-
-[arm]
-PORT = 12014
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12013
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12012
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12011
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12010
-PLUGINS = tcp
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
diff --git a/src/transport/test_transport_api_manipulation_send_tcp.c b/src/transport/test_transport_api_manipulation_send_tcp.c
deleted file mode 100644
index ea735cfc6..000000000
--- a/src/transport/test_transport_api_manipulation_send_tcp.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2009, 2010, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport/test_transport_api_manipulation_send_tcp.c
- * @brief base test case for transport traffic manipulation implementation
- *
- * This test case will setup 2 peers and connect them, the first message
- * will be sent without manipulation, then a send delay of 1 second will
- * be configured and 1 more message will be sent. Time will be measured.
- *
- * In addition the distance on receiver side will be manipulated to be 10
- */
-#include "platform.h"
-#include "gnunet_transport_service.h"
-#include "transport-testing.h"
-
-/**
- * How long until we give up on transmitting the message?
- */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
-
-static struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc;
-
-static int messages_recv;
-
-static struct GNUNET_TIME_Absolute start_normal;
-
-static struct GNUNET_TIME_Relative dur_normal;
-
-static struct GNUNET_TIME_Absolute start_delayed;
-
-static struct GNUNET_TIME_Relative dur_delayed;
-
-
-static void
-do_free (void *cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_SendClosure *sc = cls;
-
-  GNUNET_free (sc);
-}
-
-
-static void
-delayed_transmit (void *cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_SendClosure *sc = cls;
-
-  start_delayed = GNUNET_TIME_absolute_get ();
-  GNUNET_TRANSPORT_TESTING_large_send (sc);
-}
-
-
-static void
-sendtask (void *cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_SendClosure *sc;
-  struct GNUNET_TIME_Relative delay;
-  struct GNUNET_ATS_Properties prop;
-
-  sc = GNUNET_new (struct GNUNET_TRANSPORT_TESTING_SendClosure);
-  sc->num_messages = 1;
-  sc->ccc = ccc;
-  sc->cont = &do_free;
-  sc->cont_cls = sc;
-  if (0 == messages_recv)
-  {
-    start_normal = GNUNET_TIME_absolute_get ();
-  }
-  if (1 == messages_recv)
-  {
-    memset (&prop,
-            0,
-            sizeof(prop));
-    delay = GNUNET_TIME_UNIT_SECONDS;
-    GNUNET_TRANSPORT_manipulation_set (ccc->p[0]->tmh,
-                                       &ccc->p[1]->id,
-                                       &prop,
-                                       GNUNET_TIME_UNIT_ZERO,
-                                       delay);
-    /* wait 1s to allow manipulation to go into effect */
-    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                  &delayed_transmit,
-                                  sc);
-    return;
-  }
-  GNUNET_TRANSPORT_TESTING_large_send (sc);
-}
-
-
-static void
-notify_receive (void *cls,
-                struct GNUNET_TRANSPORT_TESTING_PeerContext *receiver,
-                const struct GNUNET_PeerIdentity *sender,
-                const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
-  {
-    char *ps = GNUNET_strdup (GNUNET_i2s (&receiver->id));
-
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Peer %u (`%s') received message of type %d and size %u size from peer %s)!\n",
-                receiver->no,
-                ps,
-                ntohs (message->header.type),
-                ntohs (message->header.size),
-                GNUNET_i2s (sender));
-    GNUNET_free (ps);
-  }
-
-  if ((GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE != ntohs (message->header.type)) ||
-      (GNUNET_TRANSPORT_TESTING_LARGE_MESSAGE_SIZE != ntohs (
-         message->header.size)))
-  {
-    GNUNET_break (0);
-    ccc->global_ret = GNUNET_SYSERR;
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-
-  if (0 == messages_recv)
-  {
-    /* Received non-delayed message */
-    dur_normal = GNUNET_TIME_absolute_get_duration (start_normal);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Received non-delayed message %u after %s\n",
-                messages_recv,
-                GNUNET_STRINGS_relative_time_to_string (dur_normal,
-                                                        GNUNET_YES));
-    GNUNET_SCHEDULER_add_now (&sendtask,
-                              NULL);
-    messages_recv++;
-    return;
-  }
-  /* Received manipulated message */
-  dur_delayed = GNUNET_TIME_absolute_get_duration (start_delayed);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received delayed message %u after %s\n",
-              messages_recv,
-              GNUNET_STRINGS_relative_time_to_string (dur_delayed,
-                                                      GNUNET_YES));
-  if (dur_delayed.rel_value_us < GNUNET_TIME_UNIT_SECONDS.rel_value_us)
-  {
-    GNUNET_break (0);
-    ccc->global_ret = GNUNET_SYSERR;
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Delayed message was not delayed correctly: took only %s\n",
-                GNUNET_STRINGS_relative_time_to_string (dur_delayed,
-                                                        GNUNET_YES));
-  }
-  else
-  {
-    ccc->global_ret = GNUNET_OK;
-  }
-  GNUNET_SCHEDULER_shutdown ();
-}
-
-
-int
-main (int argc,
-      char *argv[])
-{
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext my_ccc = {
-    .connect_continuation = &sendtask,
-    .config_file = "test_transport_api_data.conf",
-    .rec = &notify_receive,
-    .nc = &GNUNET_TRANSPORT_TESTING_log_connect,
-    .nd = &GNUNET_TRANSPORT_TESTING_log_disconnect,
-    .timeout = TIMEOUT,
-    .global_ret = GNUNET_NO
-  };
-
-  ccc = &my_ccc;
-  if (GNUNET_OK !=
-      GNUNET_TRANSPORT_TESTING_main (2,
-                                     &GNUNET_TRANSPORT_TESTING_connect_check,
-                                     ccc))
-    return 1;
-  return 0;
-}
-
-
-/* end of test_transport_api_manipulation_send_tcp.c */
diff --git a/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf b/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf
deleted file mode 100644
index 9150c7faf..000000000
--- a/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
-
-[transport-tcp]
-PORT = 12000
-TIMEOUT = 5 s
-
-[arm]
-PORT = 12005
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12004
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12003
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12002
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12001
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-PLUGINS = tcp
-
diff --git a/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf b/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf
deleted file mode 100644
index a7b2cf90b..000000000
--- a/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
-
-[transport-tcp]
-PORT = 12015
-TIMEOUT = 5 s
-
-[arm]
-PORT = 12014
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12013
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12012
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12011
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12010
-PLUGINS = tcp
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
diff --git a/src/transport/test_transport_api_monitor_peers.c b/src/transport/test_transport_api_monitor_peers.c
deleted file mode 100644
index c09e3782d..000000000
--- a/src/transport/test_transport_api_monitor_peers.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2009, 2010, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport/test_transport_api_monitor_peers.c
- * @brief base test case for transport peer monitor API
- */
-#include "platform.h"
-#include "gnunet_transport_service.h"
-#include "transport-testing.h"
-
-/**
- * How long until we give up on transmitting the message?
- */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120)
-
-/**
- * How long until we give up on transmitting the message?
- */
-#define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply ( \
-    GNUNET_TIME_UNIT_SECONDS, 30)
-
-#define TEST_MESSAGE_SIZE 2600
-
-#define TEST_MESSAGE_TYPE 12345
-
-static struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc;
-
-static struct GNUNET_TRANSPORT_PeerMonitoringContext *pmc_p1;
-
-static struct GNUNET_TRANSPORT_PeerMonitoringContext *pmc_p2;
-
-static int p1_c;
-
-static int p2_c;
-
-static int p1_c_notify;
-
-static int p2_c_notify;
-
-
-static void
-custom_shutdown (void *cls)
-{
-  if (NULL != pmc_p1)
-  {
-    GNUNET_TRANSPORT_monitor_peers_cancel (pmc_p1);
-    pmc_p1 = NULL;
-  }
-  if (NULL != pmc_p2)
-  {
-    GNUNET_TRANSPORT_monitor_peers_cancel (pmc_p2);
-    pmc_p2 = NULL;
-  }
-}
-
-
-static void
-notify_receive (void *cls,
-                struct GNUNET_TRANSPORT_TESTING_PeerContext *receiver,
-                const struct GNUNET_PeerIdentity *sender,
-                const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
-  char *ps = GNUNET_strdup (GNUNET_i2s (&receiver->id));
-
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              "Peer %u (`%s') received message of type %d and size %u size from peer %s!\n",
-              receiver->no,
-              ps,
-              ntohs (message->header.type),
-              ntohs (message->header.size),
-              GNUNET_i2s (sender));
-  GNUNET_free (ps);
-}
-
-
-static void
-sendtask (void *cls)
-{
-  /* intentionally empty */
-}
-
-
-static void
-check_done ()
-{
-  if ((GNUNET_YES == p1_c) &&
-      (GNUNET_YES == p2_c) &&
-      p1_c_notify &&
-      p2_c_notify)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Both peers state to be connected\n");
-    ccc->global_ret = GNUNET_OK;
-    GNUNET_SCHEDULER_shutdown ();
-  }
-}
-
-
-static void
-notify_connect (void *cls,
-                struct GNUNET_TRANSPORT_TESTING_PeerContext *me,
-                const struct GNUNET_PeerIdentity *other)
-{
-  GNUNET_TRANSPORT_TESTING_log_connect (cls,
-                                        me,
-                                        other);
-  if (0 == memcmp (other, &ccc->p[0]->id, sizeof(struct GNUNET_PeerIdentity)))
-  {
-    p1_c_notify = GNUNET_YES;
-  }
-  if (0 == memcmp (other, &ccc->p[1]->id, sizeof(struct GNUNET_PeerIdentity)))
-  {
-    p2_c_notify = GNUNET_YES;
-  }
-  check_done ();
-}
-
-
-static void
-monitor1_cb (void *cls,
-             const struct GNUNET_PeerIdentity *peer,
-             const struct GNUNET_HELLO_Address *address,
-             enum GNUNET_TRANSPORT_PeerState state,
-             struct GNUNET_TIME_Absolute state_timeout)
-{
-  if ((NULL == address) || (NULL == ccc->p[0]))
-    return;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Monitor 1: %s %s %s\n",
-              GNUNET_i2s (&address->peer),
-              GNUNET_TRANSPORT_ps2s (state),
-              GNUNET_STRINGS_absolute_time_to_string (state_timeout));
-  if ((0 == memcmp (&address->peer, &ccc->p[1]->id, sizeof(ccc->p[1]->id))) &&
-      (GNUNET_YES == GNUNET_TRANSPORT_is_connected (state)) &&
-      (GNUNET_NO == p1_c))
-  {
-    p1_c = GNUNET_YES;
-    check_done ();
-  }
-}
-
-
-static void
-monitor2_cb (void *cls,
-             const struct GNUNET_PeerIdentity *peer,
-             const struct GNUNET_HELLO_Address *address,
-             enum GNUNET_TRANSPORT_PeerState state,
-             struct GNUNET_TIME_Absolute state_timeout)
-{
-  if ((NULL == address) || (NULL == ccc->p[1]))
-    return;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Monitor 2: %s %s %s\n",
-              GNUNET_i2s (&address->peer),
-              GNUNET_TRANSPORT_ps2s (state),
-              GNUNET_STRINGS_absolute_time_to_string (state_timeout));
-  if ((0 == memcmp (&address->peer, &ccc->p[0]->id, sizeof(ccc->p[0]->id))) &&
-      (GNUNET_YES == GNUNET_TRANSPORT_is_connected (state)) &&
-      (GNUNET_NO == p2_c))
-  {
-    p2_c = GNUNET_YES;
-    check_done ();
-  }
-}
-
-
-static void
-start_monitors (void *cls)
-{
-  pmc_p1 = GNUNET_TRANSPORT_monitor_peers (ccc->p[0]->cfg,
-                                           NULL,
-                                           GNUNET_NO,
-                                           &monitor1_cb,
-                                           NULL);
-  pmc_p2 = GNUNET_TRANSPORT_monitor_peers (ccc->p[1]->cfg,
-                                           NULL,
-                                           GNUNET_NO,
-                                           &monitor2_cb,
-                                           NULL);
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext my_ccc = {
-    .pre_connect_task = &start_monitors,
-    .connect_continuation = &sendtask,
-    .config_file = "test_transport_api_data.conf",
-    .rec = &notify_receive,
-    .nc = &notify_connect,
-    .nd = &GNUNET_TRANSPORT_TESTING_log_disconnect,
-    .shutdown_task = &custom_shutdown,
-    .timeout = TIMEOUT
-  };
-
-  ccc = &my_ccc;
-  if (GNUNET_OK !=
-      GNUNET_TRANSPORT_TESTING_main (2,
-                                     &GNUNET_TRANSPORT_TESTING_connect_check,
-                                     ccc))
-    return 1;
-  return 0;
-}
-
-
-/* end of test_transport_api_monitor_peers.c */
diff --git a/src/transport/test_transport_api_monitor_peers_peer1.conf b/src/transport/test_transport_api_monitor_peers_peer1.conf
deleted file mode 100644
index bc9eee19b..000000000
--- a/src/transport/test_transport_api_monitor_peers_peer1.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-monitoring-p1/
-
diff --git a/src/transport/test_transport_api_monitor_peers_peer2.conf b/src/transport/test_transport_api_monitor_peers_peer2.conf
deleted file mode 100644
index 5225a5a87..000000000
--- a/src/transport/test_transport_api_monitor_peers_peer2.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-monitoring-p2/
-
-
diff --git a/src/transport/test_transport_api_monitor_validation_peer1.conf b/src/transport/test_transport_api_monitor_validation_peer1.conf
deleted file mode 100644
index 02f7bc2f0..000000000
--- a/src/transport/test_transport_api_monitor_validation_peer1.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-monitoring-val-p1/
-
-[transport]
-PLUGINS=tcp
diff --git a/src/transport/test_transport_api_monitor_validation_peer2.conf b/src/transport/test_transport_api_monitor_validation_peer2.conf
deleted file mode 100644
index d4e0874f0..000000000
--- a/src/transport/test_transport_api_monitor_validation_peer2.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-monitoring-val-p2/
-
-[TRANSPORT]
-PLUGINS=tcp
-
diff --git a/src/transport/test_transport_api_multi_peer1.conf b/src/transport/test_transport_api_multi_peer1.conf
deleted file mode 100644
index b7cb98777..000000000
--- a/src/transport/test_transport_api_multi_peer1.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-multi-p1/
-
-[transport]
-PLUGINS = tcp udp
-
diff --git a/src/transport/test_transport_api_multi_peer2.conf b/src/transport/test_transport_api_multi_peer2.conf
deleted file mode 100644
index f69e0abd9..000000000
--- a/src/transport/test_transport_api_multi_peer2.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-multi-p2/
-
-[nat]
-ALLOW_NAT = NO
-
-[transport]
-PLUGINS = tcp udp
diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c
deleted file mode 100644
index 508fed4f5..000000000
--- a/src/transport/test_transport_api_reliability.c
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2009, 2010, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport/test_transport_api_reliability.c
- * @brief base test case for transport implementations
- *
- * This test case serves ensures that messages are reliably sent between peers
- *
- * This test sends TOTAL_MSGS with message type MTYPE from peer 1 to peer 2
- * and ensures that all message were received.
- */
-#include "platform.h"
-#include "gnunet_transport_service.h"
-#include "gauger.h"
-#include "transport-testing.h"
-
-/**
- * Allow making the problem "bigger".
- */
-#define FACTOR 1
-
-/**
- * Total number of messages to send
- *
- * Note that this value must not significantly exceed
- * 'MAX_PENDING' in 'gnunet-service-transport_clients.c', otherwise
- * messages may be dropped even for a reliable transport.
- */
-#define TOTAL_MSGS (1024 * 3 * FACTOR)
-
-/**
- * Testcase timeout
- */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 450 \
-                                               * FACTOR)
-
-/**
- * If we are in an "xhdr" test, the factor by which we divide
- * #TOTAL_MSGS for a more sane test duration.
- */
-static unsigned int xhdr = 1;
-
-static struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc;
-
-/**
- * Total amount of bytes sent
- */
-static unsigned long long total_bytes;
-
-/**
- * Time of start
- */
-static struct GNUNET_TIME_Absolute start_time;
-
-/**
- * No. of last message received
- */
-static unsigned int msg_recv;
-
-/**
- * Bitmap storing which messages were received
- */
-static char bitmap[TOTAL_MSGS / 8];
-
-
-/**
- * Get the desired message size for message number @a iter.
- */
-static size_t
-get_size (unsigned int iter)
-{
-  size_t ret;
-
-  ret = (iter * iter * iter);
-#ifndef __linux__
-  /* FreeBSD/OSX etc. Unix DGRAMs do not work
-   * with large messages */
-  if (0 == strcmp ("unix", ccc->test_plugin))
-    return sizeof(struct GNUNET_TRANSPORT_TESTING_TestMessage) + (ret % 1024);
-#endif
-  return sizeof(struct GNUNET_TRANSPORT_TESTING_TestMessage) + (ret % 60000);
-}
-
-
-/**
- * Implementation of the callback for obtaining the
- * size of messages for transmission.  Counts the total
- * number of bytes sent as a side-effect.
- *
- * @param cnt_down count down from `TOTAL_MSGS - 1`
- * @return message size of the message
- */
-static size_t
-get_size_cnt (unsigned int cnt_down)
-{
-  size_t ret = get_size (TOTAL_MSGS / xhdr - 1 - cnt_down);
-
-  total_bytes += ret;
-  return ret;
-}
-
-
-/**
- * Sets a bit active in the bitmap.
- *
- * @param bitIdx which bit to set
- * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
- */
-static int
-set_bit (unsigned int bitIdx)
-{
-  size_t arraySlot;
-  unsigned int targetBit;
-
-  if (bitIdx >= sizeof(bitmap) * 8)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "tried to set bit %u of %u(!?!?)\n",
-                bitIdx,
-                (unsigned int) sizeof(bitmap) * 8);
-    return GNUNET_SYSERR;
-  }
-  arraySlot = bitIdx / 8;
-  targetBit = (1L << (bitIdx % 8));
-  bitmap[arraySlot] |= targetBit;
-  return GNUNET_OK;
-}
-
-
-/**
- * Obtain a bit from bitmap.
- * @param map the bitmap
- * @param bit index from bitmap
- *
- * @return Bit @a bit from @a map
- */
-static int
-get_bit (const char *map,
-         unsigned int bit)
-{
-  if (bit > TOTAL_MSGS)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "get bit %u of %u(!?!?)\n",
-                bit,
-                (unsigned int) sizeof(bitmap) * 8);
-    return 0;
-  }
-  return ((map)[bit >> 3] & (1 << (bit & 7))) > 0;
-}
-
-
-static void
-custom_shutdown (void *cls)
-{
-  unsigned long long delta;
-  unsigned long long rate;
-  int ok;
-
-  /* Calculate statistics   */
-  delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value_us;
-  if (0 == delta)
-    delta = 1;
-  rate = (1000LL * 1000ll * total_bytes) / (1024 * delta);
-  fprintf (stderr,
-           "\nThroughput was %llu KiBytes/s\n",
-           rate);
-  {
-    char *value_name;
-
-    GNUNET_asprintf (&value_name,
-                     "unreliable_%s",
-                     ccc->test_plugin);
-    GAUGER ("TRANSPORT",
-            value_name,
-            (int) rate,
-            "kb/s");
-    GNUNET_free (value_name);
-  }
-
-  ok = 0;
-  for (unsigned int i = 0; i < TOTAL_MSGS / xhdr; i++)
-  {
-    if (get_bit (bitmap, i) == 0)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Did not receive message %d\n",
-                  i);
-      ok = -1;
-    }
-  }
-  if (0 != ok)
-    ccc->global_ret = GNUNET_SYSERR; /* fail: messages missing! */
-}
-
-
-static void
-notify_receive (void *cls,
-                struct GNUNET_TRANSPORT_TESTING_PeerContext *receiver,
-                const struct GNUNET_PeerIdentity *sender,
-                const struct GNUNET_TRANSPORT_TESTING_TestMessage *hdr)
-{
-  static int n;
-  unsigned int s;
-  char cbuf[GNUNET_MAX_MESSAGE_SIZE - 1];
-
-  if (GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE != ntohs (hdr->header.type))
-    return;
-  msg_recv = ntohl (hdr->num);
-  s = get_size (ntohl (hdr->num));
-
-  if (ntohs (hdr->header.size) != s)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Expected message %u of size %u, got %u bytes of message %u\n",
-                (uint32_t) ntohl (hdr->num),
-                s,
-                ntohs (hdr->header.size),
-                (uint32_t) ntohl (hdr->num));
-    ccc->global_ret = GNUNET_SYSERR;
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-
-  memset (cbuf,
-          ntohl (hdr->num),
-          s - sizeof(struct GNUNET_TRANSPORT_TESTING_TestMessage));
-  if (0 !=
-      memcmp (cbuf,
-              &hdr[1],
-              s - sizeof(struct GNUNET_TRANSPORT_TESTING_TestMessage)))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Expected message %u with bits %u, but body did not match\n",
-                (uint32_t) ntohl (hdr->num),
-                (unsigned char) ntohl (hdr->num));
-    ccc->global_ret = GNUNET_SYSERR;
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-#if VERBOSE
-  if (0 == ntohl (hdr->num) % 5)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Got message %u of size %u\n",
-                (uint32_t) ntohl (hdr->num),
-                ntohs (hdr->header.size));
-  }
-#endif
-  n++;
-  if (GNUNET_SYSERR == set_bit (ntohl (hdr->num)))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Message id %u is bigger than maxmimum number of messages %u expected\n",
-                (uint32_t) ntohl (hdr->num),
-                TOTAL_MSGS / xhdr);
-  }
-  if (0 == (n % (TOTAL_MSGS / xhdr / 100)))
-  {
-    fprintf (stderr, "%s", ".");
-  }
-  if (n == TOTAL_MSGS / xhdr)
-  {
-    /* end testcase with success */
-    ccc->global_ret = GNUNET_OK;
-    GNUNET_SCHEDULER_shutdown ();
-  }
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  if (0 == strstr (argv[0], "xhdr"))
-    xhdr = 30;
-  struct GNUNET_TRANSPORT_TESTING_SendClosure sc = {
-    .num_messages = TOTAL_MSGS / xhdr,
-    .get_size_cb = &get_size_cnt
-  };
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext my_ccc = {
-    .connect_continuation = &GNUNET_TRANSPORT_TESTING_simple_send,
-    .connect_continuation_cls = &sc,
-    .config_file = "test_transport_api_data.conf",
-    .rec = &notify_receive,
-    .nc = &GNUNET_TRANSPORT_TESTING_log_connect,
-    .nd = &GNUNET_TRANSPORT_TESTING_log_disconnect,
-    .shutdown_task = &custom_shutdown,
-    .timeout = TIMEOUT,
-    .global_ret = GNUNET_SYSERR
-  };
-
-  ccc = &my_ccc;
-  sc.ccc = ccc;
-  start_time = GNUNET_TIME_absolute_get ();
-  if (GNUNET_OK !=
-      GNUNET_TRANSPORT_TESTING_main (2,
-                                     &GNUNET_TRANSPORT_TESTING_connect_check,
-                                     ccc))
-    return 1;
-  return 0;
-}
-
-
-/* end of test_transport_api_reliability.c */
diff --git a/src/transport/test_transport_api_reliability_bluetooth_peer1.conf b/src/transport/test_transport_api_reliability_bluetooth_peer1.conf
deleted file mode 100644
index 738255235..000000000
--- a/src/transport/test_transport_api_reliability_bluetooth_peer1.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-bluetooth-p1/
-
-[transport-bluetooth]
-INTERFACE = hci0
-TESTMODE = 1
-
-[arm]
-PORT = 12164
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12163
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12162
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12161
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12160
-PLUGINS = bluetooth
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-
-
-[ats]
-BLUETOOTH_QUOTA_IN = unlimited
-BLUETOOTH_QUOTA_OUT = unlimited
diff --git a/src/transport/test_transport_api_reliability_bluetooth_peer2.conf b/src/transport/test_transport_api_reliability_bluetooth_peer2.conf
deleted file mode 100644
index 9c68b5fbc..000000000
--- a/src/transport/test_transport_api_reliability_bluetooth_peer2.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-bluetooth-p2/
-
-[transport-bluetooth]
-INTERFACE = hci1
-TESTMODE = 2
-
-[arm]
-PORT = 12174
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12173
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12172
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12171
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12170
-PLUGINS = bluetooth
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
-[ats]
-BLUETOOTH_QUOTA_IN = unlimited
-BLUETOOTH_QUOTA_OUT = unlimited
diff --git a/src/transport/test_transport_api_reliability_http_peer1.conf b/src/transport/test_transport_api_reliability_http_peer1.conf
deleted file mode 100644
index a1e5c96ac..000000000
--- a/src/transport/test_transport_api_reliability_http_peer1.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-http-p1/
-
-[transport-http_client]
-
-[transport-tcp]
-TIMEOUT = 5 s
-
-[transport-http]
-PORT = 12180
-
-[arm]
-PORT = 12185
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12184
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12183
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12182
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12181
-PLUGINS = http_client
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-
diff --git a/src/transport/test_transport_api_reliability_http_peer2.conf b/src/transport/test_transport_api_reliability_http_peer2.conf
deleted file mode 100644
index 25a554f94..000000000
--- a/src/transport/test_transport_api_reliability_http_peer2.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-http-p2/
-
-[transport-http_server]
-PORT = 12090
-USE_IPv6 = NO
-BINDTO = 127.0.0.1
-
-[arm]
-PORT = 12195
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12194
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12193
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12192
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12191
-PLUGINS = http_server
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
diff --git a/src/transport/test_transport_api_reliability_http_xhr_peer1.conf b/src/transport/test_transport_api_reliability_http_xhr_peer1.conf
deleted file mode 100644
index ba4101ebe..000000000
--- a/src/transport/test_transport_api_reliability_http_xhr_peer1.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-http-p1/
-
-[transport-http_client]
-EMULATE_XHR = YES
-
-[transport-tcp]
-TIMEOUT = 5 s
-
-[transport-http]
-PORT = 12180
-
-[arm]
-PORT = 12185
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12184
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12183
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12182
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12181
-PLUGINS = http_client
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-
diff --git a/src/transport/test_transport_api_reliability_http_xhr_peer2.conf b/src/transport/test_transport_api_reliability_http_xhr_peer2.conf
deleted file mode 100644
index 25a554f94..000000000
--- a/src/transport/test_transport_api_reliability_http_xhr_peer2.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-http-p2/
-
-[transport-http_server]
-PORT = 12090
-USE_IPv6 = NO
-BINDTO = 127.0.0.1
-
-[arm]
-PORT = 12195
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12194
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12193
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12192
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12191
-PLUGINS = http_server
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
diff --git a/src/transport/test_transport_api_reliability_https_peer1.conf b/src/transport/test_transport_api_reliability_https_peer1.conf
deleted file mode 100644
index 1b51da130..000000000
--- a/src/transport/test_transport_api_reliability_https_peer1.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-https-p1/
-
-[transport-https_client]
-
-[arm]
-PORT = 12305
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12304
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12303
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12302
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12301
-PLUGINS = https_client
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-
diff --git a/src/transport/test_transport_api_reliability_https_peer2.conf b/src/transport/test_transport_api_reliability_https_peer2.conf
deleted file mode 100644
index 3dfb87a6d..000000000
--- a/src/transport/test_transport_api_reliability_https_peer2.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-https-p2/
-
-[transport-https_server]
-PORT = 12310
-KEY_FILE = $GNUNET_TEST_HOME/https_key_p2.key
-CERT_FILE = $GNUNET_TEST_HOME/https_cert_p2.crt
-
-[arm]
-PORT = 12315
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12314
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12313
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12312
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12311
-PLUGINS = https_server
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
-
diff --git a/src/transport/test_transport_api_reliability_https_xhr_peer1.conf b/src/transport/test_transport_api_reliability_https_xhr_peer1.conf
deleted file mode 100644
index 5d042f2f9..000000000
--- a/src/transport/test_transport_api_reliability_https_xhr_peer1.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-https-p1/
-
-[transport-https_client]
-EMULATE_XHR = YES
-
-[arm]
-PORT = 12305
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12304
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12303
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12302
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12301
-PLUGINS = https_client
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-
diff --git a/src/transport/test_transport_api_reliability_https_xhr_peer2.conf b/src/transport/test_transport_api_reliability_https_xhr_peer2.conf
deleted file mode 100644
index 3dfb87a6d..000000000
--- a/src/transport/test_transport_api_reliability_https_xhr_peer2.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-https-p2/
-
-[transport-https_server]
-PORT = 12310
-KEY_FILE = $GNUNET_TEST_HOME/https_key_p2.key
-CERT_FILE = $GNUNET_TEST_HOME/https_cert_p2.crt
-
-[arm]
-PORT = 12315
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12314
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12313
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12312
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12311
-PLUGINS = https_server
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
-
diff --git a/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf b/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
deleted file mode 100644
index 6a2029b09..000000000
--- a/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-reliability-tcp-nat-p1/
-
-[nat]
-BEHIND_NAT = YES
-ENABLE_NAT_SERVER = YES
-DISABLEV6 = YES
-
-[transport-tcp]
-PORT = 0
-TIMEOUT = 5 s
-
-[arm]
-PORT = 51204
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12023
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12022
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12021
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 29542
-PLUGINS = tcp
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-
-
diff --git a/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf b/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
deleted file mode 100644
index 2de9026f5..000000000
--- a/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-reliability-tcp-nat-p2/
-
-[nat]
-DISABLEV6 = YES
-ENABLE_NAT_CLIENT = YES
-
-[transport-tcp]
-PORT = 12030
-TIMEOUT = 5 s
-
-[arm]
-PORT = 12034
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12033
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12032
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12031
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 45923
-PLUGINS = tcp
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
-
diff --git a/src/transport/test_transport_api_reliability_tcp_peer1.conf b/src/transport/test_transport_api_reliability_tcp_peer1.conf
deleted file mode 100644
index 305605d63..000000000
--- a/src/transport/test_transport_api_reliability_tcp_peer1.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
-
-[transport-tcp]
-PORT = 12000
-TIMEOUT = 5 s
-
-[arm]
-PORT = 12005
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12004
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12003
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12002
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12001
-PLUGINS = tcp
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-
diff --git a/src/transport/test_transport_api_reliability_tcp_peer2.conf b/src/transport/test_transport_api_reliability_tcp_peer2.conf
deleted file mode 100644
index 43bb4ae37..000000000
--- a/src/transport/test_transport_api_reliability_tcp_peer2.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
-
-[transport-tcp]
-PORT = 12015
-TIMEOUT = 5 s
-
-[arm]
-PORT = 12014
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12013
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12012
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12011
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12010
-PLUGINS = tcp
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
diff --git a/src/transport/test_transport_api_reliability_udp_peer1.conf b/src/transport/test_transport_api_reliability_udp_peer1.conf
deleted file mode 100644
index 141fb0840..000000000
--- a/src/transport/test_transport_api_reliability_udp_peer1.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-udp-p1/
-
-[transport-udp]
-PORT = 12040
-# Override 1MB/s default limit.
-MAX_BPS = 500000000
-
-[arm]
-PORT = 12045
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12044
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12043
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12042
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12041
-PLUGINS = udp
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
diff --git a/src/transport/test_transport_api_reliability_udp_peer2.conf b/src/transport/test_transport_api_reliability_udp_peer2.conf
deleted file mode 100644
index 7523db854..000000000
--- a/src/transport/test_transport_api_reliability_udp_peer2.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-udp-p2/
-
-[transport-udp]
-PORT = 12050
-# Override 1MB/s default limit.
-MAX_BPS = 500000000
-
-[arm]
-PORT = 12055
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12054
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12053
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12052
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12051
-PLUGINS = udp
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
diff --git a/src/transport/test_transport_api_reliability_unix_peer1.conf b/src/transport/test_transport_api_reliability_unix_peer1.conf
deleted file mode 100644
index e253aad8c..000000000
--- a/src/transport/test_transport_api_reliability_unix_peer1.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-unix-p1/
-
-[arm]
-PORT = 12125
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12124
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12123
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12122
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12121
-PLUGINS = unix
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-
-[transport-unix]
-PORT = 12120
-
diff --git a/src/transport/test_transport_api_reliability_unix_peer2.conf b/src/transport/test_transport_api_reliability_unix_peer2.conf
deleted file mode 100644
index e0df47c07..000000000
--- a/src/transport/test_transport_api_reliability_unix_peer2.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-unix-p2/
-
-[arm]
-PORT = 12135
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12134
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12133
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12132
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12131
-PLUGINS = unix
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
-[transport-unix]
-PORT = 12131
-
diff --git a/src/transport/test_transport_api_reliability_wlan_peer1.conf b/src/transport/test_transport_api_reliability_wlan_peer1.conf
deleted file mode 100644
index 19eb21456..000000000
--- a/src/transport/test_transport_api_reliability_wlan_peer1.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-wlan-p1/
-
-[transport-wlan]
-TESTMODE = 1
-
-[arm]
-PORT = 12164
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12163
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12162
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12161
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12160
-PLUGINS = wlan
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-
-[ats]
-WLAN_QUOTA_IN = unlimited
-WLAN_QUOTA_OUT = unlimited
\ No newline at end of file
diff --git a/src/transport/test_transport_api_reliability_wlan_peer2.conf b/src/transport/test_transport_api_reliability_wlan_peer2.conf
deleted file mode 100644
index d5c269b43..000000000
--- a/src/transport/test_transport_api_reliability_wlan_peer2.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-wlan-p2/
-
-[transport-wlan]
-INTERFACE = mon1
-TESTMODE = 2
-
-[arm]
-PORT = 12174
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12173
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12172
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12171
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12170
-PLUGINS = wlan
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
-[ats]
-WLAN_QUOTA_IN = unlimited
-WLAN_QUOTA_OUT = unlimited
diff --git a/src/transport/test_transport_api_restart_1peer_peer1.conf b/src/transport/test_transport_api_restart_1peer_peer1.conf
deleted file mode 100644
index eabd6b701..000000000
--- a/src/transport/test_transport_api_restart_1peer_peer1.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
-
-[transport]
-PLUGINS = tcp
-
-#[transport]
-#PREFIX = valgrind
diff --git a/src/transport/test_transport_api_restart_1peer_peer2.conf b/src/transport/test_transport_api_restart_1peer_peer2.conf
deleted file mode 100644
index 58ce0777f..000000000
--- a/src/transport/test_transport_api_restart_1peer_peer2.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
-
-[transport]
-PLUGINS = tcp
-
-#[transport]
-#PREFIX = valgrind
diff --git a/src/transport/test_transport_api_restart_2peers_peer1.conf b/src/transport/test_transport_api_restart_2peers_peer1.conf
deleted file mode 100644
index eabd6b701..000000000
--- a/src/transport/test_transport_api_restart_2peers_peer1.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
-
-[transport]
-PLUGINS = tcp
-
-#[transport]
-#PREFIX = valgrind
diff --git a/src/transport/test_transport_api_restart_2peers_peer2.conf b/src/transport/test_transport_api_restart_2peers_peer2.conf
deleted file mode 100644
index 58ce0777f..000000000
--- a/src/transport/test_transport_api_restart_2peers_peer2.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
-
-[transport]
-PLUGINS = tcp
-
-#[transport]
-#PREFIX = valgrind
diff --git a/src/transport/test_transport_api_restart_reconnect.c b/src/transport/test_transport_api_restart_reconnect.c
deleted file mode 100644
index d58c1de54..000000000
--- a/src/transport/test_transport_api_restart_reconnect.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2009, 2010, 2015, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport/test_transport_api_restart_reconnect.c
- * @brief base test case for transport implementations
- *
- * This test case starts 2 peers, connects and exchanges a message.
- * Then, 1 or 2 peers are restarted and it is tested if peers reconnect.
- * How many peers are restarted is determined by the name of the binary.
- */
-#include "platform.h"
-#include "gnunet_transport_service.h"
-#include "transport-testing.h"
-
-/**
- * How long until we give up on transmitting the message?
- */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
-
-
-static struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc;
-
-static struct GNUNET_ATS_ConnectivitySuggestHandle *ats_sh;
-
-static int p1_connected;
-
-static int p2_connected;
-
-static int restarted;
-
-
-static void
-custom_shutdown (void *cls)
-{
-  if (NULL != ats_sh)
-  {
-    GNUNET_ATS_connectivity_suggest_cancel (ats_sh);
-    ats_sh = NULL;
-  }
-}
-
-
-static void
-restart_cb (void *cls)
-{
-  static unsigned int c;
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls;
-
-  c++;
-  if ((2 != c) &&
-      (NULL != strstr (ccc->test_name,
-                       "2peers")))
-    return;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Restarted peer %u (`%s'), issuing reconnect\n",
-              p->no,
-              GNUNET_i2s (&p->id));
-  ats_sh = GNUNET_ATS_connectivity_suggest (p->ats,
-                                            &ccc->p[1]->id,
-                                            1);
-}
-
-
-static void
-restart (struct GNUNET_TRANSPORT_TESTING_PeerContext *p)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Restarting peer %u (`%s')\n",
-              p->no,
-              GNUNET_i2s (&p->id));
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_TRANSPORT_TESTING_restart_peer (p,
-                                                        &restart_cb,
-                                                        p));
-}
-
-
-static void
-notify_receive (void *cls,
-                struct GNUNET_TRANSPORT_TESTING_PeerContext *receiver,
-                const struct GNUNET_PeerIdentity *sender,
-                const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
-  {
-    char *ps = GNUNET_strdup (GNUNET_i2s (&receiver->id));
-
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Peer %u (`%s') received message of type %d and size %u size from peer %s!\n",
-                receiver->no,
-                ps,
-                ntohs (message->header.type),
-                ntohs (message->header.size),
-                GNUNET_i2s (sender));
-    GNUNET_free (ps);
-  }
-  if ((GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE == ntohs (message->header.type)) &&
-      (sizeof(struct GNUNET_TRANSPORT_TESTING_TestMessage) == ntohs (
-         message->header.size)))
-  {
-    if (GNUNET_NO == restarted)
-    {
-      restarted = GNUNET_YES;
-      fprintf (stderr, "TN: %s\n", ccc->test_name);
-      restart (ccc->p[0]);
-      if (NULL != strstr (ccc->test_name,
-                          "2peers"))
-        restart (ccc->p[1]);
-      return;
-    }
-    else
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Restarted peers connected and message was sent, stopping test...\n");
-      ccc->global_ret = GNUNET_OK;
-      GNUNET_SCHEDULER_shutdown ();
-    }
-  }
-  else
-  {
-    GNUNET_break (0);
-    ccc->global_ret = GNUNET_SYSERR;
-    GNUNET_SCHEDULER_shutdown ();
-  }
-}
-
-
-static void
-notify_connect (void *cls,
-                struct GNUNET_TRANSPORT_TESTING_PeerContext *me,
-                const struct GNUNET_PeerIdentity *other)
-{
-  static struct GNUNET_TRANSPORT_TESTING_SendClosure sc = {
-    .num_messages = 1
-  };
-
-  sc.ccc = ccc;
-  GNUNET_TRANSPORT_TESTING_log_connect (cls,
-                                        me,
-                                        other);
-  if (me == ccc->p[0])
-    p1_connected = GNUNET_YES;
-  if (me == ccc->p[1])
-    p2_connected = GNUNET_YES;
-
-  if ((GNUNET_YES == restarted) &&
-      (GNUNET_YES == p1_connected) &&
-      (GNUNET_YES == p2_connected))
-  {
-    /* Peer was restarted and we received 3 connect messages (2 from first connect, 1 from reconnect) */
-    GNUNET_SCHEDULER_add_now (&GNUNET_TRANSPORT_TESTING_simple_send,
-                              &sc);
-  }
-}
-
-
-static void
-notify_disconnect (void *cls,
-                   struct GNUNET_TRANSPORT_TESTING_PeerContext *me,
-                   const struct GNUNET_PeerIdentity *other)
-{
-  GNUNET_TRANSPORT_TESTING_log_disconnect (cls,
-                                           me,
-                                           other);
-  if (me == ccc->p[0])
-    p1_connected = GNUNET_NO;
-  if (me == ccc->p[1])
-    p2_connected = GNUNET_NO;
-}
-
-
-int
-main (int argc,
-      char *argv[])
-{
-  struct GNUNET_TRANSPORT_TESTING_SendClosure sc = {
-    .num_messages = 1
-  };
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext my_ccc = {
-    .connect_continuation = &GNUNET_TRANSPORT_TESTING_simple_send,
-    .connect_continuation_cls = &sc,
-    .config_file = "test_transport_api_data.conf",
-    .rec = &notify_receive,
-    .nc = &notify_connect,
-    .nd = &notify_disconnect,
-    .shutdown_task = &custom_shutdown,
-    .timeout = TIMEOUT
-  };
-
-  ccc = &my_ccc;
-  sc.ccc = ccc;
-  if (GNUNET_OK !=
-      GNUNET_TRANSPORT_TESTING_main (2,
-                                     &GNUNET_TRANSPORT_TESTING_connect_check,
-                                     ccc))
-    return 1;
-  return 0;
-}
-
-
-/* end of test_transport_api_restart_1peer.c */
diff --git a/src/transport/test_transport_api_slow_ats_peer1.conf b/src/transport/test_transport_api_slow_ats_peer1.conf
deleted file mode 100644
index a96f5e263..000000000
--- a/src/transport/test_transport_api_slow_ats_peer1.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-slow-ats-p1/
-
-[transport]
-PLUGINS = tcp
-
diff --git a/src/transport/test_transport_api_slow_ats_peer2.conf b/src/transport/test_transport_api_slow_ats_peer2.conf
deleted file mode 100644
index 3a6ed05d3..000000000
--- a/src/transport/test_transport_api_slow_ats_peer2.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-slow-ats-p2/
-
-[transport]
-PLUGINS = tcp
-
-[ats]
-PREFIX = ./test_delay -t 10 --
diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/transport/test_transport_api_tcp_nat_peer1.conf
deleted file mode 100644
index fb2fcecc6..000000000
--- a/src/transport/test_transport_api_tcp_nat_peer1.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-nat-p1/
-
-[nat]
-BEHIND_NAT = YES
-ENABLE_NAT_SERVER = YES
-DISABLEV6 = YES
-
-[transport-tcp]
-PORT = 0
-TIMEOUT = 5 s
-
-[arm]
-PORT = 51204
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12023
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12022
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12021
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 29542
-PLUGINS = tcp
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-
diff --git a/src/transport/test_transport_api_tcp_nat_peer2.conf b/src/transport/test_transport_api_tcp_nat_peer2.conf
deleted file mode 100644
index 1faefc195..000000000
--- a/src/transport/test_transport_api_tcp_nat_peer2.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-nat-p2/
-
-[nat]
-DISABLEV6 = YES
-ENABLE_NAT_CLIENT = YES
-
-[transport-tcp]
-PORT = 12030
-TIMEOUT = 5 s
-
-[arm]
-PORT = 12034
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12033
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12032
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12031
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 45923
-PLUGINS = tcp
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf
deleted file mode 100644
index eabd6b701..000000000
--- a/src/transport/test_transport_api_tcp_peer1.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
-
-[transport]
-PLUGINS = tcp
-
-#[transport]
-#PREFIX = valgrind
diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf
deleted file mode 100644
index 58ce0777f..000000000
--- a/src/transport/test_transport_api_tcp_peer2.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
-
-[transport]
-PLUGINS = tcp
-
-#[transport]
-#PREFIX = valgrind
diff --git a/src/transport/test_transport_api_timeout.c b/src/transport/test_transport_api_timeout.c
deleted file mode 100644
index 9f8d3bb2b..000000000
--- a/src/transport/test_transport_api_timeout.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
-     This file is part of GNUnet.x
-     Copyright (C) 2009, 2010, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport/test_transport_api_timeout.c
- * @brief test case for transport plugin implementations complying timeout
- * settings
- *
- *
- * This test case serves ensures that no peer disconnect events occurs
- * while plugins are idle
- */
-
-#include "platform.h"
-#include "gnunet_transport_service.h"
-#include "transport-testing.h"
-
-/**
- * How long until we give up on transmitting the message?
- */
-#define WAIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
-
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 90)
-
-#define MTYPE 12345
-
-static struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc;
-
-static struct GNUNET_TIME_Relative time_running;
-
-static struct GNUNET_SCHEDULER_Task *timer_task;
-
-static int shutdown_flag;
-
-static unsigned int disconnects;
-
-
-static void
-custom_shutdown (void *cls)
-{
-  if (NULL != timer_task)
-  {
-    GNUNET_SCHEDULER_cancel (timer_task);
-    timer_task = NULL;
-  }
-  if (0 == disconnects)
-  {
-    ccc->global_ret = GNUNET_OK;
-  }
-  else
-  {
-    ccc->global_ret = -GNUNET_SYSERR;
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Fail! Had %u disconnects while waiting %s\n",
-                disconnects,
-                GNUNET_STRINGS_relative_time_to_string (WAIT,
-                                                        GNUNET_YES));
-  }
-}
-
-
-static void
-notify_receive (void *cls,
-                struct GNUNET_TRANSPORT_TESTING_PeerContext *receiver,
-                const struct GNUNET_PeerIdentity *sender,
-                const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received message of type %d from peer %s!\n",
-              ntohs (message->header.type),
-              GNUNET_i2s (sender));
-}
-
-
-static void
-notify_disconnect (void *cls,
-                   struct GNUNET_TRANSPORT_TESTING_PeerContext *me,
-                   const struct GNUNET_PeerIdentity *other)
-{
-  GNUNET_TRANSPORT_TESTING_log_disconnect (cls,
-                                           me,
-                                           other);
-  if (shutdown_flag != GNUNET_YES)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "FAIL! Peer `%s' disconnected during waiting period!\n",
-                GNUNET_i2s (other));
-    disconnects++;
-  }
-}
-
-
-static void
-timer (void *cls)
-{
-  static unsigned int percentage;
-
-  timer_task = NULL;
-  percentage += 10;
-  time_running = GNUNET_TIME_relative_add (time_running,
-                                           GNUNET_TIME_relative_divide (WAIT,
-                                                                        10));
-
-  if (time_running.rel_value_us ==
-      GNUNET_TIME_relative_max (time_running, WAIT).rel_value_us)
-  {
-    fprintf (stderr, "%s", "100%%\n");
-    shutdown_flag = GNUNET_YES;
-    GNUNET_SCHEDULER_shutdown ();
-  }
-  else
-  {
-    fprintf (stderr,
-             "%u%%..",
-             percentage);
-    timer_task =
-      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_divide (WAIT, 10),
-                                    &timer,
-                                    NULL);
-  }
-}
-
-
-int
-main (int argc,
-      char *argv[])
-{
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext my_ccc = {
-    .connect_continuation = &timer,
-    .config_file = "test_transport_api_data.conf",
-    .rec = &notify_receive,
-    .nc = &GNUNET_TRANSPORT_TESTING_log_connect,
-    .nd = &notify_disconnect,
-    .shutdown_task = &custom_shutdown,
-    .timeout = TIMEOUT
-  };
-
-  ccc = &my_ccc;
-  if (GNUNET_OK !=
-      GNUNET_TRANSPORT_TESTING_main (2,
-                                     &GNUNET_TRANSPORT_TESTING_connect_check,
-                                     ccc))
-    return 1;
-  return 0;
-}
-
-
-/* end of test_transport_api_timeout.c*/
diff --git a/src/transport/test_transport_api_timeout_bluetooth_peer1.conf b/src/transport/test_transport_api_timeout_bluetooth_peer1.conf
deleted file mode 100644
index dcc159e45..000000000
--- a/src/transport/test_transport_api_timeout_bluetooth_peer1.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-bluetooth-p1/
-
-[transport-bluetooth]
-INTERFACE = hci0
-TESTMODE = 1
-
-[arm]
-PORT = 12164
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12163
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12162
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12161
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12160
-PLUGINS = bluetooth
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
-#PREFIX = valgrind --leak-check=full --show-reachable=yes --main-stacksize=104857600
-#PREFIX = valgrind --leak-check=full --show-reachable=yes
-#PREFIX = valgrind --leak-check=full
-#PREFIX = valgrind --tool=massif
-#PREFIX = gdbserver :2345
-
diff --git a/src/transport/test_transport_api_timeout_bluetooth_peer2.conf b/src/transport/test_transport_api_timeout_bluetooth_peer2.conf
deleted file mode 100644
index 5cd550d0e..000000000
--- a/src/transport/test_transport_api_timeout_bluetooth_peer2.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-bluetooth-p2/
-
-[transport-bluetooth]
-INTERFACE = hci1
-TESTMODE = 2
-
-[arm]
-PORT = 12174
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12173
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12172
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12171
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12170
-PLUGINS = bluetooth
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
-#PREFIX = valgrind --leak-check=full --show-reachable=yes --main-stacksize=104857600
-#PREFIX = valgrind --leak-check=full --show-reachable=yes
-#PREFIX = valgrind --leak-check=full
-#PREFIX = valgrind --tool=massif
-#PREFIX = gdbserver :2345
diff --git a/src/transport/test_transport_api_timeout_http_peer1.conf b/src/transport/test_transport_api_timeout_http_peer1.conf
deleted file mode 100644
index d7bc59ea3..000000000
--- a/src/transport/test_transport_api_timeout_http_peer1.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-http-p1/
-
-[arm]
-PORT = 12085
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12084
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12083
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12082
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12081
-PLUGINS = http_client
-#BINARY = .libs/gnunet-service-transport
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-#PREFIX = valgrind --leak-check=full
-#PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
-
diff --git a/src/transport/test_transport_api_timeout_http_peer2.conf b/src/transport/test_transport_api_timeout_http_peer2.conf
deleted file mode 100644
index 453c6d0c5..000000000
--- a/src/transport/test_transport_api_timeout_http_peer2.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-http-p2/
-
-[transport-http_server]
-PORT = 12090
-USE_IPv6 = NO
-BINDTO = 127.0.0.1
-
-
-[arm]
-PORT = 12095
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12094
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12093
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12092
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12091
-PLUGINS = http_server
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-#PREFIX = valgrind --leak-check=full
diff --git a/src/transport/test_transport_api_timeout_https_peer1.conf b/src/transport/test_transport_api_timeout_https_peer1.conf
deleted file mode 100644
index c4f96814c..000000000
--- a/src/transport/test_transport_api_timeout_https_peer1.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-https-p1/
-
-[arm]
-PORT = 12105
-
-[statistics]
-PORT = 12104
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12103
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12102
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12101
-PLUGINS = https_client
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-
-
diff --git a/src/transport/test_transport_api_timeout_https_peer2.conf b/src/transport/test_transport_api_timeout_https_peer2.conf
deleted file mode 100644
index bfdf0caec..000000000
--- a/src/transport/test_transport_api_timeout_https_peer2.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-https-p2/
-
-[transport-https_server]
-PORT = 12110
-KEY_FILE = $GNUNET_TEST_HOME/https_key_p2.key
-CERT_FILE = $GNUNET_TEST_HOME/https_cert_p2.crt
-
-[arm]
-PORT = 12115
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12114
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12113
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12112
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12111
-PLUGINS = https_server
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
-
diff --git a/src/transport/test_transport_api_timeout_tcp_peer1.conf b/src/transport/test_transport_api_timeout_tcp_peer1.conf
deleted file mode 100644
index 389250bec..000000000
--- a/src/transport/test_transport_api_timeout_tcp_peer1.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
-
-[transport-tcp]
-PORT = 12000
-TIMEOUT = 5 s
-
-[arm]
-PORT = 12005
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12004
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12003
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12002
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12001
-PLUGINS = tcp
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-
-
diff --git a/src/transport/test_transport_api_timeout_tcp_peer2.conf b/src/transport/test_transport_api_timeout_tcp_peer2.conf
deleted file mode 100644
index 225b8fac2..000000000
--- a/src/transport/test_transport_api_timeout_tcp_peer2.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
-
-[nat]
-ALLOW_NAT = NO
-
-[transport-tcp]
-PORT = 12100
-
-[arm]
-PORT = 12014
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12013
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12012
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12011
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12010
-PLUGINS = tcp
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
-
diff --git a/src/transport/test_transport_api_timeout_udp_peer1.conf b/src/transport/test_transport_api_timeout_udp_peer1.conf
deleted file mode 100644
index e28e3a2e0..000000000
--- a/src/transport/test_transport_api_timeout_udp_peer1.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-udp-p1/
-
-[transport-udp]
-PORT = 12040
-BROADCAST = NO
-BROADCAST_INTERVAL = 30000
-MAX_BPS = 50000000
-
-[arm]
-PORT = 12045
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12044
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12043
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12042
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-#PREFIX = valgrind --leak-check=full
-PORT = 12041
-PLUGINS = udp
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-
-
diff --git a/src/transport/test_transport_api_timeout_udp_peer2.conf b/src/transport/test_transport_api_timeout_udp_peer2.conf
deleted file mode 100644
index 434ef4853..000000000
--- a/src/transport/test_transport_api_timeout_udp_peer2.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-udp-p2/
-
-[transport-udp]
-PORT = 12050
-BROADCAST = NO
-MAX_BPS = 50000000
-
-[arm]
-PORT = 12055
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12054
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12053
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12052
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12051
-PLUGINS = udp
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
-
diff --git a/src/transport/test_transport_api_timeout_unix_peer1.conf b/src/transport/test_transport_api_timeout_unix_peer1.conf
deleted file mode 100644
index e253aad8c..000000000
--- a/src/transport/test_transport_api_timeout_unix_peer1.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-unix-p1/
-
-[arm]
-PORT = 12125
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12124
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12123
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12122
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12121
-PLUGINS = unix
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-
-[transport-unix]
-PORT = 12120
-
diff --git a/src/transport/test_transport_api_timeout_unix_peer2.conf b/src/transport/test_transport_api_timeout_unix_peer2.conf
deleted file mode 100644
index bd3fccbb3..000000000
--- a/src/transport/test_transport_api_timeout_unix_peer2.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-unix-p2/
-
-[arm]
-PORT = 12135
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12134
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12133
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12132
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12131
-PLUGINS = unix
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
-[transport-unix]
-PORT = 12136
-
diff --git a/src/transport/test_transport_api_timeout_wlan_peer1.conf b/src/transport/test_transport_api_timeout_wlan_peer1.conf
deleted file mode 100644
index 68716d287..000000000
--- a/src/transport/test_transport_api_timeout_wlan_peer1.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-wlan-p1/
-
-[transport-wlan]
-INTERFACE = mon0
-TESTMODE = 1
-
-[arm]
-PORT = 12164
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12163
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12162
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12161
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12160
-PLUGINS = wlan
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
-#PREFIX = valgrind --leak-check=full --show-reachable=yes --main-stacksize=104857600
-#PREFIX = valgrind --leak-check=full --show-reachable=yes
-#PREFIX = valgrind --leak-check=full
-#PREFIX = valgrind --tool=massif
-#PREFIX = gdbserver :2345
-
diff --git a/src/transport/test_transport_api_timeout_wlan_peer2.conf b/src/transport/test_transport_api_timeout_wlan_peer2.conf
deleted file mode 100644
index 98bbc6e2b..000000000
--- a/src/transport/test_transport_api_timeout_wlan_peer2.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-wlan-p2/
-
-[transport-wlan]
-INTERFACE = mon1
-TESTMODE = 2
-
-[arm]
-PORT = 12174
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12173
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12172
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12171
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12170
-PLUGINS = wlan
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
-#PREFIX = valgrind --leak-check=full --show-reachable=yes --main-stacksize=104857600
-#PREFIX = valgrind --leak-check=full --show-reachable=yes
-#PREFIX = valgrind --leak-check=full
-#PREFIX = valgrind --tool=massif
-#PREFIX = gdbserver :2345
diff --git a/src/transport/test_transport_api_udp_nat_peer1.conf b/src/transport/test_transport_api_udp_nat_peer1.conf
deleted file mode 100644
index 7bbcaa628..000000000
--- a/src/transport/test_transport_api_udp_nat_peer1.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-udp-nat-p1/
-
-[nat]
-BEHIND_NAT = YES
-ALLOW_NAT = NO
-ONLY_NAT_ADDRESSES = YES
-
-[transport-udp]
-PORT = 0
-
-[arm]
-PORT = 12065
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12064
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12063
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12062
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12061
-PLUGINS = udp
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-
-
diff --git a/src/transport/test_transport_api_udp_nat_peer2.conf b/src/transport/test_transport_api_udp_nat_peer2.conf
deleted file mode 100644
index 8bdb8c293..000000000
--- a/src/transport/test_transport_api_udp_nat_peer2.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-udp-nat-p2/
-
-[nat]
-ALLOW_NAT = YES
-
-[transport-udp]
-PORT = 12070
-
-[arm]
-PORT = 12075
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12074
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12073
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12072
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12071
-PLUGINS = udp
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
-
diff --git a/src/transport/test_transport_api_udp_peer1.conf b/src/transport/test_transport_api_udp_peer1.conf
deleted file mode 100644
index 4684b77f2..000000000
--- a/src/transport/test_transport_api_udp_peer1.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-udp-p1/
-
-[transport-udp]
-PORT = 0
-BROADCAST = NO
-MAX_BPS = 50000000
-BINDTO = 127.0.0.1
-BINDTO6 = ::1
-
-[transport]
-PORT = 12041
-PLUGINS = udp
-
-
-
diff --git a/src/transport/test_transport_api_udp_peer2.conf b/src/transport/test_transport_api_udp_peer2.conf
deleted file mode 100644
index 96706ce49..000000000
--- a/src/transport/test_transport_api_udp_peer2.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-udp-p2/
-
-[transport-udp]
-PORT = 12050
-BROADCAST = NO
-MAX_BPS = 50000000
-BINDTO = 127.0.0.1
-BINDTO6 = ::1
-
-[transport]
-PLUGINS = udp
-
-
diff --git a/src/transport/test_transport_api_unix_abstract_peer1.conf b/src/transport/test_transport_api_unix_abstract_peer1.conf
deleted file mode 100644
index 103a483b4..000000000
--- a/src/transport/test_transport_api_unix_abstract_peer1.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-unix-p1/
-
-[arm]
-PORT = 12125
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12124
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12123
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12122
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12121
-PLUGINS = unix
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-
-[transport-unix]
-PORT = 12120
-
-[testing]
-USE_ABSTRACT_SOCKETS = YES
-
diff --git a/src/transport/test_transport_api_unix_abstract_peer2.conf b/src/transport/test_transport_api_unix_abstract_peer2.conf
deleted file mode 100644
index c3a5525d9..000000000
--- a/src/transport/test_transport_api_unix_abstract_peer2.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-unix-p2/
-
-[arm]
-PORT = 12135
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12134
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12133
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12132
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12131
-PLUGINS = unix
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
-[transport-unix]
-PORT = 12136
-
-[testing]
-USE_ABSTRACT_SOCKETS = YES
-
diff --git a/src/transport/test_transport_api_unix_peer1.conf b/src/transport/test_transport_api_unix_peer1.conf
deleted file mode 100644
index 005558bcc..000000000
--- a/src/transport/test_transport_api_unix_peer1.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-unix-p1/
-
-[transport]
-PLUGINS = unix
-
-[transport-unix]
-PORT = 12120
-
diff --git a/src/transport/test_transport_api_unix_peer2.conf b/src/transport/test_transport_api_unix_peer2.conf
deleted file mode 100644
index 840ed81c7..000000000
--- a/src/transport/test_transport_api_unix_peer2.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-unix-p2/
-
-[transport]
-PLUGINS = unix
-
diff --git a/src/transport/test_transport_api_unreliability_bluetooth_peer1.conf b/src/transport/test_transport_api_unreliability_bluetooth_peer1.conf
deleted file mode 100644
index 3f86ee940..000000000
--- a/src/transport/test_transport_api_unreliability_bluetooth_peer1.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-bluetooth-p1/
-
-[transport-bluetooth]
-INTERFACE = hci0
-TESTMODE = 1
-
-[arm]
-PORT = 12164
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12163
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12162
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12161
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12160
-PLUGINS = bluetooth
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-
-
diff --git a/src/transport/test_transport_api_unreliability_bluetooth_peer2.conf b/src/transport/test_transport_api_unreliability_bluetooth_peer2.conf
deleted file mode 100644
index 5fc178395..000000000
--- a/src/transport/test_transport_api_unreliability_bluetooth_peer2.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-bluetooth-p2/
-
-[transport-bluetooth]
-INTERFACE = hci1
-TESTMODE = 2
-
-[arm]
-PORT = 12174
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12173
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12172
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12171
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12170
-PLUGINS = bluetooth
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
diff --git a/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf b/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf
deleted file mode 100644
index 9f63c0ced..000000000
--- a/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-udp-p1/
-
-[transport-udp]
-PORT = 12040
-MAX_BPS = 1073741824
-
-[arm]
-PORT = 12045
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12044
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12043
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12042
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12041
-PLUGINS = udp
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-
-
diff --git a/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf b/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf
deleted file mode 100644
index cdf3d7bb4..000000000
--- a/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-udp-p2/
-
-[transport-udp]
-PORT = 12050
-MAX_BPS = 1073741824
-
-[arm]
-PORT = 12055
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12054
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12053
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12052
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12051
-PLUGINS = udp
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
-
diff --git a/src/transport/test_transport_api_unreliability_wlan_peer1.conf b/src/transport/test_transport_api_unreliability_wlan_peer1.conf
deleted file mode 100644
index 78e280b68..000000000
--- a/src/transport/test_transport_api_unreliability_wlan_peer1.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-wlan-p1/
-
-[transport-wlan]
-TESTMODE = 1
-
-[arm]
-PORT = 12164
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12163
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12162
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12161
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12160
-PLUGINS = wlan
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-
-
diff --git a/src/transport/test_transport_api_unreliability_wlan_peer2.conf b/src/transport/test_transport_api_unreliability_wlan_peer2.conf
deleted file mode 100644
index e97ab3f38..000000000
--- a/src/transport/test_transport_api_unreliability_wlan_peer2.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-wlan-p2/
-
-[transport-wlan]
-INTERFACE = mon1
-TESTMODE = 2
-
-[arm]
-PORT = 12174
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12173
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12172
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12171
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12170
-PLUGINS = wlan
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-
diff --git a/src/transport/test_transport_api_wlan_peer1.conf b/src/transport/test_transport_api_wlan_peer1.conf
deleted file mode 100644
index 68716d287..000000000
--- a/src/transport/test_transport_api_wlan_peer1.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-wlan-p1/
-
-[transport-wlan]
-INTERFACE = mon0
-TESTMODE = 1
-
-[arm]
-PORT = 12164
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12163
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12162
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12161
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12160
-PLUGINS = wlan
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
-#PREFIX = valgrind --leak-check=full --show-reachable=yes --main-stacksize=104857600
-#PREFIX = valgrind --leak-check=full --show-reachable=yes
-#PREFIX = valgrind --leak-check=full
-#PREFIX = valgrind --tool=massif
-#PREFIX = gdbserver :2345
-
diff --git a/src/transport/test_transport_api_wlan_peer2.conf b/src/transport/test_transport_api_wlan_peer2.conf
deleted file mode 100644
index 98bbc6e2b..000000000
--- a/src/transport/test_transport_api_wlan_peer2.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-wlan-p2/
-
-[transport-wlan]
-INTERFACE = mon1
-TESTMODE = 2
-
-[arm]
-PORT = 12174
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12173
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12172
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12171
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12170
-PLUGINS = wlan
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
-#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
-#PREFIX = valgrind --leak-check=full --show-reachable=yes --main-stacksize=104857600
-#PREFIX = valgrind --leak-check=full --show-reachable=yes
-#PREFIX = valgrind --leak-check=full
-#PREFIX = valgrind --tool=massif
-#PREFIX = gdbserver :2345
diff --git a/src/transport/test_transport_blacklisting.c b/src/transport/test_transport_blacklisting.c
deleted file mode 100644
index 204935dcb..000000000
--- a/src/transport/test_transport_blacklisting.c
+++ /dev/null
@@ -1,582 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2009, 2010, 2011 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/transport_api_blacklisting.c
- * @brief test for the blacklisting with blacklistings defined in cfg
- *
- * this file contains multiple tests:
- *
- * test_transport_blacklisting_no_bl:
- *      no blacklisting entries
- *      peers are expected to connect
- * test_transport_blacklisting_outbound_bl_full:
- *      both peers contain bl entries for full peer
- *      test is expected to not connect
- * test_transport_blacklisting_outbound_bl_plugin:
- *      both peers contain bl entries for plugin
- *      test is expected to not connect
- * test_transport_blacklisting_inbound_bl_plugin:
- *      peer 1 contains no bl entries
- *      peer 2 contain bl entries for full peer
- *      test is expected to not connect
- * test_transport_blacklisting_inbound_bl_full:
- *      peer 1 contains no bl entries
- *      peer 2 contain bl entries for plugin
- *      test is expected to not connect
- * test_transport_blacklisting_multiple_plugins:
- *      both peers contain bl entries for plugin
- *      test is expected to  connect with not bl'ed plugin
- *
- * @author Matthias Wachs
- *
- */
-#include "platform.h"
-#include "gnunet_transport_service.h"
-#include "transport-testing.h"
-
-char *test_name;
-
-struct GNUNET_TRANSPORT_TESTING_PeerContext *p1;
-
-struct GNUNET_TRANSPORT_TESTING_PeerContext *p2;
-
-static struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc;
-
-struct GNUNET_TRANSPORT_TESTING_Handle *tth;
-
-/**
- * How long until we give up on transmitting the message?
- */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 20)
-
-#define CONNECT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, \
-                                                       10)
-
-static int stage;
-static int ok;
-static int connected;
-
-static struct GNUNET_SCHEDULER_Task *die_task;
-
-static struct GNUNET_SCHEDULER_Task *timeout_task;
-
-static struct GNUNET_SCHEDULER_Task *stage_task;
-
-#if VERBOSE
-#define OKPP do { ok++; fprintf (stderr, "Now at stage %u at %s:%u\n", ok, \
-                                 __FILE__, __LINE__); } while (0)
-#else
-#define OKPP do { ok++; } while (0)
-#endif
-
-
-static void
-run_stage (void *cls);
-
-
-static void
-end (void *cls)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping\n");
-
-  if (die_task != NULL)
-  {
-    GNUNET_SCHEDULER_cancel (die_task);
-    die_task = NULL;
-  }
-
-  if (timeout_task != NULL)
-  {
-    GNUNET_SCHEDULER_cancel (timeout_task);
-    timeout_task = NULL;
-  }
-
-  if (stage_task != NULL)
-  {
-    GNUNET_SCHEDULER_cancel (stage_task);
-    stage_task = NULL;
-  }
-
-  if (cc != NULL)
-  {
-    GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc);
-    cc = NULL;
-  }
-
-  if (p1 != NULL)
-  {
-    GNUNET_TRANSPORT_TESTING_stop_peer (p1);
-    p1 = NULL;
-  }
-  if (p2 != NULL)
-  {
-    GNUNET_TRANSPORT_TESTING_stop_peer (p2);
-    p2 = NULL;
-  }
-}
-
-
-static void
-end_badly (void *cls)
-{
-  die_task = NULL;
-
-  if (timeout_task != NULL)
-  {
-    GNUNET_SCHEDULER_cancel (timeout_task);
-    timeout_task = NULL;
-  }
-
-  if (stage_task != NULL)
-  {
-    GNUNET_SCHEDULER_cancel (stage_task);
-    stage_task = NULL;
-  }
-
-  if (cc != NULL)
-  {
-    GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc);
-    cc = NULL;
-  }
-  if (p1 != NULL)
-    GNUNET_TRANSPORT_TESTING_stop_peer (p1);
-  if (p2 != NULL)
-    GNUNET_TRANSPORT_TESTING_stop_peer (p2);
-
-  ok = GNUNET_SYSERR;
-}
-
-
-static void
-testing_connect_cb (void *cls)
-{
-  cc = NULL;
-  char *p1_c = GNUNET_strdup (GNUNET_i2s (&p1->id));
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Peers connected: %u (%s) <-> %u (%s)\n",
-              p1->no, p1_c, p2->no, GNUNET_i2s (&p2->id));
-  GNUNET_free (p1_c);
-  connected = GNUNET_YES;
-  stage_task = GNUNET_SCHEDULER_add_now (&run_stage, NULL);
-}
-
-
-static void
-connect_timeout (void *cls)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Peers not connected, next stage\n");
-  timeout_task = NULL;
-  stage_task = GNUNET_SCHEDULER_add_now (&run_stage,
-                                         NULL);
-}
-
-
-static int started;
-
-
-static void
-start_cb (void *cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls;
-
-  started++;
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Peer %u (`%s') started\n",
-              p->no,
-              GNUNET_i2s_full (&p->id));
-
-  if (started != 2)
-    return;
-
-  char *sender_c = GNUNET_strdup (GNUNET_i2s (&p1->id));
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Test tries to connect peer %u (`%s') -> peer %u (`%s')\n",
-              p1->no,
-              sender_c,
-              p2->no,
-              GNUNET_i2s (&p2->id));
-  GNUNET_free (sender_c);
-
-  cc = GNUNET_TRANSPORT_TESTING_connect_peers (p1,
-                                               p2,
-                                               &testing_connect_cb,
-                                               NULL);
-}
-
-
-static int
-check_blacklist_config (const char *cfg_file,
-                        struct GNUNET_PeerIdentity *peer,
-                        struct GNUNET_PeerIdentity *bl_peer)
-{
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-  char *section;
-  char *peer_str;
-
-  cfg = GNUNET_CONFIGURATION_create ();
-  if (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg, cfg_file))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not load configuration `%s'\n",
-                cfg_file);
-    GNUNET_CONFIGURATION_destroy (cfg);
-    return GNUNET_SYSERR;
-  }
-
-  peer_str = GNUNET_strdup (GNUNET_i2s_full (peer));
-  GNUNET_asprintf (&section, "transport-blacklist-%s", peer_str);
-
-  if (GNUNET_NO == GNUNET_CONFIGURATION_have_value (cfg, section,
-                                                    GNUNET_i2s_full (bl_peer)))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Configuration `%s' does not have blacklisting section for peer `%s' blacklisting `%s'\n",
-                cfg_file, peer_str, GNUNET_i2s_full (bl_peer));
-    GNUNET_CONFIGURATION_destroy (cfg);
-    GNUNET_free (section);
-    GNUNET_free (peer_str);
-    return GNUNET_SYSERR;
-  }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Configuration `%s' does have blacklisting section for peer `%s' blacklisting `%s'\n",
-              cfg_file, peer_str, GNUNET_i2s_full (bl_peer));
-
-  GNUNET_CONFIGURATION_destroy (cfg);
-  GNUNET_free (section);
-  GNUNET_free (peer_str);
-  return GNUNET_OK;
-}
-
-
-static void
-run_stage (void *cls)
-{
-  stage_task = NULL;
-  if (NULL != die_task)
-    GNUNET_SCHEDULER_cancel (die_task);
-  die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Running stage %u\n", stage);
-
-  if (0 == stage)
-  {
-    started = GNUNET_NO;
-    connected = GNUNET_NO;
-    if (0 == strcmp (test_name, "test_transport_blacklisting_no_bl"))
-    {
-      /* Try to connect peers successfully */
-      p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
-                                                "test_transport_blacklisting_cfg_peer1.conf",
-                                                1,
-                                                NULL,
-                                                NULL,
-                                                NULL,
-                                                NULL,
-                                                &start_cb,
-                                                NULL);
-
-      p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
-                                                "test_transport_blacklisting_cfg_peer2.conf",
-                                                2,
-                                                NULL,
-                                                NULL,
-                                                NULL,
-                                                NULL,
-                                                &start_cb,
-                                                NULL);
-    }
-    else if (0 == strcmp (test_name,
-                          "test_transport_blacklisting_outbound_bl_full"))
-    {
-      const char *cfg_p1 =
-        "test_transport_blacklisting_cfg_blp_peer1_full.conf";
-      const char *cfg_p2 =
-        "test_transport_blacklisting_cfg_blp_peer2_full.conf";
-
-      p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
-                                                cfg_p1,
-                                                1, NULL, NULL, NULL,
-                                                NULL,
-                                                &start_cb, NULL);
-      p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
-                                                cfg_p2, 2,
-                                                NULL, NULL, NULL,
-                                                NULL,
-                                                &start_cb, NULL);
-
-      /* check if configuration contain correct blacklist entries */
-      if ((GNUNET_SYSERR ==
-           check_blacklist_config (cfg_p1, &p1->id, &p2->id)) ||
-          (GNUNET_SYSERR ==
-           check_blacklist_config (cfg_p2, &p2->id, &p1->id)))
-      {
-        GNUNET_TRANSPORT_TESTING_stop_peer (p1);
-        p1 = NULL;
-        GNUNET_TRANSPORT_TESTING_stop_peer (p2);
-        p2 = NULL;
-        ok = 1;
-        GNUNET_SCHEDULER_add_now (&end, NULL);
-      }
-    }
-    else if (0
-             == strcmp (test_name,
-                        "test_transport_blacklisting_outbound_bl_plugin"))
-    {
-      const char *cfg_p1 =
-        "test_transport_blacklisting_cfg_blp_peer1_plugin.conf";
-      const char *cfg_p2 =
-        "test_transport_blacklisting_cfg_blp_peer2_plugin.conf";
-
-      p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
-                                                cfg_p1,
-                                                1,
-                                                NULL,
-                                                NULL,
-                                                NULL,
-                                                NULL,
-                                                &start_cb,
-                                                NULL);
-
-      p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
-                                                cfg_p2, 2,
-                                                NULL,
-                                                NULL,
-                                                NULL,
-                                                NULL,
-                                                &start_cb,
-                                                NULL);
-
-      /* check if configuration contain correct blacklist entries */
-      if ((GNUNET_SYSERR ==
-           check_blacklist_config (cfg_p1, &p1->id, &p2->id)) ||
-          (GNUNET_SYSERR ==
-           check_blacklist_config (cfg_p2, &p2->id, &p1->id)))
-      {
-        GNUNET_TRANSPORT_TESTING_stop_peer (p1);
-        p1 = NULL;
-        GNUNET_TRANSPORT_TESTING_stop_peer (p2);
-        p2 = NULL;
-        ok = 1;
-        GNUNET_SCHEDULER_add_now (&end, NULL);
-      }
-    }
-    else if (0 == strcmp (test_name,
-                          "test_transport_blacklisting_inbound_bl_full"))
-    {
-      const char *cfg_p1 = "test_transport_blacklisting_cfg_peer1.conf";
-      const char *cfg_p2 =
-        "test_transport_blacklisting_cfg_blp_peer2_full.conf";
-
-      p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
-                                                cfg_p1, 1,
-                                                NULL,
-                                                NULL, NULL, NULL,
-                                                &start_cb, NULL);
-
-      p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
-                                                cfg_p2, 2,
-                                                NULL,
-                                                NULL, NULL, NULL,
-                                                &start_cb, NULL);
-
-      /* check if configuration contain correct blacklist entries */
-      if ((GNUNET_SYSERR ==
-           check_blacklist_config (cfg_p2, &p2->id, &p1->id)))
-      {
-        GNUNET_TRANSPORT_TESTING_stop_peer (p1);
-        p1 = NULL;
-        GNUNET_TRANSPORT_TESTING_stop_peer (p2);
-        p2 = NULL;
-        ok = 1;
-        GNUNET_SCHEDULER_add_now (&end, NULL);
-      }
-    }
-    else if (0 == strcmp (test_name,
-                          "test_transport_blacklisting_inbound_bl_plugin"))
-    {
-      const char *cfg_p1 = "test_transport_blacklisting_cfg_peer1.conf";
-      const char *cfg_p2 =
-        "test_transport_blacklisting_cfg_blp_peer2_plugin.conf";
-
-      p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
-                                                cfg_p1, 1,
-                                                NULL,
-                                                NULL, NULL, NULL,
-                                                &start_cb, NULL);
-
-      p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
-                                                cfg_p2, 2,
-                                                NULL,
-                                                NULL, NULL,
-                                                NULL,
-                                                &start_cb, NULL);
-
-      /* check if configuration contain correct blacklist entries */
-      if ((GNUNET_SYSERR ==
-           check_blacklist_config (cfg_p2, &p2->id, &p1->id)))
-      {
-        GNUNET_TRANSPORT_TESTING_stop_peer (p1);
-        p1 = NULL;
-        GNUNET_TRANSPORT_TESTING_stop_peer (p2);
-        p2 = NULL;
-        ok = 1;
-        GNUNET_SCHEDULER_add_now (&end, NULL);
-      }
-    }
-    else if (0 == strcmp (test_name,
-                          "test_transport_blacklisting_multiple_plugins"))
-    {
-      const char *cfg_p1 =
-        "test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf";
-      const char *cfg_p2 =
-        "test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf";
-
-      p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
-                                                cfg_p1, 1,
-                                                NULL,
-                                                NULL, NULL, NULL,
-                                                &start_cb, NULL);
-
-      p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
-                                                cfg_p2, 2,
-                                                NULL,
-                                                NULL, NULL, NULL,
-                                                &start_cb, NULL);
-
-      /* check if configuration contain correct blacklist entries */
-      if ((GNUNET_SYSERR ==
-           check_blacklist_config (cfg_p1, &p1->id, &p2->id)) ||
-          (GNUNET_SYSERR ==
-           check_blacklist_config (cfg_p2, &p2->id, &p1->id)))
-      {
-        GNUNET_TRANSPORT_TESTING_stop_peer (p1);
-        p1 = NULL;
-        GNUNET_TRANSPORT_TESTING_stop_peer (p2);
-        p2 = NULL;
-        ok = 1;
-        GNUNET_SCHEDULER_add_now (&end, NULL);
-      }
-    }
-    else
-    {
-      GNUNET_break (0);
-      GNUNET_SCHEDULER_add_now (&end, NULL);
-    }
-
-    if ((NULL == p1) || (NULL == p2))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to start peers\n");
-      ok = 1;
-      GNUNET_SCHEDULER_add_now (&end, NULL);
-    }
-
-    timeout_task = GNUNET_SCHEDULER_add_delayed (CONNECT_TIMEOUT,
-                                                 &connect_timeout,
-                                                 NULL);
-    stage++;
-    return;
-  }
-
-  if (cc != NULL)
-  {
-    GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc);
-    cc = NULL;
-  }
-
-  if (p1 != NULL)
-  {
-    GNUNET_TRANSPORT_TESTING_stop_peer (p1);
-    p1 = NULL;
-  }
-  if (p2 != NULL)
-  {
-    GNUNET_TRANSPORT_TESTING_stop_peer (p2);
-    p2 = NULL;
-  }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Done in stage %u: Peers %s and %s!\n",
-              stage, (GNUNET_NO == started) ? "NOT STARTED" : "STARTED",
-              (GNUNET_YES == connected) ? "CONNECTED" : "NOT CONNECTED");
-
-  if ((0 == strcmp (test_name, "test_transport_blacklisting_no_bl"))
-      || (0 == strcmp (test_name,
-                       "test_transport_blacklisting_multiple_plugins")))
-  {
-    if ((GNUNET_NO != started) && (GNUNET_YES == connected))
-      ok = 0;
-    else
-    {
-      GNUNET_break (0);
-      ok = 1;
-    }
-  }
-  else
-  {
-    if ((GNUNET_NO != started) && (GNUNET_YES != connected))
-      ok = 0;
-    else
-    {
-      ok = 1;
-    }
-  }
-  GNUNET_SCHEDULER_add_now (&end, NULL);
-}
-
-
-static void
-run (void *cls, char *const *args, const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  connected = GNUNET_NO;
-  stage = 0;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Running test `%s'!\n", test_name);
-  stage_task = GNUNET_SCHEDULER_add_now (&run_stage, NULL);
-}
-
-
-int
-main (int argc, char *argv0[])
-{
-  ok = 1;
-
-  test_name = GNUNET_TRANSPORT_TESTING_get_test_name (argv0[0]);
-
-  GNUNET_log_setup ("test-transport-api-blacklisting", "WARNING", NULL);
-
-  static char *const argv[] =
-  { "date", "-c", "test_transport_api_data.conf", NULL };
-  static struct GNUNET_GETOPT_CommandLineOption options[] =
-  { GNUNET_GETOPT_OPTION_END };
-
-  tth = GNUNET_TRANSPORT_TESTING_init ();
-
-  GNUNET_PROGRAM_run ((sizeof(argv) / sizeof(char *)) - 1, argv,
-                      "test-transport-api-blacklisting", "nohelp", options,
-                      &run, NULL);
-
-  GNUNET_TRANSPORT_TESTING_done (tth);
-
-  return ok;
-}
-
-
-/* end of transport_api_blacklisting.c */
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf
deleted file mode 100644
index 19bff8fcc..000000000
--- a/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
-
-[transport-tcp]
-PORT = 12000
-TIMEOUT = 5 s
-
-[transport]
-PLUGINS = tcp
-
-#Peer 1: 4TTC9WBSVP9RJT6DVEZ7E0TDW7TQXC11NR1EMR2F8ARS87WZ2730
-#Peer 2: F7B5NX6KCPG8SAKYSGV0E94Y5NXR9JE3HCGQ5YGH1H04WFQWMWT0
-
-[transport-blacklist-4TTC9WBSVP9RJT6DVEZ7E0TDW7TQXC11NR1EMR2F8ARS87WZ2730]
-F7B5NX6KCPG8SAKYSGV0E94Y5NXR9JE3HCGQ5YGH1H04WFQWMWT0 =
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
deleted file mode 100644
index 79bc90469..000000000
--- a/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
-
-[transport]
-PLUGINS = tcp unix
-
-#Peer 1: 4TTC9WBSVP9RJT6DVEZ7E0TDW7TQXC11NR1EMR2F8ARS87WZ2730
-#Peer 2: F7B5NX6KCPG8SAKYSGV0E94Y5NXR9JE3HCGQ5YGH1H04WFQWMWT0
-
-[transport-blacklist-4TTC9WBSVP9RJT6DVEZ7E0TDW7TQXC11NR1EMR2F8ARS87WZ2730]
-F7B5NX6KCPG8SAKYSGV0E94Y5NXR9JE3HCGQ5YGH1H04WFQWMWT0 = tcp
-
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf
deleted file mode 100644
index b328dd5cf..000000000
--- a/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
-
-[transport]
-PLUGINS = tcp
-
-#Peer 1: 4TTC9WBSVP9RJT6DVEZ7E0TDW7TQXC11NR1EMR2F8ARS87WZ2730
-#Peer 2: F7B5NX6KCPG8SAKYSGV0E94Y5NXR9JE3HCGQ5YGH1H04WFQWMWT0
-
-[transport-blacklist-4TTC9WBSVP9RJT6DVEZ7E0TDW7TQXC11NR1EMR2F8ARS87WZ2730]
-F7B5NX6KCPG8SAKYSGV0E94Y5NXR9JE3HCGQ5YGH1H04WFQWMWT0 = tcp
-
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf
deleted file mode 100644
index 862209d2c..000000000
--- a/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
-
-[transport]
-PLUGINS = tcp
-
-#Peer 1: 4TTC9WBSVP9RJT6DVEZ7E0TDW7TQXC11NR1EMR2F8ARS87WZ2730
-#Peer 2: F7B5NX6KCPG8SAKYSGV0E94Y5NXR9JE3HCGQ5YGH1H04WFQWMWT0
-
-[transport-blacklist-F7B5NX6KCPG8SAKYSGV0E94Y5NXR9JE3HCGQ5YGH1H04WFQWMWT0]
-4TTC9WBSVP9RJT6DVEZ7E0TDW7TQXC11NR1EMR2F8ARS87WZ2730 =
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
deleted file mode 100644
index 3134f9d81..000000000
--- a/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
-
-[transport]
-PLUGINS = tcp unix
-
-#Peer 1: 4TTC9WBSVP9RJT6DVEZ7E0TDW7TQXC11NR1EMR2F8ARS87WZ2730
-#Peer 2: F7B5NX6KCPG8SAKYSGV0E94Y5NXR9JE3HCGQ5YGH1H04WFQWMWT0
-
-[transport-blacklist-F7B5NX6KCPG8SAKYSGV0E94Y5NXR9JE3HCGQ5YGH1H04WFQWMWT0]
-4TTC9WBSVP9RJT6DVEZ7E0TDW7TQXC11NR1EMR2F8ARS87WZ2730 = tcp
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf
deleted file mode 100644
index dd582125d..000000000
--- a/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
-
-[transport]
-PLUGINS = tcp
-
-#Peer 1: 4TTC9WBSVP9RJT6DVEZ7E0TDW7TQXC11NR1EMR2F8ARS87WZ2730
-#Peer 2: F7B5NX6KCPG8SAKYSGV0E94Y5NXR9JE3HCGQ5YGH1H04WFQWMWT0
-
-[transport-blacklist-F7B5NX6KCPG8SAKYSGV0E94Y5NXR9JE3HCGQ5YGH1H04WFQWMWT0]
-4TTC9WBSVP9RJT6DVEZ7E0TDW7TQXC11NR1EMR2F8ARS87WZ2730 = tcp
diff --git a/src/transport/test_transport_blacklisting_cfg_peer1.conf b/src/transport/test_transport_blacklisting_cfg_peer1.conf
deleted file mode 100644
index 9150c7faf..000000000
--- a/src/transport/test_transport_blacklisting_cfg_peer1.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
-
-[transport-tcp]
-PORT = 12000
-TIMEOUT = 5 s
-
-[arm]
-PORT = 12005
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12004
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12003
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12002
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12001
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
-PLUGINS = tcp
-
diff --git a/src/transport/test_transport_blacklisting_cfg_peer2.conf b/src/transport/test_transport_blacklisting_cfg_peer2.conf
deleted file mode 100644
index 43bb4ae37..000000000
--- a/src/transport/test_transport_blacklisting_cfg_peer2.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
-
-[transport-tcp]
-PORT = 12015
-TIMEOUT = 5 s
-
-[arm]
-PORT = 12014
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12013
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12012
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12011
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12010
-PLUGINS = tcp
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
diff --git a/src/transport/test_transport_defaults.conf b/src/transport/test_transport_defaults.conf
deleted file mode 100644
index 3aed73f0c..000000000
--- a/src/transport/test_transport_defaults.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
-
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-tng/
-
-[transport-tcp]
-TIMEOUT = 300 s
-
-[transport]
-# PREFIX = valgrind 
-
-[nat]
-DISABLEV6 = NO
-RETURN_LOCAL_ADDRESSES = YES
-BINDTO = 127.0.0.1
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-
-[transport-udp]
-BROADCAST_RECEIVE = no
diff --git a/src/transport/test_transport_distance_vector_circle_topo.conf b/src/transport/test_transport_distance_vector_circle_topo.conf
deleted file mode 100644
index 210179291..000000000
--- a/src/transport/test_transport_distance_vector_circle_topo.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-M:1
-N:3
-X:0
-AC:1
-B:0
-T:libgnunet_test_transport_plugin_cmd_simple_send_dv
-R:1|{tcp_port:0}|{udp_port:1}
-R:2|{tcp_port:0}|{udp_port:1}
-R:3|{tcp_port:0}|{udp_port:1}
-P:1:1|{connect:{P:2:1:udp}}
-P:2:1|{connect:{P:3:1:udp}}
-P:3:1|{connect:{P:1:1:udp}}
diff --git a/src/transport/test_transport_distance_vector_topo.conf b/src/transport/test_transport_distance_vector_topo.conf
deleted file mode 100644
index ead3e0a0a..000000000
--- a/src/transport/test_transport_distance_vector_topo.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-M:2
-N:2
-X:0
-T:libgnunet_test_transport_plugin_cmd_simple_send_dv
-R:1|{tcp_port:1}|{udp_port:0}
-R:2|{tcp_port:1}|{udp_port:0}
-P:1:1|{connect:{P:2:1:tcp}}
-P:2:1|{connect:{P:1:1:tcp}}
diff --git a/src/transport/test_transport_plugin_cmd_simple_send.c b/src/transport/test_transport_plugin_cmd_simple_send.c
deleted file mode 100644
index 154c0abca..000000000
--- a/src/transport/test_transport_plugin_cmd_simple_send.c
+++ /dev/null
@@ -1,369 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2021 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testbed/plugin_cmd_simple_send.c
- * @brief a plugin to provide the API for running test cases.
- * @author t3sserakt
- */
-#include "platform.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_netjail_lib.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_transport_application_service.h"
-#include "transport-testing2.h"
-#include "transport-testing-cmds.h"
-
-/**
- * Generic logging shortcut
- */
-#define LOG(kind, ...) GNUNET_log (kind, __VA_ARGS__)
-
-#define BASE_DIR "testdir"
-
-#define TOPOLOGY_CONFIG "test_transport_simple_send_topo.conf"
-
-struct TestState
-{
-  /**
-   * Callback to write messages to the master loop.
-   *
-   */
-  TESTING_CMD_HELPER_write_cb write_message;
-
-  /**
-   * The name for a specific test environment directory.
-   *
-   */
-  char *testdir;
-
-  /**
-   * The name for the configuration file of the specific node.
-   *
-   */
-  char *cfgname;
-
-  /**
-   * The complete topology information.
-   */
-  struct GNUNET_TESTING_NetjailTopology *topology;
-};
-
-static struct GNUNET_TESTING_Command block_send;
-
-static struct GNUNET_TESTING_Command block_receive;
-
-static struct GNUNET_TESTING_Command connect_peers;
-
-static struct GNUNET_TESTING_Command local_prepared;
-
-
-/**
- * Function called to check a message of type GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE being
- * received.
- *
- */
-static int
-check_test (void *cls,
-            const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
-  return GNUNET_OK;
-}
-
-
-/**
- * Function called to handle a message of type GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE
- * being received.
- *
- */
-static void
-handle_test (void *cls,
-             const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
-  const struct GNUNET_TESTING_AsyncContext *ac;
-
-  GNUNET_TESTING_get_trait_async_context (&block_receive,
-                                          &ac);
-  GNUNET_assert  (NULL != ac);
-  if (NULL == ac->cont)
-    GNUNET_TESTING_async_fail ((struct GNUNET_TESTING_AsyncContext *) ac);
-  else
-    GNUNET_TESTING_async_finish ((struct GNUNET_TESTING_AsyncContext *) ac);
-}
-
-
-/**
- * Callback to set the flag indicating all peers started. Will be called via the plugin api.
- *
- */
-static void
-all_peers_started ()
-{
-  const struct GNUNET_TESTING_AsyncContext *ac;
-
-  GNUNET_TESTING_get_trait_async_context (&block_send,
-                                          &ac);
-  GNUNET_assert  (NULL != ac);
-  if (NULL == ac->cont)
-    GNUNET_TESTING_async_fail ((struct GNUNET_TESTING_AsyncContext *) ac);
-  else
-    GNUNET_TESTING_async_finish ((struct GNUNET_TESTING_AsyncContext *) ac);
-}
-
-
-/**
- * Function called with the final result of the test.
- *
- * @param cls the `struct MainParams`
- * @param rv #GNUNET_OK if the test passed
- */
-static void
-handle_result (void *cls,
-               enum GNUNET_GenericReturnValue rv)
-{
-  struct TestState *ts = cls;
-  struct GNUNET_MessageHeader *reply;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Local test exits with status %d\n",
-              rv);
-  reply = GNUNET_TESTING_send_local_test_finished_msg (rv);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "message prepared\n");
-  ts->write_message (reply,
-                     ntohs (reply->size));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "message send\n");
-  GNUNET_free (ts->testdir);
-  GNUNET_free (ts->cfgname);
-  GNUNET_TESTING_free_topology (ts->topology);
-  GNUNET_free (ts);
-}
-
-
-/**
- * Callback from start peer cmd for signaling a peer got connected.
- *
- */
-static void *
-notify_connect (struct GNUNET_TESTING_Interpreter *is,
-                const struct GNUNET_PeerIdentity *peer)
-{
-  const struct ConnectPeersState *cps;
-  const struct GNUNET_TESTING_Command *cmd;
-
-  cmd = GNUNET_TESTING_interpreter_lookup_command (is,
-                                                   "connect-peers");
-  GNUNET_TRANSPORT_get_trait_connect_peer_state (cmd,
-                                                 &cps);
-  void *ret = NULL;
-
-  cps->notify_connect (is,
-                       peer);
-  return ret;
-}
-
-
-/**
- * Callback to set the flag indicating all peers are prepared to finish. Will be called via the plugin api.
- */
-static void
-all_local_tests_prepared ()
-{
-  const struct LocalPreparedState *lfs;
-
-  GNUNET_TESTING_get_trait_local_prepared_state (&local_prepared,
-                                                 &lfs);
-  GNUNET_assert (NULL != &lfs->ac);
-  if (NULL == lfs->ac.cont)
-    GNUNET_TESTING_async_fail ((struct GNUNET_TESTING_AsyncContext *) &lfs->ac);
-  else
-    GNUNET_TESTING_async_finish ((struct
-                                  GNUNET_TESTING_AsyncContext *) &lfs->ac);
-}
-
-
-/**
- * Function to start a local test case.
- *
- * @param write_message Callback to send a message to the master loop.
- * @param router_ip Global address of the network namespace.
- * @param node_ip Local address of a node i a network namespace.
- * @param m The number of the node in a network namespace.
- * @param n The number of the network namespace.
- * @param local_m The number of nodes in a network namespace.
- */
-static void
-start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
-                char *node_ip,
-                char *m,
-                char *n,
-                char *local_m,
-                char *topology_data,
-                unsigned int *read_file)
-{
-
-  unsigned int n_int;
-  unsigned int m_int;
-  unsigned int local_m_int;
-  unsigned int num;
-  struct TestState *ts = GNUNET_new (struct TestState);
-  struct GNUNET_TESTING_NetjailTopology *topology;
-
-  if (GNUNET_YES == *read_file)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "read from file\n");
-    topology = GNUNET_TESTING_get_topo_from_file (topology_data);
-  }
-  else
-    topology = GNUNET_TESTING_get_topo_from_string (topology_data);
-
-  ts->topology = topology;
-
-  sscanf (m, "%u", &m_int);
-  sscanf (n, "%u", &n_int);
-  sscanf (local_m, "%u", &local_m_int);
-
-  if (0 == n_int)
-    num = m_int;
-  else
-    num = (n_int - 1) * local_m_int + m_int + topology->nodes_x;
-
-  block_send = GNUNET_TESTING_cmd_block_until_external_trigger (
-    "block");
-  block_receive = GNUNET_TESTING_cmd_block_until_external_trigger (
-    "block-receive");
-  connect_peers = GNUNET_TRANSPORT_cmd_connect_peers ("connect-peers",
-                                                      "start-peer",
-                                                      "system-create",
-                                                      num,
-                                                      topology,
-                                                      0);
-  local_prepared = GNUNET_TESTING_cmd_local_test_prepared (
-    "local-test-prepared",
-    write_message);
-
-
-  GNUNET_asprintf (&ts->cfgname,
-                   "test_transport_api2_tcp_node1.conf");
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "plugin cfgname: %s\n",
-       ts->cfgname);
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "node ip: %s\n",
-       node_ip);
-
-  GNUNET_asprintf (&ts->testdir,
-                   "%s%s%s",
-                   BASE_DIR,
-                   m,
-                   n);
-
-  struct GNUNET_MQ_MessageHandler handlers[] = {
-    GNUNET_MQ_hd_var_size (test,
-                           GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE,
-                           struct GNUNET_TRANSPORT_TESTING_TestMessage,
-                           ts),
-    GNUNET_MQ_handler_end ()
-  };
-
-  struct GNUNET_TESTING_Command commands[] = {
-    GNUNET_TESTING_cmd_system_create ("system-create",
-                                      ts->testdir),
-    GNUNET_TRANSPORT_cmd_start_peer ("start-peer",
-                                     "system-create",
-                                     num,
-                                     node_ip,
-                                     handlers,
-                                     ts->cfgname,
-                                     notify_connect,
-                                     GNUNET_NO),
-    GNUNET_TESTING_cmd_send_peer_ready ("send-peer-ready",
-                                        write_message),
-    block_send,
-    connect_peers,
-    GNUNET_TRANSPORT_cmd_send_simple ("send-simple",
-                                      "start-peer",
-                                      "system-create",
-                                      num,
-                                      topology),
-    block_receive,
-    local_prepared,
-    GNUNET_TRANSPORT_cmd_stop_peer ("stop-peer",
-                                    "start-peer"),
-    GNUNET_TESTING_cmd_system_destroy ("system-destroy",
-                                       "system-create"),
-    GNUNET_TESTING_cmd_end ()
-  };
-
-  ts->write_message = write_message;
-
-  GNUNET_TESTING_run (commands,
-                      GNUNET_TIME_UNIT_FOREVER_REL,
-                      &handle_result,
-                      ts);
-
-}
-
-
-/**
- * Entry point for the plugin.
- *
- * @param cls NULL
- * @return the exported block API
- */
-void *
-libgnunet_test_transport_plugin_cmd_simple_send_init (void *cls)
-{
-  struct GNUNET_TESTING_PluginFunctions *api;
-
-  GNUNET_log_setup ("simple-send",
-                    "DEBUG",
-                    NULL);
-
-  api = GNUNET_new (struct GNUNET_TESTING_PluginFunctions);
-  api->start_testcase = &start_testcase;
-  api->all_peers_started = &all_peers_started;
-  api->all_local_tests_prepared = all_local_tests_prepared;
-  return api;
-}
-
-
-/**
- * Exit point from the plugin.
- *
- * @param cls the return value from #libgnunet_test_transport_plugin_block_test_init
- * @return NULL
- */
-void *
-libgnunet_test_transport_plugin_cmd_simple_send_done (void *cls)
-{
-  struct GNUNET_TESTING_PluginFunctions *api = cls;
-
-  GNUNET_free (api);
-  return NULL;
-}
-
-
-/* end of plugin_cmd_simple_send.c */
diff --git a/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c b/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c
deleted file mode 100644
index 9d6844be1..000000000
--- a/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c
+++ /dev/null
@@ -1,398 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2021 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testbed/plugin_cmd_simple_send_broadcast.c
- * @brief a plugin to provide the API for running test cases.
- * @author t3sserakt
- */
-#include "platform.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_netjail_lib.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_transport_application_service.h"
-#include "transport-testing2.h"
-#include "transport-testing-cmds.h"
-
-/**
- * Generic logging shortcut
- */
-#define LOG(kind, ...) GNUNET_log (kind, __VA_ARGS__)
-
-#define BASE_DIR "testdir"
-
-#define TOPOLOGY_CONFIG "test_transport_simple_send_topo.conf"
-
-struct TestState
-{
-  /**
-   * Callback to write messages to the master loop.
-   *
-   */
-  TESTING_CMD_HELPER_write_cb write_message;
-
-  /**
-   * The name for a specific test environment directory.
-   *
-   */
-  char *testdir;
-
-  /**
-   * The name for the configuration file of the specific node.
-   *
-   */
-  char *cfgname;
-
-  /**
-   * The complete topology information.
-   */
-  struct GNUNET_TESTING_NetjailTopology *topology;
-};
-
-static struct GNUNET_TESTING_Command block_send;
-
-static struct GNUNET_TESTING_Command block_receive;
-
-static struct GNUNET_TESTING_Command connect_peers;
-
-static struct GNUNET_TESTING_Command local_prepared;
-
-/**
- * Function called to check a message of type GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE being
- * received.
- *
- */
-static int
-check_test (void *cls,
-            const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
-  return GNUNET_OK;
-}
-
-
-/**
- * Function called to handle a message of type GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE
- * being received.
- *
- */
-static void
-handle_test (void *cls,
-             const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
-  const struct GNUNET_TESTING_AsyncContext *ac;
-
-  GNUNET_TESTING_get_trait_async_context (&block_receive,
-                                          &ac);
-  GNUNET_assert  (NULL != ac);
-  if ((GNUNET_NO == ac->finished) && (NULL == ac->cont))
-    GNUNET_TESTING_async_fail ((struct GNUNET_TESTING_AsyncContext *) ac);
-  else if (GNUNET_NO == ac->finished)
-    GNUNET_TESTING_async_finish ((struct GNUNET_TESTING_AsyncContext *) ac);
-}
-
-
-/**
- * Callback to set the flag indicating all peers started. Will be called via the plugin api.
- *
- */
-static void
-all_peers_started ()
-{
-  const struct GNUNET_TESTING_AsyncContext *ac;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received message\n");
-  GNUNET_TESTING_get_trait_async_context (&block_send,
-                                          &ac);
-  GNUNET_assert  (NULL != ac);
-  if (NULL == ac->cont)
-    GNUNET_TESTING_async_fail ((struct GNUNET_TESTING_AsyncContext *) ac);
-  else
-    GNUNET_TESTING_async_finish ((struct GNUNET_TESTING_AsyncContext *) ac);
-}
-
-
-/**
- * Function called with the final result of the test.
- *
- * @param cls the `struct MainParams`
- * @param rv #GNUNET_OK if the test passed
- */
-static void
-handle_result (void *cls,
-               enum GNUNET_GenericReturnValue rv)
-{
-  struct TestState *ts = cls;
-  struct GNUNET_MessageHeader *reply;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Local test exits with status %d\n",
-              rv);
-  reply = GNUNET_TESTING_send_local_test_finished_msg (rv);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "message prepared\n");
-  ts->write_message (reply,
-                     ntohs (reply->size));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "message send\n");
-  GNUNET_free (ts->testdir);
-  GNUNET_free (ts->cfgname);
-  GNUNET_TESTING_free_topology (ts->topology);
-  GNUNET_free (ts);
-}
-
-
-/**
- * Callback from start peer cmd for signaling a peer got connected.
- *
- */
-static void *
-notify_connect (struct GNUNET_TESTING_Interpreter *is,
-                const struct GNUNET_PeerIdentity *peer)
-{
-  const struct GNUNET_TESTING_AsyncContext *ac;
-  void *ret = NULL;
-  const struct GNUNET_TESTING_Command *cmd;
-  struct BlockState *bs;
-
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "notify_connect\n");
-
-  GNUNET_TESTING_get_trait_async_context (&connect_peers,
-                                          &ac);
-
-  if (NULL != ac->is)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "notify_connect running\n");
-    GNUNET_assert  (NULL != ac);
-    if (NULL == ac->cont)
-      GNUNET_TESTING_async_fail ((struct GNUNET_TESTING_AsyncContext *) ac);
-    else
-      GNUNET_TESTING_async_finish ((struct GNUNET_TESTING_AsyncContext *) ac);
-  }
-  else
-  {
-    cmd = GNUNET_TESTING_interpreter_lookup_future_command (is,
-                                                            "connect-peers");
-
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "block state %s\n",
-         cmd->label);
-    GNUNET_TESTING_get_trait_block_state (
-      cmd,
-      (const struct BlockState  **) &bs);
-
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "block state %u\n",
-         bs->asynchronous_finish);
-    bs->asynchronous_finish = GNUNET_YES;
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "block state %u\n",
-         bs->asynchronous_finish);
-  }
-
-  return ret;
-}
-
-
-/**
- * Callback to set the flag indicating all peers are prepared to finish. Will be called via the plugin api.
- */
-static void
-all_local_tests_prepared ()
-{
-  const struct LocalPreparedState *lfs;
-
-  GNUNET_TESTING_get_trait_local_prepared_state (&local_prepared,
-                                                 &lfs);
-  GNUNET_assert (NULL != &lfs->ac);
-  if (NULL == lfs->ac.cont)
-    GNUNET_TESTING_async_fail ((struct GNUNET_TESTING_AsyncContext *) &lfs->ac);
-  else
-    GNUNET_TESTING_async_finish ((struct
-                                  GNUNET_TESTING_AsyncContext *) &lfs->ac);
-}
-
-
-/**
- * Function to start a local test case.
- *
- * @param write_message Callback to send a message to the master loop.
- * @param router_ip Global address of the network namespace.
- * @param node_ip Local address of a node i a network namespace.
- * @param m The number of the node in a network namespace.
- * @param n The number of the network namespace.
- * @param local_m The number of nodes in a network namespace.
- */
-static void
-start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
-                char *node_ip,
-                char *m,
-                char *n,
-                char *local_m,
-                char *topology_data,
-                unsigned int *read_file)
-{
-  unsigned int n_int;
-  unsigned int m_int;
-  unsigned int local_m_int;
-  unsigned int num;
-  struct TestState *ts = GNUNET_new (struct TestState);
-  struct GNUNET_TESTING_NetjailTopology *topology;
-
-
-
-  if (GNUNET_YES == *read_file)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "read from file\n");
-    topology = GNUNET_TESTING_get_topo_from_file (topology_data);
-  }
-  else
-    topology = GNUNET_TESTING_get_topo_from_string (topology_data);
-
-  ts->topology = topology;
-
-  sscanf (m, "%u", &m_int);
-  sscanf (n, "%u", &n_int);
-  sscanf (local_m, "%u", &local_m_int);
-
-  if (0 == n_int)
-    num = m_int;
-  else
-    num = (n_int - 1) * local_m_int + m_int + topology->nodes_x;
-
-  block_send = GNUNET_TESTING_cmd_block_until_external_trigger ("block");
-  block_receive = GNUNET_TESTING_cmd_block_until_external_trigger (
-    "block-receive");
-  connect_peers = GNUNET_TESTING_cmd_block_until_external_trigger (
-    "connect-peers");
-  local_prepared = GNUNET_TESTING_cmd_local_test_prepared (
-    "local-test-prepared",
-    write_message);
-
-
-  GNUNET_asprintf (&ts->cfgname,
-                   "test_transport_api2_tcp_node1.conf");
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "plugin cfgname: %s\n",
-       ts->cfgname);
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "node ip: %s\n",
-       node_ip);
-
-  GNUNET_asprintf (&ts->testdir,
-                   "%s%s%s",
-                   BASE_DIR,
-                   m,
-                   n);
-
-  struct GNUNET_MQ_MessageHandler handlers[] = {
-    GNUNET_MQ_hd_var_size (test,
-                           GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE,
-                           struct GNUNET_TRANSPORT_TESTING_TestMessage,
-                           ts),
-    GNUNET_MQ_handler_end ()
-  };
-
-  struct GNUNET_TESTING_Command commands[] = {
-    GNUNET_TESTING_cmd_system_create ("system-create",
-                                      ts->testdir),
-    GNUNET_TRANSPORT_cmd_start_peer ("start-peer",
-                                     "system-create",
-                                     num,
-                                     node_ip,
-                                     handlers,
-                                     ts->cfgname,
-                                     notify_connect,
-                                     GNUNET_YES),
-    GNUNET_TESTING_cmd_send_peer_ready ("send-peer-ready",
-                                        write_message),
-    block_send,
-    connect_peers,
-    GNUNET_TRANSPORT_cmd_send_simple ("send-simple",
-                                      "start-peer",
-                                      "system-create",
-                                      num,
-                                      topology),
-    block_receive,
-    local_prepared,
-    GNUNET_TRANSPORT_cmd_stop_peer ("stop-peer",
-                                    "start-peer"),
-    GNUNET_TESTING_cmd_system_destroy ("system-destroy",
-                                       "system-create"),
-    GNUNET_TESTING_cmd_end ()
-  };
-
-  ts->write_message = write_message;
-
-  GNUNET_TESTING_run (commands,
-                      GNUNET_TIME_UNIT_FOREVER_REL,
-                      &handle_result,
-                      ts);
-
-}
-
-
-/**
- * Entry point for the plugin.
- *
- * @param cls NULL
- * @return the exported block API
- */
-void *
-libgnunet_test_transport_plugin_cmd_simple_send_broadcast_init (void *cls)
-{
-  struct GNUNET_TESTING_PluginFunctions *api;
-
-  GNUNET_log_setup ("simple-send",
-                    "DEBUG",
-                    NULL);
-
-  api = GNUNET_new (struct GNUNET_TESTING_PluginFunctions);
-  api->start_testcase = &start_testcase;
-  api->all_peers_started = &all_peers_started;
-  api->all_local_tests_prepared = all_local_tests_prepared;
-  return api;
-}
-
-
-/**
- * Exit point from the plugin.
- *
- * @param cls the return value from #libgnunet_test_transport_plugin_block_test_init
- * @return NULL
- */
-void *
-libgnunet_test_transport_plugin_cmd_simple_send_broadcast_done (void *cls)
-{
-  struct GNUNET_TESTING_PluginFunctions *api = cls;
-
-  GNUNET_free (api);
-  return NULL;
-}
-
-
-/* end of plugin_cmd_simple_send_broadcast.c */
diff --git a/src/transport/test_transport_plugin_cmd_simple_send_dv.c b/src/transport/test_transport_plugin_cmd_simple_send_dv.c
deleted file mode 100644
index f1f168102..000000000
--- a/src/transport/test_transport_plugin_cmd_simple_send_dv.c
+++ /dev/null
@@ -1,427 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2021 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testbed/plugin_cmd_simple_send_broadcast.c
- * @brief a plugin to provide the API for running test cases.
- * @author t3sserakt
- */
-#include "platform.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_netjail_lib.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_transport_application_service.h"
-#include "transport-testing2.h"
-#include "transport-testing-cmds.h"
-
-/**
- * Generic logging shortcut
- */
-#define LOG(kind, ...) GNUNET_log (kind, __VA_ARGS__)
-
-#define BASE_DIR "testdir"
-
-#define TOPOLOGY_CONFIG "test_transport_simple_send_topo.conf"
-
-struct TestState
-{
-  /**
-   * Callback to write messages to the master loop.
-   *
-   */
-  TESTING_CMD_HELPER_write_cb write_message;
-
-  /**
-   * The name for a specific test environment directory.
-   *
-   */
-  char *testdir;
-
-  /**
-   * The name for the configuration file of the specific node.
-   *
-   */
-  char *cfgname;
-
-  /**
-   * The complete topology information.
-   */
-  struct GNUNET_TESTING_NetjailTopology *topology;
-
-};
-
-/**
-   * The number of messages received.
-   */
-static unsigned int number_received;
-
-static struct GNUNET_TESTING_Command block_send;
-
-static struct GNUNET_TESTING_Command block_receive;
-
-static struct GNUNET_TESTING_Command connect_peers;
-
-static struct GNUNET_TESTING_Command local_prepared;
-
-static struct GNUNET_TESTING_Command start_peer;
-
-/**
- * Function called to check a message of type GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE being
- * received.
- *
- */
-static int
-check_test (void *cls,
-            const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
-  GNUNET_assert (NULL != cls);
-  return GNUNET_OK;
-}
-
-
-/**
- * Function called to handle a message of type GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE
- * being received.
- *
- */
-static void
-handle_test (void *cls,
-             const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
-  struct GNUNET_PeerIdentity *peer = cls;
-  const struct GNUNET_TESTING_AsyncContext *ac_block;
-  const struct GNUNET_TESTING_AsyncContext *ac_start;
-  const struct GNUNET_TESTING_Command *cmd;
-  const struct GNUNET_CONTAINER_MultiShortmap *connected_peers_map;
-  unsigned int connected;
-  struct BlockState *bs;
-  struct GNUNET_TRANSPORT_CoreHandle *ch;
-  const struct StartPeerState *sps;
-
-
-  GNUNET_TRANSPORT_get_trait_state (&start_peer,
-                                    &sps);
-  ch = sps->th;
-  GNUNET_TRANSPORT_get_trait_connected_peers_map (&start_peer,
-                                                  &connected_peers_map);
-
-  if (NULL != connected_peers_map)
-  {
-    connected = GNUNET_CONTAINER_multishortmap_size (
-      connected_peers_map);
-
-    number_received++;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Received %u test message(s) from %s, %u connected peer(s)\n",
-                number_received,
-                GNUNET_i2s (peer),
-                connected);
-
-    GNUNET_TESTING_get_trait_async_context (&block_receive,
-                                            &ac_block);
-
-    if ( connected == number_received)
-    {
-      if (NULL != ac_block->is)
-      {
-        GNUNET_assert  (NULL != ac_block);
-        if (NULL == ac_block->cont)
-          GNUNET_TESTING_async_fail ((struct
-                                      GNUNET_TESTING_AsyncContext *) ac_block);
-        else
-          GNUNET_TESTING_async_finish ((struct
-                                        GNUNET_TESTING_AsyncContext *) ac_block);
-      }
-      else
-      {
-        GNUNET_TESTING_get_trait_block_state (
-          &block_receive,
-          (const struct BlockState  **) &bs);
-        bs->asynchronous_finish = GNUNET_YES;
-      }
-
-    }
-  }
-  GNUNET_TRANSPORT_core_receive_continue (ch, peer);
-}
-
-
-/**
- * Callback to set the flag indicating all peers started. Will be called via the plugin api.
- *
- */
-static void
-all_peers_started ()
-{
-  const struct GNUNET_TESTING_AsyncContext *ac;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received message\n");
-  GNUNET_TESTING_get_trait_async_context (&block_send,
-                                          &ac);
-  GNUNET_assert  (NULL != ac);
-  if (NULL == ac->cont)
-    GNUNET_TESTING_async_fail ((struct GNUNET_TESTING_AsyncContext *) ac);
-  else
-    GNUNET_TESTING_async_finish ((struct GNUNET_TESTING_AsyncContext *) ac);
-}
-
-
-/**
- * Function called with the final result of the test.
- *
- * @param cls the `struct MainParams`
- * @param rv #GNUNET_OK if the test passed
- */
-static void
-handle_result (void *cls,
-               enum GNUNET_GenericReturnValue rv)
-{
-  struct TestState *ts = cls;
-  struct GNUNET_MessageHeader *reply;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Local test exits with status %d\n",
-              rv);
-  reply = GNUNET_TESTING_send_local_test_finished_msg (rv);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "message prepared\n");
-  ts->write_message (reply,
-                     ntohs (reply->size));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "message send\n");
-  GNUNET_free (ts->testdir);
-  GNUNET_free (ts->cfgname);
-  GNUNET_TESTING_free_topology (ts->topology);
-  GNUNET_free (ts);
-}
-
-
-/**
- * Callback from start peer cmd for signaling a peer got connected.
- *
- */
-static void *
-notify_connect (struct GNUNET_TESTING_Interpreter *is,
-                const struct GNUNET_PeerIdentity *peer)
-{
-  const struct ConnectPeersState *cps;
-  const struct GNUNET_TESTING_Command *cmd;
-  void *ret = NULL;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "notify_connect peer %s\n",
-              GNUNET_i2s (peer));
-  cmd = GNUNET_TESTING_interpreter_lookup_command_all (is,
-                                                       "connect-peers");
-  GNUNET_TRANSPORT_get_trait_connect_peer_state (cmd,
-                                                 &cps);
-  cps->notify_connect (is,
-                       peer);
-
-  return ret;
-}
-
-
-/**
- * Callback to set the flag indicating all peers are prepared to finish. Will be called via the plugin api.
- */
-static void
-all_local_tests_prepared ()
-{
-  const struct LocalPreparedState *lfs;
-
-  GNUNET_TESTING_get_trait_local_prepared_state (&local_prepared,
-                                                 &lfs);
-  GNUNET_assert (NULL != &lfs->ac);
-  if (NULL == lfs->ac.cont)
-    GNUNET_TESTING_async_fail ((struct GNUNET_TESTING_AsyncContext *) &lfs->ac);
-  else
-    GNUNET_TESTING_async_finish ((struct
-                                  GNUNET_TESTING_AsyncContext *) &lfs->ac);
-}
-
-
-/**
- * Function to start a local test case.
- *
- * @param write_message Callback to send a message to the master loop.
- * @param router_ip Global address of the network namespace.
- * @param node_ip Local address of a node i a network namespace.
- * @param m The number of the node in a network namespace.
- * @param n The number of the network namespace.
- * @param local_m The number of nodes in a network namespace.
- */
-static void
-start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
-                char *node_ip,
-                char *m,
-                char *n,
-                char *local_m,
-                char *topology_data,
-                unsigned int *read_file)
-{
-  unsigned int n_int;
-  unsigned int m_int;
-  unsigned int local_m_int;
-  unsigned int num;
-  struct TestState *ts = GNUNET_new (struct TestState);
-  struct GNUNET_TESTING_NetjailTopology *topology;
-  struct GNUNET_MQ_MessageHandler handlers[] = {
-    GNUNET_MQ_hd_var_size (test,
-                           GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE,
-                           struct GNUNET_TRANSPORT_TESTING_TestMessage,
-                           ts),
-    GNUNET_MQ_handler_end ()
-  };
-
-  if (GNUNET_YES == *read_file)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "read from file\n");
-    topology = GNUNET_TESTING_get_topo_from_file (topology_data);
-  }
-  else
-    topology = GNUNET_TESTING_get_topo_from_string (topology_data);
-
-  ts->topology = topology;
-
-  sscanf (m, "%u", &m_int);
-  sscanf (n, "%u", &n_int);
-  sscanf (local_m, "%u", &local_m_int);
-
-  if (0 == n_int)
-    num = m_int;
-  else
-    num = (n_int - 1) * local_m_int + m_int + topology->nodes_x;
-
-  block_send = GNUNET_TESTING_cmd_block_until_external_trigger ("block");
-  block_receive = GNUNET_TESTING_cmd_block_until_external_trigger (
-    "block-receive");
-  connect_peers = GNUNET_TRANSPORT_cmd_connect_peers (
-    "connect-peers",
-    "start-peer",
-    "system-create",
-    num,
-    topology,
-    topology->additional_connects);
-  local_prepared = GNUNET_TESTING_cmd_local_test_prepared (
-    "local-test-prepared",
-    write_message);
-
-
-  GNUNET_asprintf (&ts->cfgname,
-                   "test_transport_api2_tcp_node1.conf");
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "plugin cfgname: %s\n",
-       ts->cfgname);
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "node ip: %s\n",
-       node_ip);
-
-  GNUNET_asprintf (&ts->testdir,
-                   "%s%s%s",
-                   BASE_DIR,
-                   m,
-                   n);
-
-  start_peer = GNUNET_TRANSPORT_cmd_start_peer ("start-peer",
-                                                "system-create",
-                                                num,
-                                                node_ip,
-                                                handlers,
-                                                ts->cfgname,
-                                                notify_connect,
-                                                GNUNET_NO);
-  struct GNUNET_TESTING_Command commands[] = {
-    GNUNET_TESTING_cmd_system_create ("system-create",
-                                      ts->testdir),
-    start_peer,
-    GNUNET_TESTING_cmd_send_peer_ready ("send-peer-ready",
-                                        write_message),
-    block_send,
-    connect_peers,
-    GNUNET_TRANSPORT_cmd_send_simple ("send-simple",
-                                      "start-peer",
-                                      "system-create",
-                                      num,
-                                      topology),
-    block_receive,
-    local_prepared,
-    GNUNET_TRANSPORT_cmd_stop_peer ("stop-peer",
-                                    "start-peer"),
-    GNUNET_TESTING_cmd_system_destroy ("system-destroy",
-                                       "system-create"),
-    GNUNET_TESTING_cmd_end ()
-  };
-
-  ts->write_message = write_message;
-
-  GNUNET_TESTING_run (commands,
-                      GNUNET_TIME_UNIT_FOREVER_REL,
-                      &handle_result,
-                      ts);
-
-}
-
-
-/**
- * Entry point for the plugin.
- *
- * @param cls NULL
- * @return the exported block API
- */
-void *
-libgnunet_test_transport_plugin_cmd_simple_send_dv_init (void *cls)
-{
-  struct GNUNET_TESTING_PluginFunctions *api;
-
-  GNUNET_log_setup ("simple-send",
-                    "DEBUG",
-                    NULL);
-
-  api = GNUNET_new (struct GNUNET_TESTING_PluginFunctions);
-  api->start_testcase = &start_testcase;
-  api->all_peers_started = &all_peers_started;
-  api->all_local_tests_prepared = all_local_tests_prepared;
-  return api;
-}
-
-
-/**
- * Exit point from the plugin.
- *
- * @param cls the return value from #libgnunet_test_transport_plugin_block_test_init
- * @return NULL
- */
-void *
-libgnunet_test_transport_plugin_cmd_simple_send_dv_done (void *cls)
-{
-  struct GNUNET_TESTING_PluginFunctions *api = cls;
-
-  GNUNET_free (api);
-  return NULL;
-}
-
-
-/* end of plugin_cmd_simple_send_broadcast.c */
diff --git a/src/transport/test_transport_plugin_cmd_udp_backchannel.c b/src/transport/test_transport_plugin_cmd_udp_backchannel.c
deleted file mode 100644
index 537832e61..000000000
--- a/src/transport/test_transport_plugin_cmd_udp_backchannel.c
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2021 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testbed/plugin_cmd_simple_send.c
- * @brief a plugin to provide the API for running test cases.
- * @author t3sserakt
- */
-#include "platform.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_netjail_lib.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_transport_application_service.h"
-#include "transport-testing2.h"
-#include "transport-testing-cmds.h"
-
-/**
- * Generic logging shortcut
- */
-#define LOG(kind, ...) GNUNET_log (kind, __VA_ARGS__)
-
-#define BASE_DIR "testdir"
-
-#define TOPOLOGY_CONFIG "test_transport_udp_backchannel_topo.conf"
-
-struct TestState
-{
-  /**
-   * Callback to write messages to the master loop.
-   *
-   */
-  TESTING_CMD_HELPER_write_cb write_message;
-
-  /**
-   * The name for a specific test environment directory.
-   *
-   */
-  char *testdir;
-
-  /**
-   * The name for the configuration file of the specific node.
-   *
-   */
-  char *cfgname;
-
-  /**
-   * The complete topology information.
-   */
-  struct GNUNET_TESTING_NetjailTopology *topology;
-};
-
-static struct GNUNET_TESTING_Command block_send;
-
-static struct GNUNET_TESTING_Command connect_peers;
-
-static struct GNUNET_TESTING_Command local_prepared;
-
-
-/**
- * Function called to check a message of type GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE being
- * received.
- *
- */
-static int
-check_test (void *cls,
-            const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
-  return GNUNET_OK;
-}
-
-
-/**
- * Function called to handle a message of type GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE
- * being received.
- *
- */
-static void
-handle_test (void *cls,
-             const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
-  // struct GNUNET_TESTING_AsyncContext *ac;
-
-  /*GNUNET_TESTING_get_trait_async_context (&block_receive,
-                                          &ac);
-  if ((NULL == ac) || (NULL == ac->cont))
-    GNUNET_TESTING_async_fail (ac);
-  else
-    GNUNET_TESTING_async_finish (ac);*/
-}
-
-
-/**
- * Callback to set the flag indicating all peers started. Will be called via the plugin api.
- *
- */
-static void
-all_peers_started ()
-{
-  const struct GNUNET_TESTING_AsyncContext *ac;
-
-  GNUNET_TESTING_get_trait_async_context (&block_send,
-                                          &ac);
-  GNUNET_assert  (NULL != ac);
-  if ((NULL == ac->cont))
-    GNUNET_TESTING_async_fail ((struct GNUNET_TESTING_AsyncContext *) ac);
-  else
-    GNUNET_TESTING_async_finish ((struct GNUNET_TESTING_AsyncContext *) ac);
-}
-
-
-/**
-* Function called with the final result of the test.
-*
-* @param cls the `struct MainParams`
-* @param rv #GNUNET_OK if the test passed
-*/
-static void
-handle_result (void *cls,
-               enum GNUNET_GenericReturnValue rv)
-{
-  struct TestState *ts = cls;
-  struct GNUNET_MessageHeader *reply;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Local test exits with status %d\n",
-              rv);
-  reply = GNUNET_TESTING_send_local_test_finished_msg (rv);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "message prepared\n");
-  ts->write_message (reply,
-                     ntohs (reply->size));
-
-  GNUNET_free (ts->testdir);
-  GNUNET_free (ts->cfgname);
-  GNUNET_TESTING_free_topology (ts->topology);
-  GNUNET_free (ts);
-}
-
-
-/**
- * Callback from start peer cmd for signaling a peer got connected.
- *
- */
-static void *
-notify_connect (struct GNUNET_TESTING_Interpreter *is,
-                const struct GNUNET_PeerIdentity *peer)
-{
-  const struct ConnectPeersState *cps;
-
-  GNUNET_TRANSPORT_get_trait_connect_peer_state (&connect_peers,
-                                                 &cps);
-  void *ret = NULL;
-
-  cps->notify_connect (is,
-                       peer);
-  return ret;
-}
-
-/**
- * Callback to set the flag indicating all peers are prepared to finish. Will be called via the plugin api.
- */
-static void
-all_local_tests_prepared ()
-{
-  const struct LocalPreparedState *lfs;
-
-  GNUNET_TESTING_get_trait_local_prepared_state (&local_prepared,
-                                                 &lfs);
-  GNUNET_assert (NULL != &lfs->ac);
-  if (NULL == lfs->ac.cont)
-    GNUNET_TESTING_async_fail ((struct GNUNET_TESTING_AsyncContext *) &lfs->ac);
-  else
-    GNUNET_TESTING_async_finish ((struct
-                                  GNUNET_TESTING_AsyncContext *) &lfs->ac);
-}
-
-/**
- * Function to start a local test case.
- *
- * @param write_message Callback to send a message to the master loop.
- * @param router_ip Global address of the network namespace.
- * @param node_ip Local address of a node i a network namespace.
- * @param m The number of the node in a network namespace.
- * @param n The number of the network namespace.
- * @param local_m The number of nodes in a network namespace.
- */
-static void
-start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
-                char *node_ip,
-                char *m,
-                char *n,
-                char *local_m,
-                char *topology_data,
-                unsigned int *read_file)
-{
-
-  unsigned int n_int;
-  unsigned int m_int;
-  unsigned int local_m_int;
-  unsigned int num;
-  struct TestState *ts = GNUNET_new (struct TestState);
-
-  struct GNUNET_TESTING_NetjailTopology *topology;
-
-  if (GNUNET_YES == *read_file)
-    topology = GNUNET_TESTING_get_topo_from_file (topology_data);
-  else
-    topology = GNUNET_TESTING_get_topo_from_string (topology_data);
-
-  ts->topology = topology;
-
-  sscanf (m, "%u", &m_int);
-  sscanf (n, "%u", &n_int);
-  sscanf (local_m, "%u", &local_m_int);
-
-
-  if (0 == n_int)
-    num = m_int;
-  else
-    num = (n_int - 1) * local_m_int + m_int + topology->nodes_x;
-
-  block_send = GNUNET_TESTING_cmd_block_until_external_trigger (
-    "block");
-  connect_peers = GNUNET_TRANSPORT_cmd_connect_peers ("connect-peers",
-                                                      "start-peer",
-                                                      "system-create",
-                                                      num,
-                                                      topology,
-                                                      0);
-  local_prepared = GNUNET_TESTING_cmd_local_test_prepared (
-    "local-test-prepared",
-    write_message);
-
-  GNUNET_asprintf (&ts->cfgname,
-                   "test_transport_api2_tcp_node1.conf");
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "plugin cfgname: %s\n",
-       ts->cfgname);
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "node ip: %s\n",
-       node_ip);
-
-  GNUNET_asprintf (&ts->testdir,
-                   "%s%s%s",
-                   BASE_DIR,
-                   m,
-                   n);
-
-  struct GNUNET_MQ_MessageHandler handlers[] = {
-    GNUNET_MQ_hd_var_size (test,
-                           GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE,
-                           struct GNUNET_TRANSPORT_TESTING_TestMessage,
-                           NULL),
-    GNUNET_MQ_handler_end ()
-  };
-
-  struct GNUNET_TESTING_Command commands[] = {
-    GNUNET_TESTING_cmd_system_create ("system-create",
-                                      ts->testdir),
-    GNUNET_TRANSPORT_cmd_start_peer ("start-peer",
-                                     "system-create",
-                                     num,
-                                     node_ip,
-                                     handlers,
-                                     ts->cfgname,
-                                     notify_connect,
-                                     GNUNET_NO),
-    GNUNET_TESTING_cmd_send_peer_ready ("send-peer-ready",
-                                        write_message),
-    block_send,
-    connect_peers,
-    GNUNET_TRANSPORT_cmd_backchannel_check ("backchannel-check",
-                                            "start-peer",
-                                            "system-create",
-                                            num,
-                                            m_int,
-                                            n_int,
-                                            topology),
-    local_prepared,
-    GNUNET_TRANSPORT_cmd_stop_peer ("stop-peer",
-                                    "start-peer"),
-    GNUNET_TESTING_cmd_system_destroy ("system-destroy",
-                                       "system-create"),
-    GNUNET_TESTING_cmd_end ()
-  };
-
-  ts->write_message = write_message;
-
-  GNUNET_TESTING_run (commands,
-                      GNUNET_TIME_UNIT_FOREVER_REL,
-                      &handle_result,
-                      ts);
-
-}
-
-
-/**
- * Entry point for the plugin.
- *
- * @param cls NULL
- * @return the exported block API
- */
-void *
-libgnunet_test_transport_plugin_cmd_udp_backchannel_init (void *cls)
-{
-  struct GNUNET_TESTING_PluginFunctions *api;
-
-  GNUNET_log_setup ("udp-backchannel",
-                    "DEBUG",
-                    NULL);
-
-  api = GNUNET_new (struct GNUNET_TESTING_PluginFunctions);
-  api->start_testcase = &start_testcase;
-  api->all_peers_started = &all_peers_started;
-  api->all_local_tests_prepared = all_local_tests_prepared;
-  return api;
-}
-
-
-/**
- * Exit point from the plugin.
- *
- * @param cls the return value from #libgnunet_test_transport_plugin_block_test_init
- * @return NULL
- */
-void *
-libgnunet_test_transport_plugin_cmd_udp_backchannel_done (void *cls)
-{
-  struct GNUNET_TESTING_PluginFunctions *api = cls;
-
-  GNUNET_free (api);
-  return NULL;
-}
-
-
-/* end of plugin_cmd_simple_send.c */
diff --git a/src/transport/test_transport_simple_send.sh b/src/transport/test_transport_simple_send.sh
deleted file mode 100755
index 0250070be..000000000
--- a/src/transport/test_transport_simple_send.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-if ! [ -d "/run/netns" ]; then
-    echo You have to create the directory /run/netns.
-fi
-if [ -f /proc/sys/kernel/unprivileged_userns_clone ]; then
-  if  [ "$(cat /proc/sys/kernel/unprivileged_userns_clone)" != 1 ]; then
-    echo -e "Error during test setup: The kernel parameter kernel.unprivileged_userns_clone has to be set to 1! One has to execute\n\n sysctl kernel.unprivileged_userns_clone=1\n"
-    exit 78
-  fi
-fi
-exec unshare -r -nmU bash -c "mount -t tmpfs --make-rshared tmpfs /run/netns; ./test_transport_start_with_config test_transport_simple_send_topo.conf"
diff --git a/src/transport/test_transport_simple_send_broadcast.sh b/src/transport/test_transport_simple_send_broadcast.sh
deleted file mode 100755
index a4801bf70..000000000
--- a/src/transport/test_transport_simple_send_broadcast.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-if ! [ -d "/run/netns" ]; then
-    echo You have to create the directory /run/netns.
-fi
-if [ -f /proc/sys/kernel/unprivileged_userns_clone ]; then
-  if  [ "$(cat /proc/sys/kernel/unprivileged_userns_clone)" != 1 ]; then
-    echo -e "Error during test setup: The kernel parameter kernel.unprivileged_userns_clone has to be set to 1! One has to execute\n\n sysctl kernel.unprivileged_userns_clone=1\n"
-    exit 78
-  fi
-fi
-exec unshare -r -nmU bash -c "mount -t tmpfs --make-rshared tmpfs /run/netns; ./test_transport_start_with_config test_transport_simple_send_broadcast_topo.conf"
diff --git a/src/transport/test_transport_simple_send_broadcast_topo.conf b/src/transport/test_transport_simple_send_broadcast_topo.conf
deleted file mode 100644
index aa4964f81..000000000
--- a/src/transport/test_transport_simple_send_broadcast_topo.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-M:2
-N:1
-X:0
-T:libgnunet_test_transport_plugin_cmd_simple_send_broadcast
\ No newline at end of file
diff --git a/src/transport/test_transport_simple_send_dv.sh b/src/transport/test_transport_simple_send_dv.sh
deleted file mode 100755
index b57ee0629..000000000
--- a/src/transport/test_transport_simple_send_dv.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-if ! [ -d "/run/netns" ]; then
-    echo You have to create the directory /run/netns.
-fi
-if [ -f /proc/sys/kernel/unprivileged_userns_clone ]; then
-  if  [ "$(cat /proc/sys/kernel/unprivileged_userns_clone)" != 1 ]; then
-    echo -e "Error during test setup: The kernel parameter kernel.unprivileged_userns_clone has to be set to 1! One has to execute\n\n sysctl kernel.unprivileged_userns_clone=1\n"
-    exit 78
-  fi
-fi
-exec unshare -r -nmU bash -c "mount -t tmpfs --make-rshared tmpfs /run/netns; ./test_transport_start_with_config test_transport_distance_vector_topo.conf"
diff --git a/src/transport/test_transport_simple_send_dv_circle.sh b/src/transport/test_transport_simple_send_dv_circle.sh
deleted file mode 100755
index bd5f00abe..000000000
--- a/src/transport/test_transport_simple_send_dv_circle.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-if ! [ -d "/run/netns" ]; then
-    echo You have to create the directory /run/netns.
-fi
-if [ -f /proc/sys/kernel/unprivileged_userns_clone ]; then
-  if  [ "$(cat /proc/sys/kernel/unprivileged_userns_clone)" != 1 ]; then
-    echo -e "Error during test setup: The kernel parameter kernel.unprivileged_userns_clone has to be set to 1! One has to execute\n\n sysctl kernel.unprivileged_userns_clone=1\n"
-    exit 78
-  fi
-fi
-exec unshare -r -nmU bash -c "mount -t tmpfs --make-rshared tmpfs /run/netns; ./test_transport_start_with_config test_transport_distance_vector_circle_topo.conf"
diff --git a/src/transport/test_transport_simple_send_string.sh b/src/transport/test_transport_simple_send_string.sh
deleted file mode 100755
index 211abb494..000000000
--- a/src/transport/test_transport_simple_send_string.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-string=$(cat << EOF
-M:2
-N:1
-X:0
-T:libgnunet_test_transport_plugin_cmd_simple_send
-P:1:1|{connect:{P:1:2:tcp}}
-P:1:2|{connect:{P:1:1:tcp}}
-EOF
-      )
-if ! [ -d "/run/netns" ]; then
-    echo You have to create the directory /run/netns.
-fi
-if [ -f /proc/sys/kernel/unprivileged_userns_clone ]; then
-  if  [ "$(cat /proc/sys/kernel/unprivileged_userns_clone)" != 1 ]; then
-    echo -e "Error during test setup: The kernel parameter kernel.unprivileged_userns_clone has to be set to 1! One has to execute\n\n sysctl kernel.unprivileged_userns_clone=1\n"
-    exit 78
-  fi
-fi
-
-exec unshare -r -nmU bash -c "mount -t tmpfs --make-rshared tmpfs /run/netns; ./test_transport_start_with_config -s '$string'"
diff --git a/src/transport/test_transport_simple_send_topo.conf b/src/transport/test_transport_simple_send_topo.conf
deleted file mode 100644
index 2c16201f5..000000000
--- a/src/transport/test_transport_simple_send_topo.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-M:2
-N:1
-X:0
-T:libgnunet_test_transport_plugin_cmd_simple_send
-P:1:1|{connect:{P:1:2:tcp}}
-P:1:2|{connect:{P:1:1:tcp}}
\ No newline at end of file
diff --git a/src/transport/test_transport_start_with_config.c b/src/transport/test_transport_start_with_config.c
deleted file mode 100644
index 0c3271436..000000000
--- a/src/transport/test_transport_start_with_config.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2021 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/test_transport_start_with_config.c
- * @brief Generic program to start testcases in an configurable topology.
- * @author t3sserakt
- */
-#include "platform.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_netjail_lib.h"
-#include "transport-testing-cmds.h"
-#include "gnunet_util_lib.h"
-
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 600)
-
-
-int
-main (int argc,
-      char *const *argv)
-{
-  char *topology_data;
-  char *topology_data_script;
-  struct GNUNET_TESTING_NetjailTopology *topology;
-  unsigned int read_file = GNUNET_YES;
-  int ret;
-  char *rest = NULL;
-  char *token;
-  size_t single_line_len;
-  size_t data_len;
-
-  GNUNET_log_setup ("test-netjail",
-                    "DEBUG",
-                    NULL);
-
-  if (0 == strcmp ("-s", argv[1]))
-  {
-    data_len = strlen (argv[2]);
-    topology_data = GNUNET_malloc (data_len);
-    topology_data_script = GNUNET_malloc (data_len);
-    token = strtok_r (argv[2], "\n", &rest);
-    while (NULL != token)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "token1 %s\n",
-                  token);
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "token2 %s\n",
-                  token);
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "topology_data %s\n",
-                  topology_data);
-      strcat (topology_data_script, token);
-      strcat (topology_data_script, " ");
-      strcat (topology_data, token);
-      strcat (topology_data, "\n");
-      token = strtok_r (NULL, "\n", &rest);
-    }
-    single_line_len = strlen (topology_data);
-    topology_data_script [single_line_len - 1] = '\0';
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "read from string\n");
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "topology_data %s\n",
-                topology_data);
-    read_file = GNUNET_NO;
-    topology = GNUNET_TESTING_get_topo_from_string (topology_data);
-  }
-  else
-  {
-    topology_data = argv[1];
-    topology_data_script = argv[1];
-    topology = GNUNET_TESTING_get_topo_from_file (topology_data);
-  }
-
-  struct GNUNET_TESTING_Command commands[] = {
-    GNUNET_TESTING_cmd_netjail_start ("netjail-start",
-                                      topology_data_script,
-                                      &read_file),
-    GNUNET_TESTING_cmd_netjail_start_testing_system ("netjail-start-testbed",
-                                                     topology,
-                                                     &read_file,
-                                                     topology_data_script,
-                                                     TIMEOUT),
-    GNUNET_TESTING_cmd_stop_testing_system ("stop-testbed",
-                                            "netjail-start-testbed",
-                                            topology),
-    GNUNET_TESTING_cmd_netjail_stop ("netjail-stop",
-                                     topology_data_script,
-                                     &read_file),
-    GNUNET_TESTING_cmd_end ()
-  };
-
-  ret = GNUNET_TESTING_main (commands,
-                             TIMEOUT);
-
-  if (0 == strcmp ("-s", argv[1]))
-  {
-    GNUNET_free (topology_data_script);
-    GNUNET_free (topology_data);
-  }
-  GNUNET_TESTING_free_topology (topology);
-
-  return ret;
-}
diff --git a/src/transport/test_transport_test_transport_address_switch_tcp_peer1.conf b/src/transport/test_transport_test_transport_address_switch_tcp_peer1.conf
deleted file mode 100644
index 920e8d199..000000000
--- a/src/transport/test_transport_test_transport_address_switch_tcp_peer1.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-
-[ats]
-UNSPECIFIED_QUOTA_IN = 8 KiB
-UNSPECIFIED_QUOTA_OUT = 8 KiB
-# LOOPBACK
-LOOPBACK_QUOTA_IN = 8 KiB
-LOOPBACK_QUOTA_OUT = 8 KiB
-# LAN
-LAN_QUOTA_IN = 8 KiB
-LAN_QUOTA_OUT = 8 KiB
-# WAN
-WAN_QUOTA_IN = 8 KiB
-WAN_QUOTA_OUT = 8 KiB
-# WLAN
-WLAN_QUOTA_IN = 8 KiB
-WLAN_QUOTA_OUT = 8 KiB
-# BLUETOOTH
-BLUETOOTH_QUOTA_IN = 8 KiB
-BLUETOOTH_QUOTA_OUT = 8 KiB
-
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/quota-tcp-p1/
-
-[transport]
-PLUGINS = tcp
-
-
-
diff --git a/src/transport/test_transport_test_transport_address_switch_tcp_peer2.conf b/src/transport/test_transport_test_transport_address_switch_tcp_peer2.conf
deleted file mode 100644
index 6855cd00d..000000000
--- a/src/transport/test_transport_test_transport_address_switch_tcp_peer2.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-
-[ats]
-UNSPECIFIED_QUOTA_IN = 8 KiB
-UNSPECIFIED_QUOTA_OUT = 8 KiB
-# LOOPBACK
-LOOPBACK_QUOTA_IN = 8 KiB
-LOOPBACK_QUOTA_OUT = 8 KiB
-# LAN
-LAN_QUOTA_IN = 8 KiB
-LAN_QUOTA_OUT = 8 KiB
-# WAN
-WAN_QUOTA_IN = 8 KiB
-WAN_QUOTA_OUT = 8 KiB
-# WLAN
-WLAN_QUOTA_IN = 8 KiB
-WLAN_QUOTA_OUT = 8 KiB
-# BLUETOOTH
-BLUETOOTH_QUOTA_IN = 8 KiB
-BLUETOOTH_QUOTA_OUT = 8 KiB
-
-
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
-
-[transport]
-PLUGINS = tcp
-
-
diff --git a/src/transport/test_transport_testing_restart.c b/src/transport/test_transport_testing_restart.c
deleted file mode 100644
index f537af5fc..000000000
--- a/src/transport/test_transport_testing_restart.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2009, 2010, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport/test_transport_testing_restart.c
- * @brief test case for transport testing library:
- * start the peer, get the HELLO message, restart and stop the peer
- */
-#include "platform.h"
-#include "gnunet_transport_service.h"
-#include "transport-testing.h"
-
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
-
-
-static struct GNUNET_SCHEDULER_Task *timeout_task;
-
-static struct GNUNET_TRANSPORT_TESTING_PeerContext *p;
-
-static struct GNUNET_TRANSPORT_TESTING_Handle *tth;
-
-static int ret;
-
-
-static void
-end ()
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Stopping peers\n");
-  if (NULL != timeout_task)
-    GNUNET_SCHEDULER_cancel (timeout_task);
-  if (NULL != p)
-    GNUNET_TRANSPORT_TESTING_stop_peer (p);
-  if (NULL != tth)
-    GNUNET_TRANSPORT_TESTING_done (tth);
-}
-
-
-static void
-end_badly ()
-{
-  timeout_task = NULL;
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              "Timeout!\n");
-  end ();
-  ret = GNUNET_SYSERR;
-}
-
-
-static void
-restart_cb (void *cls)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Peer %u (`%s') successfully restarted\n",
-              p->no,
-              GNUNET_i2s (&p->id));
-  ret = 0;
-  GNUNET_SCHEDULER_add_now (&end,
-                            NULL);
-}
-
-
-static void
-restart_task ()
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Peer %u (`%s') restarting\n",
-              p->no,
-              GNUNET_i2s (&p->id));
-  GNUNET_TRANSPORT_TESTING_restart_peer (p,
-                                         &restart_cb,
-                                         p);
-}
-
-
-static void
-start_cb (void *cls)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Peer %u (`%s') successfully started\n",
-              p->no,
-              GNUNET_i2s (&p->id));
-  GNUNET_SCHEDULER_add_now (&restart_task,
-                            NULL);
-}
-
-
-static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  ret = 1;
-  tth = GNUNET_TRANSPORT_TESTING_init ();
-  GNUNET_assert (NULL != tth);
-
-  timeout_task
-    = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
-                                    &end_badly,
-                                    NULL);
-  p = GNUNET_TRANSPORT_TESTING_start_peer (tth,
-                                           cfgfile,
-                                           1,
-                                           NULL, /* receive cb */
-                                           NULL, /* connect cb */
-                                           NULL, /* disconnect cb */
-                                           NULL, /* nc/nd closure */
-                                           start_cb, /* startup cb */
-                                           NULL); /* closure */
-  if (NULL == p)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to start peer\n");
-    end ();
-    ret = 1;
-  }
-}
-
-
-int
-main (int argc,
-      char *argv[])
-{
-  char *const argv_1[] = { "test_transport_testing_restart",
-                           "-c",
-                           "test_transport_api_data.conf",
-                           NULL };
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-
-  GNUNET_log_setup ("test_transport_testing_restart",
-                    "WARNING",
-                    NULL);
-  GNUNET_PROGRAM_run ((sizeof(argv_1) / sizeof(char *)) - 1,
-                      argv_1,
-                      "test_transport_testing_restart",
-                      "nohelp",
-                      options,
-                      &run,
-                      NULL);
-  return ret;
-}
-
-
-/* end of test_transport_testing_restart.c */
diff --git a/src/transport/test_transport_testing_startstop.c b/src/transport/test_transport_testing_startstop.c
deleted file mode 100644
index 4783c1813..000000000
--- a/src/transport/test_transport_testing_startstop.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2009, 2010, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport/test_transport_testing_startstop.c
- * @brief test case for transport testing library:
- * start the peer, get the HELLO message and stop the peer
- */
-#include "platform.h"
-#include "gnunet_transport_service.h"
-#include "transport-testing.h"
-
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
-
-
-static struct GNUNET_SCHEDULER_Task *timeout_task;
-
-static struct GNUNET_TRANSPORT_TESTING_PeerContext *p;
-
-static struct GNUNET_TRANSPORT_TESTING_Handle *tth;
-
-static int ret;
-
-
-static void
-end ()
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Stopping peers\n");
-  if (NULL != timeout_task)
-    GNUNET_SCHEDULER_cancel (timeout_task);
-  if (NULL != p)
-    GNUNET_TRANSPORT_TESTING_stop_peer (p);
-  if (NULL != tth)
-    GNUNET_TRANSPORT_TESTING_done (tth);
-}
-
-
-static void
-end_badly ()
-{
-  timeout_task = NULL;
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              "Timeout!\n");
-  end ();
-  ret = GNUNET_SYSERR;
-}
-
-
-static void
-start_cb (void *cls)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Peer %u (`%s') successfully started\n",
-              p->no,
-              GNUNET_i2s (&p->id));
-  ret = 0;
-  GNUNET_SCHEDULER_add_now (&end,
-                            NULL);
-}
-
-
-static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  ret = 1;
-  tth = GNUNET_TRANSPORT_TESTING_init ();
-  GNUNET_assert (NULL != tth);
-
-  timeout_task =
-    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
-                                  &end_badly,
-                                  NULL);
-
-  p = GNUNET_TRANSPORT_TESTING_start_peer (tth,
-                                           cfgfile,
-                                           1,
-                                           NULL, /* receive cb */
-                                           NULL, /* connect cb */
-                                           NULL, /* disconnect cb */
-                                           NULL, /* nc/nd closure */
-                                           &start_cb, /* startup cb */
-                                           NULL); /* closure */
-  if (NULL == p)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Failed to start peer\n");
-    if (timeout_task != NULL)
-      GNUNET_SCHEDULER_cancel (timeout_task);
-    timeout_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-  }
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  char *const argv_1[] = { "test_transport_testing",
-                           "-c",
-                           "test_transport_api_data.conf",
-                           NULL };
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-
-  GNUNET_log_setup ("test_transport_testing_startstop",
-                    "WARNING",
-                    NULL);
-  GNUNET_PROGRAM_run ((sizeof(argv_1) / sizeof(char *)) - 1,
-                      argv_1,
-                      "test_transport_testing_startstop", "nohelp",
-                      options,
-                      &run,
-                      &ret);
-
-  return ret;
-}
-
-
-/* end of test_transport_testing_startstop.c */
diff --git a/src/transport/test_transport_udp_backchannel.sh b/src/transport/test_transport_udp_backchannel.sh
deleted file mode 100755
index 1a7c83385..000000000
--- a/src/transport/test_transport_udp_backchannel.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-if [ -f "test.out" ]; then
-    rm test.out
-fi
-if ! [ -d "/run/netns" ]; then
-    echo You have to create the directory /run/netns.
-fi
-if [ -f /proc/sys/kernel/unprivileged_userns_clone ]; then
-  if  [ "$(cat /proc/sys/kernel/unprivileged_userns_clone)" != 1 ]; then
-    echo -e "Error during test setup: The kernel parameter kernel.unprivileged_userns_clone has to be set to 1! One has to execute\n\n sysctl kernel.unprivileged_userns_clone=1\n"
-    exit 78
-  fi
-fi
-exec unshare -r -nmU bash -c "mount -t tmpfs --make-rshared tmpfs /run/netns; GNUNET_FORCE_LOG=';;;;DEBUG' GNUNET_FORCE_LOGFILE='test.out' ./test_transport_start_with_config test_transport_udp_backchannel_topo.conf"
diff --git a/src/transport/test_transport_udp_backchannel_topo.conf b/src/transport/test_transport_udp_backchannel_topo.conf
deleted file mode 100644
index ad35bde0a..000000000
--- a/src/transport/test_transport_udp_backchannel_topo.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-M:1
-N:1
-X:1
-T:libgnunet_test_transport_plugin_cmd_udp_backchannel
-K:1|{connect:{P:1:1:tcp}}
-R:1|{tcp_port:1}|{udp_port:0}
-P:1:1|{connect:{K:1:udp}}
diff --git a/src/transport/transport-testing-cmds.h b/src/transport/transport-testing-cmds.h
deleted file mode 100644
index 5a3fb22d6..000000000
--- a/src/transport/transport-testing-cmds.h
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2021 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport-testing.h
- * @brief testing lib for transport service
- * @author Matthias Wachs
- * @author Christian Grothoff
- */
-#ifndef TRANSPORT_TESTING_CMDS_H
-#define TRANSPORT_TESTING_CMDS_H
-#include "gnunet_testing_lib.h"
-
-
-typedef void *
-(*GNUNET_TRANSPORT_notify_connect_cb) (struct GNUNET_TESTING_Interpreter *is,
-                                       const struct GNUNET_PeerIdentity *peer);
-
-/**
- * Struct to store information needed in callbacks.
- *
- */
-struct ConnectPeersState
-{
-  /**
-   * Context for our asynchronous completion.
-   */
-  struct GNUNET_TESTING_AsyncContext ac;
-
-  GNUNET_TRANSPORT_notify_connect_cb notify_connect;
-
-  /**
-   * The testing system of this node.
-   */
-  const struct GNUNET_TESTING_System *tl_system;
-
-  // Label of the cmd which started the test system.
-  const char *create_label;
-
-  /**
-   * Number globally identifying the node.
-   *
-   */
-  uint32_t num;
-
-  /**
-   * Label of the cmd to start a peer.
-   *
-   */
-  const char *start_peer_label;
-
-  /**
-   * The topology of the test setup.
-   */
-  struct GNUNET_TESTING_NetjailTopology *topology;
-
-  /**
-   * Connections to other peers.
-   */
-  struct GNUNET_TESTING_NodeConnection *node_connections_head;
-
-  struct GNUNET_TESTING_Interpreter *is;
-
-  /**
-   * Number of connections.
-   */
-  unsigned int con_num;
-
-  /**
-   * Number of additional connects this cmd will wait for not triggered by this cmd.
-   */
-  unsigned int additional_connects;
-
-  /**
- * Number of connections we already have a notification for.
- */
-  unsigned int con_num_notified;
-
-  /**
-   * Number of additional connects this cmd will wait for not triggered by this cmd we already have a notification for.
-   */
-  unsigned int additional_connects_notified;
-};
-
-struct StartPeerState
-{
-  /**
-   * Context for our asynchronous completion.
-   */
-  struct GNUNET_TESTING_AsyncContext ac;
-
-  /**
-   * The ip of a node.
-   */
-  char *node_ip;
-
-  /**
-   * Receive callback
-   */
-  struct GNUNET_MQ_MessageHandler *handlers;
-
-  const char *cfgname;
-
-  /**
-   * Peer's configuration
-   */
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  struct GNUNET_TESTING_Peer *peer;
-
-  /**
-   * Peer identity
-   */
-  struct GNUNET_PeerIdentity id;
-
-  /**
-   * Peer's transport service handle
-   */
-  struct GNUNET_TRANSPORT_CoreHandle *th;
-
-  /**
-   * Application handle
-   */
-  struct GNUNET_TRANSPORT_ApplicationHandle *ah;
-
-  /**
-   * Peer's PEERSTORE Handle
-   */
-  struct GNUNET_PEERSTORE_Handle *ph;
-
-  /**
-   * Hello get task
-   */
-  struct GNUNET_SCHEDULER_Task *rh_task;
-
-  /**
-   * Peer's transport get hello handle to retrieve peer's HELLO message
-   */
-  struct GNUNET_PEERSTORE_IterateContext *pic;
-
-  /**
-   * Hello
-   */
-  char *hello;
-
-  /**
-   * Hello size
-   */
-  size_t hello_size;
-
-  char *m;
-
-  char *n;
-
-  char *local_m;
-
-  const char *system_label;
-
-  /**
-   * An unique number to identify the peer
-   */
-  unsigned int no;
-
-  struct GNUNET_CONTAINER_MultiShortmap *connected_peers_map;
-
-  const struct GNUNET_TESTING_System *tl_system;
-
-  GNUNET_TRANSPORT_notify_connect_cb notify_connect;
-
-  /**
-   * Flag indicating, if udp broadcast should be switched on.
-   */
-  enum GNUNET_GenericReturnValue broadcast;
-};
-
-
-/**
- * Create command.
- *
- * @param label name for command.
- * @param system_label Label of the cmd to setup a test environment.
- * @param m The number of the local node of the actual network namespace.
- * @param n The number of the actual namespace.
- * @param local_m Number of local nodes in each namespace.
- * @param handlers Handler for messages received by this peer.
- * @param cfgname Configuration file name for this peer.
- * @param notify_connect Method which will be called, when a peer connects.
- * @param broadcast Flag indicating, if broadcast should be switched on.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TRANSPORT_cmd_start_peer (const char *label,
-                                 const char *system_label,
-                                 uint32_t no,
-                                 char *node_ip,
-                                 struct GNUNET_MQ_MessageHandler *handlers,
-                                 const char *cfgname,
-                                 GNUNET_TRANSPORT_notify_connect_cb
-                                 notify_connect,
-                                 unsigned int broadcast);
-
-
-struct GNUNET_TESTING_Command
-GNUNET_TRANSPORT_cmd_stop_peer (const char *label,
-                                const char *start_label);
-
-
-/**
- * Create command
- *
- * @param label name for command
- * @param start_peer_label Label of the cmd to start a peer.
- * @param create_peer_label Label of the cmd which started the test system.
- * @param num Number globally identifying the node.
- * @param The topology for the test setup.
- * @param additional_connects Number of additional connects this cmd will wait for not triggered by this cmd.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TRANSPORT_cmd_connect_peers (
-  const char *label,
-  const char *start_peer_label,
-  const char *create_label,
-  uint32_t num,
-  struct GNUNET_TESTING_NetjailTopology *topology,
-  unsigned int additional_connects);
-
-
-/**
- * Create command.
- *
- * @param label name for command.
- * @param start_peer_label Label of the cmd to start a peer.
- * @param create_peer_label Label of the cmd which started the test system.
- * @param num Number globally identifying the node.
- * @param The topology for the test setup.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TRANSPORT_cmd_send_simple (const char *label,
-                                  const char *start_peer_label,
-                                  const char *create_label,
-                                  uint32_t num,
-                                  struct GNUNET_TESTING_NetjailTopology *
-                                  topology);
-
-
-/**
- * Create command.
- *
- * @param label name for command.
- * @param start_peer_label Label of the cmd to start a peer.
- * @param create_label Label of the cmd to create the testing system.
- * @param num Number globally identifying the node.
- * @param node_n The number of the node in a network namespace.
- * @param namespace_n The number of the network namespace.
- * @param The topology for the test setup.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TRANSPORT_cmd_backchannel_check (const char *label,
-                                        const char *start_peer_label,
-                                        const char *create_label,
-                                        uint32_t num,
-                                        unsigned int node_n,
-                                        unsigned int namespace_n,
-                                        struct GNUNET_TESTING_NetjailTopology *
-                                        topology);
-
-
-/**
- * Create headers for a trait with name @a name for
- * statically allocated data of type @a type.
- */
-#define GNUNET_TRANSPORT_MAKE_DECL_SIMPLE_TRAIT(name,type)   \
-  enum GNUNET_GenericReturnValue                          \
-    GNUNET_TRANSPORT_get_trait_ ## name (                    \
-    const struct GNUNET_TESTING_Command *cmd,              \
-    type **ret);                                          \
-  struct GNUNET_TESTING_Trait                              \
-    GNUNET_TRANSPORT_make_trait_ ## name (                   \
-    type * value);
-
-
-/**
- * Create C implementation for a trait with name @a name for statically
- * allocated data of type @a type.
- */
-#define GNUNET_TRANSPORT_MAKE_IMPL_SIMPLE_TRAIT(name,type)  \
-  enum GNUNET_GenericReturnValue                         \
-    GNUNET_TRANSPORT_get_trait_ ## name (                   \
-    const struct GNUNET_TESTING_Command *cmd,             \
-    type **ret)                                          \
-  {                                                      \
-    if (NULL == cmd->traits) return GNUNET_SYSERR;       \
-    return cmd->traits (cmd->cls,                        \
-                        (const void **) ret,             \
-                        GNUNET_S (name),                  \
-                        0);                              \
-  }                                                      \
-  struct GNUNET_TESTING_Trait                             \
-    GNUNET_TRANSPORT_make_trait_ ## name (                  \
-    type * value)                                        \
-  {                                                      \
-    struct GNUNET_TESTING_Trait ret = {                   \
-      .trait_name = GNUNET_S (name),                      \
-      .ptr = (const void *) value                        \
-    };                                                   \
-    return ret;                                          \
-  }
-
-
-/**
- * Call #op on all simple traits.
- */
-#define GNUNET_TRANSPORT_SIMPLE_TRAITS(op) \
-  op (peer_id, const struct GNUNET_PeerIdentity) \
-  op (connected_peers_map, const struct GNUNET_CONTAINER_MultiShortmap) \
-  op (hello_size, const size_t) \
-  op (hello, const char) \
-  op (application_handle, const struct GNUNET_TRANSPORT_ApplicationHandle) \
-  op (connect_peer_state, const struct ConnectPeersState) \
-  op (state, const struct StartPeerState) \
-  op (broadcast, const enum GNUNET_GenericReturnValue)
-
-GNUNET_TRANSPORT_SIMPLE_TRAITS (GNUNET_TRANSPORT_MAKE_DECL_SIMPLE_TRAIT)
-
-
-#endif
-/* end of transport_testing.h */
diff --git a/src/transport/transport-testing-communicator.c b/src/transport/transport-testing-communicator.c
deleted file mode 100644
index ce4af01f2..000000000
--- a/src/transport/transport-testing-communicator.c
+++ /dev/null
@@ -1,1227 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2019 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/transport-testing-communicator.c
- * @brief functions related to testing-tng
- * @author Christian Grothoff
- * @author Julius Bünger
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_protocols.h"
-#include "gnunet_constants.h"
-#include "transport-testing-communicator.h"
-#include "gnunet_ats_transport_service.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_signatures.h"
-#include "transport.h"
-#include <inttypes.h>
-
-#define LOG(kind, ...) GNUNET_log_from (kind, "transport-testing2", __VA_ARGS__)
-
-struct MyClient
-{
-  struct MyClient *prev;
-  struct MyClient *next;
-  /**
-   * @brief Handle to the client
-   */
-  struct GNUNET_SERVICE_Client *client;
-
-  /**
-   * @brief Handle to the client
-   */
-  struct GNUNET_MQ_Handle *c_mq;
-
-  /**
-   * The TCH
-   */
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc;
-
-};
-
-/**
- * @brief Queue of a communicator and some context
- */
-struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorQueue
-{
-  /**
-   * @brief Handle to the TransportCommunicator
-   */
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h;
-
-  /**
-   * @brief Envelope to a message that requests the opening of the queue.
-   *
-   * If the client already requests queue(s), but the communicator is not yet
-   * connected, we cannot send the request to open the queue. Save it until the
-   * communicator becomes available and send it then.
-   */
-  struct GNUNET_MQ_Envelope *open_queue_env;
-
-  /**
-   * @brief Peer ID of the peer on the other side of the queue
-   */
-  struct GNUNET_PeerIdentity peer_id;
-
-  /**
-   * @brief Queue ID
-   */
-  uint32_t qid;
-
-  /**
-   * @brief Current message id
-   */
-  uint64_t mid;
-
-  /**
-   * An `enum GNUNET_NetworkType` in NBO.
-   */
-  uint32_t nt;
-
-  /**
-   * Maximum transmission unit.  UINT32_MAX for unlimited.
-   */
-  uint32_t mtu;
-
-  /**
-   * Queue length.  UINT64_MAX for unlimited.
-   */
-  uint64_t q_len;
-
-  /**
-   * Queue prio
-   */
-  uint32_t priority;
-
-  /**
-   * An `enum GNUNET_TRANSPORT_ConnectionStatus` in NBO.
-   */
-  uint32_t cs;
-
-  /**
-   * @brief Next element inside a DLL
-   */
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorQueue *next;
-
-  /**
-   * @brief Previous element inside a DLL
-   */
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorQueue *prev;
-};
-
-
-/**
- * @brief Handle/Context to a single transmission
- */
-struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorTransmission
-{
-};
-
-
-/**
- * @brief Check whether incoming msg indicating available communicator is
- * correct
- *
- * @param cls Closure
- * @param msg Message struct
- *
- * @return GNUNET_YES in case message is correct
- */
-static int
-check_communicator_available (
-  void *cls,
-  const struct GNUNET_TRANSPORT_CommunicatorAvailableMessage *msg)
-{
-  uint16_t size;
-
-  size = ntohs (msg->header.size) - sizeof(*msg);
-  if (0 == size)
-    return GNUNET_OK; /* receive-only communicator */
-  GNUNET_MQ_check_zero_termination (msg);
-  return GNUNET_OK;
-}
-
-
-/**
- * @brief Handle new communicator
- *
- * Store characteristics of communicator, call respective client callback.
- *
- * @param cls Closure - communicator handle
- * @param msg Message struct
- */
-static void
-handle_communicator_available (
-  void *cls,
-  const struct GNUNET_TRANSPORT_CommunicatorAvailableMessage *msg)
-{
-  struct MyClient *client = cls;
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h =
-    client->tc;
-  uint16_t size;
-  tc_h->c_mq = client->c_mq;
-
-  size = ntohs (msg->header.size) - sizeof(*msg);
-  if (0 == size)
-  {
-    GNUNET_SERVICE_client_continue (client->client);
-    return; /* receive-only communicator */
-  }
-  tc_h->c_characteristics = ntohl (msg->cc);
-  tc_h->c_addr_prefix = GNUNET_strdup ((const char *) &msg[1]);
-  if (NULL != tc_h->communicator_available_cb)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "calling communicator_available_cb()\n");
-    tc_h->communicator_available_cb (tc_h->cb_cls,
-                                     tc_h,
-                                     tc_h->c_characteristics,
-                                     tc_h->c_addr_prefix);
-  }
-  GNUNET_SERVICE_client_continue (client->client);
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "finished communicator_available_cb()\n");
-
-}
-
-
-/**
- * Incoming message.  Test message is well-formed.
- *
- * @param cls the client
- * @param msg the send message that was sent
- * @return #GNUNET_OK if message is well-formed
- */
-static int
-check_communicator_backchannel (void *cls,
-                                const struct
-                                GNUNET_TRANSPORT_CommunicatorBackchannel *msg)
-{
-  // struct TransportClient *tc = cls;
-
-  // if (CT_COMMUNICATOR != tc->type)
-  // {
-  //  GNUNET_break (0);
-  //  return GNUNET_SYSERR;
-  // }
-  // GNUNET_MQ_check_boxed_message (msg);
-  return GNUNET_OK;
-}
-
-
-/**
- * @brief Receive an incoming message.
- *
- * Pass the message to the client.
- *
- * @param cls Closure - communicator handle
- * @param msg Message
- */
-static void
-handle_communicator_backchannel (void *cls,
-                                 const struct
-                                 GNUNET_TRANSPORT_CommunicatorBackchannel *
-                                 bc_msg)
-{
-  struct MyClient *client = cls;
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h =
-    client->tc;
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *other_tc_h;
-  struct GNUNET_MessageHeader *msg;
-  msg = (struct GNUNET_MessageHeader *) &bc_msg[1];
-  uint16_t isize = ntohs (msg->size);
-  const char *target_communicator = ((const char *) msg) + isize;
-  struct GNUNET_TRANSPORT_CommunicatorBackchannelIncoming *cbi;
-  struct GNUNET_MQ_Envelope *env;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Received backchannel message\n");
-  if (tc_h->bc_enabled != GNUNET_YES)
-  {
-    GNUNET_SERVICE_client_continue (client->client);
-    return;
-  }
-  /* Find client providing this communicator */
-  /* Finally, deliver backchannel message to communicator */
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Delivering backchannel message of type %u to %s\n",
-       ntohs (msg->type),
-       target_communicator);
-  other_tc_h = tc_h->bc_cb (tc_h, msg, (struct
-                                        GNUNET_PeerIdentity*) &bc_msg->pid);
-  env = GNUNET_MQ_msg_extra (
-    cbi,
-    isize,
-    GNUNET_MESSAGE_TYPE_TRANSPORT_COMMUNICATOR_BACKCHANNEL_INCOMING);
-  cbi->pid = tc_h->peer_id;
-  memcpy (&cbi[1], msg, isize);
-
-
-  GNUNET_MQ_send (other_tc_h->c_mq, env);
-  GNUNET_SERVICE_client_continue (client->client);
-}
-
-
-/**
- * Address of our peer added.  Test message is well-formed.
- *
- * @param cls the client
- * @param aam the send message that was sent
- * @return #GNUNET_OK if message is well-formed
- */
-static int
-check_add_address (void *cls,
-                   const struct GNUNET_TRANSPORT_AddAddressMessage *msg)
-{
-  // if (CT_COMMUNICATOR != tc->type)
-  // {
-  //  GNUNET_break (0);
-  //  return GNUNET_SYSERR;
-  // }
-  GNUNET_MQ_check_zero_termination (msg);
-  return GNUNET_OK;
-}
-
-
-/**
- * @brief The communicator informs about an address.
- *
- * Store address and call client callback.
- *
- * @param cls Closure - communicator handle
- * @param msg Message
- */
-static void
-handle_add_address (void *cls,
-                    const struct GNUNET_TRANSPORT_AddAddressMessage *msg)
-{
-  struct MyClient *client = cls;
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h =
-    client->tc;
-  uint16_t size;
-  size = ntohs (msg->header.size) - sizeof(*msg);
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "received add address cb %u\n", size);
-  if (0 == size)
-    return; /* receive-only communicator */
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "received add address cb %u\n", size);
-  tc_h->c_address = GNUNET_strdup ((const char *) &msg[1]);
-  if (NULL != tc_h->add_address_cb)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "calling add_address_cb()\n");
-    tc_h->add_address_cb (tc_h->cb_cls,
-                          tc_h,
-                          tc_h->c_address,
-                          GNUNET_TIME_relative_ntoh (msg->expiration),
-                          msg->aid,
-                          ntohl (msg->nt));
-  }
-  GNUNET_SERVICE_client_continue (client->client);
-}
-
-
-/**
- * Incoming message.  Test message is well-formed.
- *
- * @param cls the client
- * @param msg the send message that was sent
- * @return #GNUNET_OK if message is well-formed
- */
-static int
-check_incoming_msg (void *cls,
-                    const struct GNUNET_TRANSPORT_IncomingMessage *msg)
-{
-  // struct TransportClient *tc = cls;
-
-  // if (CT_COMMUNICATOR != tc->type)
-  // {
-  //  GNUNET_break (0);
-  //  return GNUNET_SYSERR;
-  // }
-  GNUNET_MQ_check_boxed_message (msg);
-  return GNUNET_OK;
-}
-
-
-/**
- * @brief Receive an incoming message.
- *
- * Pass the message to the client.
- *
- * @param cls Closure - communicator handle
- * @param msg Message
- */
-static void
-handle_incoming_msg (void *cls,
-                     const struct GNUNET_TRANSPORT_IncomingMessage *inc_msg)
-{
-  struct MyClient *client = cls;
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h =
-    client->tc;
-  struct GNUNET_MessageHeader *msg;
-  msg = (struct GNUNET_MessageHeader *) &inc_msg[1];
-  size_t payload_len = ntohs (msg->size) - sizeof (struct
-                                                   GNUNET_MessageHeader);
-  if (NULL != tc_h->incoming_msg_cb)
-  {
-    tc_h->incoming_msg_cb (tc_h->cb_cls,
-                           tc_h,
-                           (char*) &msg[1],
-                           payload_len);
-  }
-  else
-  {
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         "Incoming message from communicator but no handler!\n");
-  }
-  if (GNUNET_YES == ntohl (inc_msg->fc_on))
-  {
-    /* send ACK when done to communicator for flow control! */
-    struct GNUNET_MQ_Envelope *env;
-    struct GNUNET_TRANSPORT_IncomingMessageAck *ack;
-
-    env = GNUNET_MQ_msg (ack, GNUNET_MESSAGE_TYPE_TRANSPORT_INCOMING_MSG_ACK);
-    GNUNET_assert (NULL != env);
-    ack->reserved = htonl (0);
-    ack->fc_id = inc_msg->fc_id;
-    ack->sender = inc_msg->sender;
-    GNUNET_MQ_send (tc_h->c_mq, env);
-  }
-
-  GNUNET_SERVICE_client_continue (client->client);
-}
-
-
-/**
- * @brief Communicator informs that it tries to establish requested queue
- *
- * @param cls Closure - communicator handle
- * @param msg Message
- */
-static void
-handle_queue_create_ok (void *cls,
-                        const struct GNUNET_TRANSPORT_CreateQueueResponse *msg)
-{
-  struct MyClient *client = cls;
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h =
-    client->tc;
-
-  if (NULL != tc_h->queue_create_reply_cb)
-  {
-    tc_h->queue_create_reply_cb (tc_h->cb_cls, tc_h, GNUNET_YES);
-  }
-  GNUNET_SERVICE_client_continue (client->client);
-}
-
-
-/**
- * @brief Communicator informs that it won't try establishing requested queue.
- *
- * It will not do so probably because the address is bougus (see comment to
- * #GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE_FAIL)
- *
- * @param cls Closure - communicator handle
- * @param msg Message
- */
-static void
-handle_queue_create_fail (
-  void *cls,
-  const struct GNUNET_TRANSPORT_CreateQueueResponse *msg)
-{
-  struct MyClient *client = cls;
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h =
-    client->tc;
-
-  if (NULL != tc_h->queue_create_reply_cb)
-  {
-    tc_h->queue_create_reply_cb (tc_h->cb_cls, tc_h, GNUNET_NO);
-  }
-  GNUNET_SERVICE_client_continue (client->client);
-}
-
-
-/**
- * New queue became available.  Check message.
- *
- * @param cls the client
- * @param aqm the send message that was sent
- */
-static int
-check_add_queue_message (void *cls,
-                         const struct GNUNET_TRANSPORT_AddQueueMessage *aqm)
-{
-  GNUNET_MQ_check_zero_termination (aqm);
-  return GNUNET_OK;
-}
-
-
-/**
- * @brief Handle new queue
- *
- * Store context and call client callback.
- *
- * @param cls Closure - communicator handle
- * @param msg Message struct
- */
-static void
-handle_add_queue_message (void *cls,
-                          const struct GNUNET_TRANSPORT_AddQueueMessage *msg)
-{
-  struct MyClient *client = cls;
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h =
-    client->tc;
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorQueue *tc_queue;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Got queue with ID %u\n", msg->qid);
-  for (tc_queue = tc_h->queue_head; NULL != tc_queue; tc_queue = tc_queue->next)
-  {
-    if (tc_queue->qid == msg->qid)
-      break;
-  }
-  if (NULL == tc_queue)
-  {
-    tc_queue =
-      GNUNET_new (struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorQueue);
-    tc_queue->tc_h = tc_h;
-    tc_queue->qid = msg->qid;
-    tc_queue->peer_id = msg->receiver;
-    GNUNET_CONTAINER_DLL_insert (tc_h->queue_head, tc_h->queue_tail, tc_queue);
-  }
-  GNUNET_assert (tc_queue->qid == msg->qid);
-  GNUNET_assert (0 == GNUNET_memcmp (&tc_queue->peer_id, &msg->receiver));
-  tc_queue->nt = msg->nt;
-  tc_queue->mtu = ntohl (msg->mtu);
-  tc_queue->cs = msg->cs;
-  tc_queue->priority = ntohl (msg->priority);
-  tc_queue->q_len = GNUNET_ntohll (msg->q_len);
-  if (NULL != tc_h->add_queue_cb)
-  {
-    tc_h->add_queue_cb (tc_h->cb_cls, tc_h, tc_queue, tc_queue->mtu);
-  }
-  GNUNET_SERVICE_client_continue (client->client);
-}
-
-
-/**
- * @brief Handle new queue
- *
- * Store context and call client callback.
- *
- * @param cls Closure - communicator handle
- * @param msg Message struct
- */
-static void
-handle_update_queue_message (void *cls,
-                             const struct
-                             GNUNET_TRANSPORT_UpdateQueueMessage *msg)
-{
-  struct MyClient *client = cls;
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h =
-    client->tc;
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorQueue *tc_queue;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Received queue update message for %u with q_len %" PRIu64 "\n",
-       msg->qid, GNUNET_ntohll (msg->q_len));
-  tc_queue = tc_h->queue_head;
-  if (NULL != tc_queue)
-  {
-    while (tc_queue->qid != msg->qid)
-    {
-      tc_queue = tc_queue->next;
-    }
-  }
-  if (NULL == tc_queue)
-  {
-    GNUNET_SERVICE_client_continue (client->client);
-    return;
-  }
-  GNUNET_assert (tc_queue->qid == msg->qid);
-  GNUNET_assert (0 == GNUNET_memcmp (&tc_queue->peer_id, &msg->receiver));
-  tc_queue->nt = msg->nt;
-  tc_queue->mtu = ntohl (msg->mtu);
-  tc_queue->cs = msg->cs;
-  tc_queue->priority = ntohl (msg->priority);
-  // Uncomment this for alternativ 1 of backchannel functionality
-  tc_queue->q_len += GNUNET_ntohll (msg->q_len);
-  // Until here for alternativ 1
-  // Uncomment this for alternativ 2 of backchannel functionality
-  // tc_queue->q_len = GNUNET_ntohll (msg->q_len);
-  // Until here for alternativ 2
-  GNUNET_SERVICE_client_continue (client->client);
-}
-
-
-/**
- * @brief Shut down the service
- *
- * @param cls Closure - Handle to the service
- */
-static void
-shutdown_service (void *cls)
-{
-  struct GNUNET_SERVICE_Handle *h = cls;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Shutting down service!\n");
-
-  GNUNET_SERVICE_stop (h);
-}
-
-
-/**
- * @brief Callback called when new Client (Communicator) connects
- *
- * @param cls Closure - TransporCommmunicator Handle
- * @param client Client
- * @param mq Messagequeue
- *
- * @return TransportCommunicator Handle
- */
-static void *
-connect_cb (void *cls,
-            struct GNUNET_SERVICE_Client *client,
-            struct GNUNET_MQ_Handle *mq)
-{
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h = cls;
-  struct MyClient *new_c;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Client %p connected to %p.\n",
-       client, tc_h);
-  new_c = GNUNET_new (struct MyClient);
-  new_c->client = client;
-  new_c->c_mq = mq;
-  new_c->tc = tc_h;
-  GNUNET_CONTAINER_DLL_insert (tc_h->client_head,
-                               tc_h->client_tail,
-                               new_c);
-
-  if (NULL == tc_h->queue_head)
-    return new_c;
-  /* Iterate over queues. They are yet to be opened. Request opening. */
-  for (struct
-       GNUNET_TRANSPORT_TESTING_TransportCommunicatorQueue *tc_queue_iter =
-         tc_h->queue_head;
-       NULL != tc_queue_iter;
-       tc_queue_iter = tc_queue_iter->next)
-  {
-    if (NULL == tc_queue_iter->open_queue_env)
-      continue;
-    /* Send the previously created mq envelope to request the creation of the
-     * queue. */
-    GNUNET_MQ_send (tc_h->c_mq,
-                    tc_queue_iter->open_queue_env);
-    tc_queue_iter->open_queue_env = NULL;
-  }
-  return new_c;
-}
-
-
-/**
- * @brief Callback called when Client disconnects
- *
- * @param cls Closure - TransportCommunicator Handle
- * @param client Client
- * @param internal_cls TransporCommmunicator Handle
- */
-static void
-disconnect_cb (void *cls,
-               struct GNUNET_SERVICE_Client *client,
-               void *internal_cls)
-{
-  struct MyClient *cl = cls;
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h = cls;
-
-  for (cl = tc_h->client_head; NULL != cl; cl = cl->next)
-  {
-    if (cl->client != client)
-      continue;
-    GNUNET_CONTAINER_DLL_remove (tc_h->client_head,
-                                 tc_h->client_tail,
-                                 cl);
-    if (cl->c_mq == tc_h->c_mq)
-      tc_h->c_mq = NULL;
-    GNUNET_free (cl);
-    break;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Client disconnected.\n");
-}
-
-
-/**
- * Message was transmitted.  Process the request.
- *
- * @param cls the client
- * @param sma the send message that was sent
- */
-static void
-handle_send_message_ack (void *cls,
-                         const struct GNUNET_TRANSPORT_SendMessageToAck *sma)
-{
-  struct MyClient *client = cls;
-  GNUNET_SERVICE_client_continue (client->client);
-  // NOP
-}
-
-
-/**
- * @brief Start the communicator part of the transport service
- *
- * @param communicator_available Callback to be called when a new communicator
- * becomes available
- * @param cfg Configuration
- */
-static void
-transport_communicator_start (
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h)
-{
-  struct GNUNET_MQ_MessageHandler mh[] = {
-    GNUNET_MQ_hd_var_size (communicator_available,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_NEW_COMMUNICATOR,
-                           struct GNUNET_TRANSPORT_CommunicatorAvailableMessage,
-                           tc_h),
-    GNUNET_MQ_hd_var_size (communicator_backchannel,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_COMMUNICATOR_BACKCHANNEL,
-                           struct GNUNET_TRANSPORT_CommunicatorBackchannel,
-                           tc_h),
-    GNUNET_MQ_hd_var_size (add_address,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_ADD_ADDRESS,
-                           struct GNUNET_TRANSPORT_AddAddressMessage,
-                           tc_h),
-    // GNUNET_MQ_hd_fixed_size (del_address,
-    //                         GNUNET_MESSAGE_TYPE_TRANSPORT_DEL_ADDRESS,
-    //                         struct GNUNET_TRANSPORT_DelAddressMessage,
-    //                         NULL),
-    GNUNET_MQ_hd_var_size (incoming_msg,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_INCOMING_MSG,
-                           struct GNUNET_TRANSPORT_IncomingMessage,
-                           tc_h),
-    GNUNET_MQ_hd_fixed_size (queue_create_ok,
-                             GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE_OK,
-                             struct GNUNET_TRANSPORT_CreateQueueResponse,
-                             tc_h),
-    GNUNET_MQ_hd_fixed_size (queue_create_fail,
-                             GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE_FAIL,
-                             struct GNUNET_TRANSPORT_CreateQueueResponse,
-                             tc_h),
-    GNUNET_MQ_hd_var_size (add_queue_message,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_SETUP,
-                           struct GNUNET_TRANSPORT_AddQueueMessage,
-                           tc_h),
-    GNUNET_MQ_hd_fixed_size (update_queue_message,
-                             GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_UPDATE,
-                             struct GNUNET_TRANSPORT_UpdateQueueMessage,
-                             tc_h),
-    // GNUNET_MQ_hd_fixed_size (del_queue_message,
-    //                         GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_TEARDOWN,
-    //                         struct GNUNET_TRANSPORT_DelQueueMessage,
-    //                         NULL),
-    GNUNET_MQ_hd_fixed_size (send_message_ack,
-                             GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_MSG_ACK,
-                             struct GNUNET_TRANSPORT_SendMessageToAck,
-                             tc_h),
-    GNUNET_MQ_handler_end ()
-  };
-
-
-  tc_h->sh = GNUNET_SERVICE_start ("transport",
-                                   tc_h->cfg,
-                                   &connect_cb,
-                                   &disconnect_cb,
-                                   tc_h,
-                                   mh);
-  GNUNET_assert (NULL != tc_h->sh);
-}
-
-
-/**
- * @brief Task run at shutdown to kill communicator and clean up
- *
- * @param cls Closure - Process of communicator
- */
-static void
-shutdown_process (struct GNUNET_OS_Process *proc)
-{
-  if (0 != GNUNET_OS_process_kill (proc, SIGTERM))
-  {
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         "Error shutting down process with SIGERM, trying SIGKILL\n");
-    if (0 != GNUNET_OS_process_kill (proc, SIGKILL))
-    {
-      LOG (GNUNET_ERROR_TYPE_ERROR,
-           "Error shutting down process with SIGERM and SIGKILL\n");
-    }
-  }
-  GNUNET_OS_process_destroy (proc);
-}
-
-/**
- * @brief Task run at shutdown to kill the statistics process
- *
- * @param cls Closure - Process of communicator
- */
-static void
-shutdown_statistics (void *cls)
-{
-  struct GNUNET_OS_Process *proc = cls;
-  shutdown_process (proc);
-}
-
-/**
- * @brief Task run at shutdown to kill the peerstore process
- *
- * @param cls Closure - Process of communicator
- */
-static void
-shutdown_peerstore (void *cls)
-{
-  struct GNUNET_OS_Process *proc = cls;
-  shutdown_process (proc);
-}
-
-/**
- * @brief Task run at shutdown to kill a communicator process
- *
- * @param cls Closure - Process of communicator
- */
-static void
-shutdown_communicator (void *cls)
-{
-  struct GNUNET_OS_Process *proc = cls;
-  shutdown_process (proc);
-}
-
-
-/**
- * @brief Start the communicator
- *
- * @param cfgname Name of the communicator
- */
-static void
-communicator_start (
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h,
-  const char *binary_name)
-{
-  char *binary;
-  char *loprefix;
-  char *section_name;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "communicator_start\n");
-
-  section_name = strchr (binary_name, '-');
-  section_name++;
-
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (tc_h->cfg,
-                                                          section_name,
-                                                          "PREFIX",
-                                                          &loprefix))
-    loprefix = GNUNET_strdup ("");
-
-
-  binary = GNUNET_OS_get_libexec_binary_path (binary_name);
-  tc_h->c_proc = GNUNET_OS_start_process_s (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
-                                            NULL,
-                                            loprefix,
-                                            binary,
-                                            binary_name,
-                                            "-c",
-                                            tc_h->cfg_filename,
-                                            NULL);
-  if (NULL == tc_h->c_proc)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to start communicator!");
-    return;
-  }
-  LOG (GNUNET_ERROR_TYPE_INFO, "started communicator\n");
-  GNUNET_free (binary);
-}
-
-
-/**
- * @brief Task run at shutdown to kill communicator and clean up
- *
- * @param cls Closure - Process of communicator
- */
-static void
-shutdown_nat (void *cls)
-{
-  struct GNUNET_OS_Process *proc = cls;
-  shutdown_process (proc);
-}
-
-
-/**
- * @brief Task run at shutdown to kill the resolver process
- *
- * @param cls Closure - Process of communicator
- */
-static void
-shutdown_resolver (void *cls)
-{
-  struct GNUNET_OS_Process *proc = cls;
-  shutdown_process (proc);
-}
-
-
-/**
- * @brief Start Resolver
- *
- */
-static void
-resolver_start (struct
-                GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h)
-{
-  char *binary;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "resolver_start\n");
-  binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
-  tc_h->resolver_proc = GNUNET_OS_start_process (
-    GNUNET_OS_INHERIT_STD_OUT_AND_ERR
-    | GNUNET_OS_USE_PIPE_CONTROL,
-    NULL,
-    NULL,
-    NULL,
-    binary,
-    "gnunet-service-resolver",
-    "-c",
-    tc_h->cfg_filename,
-    NULL);
-  if (NULL == tc_h->resolver_proc)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to start resolver service!");
-    return;
-  }
-  LOG (GNUNET_ERROR_TYPE_INFO, "started resolver service\n");
-  GNUNET_free (binary);
-
-}
-
-/**
- * @brief Start Statistics
- *
- */
-static void
-statistics_start (
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h)
-{
-  char *binary;
-
-  binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-statistics");
-  tc_h->stat_proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
-                                             NULL,
-                                             NULL,
-                                             NULL,
-                                             binary,
-                                             "gnunet-service-statistics",
-                                             "-c",
-                                             tc_h->cfg_filename,
-                                             NULL);
-  if (NULL == tc_h->stat_proc)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to start Statistics!");
-    return;
-  }
-  LOG (GNUNET_ERROR_TYPE_INFO, "started Statistics\n");
-  GNUNET_free (binary);
-}
-
-/**
- * @brief Start Peerstore
- *
- */
-static void
-peerstore_start (
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h)
-{
-  char *binary;
-
-  binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-peerstore");
-  tc_h->ps_proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
-                                           NULL,
-                                           NULL,
-                                           NULL,
-                                           binary,
-                                           "gnunet-service-peerstore",
-                                           "-c",
-                                           tc_h->cfg_filename,
-                                           NULL);
-  if (NULL == tc_h->ps_proc)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to start Peerstore!");
-    return;
-  }
-  LOG (GNUNET_ERROR_TYPE_INFO, "started Peerstore\n");
-  GNUNET_free (binary);
-}
-
-/**
- * @brief Start NAT
- *
- */
-static void
-nat_start (
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h)
-{
-  char *binary;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "nat_start\n");
-  binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-nat");
-  tc_h->nat_proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR
-                                            | GNUNET_OS_USE_PIPE_CONTROL,
-                                            NULL,
-                                            NULL,
-                                            NULL,
-                                            binary,
-                                            "gnunet-service-nat",
-                                            "-c",
-                                            tc_h->cfg_filename,
-                                            NULL);
-  if (NULL == tc_h->nat_proc)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to start NAT!");
-    return;
-  }
-  LOG (GNUNET_ERROR_TYPE_INFO, "started NAT\n");
-  GNUNET_free (binary);
-}
-
-
-/**
- * @brief Start communicator part of transport service and communicator
- *
- * @param service_name Name of the service
- * @param cfg Configuration handle
- * @param communicator_available_cb Callback that is called when a new
- * @param add_address_cb Callback that is called when a new
- * communicator becomes available
- * @param cb_cls Closure to @a communicator_available_cb and @a
- *
- * @return Handle to the communicator duo
- */
-struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *
-GNUNET_TRANSPORT_TESTING_transport_communicator_service_start (
-  const char *service_name,
-  const char *binary_name,
-  const char *cfg_filename,
-  const struct GNUNET_PeerIdentity *peer_id,
-  GNUNET_TRANSPORT_TESTING_CommunicatorAvailableCallback
-  communicator_available_cb,
-  GNUNET_TRANSPORT_TESTING_AddAddressCallback add_address_cb,
-  GNUNET_TRANSPORT_TESTING_QueueCreateReplyCallback queue_create_reply_cb,
-  GNUNET_TRANSPORT_TESTING_AddQueueCallback add_queue_cb,
-  GNUNET_TRANSPORT_TESTING_IncomingMessageCallback incoming_message_cb,
-  GNUNET_TRANSPORT_TESTING_BackchannelCallback bc_cb,
-  void *cb_cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Starting new transport/communicator combo with config %s\n",
-       cfg_filename);
-  tc_h =
-    GNUNET_new (struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle);
-  tc_h->cfg_filename = GNUNET_strdup (cfg_filename);
-  tc_h->cfg = GNUNET_CONFIGURATION_create ();
-  if ((GNUNET_SYSERR == GNUNET_CONFIGURATION_load (tc_h->cfg, cfg_filename)))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _ ("Malformed configuration file `%s', exit ...\n"),
-                cfg_filename);
-    GNUNET_free (tc_h->cfg_filename);
-    GNUNET_CONFIGURATION_destroy (tc_h->cfg);
-    GNUNET_free (tc_h);
-    return NULL;
-  }
-  tc_h->bc_enabled = GNUNET_CONFIGURATION_get_value_yesno (tc_h->cfg,
-                                                           "communicator-test",
-                                                           "BACKCHANNEL_ENABLED");
-  tc_h->communicator_available_cb = communicator_available_cb;
-  tc_h->add_address_cb = add_address_cb;
-  tc_h->queue_create_reply_cb = queue_create_reply_cb;
-  tc_h->add_queue_cb = add_queue_cb;
-  tc_h->incoming_msg_cb = incoming_message_cb;
-  tc_h->bc_cb = bc_cb;
-  tc_h->peer_id = *peer_id;
-  tc_h->cb_cls = cb_cls;
-
-  /* Start communicator part of service */
-  transport_communicator_start (tc_h);
-  /* Start NAT */
-  nat_start (tc_h);
-  /* Start resolver service */
-  resolver_start (tc_h);
-  /* Start peerstore service */
-  peerstore_start (tc_h);
-  /* Start statistic service */
-  statistics_start (tc_h);
-  /* Schedule start communicator */
-  communicator_start (tc_h,
-                      binary_name);
-  return tc_h;
-}
-
-
-void
-GNUNET_TRANSPORT_TESTING_transport_communicator_service_stop (
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h)
-{
-  shutdown_communicator (tc_h->c_proc);
-  shutdown_service (tc_h->sh);
-  shutdown_nat (tc_h->nat_proc);
-  shutdown_resolver (tc_h->resolver_proc);
-  shutdown_peerstore (tc_h->ps_proc);
-  shutdown_statistics (tc_h->stat_proc);
-  GNUNET_CONFIGURATION_destroy (tc_h->cfg);
-  GNUNET_free (tc_h);
-}
-
-
-/**
- * @brief Instruct communicator to open a queue
- *
- * @param tc_h Handle to communicator which shall open queue
- * @param peer_id Towards which peer
- * @param address For which address
- */
-void
-GNUNET_TRANSPORT_TESTING_transport_communicator_open_queue (
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h,
-  const struct GNUNET_PeerIdentity *peer_id,
-  const char *address)
-{
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorQueue *tc_queue;
-  static uint32_t idgen;
-  char *prefix;
-  struct GNUNET_TRANSPORT_CreateQueue *msg;
-  struct GNUNET_MQ_Envelope *env;
-  size_t alen;
-
-  tc_queue =
-    GNUNET_new (struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorQueue);
-  tc_queue->tc_h = tc_h;
-  prefix = GNUNET_HELLO_address_to_prefix (address);
-  if (NULL == prefix)
-  {
-    GNUNET_break (0);  /* We got an invalid address!? */
-    GNUNET_free (tc_queue);
-    return;
-  }
-  GNUNET_free (prefix);
-  alen = strlen (address) + 1;
-  env =
-    GNUNET_MQ_msg_extra (msg, alen, GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE);
-  msg->request_id = htonl (idgen++);
-  tc_queue->qid = msg->request_id;
-  msg->receiver = *peer_id;
-  tc_queue->peer_id = *peer_id;
-  memcpy (&msg[1], address, alen);
-  if (NULL != tc_h->c_mq)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Sending queue create immediately\n");
-    GNUNET_MQ_send (tc_h->c_mq, env);
-  }
-  else
-  {
-    tc_queue->open_queue_env = env;
-  }
-  GNUNET_CONTAINER_DLL_insert (tc_h->queue_head, tc_h->queue_tail, tc_queue);
-}
-
-
-/**
- * @brief Instruct communicator to send data
- *
- * @param tc_queue The queue to use for sending
- * @param cont function to call when done sending
- * @param cont_cls closure for @a cont
- * @param payload Data to send
- * @param payload_size Size of the @a payload
- */
-void
-GNUNET_TRANSPORT_TESTING_transport_communicator_send
-  (struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h,
-  GNUNET_SCHEDULER_TaskCallback cont,
-  void *cont_cls,
-  const void *payload,
-  size_t payload_size)
-{
-  struct GNUNET_MessageHeader *mh;
-  struct GNUNET_TRANSPORT_SendMessageTo *msg;
-  struct GNUNET_MQ_Envelope *env;
-  size_t inbox_size;
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorQueue *tc_queue;
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorQueue *tc_queue_tmp;
-
-  tc_queue = NULL;
-  for (tc_queue_tmp = tc_h->queue_head;
-       NULL != tc_queue_tmp;
-       tc_queue_tmp = tc_queue_tmp->next)
-  {
-    if (tc_queue_tmp->q_len <= 0)
-      continue;
-    if (NULL == tc_queue)
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Selecting queue with prio %u, len %" PRIu64 " and MTU %u\n",
-           tc_queue_tmp->priority,
-           tc_queue_tmp->q_len,
-           tc_queue_tmp->mtu);
-      tc_queue = tc_queue_tmp;
-      continue;
-    }
-    if (tc_queue->priority < tc_queue_tmp->priority)
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Selecting queue with prio %u, len %" PRIu64 " and MTU %u\n",
-           tc_queue_tmp->priority,
-           tc_queue_tmp->q_len,
-           tc_queue_tmp->mtu);
-      tc_queue = tc_queue_tmp;
-    }
-  }
-  GNUNET_assert (NULL != tc_queue);
-  // Uncomment this for alternativ 1 of backchannel functionality
-  if (tc_queue->q_len != GNUNET_TRANSPORT_QUEUE_LENGTH_UNLIMITED)
-    tc_queue->q_len--;
-  // Until here for alternativ 1
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Sending message\n");
-  inbox_size = sizeof (struct GNUNET_MessageHeader) + payload_size;
-  env = GNUNET_MQ_msg_extra (msg,
-                             inbox_size,
-                             GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_MSG);
-  GNUNET_assert (NULL != env);
-  msg->qid = htonl (tc_queue->qid);
-  msg->mid = tc_queue->mid++;
-  msg->receiver = tc_queue->peer_id;
-  mh = (struct GNUNET_MessageHeader *) &msg[1];
-  mh->size = htons (inbox_size);
-  mh->type = GNUNET_MESSAGE_TYPE_DUMMY;
-  memcpy (&mh[1],
-          payload,
-          payload_size);
-  if (NULL != cont)
-    GNUNET_MQ_notify_sent (env,
-                           cont,
-                           cont_cls);
-  GNUNET_MQ_send (tc_queue->tc_h->c_mq,
-                  env);
-}
diff --git a/src/transport/transport-testing-communicator.h b/src/transport/transport-testing-communicator.h
deleted file mode 100644
index 1875258b4..000000000
--- a/src/transport/transport-testing-communicator.h
+++ /dev/null
@@ -1,360 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2019 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/transport-testing-communicator.h
- * @brief functions and structures related to testing-tng
- * @author Christian Grothoff
- * @author Julius Bünger
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_ats_transport_service.h"
-#include "transport.h"
-
-/**
- * @brief Queue of a communicator and some context
- */
-struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorQueue;
-
-
-/**
- * @brief Handle/Context to a single transmission
- */
-struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorTransmission;
-
-/**
- * @brief Function signature for callbacks that are called when new
- * backchannel message arrived
- *
- * @param cls Closure
- * @param msg Backchannel message
- * @param pid Target peer
- */
-typedef struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *
-(*GNUNET_TRANSPORT_TESTING_BackchannelCallback)(void *cls,
-                                                struct GNUNET_MessageHeader *msg,
-                                                struct GNUNET_PeerIdentity *pid);
-
-
-/**
- * @brief Function signature for callbacks that are called when new
- * communicators become available
- *
- * @param cls Closure
- * @param tc_h Communicator handle
- * @param cc Characteristics of communicator
- * @param address_prefix Prefix of the address
- */
-typedef void
-(*GNUNET_TRANSPORT_TESTING_CommunicatorAvailableCallback)(void *cls,
-                                                          struct
-                                                          GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle
-                                                          *tc_h,
-                                                          enum
-                                                          GNUNET_TRANSPORT_CommunicatorCharacteristics
-                                                          cc,
-                                                          char *address_prefix);
-
-
-/**
- * @brief Receive information about the address of a communicator.
- *
- * @param cls Closure
- * @param tc_h Communicator handle
- * @param address Address represented as string
- * @param expiration Expiration
- * @param aid Aid
- * @param nt Network Type
- */
-typedef void
-(*GNUNET_TRANSPORT_TESTING_AddAddressCallback)(void *cls,
-                                               struct
-                                               GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle
-                                               *tc_h,
-                                               const char *address,
-                                               struct GNUNET_TIME_Relative
-                                               expiration,
-                                               uint32_t aid,
-                                               enum GNUNET_NetworkType nt);
-
-
-/**
- * @brief Get informed about the success of a queue request.
- *
- * @param cls Closure
- * @param tc_h Communicator handle
- * @param will_try #GNUNET_YES if communicator will try to create queue
- */
-typedef void
-(*GNUNET_TRANSPORT_TESTING_QueueCreateReplyCallback)(void *cls,
-                                                     struct
-                                                     GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle
-                                                     *tc_h,
-                                                     int will_try);
-
-
-/**
- * @brief Handle opening of queue
- *
- * @param cls Closure
- * @param tc_h Communicator handle
- * @param tc_queue Handle to newly opened queue
- */
-typedef void
-(*GNUNET_TRANSPORT_TESTING_AddQueueCallback)(void *cls,
-                                             struct
-                                             GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle
-                                             *tc_h,
-                                             struct
-                                             GNUNET_TRANSPORT_TESTING_TransportCommunicatorQueue
-                                             *tc_queue,
-                                             size_t mtu);
-
-
-/**
- * @brief Handle an incoming message
- *
- * @param cls Closure
- * @param tc_h Handle to the receiving communicator
- * @param msg Received message
- */
-typedef void
-(*GNUNET_TRANSPORT_TESTING_IncomingMessageCallback)(void *cls,
-                                                    struct
-                                                    GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle
-                                                    *tc_h,
-                                                    const char*payload,
-                                                    size_t payload_len);
-
-/**
- * @brief Handle to a transport communicator
- */
-struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle
-{
-  /**
-   * Clients
-   */
-  struct MyClient *client_head;
-  struct MyClient *client_tail;
-
-  /**
-  * @brief Handle to the client
-  */
-  struct GNUNET_MQ_Handle *c_mq;
-
-  /**
-    * @brief Handle to the configuration
-    */
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  /**
-   * @brief File name of configuration file
-   */
-  char *cfg_filename;
-
-  struct GNUNET_PeerIdentity peer_id;
-
-  /**
-   * @brief Handle to the transport service
-   */
-  struct GNUNET_SERVICE_Handle *tsh;
-
-  /**
-   * @brief Task that will be run on shutdown to stop and clean transport
-   * service
-   */
-  struct GNUNET_SCHEDULER_Task *ts_shutdown_task;
-
-
-  /**
-   * @brief Process of the communicator
-   */
-  struct GNUNET_OS_Process *c_proc;
-
-  /**
-   * NAT process
-   */
-  struct GNUNET_OS_Process *nat_proc;
-
-  /**
-   * resolver service process
-   */
-  struct GNUNET_OS_Process *resolver_proc;
-
-  /**
-   * statistics service process
-   */
-  struct GNUNET_OS_Process *stat_proc;
-
-  /**
-   * peerstore service process
-   */
-  struct GNUNET_OS_Process *ps_proc;
-
-  /**
-   * @brief Task that will be run on shutdown to stop and clean communicator
-   */
-  struct GNUNET_SCHEDULER_Task *c_shutdown_task;
-
-  /**
-   * @brief Characteristics of the communicator
-   */
-  enum GNUNET_TRANSPORT_CommunicatorCharacteristics c_characteristics;
-
-  /**
-   * @brief Specifies supported addresses
-   */
-  char *c_addr_prefix;
-
-  /**
-   * @brief Specifies supported addresses
-   */
-  char *c_address;
-
-  /**
-   * @brief Head of the DLL of queues associated with this communicator
-   */
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorQueue *queue_head;
-
-  /**
-   * @brief Tail of the DLL of queues associated with this communicator
-   */
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorQueue *queue_tail;
-
-  /* Callbacks + Closures */
-  /**
-   * @brief Callback called when a new communicator connects
-   */
-  GNUNET_TRANSPORT_TESTING_CommunicatorAvailableCallback
-    communicator_available_cb;
-
-  /**
-   * @brief Callback called when a new communicator connects
-   */
-  GNUNET_TRANSPORT_TESTING_AddAddressCallback add_address_cb;
-
-  /**
-   * @brief Callback called when a new communicator connects
-   */
-  GNUNET_TRANSPORT_TESTING_QueueCreateReplyCallback queue_create_reply_cb;
-
-  /**
-   * @brief Callback called when a new communicator connects
-   */
-  GNUNET_TRANSPORT_TESTING_AddQueueCallback add_queue_cb;
-
-  /**
-   * @brief Callback called when a new communicator connects
-   */
-  GNUNET_TRANSPORT_TESTING_IncomingMessageCallback incoming_msg_cb;
-
-  /**
-   * @brief Backchannel callback
-   */
-  GNUNET_TRANSPORT_TESTING_BackchannelCallback bc_cb;
-
-  /**
-   * Our service handle
-   */
-  struct GNUNET_SERVICE_Handle *sh;
-
-  /**
-   * @brief Closure to the callback
-   */
-  void *cb_cls;
-
-  /**
-   * Backchannel supported
-   */
-  int bc_enabled;
-};
-
-/**
- * @brief Start communicator part of transport service and communicator
- *
- * @param service_name Name of the service
- * @param cfg Configuration handle
- * @param communicator_available Callback that is called when a new
- * communicator becomes available
- * @param add_address_cb Callback handling new addresses
- * @param queue_create_reply_cb Callback handling success of queue requests
- * @param add_queue_cb Callback handling freshly created queues
- * @param incoming_message_cb Callback handling incoming messages
- * @param cb_cls Closure to @p communicator_available
- *
- * @return Handle to the communicator duo
- */
-struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *
-GNUNET_TRANSPORT_TESTING_transport_communicator_service_start (
-  const char *service_name,
-  const char *binary_name,
-  const char *cfg_filename,
-  const struct GNUNET_PeerIdentity *peer_id,
-  GNUNET_TRANSPORT_TESTING_CommunicatorAvailableCallback
-  communicator_available_cb,
-  GNUNET_TRANSPORT_TESTING_AddAddressCallback add_address_cb,
-  GNUNET_TRANSPORT_TESTING_QueueCreateReplyCallback queue_create_reply_cb,
-  GNUNET_TRANSPORT_TESTING_AddQueueCallback add_queue_cb,
-  GNUNET_TRANSPORT_TESTING_IncomingMessageCallback incoming_message_cb,
-  GNUNET_TRANSPORT_TESTING_BackchannelCallback bc_cb,
-  void *cb_cls);
-
-
-void
-GNUNET_TRANSPORT_TESTING_transport_communicator_service_stop (
-  struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h);
-
-
-/**
- * @brief Instruct communicator to open a queue
- *
- * @param tc_h Handle to communicator which shall open queue
- * @param peer_id Towards which peer
- * @param address For which address
- */
-void
-GNUNET_TRANSPORT_TESTING_transport_communicator_open_queue (struct
-                                                            GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle
-                                                            *tc_h,
-                                                            const struct
-                                                            GNUNET_PeerIdentity
-                                                            *peer_id,
-                                                            const char *address);
-
-
-/**
- * @brief Instruct communicator to send data
- *
- * @param tc_queue The queue to use for sending
- * @param cont function to call when done sending
- * @param cont_cls closure for @a cont
- * @param payload Data to send
- * @param payload_size Size of the @a payload
- */
-void
-GNUNET_TRANSPORT_TESTING_transport_communicator_send (struct
-                                                      GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle
-                                                      *tc_h,
-                                                      GNUNET_SCHEDULER_TaskCallback
-                                                      cont,
-                                                      void *cont_cls,
-                                                      const void *payload,
-                                                      size_t payload_size);
diff --git a/src/transport/transport-testing-filenames.c b/src/transport/transport-testing-filenames.c
deleted file mode 100644
index 7c136b690..000000000
--- a/src/transport/transport-testing-filenames.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2006, 2009, 2015, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport-testing-filenames.c
- * @brief convenience string manipulation functions for tests
- * @author Matthias Wachs
- * @author Christian Grothoff
- */
-#include "transport-testing.h"
-
-
-/**
- * Removes all directory separators from absolute filename
- *
- * @param file the absolute file name, e.g. as found in argv[0]
- * @return extracted file name, has to be freed by caller
- */
-static char *
-extract_filename (const char *file)
-{
-  char *pch = GNUNET_strdup (file);
-  char *backup = pch;
-  char *filename = NULL;
-  char *res;
-
-  if (NULL != strstr (pch, "/"))
-  {
-    pch = strtok (pch, "/");
-    while (pch != NULL)
-    {
-      pch = strtok (NULL, "/");
-      if (pch != NULL)
-      {
-        filename = pch;
-      }
-    }
-  }
-  else
-    filename = pch;
-
-  res = GNUNET_strdup (filename);
-  GNUNET_free (backup);
-  return res;
-}
-
-
-/**
- * Extracts the test filename from an absolute file name and removes
- * the extension
- *
- * @param file absolute file name
- * @return the result
- */
-char *
-GNUNET_TRANSPORT_TESTING_get_test_name (const char *file)
-{
-  char *backup = extract_filename (file);
-  char *filename = backup;
-  char *dotexe;
-  char *ret;
-
-  if (NULL == filename)
-    return NULL;
-
-  /* remove "lt-" */
-  filename = strstr (filename, "test");
-  if (NULL == filename)
-  {
-    GNUNET_free (backup);
-    return NULL;
-  }
-
-  /* remove ".exe" */
-  if (NULL != (dotexe = strstr (filename, ".exe")))
-    dotexe[0] = '\0';
-  ret = GNUNET_strdup (filename);
-  GNUNET_free (backup);
-  return ret;
-}
-
-
-/**
- * Extracts the filename from an absolute file name and removes the extension
- *
- * @param file absolute file name
- * @return the result
- */
-char *
-GNUNET_TRANSPORT_TESTING_get_test_source_name (const char *file)
-{
-  char *src = extract_filename (file);
-  char *split;
-
-  split = strstr (src, ".");
-  if (NULL != split)
-    split[0] = '\0';
-  return src;
-}
-
-
-/**
- * Extracts the plugin name from an absolute file name and the test name
- *
- * @param file absolute file name
- * @param test test name
- * @return the result
- */
-char *
-GNUNET_TRANSPORT_TESTING_get_test_plugin_name (const char *file,
-                                               const char *test)
-{
-  char *filename;
-  char *dotexe;
-  char *e = extract_filename (file);
-  char *t = extract_filename (test);
-  char *ret;
-
-  if (NULL == e)
-    goto fail;
-  /* remove "lt-" */
-  filename = strstr (e, "tes");
-  if (NULL == filename)
-    goto fail;
-  /* remove ".exe" */
-  if (NULL != (dotexe = strstr (filename, ".exe")))
-    dotexe[0] = '\0';
-
-  /* find last _ */
-  filename = strstr (filename, t);
-  if (NULL == filename)
-    goto fail;
-  /* copy plugin */
-  filename += strlen (t);
-  if ('\0' != *filename)
-    filename++;
-  ret = GNUNET_strdup (filename);
-  goto suc;
-fail:
-  ret = NULL;
-suc:
-  GNUNET_free (t);
-  GNUNET_free (e);
-  return ret;
-}
-
-
-/**
- * This function takes the filename (e.g. argv[0), removes a "lt-"-prefix and
- * if existing ".exe"-prefix and adds the peer-number
- *
- * @param file filename of the test, e.g. argv[0]
- * @param count peer number
- * @return the result
- */
-char *
-GNUNET_TRANSPORT_TESTING_get_config_name (const char *file,
-                                          int count)
-{
-  char *filename = extract_filename (file);
-  char *backup = filename;
-  char *dotexe;
-  char *ret;
-
-  if (NULL == filename)
-    return NULL;
-  /* remove "lt-" */
-  filename = strstr (filename, "test");
-  if (NULL == filename)
-    goto fail;
-  /* remove ".exe" */
-  if (NULL != (dotexe = strstr (filename, ".exe")))
-    dotexe[0] = '\0';
-  GNUNET_asprintf (&ret,
-                   "%s_peer%u.conf",
-                   filename,
-                   count);
-  GNUNET_free (backup);
-  return ret;
-fail:
-  GNUNET_free (backup);
-  return NULL;
-}
-
-
-/* end of transport-testing-filenames.c */
diff --git a/src/transport/transport-testing-filenames2.c b/src/transport/transport-testing-filenames2.c
deleted file mode 100644
index 7d6fd529d..000000000
--- a/src/transport/transport-testing-filenames2.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2006, 2009, 2015, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport-testing-filenames.c
- * @brief convenience string manipulation functions for tests
- * @author Matthias Wachs
- * @author Christian Grothoff
- */
-#include "transport-testing2.h"
-
-
-/**
- * Removes all directory separators from absolute filename
- *
- * @param file the absolute file name, e.g. as found in argv[0]
- * @return extracted file name, has to be freed by caller
- */
-static char *
-extract_filename (const char *file)
-{
-  char *pch = GNUNET_strdup (file);
-  char *backup = pch;
-  char *filename = NULL;
-  char *res;
-
-  if (NULL != strstr (pch, "/"))
-  {
-    pch = strtok (pch, "/");
-    while (pch != NULL)
-    {
-      pch = strtok (NULL, "/");
-      if (pch != NULL)
-      {
-        filename = pch;
-      }
-    }
-  }
-  else
-    filename = pch;
-
-  res = GNUNET_strdup (filename);
-  GNUNET_free (backup);
-  return res;
-}
-
-
-/**
- * Extracts the test filename from an absolute file name and removes
- * the extension
- *
- * @param file absolute file name
- * @return the result
- */
-char *
-GNUNET_TRANSPORT_TESTING_get_test_name (const char *file)
-{
-  char *backup = extract_filename (file);
-  char *filename = backup;
-  char *dotexe;
-  char *ret;
-
-  if (NULL == filename)
-    return NULL;
-
-  /* remove "lt-" */
-  filename = strstr (filename, "test");
-  if (NULL == filename)
-  {
-    GNUNET_free (backup);
-    return NULL;
-  }
-
-  /* remove ".exe" */
-  if (NULL != (dotexe = strstr (filename, ".exe")))
-    dotexe[0] = '\0';
-  ret = GNUNET_strdup (filename);
-  GNUNET_free (backup);
-  return ret;
-}
-
-
-/**
- * Extracts the filename from an absolute file name and removes the extension
- *
- * @param file absolute file name
- * @return the result
- */
-char *
-GNUNET_TRANSPORT_TESTING_get_test_source_name (const char *file)
-{
-  char *src = extract_filename (file);
-  char *split;
-
-  split = strstr (src, ".");
-  if (NULL != split)
-    split[0] = '\0';
-  return src;
-}
-
-
-/**
- * Extracts the plugin name from an absolute file name and the test name
- *
- * @param file absolute file name
- * @param test test name
- * @return the result
- */
-char *
-GNUNET_TRANSPORT_TESTING_get_test_plugin_name (const char *file,
-                                               const char *test)
-{
-  char *filename;
-  char *dotexe;
-  char *e = extract_filename (file);
-  char *t = extract_filename (test);
-  char *ret;
-
-  if (NULL == e)
-    goto fail;
-  /* remove "lt-" */
-  filename = strstr (e, "tes");
-  if (NULL == filename)
-    goto fail;
-  /* remove ".exe" */
-  if (NULL != (dotexe = strstr (filename, ".exe")))
-    dotexe[0] = '\0';
-
-  /* find last _ */
-  filename = strstr (filename, t);
-  if (NULL == filename)
-    goto fail;
-  /* copy plugin */
-  filename += strlen (t);
-  if ('\0' != *filename)
-    filename++;
-  ret = GNUNET_strdup (filename);
-  goto suc;
-fail:
-  ret = NULL;
-suc:
-  GNUNET_free (t);
-  GNUNET_free (e);
-  return ret;
-}
-
-
-/**
- * This function takes the filename (e.g. argv[0), removes a "lt-"-prefix and
- * if existing ".exe"-prefix and adds the peer-number
- *
- * @param file filename of the test, e.g. argv[0]
- * @param count peer number
- * @return the result
- */
-char *
-GNUNET_TRANSPORT_TESTING_get_config_name (const char *file,
-                                          int count)
-{
-  char *filename = extract_filename (file);
-  char *backup = filename;
-  char *dotexe;
-  char *ret;
-
-  if (NULL == filename)
-    return NULL;
-  /* remove "lt-" */
-  filename = strstr (filename, "test");
-  if (NULL == filename)
-    goto fail;
-  /* remove ".exe" */
-  if (NULL != (dotexe = strstr (filename, ".exe")))
-    dotexe[0] = '\0';
-  GNUNET_asprintf (&ret,
-                   "%s_peer%u.conf",
-                   filename,
-                   count);
-  GNUNET_free (backup);
-  return ret;
-fail:
-  GNUNET_free (backup);
-  return NULL;
-}
-
-
-/* end of transport-testing-filenames.c */
diff --git a/src/transport/transport-testing-loggers.c b/src/transport/transport-testing-loggers.c
deleted file mode 100644
index 330a392c6..000000000
--- a/src/transport/transport-testing-loggers.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport-testing-loggers.c
- * @brief convenience functions for logging common events in tests
- * @author Christian Grothoff
- */
-#include "transport-testing.h"
-
-
-/**
- * Log a connect event.
- *
- * @param cls NULL
- * @param me peer that had the event
- * @param other peer that connected.
- */
-void
-GNUNET_TRANSPORT_TESTING_log_connect (void *cls,
-                                      struct
-                                      GNUNET_TRANSPORT_TESTING_PeerContext *me,
-                                      const struct GNUNET_PeerIdentity *other)
-{
-  char *ps;
-
-  ps = GNUNET_strdup (GNUNET_i2s (&me->id));
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Peer %s connected to %u (%s)!\n",
-              GNUNET_i2s (other),
-              me->no,
-              ps);
-  GNUNET_free (ps);
-}
-
-
-/**
- * Log a disconnect event.
- *
- * @param cls NULL
- * @param me peer that had the event
- * @param other peer that disconnected.
- */
-void
-GNUNET_TRANSPORT_TESTING_log_disconnect (void *cls,
-                                         struct
-                                         GNUNET_TRANSPORT_TESTING_PeerContext *
-                                         me,
-                                         const struct
-                                         GNUNET_PeerIdentity *other)
-{
-  char *ps;
-
-  ps = GNUNET_strdup (GNUNET_i2s (&me->id));
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Peer `%s' disconnected from %u (%s)!\n",
-              GNUNET_i2s (other),
-              me->no,
-              ps);
-  GNUNET_free (ps);
-}
-
-
-/* end of transport-testing-loggers.c */
diff --git a/src/transport/transport-testing-loggers2.c b/src/transport/transport-testing-loggers2.c
deleted file mode 100644
index ead4fa365..000000000
--- a/src/transport/transport-testing-loggers2.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport-testing-loggers.c
- * @brief convenience functions for logging common events in tests
- * @author Christian Grothoff
- */
-#include "transport-testing2.h"
-
-
-/**
- * Log a connect event.
- *
- * @param cls NULL
- * @param me peer that had the event
- * @param other peer that connected.
- */
-void
-GNUNET_TRANSPORT_TESTING_log_connect (void *cls,
-                                      struct
-                                      GNUNET_TRANSPORT_TESTING_PeerContext *me,
-                                      const struct GNUNET_PeerIdentity *other)
-{
-  char *ps;
-
-  ps = GNUNET_strdup (GNUNET_i2s (&me->id));
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Peer %s connected to %u (%s)!\n",
-              GNUNET_i2s (other),
-              me->no,
-              ps);
-  GNUNET_free (ps);
-}
-
-
-/**
- * Log a disconnect event.
- *
- * @param cls NULL
- * @param me peer that had the event
- * @param other peer that disconnected.
- */
-void
-GNUNET_TRANSPORT_TESTING_log_disconnect (void *cls,
-                                         struct
-                                         GNUNET_TRANSPORT_TESTING_PeerContext *
-                                         me,
-                                         const struct
-                                         GNUNET_PeerIdentity *other)
-{
-  char *ps;
-
-  ps = GNUNET_strdup (GNUNET_i2s (&me->id));
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Peer `%s' disconnected from %u (%s)!\n",
-              GNUNET_i2s (other),
-              me->no,
-              ps);
-  GNUNET_free (ps);
-}
-
-
-/* end of transport-testing-loggers.c */
diff --git a/src/transport/transport-testing-main.c b/src/transport/transport-testing-main.c
deleted file mode 100644
index 20c58eeee..000000000
--- a/src/transport/transport-testing-main.c
+++ /dev/null
@@ -1,613 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport-testing-main.c
- * @brief convenience main function for tests
- * @author Christian Grothoff
- */
-#include "transport-testing.h"
-
-
-/**
- * Closure for #connect_cb.
- */
-struct GNUNET_TRANSPORT_TESTING_ConnectRequestList
-{
-  /**
-   * Stored in a DLL.
-   */
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequestList *next;
-
-  /**
-   * Stored in a DLL.
-   */
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequestList *prev;
-
-  /**
-   * Overall context we are in.
-   */
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc;
-
-  /**
-   * Connect request this is about.
-   */
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cr;
-
-  /**
-   * Peer being connected.
-   */
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p1;
-
-  /**
-   * Peer being connected.
-   */
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p2;
-};
-
-
-/**
- * Shutdown function for the test. Stops all peers.
- *
- * @param cls our `struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *`
- */
-static void
-do_shutdown (void *cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc = cls;
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequestList *crl;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Testcase shutting down\n");
-  if (NULL != ccc->shutdown_task)
-    ccc->shutdown_task (ccc->shutdown_task_cls);
-  if (NULL != ccc->timeout_task)
-  {
-    GNUNET_SCHEDULER_cancel (ccc->timeout_task);
-    ccc->timeout_task = NULL;
-  }
-  if (NULL != ccc->connect_task)
-  {
-    GNUNET_SCHEDULER_cancel (ccc->connect_task);
-    ccc->connect_task = NULL;
-  }
-  while (NULL != (crl = ccc->crl_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (ccc->crl_head,
-                                 ccc->crl_tail,
-                                 crl);
-    GNUNET_TRANSPORT_TESTING_connect_peers_cancel (crl->cr);
-    GNUNET_free (crl);
-  }
-  for (unsigned int i = 0; i < ccc->num_peers; i++)
-  {
-    if (NULL != ccc->p[i])
-    {
-      GNUNET_TRANSPORT_TESTING_stop_peer (ccc->p[i]);
-      ccc->p[i] = NULL;
-    }
-  }
-}
-
-
-/**
- * Testcase hit timeout, shut it down with error.
- *
- * @param cls our `struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *`
- */
-static void
-do_timeout (void *cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc = cls;
-
-  ccc->timeout_task = NULL;
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-              "Testcase timed out\n");
-  ccc->global_ret = GNUNET_SYSERR;
-  GNUNET_SCHEDULER_shutdown ();
-}
-
-
-/**
- * Internal data structure.   Closure for
- * #connect_cb, #disconnect_cb, #my_nc and #start_cb.
- * Allows us to identify which peer this is about.
- */
-struct GNUNET_TRANSPORT_TESTING_InternalPeerContext
-{
-  /**
-   * Overall context of the callback.
-   */
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc;
-
-  /**
-   * Offset of the peer this is about.
-   */
-  unsigned int off;
-};
-
-
-/**
- * Information tracked per connected peer.
- */
-struct ConnectPairInfo
-{
-  /**
-   * Peer this is about.
-   */
-  const struct GNUNET_PeerIdentity *sender;
-
-  /**
-   * Information about the receiving peer.
-   */
-  struct GNUNET_TRANSPORT_TESTING_InternalPeerContext *ipi;
-};
-
-
-/**
- * Function called when we connected two peers.  Once we have gotten
- * to the clique, launch test-specific logic.
- *
- * @param cls our `struct GNUNET_TRANSPORT_TESTING_ConnectRequestList *`
- */
-static void
-connect_cb (void *cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequestList *crl = cls;
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc = crl->ccc;
-
-  GNUNET_CONTAINER_DLL_remove (ccc->crl_head,
-                               ccc->crl_tail,
-                               crl);
-  {
-    char *p1_c = GNUNET_strdup (GNUNET_i2s (&crl->p1->id));
-
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Peers connected: %u (%s) <-> %u (%s)\n",
-                crl->p1->no,
-                p1_c,
-                crl->p2->no,
-                GNUNET_i2s (&crl->p2->id));
-    GNUNET_free (p1_c);
-    GNUNET_free (crl);
-  }
-  if (NULL == ccc->crl_head)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "All connections UP, launching custom test logic.\n");
-    GNUNET_SCHEDULER_add_now (ccc->connect_continuation,
-                              ccc->connect_continuation_cls);
-  }
-}
-
-
-/**
- * Find peer by peer ID.
- *
- * @param ccc context to search
- * @param peer peer to look for
- * @return NULL if @a peer was not found
- */
-struct GNUNET_TRANSPORT_TESTING_PeerContext *
-GNUNET_TRANSPORT_TESTING_find_peer (struct
-                                    GNUNET_TRANSPORT_TESTING_ConnectCheckContext
-                                    *ccc,
-                                    const struct GNUNET_PeerIdentity *peer)
-{
-  for (unsigned int i = 0; i < ccc->num_peers; i++)
-    if ((NULL != ccc->p[i]) &&
-        (0 == memcmp (peer,
-                      &ccc->p[i]->id,
-                      sizeof(*peer))))
-      return ccc->p[i];
-  return NULL;
-}
-
-
-/**
- * Wrapper around peers connecting.  Calls client's nc function.
- *
- * @param cls our `struct GNUNET_TRANSPORT_TESTING_InternalPeerContext *`
- * @param peer peer we got connected to
- * @param mq message queue for transmissions to @a peer
- * @return closure for message handlers
- */
-static void *
-my_nc (void *cls,
-       const struct GNUNET_PeerIdentity *peer,
-       struct GNUNET_MQ_Handle *mq)
-{
-  struct GNUNET_TRANSPORT_TESTING_InternalPeerContext *ipi = cls;
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc = ipi->ccc;
-  struct ConnectPairInfo *cpi;
-
-  if (NULL != ccc->nc)
-    ccc->nc (ccc->cls,
-             ccc->p[ipi->off],
-             peer);
-  cpi = GNUNET_new (struct ConnectPairInfo);
-  cpi->ipi = ipi;
-  cpi->sender = peer; /* valid until disconnect */
-  return cpi;
-}
-
-
-/**
- * Wrapper around peers disconnecting.  Calls client's nd function.
- *
- * @param cls our `struct GNUNET_TRANSPORT_TESTING_InternalPeerContext *`
- * @param peer peer we got disconnected from
- * @param custom_cls return value from @my_nc
- */
-static void
-my_nd (void *cls,
-       const struct GNUNET_PeerIdentity *peer,
-       void *custom_cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_InternalPeerContext *ipi = cls;
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc = ipi->ccc;
-  struct ConnectPairInfo *cpi = custom_cls;
-
-  if (NULL != ccc->nd)
-    ccc->nd (ccc->cls,
-             ccc->p[ipi->off],
-             peer);
-  GNUNET_free (cpi);
-}
-
-
-/**
- * Wrapper around receiving data.  Calls client's rec function.
- *
- * @param cls our `struct ConnectPairInfo *`
- * @param message message we received
- * @return #GNUNET_OK (all messages are fine)
- */
-static int
-check_test (void *cls,
-            const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
-  return GNUNET_OK;
-}
-
-
-/**
- * Wrapper around receiving data.  Calls client's rec function.
- *
- * @param cls our `struct ConnectPairInfo *`
- * @param message message we received
- */
-static void
-handle_test (void *cls,
-             const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
-  struct ConnectPairInfo *cpi = cls;
-  struct GNUNET_TRANSPORT_TESTING_InternalPeerContext *ipi = cpi->ipi;
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc = ipi->ccc;
-
-  if (NULL != ccc->rec)
-    ccc->rec (ccc->cls,
-              ccc->p[ipi->off],
-              cpi->sender,
-              message);
-}
-
-
-/**
- * Wrapper around receiving data.  Calls client's rec function.
- *
- * @param cls our `struct ConnectPairInfo *`
- * @param message message we received
- * @return #GNUNET_OK (all messages are fine)
- */
-static int
-check_test2 (void *cls,
-             const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
-  return GNUNET_OK;
-}
-
-
-/**
- * Wrapper around receiving data.  Calls client's rec function.
- *
- * @param cls our `struct ConnectPairInfo *`
- * @param message message we received
- */
-static void
-handle_test2 (void *cls,
-              const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
-  struct ConnectPairInfo *cpi = cls;
-  struct GNUNET_TRANSPORT_TESTING_InternalPeerContext *ipi = cpi->ipi;
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc = ipi->ccc;
-
-  if (NULL != ccc->rec)
-    ccc->rec (ccc->cls,
-              ccc->p[ipi->off],
-              cpi->sender,
-              message);
-}
-
-
-/**
- * Connect the peers as a clique.
- *
- * @param cls our `struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext`
- */
-static void
-do_connect (void *cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc = cls;
-
-  ccc->connect_task = NULL;
-  for (unsigned int i = 0; i < ccc->num_peers; i++)
-    for (unsigned int j = (ccc->bi_directional ? 0 : i + 1); j < ccc->num_peers;
-         j++)
-    {
-      struct GNUNET_TRANSPORT_TESTING_ConnectRequestList *crl;
-
-      if (i == j)
-        continue;
-      crl = GNUNET_new (struct GNUNET_TRANSPORT_TESTING_ConnectRequestList);
-      GNUNET_CONTAINER_DLL_insert (ccc->crl_head,
-                                   ccc->crl_tail,
-                                   crl);
-      crl->ccc = ccc;
-      crl->p1 = ccc->p[i];
-      crl->p2 = ccc->p[j];
-      {
-        char *sender_c = GNUNET_strdup (GNUNET_i2s (&ccc->p[0]->id));
-
-        GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                    "Test tries to connect peer %u (`%s') -> peer %u (`%s')\n",
-                    ccc->p[0]->no,
-                    sender_c,
-                    ccc->p[1]->no,
-                    GNUNET_i2s (&ccc->p[1]->id));
-        GNUNET_free (sender_c);
-      }
-      crl->cr = GNUNET_TRANSPORT_TESTING_connect_peers (ccc->p[i],
-                                                        ccc->p[j],
-                                                        &connect_cb,
-                                                        crl);
-    }
-}
-
-
-/**
- * Function called once we have successfully launched a peer.
- * Once all peers have been launched, we connect all of them
- * in a clique.
- *
- * @param cls our `struct GNUNET_TRANSPORT_TESTING_InternalPeerContext *`
- */
-static void
-start_cb (void *cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_InternalPeerContext *ipi = cls;
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc = ipi->ccc;
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p = ccc->p[ipi->off];
-
-  ccc->started++;
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Peer %u (`%s') started\n",
-              p->no,
-              GNUNET_i2s (&p->id));
-  if (ccc->started != ccc->num_peers)
-    return;
-  if (NULL != ccc->pre_connect_task)
-  {
-    /* Run the custom per-connect job, then give it a second to
-       go into effect before we continue connecting peers. */
-    ccc->pre_connect_task (ccc->pre_connect_task_cls);
-    ccc->connect_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                                      &do_connect,
-                                                      ccc);
-  }
-  else
-  {
-    do_connect (ccc);
-  }
-}
-
-
-/**
- * Function run from #GNUNET_TRANSPORT_TESTING_connect_check
- * once the scheduler is up.  Should launch the peers and
- * then in the continuations try to connect them.
- *
- * @param cls our `struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *`
- * @param args ignored
- * @param cfgfile ignored
- * @param cfg configuration
- */
-static void
-connect_check_run (void *cls,
-                   char *const *args,
-                   const char *cfgfile,
-                   const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc = cls;
-  int ok;
-
-  ccc->cfg = cfg;
-  ccc->timeout_task = GNUNET_SCHEDULER_add_delayed (ccc->timeout,
-                                                    &do_timeout,
-                                                    ccc);
-  GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
-                                 ccc);
-  ok = GNUNET_OK;
-  for (unsigned int i = 0; i < ccc->num_peers; i++)
-  {
-    struct GNUNET_MQ_MessageHandler handlers[] = {
-      GNUNET_MQ_hd_var_size (test,
-                             GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE,
-                             struct GNUNET_TRANSPORT_TESTING_TestMessage,
-                             NULL),
-      GNUNET_MQ_hd_var_size (test2,
-                             GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE2,
-                             struct GNUNET_TRANSPORT_TESTING_TestMessage,
-                             NULL),
-      GNUNET_MQ_handler_end ()
-    };
-    ccc->p[i] = GNUNET_TRANSPORT_TESTING_start_peer (ccc->tth,
-                                                     ccc->cfg_files[i],
-                                                     i + 1,
-                                                     handlers,
-                                                     &my_nc,
-                                                     &my_nd,
-                                                     &ccc->ip[i],
-                                                     &start_cb,
-                                                     &ccc->ip[i]);
-    if (NULL == ccc->p[i])
-      ok = GNUNET_SYSERR;
-  }
-  if (GNUNET_OK != ok)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Fail! Could not start peers!\n");
-    GNUNET_SCHEDULER_shutdown ();
-  }
-}
-
-
-/**
- * Common implementation of the #GNUNET_TRANSPORT_TESTING_CheckCallback.
- * Starts and connects the two peers, then invokes the
- * `connect_continuation` from @a cls.  Sets up a timeout to
- * abort the test, and a shutdown handler to clean up properly
- * on exit.
- *
- * @param cls closure of type `struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext`
- * @param tth_ initialized testing handle
- * @param test_plugin_ name of the plugin
- * @param test_name_ name of the test
- * @param num_peers number of entries in the @a cfg_file array
- * @param cfg_files array of names of configuration files for the peers
- * @return #GNUNET_SYSERR on error
- */
-int
-GNUNET_TRANSPORT_TESTING_connect_check (void *cls,
-                                        struct GNUNET_TRANSPORT_TESTING_Handle *
-                                        tth_,
-                                        const char *test_plugin_,
-                                        const char *test_name_,
-                                        unsigned int num_peers,
-                                        char *cfg_files[])
-{
-  static struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc = cls;
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p[num_peers];
-  struct GNUNET_TRANSPORT_TESTING_InternalPeerContext ip[num_peers];
-  char *argv[] = {
-    (char *) test_name_,
-    "-c",
-    (char *) ccc->config_file,
-    NULL
-  };
-
-  ccc->num_peers = num_peers;
-  ccc->cfg_files = cfg_files;
-  ccc->test_plugin = test_plugin_;
-  ccc->test_name = test_name_;
-  ccc->tth = tth_;
-  ccc->global_ret = GNUNET_OK;
-  ccc->p = p;
-  ccc->ip = ip;
-  for (unsigned int i = 0; i < num_peers; i++)
-  {
-    ip[i].off = i;
-    ip[i].ccc = ccc;
-  }
-  if (GNUNET_OK !=
-      GNUNET_PROGRAM_run ((sizeof(argv) / sizeof(char *)) - 1,
-                          argv,
-                          test_name_,
-                          "nohelp",
-                          options,
-                          &connect_check_run,
-                          ccc))
-    return GNUNET_SYSERR;
-  return ccc->global_ret;
-}
-
-
-/**
- * Setup testcase.  Calls @a check with the data the test needs.
- *
- * @param argv0 binary name (argv[0])
- * @param filename source file name (__FILE__)
- * @param num_peers number of peers to start
- * @param check main function to run
- * @param check_cls closure for @a check
- * @return #GNUNET_OK on success
- */
-int
-GNUNET_TRANSPORT_TESTING_main_ (const char *argv0,
-                                const char *filename,
-                                unsigned int num_peers,
-                                GNUNET_TRANSPORT_TESTING_CheckCallback check,
-                                void *check_cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_Handle *tth;
-  char *test_name;
-  char *test_source;
-  char *test_plugin;
-  char *cfg_names[num_peers];
-  int ret;
-
-  ret = GNUNET_OK;
-  test_name = GNUNET_TRANSPORT_TESTING_get_test_name (argv0);
-  GNUNET_log_setup (test_name,
-                    "WARNING",
-                    NULL);
-  test_source = GNUNET_TRANSPORT_TESTING_get_test_source_name (filename);
-  test_plugin = GNUNET_TRANSPORT_TESTING_get_test_plugin_name (argv0,
-                                                               test_source);
-  for (unsigned int i = 0; i < num_peers; i++)
-    cfg_names[i] = GNUNET_TRANSPORT_TESTING_get_config_name (argv0,
-                                                             i + 1);
-  tth = GNUNET_TRANSPORT_TESTING_init ();
-  if (NULL == tth)
-  {
-    ret = GNUNET_SYSERR;
-  }
-  else
-  {
-    ret = check (check_cls,
-                 tth,
-                 test_plugin,
-                 test_name,
-                 num_peers,
-                 cfg_names);
-    GNUNET_TRANSPORT_TESTING_done (tth);
-  }
-  for (unsigned int i = 0; i < num_peers; i++)
-    GNUNET_free (cfg_names[i]);
-  GNUNET_free (test_source);
-  GNUNET_free (test_plugin);
-  GNUNET_free (test_name);
-  return ret;
-}
-
-
-/* end of transport-testing-main.c */
diff --git a/src/transport/transport-testing-main2.c b/src/transport/transport-testing-main2.c
deleted file mode 100644
index 62aa3ceb7..000000000
--- a/src/transport/transport-testing-main2.c
+++ /dev/null
@@ -1,613 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport-testing-main.c
- * @brief convenience main function for tests
- * @author Christian Grothoff
- */
-#include "transport-testing2.h"
-
-
-/**
- * Closure for #connect_cb.
- */
-struct GNUNET_TRANSPORT_TESTING_ConnectRequestList
-{
-  /**
-   * Stored in a DLL.
-   */
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequestList *next;
-
-  /**
-   * Stored in a DLL.
-   */
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequestList *prev;
-
-  /**
-   * Overall context we are in.
-   */
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc;
-
-  /**
-   * Connect request this is about.
-   */
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cr;
-
-  /**
-   * Peer being connected.
-   */
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p1;
-
-  /**
-   * Peer being connected.
-   */
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p2;
-};
-
-
-/**
- * Shutdown function for the test. Stops all peers.
- *
- * @param cls our `struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *`
- */
-static void
-do_shutdown (void *cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc = cls;
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequestList *crl;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Testcase shutting down\n");
-  if (NULL != ccc->shutdown_task)
-    ccc->shutdown_task (ccc->shutdown_task_cls);
-  if (NULL != ccc->timeout_task)
-  {
-    GNUNET_SCHEDULER_cancel (ccc->timeout_task);
-    ccc->timeout_task = NULL;
-  }
-  if (NULL != ccc->connect_task)
-  {
-    GNUNET_SCHEDULER_cancel (ccc->connect_task);
-    ccc->connect_task = NULL;
-  }
-  while (NULL != (crl = ccc->crl_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (ccc->crl_head,
-                                 ccc->crl_tail,
-                                 crl);
-    GNUNET_TRANSPORT_TESTING_connect_peers_cancel (crl->cr);
-    GNUNET_free (crl);
-  }
-  for (unsigned int i = 0; i < ccc->num_peers; i++)
-  {
-    if (NULL != ccc->p[i])
-    {
-      GNUNET_TRANSPORT_TESTING_stop_peer (ccc->p[i]);
-      ccc->p[i] = NULL;
-    }
-  }
-}
-
-
-/**
- * Testcase hit timeout, shut it down with error.
- *
- * @param cls our `struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *`
- */
-static void
-do_timeout (void *cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc = cls;
-
-  ccc->timeout_task = NULL;
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-              "Testcase timed out\n");
-  ccc->global_ret = GNUNET_SYSERR;
-  GNUNET_SCHEDULER_shutdown ();
-}
-
-
-/**
- * Internal data structure.   Closure for
- * #connect_cb, #disconnect_cb, #my_nc and #start_cb.
- * Allows us to identify which peer this is about.
- */
-struct GNUNET_TRANSPORT_TESTING_InternalPeerContext
-{
-  /**
-   * Overall context of the callback.
-   */
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc;
-
-  /**
-   * Offset of the peer this is about.
-   */
-  unsigned int off;
-};
-
-
-/**
- * Information tracked per connected peer.
- */
-struct ConnectPairInfo
-{
-  /**
-   * Peer this is about.
-   */
-  const struct GNUNET_PeerIdentity *sender;
-
-  /**
-   * Information about the receiving peer.
-   */
-  struct GNUNET_TRANSPORT_TESTING_InternalPeerContext *ipi;
-};
-
-
-/**
- * Function called when we connected two peers.  Once we have gotten
- * to the clique, launch test-specific logic.
- *
- * @param cls our `struct GNUNET_TRANSPORT_TESTING_ConnectRequestList *`
- */
-static void
-connect_cb (void *cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequestList *crl = cls;
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc = crl->ccc;
-
-  GNUNET_CONTAINER_DLL_remove (ccc->crl_head,
-                               ccc->crl_tail,
-                               crl);
-  {
-    char *p1_c = GNUNET_strdup (GNUNET_i2s (&crl->p1->id));
-
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Peers connected: %u (%s) <-> %u (%s)\n",
-                crl->p1->no,
-                p1_c,
-                crl->p2->no,
-                GNUNET_i2s (&crl->p2->id));
-    GNUNET_free (p1_c);
-    GNUNET_free (crl);
-  }
-  if (NULL == ccc->crl_head)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "All connections UP, launching custom test logic.\n");
-    GNUNET_SCHEDULER_add_now (ccc->connect_continuation,
-                              ccc->connect_continuation_cls);
-  }
-}
-
-
-/**
- * Find peer by peer ID.
- *
- * @param ccc context to search
- * @param peer peer to look for
- * @return NULL if @a peer was not found
- */
-struct GNUNET_TRANSPORT_TESTING_PeerContext *
-GNUNET_TRANSPORT_TESTING_find_peer (struct
-                                    GNUNET_TRANSPORT_TESTING_ConnectCheckContext
-                                    *ccc,
-                                    const struct GNUNET_PeerIdentity *peer)
-{
-  for (unsigned int i = 0; i < ccc->num_peers; i++)
-    if ((NULL != ccc->p[i]) &&
-        (0 == memcmp (peer,
-                      &ccc->p[i]->id,
-                      sizeof(*peer))))
-      return ccc->p[i];
-  return NULL;
-}
-
-
-/**
- * Wrapper around peers connecting.  Calls client's nc function.
- *
- * @param cls our `struct GNUNET_TRANSPORT_TESTING_InternalPeerContext *`
- * @param peer peer we got connected to
- * @param mq message queue for transmissions to @a peer
- * @return closure for message handlers
- */
-static void *
-my_nc (void *cls,
-       const struct GNUNET_PeerIdentity *peer,
-       struct GNUNET_MQ_Handle *mq)
-{
-  struct GNUNET_TRANSPORT_TESTING_InternalPeerContext *ipi = cls;
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc = ipi->ccc;
-  struct ConnectPairInfo *cpi;
-
-  if (NULL != ccc->nc)
-    ccc->nc (ccc->cls,
-             ccc->p[ipi->off],
-             peer);
-  cpi = GNUNET_new (struct ConnectPairInfo);
-  cpi->ipi = ipi;
-  cpi->sender = peer; /* valid until disconnect */
-  return cpi;
-}
-
-
-/**
- * Wrapper around peers disconnecting.  Calls client's nd function.
- *
- * @param cls our `struct GNUNET_TRANSPORT_TESTING_InternalPeerContext *`
- * @param peer peer we got disconnected from
- * @param custom_cls return value from @my_nc
- */
-static void
-my_nd (void *cls,
-       const struct GNUNET_PeerIdentity *peer,
-       void *custom_cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_InternalPeerContext *ipi = cls;
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc = ipi->ccc;
-  struct ConnectPairInfo *cpi = custom_cls;
-
-  if (NULL != ccc->nd)
-    ccc->nd (ccc->cls,
-             ccc->p[ipi->off],
-             peer);
-  GNUNET_free (cpi);
-}
-
-
-/**
- * Wrapper around receiving data.  Calls client's rec function.
- *
- * @param cls our `struct ConnectPairInfo *`
- * @param message message we received
- * @return #GNUNET_OK (all messages are fine)
- */
-static int
-check_test (void *cls,
-            const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
-  return GNUNET_OK;
-}
-
-
-/**
- * Wrapper around receiving data.  Calls client's rec function.
- *
- * @param cls our `struct ConnectPairInfo *`
- * @param message message we received
- */
-static void
-handle_test (void *cls,
-             const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
-  struct ConnectPairInfo *cpi = cls;
-  struct GNUNET_TRANSPORT_TESTING_InternalPeerContext *ipi = cpi->ipi;
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc = ipi->ccc;
-
-  if (NULL != ccc->rec)
-    ccc->rec (ccc->cls,
-              ccc->p[ipi->off],
-              cpi->sender,
-              message);
-}
-
-
-/**
- * Wrapper around receiving data.  Calls client's rec function.
- *
- * @param cls our `struct ConnectPairInfo *`
- * @param message message we received
- * @return #GNUNET_OK (all messages are fine)
- */
-static int
-check_test2 (void *cls,
-             const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
-  return GNUNET_OK;
-}
-
-
-/**
- * Wrapper around receiving data.  Calls client's rec function.
- *
- * @param cls our `struct ConnectPairInfo *`
- * @param message message we received
- */
-static void
-handle_test2 (void *cls,
-              const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
-  struct ConnectPairInfo *cpi = cls;
-  struct GNUNET_TRANSPORT_TESTING_InternalPeerContext *ipi = cpi->ipi;
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc = ipi->ccc;
-
-  if (NULL != ccc->rec)
-    ccc->rec (ccc->cls,
-              ccc->p[ipi->off],
-              cpi->sender,
-              message);
-}
-
-
-/**
- * Connect the peers as a clique.
- *
- * @param cls our `struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext`
- */
-static void
-do_connect (void *cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc = cls;
-
-  ccc->connect_task = NULL;
-  for (unsigned int i = 0; i < ccc->num_peers; i++)
-    for (unsigned int j = (ccc->bi_directional ? 0 : i + 1); j < ccc->num_peers;
-         j++)
-    {
-      struct GNUNET_TRANSPORT_TESTING_ConnectRequestList *crl;
-
-      if (i == j)
-        continue;
-      crl = GNUNET_new (struct GNUNET_TRANSPORT_TESTING_ConnectRequestList);
-      GNUNET_CONTAINER_DLL_insert (ccc->crl_head,
-                                   ccc->crl_tail,
-                                   crl);
-      crl->ccc = ccc;
-      crl->p1 = ccc->p[i];
-      crl->p2 = ccc->p[j];
-      {
-        char *sender_c = GNUNET_strdup (GNUNET_i2s (&ccc->p[0]->id));
-
-        GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                    "Test tries to connect peer %u (`%s') -> peer %u (`%s')\n",
-                    ccc->p[0]->no,
-                    sender_c,
-                    ccc->p[1]->no,
-                    GNUNET_i2s (&ccc->p[1]->id));
-        GNUNET_free (sender_c);
-      }
-      crl->cr = GNUNET_TRANSPORT_TESTING_connect_peers (ccc->p[i],
-                                                        ccc->p[j],
-                                                        &connect_cb,
-                                                        crl);
-    }
-}
-
-
-/**
- * Function called once we have successfully launched a peer.
- * Once all peers have been launched, we connect all of them
- * in a clique.
- *
- * @param cls our `struct GNUNET_TRANSPORT_TESTING_InternalPeerContext *`
- */
-static void
-start_cb (void *cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_InternalPeerContext *ipi = cls;
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc = ipi->ccc;
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p = ccc->p[ipi->off];
-
-  ccc->started++;
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Peer %u (`%s') started\n",
-              p->no,
-              GNUNET_i2s (&p->id));
-  if (ccc->started != ccc->num_peers)
-    return;
-  if (NULL != ccc->pre_connect_task)
-  {
-    /* Run the custom per-connect job, then give it a second to
-       go into effect before we continue connecting peers. */
-    ccc->pre_connect_task (ccc->pre_connect_task_cls);
-    ccc->connect_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                                      &do_connect,
-                                                      ccc);
-  }
-  else
-  {
-    do_connect (ccc);
-  }
-}
-
-
-/**
- * Function run from #GNUNET_TRANSPORT_TESTING_connect_check
- * once the scheduler is up.  Should launch the peers and
- * then in the continuations try to connect them.
- *
- * @param cls our `struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *`
- * @param args ignored
- * @param cfgfile ignored
- * @param cfg configuration
- */
-static void
-connect_check_run (void *cls,
-                   char *const *args,
-                   const char *cfgfile,
-                   const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc = cls;
-  int ok;
-
-  ccc->cfg = cfg;
-  ccc->timeout_task = GNUNET_SCHEDULER_add_delayed (ccc->timeout,
-                                                    &do_timeout,
-                                                    ccc);
-  GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
-                                 ccc);
-  ok = GNUNET_OK;
-  for (unsigned int i = 0; i < ccc->num_peers; i++)
-  {
-    struct GNUNET_MQ_MessageHandler handlers[] = {
-      GNUNET_MQ_hd_var_size (test,
-                             GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE,
-                             struct GNUNET_TRANSPORT_TESTING_TestMessage,
-                             NULL),
-      GNUNET_MQ_hd_var_size (test2,
-                             GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE2,
-                             struct GNUNET_TRANSPORT_TESTING_TestMessage,
-                             NULL),
-      GNUNET_MQ_handler_end ()
-    };
-    ccc->p[i] = GNUNET_TRANSPORT_TESTING_start_peer (ccc->tth,
-                                                     ccc->cfg_files[i],
-                                                     i + 1,
-                                                     handlers,
-                                                     &my_nc,
-                                                     &my_nd,
-                                                     &ccc->ip[i],
-                                                     &start_cb,
-                                                     &ccc->ip[i]);
-    if (NULL == ccc->p[i])
-      ok = GNUNET_SYSERR;
-  }
-  if (GNUNET_OK != ok)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Fail! Could not start peers!\n");
-    GNUNET_SCHEDULER_shutdown ();
-  }
-}
-
-
-/**
- * Common implementation of the #GNUNET_TRANSPORT_TESTING_CheckCallback.
- * Starts and connects the two peers, then invokes the
- * `connect_continuation` from @a cls.  Sets up a timeout to
- * abort the test, and a shutdown handler to clean up properly
- * on exit.
- *
- * @param cls closure of type `struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext`
- * @param tth_ initialized testing handle
- * @param test_plugin_ name of the plugin
- * @param test_name_ name of the test
- * @param num_peers number of entries in the @a cfg_file array
- * @param cfg_files array of names of configuration files for the peers
- * @return #GNUNET_SYSERR on error
- */
-int
-GNUNET_TRANSPORT_TESTING_connect_check (void *cls,
-                                        struct GNUNET_TRANSPORT_TESTING_Handle *
-                                        tth_,
-                                        const char *test_plugin_,
-                                        const char *test_name_,
-                                        unsigned int num_peers,
-                                        char *cfg_files[])
-{
-  static struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc = cls;
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p[num_peers];
-  struct GNUNET_TRANSPORT_TESTING_InternalPeerContext ip[num_peers];
-  char *argv[] = {
-    (char *) test_name_,
-    "-c",
-    (char *) ccc->config_file,
-    NULL
-  };
-
-  ccc->num_peers = num_peers;
-  ccc->cfg_files = cfg_files;
-  ccc->test_plugin = test_plugin_;
-  ccc->test_name = test_name_;
-  ccc->tth = tth_;
-  ccc->global_ret = GNUNET_OK;
-  ccc->p = p;
-  ccc->ip = ip;
-  for (unsigned int i = 0; i < num_peers; i++)
-  {
-    ip[i].off = i;
-    ip[i].ccc = ccc;
-  }
-  if (GNUNET_OK !=
-      GNUNET_PROGRAM_run ((sizeof(argv) / sizeof(char *)) - 1,
-                          argv,
-                          test_name_,
-                          "nohelp",
-                          options,
-                          &connect_check_run,
-                          ccc))
-    return GNUNET_SYSERR;
-  return ccc->global_ret;
-}
-
-
-/**
- * Setup testcase.  Calls @a check with the data the test needs.
- *
- * @param argv0 binary name (argv[0])
- * @param filename source file name (__FILE__)
- * @param num_peers number of peers to start
- * @param check main function to run
- * @param check_cls closure for @a check
- * @return #GNUNET_OK on success
- */
-int
-GNUNET_TRANSPORT_TESTING_main_ (const char *argv0,
-                                const char *filename,
-                                unsigned int num_peers,
-                                GNUNET_TRANSPORT_TESTING_CheckCallback check,
-                                void *check_cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_Handle *tth;
-  char *test_name;
-  char *test_source;
-  char *test_plugin;
-  char *cfg_names[num_peers];
-  int ret;
-
-  ret = GNUNET_OK;
-  test_name = GNUNET_TRANSPORT_TESTING_get_test_name (argv0);
-  GNUNET_log_setup (test_name,
-                    "WARNING",
-                    NULL);
-  test_source = GNUNET_TRANSPORT_TESTING_get_test_source_name (filename);
-  test_plugin = GNUNET_TRANSPORT_TESTING_get_test_plugin_name (argv0,
-                                                               test_source);
-  for (unsigned int i = 0; i < num_peers; i++)
-    cfg_names[i] = GNUNET_TRANSPORT_TESTING_get_config_name (argv0,
-                                                             i + 1);
-  tth = GNUNET_TRANSPORT_TESTING_init ();
-  if (NULL == tth)
-  {
-    ret = GNUNET_SYSERR;
-  }
-  else
-  {
-    ret = check (check_cls,
-                 tth,
-                 test_plugin,
-                 test_name,
-                 num_peers,
-                 cfg_names);
-    GNUNET_TRANSPORT_TESTING_done (tth);
-  }
-  for (unsigned int i = 0; i < num_peers; i++)
-    GNUNET_free (cfg_names[i]);
-  GNUNET_free (test_source);
-  GNUNET_free (test_plugin);
-  GNUNET_free (test_name);
-  return ret;
-}
-
-
-/* end of transport-testing-main.c */
diff --git a/src/transport/transport-testing-send.c b/src/transport/transport-testing-send.c
deleted file mode 100644
index 38018c172..000000000
--- a/src/transport/transport-testing-send.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport-testing-send.c
- * @brief convenience transmission function for tests
- * @author Christian Grothoff
- */
-#include "transport-testing.h"
-
-/**
- * Acceptable transmission delay.
- */
-#define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply ( \
-    GNUNET_TIME_UNIT_SECONDS, 30)
-
-
-/**
- * Return @a cx in @a cls.
- */
-static void
-find_cr (void *cls,
-         struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cx)
-{
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest **cr = cls;
-
-  if (GNUNET_NO == cx->connected)
-    return;
-  *cr = cx;
-}
-
-
-/**
- * Send a test message of type @a mtype and size @a msize from
- * peer @a sender to peer @a receiver.  The peers should be
- * connected when this function is called.
- *
- * @param sender the sending peer
- * @param receiver the receiving peer
- * @param mtype message type to use
- * @param msize size of the message, at least `sizeof (struct GNUNET_TRANSPORT_TESTING_TestMessage)`
- * @param num unique message number
- * @param cont continuation to call after transmission
- * @param cont_cls closure for @a cont
- * @return #GNUNET_OK if message was queued,
- *         #GNUNET_NO if peers are not connected
- *         #GNUNET_SYSERR if @a msize is illegal
- */
-int
-GNUNET_TRANSPORT_TESTING_send (struct
-                               GNUNET_TRANSPORT_TESTING_PeerContext *sender,
-                               struct GNUNET_TRANSPORT_TESTING_PeerContext *
-                               receiver,
-                               uint16_t mtype,
-                               uint16_t msize,
-                               uint32_t num,
-                               GNUNET_SCHEDULER_TaskCallback cont,
-                               void *cont_cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cr;
-  struct GNUNET_MQ_Envelope *env;
-  struct GNUNET_TRANSPORT_TESTING_TestMessage *test;
-
-  if (msize < sizeof(struct GNUNET_TRANSPORT_TESTING_TestMessage))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  cr = NULL;
-  GNUNET_TRANSPORT_TESTING_find_connecting_context (sender,
-                                                    receiver,
-                                                    &find_cr,
-                                                    &cr);
-  if (NULL == cr)
-    GNUNET_TRANSPORT_TESTING_find_connecting_context (receiver,
-                                                      sender,
-                                                      &find_cr,
-                                                      &cr);
-  if (NULL == cr)
-  {
-    GNUNET_break (0);
-    return GNUNET_NO;
-  }
-  if (NULL == cr->mq)
-  {
-    GNUNET_break (0);
-    return GNUNET_NO;
-  }
-  {
-    char *receiver_s = GNUNET_strdup (GNUNET_i2s (&receiver->id));
-
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Sending message from peer %u (`%s') -> peer %u (`%s') !\n",
-                sender->no,
-                GNUNET_i2s (&sender->id),
-                receiver->no,
-                receiver_s);
-    GNUNET_free (receiver_s);
-  }
-  env = GNUNET_MQ_msg_extra (test,
-                             msize - sizeof(*test),
-                             mtype);
-  test->num = htonl (num);
-  memset (&test[1],
-          num,
-          msize - sizeof(*test));
-  GNUNET_MQ_notify_sent (env,
-                         cont,
-                         cont_cls);
-  GNUNET_MQ_send (cr->mq,
-                  env);
-  return GNUNET_OK;
-}
-
-
-/**
- * Task that sends a test message from the
- * first peer to the second peer.
- *
- * @param ccc context which should contain at least two peers, the
- *        first two of which should be currently connected
- * @param size desired message size
- * @param cont continuation to call after transmission
- * @param cont_cls closure for @a cont
- */
-static void
-do_send (struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc,
-         uint16_t size,
-         GNUNET_SCHEDULER_TaskCallback cont,
-         void *cont_cls)
-{
-  int ret;
-
-  ccc->global_ret = GNUNET_SYSERR;
-  ret = GNUNET_TRANSPORT_TESTING_send (ccc->p[0],
-                                       ccc->p[1],
-                                       GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE,
-                                       size,
-                                       ccc->send_num_gen++,
-                                       cont,
-                                       cont_cls);
-  GNUNET_assert (GNUNET_SYSERR != ret);
-  if (GNUNET_NO == ret)
-  {
-    GNUNET_break (0);
-    ccc->global_ret = GNUNET_SYSERR;
-    GNUNET_SCHEDULER_shutdown ();
-  }
-}
-
-
-/**
- * Task that sends a minimalistic test message from the
- * first peer to the second peer.
- *
- * @param cls the `struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext`
- *        which should contain at least two peers, the first two
- *        of which should be currently connected
- */
-void
-GNUNET_TRANSPORT_TESTING_simple_send (void *cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_SendClosure *sc = cls;
-  int done;
-  size_t msize;
-
-  if (0 < sc->num_messages)
-  {
-    sc->num_messages--;
-    done = (0 == sc->num_messages);
-  }
-  else
-  {
-    done = 0;   /* infinite loop */
-  }
-  msize = sizeof(struct GNUNET_TRANSPORT_TESTING_TestMessage);
-  if (NULL != sc->get_size_cb)
-    msize = sc->get_size_cb (sc->num_messages);
-  /* if this was the last message, call the continuation,
-     otherwise call this function again */
-  do_send (sc->ccc,
-           msize,
-           done ? sc->cont : &GNUNET_TRANSPORT_TESTING_simple_send,
-           done ? sc->cont_cls : sc);
-}
-
-
-/**
- * Task that sends a large test message from the
- * first peer to the second peer.
- *
- * @param cls the `struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext`
- *        which should contain at least two peers, the first two
- *        of which should be currently connected
- */
-void
-GNUNET_TRANSPORT_TESTING_large_send (void *cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_SendClosure *sc = cls;
-  int done;
-  size_t msize;
-
-  if (0 < sc->num_messages)
-  {
-    sc->num_messages--;
-    done = (0 == sc->num_messages);
-  }
-  else
-  {
-    done = 0;   /* infinite loop */
-  }
-  msize = 2600;
-  if (NULL != sc->get_size_cb)
-    msize = sc->get_size_cb (sc->num_messages);
-  /* if this was the last message, call the continuation,
-     otherwise call this function again */
-  do_send (sc->ccc,
-           msize,
-           done ? sc->cont : &GNUNET_TRANSPORT_TESTING_large_send,
-           done ? sc->cont_cls : sc);
-}
-
-
-/* end of transport-testing-send.c */
diff --git a/src/transport/transport-testing-send2.c b/src/transport/transport-testing-send2.c
deleted file mode 100644
index bd2afb9b0..000000000
--- a/src/transport/transport-testing-send2.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport-testing-send.c
- * @brief convenience transmission function for tests
- * @author Christian Grothoff
- */
-#include "transport-testing2.h"
-
-/**
- * Acceptable transmission delay.
- */
-#define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply ( \
-    GNUNET_TIME_UNIT_SECONDS, 30)
-
-
-/**
- * Return @a cx in @a cls.
- */
-static void
-find_cr (void *cls,
-         struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cx)
-{
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest **cr = cls;
-
-  if (GNUNET_NO == cx->connected)
-    return;
-  *cr = cx;
-}
-
-
-/**
- * Send a test message of type @a mtype and size @a msize from
- * peer @a sender to peer @a receiver.  The peers should be
- * connected when this function is called.
- *
- * @param sender the sending peer
- * @param receiver the receiving peer
- * @param mtype message type to use
- * @param msize size of the message, at least `sizeof (struct GNUNET_TRANSPORT_TESTING_TestMessage)`
- * @param num unique message number
- * @param cont continuation to call after transmission
- * @param cont_cls closure for @a cont
- * @return #GNUNET_OK if message was queued,
- *         #GNUNET_NO if peers are not connected
- *         #GNUNET_SYSERR if @a msize is illegal
- */
-int
-GNUNET_TRANSPORT_TESTING_send (struct
-                               GNUNET_TRANSPORT_TESTING_PeerContext *sender,
-                               struct GNUNET_TRANSPORT_TESTING_PeerContext *
-                               receiver,
-                               uint16_t mtype,
-                               uint16_t msize,
-                               uint32_t num,
-                               GNUNET_SCHEDULER_TaskCallback cont,
-                               void *cont_cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cr;
-  struct GNUNET_MQ_Envelope *env;
-  struct GNUNET_TRANSPORT_TESTING_TestMessage *test;
-
-  if (msize < sizeof(struct GNUNET_TRANSPORT_TESTING_TestMessage))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  cr = NULL;
-  GNUNET_TRANSPORT_TESTING_find_connecting_context (sender,
-                                                    receiver,
-                                                    &find_cr,
-                                                    &cr);
-  if (NULL == cr)
-    GNUNET_TRANSPORT_TESTING_find_connecting_context (receiver,
-                                                      sender,
-                                                      &find_cr,
-                                                      &cr);
-  if (NULL == cr)
-  {
-    GNUNET_break (0);
-    return GNUNET_NO;
-  }
-  if (NULL == cr->mq)
-  {
-    GNUNET_break (0);
-    return GNUNET_NO;
-  }
-  {
-    char *receiver_s = GNUNET_strdup (GNUNET_i2s (&receiver->id));
-
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Sending message from peer %u (`%s') -> peer %u (`%s') !\n",
-                sender->no,
-                GNUNET_i2s (&sender->id),
-                receiver->no,
-                receiver_s);
-    GNUNET_free (receiver_s);
-  }
-  env = GNUNET_MQ_msg_extra (test,
-                             msize - sizeof(*test),
-                             mtype);
-  test->num = htonl (num);
-  memset (&test[1],
-          num,
-          msize - sizeof(*test));
-  GNUNET_MQ_notify_sent (env,
-                         cont,
-                         cont_cls);
-  GNUNET_MQ_send (cr->mq,
-                  env);
-  return GNUNET_OK;
-}
-
-
-/**
- * Task that sends a test message from the
- * first peer to the second peer.
- *
- * @param ccc context which should contain at least two peers, the
- *        first two of which should be currently connected
- * @param size desired message size
- * @param cont continuation to call after transmission
- * @param cont_cls closure for @a cont
- */
-static void
-do_send (struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc,
-         uint16_t size,
-         GNUNET_SCHEDULER_TaskCallback cont,
-         void *cont_cls)
-{
-  int ret;
-
-  ccc->global_ret = GNUNET_SYSERR;
-  ret = GNUNET_TRANSPORT_TESTING_send (ccc->p[0],
-                                       ccc->p[1],
-                                       GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE,
-                                       size,
-                                       ccc->send_num_gen++,
-                                       cont,
-                                       cont_cls);
-  GNUNET_assert (GNUNET_SYSERR != ret);
-  if (GNUNET_NO == ret)
-  {
-    GNUNET_break (0);
-    ccc->global_ret = GNUNET_SYSERR;
-    GNUNET_SCHEDULER_shutdown ();
-  }
-}
-
-
-/**
- * Task that sends a minimalistic test message from the
- * first peer to the second peer.
- *
- * @param cls the `struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext`
- *        which should contain at least two peers, the first two
- *        of which should be currently connected
- */
-void
-GNUNET_TRANSPORT_TESTING_simple_send (void *cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_SendClosure *sc = cls;
-  int done;
-  size_t msize;
-
-  if (0 < sc->num_messages)
-  {
-    sc->num_messages--;
-    done = (0 == sc->num_messages);
-  }
-  else
-  {
-    done = 0;   /* infinite loop */
-  }
-  msize = sizeof(struct GNUNET_TRANSPORT_TESTING_TestMessage);
-  if (NULL != sc->get_size_cb)
-    msize = sc->get_size_cb (sc->num_messages);
-  /* if this was the last message, call the continuation,
-     otherwise call this function again */
-  do_send (sc->ccc,
-           msize,
-           done ? sc->cont : &GNUNET_TRANSPORT_TESTING_simple_send,
-           done ? sc->cont_cls : sc);
-}
-
-
-/**
- * Task that sends a large test message from the
- * first peer to the second peer.
- *
- * @param cls the `struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext`
- *        which should contain at least two peers, the first two
- *        of which should be currently connected
- */
-void
-GNUNET_TRANSPORT_TESTING_large_send (void *cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_SendClosure *sc = cls;
-  int done;
-  size_t msize;
-
-  if (0 < sc->num_messages)
-  {
-    sc->num_messages--;
-    done = (0 == sc->num_messages);
-  }
-  else
-  {
-    done = 0;   /* infinite loop */
-  }
-  msize = 2600;
-  if (NULL != sc->get_size_cb)
-    msize = sc->get_size_cb (sc->num_messages);
-  /* if this was the last message, call the continuation,
-     otherwise call this function again */
-  do_send (sc->ccc,
-           msize,
-           done ? sc->cont : &GNUNET_TRANSPORT_TESTING_large_send,
-           done ? sc->cont_cls : sc);
-}
-
-
-/* end of transport-testing-send.c */
diff --git a/src/transport/transport-testing.c b/src/transport/transport-testing.c
deleted file mode 100644
index 00c4a08dd..000000000
--- a/src/transport/transport-testing.c
+++ /dev/null
@@ -1,931 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2006, 2009, 2015, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport-testing.c
- * @brief testing lib for transport service
- * @author Matthias Wachs
- * @author Christian Grothoff
- */
-#include "transport-testing.h"
-
-
-#define LOG(kind, ...) GNUNET_log_from (kind, "transport-testing", __VA_ARGS__)
-
-
-static struct GNUNET_TRANSPORT_TESTING_PeerContext *
-find_peer_context (struct GNUNET_TRANSPORT_TESTING_Handle *tth,
-                   const struct GNUNET_PeerIdentity *peer)
-{
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *t;
-
-  for (t = tth->p_head; NULL != t; t = t->next)
-    if (0 == memcmp (&t->id,
-                     peer,
-                     sizeof(struct GNUNET_PeerIdentity)))
-      return t;
-  return NULL;
-}
-
-
-/**
- * Find any connecting context matching the given pair of peers.
- *
- * @param p1 first peer
- * @param p2 second peer
- * @param cb function to call
- * @param cb_cls closure for @a cb
- */
-void
-GNUNET_TRANSPORT_TESTING_find_connecting_context (struct
-                                                  GNUNET_TRANSPORT_TESTING_PeerContext
-                                                  *p1,
-                                                  struct
-                                                  GNUNET_TRANSPORT_TESTING_PeerContext
-                                                  *p2,
-                                                  GNUNET_TRANSPORT_TESTING_ConnectContextCallback
-                                                  cb,
-                                                  void *cb_cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_Handle *tth = p1->tth;
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc;
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *ccn;
-
-  for (cc = tth->cc_head; NULL != cc; cc = ccn)
-  {
-    ccn = cc->next;
-    if ((cc->p1 == p1) &&
-        (cc->p2 == p2))
-      cb (cb_cls,
-          cc);
-  }
-}
-
-
-static void
-set_p1c (void *cls,
-         struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cx)
-{
-  int *found = cls;
-
-  if (NULL != found)
-    *found = GNUNET_YES;
-  cx->p1_c = GNUNET_YES;
-}
-
-
-static void
-set_mq (void *cls,
-        struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cx)
-{
-  struct GNUNET_MQ_Handle *mq = cls;
-
-  cx->mq = mq;
-}
-
-
-static void
-set_p2c (void *cls,
-         struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cx)
-{
-  int *found = cls;
-
-  if (NULL != found)
-    *found = GNUNET_YES;
-  cx->p2_c = GNUNET_YES;
-}
-
-
-static void
-clear_p1c (void *cls,
-           struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cx)
-{
-  int *found = cls;
-
-  if (NULL != found)
-    *found = GNUNET_YES;
-  cx->p1_c = GNUNET_NO;
-}
-
-
-static void
-clear_p2c (void *cls,
-           struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cx)
-{
-  int *found = cls;
-
-  if (NULL != found)
-    *found = GNUNET_YES;
-  cx->p2_c = GNUNET_NO;
-}
-
-
-static void *
-notify_connect (void *cls,
-                const struct GNUNET_PeerIdentity *peer,
-                struct GNUNET_MQ_Handle *mq)
-{
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls;
-  struct GNUNET_TRANSPORT_TESTING_Handle *tth = p->tth;
-  char *p2_s;
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p2;
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc;
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *ccn;
-  int found;
-  void *ret;
-
-  p2 = find_peer_context (p->tth,
-                          peer);
-  if (NULL != p->nc)
-    ret = p->nc (p->cb_cls,
-                 peer,
-                 mq);
-  else
-    ret = NULL;
-
-  if (NULL != p2)
-    GNUNET_asprintf (&p2_s,
-                     "%u (`%s')",
-                     p2->no,
-                     GNUNET_i2s (&p2->id));
-  else
-    GNUNET_asprintf (&p2_s,
-                     "`%s'",
-                     GNUNET_i2s (peer));
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Peers %s connected to peer %u (`%s')\n",
-       p2_s,
-       p->no,
-       GNUNET_i2s (&p->id));
-  GNUNET_free (p2_s);
-  /* update flags in connecting contexts */
-  found = GNUNET_NO;
-  GNUNET_TRANSPORT_TESTING_find_connecting_context (p,
-                                                    p2,
-                                                    &set_p1c,
-                                                    &found);
-  if (GNUNET_NO == found)
-  {
-    cc = GNUNET_new (struct GNUNET_TRANSPORT_TESTING_ConnectRequest);
-    cc->p1 = p;
-    cc->p2 = p2;
-    cc->p1_c = GNUNET_YES;
-    GNUNET_CONTAINER_DLL_insert (tth->cc_head,
-                                 tth->cc_tail,
-                                 cc);
-  }
-  found = GNUNET_NO;
-  GNUNET_TRANSPORT_TESTING_find_connecting_context (p2,
-                                                    p,
-                                                    &set_p2c,
-                                                    &found);
-  if (GNUNET_NO == found)
-  {
-    cc = GNUNET_new (struct GNUNET_TRANSPORT_TESTING_ConnectRequest);
-    cc->p1 = p2;
-    cc->p2 = p;
-    cc->p1_c = GNUNET_YES;
-    GNUNET_CONTAINER_DLL_insert (tth->cc_head,
-                                 tth->cc_tail,
-                                 cc);
-  }
-  GNUNET_TRANSPORT_TESTING_find_connecting_context (p,
-                                                    p2,
-                                                    &set_mq,
-                                                    mq);
-  /* update set connected flag for all requests */
-  for (cc = tth->cc_head; NULL != cc; cc = cc->next)
-  {
-    if (GNUNET_YES == cc->connected)
-      continue;
-    if ((GNUNET_YES == cc->p1_c) &&
-        (GNUNET_YES == cc->p2_c))
-    {
-      cc->connected = GNUNET_YES;
-      /* stop trying to connect */
-      if (NULL != cc->tct)
-      {
-        GNUNET_SCHEDULER_cancel (cc->tct);
-        cc->tct = NULL;
-      }
-      if (NULL != cc->oh)
-      {
-        GNUNET_TRANSPORT_offer_hello_cancel (cc->oh);
-        cc->oh = NULL;
-      }
-      if (NULL != cc->ats_sh)
-      {
-        GNUNET_ATS_connectivity_suggest_cancel (cc->ats_sh);
-        cc->ats_sh = NULL;
-      }
-    }
-  }
-  /* then notify application */
-  for (cc = tth->cc_head; NULL != cc; cc = ccn)
-  {
-    ccn = cc->next;
-    if ((GNUNET_YES == cc->connected) &&
-        (NULL != cc->cb))
-    {
-      cc->cb (cc->cb_cls);
-      cc->cb = NULL;     /* only notify once! */
-    }
-  }
-  return ret;
-}
-
-
-/**
- * Offer the current HELLO of P2 to P1.
- *
- * @param cls our `struct GNUNET_TRANSPORT_TESTING_ConnectRequest`
- */
-static void
-offer_hello (void *cls);
-
-
-static void
-notify_disconnect (void *cls,
-                   const struct GNUNET_PeerIdentity *peer,
-                   void *handler_cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls;
-  struct GNUNET_TRANSPORT_TESTING_Handle *tth = p->tth;
-  char *p2_s;
-  /* Find PeerContext */
-  int no = 0;
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p2 = NULL;
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc;
-
-  p2 = find_peer_context (p->tth,
-                          peer);
-  no = p->no;
-  if (NULL != p2)
-    GNUNET_asprintf (&p2_s,
-                     "%u (`%s')",
-                     p2->no,
-                     GNUNET_i2s (&p2->id));
-  else
-    GNUNET_asprintf (&p2_s,
-                     "`%s'",
-                     GNUNET_i2s (peer));
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Peers %s disconnected from peer %u (`%s')\n",
-       p2_s,
-       no,
-       GNUNET_i2s (&p->id));
-  GNUNET_free (p2_s);
-  /* notify about disconnect */
-  if (NULL != p->nd)
-    p->nd (p->cb_cls,
-           peer,
-           handler_cls);
-  if (NULL == p2)
-    return;
-  /* clear MQ, it is now invalid */
-  GNUNET_TRANSPORT_TESTING_find_connecting_context (p,
-                                                    p2,
-                                                    &set_mq,
-                                                    NULL);
-  /* update set connected flags for all requests */
-  GNUNET_TRANSPORT_TESTING_find_connecting_context (p,
-                                                    p2,
-                                                    &clear_p1c,
-                                                    NULL);
-  GNUNET_TRANSPORT_TESTING_find_connecting_context (p2,
-                                                    p,
-                                                    &clear_p2c,
-                                                    NULL);
-  /* resume connectivity requests as necessary */
-  for (cc = tth->cc_head; NULL != cc; cc = cc->next)
-  {
-    if (GNUNET_NO == cc->connected)
-      continue;
-    if ((GNUNET_YES != cc->p1_c) ||
-        (GNUNET_YES != cc->p2_c))
-    {
-      cc->connected = GNUNET_NO;
-      /* start trying to connect */
-      if ((NULL == cc->tct) &&
-          (NULL == cc->oh))
-        cc->tct = GNUNET_SCHEDULER_add_now (&offer_hello,
-                                            cc);
-      if (NULL == cc->ats_sh)
-        cc->ats_sh = GNUNET_ATS_connectivity_suggest (cc->p1->ats,
-                                                      &p2->id,
-                                                      1);
-    }
-  }
-}
-
-
-static void
-get_hello (void *cb_cls,
-           const struct GNUNET_MessageHeader *message)
-{
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cb_cls;
-  struct GNUNET_PeerIdentity hello_id;
-
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_HELLO_get_id ((const struct
-                                       GNUNET_HELLO_Message *) message,
-                                      &hello_id));
-  GNUNET_assert (0 == memcmp (&hello_id,
-                              &p->id,
-                              sizeof(hello_id)));
-  GNUNET_free (p->hello);
-  p->hello = (struct GNUNET_HELLO_Message *) GNUNET_copy_message (message);
-
-  if (NULL != p->start_cb)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Peer %u (`%s') successfully started\n",
-         p->no,
-         GNUNET_i2s (&p->id));
-    p->start_cb (p->start_cb_cls);
-    p->start_cb = NULL;
-  }
-}
-
-
-/**
- * Start a peer with the given configuration
- * @param tth the testing handle
- * @param cfgname configuration file
- * @param peer_id a unique number to identify the peer
- * @param handlers functions for receiving messages
- * @param nc connect callback
- * @param nd disconnect callback
- * @param cb_cls closure for callback
- * @param start_cb start callback
- * @param start_cb_cls closure for callback
- * @return the peer context
- */
-struct GNUNET_TRANSPORT_TESTING_PeerContext *
-GNUNET_TRANSPORT_TESTING_start_peer (struct
-                                     GNUNET_TRANSPORT_TESTING_Handle *tth,
-                                     const char *cfgname,
-                                     int peer_id,
-                                     const struct
-                                     GNUNET_MQ_MessageHandler *handlers,
-                                     GNUNET_TRANSPORT_NotifyConnect nc,
-                                     GNUNET_TRANSPORT_NotifyDisconnect nd,
-                                     void *cb_cls,
-                                     GNUNET_SCHEDULER_TaskCallback start_cb,
-                                     void *start_cb_cls)
-{
-  char *emsg = NULL;
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p;
-  struct GNUNET_PeerIdentity dummy;
-  unsigned int i;
-
-  if (GNUNET_NO == GNUNET_DISK_file_test (cfgname))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "File not found: `%s'\n",
-         cfgname);
-    return NULL;
-  }
-
-  p = GNUNET_new (struct GNUNET_TRANSPORT_TESTING_PeerContext);
-  p->tth = tth;
-  p->nc = nc;
-  p->nd = nd;
-  if (NULL != handlers)
-  {
-    for (i = 0; NULL != handlers[i].cb; i++)
-      ;
-    p->handlers = GNUNET_new_array (i + 1,
-                                    struct GNUNET_MQ_MessageHandler);
-    GNUNET_memcpy (p->handlers,
-                   handlers,
-                   i * sizeof(struct GNUNET_MQ_MessageHandler));
-  }
-  if (NULL != cb_cls)
-    p->cb_cls = cb_cls;
-  else
-    p->cb_cls = p;
-  p->start_cb = start_cb;
-  if (NULL != start_cb_cls)
-    p->start_cb_cls = start_cb_cls;
-  else
-    p->start_cb_cls = p;
-  GNUNET_CONTAINER_DLL_insert (tth->p_head,
-                               tth->p_tail,
-                               p);
-
-  /* Create configuration and call testing lib to modify it */
-  p->cfg = GNUNET_CONFIGURATION_create ();
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONFIGURATION_load (p->cfg, cfgname));
-  if (GNUNET_SYSERR ==
-      GNUNET_TESTING_configuration_create (tth->tl_system,
-                                           p->cfg))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Testing library failed to create unique configuration based on `%s'\n",
-         cfgname);
-    GNUNET_CONFIGURATION_destroy (p->cfg);
-    GNUNET_free (p);
-    return NULL;
-  }
-
-  p->no = peer_id;
-  /* Configure peer with configuration */
-  p->peer = GNUNET_TESTING_peer_configure (tth->tl_system,
-                                           p->cfg,
-                                           p->no,
-                                           NULL,
-                                           &emsg);
-  if (NULL == p->peer)
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Testing library failed to create unique configuration based on `%s': `%s'\n",
-         cfgname,
-         emsg);
-    GNUNET_TRANSPORT_TESTING_stop_peer (p);
-    GNUNET_free (emsg);
-    return NULL;
-  }
-
-  if (GNUNET_OK != GNUNET_TESTING_peer_start (p->peer))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Testing library failed to create unique configuration based on `%s'\n",
-         cfgname);
-    GNUNET_TRANSPORT_TESTING_stop_peer (p);
-    return NULL;
-  }
-
-  memset (&dummy,
-          '\0',
-          sizeof(dummy));
-  GNUNET_TESTING_peer_get_identity (p->peer,
-                                    &p->id);
-  if (0 == memcmp (&dummy,
-                   &p->id,
-                   sizeof(struct GNUNET_PeerIdentity)))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Testing library failed to obtain peer identity for peer %u\n",
-         p->no);
-    GNUNET_TRANSPORT_TESTING_stop_peer (p);
-    return NULL;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Peer %u configured with identity `%s'\n",
-       p->no,
-       GNUNET_i2s_full (&p->id));
-  p->tmh = GNUNET_TRANSPORT_manipulation_connect (p->cfg);
-  p->th = GNUNET_TRANSPORT_core_connect (p->cfg,
-                                         NULL,
-                                         handlers,
-                                         p,
-                                         &notify_connect,
-                                         &notify_disconnect,
-                                         NULL);
-  if ((NULL == p->th) ||
-      (NULL == p->tmh))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Failed to connect to transport service for peer `%s': `%s'\n",
-         cfgname,
-         emsg);
-    GNUNET_TRANSPORT_TESTING_stop_peer (p);
-    GNUNET_free (emsg);
-    return NULL;
-  }
-  p->ats = GNUNET_ATS_connectivity_init (p->cfg);
-  if (NULL == p->ats)
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Failed to connect to ATS service for peer `%s': `%s'\n",
-         cfgname,
-         emsg);
-    GNUNET_TRANSPORT_TESTING_stop_peer (p);
-    GNUNET_free (emsg);
-    return NULL;
-  }
-  p->ghh = GNUNET_TRANSPORT_hello_get (p->cfg,
-                                       GNUNET_TRANSPORT_AC_ANY,
-                                       &get_hello,
-                                       p);
-  GNUNET_assert (NULL != p->ghh);
-  return p;
-}
-
-
-/**
- * Stops and restarts the given peer, sleeping (!) for 5s in between.
- *
- * @param p the peer
- * @param restart_cb callback to call when restarted
- * @param restart_cb_cls callback closure
- * @return #GNUNET_OK in success otherwise #GNUNET_SYSERR
- */
-int
-GNUNET_TRANSPORT_TESTING_restart_peer (struct
-                                       GNUNET_TRANSPORT_TESTING_PeerContext *p,
-                                       GNUNET_SCHEDULER_TaskCallback restart_cb,
-                                       void *restart_cb_cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc;
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *ccn;
-
-  /* shutdown */
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Stopping peer %u (`%s')\n",
-       p->no,
-       GNUNET_i2s (&p->id));
-  if (NULL != p->ghh)
-  {
-    GNUNET_TRANSPORT_hello_get_cancel (p->ghh);
-    p->ghh = NULL;
-  }
-  if (NULL != p->th)
-  {
-    GNUNET_TRANSPORT_core_disconnect (p->th);
-    p->th = NULL;
-  }
-  if (NULL != p->tmh)
-  {
-    GNUNET_TRANSPORT_manipulation_disconnect (p->tmh);
-    p->tmh = NULL;
-  }
-  for (cc = p->tth->cc_head; NULL != cc; cc = ccn)
-  {
-    ccn = cc->next;
-    if ((cc->p1 == p) ||
-        (cc->p2 == p))
-      GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc);
-  }
-  if (NULL != p->ats)
-  {
-    GNUNET_ATS_connectivity_done (p->ats);
-    p->ats = NULL;
-  }
-  if (GNUNET_SYSERR ==
-      GNUNET_TESTING_peer_stop (p->peer))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Failed to stop peer %u (`%s')\n",
-         p->no,
-         GNUNET_i2s (&p->id));
-    return GNUNET_SYSERR;
-  }
-
-  sleep (5);  // YUCK!
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Restarting peer %u (`%s')\n",
-       p->no,
-       GNUNET_i2s (&p->id));
-  /* restart */
-  if (GNUNET_SYSERR == GNUNET_TESTING_peer_start (p->peer))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Failed to restart peer %u (`%s')\n",
-         p->no,
-         GNUNET_i2s (&p->id));
-    return GNUNET_SYSERR;
-  }
-
-  GNUNET_assert (NULL == p->start_cb);
-  p->start_cb = restart_cb;
-  p->start_cb_cls = restart_cb_cls;
-
-  p->th = GNUNET_TRANSPORT_core_connect (p->cfg,
-                                         NULL,
-                                         p->handlers,
-                                         p,
-                                         &notify_connect,
-                                         &notify_disconnect,
-                                         NULL);
-  GNUNET_assert (NULL != p->th);
-  p->ats = GNUNET_ATS_connectivity_init (p->cfg);
-  p->ghh = GNUNET_TRANSPORT_hello_get (p->cfg,
-                                       GNUNET_TRANSPORT_AC_ANY,
-                                       &get_hello,
-                                       p);
-  GNUNET_assert (NULL != p->ghh);
-  return GNUNET_OK;
-}
-
-
-/**
- * Shutdown the given peer
- *
- * @param p the peer
- */
-void
-GNUNET_TRANSPORT_TESTING_stop_peer (struct
-                                    GNUNET_TRANSPORT_TESTING_PeerContext *p)
-{
-  struct GNUNET_TRANSPORT_TESTING_Handle *tth = p->tth;
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc;
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *ccn;
-
-  for (cc = tth->cc_head; NULL != cc; cc = ccn)
-  {
-    ccn = cc->next;
-    if ((cc->p1 == p) ||
-        (cc->p2 == p))
-      GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc);
-  }
-  if (NULL != p->ghh)
-  {
-    GNUNET_TRANSPORT_hello_get_cancel (p->ghh);
-    p->ghh = NULL;
-  }
-  if (NULL != p->tmh)
-  {
-    GNUNET_TRANSPORT_manipulation_disconnect (p->tmh);
-    p->tmh = NULL;
-  }
-  if (NULL != p->th)
-  {
-    GNUNET_TRANSPORT_core_disconnect (p->th);
-    p->th = NULL;
-  }
-  if (NULL != p->peer)
-  {
-    if (GNUNET_OK !=
-        GNUNET_TESTING_peer_stop (p->peer))
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Testing lib failed to stop peer %u (`%s')\n",
-           p->no,
-           GNUNET_i2s (&p->id));
-    }
-    GNUNET_TESTING_peer_destroy (p->peer);
-    p->peer = NULL;
-  }
-  if (NULL != p->ats)
-  {
-    GNUNET_ATS_connectivity_done (p->ats);
-    p->ats = NULL;
-  }
-  if (NULL != p->hello)
-  {
-    GNUNET_free (p->hello);
-    p->hello = NULL;
-  }
-  if (NULL != p->cfg)
-  {
-    GNUNET_CONFIGURATION_destroy (p->cfg);
-    p->cfg = NULL;
-  }
-  if (NULL != p->handlers)
-  {
-    GNUNET_free (p->handlers);
-    p->handlers = NULL;
-  }
-  GNUNET_CONTAINER_DLL_remove (tth->p_head,
-                               tth->p_tail,
-                               p);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Peer %u (`%s') stopped\n",
-       p->no,
-       GNUNET_i2s (&p->id));
-  GNUNET_free (p);
-}
-
-
-/**
- * Function called after the HELLO was passed to the
- * transport service.
- */
-static void
-hello_offered (void *cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc = cls;
-
-  cc->oh = NULL;
-  cc->tct = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                          &offer_hello,
-                                          cc);
-}
-
-
-/**
- * Offer the current HELLO of P2 to P1.
- *
- * @param cls our `struct GNUNET_TRANSPORT_TESTING_ConnectRequest`
- */
-static void
-offer_hello (void *cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc = cls;
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p1 = cc->p1;
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p2 = cc->p2;
-
-  cc->tct = NULL;
-  {
-    char *p2_s = GNUNET_strdup (GNUNET_i2s (&p2->id));
-
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Asking peer %u (`%s') to connect peer %u (`%s'), providing HELLO with %u bytes\n",
-         p1->no,
-         GNUNET_i2s (&p1->id),
-         p2->no,
-         p2_s,
-         GNUNET_HELLO_size (cc->p2->hello));
-    GNUNET_free (p2_s);
-  }
-
-  if (NULL != cc->oh)
-    GNUNET_TRANSPORT_offer_hello_cancel (cc->oh);
-  cc->oh =
-    GNUNET_TRANSPORT_offer_hello (cc->p1->cfg,
-                                  (const struct
-                                   GNUNET_MessageHeader *) cc->p2->hello,
-                                  &hello_offered,
-                                  cc);
-}
-
-
-/**
- * Initiate a connection from p1 to p2 by offering p1 p2's HELLO message
- *
- * Remarks: start_peer's notify_connect callback can be called before.
- *
- * @param tth transport testing handle
- * @param p1 peer 1
- * @param p2 peer 2
- * @param cb the callback to call when both peers notified that they are connected
- * @param cls callback cls
- * @return a connect request handle
- */
-struct GNUNET_TRANSPORT_TESTING_ConnectRequest *
-GNUNET_TRANSPORT_TESTING_connect_peers (struct
-                                        GNUNET_TRANSPORT_TESTING_PeerContext *p1,
-                                        struct
-                                        GNUNET_TRANSPORT_TESTING_PeerContext *p2,
-                                        GNUNET_SCHEDULER_TaskCallback cb,
-                                        void *cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_Handle *tth = p1->tth;
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc;
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *ccn;
-
-  ccn = NULL;
-  for (cc = tth->cc_head; NULL != cc; cc = cc->next)
-  {
-    if ((cc->p1 == p1) &&
-        (cc->p2 == p2))
-    {
-      ccn = cc;
-      break;
-    }
-  }
-
-  cc = GNUNET_new (struct GNUNET_TRANSPORT_TESTING_ConnectRequest);
-  cc->p1 = p1;
-  cc->p2 = p2;
-  cc->cb = cb;
-  if (NULL != cls)
-    cc->cb_cls = cls;
-  else
-    cc->cb_cls = cc;
-  if (NULL != ccn)
-  {
-    cc->p1_c = ccn->p1_c;
-    cc->p2_c = ccn->p2_c;
-    cc->connected = ccn->connected;
-  }
-  GNUNET_CONTAINER_DLL_insert (tth->cc_head,
-                               tth->cc_tail,
-                               cc);
-  cc->tct = GNUNET_SCHEDULER_add_now (&offer_hello,
-                                      cc);
-  cc->ats_sh = GNUNET_ATS_connectivity_suggest (cc->p1->ats,
-                                                &p2->id,
-                                                1);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "New connect request %p\n",
-       cc);
-  return cc;
-}
-
-
-/**
- * Cancel the request to connect two peers
- * Tou MUST cancel the request if you stop the peers before the peers connected successfully
- *
- * @param tth transport testing handle
- * @param cc a connect request handle
- */
-void
-GNUNET_TRANSPORT_TESTING_connect_peers_cancel (struct
-                                               GNUNET_TRANSPORT_TESTING_ConnectRequest
-                                               *cc)
-{
-  struct GNUNET_TRANSPORT_TESTING_Handle *tth = cc->p1->tth;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Canceling connect request!\n");
-  if (NULL != cc->tct)
-  {
-    GNUNET_SCHEDULER_cancel (cc->tct);
-    cc->tct = NULL;
-  }
-  if (NULL != cc->oh)
-  {
-    GNUNET_TRANSPORT_offer_hello_cancel (cc->oh);
-    cc->oh = NULL;
-  }
-  if (NULL != cc->ats_sh)
-  {
-    GNUNET_ATS_connectivity_suggest_cancel (cc->ats_sh);
-    cc->ats_sh = NULL;
-  }
-  GNUNET_CONTAINER_DLL_remove (tth->cc_head,
-                               tth->cc_tail,
-                               cc);
-  GNUNET_free (cc);
-}
-
-
-/**
- * Clean up the transport testing
- *
- * @param tth transport testing handle
- */
-void
-GNUNET_TRANSPORT_TESTING_done (struct GNUNET_TRANSPORT_TESTING_Handle *tth)
-{
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc;
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *ct;
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p;
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *t;
-
-  if (NULL == tth)
-    return;
-  cc = tth->cc_head;
-  while (NULL != cc)
-  {
-    ct = cc->next;
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Developer forgot to cancel connect request!\n");
-    GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc);
-    cc = ct;
-  }
-  p = tth->p_head;
-  while (NULL != p)
-  {
-    t = p->next;
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Developer forgot to stop peer!\n");
-    GNUNET_TRANSPORT_TESTING_stop_peer (p);
-    p = t;
-  }
-  GNUNET_TESTING_system_destroy (tth->tl_system,
-                                 GNUNET_YES);
-
-  GNUNET_free (tth);
-}
-
-
-/**
- * Initialize the transport testing
- *
- * @return transport testing handle
- */
-struct GNUNET_TRANSPORT_TESTING_Handle *
-GNUNET_TRANSPORT_TESTING_init ()
-{
-  struct GNUNET_TRANSPORT_TESTING_Handle *tth;
-
-  tth = GNUNET_new (struct GNUNET_TRANSPORT_TESTING_Handle);
-  tth->tl_system = GNUNET_TESTING_system_create ("transport-testing",
-                                                 NULL,
-                                                 NULL,
-                                                 NULL);
-  if (NULL == tth->tl_system)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to initialize testing library!\n");
-    GNUNET_free (tth);
-    return NULL;
-  }
-  return tth;
-}
-
-
-/* end of transport-testing.c */
diff --git a/src/transport/transport-testing.h b/src/transport/transport-testing.h
deleted file mode 100644
index c548e59c1..000000000
--- a/src/transport/transport-testing.h
+++ /dev/null
@@ -1,914 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2006, 2009, 2015, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport-testing.h
- * @brief testing lib for transport service
- * @author Matthias Wachs
- * @author Christian Grothoff
- */
-#ifndef TRANSPORT_TESTING_H
-#define TRANSPORT_TESTING_H
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_transport_service.h"
-#include "gnunet_transport_hello_service.h"
-#include "gnunet_transport_manipulation_service.h"
-#include "gnunet_testing_lib.h"
-
-
-/* ************* Basic functions for starting/stopping/connecting *********** */
-
-/**
- * Context for a single peer
- */
-struct GNUNET_TRANSPORT_TESTING_PeerContext;
-
-/**
- * Definition for a transport testing handle
- */
-struct GNUNET_TRANSPORT_TESTING_Handle;
-
-
-/**
- * Context for a single peer
- */
-struct GNUNET_TRANSPORT_TESTING_PeerContext
-{
-  /**
-   * Next element in the DLL
-   */
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *next;
-
-  /**
-   * Previous element in the DLL
-   */
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *prev;
-
-  /**
-   * Transport testing handle this peer belongs to
-   */
-  struct GNUNET_TRANSPORT_TESTING_Handle *tth;
-
-  /**
-   * Peer's configuration
-   */
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  /**
-   * Peer's transport service handle
-   */
-  struct GNUNET_TRANSPORT_CoreHandle *th;
-
-  /**
-   * Peer's transport service manipulation handle
-   */
-  struct GNUNET_TRANSPORT_ManipulationHandle *tmh;
-
-  /**
-   * Peer's ATS handle.
-   */
-  struct GNUNET_ATS_ConnectivityHandle *ats;
-
-  /**
-   * Peer's transport get hello handle to retrieve peer's HELLO message
-   */
-  struct GNUNET_TRANSPORT_HelloGetHandle *ghh;
-
-  /**
-   * Peer's testing handle
-   */
-  struct GNUNET_TESTING_Peer *peer;
-
-  /**
-   * Peer identity
-   */
-  struct GNUNET_PeerIdentity id;
-
-  /**
-   * Handle for the peer's ARM process
-   */
-  struct GNUNET_OS_Process *arm_proc;
-
-  /**
-   * Receive callback
-   */
-  struct GNUNET_MQ_MessageHandler *handlers;
-
-  /**
-   * Notify connect callback
-   */
-  GNUNET_TRANSPORT_NotifyConnect nc;
-
-  /**
-   * Notify disconnect callback
-   */
-  GNUNET_TRANSPORT_NotifyDisconnect nd;
-
-  /**
-   * Startup completed callback
-   */
-  GNUNET_SCHEDULER_TaskCallback start_cb;
-
-  /**
-   * Peers HELLO Message
-   */
-  struct GNUNET_HELLO_Message *hello;
-
-  /**
-   * Closure for the @a nc and @a nd callbacks
-   */
-  void *cb_cls;
-
-  /**
-   * Closure for @e start_cb.
-   */
-  void *start_cb_cls;
-
-  /**
-   * An unique number to identify the peer
-   */
-  unsigned int no;
-};
-
-
-/**
- * Handle for a request to connect two peers.
- */
-struct GNUNET_TRANSPORT_TESTING_ConnectRequest
-{
-  /**
-   * Kept in a DLL.
-   */
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *next;
-
-  /**
-   * Kept in a DLL.
-   */
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *prev;
-
-  /**
-   * Peer we want to connect.
-   */
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p1;
-
-  /**
-   * Peer we want to connect.
-   */
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p2;
-
-  /**
-   * Task by which we accomplish the connection.
-   */
-  struct GNUNET_SCHEDULER_Task *tct;
-
-  /**
-   * Handle by which we ask ATS to facilitate the connection.
-   */
-  struct GNUNET_ATS_ConnectivitySuggestHandle *ats_sh;
-
-  /**
-   * Handle by which we inform the peer about the HELLO of
-   * the other peer.
-   */
-  struct GNUNET_TRANSPORT_OfferHelloHandle *oh;
-
-  /**
-   * Function to call upon completion.
-   */
-  GNUNET_SCHEDULER_TaskCallback cb;
-
-  /**
-   * Closure for @e cb.
-   */
-  void *cb_cls;
-
-  /**
-   * Message queue for sending from @a p1 to @a p2.
-   */
-  struct GNUNET_MQ_Handle *mq;
-
-  /**
-   * Set if peer1 says the connection is up to peer2.
-   */
-  int p1_c;
-
-  /**
-   * Set if peer2 says the connection is up to peer1.
-   */
-  int p2_c;
-
-  /**
-   * #GNUNET_YES if both @e p1_c and @e p2_c are #GNUNET_YES.
-   */
-  int connected;
-};
-
-
-/**
- * Handle for a test run.
- */
-struct GNUNET_TRANSPORT_TESTING_Handle
-{
-  /**
-   * Testing library system handle
-   */
-  struct GNUNET_TESTING_System *tl_system;
-
-  /**
-   * head DLL of connect contexts
-   */
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc_head;
-
-  /**
-   * head DLL of connect contexts
-   */
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc_tail;
-
-  /**
-   * head DLL of peers
-   */
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p_head;
-
-  /**
-   * tail DLL of peers
-   */
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p_tail;
-};
-
-
-/**
- * Initialize the transport testing
- *
- * @return transport testing handle
- */
-struct GNUNET_TRANSPORT_TESTING_Handle *
-GNUNET_TRANSPORT_TESTING_init (void);
-
-
-/**
- * Clean up the transport testing
- *
- * @param tth transport testing handle
- */
-void
-GNUNET_TRANSPORT_TESTING_done (struct GNUNET_TRANSPORT_TESTING_Handle *tth);
-
-
-/**
- * Start a peer with the given configuration
- *
- * @param tth the testing handle
- * @param cfgname configuration file
- * @param peer_id the peer_id
- * @param handlers functions for receiving messages
- * @param nc connect callback
- * @param nd disconnect callback
- * @param cb_cls closure for @a nc and @a nd callback
- * @param start_cb start callback
- * @param start_cb_cls closure for @a start_cb
- * @return the peer context
- */
-struct GNUNET_TRANSPORT_TESTING_PeerContext *
-GNUNET_TRANSPORT_TESTING_start_peer (
-  struct GNUNET_TRANSPORT_TESTING_Handle *tth,
-  const char *cfgname,
-  int peer_id,
-  const struct GNUNET_MQ_MessageHandler *handlers,
-  GNUNET_TRANSPORT_NotifyConnect nc,
-  GNUNET_TRANSPORT_NotifyDisconnect nd,
-  void *cb_cls,
-  GNUNET_SCHEDULER_TaskCallback start_cb,
-  void *start_cb_cls);
-
-
-/**
- * Shutdown the given peer
- *
- * @param p the peer
- */
-void
-GNUNET_TRANSPORT_TESTING_stop_peer (
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *pc);
-
-
-/**
- * Stops and restarts the given peer, sleeping (!) for 5s in between.
- *
- * @param p the peer
- * @param restart_cb restart callback
- * @param restart_cb_cls callback closure
- * @return #GNUNET_OK in success otherwise #GNUNET_SYSERR
- */
-int
-GNUNET_TRANSPORT_TESTING_restart_peer (
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p,
-  GNUNET_SCHEDULER_TaskCallback restart_cb,
-  void *restart_cb_cls);
-
-
-/**
- * Connect the given peers and call the callback when both peers
- * report the inbound connection. Remarks: start_peer's notify_connect
- * callback can be called before.
- *
- * @param p1 peer 1
- * @param p2 peer 2
- * @param cb the callback to call when both peers notified that they are
- * connected
- * @param cls callback cls
- * @return a connect request handle
- */
-struct GNUNET_TRANSPORT_TESTING_ConnectRequest *
-GNUNET_TRANSPORT_TESTING_connect_peers (
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p1,
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p2,
-  GNUNET_SCHEDULER_TaskCallback cb,
-  void *cls);
-
-
-/**
- * Cancel the request to connect two peers.  You MUST cancel the
- * request if you stop the peers before the peers connected
- * successfully.
- *
- * @param cc a connect request handle
- */
-void
-GNUNET_TRANSPORT_TESTING_connect_peers_cancel (
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc);
-
-
-/**
- * Function called on matching connect requests.
- *
- * @param cls closure
- * @param cc request matching the query
- */
-typedef void (*GNUNET_TRANSPORT_TESTING_ConnectContextCallback) (
-  void *cls,
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc);
-
-
-/**
- * Find any connecting context matching the given pair of peers.
- *
- * @param p1 first peer
- * @param p2 second peer
- * @param cb function to call
- * @param cb_cls closure for @a cb
- */
-void
-GNUNET_TRANSPORT_TESTING_find_connecting_context (
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p1,
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p2,
-  GNUNET_TRANSPORT_TESTING_ConnectContextCallback cb,
-  void *cb_cls);
-
-
-/* ********************** high-level process functions *************** */
-
-
-/**
- * Function called once the peers have been launched and
- * connected by #GNUNET_TRANSPORT_TESTING_connect_check().
- *
- * @param cls closure
- * @param num_peers size of the @a p array
- * @param p the peers that were launched
- */
-typedef void (*GNUNET_TRANSPORT_TESTING_ConnectContinuation) (
-  void *cls,
-  unsigned int num_peers,
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p[]);
-
-
-/**
- * Internal data structure.
- */
-struct GNUNET_TRANSPORT_TESTING_ConnectRequestList;
-
-/**
- * Internal data structure.
- */
-struct GNUNET_TRANSPORT_TESTING_InternalPeerContext;
-
-
-GNUNET_NETWORK_STRUCT_BEGIN
-struct GNUNET_TRANSPORT_TESTING_TestMessage
-{
-  /**
-   * Type is (usually) #GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Monotonically increasing counter throughout the test.
-   */
-  uint32_t num GNUNET_PACKED;
-};
-GNUNET_NETWORK_STRUCT_END
-
-
-/**
- * Function called by the transport for each received message.
- *
- * @param cls closure
- * @param receiver receiver of the message
- * @param sender sender of the message
- * @param message the message
- */
-typedef void (*GNUNET_TRANSPORT_TESTING_ReceiveCallback) (
-  void *cls,
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *receiver,
-  const struct GNUNET_PeerIdentity *sender,
-  const struct GNUNET_TRANSPORT_TESTING_TestMessage *message);
-
-
-/**
- * Function called to notify transport users that another
- * peer connected to us.
- *
- * @param cls closure
- * @param me peer experiencing the event
- * @param other peer that connected to @a me
- */
-typedef void (*GNUNET_TRANSPORT_TESTING_NotifyConnect) (
-  void *cls,
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *me,
-  const struct GNUNET_PeerIdentity *other);
-
-
-/**
- * Function called to notify transport users that another
- * peer disconnected from us.
- *
- * @param cls closure
- * @param me peer experiencing the event
- * @param other peer that disconnected from @a me
- */
-typedef void (*GNUNET_TRANSPORT_TESTING_NotifyDisconnect) (
-  void *cls,
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *me,
-  const struct GNUNET_PeerIdentity *other);
-
-
-/**
- * Closure that must be passed to
- * #GNUNET_TRANSPORT_TESTING_connect_check.
- */
-struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext
-{
-  /**
-   * How should we continue after the connect?
-   */
-  GNUNET_SCHEDULER_TaskCallback connect_continuation;
-
-  /**
-   * Closure for @e connect_continuation.
-   */
-  void *connect_continuation_cls;
-
-  /**
-   * Which configuration file should we pass to the
-   * #GNUNET_PROGRAM_run() of the testcase?
-   */
-  const char *config_file;
-
-  /**
-   * Receiver argument to give for peers we start.
-   */
-  GNUNET_TRANSPORT_TESTING_ReceiveCallback rec;
-
-  /**
-   * Notify connect argument to give for peers we start.
-   */
-  GNUNET_TRANSPORT_TESTING_NotifyConnect nc;
-
-  /**
-   * Notify disconnect argument to give for peers we start.
-   */
-  GNUNET_TRANSPORT_TESTING_NotifyDisconnect nd;
-
-  /**
-   * Closure for @e rec, @e nc and @e nd.
-   */
-  void *cls;
-
-  /**
-   * Custom task to run on shutdown.
-   */
-  GNUNET_SCHEDULER_TaskCallback shutdown_task;
-
-  /**
-   * Closure for @e shutdown_task.
-   */
-  void *shutdown_task_cls;
-
-  /**
-   * Custom task to run after peers were started but before we try to
-   * connect them.  If this function is set, we wait ONE second after
-   * running this function until we continue with connecting the
-   * peers.
-   */
-  GNUNET_SCHEDULER_TaskCallback pre_connect_task;
-
-  /**
-   * Closure for @e shutdown_task.
-   */
-  void *pre_connect_task_cls;
-
-  /**
-   * When should the testcase time out?
-   */
-  struct GNUNET_TIME_Relative timeout;
-
-  /**
-   * Should we try to create connections in both directions?
-   */
-  int bi_directional;
-
-  /* ******* fields set by #GNUNET_TRANSPORT_TESTING_connect_check **** */
-
-  /**
-   * Number of peers involved in the test.
-   */
-  unsigned int num_peers;
-
-  /**
-   * Configuration files we have, array with @e num_peers entries.
-   */
-  char **cfg_files;
-
-  /**
-   * Array with @e num_peers entries.
-   */
-  struct GNUNET_TRANSPORT_TESTING_PeerContext **p;
-
-  /**
-   * Name of the plugin.
-   */
-  const char *test_plugin;
-
-  /**
-   * Name of the testcase.
-   */
-  const char *test_name;
-
-  /**
-   * Configuration object for the testcase.
-   */
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  /**
-   * Main testing handle.
-   */
-  struct GNUNET_TRANSPORT_TESTING_Handle *tth;
-
-  /**
-   * Result from the main function, set to #GNUNET_OK on success.
-   * Clients should set to #GNUNET_SYSERR to indicate test failure.
-   */
-  int global_ret;
-
-  /**
-   * Generator for the `num` field in test messages.  Incremented each
-   * time #GNUNET_TRANSPORT_TESTING_simple_send or
-   * #GNUNET_TRANSPORT_TESTING_large_send are used to transmit a
-   * message.
-   */
-  uint32_t send_num_gen;
-
-  /* ******* internal state, clients should not mess with this **** */
-
-  /**
-   * Task run on timeout.
-   */
-  struct GNUNET_SCHEDULER_Task *timeout_task;
-
-  /**
-   * Task run to connect peers.
-   */
-  struct GNUNET_SCHEDULER_Task *connect_task;
-
-  /**
-   * Number of peers that have been started.
-   */
-  unsigned int started;
-
-  /**
-   * DLL of active connect requests.
-   */
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequestList *crl_head;
-
-  /**
-   * DLL of active connect requests.
-   */
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequestList *crl_tail;
-
-  /**
-   * Array with @e num_peers entries.
-   */
-  struct GNUNET_TRANSPORT_TESTING_InternalPeerContext *ip;
-};
-
-
-/**
- * Find peer by peer ID.
- *
- * @param ccc context to search
- * @param peer peer to look for
- * @return NULL if @a peer was not found
- */
-struct GNUNET_TRANSPORT_TESTING_PeerContext *
-GNUNET_TRANSPORT_TESTING_find_peer (
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc,
-  const struct GNUNET_PeerIdentity *peer);
-
-
-/**
- * Common implementation of the #GNUNET_TRANSPORT_TESTING_CheckCallback.
- * Starts and connects the two peers, then invokes the
- * `connect_continuation` from @a cls.  Sets up a timeout to
- * abort the test, and a shutdown handler to clean up properly
- * on exit.
- *
- * @param cls closure of type `struct
- * GNUNET_TRANSPORT_TESTING_ConnectCheckContext`
- * @param tth_ initialized testing handle
- * @param test_plugin_ name of the plugin
- * @param test_name_ name of the test
- * @param num_peers number of entries in the @a cfg_file array
- * @param cfg_files array of names of configuration files for the peers
- * @return #GNUNET_SYSERR on error
- */
-int
-GNUNET_TRANSPORT_TESTING_connect_check (
-  void *cls,
-  struct GNUNET_TRANSPORT_TESTING_Handle *tth_,
-  const char *test_plugin_,
-  const char *test_name_,
-  unsigned int num_peers,
-  char *cfg_files[]);
-
-
-/**
- * Main function of a testcase.  Called with the initial setup data
- * for the test as derived from the source name and the binary name.
- *
- * @param cls closure
- * @param tth_ initialized testing handle
- * @param test_plugin_ name of the plugin
- * @param test_name_ name of the test
- * @param num_peers number of entries in the @a cfg_file array
- * @param cfg_files array of names of configuration files for the peers
- * @return #GNUNET_SYSERR on error
- */
-typedef int (*GNUNET_TRANSPORT_TESTING_CheckCallback) (
-  void *cls,
-  struct GNUNET_TRANSPORT_TESTING_Handle *tth_,
-  const char *test_plugin_,
-  const char *test_name_,
-  unsigned int num_peers,
-  char *cfg_files[]);
-
-
-/**
- * Setup testcase.  Calls @a check with the data the test needs.
- *
- * @param argv0 binary name (argv[0])
- * @param filename source file name (__FILE__)
- * @param num_peers number of peers to start
- * @param check main function to run
- * @param check_cls closure for @a check
- * @return #GNUNET_OK on success
- */
-int
-GNUNET_TRANSPORT_TESTING_main_ (const char *argv0,
-                                const char *filename,
-                                unsigned int num_peers,
-                                GNUNET_TRANSPORT_TESTING_CheckCallback check,
-                                void *check_cls);
-
-
-/**
- * Setup testcase.  Calls @a check with the data the test needs.
- *
- * @param num_peers number of peers to start
- * @param check main function to run
- * @param check_cls closure for @a check
- * @return #GNUNET_OK on success
- */
-#define GNUNET_TRANSPORT_TESTING_main(num_peers, check, check_cls) \
-  GNUNET_TRANSPORT_TESTING_main_ (argv[0],                         \
-                                  __FILE__,                        \
-                                  num_peers,                       \
-                                  check,                           \
-                                  check_cls)
-
-/* ***************** Convenience functions for sending ********* */
-
-/**
- * Send a test message of type @a mtype and size @a msize from
- * peer @a sender to peer @a receiver.  The peers should be
- * connected when this function is called.
- *
- * @param sender the sending peer
- * @param receiver the receiving peer
- * @param mtype message type to use
- * @param msize size of the message, at least `sizeof (struct
- * GNUNET_TRANSPORT_TESTING_TestMessage)`
- * @param num unique message number
- * @param cont continuation to call after transmission
- * @param cont_cls closure for @a cont
- * @return #GNUNET_OK if message was queued,
- *         #GNUNET_NO if peers are not connected
- *         #GNUNET_SYSERR if @a msize is illegal
- */
-int
-GNUNET_TRANSPORT_TESTING_send (
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *sender,
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *receiver,
-  uint16_t mtype,
-  uint16_t msize,
-  uint32_t num,
-  GNUNET_SCHEDULER_TaskCallback cont,
-  void *cont_cls);
-
-
-/**
- * Message type used by #GNUNET_TRANSPORT_TESTING_simple_send().
- */
-#define GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE 12345
-
-/**
- * Alternative message type for tests.
- */
-#define GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE2 12346
-
-
-/**
- * Type of the closure argument to pass to
- * #GNUNET_TRANSPORT_TESTING_simple_send() and
- * #GNUNET_TRANSPORT_TESTING_large_send().
- */
-struct GNUNET_TRANSPORT_TESTING_SendClosure
-{
-  /**
-   * Context for the transmission.
-   */
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc;
-
-  /**
-   * Function that returns the desired message size. Overrides
-   * the message size, can be NULL in which case the message
-   * size is the default.
-   */
-  size_t (*get_size_cb) (unsigned int n);
-
-  /**
-   * Number of messages to be transmitted in a loop.
-   * Use zero for "forever" (until external shutdown).
-   */
-  unsigned int num_messages;
-
-  /**
-   * Function to call after all transmissions, can be NULL.
-   */
-  GNUNET_SCHEDULER_TaskCallback cont;
-
-  /**
-   * Closure for @e cont.
-   */
-  void *cont_cls;
-};
-
-
-/**
- * Task that sends a minimalistic test message from the
- * first peer to the second peer.
- *
- * @param cls the `struct GNUNET_TRANSPORT_TESTING_SendClosure`
- *        which should contain at least two peers, the first two
- *        of which should be currently connected
- */
-void
-GNUNET_TRANSPORT_TESTING_simple_send (void *cls);
-
-/**
- * Size of a message sent with
- * #GNUNET_TRANSPORT_TESTING_large_send().  Big enough
- * to usually force defragmentation.
- */
-#define GNUNET_TRANSPORT_TESTING_LARGE_MESSAGE_SIZE 2600
-
-/**
- * Task that sends a large test message from the
- * first peer to the second peer.
- *
- * @param cls the `struct GNUNET_TRANSPORT_TESTING_SendClosure`
- *        which should contain at least two peers, the first two
- *        of which should be currently connected
- */
-void
-GNUNET_TRANSPORT_TESTING_large_send (void *cls);
-
-
-/* ********************** log-only convenience functions ************* */
-
-
-/**
- * Log a connect event.
- *
- * @param cls NULL
- * @param me peer that had the event
- * @param other peer that connected.
- */
-void
-GNUNET_TRANSPORT_TESTING_log_connect (
-  void *cls,
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *me,
-  const struct GNUNET_PeerIdentity *other);
-
-
-/**
- * Log a disconnect event.
- *
- * @param cls NULL
- * @param me peer that had the event
- * @param other peer that disconnected.
- */
-void
-GNUNET_TRANSPORT_TESTING_log_disconnect (
-  void *cls,
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *me,
-  const struct GNUNET_PeerIdentity *other);
-
-
-/* ********************** low-level filename functions *************** */
-
-
-/**
- * Extracts the test filename from an absolute file name and removes
- * the extension.
- *
- * @param file absolute file name
- * @return resulting test name
- */
-char *
-GNUNET_TRANSPORT_TESTING_get_test_name (const char *file);
-
-
-/**
- * This function takes the filename (e.g. argv[0), removes a "lt-"-prefix and
- * if existing ".exe"-prefix and adds the peer-number
- *
- * @param file filename of the test, e.g. argv[0]
- * @param count peer number
- * @return configuration name to use
- */
-char *
-GNUNET_TRANSPORT_TESTING_get_config_name (const char *file, int count);
-
-
-/**
- * Extracts the plugin anme from an absolute file name and the test name
- * @param file absolute file name
- * @param test test name
- * @return the plugin name
- */
-char *
-GNUNET_TRANSPORT_TESTING_get_test_plugin_name (const char *executable,
-                                               const char *testname);
-
-
-/**
- * Extracts the filename from an absolute file name and removes the
- * extension
- *
- * @param file absolute file name
- * @return the source name
- */
-char *
-GNUNET_TRANSPORT_TESTING_get_test_source_name (const char *file);
-
-#endif
-/* end of transport_testing.h */
diff --git a/src/transport/transport-testing2.c b/src/transport/transport-testing2.c
deleted file mode 100644
index 6d41ec098..000000000
--- a/src/transport/transport-testing2.c
+++ /dev/null
@@ -1,961 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2006, 2009, 2015, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport-testing.c
- * @brief testing lib for transport service
- * @author Matthias Wachs
- * @author Christian Grothoff
- */
-#include "transport-testing2.h"
-
-
-#define LOG(kind, ...) GNUNET_log_from (kind, "transport-testing", __VA_ARGS__)
-
-
-static struct GNUNET_TRANSPORT_TESTING_PeerContext *
-find_peer_context (struct GNUNET_TRANSPORT_TESTING_Handle *tth,
-                   const struct GNUNET_PeerIdentity *peer)
-{
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *t;
-
-  for (t = tth->p_head; NULL != t; t = t->next)
-    if (0 == memcmp (&t->id,
-                     peer,
-                     sizeof(struct GNUNET_PeerIdentity)))
-      return t;
-  return NULL;
-}
-
-
-/**
- * Find any connecting context matching the given pair of peers.
- *
- * @param p1 first peer
- * @param p2 second peer
- * @param cb function to call
- * @param cb_cls closure for @a cb
- */
-void
-GNUNET_TRANSPORT_TESTING_find_connecting_context (struct
-                                                  GNUNET_TRANSPORT_TESTING_PeerContext
-                                                  *p1,
-                                                  struct
-                                                  GNUNET_TRANSPORT_TESTING_PeerContext
-                                                  *p2,
-                                                  GNUNET_TRANSPORT_TESTING_ConnectContextCallback
-                                                  cb,
-                                                  void *cb_cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_Handle *tth = p1->tth;
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc;
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *ccn;
-
-  for (cc = tth->cc_head; NULL != cc; cc = ccn)
-  {
-    ccn = cc->next;
-    if ((cc->p1 == p1) &&
-        (cc->p2 == p2))
-      cb (cb_cls,
-          cc);
-  }
-}
-
-
-static void
-set_p1c (void *cls,
-         struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cx)
-{
-  int *found = cls;
-
-  if (NULL != found)
-    *found = GNUNET_YES;
-  cx->p1_c = GNUNET_YES;
-}
-
-
-static void
-set_mq (void *cls,
-        struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cx)
-{
-  struct GNUNET_MQ_Handle *mq = cls;
-
-  cx->mq = mq;
-}
-
-
-static void
-set_p2c (void *cls,
-         struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cx)
-{
-  int *found = cls;
-
-  if (NULL != found)
-    *found = GNUNET_YES;
-  cx->p2_c = GNUNET_YES;
-}
-
-
-static void
-clear_p1c (void *cls,
-           struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cx)
-{
-  int *found = cls;
-
-  if (NULL != found)
-    *found = GNUNET_YES;
-  cx->p1_c = GNUNET_NO;
-}
-
-
-static void
-clear_p2c (void *cls,
-           struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cx)
-{
-  int *found = cls;
-
-  if (NULL != found)
-    *found = GNUNET_YES;
-  cx->p2_c = GNUNET_NO;
-}
-
-
-static void *
-notify_connect (void *cls,
-                const struct GNUNET_PeerIdentity *peer,
-                struct GNUNET_MQ_Handle *mq)
-{
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls;
-  struct GNUNET_TRANSPORT_TESTING_Handle *tth = p->tth;
-  char *p2_s;
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p2;
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc;
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *ccn;
-  int found;
-  void *ret;
-
-  p2 = find_peer_context (p->tth,
-                          peer);
-  if (NULL != p->nc)
-    ret = p->nc (p->cb_cls,
-                 peer,
-                 mq);
-  else
-    ret = NULL;
-
-  if (NULL != p2)
-    GNUNET_asprintf (&p2_s,
-                     "%u (`%s')",
-                     p2->no,
-                     GNUNET_i2s (&p2->id));
-  else
-    GNUNET_asprintf (&p2_s,
-                     "`%s'",
-                     GNUNET_i2s (peer));
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Peers %s connected to peer %u (`%s')\n",
-       p2_s,
-       p->no,
-       GNUNET_i2s (&p->id));
-  GNUNET_free (p2_s);
-  /* update flags in connecting contexts */
-  found = GNUNET_NO;
-  GNUNET_TRANSPORT_TESTING_find_connecting_context (p,
-                                                    p2,
-                                                    &set_p1c,
-                                                    &found);
-  if (GNUNET_NO == found)
-  {
-    cc = GNUNET_new (struct GNUNET_TRANSPORT_TESTING_ConnectRequest);
-    cc->p1 = p;
-    cc->p2 = p2;
-    cc->p1_c = GNUNET_YES;
-    GNUNET_CONTAINER_DLL_insert (tth->cc_head,
-                                 tth->cc_tail,
-                                 cc);
-  }
-  found = GNUNET_NO;
-  GNUNET_TRANSPORT_TESTING_find_connecting_context (p2,
-                                                    p,
-                                                    &set_p2c,
-                                                    &found);
-  if (GNUNET_NO == found)
-  {
-    cc = GNUNET_new (struct GNUNET_TRANSPORT_TESTING_ConnectRequest);
-    cc->p1 = p2;
-    cc->p2 = p;
-    cc->p1_c = GNUNET_YES;
-    GNUNET_CONTAINER_DLL_insert (tth->cc_head,
-                                 tth->cc_tail,
-                                 cc);
-  }
-  GNUNET_TRANSPORT_TESTING_find_connecting_context (p,
-                                                    p2,
-                                                    &set_mq,
-                                                    mq);
-  /* update set connected flag for all requests */
-  for (cc = tth->cc_head; NULL != cc; cc = cc->next)
-  {
-    if (GNUNET_YES == cc->connected)
-      continue;
-    if ((GNUNET_YES == cc->p1_c) &&
-        (GNUNET_YES == cc->p2_c))
-    {
-      cc->connected = GNUNET_YES;
-      /* stop trying to connect */
-      if (NULL != cc->tct)
-      {
-        GNUNET_SCHEDULER_cancel (cc->tct);
-        cc->tct = NULL;
-      }
-      if (NULL != cc->ats_sh)
-      {
-        GNUNET_ATS_connectivity_suggest_cancel (cc->ats_sh);
-        cc->ats_sh = NULL;
-      }
-    }
-  }
-  /* then notify application */
-  for (cc = tth->cc_head; NULL != cc; cc = ccn)
-  {
-    ccn = cc->next;
-    if ((GNUNET_YES == cc->connected) &&
-        (NULL != cc->cb))
-    {
-      cc->cb (cc->cb_cls);
-      cc->cb = NULL;     /* only notify once! */
-    }
-  }
-  return ret;
-}
-
-
-/**
- * Offer the current HELLO of P2 to P1.
- *
- * @param cls our `struct GNUNET_TRANSPORT_TESTING_ConnectRequest`
- */
-static void
-offer_hello (void *cls);
-
-
-static void
-notify_disconnect (void *cls,
-                   const struct GNUNET_PeerIdentity *peer,
-                   void *handler_cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls;
-  struct GNUNET_TRANSPORT_TESTING_Handle *tth = p->tth;
-  char *p2_s;
-  /* Find PeerContext */
-  int no = 0;
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p2 = NULL;
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc;
-
-  p2 = find_peer_context (p->tth,
-                          peer);
-  no = p->no;
-  if (NULL != p2)
-    GNUNET_asprintf (&p2_s,
-                     "%u (`%s')",
-                     p2->no,
-                     GNUNET_i2s (&p2->id));
-  else
-    GNUNET_asprintf (&p2_s,
-                     "`%s'",
-                     GNUNET_i2s (peer));
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Peers %s disconnected from peer %u (`%s')\n",
-       p2_s,
-       no,
-       GNUNET_i2s (&p->id));
-  GNUNET_free (p2_s);
-  /* notify about disconnect */
-  if (NULL != p->nd)
-    p->nd (p->cb_cls,
-           peer,
-           handler_cls);
-  if (NULL == p2)
-    return;
-  /* clear MQ, it is now invalid */
-  GNUNET_TRANSPORT_TESTING_find_connecting_context (p,
-                                                    p2,
-                                                    &set_mq,
-                                                    NULL);
-  /* update set connected flags for all requests */
-  GNUNET_TRANSPORT_TESTING_find_connecting_context (p,
-                                                    p2,
-                                                    &clear_p1c,
-                                                    NULL);
-  GNUNET_TRANSPORT_TESTING_find_connecting_context (p2,
-                                                    p,
-                                                    &clear_p2c,
-                                                    NULL);
-  /* resume connectivity requests as necessary */
-  for (cc = tth->cc_head; NULL != cc; cc = cc->next)
-  {
-    if (GNUNET_NO == cc->connected)
-      continue;
-    if ((GNUNET_YES != cc->p1_c) ||
-        (GNUNET_YES != cc->p2_c))
-    {
-      cc->connected = GNUNET_NO;
-      /* start trying to connect */
-      if (NULL == cc->tct)
-        cc->tct = GNUNET_SCHEDULER_add_now (&offer_hello,
-                                            cc);
-      if (NULL == cc->ats_sh)
-        cc->ats_sh = GNUNET_ATS_connectivity_suggest (cc->p1->ats,
-                                                      &p2->id,
-                                                      1);
-    }
-  }
-}
-
-static void
-retrieve_hello (void *cls);
-
-static void
-hello_iter_cb (void *cb_cls,
-               const struct GNUNET_PEERSTORE_Record *record,
-               const char *emsg)
-{
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cb_cls;
-  if (NULL == record)
-  {
-    p->pic = NULL;
-    if (NULL != p->start_cb)
-      p->rh_task = GNUNET_SCHEDULER_add_now (retrieve_hello, p);
-    return;
-  }
-  // Check record type et al?
-  p->hello_size = record->value_size;
-  p->hello = GNUNET_malloc (p->hello_size);
-  memcpy (p->hello, record->value, p->hello_size);
-  p->hello[p->hello_size - 1] = '\0';
-
-  GNUNET_PEERSTORE_iterate_cancel (p->pic);
-  p->pic = NULL;
-  if (NULL != p->start_cb)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Peer %u (`%s') successfully started\n",
-         p->no,
-         GNUNET_i2s (&p->id));
-    p->start_cb (p->start_cb_cls);
-    p->start_cb = NULL;
-  }
-}
-
-
-static void
-retrieve_hello (void *cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls;
-  p->rh_task = NULL;
-  p->pic = GNUNET_PEERSTORE_iterate (p->ph,
-                                     "transport",
-                                     &p->id,
-                                     GNUNET_PEERSTORE_TRANSPORT_HELLO_KEY,
-                                     hello_iter_cb,
-                                     p);
-
-}
-
-
-/**
- * Start a peer with the given configuration
- * @param tth the testing handle
- * @param cfgname configuration file
- * @param peer_id a unique number to identify the peer
- * @param handlers functions for receiving messages
- * @param nc connect callback
- * @param nd disconnect callback
- * @param cb_cls closure for callback
- * @param start_cb start callback
- * @param start_cb_cls closure for callback
- * @return the peer context
- */
-struct GNUNET_TRANSPORT_TESTING_PeerContext *
-GNUNET_TRANSPORT_TESTING_start_peer (struct
-                                     GNUNET_TRANSPORT_TESTING_Handle *tth,
-                                     const char *cfgname,
-                                     int peer_id,
-                                     const struct
-                                     GNUNET_MQ_MessageHandler *handlers,
-                                     GNUNET_TRANSPORT_NotifyConnect nc,
-                                     GNUNET_TRANSPORT_NotifyDisconnect nd,
-                                     void *cb_cls,
-                                     GNUNET_SCHEDULER_TaskCallback start_cb,
-                                     void *start_cb_cls)
-{
-  char *emsg = NULL;
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p;
-  struct GNUNET_PeerIdentity dummy;
-  unsigned int i;
-
-  if (GNUNET_NO == GNUNET_DISK_file_test (cfgname))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "File not found: `%s'\n",
-         cfgname);
-    return NULL;
-  }
-
-  p = GNUNET_new (struct GNUNET_TRANSPORT_TESTING_PeerContext);
-  p->tth = tth;
-  p->nc = nc;
-  p->nd = nd;
-  if (NULL != handlers)
-  {
-    for (i = 0; NULL != handlers[i].cb; i++)
-      ;
-    p->handlers = GNUNET_new_array (i + 1,
-                                    struct GNUNET_MQ_MessageHandler);
-    GNUNET_memcpy (p->handlers,
-                   handlers,
-                   i * sizeof(struct GNUNET_MQ_MessageHandler));
-  }
-  if (NULL != cb_cls)
-    p->cb_cls = cb_cls;
-  else
-    p->cb_cls = p;
-  p->start_cb = start_cb;
-  if (NULL != start_cb_cls)
-    p->start_cb_cls = start_cb_cls;
-  else
-    p->start_cb_cls = p;
-  GNUNET_CONTAINER_DLL_insert (tth->p_head,
-                               tth->p_tail,
-                               p);
-
-  /* Create configuration and call testing lib to modify it */
-  p->cfg = GNUNET_CONFIGURATION_create ();
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONFIGURATION_load (p->cfg, cfgname));
-  if (GNUNET_SYSERR ==
-      GNUNET_TESTING_configuration_create (tth->tl_system,
-                                           p->cfg))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Testing library failed to create unique configuration based on `%s'\n",
-         cfgname);
-    GNUNET_CONFIGURATION_destroy (p->cfg);
-    GNUNET_free (p);
-    return NULL;
-  }
-
-  p->no = peer_id;
-  /* Configure peer with configuration */
-  p->peer = GNUNET_TESTING_peer_configure (tth->tl_system,
-                                           p->cfg,
-                                           p->no,
-                                           NULL,
-                                           &emsg);
-  if (NULL == p->peer)
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Testing library failed to create unique configuration based on `%s': `%s'\n",
-         cfgname,
-         emsg);
-    GNUNET_TRANSPORT_TESTING_stop_peer (p);
-    GNUNET_free (emsg);
-    return NULL;
-  }
-
-  if (GNUNET_OK != GNUNET_TESTING_peer_start (p->peer))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Testing library failed to create unique configuration based on `%s'\n",
-         cfgname);
-    GNUNET_TRANSPORT_TESTING_stop_peer (p);
-    return NULL;
-  }
-
-  memset (&dummy,
-          '\0',
-          sizeof(dummy));
-  GNUNET_TESTING_peer_get_identity (p->peer,
-                                    &p->id);
-  if (0 == memcmp (&dummy,
-                   &p->id,
-                   sizeof(struct GNUNET_PeerIdentity)))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Testing library failed to obtain peer identity for peer %u\n",
-         p->no);
-    GNUNET_TRANSPORT_TESTING_stop_peer (p);
-    return NULL;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Peer %u configured with identity `%s'\n",
-       p->no,
-       GNUNET_i2s_full (&p->id));
-  p->th = GNUNET_TRANSPORT_core_connect (p->cfg,
-                                         NULL,
-                                         handlers,
-                                         p,
-                                         &notify_connect,
-                                         &notify_disconnect);
-  if (NULL == p->th)
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Failed to connect to transport service for peer `%s': `%s'\n",
-         cfgname,
-         emsg);
-    GNUNET_TRANSPORT_TESTING_stop_peer (p);
-    GNUNET_free (emsg);
-    return NULL;
-  }
-  p->ats = GNUNET_ATS_connectivity_init (p->cfg);
-  if (NULL == p->ats)
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Failed to connect to ATS service for peer `%s': `%s'\n",
-         cfgname,
-         emsg);
-    GNUNET_TRANSPORT_TESTING_stop_peer (p);
-    GNUNET_free (emsg);
-    return NULL;
-  }
-  p->ph = GNUNET_PEERSTORE_connect (p->cfg);
-  // FIXME Error handling
-  p->ah = GNUNET_TRANSPORT_application_init (p->cfg);
-  GNUNET_assert (NULL != p->ah);
-  // FIXME Error handling
-  p->rh_task = GNUNET_SCHEDULER_add_now (retrieve_hello, p);
-
-  return p;
-}
-
-
-/**
- * Stops and restarts the given peer, sleeping (!) for 5s in between.
- *
- * @param p the peer
- * @param restart_cb callback to call when restarted
- * @param restart_cb_cls callback closure
- * @return #GNUNET_OK in success otherwise #GNUNET_SYSERR
- */
-int
-GNUNET_TRANSPORT_TESTING_restart_peer (struct
-                                       GNUNET_TRANSPORT_TESTING_PeerContext *p,
-                                       GNUNET_SCHEDULER_TaskCallback restart_cb,
-                                       void *restart_cb_cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc;
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *ccn;
-
-  /* shutdown */
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Stopping peer %u (`%s')\n",
-       p->no,
-       GNUNET_i2s (&p->id));
-  if (NULL != p->pic)
-  {
-    GNUNET_PEERSTORE_iterate_cancel (p->pic);
-    p->pic = NULL;
-  }
-  if (NULL != p->th)
-  {
-    GNUNET_TRANSPORT_core_disconnect (p->th);
-    p->th = NULL;
-  }
-  for (cc = p->tth->cc_head; NULL != cc; cc = ccn)
-  {
-    ccn = cc->next;
-    if ((cc->p1 == p) ||
-        (cc->p2 == p))
-      GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc);
-  }
-  if (NULL != p->ats)
-  {
-    GNUNET_ATS_connectivity_done (p->ats);
-    p->ats = NULL;
-  }
-  if (GNUNET_SYSERR ==
-      GNUNET_TESTING_peer_stop (p->peer))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Failed to stop peer %u (`%s')\n",
-         p->no,
-         GNUNET_i2s (&p->id));
-    return GNUNET_SYSERR;
-  }
-
-  sleep (5);  // YUCK!
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Restarting peer %u (`%s')\n",
-       p->no,
-       GNUNET_i2s (&p->id));
-  /* restart */
-  if (GNUNET_SYSERR == GNUNET_TESTING_peer_start (p->peer))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Failed to restart peer %u (`%s')\n",
-         p->no,
-         GNUNET_i2s (&p->id));
-    return GNUNET_SYSERR;
-  }
-
-  GNUNET_assert (NULL == p->start_cb);
-  p->start_cb = restart_cb;
-  p->start_cb_cls = restart_cb_cls;
-
-  p->th = GNUNET_TRANSPORT_core_connect (p->cfg,
-                                         NULL,
-                                         p->handlers,
-                                         p,
-                                         &notify_connect,
-                                         &notify_disconnect);
-  GNUNET_assert (NULL != p->th);
-  p->ats = GNUNET_ATS_connectivity_init (p->cfg);
-  p->pic = GNUNET_PEERSTORE_iterate (p->ph,
-                                     "transport",
-                                     &p->id,
-                                     GNUNET_PEERSTORE_TRANSPORT_HELLO_KEY,
-                                     hello_iter_cb,
-                                     p);
-  GNUNET_assert (NULL != p->pic);
-  return GNUNET_OK;
-}
-
-
-/**
- * Shutdown the given peer
- *
- * @param p the peer
- */
-void
-GNUNET_TRANSPORT_TESTING_stop_peer (struct
-                                    GNUNET_TRANSPORT_TESTING_PeerContext *p)
-{
-  struct GNUNET_TRANSPORT_TESTING_Handle *tth = p->tth;
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc;
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *ccn;
-  /* shutdown */
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Stopping peer %u (`%s')\n",
-       p->no,
-       GNUNET_i2s (&p->id));
-
-  for (cc = tth->cc_head; NULL != cc; cc = ccn)
-  {
-    ccn = cc->next;
-    if ((cc->p1 == p) ||
-        (cc->p2 == p))
-      GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc);
-  }
-  if (NULL != p->pic)
-  {
-    GNUNET_PEERSTORE_iterate_cancel (p->pic);
-    p->pic = NULL;
-  }
-  if (NULL != p->th)
-  {
-    GNUNET_TRANSPORT_core_disconnect (p->th);
-    p->th = NULL;
-  }
-  if (NULL != p->ats)
-  {
-    GNUNET_ATS_connectivity_done (p->ats);
-    p->ats = NULL;
-  }
-  if (NULL != p->ah)
-  {
-    GNUNET_TRANSPORT_application_done (p->ah);
-    p->ah = NULL;
-  }
-  if (NULL != p->ph)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Disconnecting from PEERSTORE service\n");
-    GNUNET_PEERSTORE_disconnect (p->ph, GNUNET_NO);
-    p->ph = NULL;
-  }
-
-  if (NULL != p->peer)
-  {
-    if (GNUNET_OK !=
-        GNUNET_TESTING_peer_stop (p->peer))
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Testing lib failed to stop peer %u (`%s')\n",
-           p->no,
-           GNUNET_i2s (&p->id));
-    }
-    GNUNET_TESTING_peer_destroy (p->peer);
-    p->peer = NULL;
-  }
-  if (NULL != p->hello)
-  {
-    GNUNET_free (p->hello);
-    p->hello = NULL;
-  }
-  if (NULL != p->cfg)
-  {
-    GNUNET_CONFIGURATION_destroy (p->cfg);
-    p->cfg = NULL;
-  }
-  if (NULL != p->handlers)
-  {
-    GNUNET_free (p->handlers);
-    p->handlers = NULL;
-  }
-  GNUNET_CONTAINER_DLL_remove (tth->p_head,
-                               tth->p_tail,
-                               p);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Peer %u (`%s') stopped\n",
-       p->no,
-       GNUNET_i2s (&p->id));
-  if (NULL != p->rh_task)
-    GNUNET_SCHEDULER_cancel (p->rh_task);
-  p->rh_task = NULL;
-  GNUNET_free (p);
-}
-
-
-/**
- * Function called after the HELLO was passed to the
- * transport service.
- * FIXME maybe schedule the application_validate somehow
- */
-/*
-   static void
-   hello_offered (void *cls)
-   {
-   struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc = cls;
-
-   cc->oh = NULL;
-   cc->tct = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-   &offer_hello,
-   cc);
-   }*/
-
-
-/**
- * Offer the current HELLO of P2 to P1.
- *
- * @param cls our `struct GNUNET_TRANSPORT_TESTING_ConnectRequest`
- */
-static void
-offer_hello (void *cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc = cls;
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p1 = cc->p1;
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p2 = cc->p2;
-  struct GNUNET_TIME_Absolute t;
-  enum GNUNET_NetworkType nt = 0;
-  char *addr;
-
-  cc->tct = NULL;
-  {
-    char *p2_s = GNUNET_strdup (GNUNET_i2s (&p2->id));
-
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Asking peer %u (`%s') to connect peer %u (`%s'), providing HELLO with %s\n",
-         p1->no,
-         GNUNET_i2s (&p1->id),
-         p2->no,
-         p2_s,
-         p2->hello);
-    GNUNET_free (p2_s);
-  }
-
-  addr = GNUNET_HELLO_extract_address (p2->hello,
-                                       p2->hello_size,
-                                       &p2->id,
-                                       &nt,
-                                       &t);
-  GNUNET_assert (NULL != addr);
-  GNUNET_assert (NULL != p1->hello);
-  GNUNET_TRANSPORT_application_validate (p1->ah,
-                                         &p2->id,
-                                         nt,
-                                         addr);
-  GNUNET_free (addr);
-}
-
-
-/**
- * Initiate a connection from p1 to p2 by offering p1 p2's HELLO message
- *
- * Remarks: start_peer's notify_connect callback can be called before.
- *
- * @param tth transport testing handle
- * @param p1 peer 1
- * @param p2 peer 2
- * @param cb the callback to call when both peers notified that they are connected
- * @param cls callback cls
- * @return a connect request handle
- */
-struct GNUNET_TRANSPORT_TESTING_ConnectRequest *
-GNUNET_TRANSPORT_TESTING_connect_peers (struct
-                                        GNUNET_TRANSPORT_TESTING_PeerContext *p1,
-                                        struct
-                                        GNUNET_TRANSPORT_TESTING_PeerContext *p2,
-                                        GNUNET_SCHEDULER_TaskCallback cb,
-                                        void *cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_Handle *tth = p1->tth;
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc;
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *ccn;
-
-  ccn = NULL;
-  for (cc = tth->cc_head; NULL != cc; cc = cc->next)
-  {
-    if ((cc->p1 == p1) &&
-        (cc->p2 == p2))
-    {
-      ccn = cc;
-      break;
-    }
-  }
-
-  cc = GNUNET_new (struct GNUNET_TRANSPORT_TESTING_ConnectRequest);
-  cc->p1 = p1;
-  cc->p2 = p2;
-  cc->cb = cb;
-  if (NULL != cls)
-    cc->cb_cls = cls;
-  else
-    cc->cb_cls = cc;
-  if (NULL != ccn)
-  {
-    cc->p1_c = ccn->p1_c;
-    cc->p2_c = ccn->p2_c;
-    cc->connected = ccn->connected;
-  }
-  GNUNET_CONTAINER_DLL_insert (tth->cc_head,
-                               tth->cc_tail,
-                               cc);
-  cc->tct = GNUNET_SCHEDULER_add_now (&offer_hello,
-                                      cc);
-  cc->ats_sh = GNUNET_ATS_connectivity_suggest (cc->p1->ats,
-                                                &p2->id,
-                                                1);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "New connect request %p\n",
-       cc);
-  return cc;
-}
-
-
-/**
- * Cancel the request to connect two peers
- * Tou MUST cancel the request if you stop the peers before the peers connected successfully
- *
- * @param tth transport testing handle
- * @param cc a connect request handle
- */
-void
-GNUNET_TRANSPORT_TESTING_connect_peers_cancel (struct
-                                               GNUNET_TRANSPORT_TESTING_ConnectRequest
-                                               *cc)
-{
-  struct GNUNET_TRANSPORT_TESTING_Handle *tth = cc->p1->tth;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Canceling connect request!\n");
-  if (NULL != cc->tct)
-  {
-    GNUNET_SCHEDULER_cancel (cc->tct);
-    cc->tct = NULL;
-  }
-  if (NULL != cc->ats_sh)
-  {
-    GNUNET_ATS_connectivity_suggest_cancel (cc->ats_sh);
-    cc->ats_sh = NULL;
-  }
-  GNUNET_CONTAINER_DLL_remove (tth->cc_head,
-                               tth->cc_tail,
-                               cc);
-  GNUNET_free (cc);
-}
-
-
-/**
- * Clean up the transport testing
- *
- * @param tth transport testing handle
- */
-void
-GNUNET_TRANSPORT_TESTING_done (struct GNUNET_TRANSPORT_TESTING_Handle *tth)
-{
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc;
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *ct;
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p;
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *t;
-
-  if (NULL == tth)
-    return;
-  cc = tth->cc_head;
-  while (NULL != cc)
-  {
-    ct = cc->next;
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Developer forgot to cancel connect request!\n");
-    GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc);
-    cc = ct;
-  }
-  p = tth->p_head;
-  while (NULL != p)
-  {
-    t = p->next;
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Developer forgot to stop peer!\n");
-    GNUNET_TRANSPORT_TESTING_stop_peer (p);
-    p = t;
-  }
-  GNUNET_TESTING_system_destroy (tth->tl_system,
-                                 GNUNET_YES);
-
-  GNUNET_free (tth);
-}
-
-
-/**
- * Initialize the transport testing
- *
- * @return transport testing handle
- */
-struct GNUNET_TRANSPORT_TESTING_Handle *
-GNUNET_TRANSPORT_TESTING_init ()
-{
-  struct GNUNET_TRANSPORT_TESTING_Handle *tth;
-
-  tth = GNUNET_new (struct GNUNET_TRANSPORT_TESTING_Handle);
-  tth->tl_system = GNUNET_TESTING_system_create ("transport-testing",
-                                                 NULL,
-                                                 NULL,
-                                                 NULL);
-  if (NULL == tth->tl_system)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to initialize testing library!\n");
-    GNUNET_free (tth);
-    return NULL;
-  }
-  return tth;
-}
-
-
-/* end of transport-testing.c */
diff --git a/src/transport/transport-testing2.h b/src/transport/transport-testing2.h
deleted file mode 100644
index e2167ca7e..000000000
--- a/src/transport/transport-testing2.h
+++ /dev/null
@@ -1,924 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2006, 2009, 2015, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport-testing.h
- * @brief testing lib for transport service
- * @author Matthias Wachs
- * @author Christian Grothoff
- */
-#ifndef TRANSPORT_TESTING_H
-#define TRANSPORT_TESTING_H
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_peerstore_service.h"
-#include "gnunet_transport_core_service.h"
-#include "gnunet_transport_application_service.h"
-#include "gnunet_transport_manipulation_service.h"
-#include "gnunet_testing_lib.h"
-
-
-/* ************* Basic functions for starting/stopping/connecting *********** */
-
-/**
- * Context for a single peer
- */
-struct GNUNET_TRANSPORT_TESTING_PeerContext;
-
-/**
- * Definition for a transport testing handle
- */
-struct GNUNET_TRANSPORT_TESTING_Handle;
-
-
-/**
- * Context for a single peer
- */
-struct GNUNET_TRANSPORT_TESTING_PeerContext
-{
-  /**
-   * Next element in the DLL
-   */
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *next;
-
-  /**
-   * Previous element in the DLL
-   */
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *prev;
-
-  /**
-   * Transport testing handle this peer belongs to
-   */
-  struct GNUNET_TRANSPORT_TESTING_Handle *tth;
-
-  /**
-   * Application handle
-   */
-  struct GNUNET_TRANSPORT_ApplicationHandle *ah;
-
-  /**
-   * Peer's configuration
-   */
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  /**
-   * Peer's transport service handle
-   */
-  struct GNUNET_TRANSPORT_CoreHandle *th;
-
-  /**
-   * Peer's ATS handle.
-   */
-  struct GNUNET_ATS_ConnectivityHandle *ats;
-
-  /**
-   * Peer's PEERSTORE Handle
-   */
-  struct GNUNET_PEERSTORE_Handle *ph;
-
-  /**
-   * Peer's transport get hello handle to retrieve peer's HELLO message
-   */
-  struct GNUNET_PEERSTORE_IterateContext *pic;
-
-  /**
-   * Hello
-   */
-  char *hello;
-
-  /**
-   * Hello size
-   */
-  size_t hello_size;
-
-  /**
-   * Peer's testing handle
-   */
-  struct GNUNET_TESTING_Peer *peer;
-
-  /**
-   * Peer identity
-   */
-  struct GNUNET_PeerIdentity id;
-
-  /**
-   * Handle for the peer's ARM process
-   */
-  struct GNUNET_OS_Process *arm_proc;
-
-  /**
-   * Receive callback
-   */
-  struct GNUNET_MQ_MessageHandler *handlers;
-
-  /**
-   * Notify connect callback
-   */
-  GNUNET_TRANSPORT_NotifyConnect nc;
-
-  /**
-   * Notify disconnect callback
-   */
-  GNUNET_TRANSPORT_NotifyDisconnect nd;
-
-  /**
-   * Startup completed callback
-   */
-  GNUNET_SCHEDULER_TaskCallback start_cb;
-
-  /**
-   * Hello get task
-   */
-  struct GNUNET_SCHEDULER_Task *rh_task;
-
-  /**
-   * Closure for the @a nc and @a nd callbacks
-   */
-  void *cb_cls;
-
-  /**
-   * Closure for @e start_cb.
-   */
-  void *start_cb_cls;
-
-  /**
-   * An unique number to identify the peer
-   */
-  unsigned int no;
-};
-
-
-/**
- * Handle for a request to connect two peers.
- */
-struct GNUNET_TRANSPORT_TESTING_ConnectRequest
-{
-  /**
-   * Kept in a DLL.
-   */
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *next;
-
-  /**
-   * Kept in a DLL.
-   */
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *prev;
-
-  /**
-   * Peer we want to connect.
-   */
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p1;
-
-  /**
-   * Peer we want to connect.
-   */
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p2;
-
-  /**
-   * Task by which we accomplish the connection.
-   */
-  struct GNUNET_SCHEDULER_Task *tct;
-
-  /**
-   * Handle by which we ask ATS to facilitate the connection.
-   */
-  struct GNUNET_ATS_ConnectivitySuggestHandle *ats_sh;
-
-  /**
-   * Function to call upon completion.
-   */
-  GNUNET_SCHEDULER_TaskCallback cb;
-
-  /**
-   * Closure for @e cb.
-   */
-  void *cb_cls;
-
-  /**
-   * Message queue for sending from @a p1 to @a p2.
-   */
-  struct GNUNET_MQ_Handle *mq;
-
-  /**
-   * Set if peer1 says the connection is up to peer2.
-   */
-  int p1_c;
-
-  /**
-   * Set if peer2 says the connection is up to peer1.
-   */
-  int p2_c;
-
-  /**
-   * #GNUNET_YES if both @e p1_c and @e p2_c are #GNUNET_YES.
-   */
-  int connected;
-};
-
-
-/**
- * Handle for a test run.
- */
-struct GNUNET_TRANSPORT_TESTING_Handle
-{
-  /**
-   * Testing library system handle
-   */
-  struct GNUNET_TESTING_System *tl_system;
-
-  /**
-   * head DLL of connect contexts
-   */
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc_head;
-
-  /**
-   * head DLL of connect contexts
-   */
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc_tail;
-
-  /**
-   * head DLL of peers
-   */
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p_head;
-
-  /**
-   * tail DLL of peers
-   */
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p_tail;
-};
-
-
-/**
- * Initialize the transport testing
- *
- * @return transport testing handle
- */
-struct GNUNET_TRANSPORT_TESTING_Handle *
-GNUNET_TRANSPORT_TESTING_init (void);
-
-
-/**
- * Clean up the transport testing
- *
- * @param tth transport testing handle
- */
-void
-GNUNET_TRANSPORT_TESTING_done (struct GNUNET_TRANSPORT_TESTING_Handle *tth);
-
-
-/**
- * Start a peer with the given configuration
- *
- * @param tth the testing handle
- * @param cfgname configuration file
- * @param peer_id the peer_id
- * @param handlers functions for receiving messages
- * @param nc connect callback
- * @param nd disconnect callback
- * @param cb_cls closure for @a nc and @a nd callback
- * @param start_cb start callback
- * @param start_cb_cls closure for @a start_cb
- * @return the peer context
- */
-struct GNUNET_TRANSPORT_TESTING_PeerContext *
-GNUNET_TRANSPORT_TESTING_start_peer (
-  struct GNUNET_TRANSPORT_TESTING_Handle *tth,
-  const char *cfgname,
-  int peer_id,
-  const struct GNUNET_MQ_MessageHandler *handlers,
-  GNUNET_TRANSPORT_NotifyConnect nc,
-  GNUNET_TRANSPORT_NotifyDisconnect nd,
-  void *cb_cls,
-  GNUNET_SCHEDULER_TaskCallback start_cb,
-  void *start_cb_cls);
-
-
-/**
- * Shutdown the given peer
- *
- * @param p the peer
- */
-void
-GNUNET_TRANSPORT_TESTING_stop_peer (
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *pc);
-
-
-/**
- * Stops and restarts the given peer, sleeping (!) for 5s in between.
- *
- * @param p the peer
- * @param restart_cb restart callback
- * @param restart_cb_cls callback closure
- * @return #GNUNET_OK in success otherwise #GNUNET_SYSERR
- */
-int
-GNUNET_TRANSPORT_TESTING_restart_peer (
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p,
-  GNUNET_SCHEDULER_TaskCallback restart_cb,
-  void *restart_cb_cls);
-
-
-/**
- * Connect the given peers and call the callback when both peers
- * report the inbound connection. Remarks: start_peer's notify_connect
- * callback can be called before.
- *
- * @param p1 peer 1
- * @param p2 peer 2
- * @param cb the callback to call when both peers notified that they are
- * connected
- * @param cls callback cls
- * @return a connect request handle
- */
-struct GNUNET_TRANSPORT_TESTING_ConnectRequest *
-GNUNET_TRANSPORT_TESTING_connect_peers (
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p1,
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p2,
-  GNUNET_SCHEDULER_TaskCallback cb,
-  void *cls);
-
-
-/**
- * Cancel the request to connect two peers.  You MUST cancel the
- * request if you stop the peers before the peers connected
- * successfully.
- *
- * @param cc a connect request handle
- */
-void
-GNUNET_TRANSPORT_TESTING_connect_peers_cancel (
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc);
-
-
-/**
- * Function called on matching connect requests.
- *
- * @param cls closure
- * @param cc request matching the query
- */
-typedef void (*GNUNET_TRANSPORT_TESTING_ConnectContextCallback) (
-  void *cls,
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc);
-
-
-/**
- * Find any connecting context matching the given pair of peers.
- *
- * @param p1 first peer
- * @param p2 second peer
- * @param cb function to call
- * @param cb_cls closure for @a cb
- */
-void
-GNUNET_TRANSPORT_TESTING_find_connecting_context (
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p1,
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p2,
-  GNUNET_TRANSPORT_TESTING_ConnectContextCallback cb,
-  void *cb_cls);
-
-
-/* ********************** high-level process functions *************** */
-
-
-/**
- * Function called once the peers have been launched and
- * connected by #GNUNET_TRANSPORT_TESTING_connect_check().
- *
- * @param cls closure
- * @param num_peers size of the @a p array
- * @param p the peers that were launched
- */
-typedef void (*GNUNET_TRANSPORT_TESTING_ConnectContinuation) (
-  void *cls,
-  unsigned int num_peers,
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *p[]);
-
-
-/**
- * Internal data structure.
- */
-struct GNUNET_TRANSPORT_TESTING_ConnectRequestList;
-
-/**
- * Internal data structure.
- */
-struct GNUNET_TRANSPORT_TESTING_InternalPeerContext;
-
-
-GNUNET_NETWORK_STRUCT_BEGIN
-struct GNUNET_TRANSPORT_TESTING_TestMessage
-{
-  /**
-   * Type is (usually) #GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Monotonically increasing counter throughout the test.
-   */
-  uint32_t num GNUNET_PACKED;
-};
-GNUNET_NETWORK_STRUCT_END
-
-
-/**
- * Function called by the transport for each received message.
- *
- * @param cls closure
- * @param receiver receiver of the message
- * @param sender sender of the message
- * @param message the message
- */
-typedef void (*GNUNET_TRANSPORT_TESTING_ReceiveCallback) (
-  void *cls,
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *receiver,
-  const struct GNUNET_PeerIdentity *sender,
-  const struct GNUNET_TRANSPORT_TESTING_TestMessage *message);
-
-
-/**
- * Function called to notify transport users that another
- * peer connected to us.
- *
- * @param cls closure
- * @param me peer experiencing the event
- * @param other peer that connected to @a me
- */
-typedef void (*GNUNET_TRANSPORT_TESTING_NotifyConnect) (
-  void *cls,
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *me,
-  const struct GNUNET_PeerIdentity *other);
-
-
-/**
- * Function called to notify transport users that another
- * peer disconnected from us.
- *
- * @param cls closure
- * @param me peer experiencing the event
- * @param other peer that disconnected from @a me
- */
-typedef void (*GNUNET_TRANSPORT_TESTING_NotifyDisconnect) (
-  void *cls,
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *me,
-  const struct GNUNET_PeerIdentity *other);
-
-
-/**
- * Closure that must be passed to
- * #GNUNET_TRANSPORT_TESTING_connect_check.
- */
-struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext
-{
-  /**
-   * How should we continue after the connect?
-   */
-  GNUNET_SCHEDULER_TaskCallback connect_continuation;
-
-  /**
-   * Closure for @e connect_continuation.
-   */
-  void *connect_continuation_cls;
-
-  /**
-   * Which configuration file should we pass to the
-   * #GNUNET_PROGRAM_run() of the testcase?
-   */
-  const char *config_file;
-
-  /**
-   * Receiver argument to give for peers we start.
-   */
-  GNUNET_TRANSPORT_TESTING_ReceiveCallback rec;
-
-  /**
-   * Notify connect argument to give for peers we start.
-   */
-  GNUNET_TRANSPORT_TESTING_NotifyConnect nc;
-
-  /**
-   * Notify disconnect argument to give for peers we start.
-   */
-  GNUNET_TRANSPORT_TESTING_NotifyDisconnect nd;
-
-  /**
-   * Closure for @e rec, @e nc and @e nd.
-   */
-  void *cls;
-
-  /**
-   * Custom task to run on shutdown.
-   */
-  GNUNET_SCHEDULER_TaskCallback shutdown_task;
-
-  /**
-   * Closure for @e shutdown_task.
-   */
-  void *shutdown_task_cls;
-
-  /**
-   * Custom task to run after peers were started but before we try to
-   * connect them.  If this function is set, we wait ONE second after
-   * running this function until we continue with connecting the
-   * peers.
-   */
-  GNUNET_SCHEDULER_TaskCallback pre_connect_task;
-
-  /**
-   * Closure for @e shutdown_task.
-   */
-  void *pre_connect_task_cls;
-
-  /**
-   * When should the testcase time out?
-   */
-  struct GNUNET_TIME_Relative timeout;
-
-  /**
-   * Should we try to create connections in both directions?
-   */
-  int bi_directional;
-
-  /* ******* fields set by #GNUNET_TRANSPORT_TESTING_connect_check **** */
-
-  /**
-   * Number of peers involved in the test.
-   */
-  unsigned int num_peers;
-
-  /**
-   * Configuration files we have, array with @e num_peers entries.
-   */
-  char **cfg_files;
-
-  /**
-   * Array with @e num_peers entries.
-   */
-  struct GNUNET_TRANSPORT_TESTING_PeerContext **p;
-
-  /**
-   * Name of the plugin.
-   */
-  const char *test_plugin;
-
-  /**
-   * Name of the testcase.
-   */
-  const char *test_name;
-
-  /**
-   * Configuration object for the testcase.
-   */
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  /**
-   * Main testing handle.
-   */
-  struct GNUNET_TRANSPORT_TESTING_Handle *tth;
-
-  /**
-   * Result from the main function, set to #GNUNET_OK on success.
-   * Clients should set to #GNUNET_SYSERR to indicate test failure.
-   */
-  int global_ret;
-
-  /**
-   * Generator for the `num` field in test messages.  Incremented each
-   * time #GNUNET_TRANSPORT_TESTING_simple_send or
-   * #GNUNET_TRANSPORT_TESTING_large_send are used to transmit a
-   * message.
-   */
-  uint32_t send_num_gen;
-
-  /* ******* internal state, clients should not mess with this **** */
-
-  /**
-   * Task run on timeout.
-   */
-  struct GNUNET_SCHEDULER_Task *timeout_task;
-
-  /**
-   * Task run to connect peers.
-   */
-  struct GNUNET_SCHEDULER_Task *connect_task;
-
-  /**
-   * Number of peers that have been started.
-   */
-  unsigned int started;
-
-  /**
-   * DLL of active connect requests.
-   */
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequestList *crl_head;
-
-  /**
-   * DLL of active connect requests.
-   */
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequestList *crl_tail;
-
-  /**
-   * Array with @e num_peers entries.
-   */
-  struct GNUNET_TRANSPORT_TESTING_InternalPeerContext *ip;
-};
-
-
-/**
- * Find peer by peer ID.
- *
- * @param ccc context to search
- * @param peer peer to look for
- * @return NULL if @a peer was not found
- */
-struct GNUNET_TRANSPORT_TESTING_PeerContext *
-GNUNET_TRANSPORT_TESTING_find_peer (
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc,
-  const struct GNUNET_PeerIdentity *peer);
-
-
-/**
- * Common implementation of the #GNUNET_TRANSPORT_TESTING_CheckCallback.
- * Starts and connects the two peers, then invokes the
- * `connect_continuation` from @a cls.  Sets up a timeout to
- * abort the test, and a shutdown handler to clean up properly
- * on exit.
- *
- * @param cls closure of type `struct
- * GNUNET_TRANSPORT_TESTING_ConnectCheckContext`
- * @param tth_ initialized testing handle
- * @param test_plugin_ name of the plugin
- * @param test_name_ name of the test
- * @param num_peers number of entries in the @a cfg_file array
- * @param cfg_files array of names of configuration files for the peers
- * @return #GNUNET_SYSERR on error
- */
-int
-GNUNET_TRANSPORT_TESTING_connect_check (
-  void *cls,
-  struct GNUNET_TRANSPORT_TESTING_Handle *tth_,
-  const char *test_plugin_,
-  const char *test_name_,
-  unsigned int num_peers,
-  char *cfg_files[]);
-
-
-/**
- * Main function of a testcase.  Called with the initial setup data
- * for the test as derived from the source name and the binary name.
- *
- * @param cls closure
- * @param tth_ initialized testing handle
- * @param test_plugin_ name of the plugin
- * @param test_name_ name of the test
- * @param num_peers number of entries in the @a cfg_file array
- * @param cfg_files array of names of configuration files for the peers
- * @return #GNUNET_SYSERR on error
- */
-typedef int (*GNUNET_TRANSPORT_TESTING_CheckCallback) (
-  void *cls,
-  struct GNUNET_TRANSPORT_TESTING_Handle *tth_,
-  const char *test_plugin_,
-  const char *test_name_,
-  unsigned int num_peers,
-  char *cfg_files[]);
-
-
-/**
- * Setup testcase.  Calls @a check with the data the test needs.
- *
- * @param argv0 binary name (argv[0])
- * @param filename source file name (__FILE__)
- * @param num_peers number of peers to start
- * @param check main function to run
- * @param check_cls closure for @a check
- * @return #GNUNET_OK on success
- */
-int
-GNUNET_TRANSPORT_TESTING_main_ (const char *argv0,
-                                const char *filename,
-                                unsigned int num_peers,
-                                GNUNET_TRANSPORT_TESTING_CheckCallback check,
-                                void *check_cls);
-
-
-/**
- * Setup testcase.  Calls @a check with the data the test needs.
- *
- * @param num_peers number of peers to start
- * @param check main function to run
- * @param check_cls closure for @a check
- * @return #GNUNET_OK on success
- */
-#define GNUNET_TRANSPORT_TESTING_main(num_peers, check, check_cls) \
-  GNUNET_TRANSPORT_TESTING_main_ (argv[0],                         \
-                                  __FILE__,                        \
-                                  num_peers,                       \
-                                  check,                           \
-                                  check_cls)
-
-/* ***************** Convenience functions for sending ********* */
-
-/**
- * Send a test message of type @a mtype and size @a msize from
- * peer @a sender to peer @a receiver.  The peers should be
- * connected when this function is called.
- *
- * @param sender the sending peer
- * @param receiver the receiving peer
- * @param mtype message type to use
- * @param msize size of the message, at least `sizeof (struct
- * GNUNET_TRANSPORT_TESTING_TestMessage)`
- * @param num unique message number
- * @param cont continuation to call after transmission
- * @param cont_cls closure for @a cont
- * @return #GNUNET_OK if message was queued,
- *         #GNUNET_NO if peers are not connected
- *         #GNUNET_SYSERR if @a msize is illegal
- */
-int
-GNUNET_TRANSPORT_TESTING_send (
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *sender,
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *receiver,
-  uint16_t mtype,
-  uint16_t msize,
-  uint32_t num,
-  GNUNET_SCHEDULER_TaskCallback cont,
-  void *cont_cls);
-
-
-/**
- * Message type used by #GNUNET_TRANSPORT_TESTING_simple_send().
- */
-#define GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE 12345
-
-/**
- * Alternative message type for tests.
- */
-#define GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE2 12346
-
-
-/**
- * Type of the closure argument to pass to
- * #GNUNET_TRANSPORT_TESTING_simple_send() and
- * #GNUNET_TRANSPORT_TESTING_large_send().
- */
-struct GNUNET_TRANSPORT_TESTING_SendClosure
-{
-  /**
-   * Context for the transmission.
-   */
-  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc;
-
-  /**
-   * Function that returns the desired message size. Overrides
-   * the message size, can be NULL in which case the message
-   * size is the default.
-   */
-  size_t (*get_size_cb) (unsigned int n);
-
-  /**
-   * Number of messages to be transmitted in a loop.
-   * Use zero for "forever" (until external shutdown).
-   */
-  unsigned int num_messages;
-
-  /**
-   * Function to call after all transmissions, can be NULL.
-   */
-  GNUNET_SCHEDULER_TaskCallback cont;
-
-  /**
-   * Closure for @e cont.
-   */
-  void *cont_cls;
-};
-
-
-/**
- * Task that sends a minimalistic test message from the
- * first peer to the second peer.
- *
- * @param cls the `struct GNUNET_TRANSPORT_TESTING_SendClosure`
- *        which should contain at least two peers, the first two
- *        of which should be currently connected
- */
-void
-GNUNET_TRANSPORT_TESTING_simple_send (void *cls);
-
-/**
- * Size of a message sent with
- * #GNUNET_TRANSPORT_TESTING_large_send().  Big enough
- * to usually force defragmentation.
- */
-#define GNUNET_TRANSPORT_TESTING_LARGE_MESSAGE_SIZE 2600
-
-/**
- * Task that sends a large test message from the
- * first peer to the second peer.
- *
- * @param cls the `struct GNUNET_TRANSPORT_TESTING_SendClosure`
- *        which should contain at least two peers, the first two
- *        of which should be currently connected
- */
-void
-GNUNET_TRANSPORT_TESTING_large_send (void *cls);
-
-
-/* ********************** log-only convenience functions ************* */
-
-
-/**
- * Log a connect event.
- *
- * @param cls NULL
- * @param me peer that had the event
- * @param other peer that connected.
- */
-void
-GNUNET_TRANSPORT_TESTING_log_connect (
-  void *cls,
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *me,
-  const struct GNUNET_PeerIdentity *other);
-
-
-/**
- * Log a disconnect event.
- *
- * @param cls NULL
- * @param me peer that had the event
- * @param other peer that disconnected.
- */
-void
-GNUNET_TRANSPORT_TESTING_log_disconnect (
-  void *cls,
-  struct GNUNET_TRANSPORT_TESTING_PeerContext *me,
-  const struct GNUNET_PeerIdentity *other);
-
-
-/* ********************** low-level filename functions *************** */
-
-
-/**
- * Extracts the test filename from an absolute file name and removes
- * the extension.
- *
- * @param file absolute file name
- * @return resulting test name
- */
-char *
-GNUNET_TRANSPORT_TESTING_get_test_name (const char *file);
-
-
-/**
- * This function takes the filename (e.g. argv[0), removes a "lt-"-prefix and
- * if existing ".exe"-prefix and adds the peer-number
- *
- * @param file filename of the test, e.g. argv[0]
- * @param count peer number
- * @return configuration name to use
- */
-char *
-GNUNET_TRANSPORT_TESTING_get_config_name (const char *file, int count);
-
-
-/**
- * Extracts the plugin anme from an absolute file name and the test name
- * @param file absolute file name
- * @param test test name
- * @return the plugin name
- */
-char *
-GNUNET_TRANSPORT_TESTING_get_test_plugin_name (const char *executable,
-                                               const char *testname);
-
-
-/**
- * Extracts the filename from an absolute file name and removes the
- * extension
- *
- * @param file absolute file name
- * @return the source name
- */
-char *
-GNUNET_TRANSPORT_TESTING_get_test_source_name (const char *file);
-
-#endif
-/* end of transport_testing.h */
diff --git a/src/transport/transport.conf.in b/src/transport/transport.conf.in
deleted file mode 100644
index c6b207ad7..000000000
--- a/src/transport/transport.conf.in
+++ /dev/null
@@ -1,237 +0,0 @@
-[transport]
-START_ON_DEMAND = @START_ON_DEMAND@
-@JAVAPORT@PORT = 2091
-HOSTNAME = localhost
-BINARY = gnunet-service-transport
-# PREFIX = valgrind
-
-# Maximum number of neighbours PER PLUGIN (not in total).
-NEIGHBOUR_LIMIT = 50
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-# TCP is the only transport plugin known to work "reliably"
-PLUGINS = tcp
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport.sock
-BLACKLIST_FILE = $GNUNET_CONFIG_HOME/transport/blacklist
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-# DISABLE_SOCKET_FORWARDING = NO
-# USERNAME =
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX = valgrind --leak-check=full
-
-# Configuration settings related to traffic manipulation for testing purposes
-# Distance
-# MANIPULATE_DISTANCE_IN = 1
-# MANIPULATE_DISTANCE_OUT = 1
-# Delay; WARNING: to large values may lead to peers not connecting!
-# MANIPULATE_DELAY_IN = 1 ms
-# MANIPULATE_DELAY_OUT = 1 ms
-
-
-[transport-unix]
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-transport-plugin-unix.sock
-TESTING_IGNORE_KEYS = ACCEPT_FROM;
-
-[transport-tcp]
-# Use 0 to ONLY advertise as a peer behind NAT (no port binding)
-PORT = 2086
-
-# Obsolete option, to be replaced by HOLE_EXTERNAL (soon)
-ADVERTISED_PORT = 2086
-
-# If we have a manually punched NAT, what is the external IP and port?
-# Can use DNS names for DynDNS-based detection of external IP.
-# Can use IPv6 addresses ([fefc::]:PORT).
-# Use "AUTO" for the hostname to automatically detect external IP.
-# Do not set if NAT is not manually punched.
-# HOLE_EXTERNAL = AUTO:2086
-
-TESTING_IGNORE_KEYS = ACCEPT_FROM;
-
-# Maximum number of open TCP connections allowed
-MAX_CONNECTIONS = 128
-
-TIMEOUT = 5 s
-# ACCEPT_FROM =
-# ACCEPT_FROM6 =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# BINDTO =
-MAX_CONNECTIONS = 128
-
-# Enable TCP stealth?
-TCP_STEALTH = NO
-
-
-
-[transport-xt]
-# Use 0 to ONLY advertise as a peer behind NAT (no port binding)
-PORT = 2087
-
-# Obsolete option, to be replaced by HOLE_EXTERNAL (soon)
-ADVERTISED_PORT = 2087
-
-# If we have a manually punched NAT, what is the external IP and port?
-# Can use DNS names for DynDNS-based detection of external IP.
-# Can use IPv6 addresses ([fefc::]:PORT).
-# Use "AUTO" for the hostname to automatically detect external IP.
-# Do not set if NAT is not manually punched.
-# HOLE_EXTERNAL = AUTO:2087
-
-TESTING_IGNORE_KEYS = ACCEPT_FROM;
-
-# Maximum number of open TCP connections allowed
-MAX_CONNECTIONS = 128
-
-TIMEOUT = 5 s
-# ACCEPT_FROM =
-# ACCEPT_FROM6 =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# BINDTO =
-MAX_CONNECTIONS = 128
-
-# Enable TCP stealth?
-TCP_STEALTH = NO
-
-
-[transport-udp]
-# Use PORT = 0 to autodetect a port available
-PORT = 2086
-BROADCAST = YES
-BROADCAST_RECEIVE = YES
-BROADCAST_INTERVAL = 30 s
-
-# This limits UDP to 1MB/s for SENDING. Higher values are advised
-# for benchmarking or well-connected systems.  Note that this quota
-# applies IN ADDITION to the system-wide transport-wide WAN/LAN
-# quotas.
-MAX_BPS = 1000000
-TESTING_IGNORE_KEYS = ACCEPT_FROM;
-
-# If we have a manually punched NAT, what is the external IP and port?
-# Can use DNS names for DynDNS-based detection of external IP.
-# Can use IPv6 addresses ([fefc::]:PORT).
-# Use "AUTO" for the hostname to automatically detect external IP.
-# Do not set if NAT is not manually punched.
-# HOLE_EXTERNAL = AUTO:2086
-
-
-[transport-xu]
-# Use PORT = 0 to autodetect a port available
-PORT = 2087
-
-
-[transport-http_client]
-MAX_CONNECTIONS = 128
-TESTING_IGNORE_KEYS = ACCEPT_FROM;
-# Hostname or IP of proxy server
-# PROXY =
-
-# User name for proxy server
-# PROXY_USERNAME =
-# User password for proxy server
-# PROXY_PASSWORD =
-
-# Type of proxy server,
-# Valid values: HTTP, SOCKS4, SOCKS5, SOCKS4A, SOCKS5_HOSTNAME
-# Default: HTTP
-# PROXY_TYPE = HTTP
-
-# Enable tunneling proxy request instead of having proxy server evaluate it
-# Experimental, default: NO
-# PROXY_HTTP_TUNNELING = NO
-
-
-[transport-http_server]
-#EXTERNAL_HOSTNAME = <your hostname/path>
-PORT = 1080
-
-# Obsolete option, to be replaced by HOLE_EXTERNAL (soon)
-ADVERTISED_PORT = 1080
-
-# If we have a manually punched NAT, what is the external IP and port?
-# Can use DNS names for DynDNS-based detection of external IP.
-# Can use IPv6 addresses ([fefc::]:PORT).
-# Use "AUTO" for the hostname to automatically detect external IP.
-# Do not set if NAT is not manually punched.
-# HOLE_EXTERNAL = AUTO:1080
-
-MAX_CONNECTIONS = 128
-TESTING_IGNORE_KEYS = ACCEPT_FROM;
-
-# Enable TCP stealth?
-TCP_STEALTH = NO
-
-
-[transport-https_client]
-MAX_CONNECTIONS = 128
-TESTING_IGNORE_KEYS = ACCEPT_FROM;
-# Hostname or IP of proxy server
-# PROXY =
-
-# User name for proxy server
-# PROXY_USERNAME =
-# User password for proxy server
-# PROXY_PASSWORD =
-
-# Type of proxy server,
-# Valid values: HTTP, SOCKS4, SOCKS5, SOCKS4A, SOCKS5_HOSTNAME
-# Default: HTTP
-# PROXY_TYPE = HTTP
-
-# Enable tunneling proxy request instead of having proxy server evaluate it
-# Experimental, default: NO
-# PROXY_HTTP_TUNNELING = NO
-
-
-[transport-https_server]
-# EXTERNAL_HOSTNAME = <your hostname/path>
-# EXTERNAL_HOSTNAME_ONLY = YES
-# If you have a valid SSL certificate for your external hostname tell,
-# clients to verify it
-# VERIFY_EXTERNAL_HOSTNAME = YES
-# Does the external hostname use the same port?
-# EXTERNAL_HOSTNAME_USE_PORT = YES
-PORT = 4433
-
-# Obsolete option, to be replaced by HOLE_EXTERNAL (soon)
-ADVERTISED_PORT = 4433
-
-# If we have a manually punched NAT, what is the external IP and port?
-# Can use DNS names for DynDNS-based detection of external IP.
-# Can use IPv6 addresses ([fefc::]:PORT).
-# Use "AUTO" for the hostname to automatically detect external IP.
-# Do not set if NAT is not manually punched.
-# HOLE_EXTERNAL = AUTO:4433
-
-CRYPTO_INIT = NORMAL
-KEY_FILE = $GNUNET_DATA_HOME/transport/https.key
-CERT_FILE = $GNUNET_DATA_HOME/transport/https.cert
-MAX_CONNECTIONS = 128
-TESTING_IGNORE_KEYS = ACCEPT_FROM;
-
-# Enable TCP stealth?
-TCP_STEALTH = NO
-
-
-[transport-wlan]
-# Name of the interface in monitor mode (typically monX)
-INTERFACE = mon0
-# Real hardware, no testing
-TESTMODE = 0
-TESTING_IGNORE_KEYS = ACCEPT_FROM;
-
-
-[transport-bluetooth]
-# Name of the interface (typically hciX)
-INTERFACE = hci0
-# Real hardware, no testing
-TESTMODE = 0
-TESTING_IGNORE_KEYS = ACCEPT_FROM;
diff --git a/src/transport/transport.h b/src/transport/transport.h
deleted file mode 100644
index 8ffc87070..000000000
--- a/src/transport/transport.h
+++ /dev/null
@@ -1,1241 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2009-2014 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/transport.h
- * @brief common internal definitions for transport service
- * @author Christian Grothoff
- */
-#ifndef TRANSPORT_H
-#define TRANSPORT_H
-
-#include "gnunet_crypto_lib.h"
-#include "gnunet_time_lib.h"
-#include "gnunet_constants.h"
-
-#define DEBUG_TRANSPORT GNUNET_EXTRA_LOGGING
-
-
-/**
- * For how long do we allow unused bandwidth
- * from the past to carry over into the future? (in seconds)
- */
-#define MAX_BANDWIDTH_CARRY_S GNUNET_CONSTANTS_MAX_BANDWIDTH_CARRY_S
-
-/**
- * How often do we (at most) do a full quota
- * recalculation? (in ms)
- */
-#define MIN_QUOTA_REFRESH_TIME 2000
-
-/**
- * What's the maximum number of sockets transport uses for validation and
- * neighbors
- */
-#define DEFAULT_MAX_FDS 256
-
-/**
- * Maximum frequency for re-evaluating latencies for all transport addresses.
- */
-#define LATENCY_EVALUATION_MAX_DELAY \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 1)
-
-/**
- * Maximum frequency for re-evaluating latencies for connected addresses.
- */
-#define CONNECTED_LATENCY_EVALUATION_MAX_DELAY \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 1)
-
-/**
- * Similar to GNUNET_TRANSPORT_NotifyDisconnect but in and out quotas are
- * included here. These values are not required outside transport_api
- *
- * @param cls closure
- * @param peer the peer that connected
- * @param bandwidth_in inbound bandwidth in NBO
- * @param bandwidth_out outbound bandwidth in NBO
- *
- */
-typedef void (*NotifyConnect) (
-  void *cls,
-  const struct GNUNET_PeerIdentity *peer,
-  struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
-  struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out);
-
-
-GNUNET_NETWORK_STRUCT_BEGIN
-
-
-/**
- * Message from the transport service to the library
- * asking to check if both processes agree about this
- * peers identity.
- */
-struct StartMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_START
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * 0: no options
-   * 1: The @e self field should be checked
-   * 2: this client is interested in payload traffic
-   */
-  uint32_t options;
-
-  /**
-   * Identity we think we have.  If it does not match, the
-   * receiver should print out an error message and disconnect.
-   */
-  struct GNUNET_PeerIdentity self;
-};
-
-
-/**
- * Message from the transport service to the library
- * informing about neighbors.
- */
-struct ConnectInfoMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_CONNECT
-   */
-  struct GNUNET_MessageHeader header;
-
-#if (defined(GNUNET_TRANSPORT_COMMUNICATION_VERSION) || \
-  defined(GNUNET_TRANSPORT_CORE_VERSION))
-
-  /**
-   * Always zero, for alignment.
-   */
-  uint32_t reserved GNUNET_PACKED;
-#else
-  /**
-   * Current outbound quota for this peer
-   */
-  struct GNUNET_BANDWIDTH_Value32NBO quota_out;
-#endif
-
-  /**
-   * Identity of the new neighbour.
-   */
-  struct GNUNET_PeerIdentity id;
-};
-
-
-/**
- * Message from the transport service to the library
- * informing about disconnects.
- */
-struct DisconnectInfoMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_DISCONNECT
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Reserved, always zero.
-   */
-  uint32_t reserved GNUNET_PACKED;
-
-  /**
-   * Who got disconnected?
-   */
-  struct GNUNET_PeerIdentity peer;
-};
-
-
-/**
- * Message used to set a particular bandwidth quota.  Sent TO the
- * service to set an incoming quota, sent FROM the service to update
- * an outgoing quota.
- *
- * NOTE: no longer used in TNG!
- */
-struct QuotaSetMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_SET_QUOTA
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Quota.
-   */
-  struct GNUNET_BANDWIDTH_Value32NBO quota;
-
-  /**
-   * About which peer are we talking here?
-   */
-  struct GNUNET_PeerIdentity peer;
-};
-
-
-/**
- * Message used to notify the transport API about a message
- * received from the network.  The actual message follows.
- */
-struct InboundMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_RECV
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Which peer sent the message?
-   */
-  struct GNUNET_PeerIdentity peer;
-};
-
-
-/**
- * Message used to notify the transport API that it can
- * send another message to the transport service.
- */
-struct SendOkMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK
-   */
-  struct GNUNET_MessageHeader header;
-
-#if (defined(GNUNET_TRANSPORT_COMMUNICATION_VERSION) || \
-  defined(GNUNET_TRANSPORT_CORE_VERSION))
-
-  uint32_t reserved GNUNET_PACKED;
-#else
-  /**
-   * #GNUNET_OK if the transmission succeeded,
-   * #GNUNET_SYSERR if it failed (i.e. network disconnect);
-   * in either case, it is now OK for this client to
-   * send us another message for the given peer.
-   */
-  uint16_t success GNUNET_PACKED;
-
-  /**
-   * Size of message sent
-   */
-  uint16_t bytes_msg GNUNET_PACKED;
-
-  /**
-   * Size of message sent over wire.
-   * Includes plugin and protocol specific overheads.
-   */
-  uint32_t bytes_physical GNUNET_PACKED;
-#endif
-
-  /**
-   * Which peer can send more now?
-   */
-  struct GNUNET_PeerIdentity peer;
-};
-
-
-/**
- * Message used to notify the transport API that it can
- * send another message to the transport service.
- * (Used to implement flow control.)
- */
-struct RecvOkMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_RECV_OK
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Number of messages by which to increase the window, greater or
-   * equal to one.
-   */
-  uint32_t increase_window_delta GNUNET_PACKED;
-
-  /**
-   * Which peer can CORE handle more from now?
-   */
-  struct GNUNET_PeerIdentity peer;
-};
-
-
-/**
- * Message used to notify the transport service about a message
- * to be transmitted to another peer.  The actual message follows.
- */
-struct OutboundMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_SEND
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * An `enum GNUNET_MQ_PriorityPreferences` in NBO.
-   */
-  uint32_t priority GNUNET_PACKED;
-
-#if ! (defined(GNUNET_TRANSPORT_COMMUNICATION_VERSION) || \
-  defined(GNUNET_TRANSPORT_CORE_VERSION))
-
-  /**
-   * Allowed delay.
-   */
-  struct GNUNET_TIME_RelativeNBO timeout;
-#endif
-
-  /**
-   * Which peer should receive the message?
-   */
-  struct GNUNET_PeerIdentity peer;
-};
-
-
-#if ! (defined(GNUNET_TRANSPORT_COMMUNICATION_VERSION) || \
-  defined(GNUNET_TRANSPORT_CORE_VERSION))
-
-
-/**
- * Message used to notify the transport API about an address to string
- * conversion. Message is followed by the string with the humand-readable
- * address.  For each lookup, multiple results may be returned.  The
- * last message must have a @e res of #GNUNET_OK and an @e addr_len
- * of zero.
- */
-struct AddressToStringResultMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_TO_STRING_REPLY
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * #GNUNET_OK if the conversion succeeded,
-   * #GNUNET_SYSERR if it failed
-   */
-  uint32_t res GNUNET_PACKED;
-
-  /**
-   * Length of the following string, zero if @e is #GNUNET_SYSERR
-   */
-  uint32_t addr_len GNUNET_PACKED;
-};
-
-
-/**
- * Message from the library to the transport service
- * asking for converting a transport address to a
- * human-readable UTF-8 string.
- */
-struct AddressLookupMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_TO_STRING
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Should the conversion use numeric IP addresses (otherwise
-   * a reverse DNS lookup is OK -- if applicable).
-   */
-  int16_t numeric_only GNUNET_PACKED;
-
-  /**
-   * Length of the (binary) address in bytes, in big-endian.
-   */
-  uint16_t addrlen GNUNET_PACKED;
-
-  /**
-   * timeout to give up (for DNS resolution timeout mostly)
-   */
-  struct GNUNET_TIME_RelativeNBO timeout;
-
-  /* followed by @e addrlen bytes of the actual address, then
-   * followed by the 0-terminated name of the transport */
-};
-
-
-/**
- * Message from the transport service to the library containing information
- * about a peer. Information contained are:
- * - current address used to communicate with this peer
- * - state
- * - state timeout
- *
- * Memory layout:
- * [AddressIterateResponseMessage][address[addrlen]][transportname[pluginlen]]
- */
-struct ValidationIterateResponseMessage
-{
-  /**
-   * Type is #GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_VALIDATION_RESPONSE
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * For alignment.
-   */
-  uint32_t reserved;
-
-  /**
-   * Peer identity
-   */
-  struct GNUNET_PeerIdentity peer;
-
-  /**
-   * Local info about the address
-   */
-  uint32_t local_address_info GNUNET_PACKED;
-
-  /**
-   * Address length
-   */
-  uint32_t addrlen GNUNET_PACKED;
-
-  /**
-   * Length of the plugin name
-   */
-  uint32_t pluginlen GNUNET_PACKED;
-
-  /**
-   * State
-   */
-  uint32_t state GNUNET_PACKED;
-
-  /**
-   * At what time did we successfully validate the address last.
-   * Will be NEVER if the address failed validation.
-   */
-  struct GNUNET_TIME_AbsoluteNBO last_validation;
-
-  /**
-   * Until when is the address believed to be valid.
-   * Will be ZERO if the address is not believed to be valid.
-   */
-  struct GNUNET_TIME_AbsoluteNBO valid_until;
-
-  /**
-   * When will we next try to validate the address (typically
-   * done before @e valid_until happens).
-   */
-  struct GNUNET_TIME_AbsoluteNBO next_validation;
-};
-
-
-/**
- * Message from the library to the transport service
- * asking for binary addresses known for a peer.
- */
-struct ValidationMonitorMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_VALIDATION_REQUEST
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * One shot call or continuous replies?
-   */
-  uint32_t one_shot GNUNET_PACKED;
-
-  /**
-   * The identity of the peer to look up.
-   */
-  struct GNUNET_PeerIdentity peer;
-};
-
-
-/**
- * Message from the library to the transport service
- * asking for binary addresses known for a peer.
- */
-struct PeerMonitorMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_PEER_REQUEST
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * One shot call or continuous replies?
-   */
-  uint32_t one_shot GNUNET_PACKED;
-
-  /**
-   * The identity of the peer to look up.
-   */
-  struct GNUNET_PeerIdentity peer;
-};
-
-
-/**
- * Message from the library to the transport service
- * asking for binary addresses known for a peer.
- */
-struct TrafficMetricMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_TRAFFIC_METRIC
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Always zero.
-   */
-  uint32_t reserved GNUNET_PACKED;
-
-  /**
-   * The identity of the peer to look up.
-   */
-  struct GNUNET_PeerIdentity peer;
-
-  /**
-   * Fake properties to generate.
-   */
-  struct GNUNET_ATS_PropertiesNBO properties;
-
-  /**
-   * Fake delay to add on inbound traffic.
-   */
-  struct GNUNET_TIME_RelativeNBO delay_in;
-
-  /**
-   * Fake delay to add on outbound traffic.
-   */
-  struct GNUNET_TIME_RelativeNBO delay_out;
-};
-
-
-/**
- * Message from the transport service to the library containing information
- * about a peer. Information contained are:
- * - current address used to communicate with this peer
- * - state
- * - state timeout
- *
- * Memory layout:
- * [AddressIterateResponseMessage][address[addrlen]][transportname[pluginlen]]
- */
-struct PeerIterateResponseMessage
-{
-  /**
-   * Type is #GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_PEER_RESPONSE
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * For alignment.
-   */
-  uint32_t reserved;
-
-  /**
-   * Peer identity
-   */
-  struct GNUNET_PeerIdentity peer;
-
-  /**
-   * Timeout for the state this peer is in
-   */
-  struct GNUNET_TIME_AbsoluteNBO state_timeout;
-
-  /**
-   * Local info about the address
-   */
-  uint32_t local_address_info GNUNET_PACKED;
-
-  /**
-   * State this peer is in as an `enum GNUNET_TRANSPORT_PeerState`
-   */
-  uint32_t state GNUNET_PACKED;
-
-  /**
-   * Address length
-   */
-  uint32_t addrlen GNUNET_PACKED;
-
-  /**
-   * Length of the plugin name
-   */
-  uint32_t pluginlen GNUNET_PACKED;
-};
-
-
-/**
- * Change in blacklisting (either request or notification,
- * depending on which direction it is going).
- */
-struct BlacklistMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST_QUERY or
-   * #GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST_REPLY.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * 0 for the query, #GNUNET_OK (allowed) or #GNUNET_SYSERR (disallowed)
-   * for the response.
-   */
-  uint32_t is_allowed GNUNET_PACKED;
-
-  /**
-   * Which peer is being blacklisted or queried?
-   */
-  struct GNUNET_PeerIdentity peer;
-};
-
-
-/**
- * Transport-level connection status update.
- */
-struct TransportPluginMonitorMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_PLUGIN_EVENT.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * An `enum GNUNET_TRANSPORT_SessionState` in NBO.
-   */
-  uint16_t session_state GNUNET_PACKED;
-
-  /**
-   * #GNUNET_YES if this is an inbound connection,
-   * #GNUNET_NO if this is an outbound connection,
-   * #GNUNET_SYSERR if connections of this plugin
-   *             are so fundamentally bidirectional
-   *             that they have no 'initiator'
-   * Value given in NBO.
-   */
-  int16_t is_inbound GNUNET_PACKED;
-
-  /**
-   * Number of messages waiting transmission.
-   */
-  uint32_t msgs_pending GNUNET_PACKED;
-
-  /**
-   * Number of bytes waiting for transmission.
-   */
-  uint32_t bytes_pending GNUNET_PACKED;
-
-  /**
-   * When will this transport plugin session time out?
-   */
-  struct GNUNET_TIME_AbsoluteNBO timeout;
-
-  /**
-   * Until how long is this plugin currently blocked from reading?
-   */
-  struct GNUNET_TIME_AbsoluteNBO delay;
-
-  /**
-   * Which peer is this connection for?
-   */
-  struct GNUNET_PeerIdentity peer;
-
-  /**
-   * Unique identifier for the session.
-   */
-  uint64_t session_id;
-
-  /**
-   * Length of the plugin name in bytes, including 0-termination.
-   */
-  uint16_t plugin_name_len GNUNET_PACKED;
-
-  /**
-   * Length of the plugin address in bytes.
-   */
-  uint16_t plugin_address_len GNUNET_PACKED;
-
-  /* followed by 0-terminated plugin name and
-     @e plugin_address_len bytes of plugin address */
-};
-
-#else
-
-/* *********************** TNG messages ***************** */
-
-/**
- * Communicator goes online.  Note which addresses it can
- * work with.
- */
-struct GNUNET_TRANSPORT_CommunicatorAvailableMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_NEW_COMMUNICATOR.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * NBO encoding of `enum GNUNET_TRANSPORT_CommunicatorCharacteristics`
-   */
-  uint32_t cc;
-
-  /* Followed by the address prefix of the communicator */
-};
-
-
-/**
- * Add address to the list.
- */
-struct GNUNET_TRANSPORT_AddAddressMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_ADD_ADDRESS.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Address identifier (used during deletion).
-   */
-  uint32_t aid GNUNET_PACKED;
-
-  /**
-   * When does the address expire?
-   */
-  struct GNUNET_TIME_RelativeNBO expiration;
-
-  /**
-   * An `enum GNUNET_NetworkType` in NBO.
-   */
-  uint32_t nt;
-
-  /* followed by UTF-8 encoded, 0-terminated human-readable address */
-};
-
-
-/**
- * Remove address from the list.
- */
-struct GNUNET_TRANSPORT_DelAddressMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_DEL_ADDRESS.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Address identifier.
-   */
-  uint32_t aid GNUNET_PACKED;
-};
-
-
-/**
- * Inform transport about an incoming message.
- */
-struct GNUNET_TRANSPORT_IncomingMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_INCOMING_MSG.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Do we use flow control or not?
-   */
-  uint32_t fc_on GNUNET_PACKED;
-
-  /**
-   * 64-bit number to identify the matching ACK.
-   */
-  uint64_t fc_id GNUNET_PACKED;
-
-  /**
-   * How long does the communicator believe the address on which
-   * the message was received to remain valid?
-   */
-  struct GNUNET_TIME_RelativeNBO expected_address_validity;
-
-  /**
-   * Sender identifier.
-   */
-  struct GNUNET_PeerIdentity sender;
-
-  /* followed by the message */
-};
-
-
-/**
- * Transport informs us about being done with an incoming message.
- * (only sent if fc_on was set).
- */
-struct GNUNET_TRANSPORT_IncomingMessageAck
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_INCOMING_MSG_ACK.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Reserved (0)
-   */
-  uint32_t reserved GNUNET_PACKED;
-
-  /**
-   * Which message is being ACKed?
-   */
-  uint64_t fc_id GNUNET_PACKED;
-
-  /**
-   * Sender identifier of the original message.
-   */
-  struct GNUNET_PeerIdentity sender;
-};
-
-
-/**
- * Add queue to the transport
- */
-struct GNUNET_TRANSPORT_AddQueueMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_SETUP.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Queue identifier (used to identify the queue).
-   */
-  uint32_t qid GNUNET_PACKED;
-
-  /**
-   * Receiver that can be addressed via the queue.
-   */
-  struct GNUNET_PeerIdentity receiver;
-
-  /**
-   * An `enum GNUNET_NetworkType` in NBO.
-   */
-  uint32_t nt;
-
-  /**
-   * Maximum transmission unit, in NBO.  UINT32_MAX for unlimited.
-   */
-  uint32_t mtu;
-
-  /**
-   * Queue length, in NBO. Defines how many messages may be
-   * send through this queue. UINT64_MAX for unlimited.
-   */
-  uint64_t q_len;
-
-  /**
-   * Priority of the queue in relation to other queues.
-   */
-  uint32_t priority;
-
-  /**
-   * An `enum GNUNET_TRANSPORT_ConnectionStatus` in NBO.
-   */
-  uint32_t cs;
-
-  /* followed by UTF-8 encoded, 0-terminated human-readable address */
-};
-
-
-/**
- * Update queue
- */
-struct GNUNET_TRANSPORT_UpdateQueueMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_SETUP.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Queue identifier (used to identify the queue).
-   */
-  uint32_t qid GNUNET_PACKED;
-
-  /**
-   * Receiver that can be addressed via the queue.
-   */
-  struct GNUNET_PeerIdentity receiver;
-
-  /**
-   * An `enum GNUNET_NetworkType` in NBO.
-   */
-  uint32_t nt;
-
-  /**
-   * Maximum transmission unit, in NBO.  UINT32_MAX for unlimited.
-   */
-  uint32_t mtu;
-
-  /**
-   * Queue length, in NBO. Defines how many messages may be
-   * send through this queue. UINT64_MAX for unlimited.
-   */
-  uint64_t q_len;
-
-  /**
-   * Priority of the queue in relation to other queues.
-   */
-  uint32_t priority;
-
-  /**
-   * An `enum GNUNET_TRANSPORT_ConnectionStatus` in NBO.
-   */
-  uint32_t cs;
-};
-
-
-/**
- * Remove queue, it is no longer available.
- */
-struct GNUNET_TRANSPORT_DelQueueMessage
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_TEARDOWN.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Address identifier.
-   */
-  uint32_t qid GNUNET_PACKED;
-
-  /**
-   * Receiver that can be addressed via the queue.
-   */
-  struct GNUNET_PeerIdentity receiver;
-};
-
-
-/**
- * Transport tells communicator that it wants a new queue.
- */
-struct GNUNET_TRANSPORT_CreateQueue
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Unique ID for the request.
-   */
-  uint32_t request_id GNUNET_PACKED;
-
-  /**
-   * Receiver that can be addressed via the queue.
-   */
-  struct GNUNET_PeerIdentity receiver;
-
-  /* followed by UTF-8 encoded, 0-terminated human-readable address */
-};
-
-
-/**
- * Communicator tells transport how queue creation went down.
- */
-struct GNUNET_TRANSPORT_CreateQueueResponse
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE_OK or
-   * #GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE_FAIL.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Unique ID for the request.
-   */
-  uint32_t request_id GNUNET_PACKED;
-};
-
-
-/**
- * Inform communicator about transport's desire to send a message.
- */
-struct GNUNET_TRANSPORT_SendMessageTo
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_MSG.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Which queue should we use?
-   */
-  uint32_t qid GNUNET_PACKED;
-
-  /**
-   * Message ID, used for flow control.
-   */
-  uint64_t mid GNUNET_PACKED;
-
-  /**
-   * Receiver identifier.
-   */
-  struct GNUNET_PeerIdentity receiver;
-
-  /* followed by the message */
-};
-
-
-/**
- * Inform transport that message was sent.
- */
-struct GNUNET_TRANSPORT_SendMessageToAck
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_MSG_ACK.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Success (#GNUNET_OK), failure (#GNUNET_SYSERR).
-   */
-  uint32_t status GNUNET_PACKED;
-
-  /**
-   * Message ID of the original message.
-   */
-  uint64_t mid GNUNET_PACKED;
-
-  /**
-   * Receiver identifier.
-   */
-  struct GNUNET_PeerIdentity receiver;
-};
-
-
-/**
- * Message from communicator to transport service asking for
- * transmission of a backchannel message with the given peer @e pid
- * and communicator.
- */
-struct GNUNET_TRANSPORT_CommunicatorBackchannel
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_COMMUNICATOR_BACKCHANNEL
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Always zero, for alignment.
-   */
-  uint32_t reserved;
-
-  /**
-   * Target peer.
-   */
-  struct GNUNET_PeerIdentity pid;
-
-  /* Followed by a `struct GNUNET_MessageHeader` with the encapsulated
-     message to the communicator */
-
-  /* Followed by the 0-terminated string specifying the desired
-     communicator at the target (@e pid) peer */
-};
-
-
-/**
- * Message from transport to communicator passing along a backchannel
- * message from the given peer @e pid.
- */
-struct GNUNET_TRANSPORT_CommunicatorBackchannelIncoming
-{
-  /**
-   * Type will be
-   * #GNUNET_MESSAGE_TYPE_TRANSPORT_COMMUNICATOR_BACKCHANNEL_INCOMING
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Always zero, for alignment.
-   */
-  uint32_t reserved;
-
-  /**
-   * Origin peer.
-   */
-  struct GNUNET_PeerIdentity pid;
-
-  /* Followed by a `struct GNUNET_MessageHeader` with the encapsulated
-     message to the communicator */
-};
-
-
-/**
- * Request to start monitoring.
- */
-struct GNUNET_TRANSPORT_MonitorStart
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_START.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * #GNUNET_YES for one-shot montoring, #GNUNET_NO for continuous monitoring.
-   */
-  uint32_t one_shot;
-
-  /**
-   * Target identifier to monitor, all zeros for "all peers".
-   */
-  struct GNUNET_PeerIdentity peer;
-};
-
-
-/**
- * Monitoring data.
- */
-struct GNUNET_TRANSPORT_MonitorData
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_DATA.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Network type (an `enum GNUNET_NetworkType` in NBO).
-   */
-  uint32_t nt GNUNET_PACKED;
-
-  /**
-   * Target identifier.
-   */
-  struct GNUNET_PeerIdentity peer;
-
-  /**
-   * @deprecated To be discussed if we keep these...
-   */
-  struct GNUNET_TIME_AbsoluteNBO last_validation;
-  struct GNUNET_TIME_AbsoluteNBO valid_until;
-  struct GNUNET_TIME_AbsoluteNBO next_validation;
-
-  /**
-   * Current round-trip time estimate.
-   */
-  struct GNUNET_TIME_RelativeNBO rtt;
-
-  /**
-   * Connection status (in NBO).
-   */
-  uint32_t cs GNUNET_PACKED;
-
-  /**
-   * Messages pending (in NBO).
-   */
-  uint32_t num_msg_pending GNUNET_PACKED;
-
-  /**
-   * Bytes pending (in NBO).
-   */
-  uint32_t num_bytes_pending GNUNET_PACKED;
-
-  /* Followed by 0-terminated address of the peer */
-};
-
-
-/**
- * Request to verify address.
- */
-struct GNUNET_TRANSPORT_AddressToVerify
-{
-  /**
-   * Type will be #GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_CONSIDER_VERIFY.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Reserved. 0.
-   */
-  uint32_t reserved;
-
-  /**
-   * Peer the address is from.
-   */
-  struct GNUNET_PeerIdentity peer;
-
-  /* followed by variable-size raw address */
-};
-
-
-/**
- * Application client to TRANSPORT service: we would like to have
- * address suggestions for this peer.
- */
-struct ExpressPreferenceMessage
-{
-  /**
-   * Type is #GNUNET_MESSAGE_TYPE_TRANSPORT_SUGGEST or
-   * #GNUNET_MESSAGE_TYPE_TRANSPORT_SUGGEST_CANCEL to stop
-   * suggestions.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * What type of performance preference does the client have?
-   * A `enum GNUNET_MQ_PreferenceKind` in NBO.
-   */
-  uint32_t pk GNUNET_PACKED;
-
-  /**
-   * Peer to get address suggestions for.
-   */
-  struct GNUNET_PeerIdentity peer;
-
-  /**
-   * How much bandwidth in bytes/second does the application expect?
-   */
-  struct GNUNET_BANDWIDTH_Value32NBO bw;
-};
-
-
-/**
- * We got an address of another peer, TRANSPORT service
- * should validate it.  There is no response.
- */
-struct RequestHelloValidationMessage
-{
-  /**
-   * Type is #GNUNET_MESSAGE_TYPE_TRANSPORT_REQUEST_HELLO_VALIDATION.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * What type of network does the other peer claim this is?
-   * A `enum GNUNET_NetworkType` in NBO.
-   */
-  uint32_t nt GNUNET_PACKED;
-
-  /**
-   * Peer to the address is presumably for.
-   */
-  struct GNUNET_PeerIdentity peer;
-
-  /* followed by 0-terminated address to validate */
-};
-
-#endif
-
-GNUNET_NETWORK_STRUCT_END
-
-/* end of transport.h */
-#endif
diff --git a/src/transport/transport_api2_application.c b/src/transport/transport_api2_application.c
deleted file mode 100644
index 00f5f62eb..000000000
--- a/src/transport/transport_api2_application.c
+++ /dev/null
@@ -1,397 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2010--2019 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport/transport_api2_application.c
- * @brief enable clients to ask TRANSPORT about establishing connections to peers
- * @author Christian Grothoff
- * @author Matthias Wachs
- */
-#include "platform.h"
-#include "gnunet_transport_application_service.h"
-#include "gnunet_transport_core_service.h"
-#include "transport.h"
-
-
-#define LOG(kind, ...) \
-  GNUNET_log_from (kind, "transport-application-api", __VA_ARGS__)
-
-
-/**
- * Handle for TRANSPORT address suggestion requests.
- */
-struct GNUNET_TRANSPORT_ApplicationSuggestHandle
-{
-  /**
-   * ID of the peer for which address suggestion was requested.
-   */
-  struct GNUNET_PeerIdentity id;
-
-  /**
-   * Connecitivity handle this suggestion handle belongs to.
-   */
-  struct GNUNET_TRANSPORT_ApplicationHandle *ch;
-
-  /**
-   * What preference is being expressed?
-   */
-  enum GNUNET_MQ_PriorityPreferences pk;
-
-  /**
-   * How much bandwidth does the client expect?
-   */
-  struct GNUNET_BANDWIDTH_Value32NBO bw;
-};
-
-
-/**
- * Handle to the TRANSPORT subsystem for application management.
- */
-struct GNUNET_TRANSPORT_ApplicationHandle
-{
-  /**
-   * Our configuration.
-   */
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  /**
-   * Map with the identities of all the peers for which we would
-   * like to have address suggestions.  The key is the PID, the
-   * value is currently the `struct GNUNET_TRANSPORT_ApplicationSuggestHandle`
-   */
-  struct GNUNET_CONTAINER_MultiPeerMap *sug_requests;
-
-  /**
-   * Message queue for sending requests to the TRANSPORT service.
-   */
-  struct GNUNET_MQ_Handle *mq;
-
-  /**
-   * Task to trigger reconnect.
-   */
-  struct GNUNET_SCHEDULER_Task *task;
-
-  /**
-   * Reconnect backoff delay.
-   */
-  struct GNUNET_TIME_Relative backoff;
-};
-
-
-/**
- * Re-establish the connection to the TRANSPORT service.
- *
- * @param ch handle to use to re-connect.
- */
-static void
-reconnect (struct GNUNET_TRANSPORT_ApplicationHandle *ch);
-
-
-/**
- * Re-establish the connection to the TRANSPORT service.
- *
- * @param cls handle to use to re-connect.
- */
-static void
-reconnect_task (void *cls)
-{
-  struct GNUNET_TRANSPORT_ApplicationHandle *ch = cls;
-
-  ch->task = NULL;
-  reconnect (ch);
-}
-
-
-/**
- * Disconnect from TRANSPORT and then reconnect.
- *
- * @param ch our handle
- */
-static void
-force_reconnect (struct GNUNET_TRANSPORT_ApplicationHandle *ch)
-{
-  if (NULL != ch->mq)
-  {
-    GNUNET_MQ_destroy (ch->mq);
-    ch->mq = NULL;
-  }
-  ch->backoff = GNUNET_TIME_STD_BACKOFF (ch->backoff);
-  ch->task = GNUNET_SCHEDULER_add_delayed (ch->backoff, &reconnect_task, ch);
-}
-
-
-/**
- * We encountered an error handling the MQ to the
- * TRANSPORT service.  Reconnect.
- *
- * @param cls the `struct GNUNET_TRANSPORT_ApplicationHandle`
- * @param error details about the error
- */
-static void
-error_handler (void *cls, enum GNUNET_MQ_Error error)
-{
-  struct GNUNET_TRANSPORT_ApplicationHandle *ch = cls;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "TRANSPORT connection died (code %d), reconnecting\n",
-       (int) error);
-  force_reconnect (ch);
-}
-
-
-/**
- * Transmit request for an address suggestion.
- *
- * @param cls the `struct GNUNET_TRANSPORT_ApplicationHandle`
- * @param peer peer to ask for an address suggestion for
- * @param value the `struct GNUNET_TRANSPORT_SuggestHandle`
- * @return #GNUNET_OK (continue to iterate), #GNUNET_SYSERR on
- *         failure (message queue no longer exists)
- */
-static int
-transmit_suggestion (void *cls,
-                     const struct GNUNET_PeerIdentity *peer,
-                     void *value)
-{
-  struct GNUNET_TRANSPORT_ApplicationHandle *ch = cls;
-  struct GNUNET_TRANSPORT_ApplicationSuggestHandle *sh = value;
-  struct GNUNET_MQ_Envelope *ev;
-  struct ExpressPreferenceMessage *m;
-
-  if (NULL == ch->mq)
-    return GNUNET_SYSERR;
-  ev = GNUNET_MQ_msg (m, GNUNET_MESSAGE_TYPE_TRANSPORT_SUGGEST);
-  m->pk = htonl ((uint32_t) sh->pk);
-  m->bw = sh->bw;
-  m->peer = *peer;
-  GNUNET_MQ_send (ch->mq, ev);
-  return GNUNET_OK;
-}
-
-
-/**
- * Re-establish the connection to the TRANSPORT service.
- *
- * @param ch handle to use to re-connect.
- */
-static void
-reconnect (struct GNUNET_TRANSPORT_ApplicationHandle *ch)
-{
-  static const struct GNUNET_MQ_MessageHandler handlers[] = { { NULL, 0, 0 } };
-
-  GNUNET_assert (NULL == ch->mq);
-  ch->mq =
-    GNUNET_CLIENT_connect (ch->cfg, "transport", handlers, &error_handler, ch);
-  if (NULL == ch->mq)
-  {
-    force_reconnect (ch);
-    return;
-  }
-  GNUNET_CONTAINER_multipeermap_iterate (ch->sug_requests,
-                                         &transmit_suggestion,
-                                         ch);
-}
-
-
-/**
- * Initialize the TRANSPORT application suggestion client handle.
- *
- * @param cfg configuration to use
- * @return transport application handle, NULL on error
- */
-struct GNUNET_TRANSPORT_ApplicationHandle *
-GNUNET_TRANSPORT_application_init (
-  const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  struct GNUNET_TRANSPORT_ApplicationHandle *ch;
-
-  ch = GNUNET_new (struct GNUNET_TRANSPORT_ApplicationHandle);
-  ch->cfg = cfg;
-  ch->sug_requests = GNUNET_CONTAINER_multipeermap_create (32, GNUNET_YES);
-  reconnect (ch);
-  return ch;
-}
-
-
-/**
- * Function called to free all `struct GNUNET_TRANSPORT_ApplicationSuggestHandle`s
- * in the map.
- *
- * @param cls NULL
- * @param key the key
- * @param value the value to free
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-free_sug_handle (void *cls, const struct GNUNET_PeerIdentity *key, void *value)
-{
-  struct GNUNET_TRANSPORT_ApplicationSuggestHandle *cur = value;
-
-  GNUNET_free (cur);
-  return GNUNET_OK;
-}
-
-
-/**
- * Client is done with TRANSPORT application management, release resources.
- *
- * @param ch handle to release
- */
-void
-GNUNET_TRANSPORT_application_done (
-  struct GNUNET_TRANSPORT_ApplicationHandle *ch)
-{
-  if (NULL != ch->mq)
-  {
-    GNUNET_MQ_destroy (ch->mq);
-    ch->mq = NULL;
-  }
-  if (NULL != ch->task)
-  {
-    GNUNET_SCHEDULER_cancel (ch->task);
-    ch->task = NULL;
-  }
-  GNUNET_CONTAINER_multipeermap_iterate (ch->sug_requests,
-                                         &free_sug_handle,
-                                         NULL);
-  GNUNET_CONTAINER_multipeermap_destroy (ch->sug_requests);
-  GNUNET_free (ch);
-}
-
-
-/**
- * An application would like TRANSPORT to connect to a peer.
- *
- * @param ch handle
- * @param peer identity of the peer we need an address for
- * @param pk what kind of application will the application require (can be
- *         #GNUNET_MQ_PRIO_BACKGROUND, we will still try to connect)
- * @param bw desired bandwidth, can be zero (we will still try to connect)
- * @return suggest handle, NULL if a request is already pending
- */
-struct GNUNET_TRANSPORT_ApplicationSuggestHandle *
-GNUNET_TRANSPORT_application_suggest (
-  struct GNUNET_TRANSPORT_ApplicationHandle *ch,
-  const struct GNUNET_PeerIdentity *peer,
-  enum GNUNET_MQ_PriorityPreferences pk,
-  struct GNUNET_BANDWIDTH_Value32NBO bw)
-{
-  struct GNUNET_TRANSPORT_ApplicationSuggestHandle *s;
-
-  s = GNUNET_new (struct GNUNET_TRANSPORT_ApplicationSuggestHandle);
-  s->ch = ch;
-  s->id = *peer;
-  s->pk = pk;
-  s->bw = bw;
-  (void) GNUNET_CONTAINER_multipeermap_put (
-    ch->sug_requests,
-    &s->id,
-    s,
-    GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Requesting TRANSPORT to suggest address for `%s'\n",
-       GNUNET_i2s (peer));
-  if (NULL == ch->mq)
-    return s;
-  GNUNET_assert (GNUNET_OK == transmit_suggestion (ch, &s->id, s));
-  return s;
-}
-
-
-/**
- * We no longer care about being connected to a peer.
- *
- * @param sh handle to stop
- */
-void
-GNUNET_TRANSPORT_application_suggest_cancel (
-  struct GNUNET_TRANSPORT_ApplicationSuggestHandle *sh)
-{
-  struct GNUNET_TRANSPORT_ApplicationHandle *ch = sh->ch;
-  struct GNUNET_MQ_Envelope *ev;
-  struct ExpressPreferenceMessage *m;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Telling TRANSPORT we no longer care for an address for `%s'\n",
-       GNUNET_i2s (&sh->id));
-  GNUNET_assert (
-    GNUNET_OK ==
-    GNUNET_CONTAINER_multipeermap_remove (ch->sug_requests, &sh->id, sh));
-  if (NULL == ch->mq)
-  {
-    GNUNET_free (sh);
-    return;
-  }
-  ev = GNUNET_MQ_msg (m, GNUNET_MESSAGE_TYPE_TRANSPORT_SUGGEST_CANCEL);
-  m->pk = htonl ((uint32_t) sh->pk);
-  m->bw = sh->bw;
-  m->peer = sh->id;
-  GNUNET_MQ_send (ch->mq, ev);
-  GNUNET_free (sh);
-}
-
-
-/**
- * An application (or a communicator) has received a HELLO (or other address
- * data of another peer) and wants TRANSPORT to validate that the address is
- * correct.  The result is NOT returned, in fact TRANSPORT may do nothing
- * (i.e. if it has too many active validations or recently tried this one
- * already).  If the @a addr validates, TRANSPORT will persist the address
- * with PEERSTORE.
- *
- * @param ch handle
- * @param peer identity of the peer we have an address for
- * @param nt network type of @a addr (as claimed by the other peer);
- *        used by TRANSPORT to avoid trying @a addr's that really cannot work
- *        due to network type mismatches
- * @param addr address to validate
- */
-void
-GNUNET_TRANSPORT_application_validate (
-  struct GNUNET_TRANSPORT_ApplicationHandle *ch,
-  const struct GNUNET_PeerIdentity *peer,
-  enum GNUNET_NetworkType nt,
-  const char *addr)
-{
-  struct GNUNET_MQ_Envelope *ev;
-  struct RequestHelloValidationMessage *m;
-  size_t alen;
-
-  if (NULL == ch->mq)
-  {
-    GNUNET_log (
-      GNUNET_ERROR_TYPE_WARNING,
-      "Address validation for %s:%s skipped as transport is not connected\n",
-      GNUNET_i2s (peer),
-      addr);
-    return;
-  }
-  alen = strlen (addr) + 1;
-  ev =
-    GNUNET_MQ_msg_extra (m,
-                         alen,
-                         GNUNET_MESSAGE_TYPE_TRANSPORT_REQUEST_HELLO_VALIDATION);
-  m->peer = *peer;
-  m->nt = htonl ((uint32_t) nt);
-  memcpy (&m[1], addr, alen);
-  GNUNET_MQ_send (ch->mq, ev);
-}
-
-
-/* end of transport_api2_application.c */
diff --git a/src/transport/transport_api2_communication.c b/src/transport/transport_api2_communication.c
deleted file mode 100644
index 2a80db87b..000000000
--- a/src/transport/transport_api2_communication.c
+++ /dev/null
@@ -1,1165 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2018 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/transport_api2_communication.c
- * @brief implementation of the gnunet_transport_communication_service.h API
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_protocols.h"
-#include "gnunet_transport_communication_service.h"
-#include "gnunet_ats_transport_service.h"
-#include "transport.h"
-
-
-/**
- * How many messages do we keep at most in the queue to the
- * transport service before we start to drop (default,
- * can be changed via the configuration file).
- */
-#define DEFAULT_MAX_QUEUE_LENGTH 16
-
-
-/**
- * Information we track per packet to enable flow control.
- */
-struct FlowControl
-{
-  /**
-   * Kept in a DLL.
-   */
-  struct FlowControl *next;
-
-  /**
-   * Kept in a DLL.
-   */
-  struct FlowControl *prev;
-
-  /**
-   * Function to call once the message was processed.
-   */
-  GNUNET_TRANSPORT_MessageCompletedCallback cb;
-
-  /**
-   * Closure for @e cb
-   */
-  void *cb_cls;
-
-  /**
-   * Which peer is this about?
-   */
-  struct GNUNET_PeerIdentity sender;
-
-  /**
-   * More-or-less unique ID for the message.
-   */
-  uint64_t id;
-};
-
-
-/**
- * Information we track per message to tell the transport about
- * success or failures.
- */
-struct AckPending
-{
-  /**
-   * Kept in a DLL.
-   */
-  struct AckPending *next;
-
-  /**
-   * Kept in a DLL.
-   */
-  struct AckPending *prev;
-
-  /**
-   * Communicator this entry belongs to.
-   */
-  struct GNUNET_TRANSPORT_CommunicatorHandle *ch;
-
-  /**
-   * Which peer is this about?
-   */
-  struct GNUNET_PeerIdentity receiver;
-
-  /**
-   * More-or-less unique ID for the message.
-   */
-  uint64_t mid;
-};
-
-
-/**
- * Opaque handle to the transport service for communicators.
- */
-struct GNUNET_TRANSPORT_CommunicatorHandle
-{
-  /**
-   * Head of DLL of addresses this communicator offers to the transport service.
-   */
-  struct GNUNET_TRANSPORT_AddressIdentifier *ai_head;
-
-  /**
-   * Tail of DLL of addresses this communicator offers to the transport service.
-   */
-  struct GNUNET_TRANSPORT_AddressIdentifier *ai_tail;
-
-  /**
-   * DLL of messages awaiting flow control confirmation (ack).
-   */
-  struct FlowControl *fc_head;
-
-  /**
-   * DLL of messages awaiting flow control confirmation (ack).
-   */
-  struct FlowControl *fc_tail;
-
-  /**
-   * DLL of messages awaiting transmission confirmation (ack).
-   */
-  struct AckPending *ap_head;
-
-  /**
-   * DLL of messages awaiting transmission confirmation (ack).
-   */
-  struct AckPending *ap_tail;
-
-  /**
-   * DLL of queues we offer.
-   */
-  struct GNUNET_TRANSPORT_QueueHandle *queue_head;
-
-  /**
-   * DLL of queues we offer.
-   */
-  struct GNUNET_TRANSPORT_QueueHandle *queue_tail;
-
-  /**
-   * Our configuration.
-   */
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  /**
-   * Config section to use.
-   */
-  const char *config_section;
-
-  /**
-   * Address prefix to use.
-   */
-  const char *addr_prefix;
-
-  /**
-   * Function to call when the transport service wants us to initiate
-   * a communication channel with another peer.
-   */
-  GNUNET_TRANSPORT_CommunicatorMqInit mq_init;
-
-  /**
-   * Closure for @e mq_init.
-   */
-  void *mq_init_cls;
-
-  /**
-   * Function to call when the transport service receives messages
-   * for a communicator (i.e. for NAT traversal or for non-bidirectional
-   * communicators).
-   */
-  GNUNET_TRANSPORT_CommunicatorNotify notify_cb;
-
-  /**
-   * Closure for @e notify_Cb.
-   */
-  void *notify_cb_cls;
-
-  /**
-   * Queue to talk to the transport service.
-   */
-  struct GNUNET_MQ_Handle *mq;
-
-  /**
-   * Maximum permissible queue length.
-   */
-  unsigned long long max_queue_length;
-
-  /**
-   * Flow-control identifier generator.
-   */
-  uint64_t fc_gen;
-
-  /**
-   * Internal UUID for the address used in communication with the
-   * transport service.
-   */
-  uint32_t aid_gen;
-
-  /**
-   * Queue identifier generator.
-   */
-  uint32_t queue_gen;
-
-  /**
-   * Characteristics of the communicator.
-   */
-  enum GNUNET_TRANSPORT_CommunicatorCharacteristics cc;
-};
-
-
-/**
- * Handle returned to identify the internal data structure the transport
- * API has created to manage a message queue to a particular peer.
- */
-struct GNUNET_TRANSPORT_QueueHandle
-{
-  /**
-   * Kept in a DLL.
-   */
-  struct GNUNET_TRANSPORT_QueueHandle *next;
-
-  /**
-   * Kept in a DLL.
-   */
-  struct GNUNET_TRANSPORT_QueueHandle *prev;
-
-  /**
-   * Handle this queue belongs to.
-   */
-  struct GNUNET_TRANSPORT_CommunicatorHandle *ch;
-
-  /**
-   * Address used by the communication queue.
-   */
-  char *address;
-
-  /**
-   * The queue itself.
-   */
-  struct GNUNET_MQ_Handle *mq;
-
-  /**
-   * Which peer we can communciate with.
-   */
-  struct GNUNET_PeerIdentity peer;
-
-  /**
-   * Network type of the communication queue.
-   */
-  enum GNUNET_NetworkType nt;
-
-  /**
-   * Communication status of the queue.
-   */
-  enum GNUNET_TRANSPORT_ConnectionStatus cs;
-
-  /**
-   * ID for this queue when talking to the transport service.
-   */
-  uint32_t queue_id;
-
-  /**
-   * Maximum transmission unit for the queue.
-   */
-  uint32_t mtu;
-
-  /**
-   * Queue length.
-   */
-  uint64_t q_len;
-  /**
-   * Queue priority.
-   */
-  uint32_t priority;
-};
-
-
-/**
- * Internal representation of an address a communicator is
- * currently providing for the transport service.
- */
-struct GNUNET_TRANSPORT_AddressIdentifier
-{
-  /**
-   * Kept in a DLL.
-   */
-  struct GNUNET_TRANSPORT_AddressIdentifier *next;
-
-  /**
-   * Kept in a DLL.
-   */
-  struct GNUNET_TRANSPORT_AddressIdentifier *prev;
-
-  /**
-   * Transport handle where the address was added.
-   */
-  struct GNUNET_TRANSPORT_CommunicatorHandle *ch;
-
-  /**
-   * The actual address.
-   */
-  char *address;
-
-  /**
-   * When does the address expire? (Expected lifetime of the
-   * address.)
-   */
-  struct GNUNET_TIME_Relative expiration;
-
-  /**
-   * Internal UUID for the address used in communication with the
-   * transport service.
-   */
-  uint32_t aid;
-
-  /**
-   * Network type for the address.
-   */
-  enum GNUNET_NetworkType nt;
-};
-
-
-/**
- * (re)connect our communicator to the transport service
- *
- * @param ch handle to reconnect
- */
-static void
-reconnect (struct GNUNET_TRANSPORT_CommunicatorHandle *ch);
-
-
-/**
- * Send message to the transport service about address @a ai
- * being now available.
- *
- * @param ai address to add
- */
-static void
-send_add_address (struct GNUNET_TRANSPORT_AddressIdentifier *ai)
-{
-  struct GNUNET_MQ_Envelope *env;
-  struct GNUNET_TRANSPORT_AddAddressMessage *aam;
-
-  if (NULL == ai->ch->mq)
-    return;
-  env = GNUNET_MQ_msg_extra (aam,
-                             strlen (ai->address) + 1,
-                             GNUNET_MESSAGE_TYPE_TRANSPORT_ADD_ADDRESS);
-  aam->expiration = GNUNET_TIME_relative_hton (ai->expiration);
-  aam->nt = htonl ((uint32_t) ai->nt);
-  memcpy (&aam[1], ai->address, strlen (ai->address) + 1);
-  GNUNET_MQ_send (ai->ch->mq, env);
-}
-
-
-/**
- * Send message to the transport service about address @a ai
- * being no longer available.
- *
- * @param ai address to delete
- */
-static void
-send_del_address (struct GNUNET_TRANSPORT_AddressIdentifier *ai)
-{
-  struct GNUNET_MQ_Envelope *env;
-  struct GNUNET_TRANSPORT_DelAddressMessage *dam;
-
-  if (NULL == ai->ch->mq)
-    return;
-  env = GNUNET_MQ_msg (dam, GNUNET_MESSAGE_TYPE_TRANSPORT_DEL_ADDRESS);
-  dam->aid = htonl (ai->aid);
-  GNUNET_MQ_send (ai->ch->mq, env);
-}
-
-
-/**
- * Send message to the transport service about queue @a qh
- * being now available.
- *
- * @param qh queue to add
- */
-static void
-send_add_queue (struct GNUNET_TRANSPORT_QueueHandle *qh)
-{
-  struct GNUNET_MQ_Envelope *env;
-  struct GNUNET_TRANSPORT_AddQueueMessage *aqm;
-
-  if (NULL == qh->ch->mq)
-    return;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Sending `GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_SETUP` message\n");
-  env = GNUNET_MQ_msg_extra (aqm,
-                             strlen (qh->address) + 1,
-                             GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_SETUP);
-  aqm->qid = htonl (qh->queue_id);
-  aqm->receiver = qh->peer;
-  aqm->nt = htonl ((uint32_t) qh->nt);
-  aqm->mtu = htonl (qh->mtu);
-  aqm->q_len = GNUNET_htonll (qh->q_len);
-  aqm->priority = htonl (qh->priority);
-  aqm->cs = htonl ((uint32_t) qh->cs);
-  memcpy (&aqm[1], qh->address, strlen (qh->address) + 1);
-  GNUNET_MQ_send (qh->ch->mq, env);
-}
-
-
-/**
- * Send message to the transport service about queue @a qh
- * updated.
- *
- * @param qh queue to add
- */
-static void
-send_update_queue (struct GNUNET_TRANSPORT_QueueHandle *qh)
-{
-  struct GNUNET_MQ_Envelope *env;
-  struct GNUNET_TRANSPORT_UpdateQueueMessage *uqm;
-
-  if (NULL == qh->ch->mq)
-    return;
-  env = GNUNET_MQ_msg (uqm, GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_UPDATE);
-  uqm->qid = htonl (qh->queue_id);
-  uqm->receiver = qh->peer;
-  uqm->nt = htonl ((uint32_t) qh->nt);
-  uqm->mtu = htonl (qh->mtu);
-  uqm->q_len = GNUNET_htonll (qh->q_len);
-  uqm->priority = htonl (qh->priority);
-  uqm->cs = htonl ((uint32_t) qh->cs);
-  GNUNET_MQ_send (qh->ch->mq, env);
-}
-
-
-/**
- * Send message to the transport service about queue @a qh
- * being no longer available.
- *
- * @param qh queue to delete
- */
-static void
-send_del_queue (struct GNUNET_TRANSPORT_QueueHandle *qh)
-{
-  struct GNUNET_MQ_Envelope *env;
-  struct GNUNET_TRANSPORT_DelQueueMessage *dqm;
-
-  if (NULL == qh->ch->mq)
-    return;
-  env = GNUNET_MQ_msg (dqm, GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_TEARDOWN);
-  dqm->qid = htonl (qh->queue_id);
-  dqm->receiver = qh->peer;
-  GNUNET_MQ_send (qh->ch->mq, env);
-}
-
-
-/**
- * Disconnect from the transport service.  Purges
- * all flow control entries as we will no longer receive
- * the ACKs.  Purges the ack pending entries as the
- * transport will no longer expect the confirmations.
- *
- * @param ch service to disconnect from
- */
-static void
-disconnect (struct GNUNET_TRANSPORT_CommunicatorHandle *ch)
-{
-  struct FlowControl *fcn;
-  struct AckPending *apn;
-
-  for (struct FlowControl *fc = ch->fc_head; NULL != fc; fc = fcn)
-  {
-    fcn = fc->next;
-    GNUNET_CONTAINER_DLL_remove (ch->fc_head, ch->fc_tail, fc);
-    fc->cb (fc->cb_cls, GNUNET_SYSERR);
-    GNUNET_free (fc);
-  }
-  for (struct AckPending *ap = ch->ap_head; NULL != ap; ap = apn)
-  {
-    apn = ap->next;
-    GNUNET_CONTAINER_DLL_remove (ch->ap_head, ch->ap_tail, ap);
-    GNUNET_free (ap);
-  }
-  if (NULL == ch->mq)
-    return;
-  GNUNET_MQ_destroy (ch->mq);
-  ch->mq = NULL;
-}
-
-
-/**
- * Function called on MQ errors.
- */
-static void
-error_handler (void *cls, enum GNUNET_MQ_Error error)
-{
-  struct GNUNET_TRANSPORT_CommunicatorHandle *ch = cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "MQ failure %d, reconnecting to transport service.\n",
-              error);
-  disconnect (ch);
-  /* TODO: maybe do this with exponential backoff/delay */
-  reconnect (ch);
-}
-
-
-/**
- * Transport service acknowledged a message we gave it
- * (with flow control enabled). Tell the communicator.
- *
- * @param cls our `struct GNUNET_TRANSPORT_CommunicatorHandle *`
- * @param incoming_ack the ack
- */
-static void
-handle_incoming_ack (
-  void *cls,
-  const struct GNUNET_TRANSPORT_IncomingMessageAck *incoming_ack)
-{
-  struct GNUNET_TRANSPORT_CommunicatorHandle *ch = cls;
-
-  for (struct FlowControl *fc = ch->fc_head; NULL != fc; fc = fc->next)
-  {
-    if ((fc->id == incoming_ack->fc_id) &&
-        (0 == memcmp (&fc->sender,
-                      &incoming_ack->sender,
-                      sizeof(struct GNUNET_PeerIdentity))))
-    {
-      GNUNET_CONTAINER_DLL_remove (ch->fc_head, ch->fc_tail, fc);
-      fc->cb (fc->cb_cls, GNUNET_OK);
-      GNUNET_free (fc);
-      return;
-    }
-  }
-  GNUNET_break (0);
-  disconnect (ch);
-  /* TODO: maybe do this with exponential backoff/delay */
-  reconnect (ch);
-}
-
-
-/**
- * Transport service wants us to create a queue. Check if @a cq
- * is well-formed.
- *
- * @param cls our `struct GNUNET_TRANSPORT_CommunicatorHandle *`
- * @param cq the queue creation request
- * @return #GNUNET_OK if @a smt is well-formed
- */
-static int
-check_create_queue (void *cls, const struct GNUNET_TRANSPORT_CreateQueue *cq)
-{
-  (void) cls;
-  GNUNET_MQ_check_zero_termination (cq);
-  return GNUNET_OK;
-}
-
-
-/**
- * Transport service wants us to create a queue. Tell the communicator.
- *
- * @param cls our `struct GNUNET_TRANSPORT_CommunicatorHandle *`
- * @param cq the queue creation request
- */
-static void
-handle_create_queue (void *cls, const struct GNUNET_TRANSPORT_CreateQueue *cq)
-{
-  struct GNUNET_TRANSPORT_CommunicatorHandle *ch = cls;
-  const char *addr = (const char *) &cq[1];
-  struct GNUNET_TRANSPORT_CreateQueueResponse *cqr;
-  struct GNUNET_MQ_Envelope *env;
-
-  if (GNUNET_OK != ch->mq_init (ch->mq_init_cls, &cq->receiver, addr))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Address `%s' invalid for this communicator\n",
-                addr);
-    env = GNUNET_MQ_msg (cqr, GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE_FAIL);
-  }
-  else
-  {
-    env = GNUNET_MQ_msg (cqr, GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE_OK);
-  }
-  cqr->request_id = cq->request_id;
-  GNUNET_MQ_send (ch->mq, env);
-}
-
-
-/**
- * Transport service wants us to send a message. Check if @a smt
- * is well-formed.
- *
- * @param cls our `struct GNUNET_TRANSPORT_CommunicatorHandle *`
- * @param smt the transmission request
- * @return #GNUNET_OK if @a smt is well-formed
- */
-static int
-check_send_msg (void *cls, const struct GNUNET_TRANSPORT_SendMessageTo *smt)
-{
-  (void) cls;
-  GNUNET_MQ_check_boxed_message (smt);
-  return GNUNET_OK;
-}
-
-
-/**
- * Notify transport service about @a status of a message with
- * @a mid sent to @a receiver.
- *
- * @param ch handle
- * @param status #GNUNET_OK on success, #GNUNET_SYSERR on failure
- * @param receiver which peer was the receiver
- * @param mid message that the ack is about
- */
-static void
-send_ack (struct GNUNET_TRANSPORT_CommunicatorHandle *ch,
-          int status,
-          const struct GNUNET_PeerIdentity *receiver,
-          uint64_t mid)
-{
-  struct GNUNET_MQ_Envelope *env;
-  struct GNUNET_TRANSPORT_SendMessageToAck *ack;
-
-  env = GNUNET_MQ_msg (ack, GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_MSG_ACK);
-  ack->status = htonl (status);
-  ack->mid = mid;
-  ack->receiver = *receiver;
-  GNUNET_MQ_send (ch->mq, env);
-}
-
-
-/**
- * Message queue transmission by communicator was successful,
- * notify transport service.
- *
- * @param cls an `struct AckPending *`
- */
-static void
-send_ack_cb (void *cls)
-{
-  struct AckPending *ap = cls;
-  struct GNUNET_TRANSPORT_CommunicatorHandle *ch = ap->ch;
-
-  GNUNET_CONTAINER_DLL_remove (ch->ap_head, ch->ap_tail, ap);
-  send_ack (ch, GNUNET_OK, &ap->receiver, ap->mid);
-  GNUNET_free (ap);
-}
-
-
-/**
- * Transport service wants us to send a message. Tell the communicator.
- *
- * @param cls our `struct GNUNET_TRANSPORT_CommunicatorHandle *`
- * @param smt the transmission request
- */
-static void
-handle_send_msg (void *cls, const struct GNUNET_TRANSPORT_SendMessageTo *smt)
-{
-  struct GNUNET_TRANSPORT_CommunicatorHandle *ch = cls;
-  const struct GNUNET_MessageHeader *mh;
-  struct GNUNET_MQ_Envelope *env;
-  struct AckPending *ap;
-  struct GNUNET_TRANSPORT_QueueHandle *qh;
-
-  for (qh = ch->queue_head; NULL != qh; qh = qh->next)
-    if ((qh->queue_id == ntohl (smt->qid)) &&
-        (0 == memcmp (&qh->peer,
-                      &smt->receiver,
-                      sizeof(struct GNUNET_PeerIdentity))))
-      break;
-  if (NULL == qh)
-  {
-    /* queue is already gone, tell transport this one failed */
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Transmission failed, queue no longer exists.\n");
-    send_ack (ch, GNUNET_NO, &smt->receiver, smt->mid);
-    return;
-  }
-  ap = GNUNET_new (struct AckPending);
-  ap->ch = ch;
-  ap->receiver = smt->receiver;
-  ap->mid = smt->mid;
-  GNUNET_CONTAINER_DLL_insert (ch->ap_head, ch->ap_tail, ap);
-  mh = (const struct GNUNET_MessageHeader *) &smt[1];
-  env = GNUNET_MQ_msg_copy (mh);
-  GNUNET_MQ_notify_sent (env, &send_ack_cb, ap);
-  GNUNET_MQ_send (qh->mq, env);
-}
-
-
-/**
- * Transport service gives us backchannel message. Check if @a bi
- * is well-formed.
- *
- * @param cls our `struct GNUNET_TRANSPORT_CommunicatorHandle *`
- * @param bi the backchannel message
- * @return #GNUNET_OK if @a smt is well-formed
- */
-static int
-check_backchannel_incoming (
-  void *cls,
-  const struct GNUNET_TRANSPORT_CommunicatorBackchannelIncoming *bi)
-{
-  (void) cls;
-  GNUNET_MQ_check_boxed_message (bi);
-  return GNUNET_OK;
-}
-
-
-/**
- * Transport service gives us backchannel message. Handle it.
- *
- * @param cls our `struct GNUNET_TRANSPORT_CommunicatorHandle *`
- * @param bi the backchannel message
- */
-static void
-handle_backchannel_incoming (
-  void *cls,
-  const struct GNUNET_TRANSPORT_CommunicatorBackchannelIncoming *bi)
-{
-  struct GNUNET_TRANSPORT_CommunicatorHandle *ch = cls;
-  if (NULL != ch->notify_cb)
-    ch->notify_cb (ch->notify_cb_cls,
-                   &bi->pid,
-                   (const struct GNUNET_MessageHeader *) &bi[1]);
-  else
-    GNUNET_log (
-      GNUNET_ERROR_TYPE_INFO,
-      _ ("Dropped backchanel message: handler not provided by communicator\n"));
-}
-
-
-/**
- * (re)connect our communicator to the transport service
- *
- * @param ch handle to reconnect
- */
-static void
-reconnect (struct GNUNET_TRANSPORT_CommunicatorHandle *ch)
-{
-  struct GNUNET_MQ_MessageHandler handlers[] =
-  { GNUNET_MQ_hd_fixed_size (incoming_ack,
-                             GNUNET_MESSAGE_TYPE_TRANSPORT_INCOMING_MSG_ACK,
-                             struct GNUNET_TRANSPORT_IncomingMessageAck,
-                             ch),
-    GNUNET_MQ_hd_var_size (create_queue,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE,
-                           struct GNUNET_TRANSPORT_CreateQueue,
-                           ch),
-    GNUNET_MQ_hd_var_size (send_msg,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_MSG,
-                           struct GNUNET_TRANSPORT_SendMessageTo,
-                           ch),
-    GNUNET_MQ_hd_var_size (
-      backchannel_incoming,
-      GNUNET_MESSAGE_TYPE_TRANSPORT_COMMUNICATOR_BACKCHANNEL_INCOMING,
-      struct GNUNET_TRANSPORT_CommunicatorBackchannelIncoming,
-      ch),
-    GNUNET_MQ_handler_end () };
-  struct GNUNET_TRANSPORT_CommunicatorAvailableMessage *cam;
-  struct GNUNET_MQ_Envelope *env;
-
-  ch->mq =
-    GNUNET_CLIENT_connect (ch->cfg, "transport", handlers, &error_handler, ch);
-  if (NULL == ch->mq)
-    return;
-  env = GNUNET_MQ_msg_extra (cam,
-                             strlen (ch->addr_prefix) + 1,
-                             GNUNET_MESSAGE_TYPE_TRANSPORT_NEW_COMMUNICATOR);
-  cam->cc = htonl ((uint32_t) ch->cc);
-  memcpy (&cam[1], ch->addr_prefix, strlen (ch->addr_prefix) + 1);
-  GNUNET_MQ_send (ch->mq, env);
-  for (struct GNUNET_TRANSPORT_AddressIdentifier *ai = ch->ai_head; NULL != ai;
-       ai = ai->next)
-    send_add_address (ai);
-  for (struct GNUNET_TRANSPORT_QueueHandle *qh = ch->queue_head; NULL != qh;
-       qh = qh->next)
-    send_add_queue (qh);
-}
-
-
-/**
- * Connect to the transport service.
- *
- * @param cfg configuration to use
- * @param config_section section of the configuration to use for options
- * @param addr_prefix address prefix for addresses supported by this
- *        communicator, could be NULL for incoming-only communicators
- * @param cc what characteristics does the communicator have?
- * @param mtu maximum message size supported by communicator, 0 if
- *            sending is not supported, SIZE_MAX for no MTU
- * @param mq_init function to call to initialize a message queue given
- *                the address of another peer, can be NULL if the
- *                communicator only supports receiving messages
- * @param mq_init_cls closure for @a mq_init
- * @param notify_cb function to pass backchannel messages to communicator
- * @param notify_cb_cls closure for @a notify_cb
- * @return NULL on error
- */
-struct GNUNET_TRANSPORT_CommunicatorHandle *
-GNUNET_TRANSPORT_communicator_connect (
-  const struct GNUNET_CONFIGURATION_Handle *cfg,
-  const char *config_section,
-  const char *addr_prefix,
-  enum GNUNET_TRANSPORT_CommunicatorCharacteristics cc,
-  GNUNET_TRANSPORT_CommunicatorMqInit mq_init,
-  void *mq_init_cls,
-  GNUNET_TRANSPORT_CommunicatorNotify notify_cb,
-  void *notify_cb_cls)
-{
-  struct GNUNET_TRANSPORT_CommunicatorHandle *ch;
-
-  ch = GNUNET_new (struct GNUNET_TRANSPORT_CommunicatorHandle);
-  ch->cfg = cfg;
-  ch->config_section = config_section;
-  ch->addr_prefix = addr_prefix;
-  ch->mq_init = mq_init;
-  ch->mq_init_cls = mq_init_cls;
-  ch->notify_cb = notify_cb;
-  ch->notify_cb_cls = notify_cb_cls;
-  ch->cc = cc;
-  reconnect (ch);
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (cfg,
-                                             config_section,
-                                             "MAX_QUEUE_LENGTH",
-                                             &ch->max_queue_length))
-    ch->max_queue_length = DEFAULT_MAX_QUEUE_LENGTH;
-  if (NULL == ch->mq)
-  {
-    GNUNET_free (ch);
-    return NULL;
-  }
-  return ch;
-}
-
-
-/**
- * Disconnect from the transport service.
- *
- * @param ch handle returned from connect
- */
-void
-GNUNET_TRANSPORT_communicator_disconnect (
-  struct GNUNET_TRANSPORT_CommunicatorHandle *ch)
-{
-  disconnect (ch);
-  while (NULL != ch->ai_head)
-  {
-    GNUNET_break (0);  /* communicator forgot to remove address, warn! */
-    GNUNET_TRANSPORT_communicator_address_remove (ch->ai_head);
-  }
-  GNUNET_free (ch);
-}
-
-
-/* ************************* Receiving *************************** */
-
-
-/**
- * Notify transport service that the communicator has received
- * a message.
- *
- * @param ch connection to transport service
- * @param sender presumed sender of the message (details to be checked
- *        by higher layers)
- * @param msg the message
- * @param expected_addr_validity how long does the communicator believe it
- *        will continue to be able to receive messages from the same address
- *        on which it received this message?
- * @param cb function to call once handling the message is done, NULL if
- *         flow control is not supported by this communicator
- * @param cb_cls closure for @a cb
- * @return #GNUNET_OK if all is well, #GNUNET_NO if the message was
- *         immediately dropped due to memory limitations (communicator
- *         should try to apply back pressure),
- *         #GNUNET_SYSERR if the message could not be delivered because
- *         the transport service is not yet up
- */
-int
-GNUNET_TRANSPORT_communicator_receive (
-  struct GNUNET_TRANSPORT_CommunicatorHandle *ch,
-  const struct GNUNET_PeerIdentity *sender,
-  const struct GNUNET_MessageHeader *msg,
-  struct GNUNET_TIME_Relative expected_addr_validity,
-  GNUNET_TRANSPORT_MessageCompletedCallback cb,
-  void *cb_cls)
-{
-  struct GNUNET_MQ_Envelope *env;
-  struct GNUNET_TRANSPORT_IncomingMessage *im;
-  uint16_t msize;
-
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "communicator receive\n");
-
-  if (NULL == ch->mq)
-    return GNUNET_SYSERR;
-  if ((NULL == cb) && (GNUNET_MQ_get_length (ch->mq) >= ch->max_queue_length))
-  {
-    GNUNET_log (
-      GNUNET_ERROR_TYPE_WARNING,
-      "Dropping message: transport is too slow, queue length %llu exceeded\n",
-      ch->max_queue_length);
-    return GNUNET_NO;
-  }
-
-  msize = ntohs (msg->size);
-  env =
-    GNUNET_MQ_msg_extra (im, msize, GNUNET_MESSAGE_TYPE_TRANSPORT_INCOMING_MSG);
-  if (NULL == env)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  im->expected_address_validity =
-    GNUNET_TIME_relative_hton (expected_addr_validity);
-  im->sender = *sender;
-  // FIXME: this is expensive, would be better if we would
-  // re-design the API to allow us to create the envelope first,
-  // and then have the application fill in the body so we do
-  // not have to memcpy()
-  memcpy (&im[1], msg, msize);
-  im->fc_on = htonl (GNUNET_NO);
-  if (NULL != cb)
-  {
-    struct FlowControl *fc;
-
-    im->fc_on = htonl (GNUNET_YES);
-    im->fc_id = ch->fc_gen++;
-    fc = GNUNET_new (struct FlowControl);
-    fc->sender = *sender;
-    fc->id = im->fc_id;
-    fc->cb = cb;
-    fc->cb_cls = cb_cls;
-    GNUNET_CONTAINER_DLL_insert (ch->fc_head, ch->fc_tail, fc);
-  }
-  GNUNET_MQ_send (ch->mq, env);
-  return GNUNET_OK;
-}
-
-
-/* ************************* Discovery *************************** */
-
-
-/**
- * Notify transport service that an MQ became available due to an
- * "inbound" connection or because the communicator discovered the
- * presence of another peer.
- *
- * @param ch connection to transport service
- * @param peer peer with which we can now communicate
- * @param address address in human-readable format, 0-terminated, UTF-8
- * @param mtu maximum message size supported by queue, 0 if
- *            sending is not supported, SIZE_MAX for no MTU
- * @param q_len number of messages that can be send through this queue
- * @param priority queue priority. Queues with highest priority should be
- *                 used
- * @param nt which network type does the @a address belong to?
- * @param cc what characteristics does the communicator have?
- * @param cs what is the connection status of the queue?
- * @param mq message queue of the @a peer
- * @return API handle identifying the new MQ
- */
-struct GNUNET_TRANSPORT_QueueHandle *
-GNUNET_TRANSPORT_communicator_mq_add (
-  struct GNUNET_TRANSPORT_CommunicatorHandle *ch,
-  const struct GNUNET_PeerIdentity *peer,
-  const char *address,
-  uint32_t mtu,
-  uint64_t q_len,
-  uint32_t priority,
-  enum GNUNET_NetworkType nt,
-  enum GNUNET_TRANSPORT_ConnectionStatus cs,
-  struct GNUNET_MQ_Handle *mq)
-{
-  struct GNUNET_TRANSPORT_QueueHandle *qh;
-
-  // Do not notify the service if there is no intial capacity.
-  GNUNET_assert (0 < q_len);
-
-  qh = GNUNET_new (struct GNUNET_TRANSPORT_QueueHandle);
-  qh->ch = ch;
-  qh->peer = *peer;
-  qh->address = GNUNET_strdup (address);
-  qh->nt = nt;
-  qh->mtu = mtu;
-  qh->q_len = q_len;
-  qh->priority = priority;
-  qh->cs = cs;
-  qh->mq = mq;
-  qh->queue_id = ch->queue_gen++;
-  GNUNET_CONTAINER_DLL_insert (ch->queue_head, ch->queue_tail, qh);
-  send_add_queue (qh);
-  return qh;
-}
-
-
-/**
- * Notify transport service that an MQ was updated
- *
- * @param ch connection to transport service
- * @param qh the queue to update
- * @param q_len number of messages that can be send through this queue
- * @param priority queue priority. Queues with highest priority should be
- *                 used
- */
-void
-GNUNET_TRANSPORT_communicator_mq_update (
-  struct GNUNET_TRANSPORT_CommunicatorHandle *ch,
-  const struct GNUNET_TRANSPORT_QueueHandle *u_qh,
-  uint64_t q_len,
-  uint32_t priority)
-{
-  struct GNUNET_TRANSPORT_QueueHandle *qh;
-
-  for (qh = ch->queue_head; NULL != qh; qh = qh->next)
-  {
-    if (u_qh == qh)
-      break;
-  }
-  GNUNET_assert (NULL != qh);
-  qh->q_len = q_len;
-  qh->priority = priority;
-  send_update_queue (qh);
-}
-
-
-/**
- * Notify transport service that an MQ became unavailable due to a
- * disconnect or timeout.
- *
- * @param qh handle for the queue that must be invalidated
- */
-void
-GNUNET_TRANSPORT_communicator_mq_del (struct GNUNET_TRANSPORT_QueueHandle *qh)
-{
-  struct GNUNET_TRANSPORT_CommunicatorHandle *ch = qh->ch;
-
-  send_del_queue (qh);
-  GNUNET_CONTAINER_DLL_remove (ch->queue_head, ch->queue_tail, qh);
-  GNUNET_MQ_destroy (qh->mq);
-  GNUNET_free (qh->address);
-  GNUNET_free (qh);
-}
-
-
-/**
- * Notify transport service about an address that this communicator
- * provides for this peer.
- *
- * @param ch connection to transport service
- * @param address our address in human-readable format, 0-terminated, UTF-8
- * @param nt which network type does the address belong to?
- * @param expiration when does the communicator forsee this address expiring?
- */
-struct GNUNET_TRANSPORT_AddressIdentifier *
-GNUNET_TRANSPORT_communicator_address_add (
-  struct GNUNET_TRANSPORT_CommunicatorHandle *ch,
-  const char *address,
-  enum GNUNET_NetworkType nt,
-  struct GNUNET_TIME_Relative expiration)
-{
-  struct GNUNET_TRANSPORT_AddressIdentifier *ai;
-
-  ai = GNUNET_new (struct GNUNET_TRANSPORT_AddressIdentifier);
-  ai->ch = ch;
-  ai->address = GNUNET_strdup (address);
-  ai->nt = nt;
-  ai->expiration = expiration;
-  ai->aid = ch->aid_gen++;
-  GNUNET_CONTAINER_DLL_insert (ch->ai_head, ch->ai_tail, ai);
-  send_add_address (ai);
-  return ai;
-}
-
-/**
- * Notify transport service about an address that this communicator no
- * longer provides for this peer.
- *
- * @param ai address that is no longer provided
- */
-void
-GNUNET_TRANSPORT_communicator_address_remove (
-  struct GNUNET_TRANSPORT_AddressIdentifier *ai)
-{
-  struct GNUNET_TRANSPORT_CommunicatorHandle *ch = ai->ch;
-
-  send_del_address (ai);
-  GNUNET_CONTAINER_DLL_remove (ch->ai_head, ch->ai_tail, ai);
-  GNUNET_free (ai->address);
-  GNUNET_free (ai);
-}
-
-/**
- * Notify transport service that this communicator no longer provides all its addresses for this peer.
- *
- * @param ch The communicator handle.
- */
-void
-GNUNET_TRANSPORT_communicator_address_remove_all (
-  struct GNUNET_TRANSPORT_CommunicatorHandle *ch)
-{
-  for (struct GNUNET_TRANSPORT_AddressIdentifier *ai = ch->ai_head; NULL != ai;
-       ai = ai->next)
-    GNUNET_TRANSPORT_communicator_address_remove (ai);
-}
-
-
-/* ************************* Backchannel *************************** */
-
-
-/**
- * The communicator asks the transport service to route a message via
- * a different path to another communicator service at another peer.
- * This must only be done for special control traffic (as there is no
- * flow control for this API), such as acknowledgements, and generally
- * only be done if the communicator is uni-directional (i.e. cannot
- * send the message back itself).
- *
- * @param ch handle of this communicator
- * @param pid peer to send the message to
- * @param comm name of the communicator to send the message to
- * @param header header of the message to transmit and pass via the
- *        notify-API to @a pid's communicator @a comm
- */
-void
-GNUNET_TRANSPORT_communicator_notify (
-  struct GNUNET_TRANSPORT_CommunicatorHandle *ch,
-  const struct GNUNET_PeerIdentity *pid,
-  const char *comm,
-  const struct GNUNET_MessageHeader *header)
-{
-  struct GNUNET_MQ_Envelope *env;
-  struct GNUNET_TRANSPORT_CommunicatorBackchannel *cb;
-  size_t slen = strlen (comm) + 1;
-  uint16_t mlen = ntohs (header->size);
-
-  GNUNET_assert (mlen + slen + sizeof(*cb) < UINT16_MAX);
-  env =
-    GNUNET_MQ_msg_extra (cb,
-                         slen + mlen,
-                         GNUNET_MESSAGE_TYPE_TRANSPORT_COMMUNICATOR_BACKCHANNEL);
-  cb->pid = *pid;
-  memcpy (&cb[1], header, mlen);
-  memcpy (((char *) &cb[1]) + mlen, comm, slen);
-  GNUNET_MQ_send (ch->mq, env);
-}
-
-
-/* end of transport_api2_communication.c */
diff --git a/src/transport/transport_api2_core.c b/src/transport/transport_api2_core.c
deleted file mode 100644
index 8cd0b7c8c..000000000
--- a/src/transport/transport_api2_core.c
+++ /dev/null
@@ -1,804 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2009-2013, 2016, 2018 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/transport_api_core.c
- * @brief library to access the transport service for message exchange
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_constants.h"
-#include "gnunet_arm_service.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_protocols.h"
-#include "gnunet_transport_core_service.h"
-#include "transport.h"
-
-#define LOG(kind, ...) GNUNET_log_from (kind, "transport-api-core", __VA_ARGS__)
-
-/**
- * How large to start with for the hashmap of neighbours.
- */
-#define STARTING_NEIGHBOURS_SIZE 16
-
-/**
- * Window size. How many messages to the same target do we pass
- * to TRANSPORT without a SEND_OK in between? Small values limit
- * thoughput, large values will increase latency.
- *
- * FIXME-OPTIMIZE: find out what good values are experimentally,
- * maybe set adaptively (i.e. to observed available bandwidth).
- */
-#define SEND_WINDOW_SIZE 4
-
-
-/**
- * Entry in hash table of all of our current (connected) neighbours.
- */
-struct Neighbour
-{
-  /**
-   * Identity of this neighbour.
-   */
-  struct GNUNET_PeerIdentity id;
-
-  /**
-   * Overall transport handle.
-   */
-  struct GNUNET_TRANSPORT_CoreHandle *h;
-
-  /**
-   * Active message queue for the peer.
-   */
-  struct GNUNET_MQ_Handle *mq;
-
-  /**
-   * Envelope with the message we are currently transmitting (or NULL).
-   */
-  struct GNUNET_MQ_Envelope *env;
-
-  /**
-   * Closure for @e mq handlers.
-   */
-  void *handlers_cls;
-
-  /**
-   * How many messages can we still send to this peer before we should
-   * throttle?
-   */
-  unsigned int ready_window;
-
-  /**
-   * Used to indicate our status if @e env is non-NULL.  Set to
-   * #GNUNET_YES if we did pass a message to the MQ and are waiting
-   * for the call to #notify_send_done(). Set to #GNUNET_NO if the @e
-   * ready_window is 0 and @e env is waiting for a
-   * #GNUNET_MESSAGE_TYPE_TRANSPORT_RECV_OK?
-   */
-  int16_t awaiting_done;
-
-  /**
-   * Size of the message in @e env.
-   */
-  uint16_t env_size;
-};
-
-
-/**
- * Handle for the transport service (includes all of the
- * state for the transport service).
- */
-struct GNUNET_TRANSPORT_CoreHandle
-{
-  /**
-   * Closure for the callbacks.
-   */
-  void *cls;
-
-  /**
-   * Functions to call for received data (template for
-   * new message queues).
-   */
-  struct GNUNET_MQ_MessageHandler *handlers;
-
-  /**
-   * function to call on connect events
-   */
-  GNUNET_TRANSPORT_NotifyConnect nc_cb;
-
-  /**
-   * function to call on disconnect events
-   */
-  GNUNET_TRANSPORT_NotifyDisconnect nd_cb;
-
-  /**
-   * My client connection to the transport service.
-   */
-  struct GNUNET_MQ_Handle *mq;
-
-  /**
-   * My configuration.
-   */
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  /**
-   * Hash map of the current connected neighbours of this peer.
-   * Maps peer identities to `struct Neighbour` entries.
-   */
-  struct GNUNET_CONTAINER_MultiPeerMap *neighbours;
-
-  /**
-   * Peer identity as assumed by this process, or all zeros.
-   */
-  struct GNUNET_PeerIdentity self;
-
-  /**
-   * ID of the task trying to reconnect to the service.
-   */
-  struct GNUNET_SCHEDULER_Task *reconnect_task;
-
-  /**
-   * Delay until we try to reconnect.
-   */
-  struct GNUNET_TIME_Relative reconnect_delay;
-
-  /**
-   * Should we check that @e self matches what the service thinks?
-   * (if #GNUNET_NO, then @e self is all zeros!).
-   */
-  int check_self;
-};
-
-
-/**
- * Function that will schedule the job that will try
- * to connect us again to the client.
- *
- * @param h transport service to reconnect
- */
-static void
-disconnect_and_schedule_reconnect (struct GNUNET_TRANSPORT_CoreHandle *h);
-
-
-/**
- * Get the neighbour list entry for the given peer
- *
- * @param h our context
- * @param peer peer to look up
- * @return NULL if no such peer entry exists
- */
-static struct Neighbour *
-neighbour_find (struct GNUNET_TRANSPORT_CoreHandle *h,
-                const struct GNUNET_PeerIdentity *peer)
-{
-  return GNUNET_CONTAINER_multipeermap_get (h->neighbours, peer);
-}
-
-
-/**
- * Iterator over hash map entries, for deleting state of a neighbour.
- *
- * @param cls the `struct GNUNET_TRANSPORT_CoreHandle *`
- * @param key peer identity
- * @param value value in the hash map, the neighbour entry to delete
- * @return #GNUNET_YES if we should continue to
- *         iterate,
- *         #GNUNET_NO if not.
- */
-static int
-neighbour_delete (void *cls, const struct GNUNET_PeerIdentity *key, void *value)
-{
-  struct GNUNET_TRANSPORT_CoreHandle *handle = cls;
-  struct Neighbour *n = value;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Dropping entry for neighbour `%s'.\n",
-       GNUNET_i2s (key));
-  if (NULL != handle->nd_cb)
-    handle->nd_cb (handle->cls, &n->id, n->handlers_cls);
-  if (NULL != n->env)
-  {
-    GNUNET_MQ_send_cancel (n->env);
-    n->env = NULL;
-  }
-  GNUNET_MQ_destroy (n->mq);
-  GNUNET_assert (NULL == n->mq);
-  GNUNET_assert (
-    GNUNET_YES ==
-    GNUNET_CONTAINER_multipeermap_remove (handle->neighbours, key, n));
-  GNUNET_free (n);
-  return GNUNET_YES;
-}
-
-
-/**
- * Generic error handler, called with the appropriate
- * error code and the same closure specified at the creation of
- * the message queue.
- * Not every message queue implementation supports an error handler.
- *
- * @param cls closure with the `struct GNUNET_TRANSPORT_CoreHandle *`
- * @param error error code
- */
-static void
-mq_error_handler (void *cls, enum GNUNET_MQ_Error error)
-{
-  struct GNUNET_TRANSPORT_CoreHandle *h = cls;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Error %u received from transport service, disconnecting temporarily.\n",
-       error);
-  disconnect_and_schedule_reconnect (h);
-}
-
-
-/**
- * A message from the handler's message queue to a neighbour was
- * transmitted.  Now trigger (possibly delayed) notification of the
- * neighbour's message queue that we are done and thus ready for
- * the next message.  Note that the MQ being ready is independent
- * of the send window, as we may queue many messages and simply
- * not pass them to TRANSPORT if the send window is insufficient.
- *
- * @param cls the `struct Neighbour` where the message was sent
- */
-static void
-notify_send_done (void *cls)
-{
-  struct Neighbour *n = cls;
-
-  n->awaiting_done = GNUNET_NO;
-  n->env = NULL;
-  GNUNET_MQ_impl_send_continue (n->mq);
-}
-
-
-/**
- * We have an envelope waiting for transmission at @a n, and
- * our transmission window is positive. Perform the transmission.
- *
- * @param n neighbour to perform transmission for
- */
-static void
-do_send (struct Neighbour *n)
-{
-  GNUNET_assert (0 < n->ready_window);
-  GNUNET_assert (NULL != n->env);
-  n->ready_window--;
-  n->awaiting_done = GNUNET_YES;
-  GNUNET_MQ_notify_sent (n->env, &notify_send_done, n);
-  GNUNET_MQ_send (n->h->mq, n->env);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Passed message of type %u for neighbour `%s' to TRANSPORT.\n",
-       ntohs (GNUNET_MQ_env_get_msg (n->env)->type),
-       GNUNET_i2s (&n->id));
-}
-
-
-/**
- * Implement sending functionality of a message queue.
- * Called one message at a time. Should send the @a msg
- * to the transport service and then notify the queue
- * once we are ready for the next one.
- *
- * @param mq the message queue
- * @param msg the message to send
- * @param impl_state state of the implementation
- */
-static void
-mq_send_impl (struct GNUNET_MQ_Handle *mq,
-              const struct GNUNET_MessageHeader *msg,
-              void *impl_state)
-{
-  struct Neighbour *n = impl_state;
-  struct OutboundMessage *obm;
-  uint16_t msize;
-
-  msize = ntohs (msg->size);
-  if (msize >= GNUNET_MAX_MESSAGE_SIZE - sizeof(*obm))
-  {
-    GNUNET_break (0);
-    GNUNET_MQ_impl_send_continue (mq);
-    return;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "CORE requested transmission of message of type %u to neighbour `%s'.\n",
-       ntohs (msg->type),
-       GNUNET_i2s (&n->id));
-
-  GNUNET_assert (NULL == n->env);
-  n->env =
-    GNUNET_MQ_msg_nested_mh (obm, GNUNET_MESSAGE_TYPE_TRANSPORT_SEND, msg);
-  n->env_size = ntohs (msg->size);
-  {
-    struct GNUNET_MQ_Envelope *env;
-
-    env = GNUNET_MQ_get_current_envelope (mq);
-    obm->priority = htonl ((uint32_t) GNUNET_MQ_env_get_options (env));
-  }
-  obm->peer = n->id;
-  if (0 == n->ready_window)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Flow control delays transmission to CORE until we see SEND_OK.\n");
-    return;   /* can't send yet, need to wait for SEND_OK */
-  }
-  do_send (n);
-}
-
-
-/**
- * Handle destruction of a message queue.  Implementations must not
- * free @a mq, but should take care of @a impl_state.
- *
- * @param mq the message queue to destroy
- * @param impl_state state of the implementation
- */
-static void
-mq_destroy_impl (struct GNUNET_MQ_Handle *mq, void *impl_state)
-{
-  struct Neighbour *n = impl_state;
-
-  GNUNET_assert (mq == n->mq);
-  n->mq = NULL;
-}
-
-
-/**
- * Implementation function that cancels the currently sent message.
- * Should basically undo whatever #mq_send_impl() did.
- *
- * @param mq message queue
- * @param impl_state state specific to the implementation
- */
-static void
-mq_cancel_impl (struct GNUNET_MQ_Handle *mq, void *impl_state)
-{
-  struct Neighbour *n = impl_state;
-
-  n->ready_window++;
-  if (GNUNET_YES == n->awaiting_done)
-  {
-    GNUNET_MQ_send_cancel (n->env);
-    n->env = NULL;
-    n->awaiting_done = GNUNET_NO;
-  }
-  else
-  {
-    GNUNET_assert (0 == n->ready_window);
-    n->env = NULL;
-  }
-}
-
-
-/**
- * We had an error processing a message we forwarded from a peer to
- * the CORE service.  We should just complain about it but otherwise
- * continue processing.
- *
- * @param cls closure
- * @param error error code
- */
-static void
-peer_mq_error_handler (void *cls, enum GNUNET_MQ_Error error)
-{
-  /* struct Neighbour *n = cls; */
-
-  GNUNET_break_op (0);
-}
-
-
-/**
- * Function we use for handling incoming connect messages.
- *
- * @param cls closure, a `struct GNUNET_TRANSPORT_Handle *`
- * @param cim message received
- */
-static void
-handle_connect (void *cls, const struct ConnectInfoMessage *cim)
-{
-  struct GNUNET_TRANSPORT_CoreHandle *h = cls;
-  struct Neighbour *n;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Receiving CONNECT message for `%s'\n",
-       GNUNET_i2s (&cim->id));
-  n = neighbour_find (h, &cim->id);
-  if (NULL != n)
-  {
-    GNUNET_break (0);
-    disconnect_and_schedule_reconnect (h);
-    return;
-  }
-  n = GNUNET_new (struct Neighbour);
-  n->id = cim->id;
-  n->h = h;
-  n->ready_window = SEND_WINDOW_SIZE;
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONTAINER_multipeermap_put (
-                   h->neighbours,
-                   &n->id,
-                   n,
-                   GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
-
-  n->mq = GNUNET_MQ_queue_for_callbacks (&mq_send_impl,
-                                         &mq_destroy_impl,
-                                         &mq_cancel_impl,
-                                         n,
-                                         h->handlers,
-                                         &peer_mq_error_handler,
-                                         n);
-  if (NULL != h->nc_cb)
-  {
-    n->handlers_cls = h->nc_cb (h->cls, &n->id, n->mq);
-    GNUNET_MQ_set_handlers_closure (n->mq, n->handlers_cls);
-  }
-}
-
-
-/**
- * Function we use for handling incoming disconnect messages.
- *
- * @param cls closure, a `struct GNUNET_TRANSPORT_CoreHandle *`
- * @param dim message received
- */
-static void
-handle_disconnect (void *cls, const struct DisconnectInfoMessage *dim)
-{
-  struct GNUNET_TRANSPORT_CoreHandle *h = cls;
-  struct Neighbour *n;
-
-  GNUNET_break (ntohl (dim->reserved) == 0);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Receiving DISCONNECT message for `%s'.\n",
-       GNUNET_i2s (&dim->peer));
-  n = neighbour_find (h, &dim->peer);
-  if (NULL == n)
-  {
-    GNUNET_break (0);
-    disconnect_and_schedule_reconnect (h);
-    return;
-  }
-  GNUNET_assert (GNUNET_YES == neighbour_delete (h, &dim->peer, n));
-}
-
-
-/**
- * Function we use for handling incoming send-ok messages.
- *
- * @param cls closure, a `struct GNUNET_TRANSPORT_CoreHandle *`
- * @param okm message received
- */
-static void
-handle_send_ok (void *cls, const struct SendOkMessage *okm)
-{
-  struct GNUNET_TRANSPORT_CoreHandle *h = cls;
-  struct Neighbour *n;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Receiving SEND_OK message for transmission to %s\n",
-       GNUNET_i2s (&okm->peer));
-  n = neighbour_find (h, &okm->peer);
-  if (NULL == n)
-  {
-    /* We should never get a 'SEND_OK' for a peer that we are not
-       connected to */
-    GNUNET_break (0);
-    disconnect_and_schedule_reconnect (h);
-    return;
-  }
-  n->ready_window++;
-  if ((NULL != n->env) && (1 == n->ready_window))
-    do_send (n);
-}
-
-
-/**
- * Function we use for checking incoming "inbound" messages.
- *
- * @param cls closure, a `struct GNUNET_TRANSPORT_CoreHandle *`
- * @param im message received
- */
-static int
-check_recv (void *cls, const struct InboundMessage *im)
-{
-  const struct GNUNET_MessageHeader *imm;
-  uint16_t size;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "check_recv\n");
-  size = ntohs (im->header.size) - sizeof(*im);
-  if (size < sizeof(struct GNUNET_MessageHeader))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  imm = (const struct GNUNET_MessageHeader *) &im[1];
-  if (ntohs (imm->size) != size)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Function we use for handling incoming messages.
- *
- * @param cls closure, a `struct GNUNET_TRANSPORT_CoreHandle *`
- * @param im message received
- */
-static void
-handle_recv (void *cls, const struct InboundMessage *im)
-{
-  struct GNUNET_TRANSPORT_CoreHandle *h = cls;
-  const struct GNUNET_MessageHeader *imm =
-    (const struct GNUNET_MessageHeader *) &im[1];
-  struct Neighbour *n;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Received message of type %u with %u bytes from `%s'.\n",
-       (unsigned int) ntohs (imm->type),
-       (unsigned int) ntohs (imm->size),
-       GNUNET_i2s (&im->peer));
-  n = neighbour_find (h, &im->peer);
-  if (NULL == n)
-  {
-    GNUNET_break (0);
-    disconnect_and_schedule_reconnect (h);
-    return;
-  }
-  GNUNET_MQ_inject_message (n->mq, imm);
-}
-
-
-/**
- * Try again to connect to transport service.
- *
- * @param cls the handle to the transport service
- */
-static void
-reconnect (void *cls)
-{
-  struct GNUNET_TRANSPORT_CoreHandle *h = cls;
-  struct GNUNET_MQ_MessageHandler handlers[] =
-  { GNUNET_MQ_hd_fixed_size (connect,
-                             GNUNET_MESSAGE_TYPE_TRANSPORT_CONNECT,
-                             struct ConnectInfoMessage,
-                             h),
-    GNUNET_MQ_hd_fixed_size (disconnect,
-                             GNUNET_MESSAGE_TYPE_TRANSPORT_DISCONNECT,
-                             struct DisconnectInfoMessage,
-                             h),
-    GNUNET_MQ_hd_fixed_size (send_ok,
-                             GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK,
-                             struct SendOkMessage,
-                             h),
-    GNUNET_MQ_hd_var_size (recv,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_RECV,
-                           struct InboundMessage,
-                           h),
-    GNUNET_MQ_handler_end () };
-  struct GNUNET_MQ_Envelope *env;
-  struct StartMessage *s;
-  uint32_t options;
-
-  h->reconnect_task = NULL;
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Connecting to transport service.\n");
-  GNUNET_assert (NULL == h->mq);
-  h->mq =
-    GNUNET_CLIENT_connect (h->cfg, "transport", handlers, &mq_error_handler, h);
-  if (NULL == h->mq)
-    return;
-  env = GNUNET_MQ_msg (s, GNUNET_MESSAGE_TYPE_TRANSPORT_START);
-  options = 0;
-  if (h->check_self)
-    options |= 1;
-  if (NULL != h->handlers)
-    options |= 2;
-  s->options = htonl (options);
-  s->self = h->self;
-  GNUNET_MQ_send (h->mq, env);
-}
-
-
-/**
- * Disconnect from the transport service.
- *
- * @param h transport service to reconnect
- */
-static void
-disconnect (struct GNUNET_TRANSPORT_CoreHandle *h)
-{
-  GNUNET_CONTAINER_multipeermap_iterate (h->neighbours, &neighbour_delete, h);
-  if (NULL != h->mq)
-  {
-    GNUNET_MQ_destroy (h->mq);
-    h->mq = NULL;
-  }
-}
-
-
-/**
- * Function that will schedule the job that will try
- * to connect us again to the client.
- *
- * @param h transport service to reconnect
- */
-static void
-disconnect_and_schedule_reconnect (struct GNUNET_TRANSPORT_CoreHandle *h)
-{
-  GNUNET_assert (NULL == h->reconnect_task);
-  disconnect (h);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Scheduling task to reconnect to transport service in %s.\n",
-       GNUNET_STRINGS_relative_time_to_string (h->reconnect_delay, GNUNET_YES));
-  h->reconnect_task =
-    GNUNET_SCHEDULER_add_delayed (h->reconnect_delay, &reconnect, h);
-  h->reconnect_delay = GNUNET_TIME_STD_BACKOFF (h->reconnect_delay);
-}
-
-
-/**
- * Checks if a given peer is connected to us and get the message queue.
- *
- * @param handle connection to transport service
- * @param peer the peer to check
- * @return NULL if disconnected, otherwise message queue for @a peer
- */
-struct GNUNET_MQ_Handle *
-GNUNET_TRANSPORT_core_get_mq (struct GNUNET_TRANSPORT_CoreHandle *handle,
-                              const struct GNUNET_PeerIdentity *peer)
-{
-  struct Neighbour *n;
-
-  n = neighbour_find (handle, peer);
-  if (NULL == n)
-    return NULL;
-  return n->mq;
-}
-
-
-/**
- * Notification from the CORE service to the TRANSPORT service
- * that the CORE service has finished processing a message from
- * TRANSPORT (via the @code{handlers} of #GNUNET_TRANSPORT_core_connect())
- * and that it is thus now OK for TRANSPORT to send more messages
- * for @a pid.
- *
- * Used to provide flow control, this is our equivalent to
- * #GNUNET_SERVICE_client_continue() of an ordinary service.
- *
- * Note that due to the use of a window, TRANSPORT may send multiple
- * messages destined for the same peer even without an intermediate
- * call to this function. However, CORE must still call this function
- * once per message received, as otherwise eventually the window will
- * be full and TRANSPORT will stop providing messages to CORE for @a
- * pid.
- *
- * @param ch core handle
- * @param pid which peer was the message from that was fully processed by CORE
- */
-void
-GNUNET_TRANSPORT_core_receive_continue (struct GNUNET_TRANSPORT_CoreHandle *ch,
-                                        const struct GNUNET_PeerIdentity *pid)
-{
-  struct GNUNET_MQ_Envelope *env;
-  struct RecvOkMessage *rok;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Message for %s finished CORE processing, sending RECV_OK.\n",
-       GNUNET_i2s (pid));
-  if (NULL == ch->mq)
-    return;
-  env = GNUNET_MQ_msg (rok, GNUNET_MESSAGE_TYPE_TRANSPORT_RECV_OK);
-  rok->increase_window_delta = htonl (1);
-  rok->peer = *pid;
-  GNUNET_MQ_send (ch->mq, env);
-}
-
-
-/**
- * Connect to the transport service.  Note that the connection may
- * complete (or fail) asynchronously.
- *
- * @param cfg configuration to use
- * @param self our own identity (API should check that it matches
- *             the identity found by transport), or NULL (no check)
- * @param cls closure for the callbacks
- * @param rec receive function to call
- * @param nc function to call on connect events
- * @param nd function to call on disconnect events
- * @return NULL on error
- */
-struct GNUNET_TRANSPORT_CoreHandle *
-GNUNET_TRANSPORT_core_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                               const struct GNUNET_PeerIdentity *self,
-                               const struct GNUNET_MQ_MessageHandler *handlers,
-                               void *cls,
-                               GNUNET_TRANSPORT_NotifyConnect nc,
-                               GNUNET_TRANSPORT_NotifyDisconnect nd)
-{
-  struct GNUNET_TRANSPORT_CoreHandle *h;
-  unsigned int i;
-
-  h = GNUNET_new (struct GNUNET_TRANSPORT_CoreHandle);
-  if (NULL != self)
-  {
-    h->self = *self;
-    h->check_self = GNUNET_YES;
-  }
-  h->cfg = cfg;
-  h->cls = cls;
-  h->nc_cb = nc;
-  h->nd_cb = nd;
-  h->reconnect_delay = GNUNET_TIME_UNIT_ZERO;
-  if (NULL != handlers)
-  {
-    for (i = 0; NULL != handlers[i].cb; i++)
-      ;
-    h->handlers = GNUNET_new_array (i + 1, struct GNUNET_MQ_MessageHandler);
-    GNUNET_memcpy (h->handlers,
-                   handlers,
-                   i * sizeof(struct GNUNET_MQ_MessageHandler));
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Connecting to transport service\n");
-  reconnect (h);
-  if (NULL == h->mq)
-  {
-    GNUNET_free (h->handlers);
-    GNUNET_free (h);
-    return NULL;
-  }
-  h->neighbours =
-    GNUNET_CONTAINER_multipeermap_create (STARTING_NEIGHBOURS_SIZE, GNUNET_YES);
-  return h;
-}
-
-
-/**
- * Disconnect from the transport service.
- *
- * @param handle handle to the service as returned from
- * #GNUNET_TRANSPORT_core_connect()
- */
-void
-GNUNET_TRANSPORT_core_disconnect (struct GNUNET_TRANSPORT_CoreHandle *handle)
-{
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Transport disconnect called!\n");
-  /* this disconnects all neighbours... */
-  disconnect (handle);
-  /* and now we stop trying to connect again... */
-  if (NULL != handle->reconnect_task)
-  {
-    GNUNET_SCHEDULER_cancel (handle->reconnect_task);
-    handle->reconnect_task = NULL;
-  }
-  GNUNET_CONTAINER_multipeermap_destroy (handle->neighbours);
-  handle->neighbours = NULL;
-  GNUNET_free (handle->handlers);
-  handle->handlers = NULL;
-  GNUNET_free (handle);
-}
-
-
-/* end of transport_api_core.c */
diff --git a/src/transport/transport_api2_monitor.c b/src/transport/transport_api2_monitor.c
deleted file mode 100644
index 67aa1985e..000000000
--- a/src/transport/transport_api2_monitor.c
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2018 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/transport_api2_monitor.c
- * @brief implementation of the gnunet_transport_monitor_service.h API
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_protocols.h"
-#include "gnunet_transport_monitor_service.h"
-#include "transport.h"
-
-
-/**
- * Opaque handle to the transport service for monitors.
- */
-struct GNUNET_TRANSPORT_MonitorContext
-{
-  /**
-   * Our configuration.
-   */
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  /**
-   * Queue to talk to the transport service.
-   */
-  struct GNUNET_MQ_Handle *mq;
-
-  /**
-   * Peer we monitor, all zeros for "all"
-   */
-  struct GNUNET_PeerIdentity peer;
-
-  /**
-   * #GNUNET_YES to return the current state and then end.
-   */
-  int one_shot;
-
-  /**
-   * Function to call with monitor data.
-   */
-  GNUNET_TRANSPORT_MonitorCallback cb;
-
-  /**
-   * Closure for @e cb.
-   */
-  void *cb_cls;
-};
-
-
-/**
- * (re)connect our monitor to the transport service
- *
- * @param mc handle to reconnect
- */
-static void
-reconnect (struct GNUNET_TRANSPORT_MonitorContext *mc);
-
-
-/**
- * Send message to the transport service about our montoring
- * desire.
- *
- * @param ai address to delete
- */
-static void
-send_start_monitor (struct GNUNET_TRANSPORT_MonitorContext *mc)
-{
-  struct GNUNET_MQ_Envelope *env;
-  struct GNUNET_TRANSPORT_MonitorStart *smm;
-
-  if (NULL == mc->mq)
-    return;
-  env = GNUNET_MQ_msg (smm, GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_START);
-  smm->one_shot = htonl ((uint32_t) mc->one_shot);
-  smm->peer = mc->peer;
-  GNUNET_MQ_send (mc->mq, env);
-}
-
-
-/**
- * Disconnect from the transport service.
- *
- * @param mc service to disconnect from
- */
-static void
-disconnect (struct GNUNET_TRANSPORT_MonitorContext *mc)
-{
-  if (NULL == mc->mq)
-    return;
-  GNUNET_MQ_destroy (mc->mq);
-  mc->mq = NULL;
-}
-
-
-/**
- * Function called on MQ errors. Reconnects to the service.
- *
- * @param cls our `struct GNUNET_TRANSPORT_MonitorContext *`
- * @param error what error happened?
- */
-static void
-error_handler (void *cls, enum GNUNET_MQ_Error error)
-{
-  struct GNUNET_TRANSPORT_MonitorContext *mc = cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "MQ failure %d, reconnecting to transport service.\n",
-              error);
-  disconnect (mc);
-  /* TODO: maybe do this with exponential backoff/delay */
-  reconnect (mc);
-}
-
-
-/**
- * Transport service sends us information about what is going on.
- * Check if @a md is well-formed.
- *
- * @param cls our `struct GNUNET_TRANSPORT_MonitorContext *`
- * @param md the monitor data we got
- * @return #GNUNET_OK if @a smt is well-formed
- */
-static int
-check_monitor_data (void *cls, const struct GNUNET_TRANSPORT_MonitorData *md)
-{
-  (void) cls;
-  GNUNET_MQ_check_zero_termination (md);
-  return GNUNET_OK;
-}
-
-
-/**
- * Transport service sends us information about what is going on.
- *
- * @param cls our `struct GNUNET_TRANSPORT_MonitorContext *`
- * @param md monitor data
- */
-static void
-handle_monitor_data (void *cls, const struct GNUNET_TRANSPORT_MonitorData *md)
-{
-  struct GNUNET_TRANSPORT_MonitorContext *mc = cls;
-  struct GNUNET_TRANSPORT_MonitorInformation mi;
-
-  mi.address = (const char *) &md[1];
-  mi.nt = (enum GNUNET_NetworkType) ntohl (md->nt);
-  mi.cs = (enum GNUNET_TRANSPORT_ConnectionStatus) ntohl (md->cs);
-  mi.num_msg_pending = ntohl (md->num_msg_pending);
-  mi.num_bytes_pending = ntohl (md->num_bytes_pending);
-  mi.last_validation = GNUNET_TIME_absolute_ntoh (md->last_validation);
-  mi.valid_until = GNUNET_TIME_absolute_ntoh (md->valid_until);
-  mi.next_validation = GNUNET_TIME_absolute_ntoh (md->next_validation);
-  mi.rtt = GNUNET_TIME_relative_ntoh (md->rtt);
-  mc->cb (mc->cb_cls, &md->peer, &mi);
-}
-
-
-/**
- * One shot was requested, and transport service is done.
- *
- * @param cls our `struct GNUNET_TRANSPORT_MonitorContext *`
- * @param me end message
- */
-static void
-handle_monitor_end (void *cls, const struct GNUNET_MessageHeader *me)
-{
-  struct GNUNET_TRANSPORT_MonitorContext *mc = cls;
-
-  if (GNUNET_YES != mc->one_shot)
-  {
-    GNUNET_break (0);
-    disconnect (mc);
-    reconnect (mc);
-    return;
-  }
-  mc->cb (mc->cb_cls, NULL, NULL);
-  GNUNET_TRANSPORT_monitor_cancel (mc);
-}
-
-
-/**
- * (re)connect our monitor to the transport service
- *
- * @param mc handle to reconnect
- */
-static void
-reconnect (struct GNUNET_TRANSPORT_MonitorContext *mc)
-{
-  struct GNUNET_MQ_MessageHandler handlers[] =
-  { GNUNET_MQ_hd_var_size (monitor_data,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_DATA,
-                           struct GNUNET_TRANSPORT_MonitorData,
-                           mc),
-    GNUNET_MQ_hd_fixed_size (monitor_end,
-                             GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_END,
-                             struct GNUNET_MessageHeader,
-                             mc),
-    GNUNET_MQ_handler_end () };
-
-  mc->mq =
-    GNUNET_CLIENT_connect (mc->cfg, "transport", handlers, &error_handler, mc);
-  if (NULL == mc->mq)
-    return;
-  send_start_monitor (mc);
-}
-
-
-/**
- * Return information about a specific peer or all peers currently known to
- * transport service once or in monitoring mode. To obtain information about
- * a specific peer, a peer identity can be passed. To obtain information about
- * all peers currently known to transport service, NULL can be passed as peer
- * identity.
- *
- * For each peer, the callback is called with information about the address used
- * to communicate with this peer, the state this peer is currently in and the
- * the current timeout for this state.
- *
- * Upon completion, the #GNUNET_TRANSPORT_PeerIterateCallback is called one
- * more time with `NULL`. After this, the operation must no longer be
- * explicitly canceled.
- *
- * The #GNUNET_TRANSPORT_monitor_peers_cancel call MUST not be called in the
- * the peer_callback!
- *
- * @param cfg configuration to use
- * @param peer a specific peer identity to obtain information for,
- *      NULL for all peers
- * @param one_shot #GNUNET_YES to return the current state and then end (with NULL+NULL),
- *                 #GNUNET_NO to monitor peers continuously
- * @param cb function to call with the results
- * @param cb_cls closure for @a mc
- */
-struct GNUNET_TRANSPORT_MonitorContext *
-GNUNET_TRANSPORT_monitor (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                          const struct GNUNET_PeerIdentity *peer,
-                          int one_shot,
-                          GNUNET_TRANSPORT_MonitorCallback cb,
-                          void *cb_cls)
-{
-  struct GNUNET_TRANSPORT_MonitorContext *mc;
-
-  mc = GNUNET_new (struct GNUNET_TRANSPORT_MonitorContext);
-  mc->cfg = cfg;
-  if (NULL != peer)
-    mc->peer = *peer;
-  mc->one_shot = one_shot;
-  mc->cb = cb;
-  mc->cb_cls = cb_cls;
-  reconnect (mc);
-  if (NULL == mc->mq)
-  {
-    GNUNET_free (mc);
-    return NULL;
-  }
-  return mc;
-}
-
-
-/**
- * Cancel request to monitor peers
- *
- * @param pmc handle for the request to cancel
- */
-void
-GNUNET_TRANSPORT_monitor_cancel (struct GNUNET_TRANSPORT_MonitorContext *mc)
-{
-  disconnect (mc);
-  GNUNET_free (mc);
-}
-
-
-/* end of transport_api2_monitor.c */
diff --git a/src/transport/transport_api_address_to_string.c b/src/transport/transport_api_address_to_string.c
deleted file mode 100644
index c7de39ea8..000000000
--- a/src/transport/transport_api_address_to_string.c
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2009-2014, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file transport/transport_api_address_to_string.c
- * @author Christian Grothoff
- * @brief enable clients to convert addresses to human readable strings
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_arm_service.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_protocols.h"
-#include "gnunet_transport_service.h"
-#include "transport.h"
-
-/**
- * Context for the address lookup.
- */
-struct GNUNET_TRANSPORT_AddressToStringContext
-{
-  /**
-   * Function to call with the human-readable address.
-   */
-  GNUNET_TRANSPORT_AddressToStringCallback cb;
-
-  /**
-   * Closure for @e cb.
-   */
-  void *cb_cls;
-
-  /**
-   * Connection to the service.
-   */
-  struct GNUNET_MQ_Handle *mq;
-};
-
-
-/**
- * Function called with responses from the service.
- *
- * @param cls our `struct GNUNET_TRANSPORT_AddressToStringContext *`
- * @param msg message with the human-readable address
- * @return #GNUNET_OK if message is well-formed
- */
-static int
-check_reply (void *cls,
-             const struct AddressToStringResultMessage *atsm)
-{
-  uint16_t size = ntohs (atsm->header.size) - sizeof(*atsm);
-  const char *address;
-  int result;
-  uint32_t addr_len;
-
-  result = (int) ntohl (atsm->res);
-  addr_len = ntohl (atsm->addr_len);
-  if (GNUNET_SYSERR == result)
-    return GNUNET_OK;
-  if (0 == size)
-  {
-    if (GNUNET_OK != result)
-    {
-      GNUNET_break (0);
-      return GNUNET_SYSERR;
-    }
-    return GNUNET_OK;
-  }
-  address = (const char *) &atsm[1];
-  if ((addr_len > size) ||
-      (address[addr_len - 1] != '\0'))
-  {
-    /* invalid reply */
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Function called with responses from the service.
- *
- * @param cls our `struct GNUNET_TRANSPORT_AddressToStringContext *`
- * @param msg message with the human-readable address
- */
-static void
-handle_reply (void *cls,
-              const struct AddressToStringResultMessage *atsm)
-{
-  struct GNUNET_TRANSPORT_AddressToStringContext *alucb = cls;
-  uint16_t size = ntohs (atsm->header.size) - sizeof(*atsm);
-  const char *address;
-  int result;
-
-  result = (int) ntohl (atsm->res);
-  if (GNUNET_SYSERR == result)
-  {
-    /* expect more replies; as this is not the last
-       call, we must pass the empty string for the address */
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Address resolution failed\n");
-    alucb->cb (alucb->cb_cls,
-               "",
-               GNUNET_NO);
-    return;
-  }
-  if (0 == size)
-  {
-    /* we are done (successfully, without communication errors) */
-    alucb->cb (alucb->cb_cls,
-               NULL,
-               GNUNET_OK);
-    GNUNET_TRANSPORT_address_to_string_cancel (alucb);
-    return;
-  }
-  address = (const char *) &atsm[1];
-  /* return normal reply to caller, also expect more replies */
-  alucb->cb (alucb->cb_cls,
-             address,
-             GNUNET_OK);
-}
-
-
-/**
- * Generic error handler, called with the appropriate
- * error code and the same closure specified at the creation of
- * the message queue.
- * Not every message queue implementation supports an error handler.
- *
- * @param cls the `struct GNUNET_TRANSPORT_AddressToStringContext *`
- * @param error error code
- */
-static void
-mq_error_handler (void *cls,
-                  enum GNUNET_MQ_Error error)
-{
-  struct GNUNET_TRANSPORT_AddressToStringContext *alucb = cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Disconnected from transport, address resolution failed\n");
-  alucb->cb (alucb->cb_cls,
-             NULL,
-             GNUNET_SYSERR);
-  GNUNET_TRANSPORT_address_to_string_cancel (alucb);
-}
-
-
-/**
- * Convert a binary address into a human readable address.
- *
- * @param cfg configuration to use
- * @param address address to convert (binary format)
- * @param numeric should (IP) addresses be displayed in numeric form
- *                (otherwise do reverse DNS lookup)
- * @param timeout how long is the lookup allowed to take at most
- * @param aluc function to call with the results
- * @param aluc_cls closure for @a aluc
- * @return handle to cancel the operation, NULL on error
- */
-struct GNUNET_TRANSPORT_AddressToStringContext *
-GNUNET_TRANSPORT_address_to_string (const struct
-                                    GNUNET_CONFIGURATION_Handle *cfg,
-                                    const struct GNUNET_HELLO_Address *address,
-                                    int numeric,
-                                    struct GNUNET_TIME_Relative timeout,
-                                    GNUNET_TRANSPORT_AddressToStringCallback
-                                    aluc,
-                                    void *aluc_cls)
-{
-  struct GNUNET_TRANSPORT_AddressToStringContext *alc
-    = GNUNET_new (struct GNUNET_TRANSPORT_AddressToStringContext);
-  struct GNUNET_MQ_MessageHandler handlers[] = {
-    GNUNET_MQ_hd_var_size (reply,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_TO_STRING_REPLY,
-                           struct AddressToStringResultMessage,
-                           alc),
-    GNUNET_MQ_handler_end ()
-  };
-  size_t alen;
-  size_t slen;
-  struct AddressLookupMessage *msg;
-  struct GNUNET_MQ_Envelope *env;
-  char *addrbuf;
-
-  alen = address->address_length;
-  slen = strlen (address->transport_name) + 1;
-  if ((alen + slen >= GNUNET_MAX_MESSAGE_SIZE
-       - sizeof(struct AddressLookupMessage)) ||
-      (alen >= GNUNET_MAX_MESSAGE_SIZE) ||
-      (slen >= GNUNET_MAX_MESSAGE_SIZE))
-  {
-    GNUNET_break (0);
-    GNUNET_free (alc);
-    return NULL;
-  }
-  alc->cb = aluc;
-  alc->cb_cls = aluc_cls;
-  alc->mq = GNUNET_CLIENT_connect (cfg,
-                                   "transport",
-                                   handlers,
-                                   &mq_error_handler,
-                                   alc);
-  if (NULL == alc->mq)
-  {
-    GNUNET_break (0);
-    GNUNET_free (alc);
-    return NULL;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Client tries to resolve for peer `%s' address plugin %s len %u\n",
-              GNUNET_i2s (&address->peer),
-              address->transport_name,
-              (unsigned int) address->address_length);
-  env = GNUNET_MQ_msg_extra (msg,
-                             alen + slen,
-                             GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_TO_STRING);
-  msg->numeric_only = htons ((int16_t) numeric);
-  msg->addrlen = htons ((uint16_t) alen);
-  msg->timeout = GNUNET_TIME_relative_hton (timeout);
-  addrbuf = (char *) &msg[1];
-  GNUNET_memcpy (addrbuf,
-                 address->address,
-                 alen);
-  GNUNET_memcpy (&addrbuf[alen],
-                 address->transport_name,
-                 slen);
-  GNUNET_MQ_send (alc->mq,
-                  env);
-  return alc;
-}
-
-
-/**
- * Cancel request for address conversion.
- *
- * @param alc the context handle
- */
-void
-GNUNET_TRANSPORT_address_to_string_cancel (struct
-                                           GNUNET_TRANSPORT_AddressToStringContext
-                                           *alc)
-{
-  GNUNET_MQ_destroy (alc->mq);
-  GNUNET_free (alc);
-}
-
-
-/* end of transport_api_address_to_string.c */
diff --git a/src/transport/transport_api_blacklist.c b/src/transport/transport_api_blacklist.c
deleted file mode 100644
index b195a7fc7..000000000
--- a/src/transport/transport_api_blacklist.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2010-2014, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/transport_api_blacklist.c
- * @brief library to access the blacklisting functions of the transport service
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_arm_service.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_protocols.h"
-#include "gnunet_transport_service.h"
-#include "transport.h"
-
-/**
- * Handle for blacklisting requests.
- */
-struct GNUNET_TRANSPORT_Blacklist
-{
-  /**
-   * Connection to transport service.
-   */
-  struct GNUNET_MQ_Handle *mq;
-
-  /**
-   * Configuration to use.
-   */
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  /**
-   * Function to call for determining if a peer is allowed
-   * to communicate with us.
-   */
-  GNUNET_TRANSPORT_BlacklistCallback cb;
-
-  /**
-   * Closure for @e cb.
-   */
-  void *cb_cls;
-};
-
-
-/**
- * Establish blacklist connection to transport service.
- *
- * @param br overall handle
- */
-static void
-reconnect (struct GNUNET_TRANSPORT_Blacklist *br);
-
-
-/**
- * Handle blacklist queries.
- *
- * @param cls our overall handle
- * @param bm query
- */
-static void
-handle_query (void *cls,
-              const struct BlacklistMessage *bm)
-{
-  struct GNUNET_TRANSPORT_Blacklist *br = cls;
-  struct GNUNET_MQ_Envelope *env;
-  struct BlacklistMessage *res;
-
-  GNUNET_break (0 == ntohl (bm->is_allowed));
-  env = GNUNET_MQ_msg (res,
-                       GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST_REPLY);
-  res->is_allowed = htonl (br->cb (br->cb_cls,
-                                   &bm->peer));
-  res->peer = bm->peer;
-  GNUNET_MQ_send (br->mq,
-                  env);
-}
-
-
-/**
- * Generic error handler, called with the appropriate error code and
- * the same closure specified at the creation of the message queue.
- * Not every message queue implementation supports an error handler.
- *
- * @param cls closure with the `struct GNUNET_TRANSPORT_Blacklist *`
- * @param error error code
- */
-static void
-mq_error_handler (void *cls,
-                  enum GNUNET_MQ_Error error)
-{
-  struct GNUNET_TRANSPORT_Blacklist *br = cls;
-
-  reconnect (br);
-}
-
-
-/**
- * Establish blacklist connection to transport service.
- *
- * @param br overall handle
- */
-static void
-reconnect (struct GNUNET_TRANSPORT_Blacklist *br)
-{
-  struct GNUNET_MQ_MessageHandler handlers[] = {
-    GNUNET_MQ_hd_fixed_size (query,
-                             GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST_QUERY,
-                             struct BlacklistMessage,
-                             br),
-    GNUNET_MQ_handler_end ()
-  };
-  struct GNUNET_MQ_Envelope *env;
-  struct GNUNET_MessageHeader *req;
-
-  if (NULL != br->mq)
-    GNUNET_MQ_destroy (br->mq);
-  br->mq = GNUNET_CLIENT_connect (br->cfg,
-                                  "transport",
-                                  handlers,
-                                  &mq_error_handler,
-                                  br);
-  if (NULL == br->mq)
-    return;
-  env = GNUNET_MQ_msg (req,
-                       GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST_INIT);
-  GNUNET_MQ_send (br->mq,
-                  env);
-}
-
-
-/**
- * Install a blacklist callback.  The service will be queried for all
- * existing connections as well as any fresh connections to check if
- * they are permitted.  If the blacklisting callback is unregistered,
- * all hosts that were denied in the past will automatically be
- * whitelisted again.  Cancelling the blacklist handle is also the
- * only way to re-enable connections from peers that were previously
- * blacklisted.
- *
- * @param cfg configuration to use
- * @param cb callback to invoke to check if connections are allowed
- * @param cb_cls closure for @a cb
- * @return NULL on error, otherwise handle for cancellation
- */
-struct GNUNET_TRANSPORT_Blacklist *
-GNUNET_TRANSPORT_blacklist (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                            GNUNET_TRANSPORT_BlacklistCallback cb,
-                            void *cb_cls)
-{
-  struct GNUNET_TRANSPORT_Blacklist *br;
-
-  br = GNUNET_new (struct GNUNET_TRANSPORT_Blacklist);
-  br->cfg = cfg;
-  br->cb = cb;
-  br->cb_cls = cb_cls;
-  reconnect (br);
-  if (NULL == br->mq)
-  {
-    GNUNET_free (br);
-    return NULL;
-  }
-  return br;
-}
-
-
-/**
- * Abort the blacklist.  Note that this function is the only way for
- * removing a peer from the blacklist.
- *
- * @param br handle of the request that is to be cancelled
- */
-void
-GNUNET_TRANSPORT_blacklist_cancel (struct GNUNET_TRANSPORT_Blacklist *br)
-{
-  GNUNET_MQ_destroy (br->mq);
-  GNUNET_free (br);
-}
-
-
-/* end of transport_api_blacklist.c */
diff --git a/src/transport/transport_api_cmd_backchannel_check.c b/src/transport/transport_api_cmd_backchannel_check.c
deleted file mode 100644
index 4ffd96210..000000000
--- a/src/transport/transport_api_cmd_backchannel_check.c
+++ /dev/null
@@ -1,602 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2021 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testing_api_cmd_backchannel_check.c
- * @brief cmd to start a peer.
- * @author t3sserakt
- */
-#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_netjail_lib.h"
-#include "gnunet_transport_application_service.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_transport_service.h"
-#include "transport-testing-cmds.h"
-
-/**
- * Generic logging shortcut
- */
-#define LOG(kind, ...) GNUNET_log (kind, __VA_ARGS__)
-
-#define UDP "udp"
-
-/**
- * Maximum length allowed for line input.
- */
-#define MAX_LINE_LENGTH 1024
-
-/**
- * Struct to store information needed in callbacks.
- *
- */
-struct CheckState
-{
-  /**
-   * Context for our asynchronous completion.
-   */
-  struct GNUNET_TESTING_AsyncContext ac;
-
-  /**
-   * The number of the node in a network namespace.
-   */
-  unsigned int node_n;
-
-  /**
-   * The number of the network namespace.
-   */
-  unsigned int namespace_n;
-
-  /**
-   * The testing system of this node.
-   */
-  const struct GNUNET_TESTING_System *tl_system;
-
-  // Label of the cmd which started the test system.
-  const char *create_label;
-
-  /**
-   * Number globally identifying the node.
-   *
-   */
-  uint32_t num;
-
-  /**
-   * Label of the cmd to start a peer.
-   *
-   */
-  const char *start_peer_label;
-
-  /**
-   * The topology of the test setup.
-   */
-  struct GNUNET_TESTING_NetjailTopology *topology;
-
-  /**
-   * Connections to other peers.
-   */
-  struct GNUNET_TESTING_NodeConnection *node_connections_head;
-
-  /**
-   * Number of connections.
-   */
-  unsigned int con_num;
-
-  /**
-   * Number of received backchannel messages.
-   */
-  unsigned int received_backchannel_msgs;
-
-  /**
-   * Array with search strings.
-   */
-  char **search_string;
-
-  /**
-   * File handle for log file.
-   */
-  struct GNUNET_DISK_FileHandle *fh;
-
-  /**
-   * Task which handles the reading
-   */
-  struct GNUNET_SCHEDULER_Task *task;
-
-  /**
-   * Stream to read log file lines.
-   */
-  FILE *stream;
-};
-
-/**
- *
- * @param cls The cmd state CheckState.
- */
-static void
-read_from_log (void *cls)
-{
-  struct CheckState *cs = cls;
-  char line[MAX_LINE_LENGTH + 1];
-  char *search_string;
-
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "read_from_log\n");
-
-  cs->fh = GNUNET_DISK_file_open ("test.out",
-                                  GNUNET_DISK_OPEN_READ,
-                                  GNUNET_DISK_PERM_USER_READ);
-
-  cs->task = NULL;
-
-  /* read message from line and handle it */
-  cs->stream = fdopen (cs->fh->fd, "r");
-  memset (line, 0, MAX_LINE_LENGTH + 1);
-
-  // fgets (line, MAX_LINE_LENGTH, cs->stream);
-  // while (NULL != line &&  0 != strcmp (line, ""))// '\0' != line[0])
-  while  (NULL != fgets (line, MAX_LINE_LENGTH, cs->stream))
-  {
-    /*LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "cs->received_backchannel_msgs: %u\n",
-         cs->received_backchannel_msgs);*/
-    /*if (NULL == strstr (line, "line"))
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "line: %s",
-           line);*/
-
-
-    for (int i = 0; i < cs->con_num; i++)
-    {
-      search_string = cs->search_string[i];
-      /*LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "search %u %u: %s %p\n",
-           i,
-           cs->con_num,
-           cs->search_string[i],
-           cs->search_string);
-      fprintf (stderr,
-      line);*/
-      if (NULL != strstr (line,
-                          search_string))
-      // "Delivering backchannel message from 4TTC to F7B5 of type 1460 to udp"))
-      // cs->search_string[i]))
-      {
-        cs->received_backchannel_msgs++;
-        LOG (GNUNET_ERROR_TYPE_DEBUG,
-             "received_backchannel_msgs %u con_num %u\n",
-             cs->received_backchannel_msgs,
-             cs->con_num);
-        if (cs->received_backchannel_msgs == cs->con_num)
-        {
-          LOG (GNUNET_ERROR_TYPE_DEBUG,
-               "search finished %lu %lu %u\n",
-               strlen (cs->search_string[i]),
-               strlen (
-                 "Delivering backchannel message from 4TTC to F7B5 of type 1460 to udp"),
-               strcmp (
-                 "Delivering backchannel message from 4TTC to F7B5 of type 1460 to udp",
-                 cs->search_string[i]));
-          GNUNET_TESTING_async_finish (&cs->ac);
-          fclose (cs->stream);
-          return;
-        }
-      }
-    }
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "read_from_log end\n");
-  fclose (cs->stream);
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
-                                &read_from_log,
-                                cs);
-  /*if (NULL == fgets (line, MAX_LINE_LENGTH, cs->stream))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "read null\n");
-    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                  &read_from_log,
-                                  cs);
-    return;
-    }*/
-  /*else {
-    cs->task =
-      GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
-                                      cs->fh,
-                                      &read_from_log,
-                                      cs);
-
-
-                                      }*/
-}
-
-
-static enum GNUNET_GenericReturnValue
-will_the_other_node_connect_via_udp (
-  struct CheckState *cs,
-  const struct GNUNET_TESTING_NetjailNode *node)
-// struct GNUNET_TESTING_NodeConnection *connection)
-{
-  // struct GNUNET_TESTING_NetjailTopology *topology = cs->topology;
-  // unsigned int node_n = connection->node_n;
-  // unsigned int namespace_n = connection->namespace_n;
-  // struct GNUNET_HashCode hc;
-  // struct GNUNET_ShortHashCode *key = GNUNET_new (struct GNUNET_ShortHashCode);
-  // struct GNUNET_HashCode hc_namespace;
-  /*struct GNUNET_ShortHashCode *key_namespace = GNUNET_new (struct
-    GNUNET_ShortHashCode);*/
-  // struct GNUNET_TESTING_NetjailNode *node;
-  struct GNUNET_TESTING_NodeConnection *pos_connection;
-  struct GNUNET_TESTING_AddressPrefix *pos_prefix;
-  // struct GNUNET_TESTING_NetjailNamespace *namespace;
-  // struct GNUNET_CONTAINER_MultiShortmap *map;
-
-  /* if (0 == connection->namespace_n) */
-  /* { */
-  /*   map = topology->map_globals; */
-  /* } */
-  /* else */
-  /* { */
-  /*   GNUNET_CRYPTO_hash (&namespace_n, sizeof(namespace_n), &hc_namespace); */
-  /*   memcpy (key_namespace, */
-  /*           &hc_namespace, */
-  /*           sizeof (*key_namespace)); */
-  /*   if (GNUNET_YES == GNUNET_CONTAINER_multishortmap_contains ( */
-  /*         topology->map_namespaces, */
-  /*         key_namespace)) */
-  /*   { */
-  /*     namespace = GNUNET_CONTAINER_multishortmap_get (topology->map_namespaces, */
-  /*                                                     key_namespace); */
-  /*     map = namespace->nodes; */
-  /*   } */
-  /*   else */
-  /*     GNUNET_assert (0); */
-  /* } */
-
-  /* GNUNET_CRYPTO_hash (&node_n, sizeof(node_n), &hc); */
-  /* memcpy (key, */
-  /*         &hc, */
-  /*         sizeof (*key)); */
-  /* if (GNUNET_YES == GNUNET_CONTAINER_multishortmap_contains ( */
-  /*       map, */
-  /*       key)) */
-  /* { */
-  /*   node = GNUNET_CONTAINER_multishortmap_get (cs->topology->map_globals, */
-  /*                                              key); */
-  /*   for (pos_connection = node->node_connections_head; NULL != pos_connection; */
-  /*        pos_connection = pos_connection->next) */
-  /*   { */
-  /*     if ((node->namespace_n == pos_connection->namespace_n) && */
-  /*         (node->node_n == pos_connection->node_n) ) */
-  /*     { */
-  /*       for (pos_prefix = pos_connection->address_prefixes_head; NULL != */
-  /*            pos_prefix; */
-  /*            pos_prefix = */
-  /*              pos_prefix->next) */
-  /*       { */
-  /*         if (0 == strcmp (UDP, pos_prefix->address_prefix)) */
-  /*         { */
-  /*           return GNUNET_YES; */
-  /*         } */
-  /*       } */
-  /*     } */
-  /*   } */
-  /* } */
-
-  for (pos_connection = node->node_connections_head; NULL != pos_connection;
-       pos_connection = pos_connection->next)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "connect via udp %u %u %u %u\n",
-                node->namespace_n,
-                cs->namespace_n,
-                node->node_n,
-                cs->node_n);
-    if ((pos_connection->namespace_n == cs->namespace_n) &&
-        (pos_connection->node_n == cs->node_n) )
-    {
-      for (pos_prefix = pos_connection->address_prefixes_head; NULL !=
-           pos_prefix;
-           pos_prefix =
-             pos_prefix->next)
-      {
-        if (0 == strcmp (UDP, pos_prefix->address_prefix))
-        {
-          return GNUNET_YES;
-        }
-      }
-    }
-  }
-
-  return GNUNET_NO;
-}
-
-static void
-add_search_string (struct CheckState *cs, const struct
-                   GNUNET_TESTING_NetjailNode *node)
-{
-  unsigned int num;
-  struct GNUNET_PeerIdentity *peer;
-  struct GNUNET_PeerIdentity *us;
-  char *buf;
-  char *part_one = "Delivering backchannel message from ";
-  char *part_two = " to ";
-  char *part_three = " of type 1460 to udp";
-  char *peer_id;
-  char *us_id;
-
-  if (0 == node->namespace_n)
-    num = node->node_n;
-  else
-    num = (node->namespace_n - 1) * cs->topology->nodes_m + node->node_n
-          + cs->topology->nodes_x;
-
-  // num = GNUNET_TESTING_calculate_num (pos_connection, cs->topology);
-  peer = GNUNET_TESTING_get_pub_key (num, cs->tl_system);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "peer: %s num %u\n",
-       GNUNET_i2s (peer),
-       num);
-  us = GNUNET_TESTING_get_pub_key (cs->num, cs->tl_system);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "us: %s cs->num %d\n",
-       GNUNET_i2s (us),
-       cs->num);
-
-  GNUNET_asprintf (&peer_id,
-                   "%s",
-                   GNUNET_i2s (peer));
-  GNUNET_asprintf (&us_id,
-                   "%s",
-                   GNUNET_i2s (us));
-
-  if (0 < GNUNET_asprintf (&buf,
-                           "%s%s%s%s%s",
-                           part_one,
-                           us_id,
-                           part_two,
-                           peer_id,
-                           part_three))
-  {
-    GNUNET_array_append (cs->search_string,
-                         cs->con_num,
-                         buf);
-    /*LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "con_num: %u search: %s %p\n",
-         cs->con_num,
-         cs->search_string[cs->con_num - 1],
-         cs->search_string);*/
-  }
-  else
-    GNUNET_assert (0);
-}
-
-
-/**
- * The run method of this cmd will connect to peers.
- *
- */
-static void
-backchannel_check_run (void *cls,
-                       struct GNUNET_TESTING_Interpreter *is)
-{
-  struct CheckState *cs = cls;
-  // char *buf;
-  // char *part_one = "Delivering backchannel message from ";
-  // char *part_two = " of type 1460 to udp";
-  const struct GNUNET_TESTING_Command *system_cmd;
-  const struct GNUNET_TESTING_System *tl_system;
-  const struct GNUNET_TESTING_Command *peer1_cmd;
-  const struct GNUNET_TRANSPORT_ApplicationHandle *ah;
-  // struct GNUNET_PeerIdentity *peer;
-  // uint32_t num;
-  // struct GNUNET_TESTING_NodeConnection *pos_connection;
-  // unsigned int con_num = 0;
-  struct GNUNET_CONTAINER_MultiShortmapIterator *node_it;
-  struct GNUNET_CONTAINER_MultiShortmapIterator *namespace_it;
-  struct GNUNET_ShortHashCode node_key;
-  struct GNUNET_ShortHashCode namespace_key;
-  const struct GNUNET_TESTING_NetjailNode *node;
-  const struct GNUNET_TESTING_NetjailNamespace *namespace;
-
-  peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
-                                                         cs->start_peer_label);
-  GNUNET_TRANSPORT_get_trait_application_handle (peer1_cmd,
-                                                 &ah);
-
-  system_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
-                                                          cs->create_label);
-  GNUNET_TESTING_get_trait_test_system (system_cmd,
-                                        &tl_system);
-
-  cs->tl_system = tl_system;
-
-  cs->node_connections_head = GNUNET_TESTING_get_connections (cs->num,
-                                                              cs->topology);
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "check run\n");
-
-
-  node_it = GNUNET_CONTAINER_multishortmap_iterator_create (
-    cs->topology->map_globals);
-
-  while (GNUNET_YES == GNUNET_CONTAINER_multishortmap_iterator_next (node_it,
-                                                                     &node_key,
-                                                                     (const
-                                                                      void**) &
-                                                                     node))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "namespace_n %u node_n %u\n",
-         node->namespace_n,
-         node->node_n);
-    if (GNUNET_YES == will_the_other_node_connect_via_udp (cs, node))
-    {
-      add_search_string (cs, node);
-    }
-  }
-  namespace_it = GNUNET_CONTAINER_multishortmap_iterator_create (
-    cs->topology->map_namespaces);
-  while (GNUNET_YES == GNUNET_CONTAINER_multishortmap_iterator_next (
-           namespace_it,
-           &namespace_key,
-           (const
-            void**) &namespace))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "namespace_n %u\n",
-         node->namespace_n);
-    node_it = GNUNET_CONTAINER_multishortmap_iterator_create (
-      namespace->nodes);
-    while (GNUNET_YES == GNUNET_CONTAINER_multishortmap_iterator_next (node_it,
-                                                                       &node_key,
-                                                                       (const
-                                                                        void**)
-                                                                       &node))
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "namespace_n %u node_n %u\n",
-           node->namespace_n,
-           node->node_n);
-      if (GNUNET_YES == will_the_other_node_connect_via_udp (cs, node))
-      {
-        add_search_string (cs, node);
-      }
-    }
-  }
-  /* for (pos_connection = cs->node_connections_head; NULL != pos_connection; */
-  /*      pos_connection = pos_connection->next) */
-  /* { */
-
-  /*   if (GNUNET_YES == will_the_other_node_connect_via_udp (cs, node)) */
-  /*   { */
-  /*     num = GNUNET_TESTING_calculate_num (pos_connection, cs->topology); */
-  /*     peer = GNUNET_TESTING_get_pub_key (num, tl_system); */
-  /*     LOG (GNUNET_ERROR_TYPE_DEBUG, */
-  /*          "peer: %s\n", */
-  /*          GNUNET_i2s (peer)); */
-
-  /*     if (0 < GNUNET_asprintf (&buf, */
-  /*                              "%s%s%s", */
-  /*                              part_one, */
-  /*                              GNUNET_i2s (peer), */
-  /*                              part_two)) */
-  /*     { */
-  /*       GNUNET_array_append (cs->search_string, */
-  /*                            con_num, */
-  /*                            buf); */
-  /*       /\*LOG (GNUNET_ERROR_TYPE_DEBUG, */
-  /*            "con_num: %u search: %s %p\n", */
-  /*            con_num, */
-  /*            cs->search_string[con_num - 1], */
-  /*            cs->search_string);*\/ */
-  /*     } */
-  /*     else */
-  /*       GNUNET_assert (0); */
-  /*   } */
-
-
-  /* } */
-  // cs->con_num = con_num;
-  if (0 != cs->con_num)
-  {
-    cs->task =
-      GNUNET_SCHEDULER_add_now (&read_from_log,
-                                cs);
-  }
-  else
-    GNUNET_TESTING_async_finish (&cs->ac);
-
-}
-
-
-/**
- * Trait function of this cmd does nothing.
- *
- */
-static int
-backchannel_check_traits (void *cls,
-                          const void **ret,
-                          const char *trait,
-                          unsigned int index)
-{
-  return GNUNET_OK;
-}
-
-
-/**
- * The cleanup function of this cmd frees resources the cmd allocated.
- *
- */
-static void
-backchannel_check_cleanup (void *cls)
-{
-  struct ConnectPeersState *cs = cls;
-
-  GNUNET_free (cs);
-}
-
-
-/**
- * Create command.
- *
- * @param label name for command.
- * @param start_peer_label Label of the cmd to start a peer.
- * @param create_label Label of the cmd to create the testing system.
- * @param num Number globally identifying the node.
- * @param node_n The number of the node in a network namespace.
- * @param namespace_n The number of the network namespace.
- * @param The topology for the test setup.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TRANSPORT_cmd_backchannel_check (const char *label,
-                                        const char *start_peer_label,
-                                        const char *create_label,
-                                        uint32_t num,
-                                        unsigned int node_n,
-                                        unsigned int namespace_n,
-                                        struct GNUNET_TESTING_NetjailTopology *
-                                        topology)
-{
-  struct CheckState *cs;
-
-  cs = GNUNET_new (struct CheckState);
-  cs->start_peer_label = start_peer_label;
-  cs->num = num;
-  cs->create_label = create_label;
-  cs->topology = topology;
-  cs->node_n = node_n;
-  cs->namespace_n = namespace_n;
-
-  struct GNUNET_TESTING_Command cmd = {
-    .cls = cs,
-    .label = label,
-    .run = &backchannel_check_run,
-    .ac = &cs->ac,
-    .cleanup = &backchannel_check_cleanup,
-    .traits = &backchannel_check_traits
-  };
-
-  return cmd;
-}
diff --git a/src/transport/transport_api_cmd_connecting_peers.c b/src/transport/transport_api_cmd_connecting_peers.c
deleted file mode 100644
index 8aba290c3..000000000
--- a/src/transport/transport_api_cmd_connecting_peers.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2021 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testing_api_cmd_start_peer.c
- * @brief cmd to start a peer.
- * @author t3sserakt
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_netjail_lib.h"
-#include "gnunet_transport_application_service.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_transport_service.h"
-#include "transport-testing-cmds.h"
-
-/**
- * Generic logging shortcut
- */
-#define LOG(kind, ...) GNUNET_log (kind, __VA_ARGS__)
-
-/**
- * The run method of this cmd will connect to peers.
- *
- */
-static void
-connect_peers_run (void *cls,
-                   struct GNUNET_TESTING_Interpreter *is)
-{
-  struct ConnectPeersState *cps = cls;
-  const struct GNUNET_TESTING_Command *system_cmd;
-  const struct GNUNET_TESTING_System *tl_system;
-
-
-  const struct GNUNET_TESTING_Command *peer1_cmd;
-  const struct GNUNET_TRANSPORT_ApplicationHandle *ah;
-  struct GNUNET_PeerIdentity *peer;
-  char *addr;
-  char *addr_and_port;
-  enum GNUNET_NetworkType nt = 0;
-  uint32_t num;
-  struct GNUNET_TESTING_NodeConnection *pos_connection;
-  struct GNUNET_TESTING_AddressPrefix *pos_prefix;
-  unsigned int con_num = 0;
-  const enum GNUNET_GenericReturnValue *broadcast;
-  char *port;
-
-  cps->is = is;
-  peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
-                                                         cps->start_peer_label);
-  GNUNET_TRANSPORT_get_trait_application_handle (peer1_cmd,
-                                                 &ah);
-  GNUNET_TRANSPORT_get_trait_broadcast (peer1_cmd,
-                                        &broadcast);
-
-  system_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
-                                                          cps->create_label);
-  GNUNET_TESTING_get_trait_test_system (system_cmd,
-                                        &tl_system);
-
-  cps->tl_system = tl_system;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "cps->num: %u \n",
-       cps->num);
-
-  cps->node_connections_head = GNUNET_TESTING_get_connections (cps->num,
-                                                               cps->topology);
-
-  for (pos_connection = cps->node_connections_head; NULL != pos_connection;
-       pos_connection = pos_connection->next)
-  {
-    con_num++;
-    num = GNUNET_TESTING_calculate_num (pos_connection, cps->topology);
-    for (pos_prefix = pos_connection->address_prefixes_head; NULL != pos_prefix;
-         pos_prefix =
-           pos_prefix->next)
-    {
-      addr = GNUNET_TESTING_get_address (pos_connection,
-                                         pos_prefix->address_prefix);
-      if (NULL != addr)
-      {
-        if (0 == GNUNET_memcmp (pos_prefix->address_prefix, "udp"))
-          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                      "validating memcmp\n");
-        if (GNUNET_YES == *broadcast)
-          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                      "validating broadcast\n");
-        if ((0 == GNUNET_memcmp (pos_prefix->address_prefix, "udp")) &&
-            (GNUNET_YES == *broadcast) )
-          GNUNET_asprintf (&addr_and_port,
-                           "%s:2086",
-                           addr);
-        else
-          GNUNET_asprintf (&addr_and_port,
-                           "%s:60002",
-                           addr);
-        peer = GNUNET_TESTING_get_pub_key (num, tl_system);
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                    "validating peer number %u with identity %s and address %s %u %s\n",
-                    num,
-                    GNUNET_i2s (peer),
-                    addr_and_port,
-                    *broadcast,
-                    pos_prefix->address_prefix);
-        GNUNET_TRANSPORT_application_validate ((struct
-                                                GNUNET_TRANSPORT_ApplicationHandle
-                                                *) ah,
-                                               peer,
-                                               nt,
-                                               addr_and_port);
-        GNUNET_free (peer);
-        GNUNET_free (addr);
-        GNUNET_free (addr_and_port);
-      }
-    }
-  }
-  cps->con_num = con_num;
-}
-
-
-/**
- * Callback from start peer cmd for signaling a peer got connected.
- *
- */
-static void *
-notify_connect (struct GNUNET_TESTING_Interpreter *is,
-                const struct GNUNET_PeerIdentity *peer)
-{
-  const struct GNUNET_TESTING_Command *cmd;
-  struct ConnectPeersState *cps;
-  struct GNUNET_PeerIdentity *peer_connection;
-  struct GNUNET_TESTING_NodeConnection *pos_connection;
-  unsigned int num;
-  unsigned int con_num;
-  void *ret = NULL;
-
-  cmd = GNUNET_TESTING_interpreter_lookup_command_all (is,
-                                                       "connect-peers");
-  cps = cmd->cls;
-  con_num = cps->con_num_notified;
-  for (pos_connection = cps->node_connections_head; NULL != pos_connection;
-       pos_connection = pos_connection->next)
-  {
-    num = GNUNET_TESTING_calculate_num (pos_connection, cps->topology);
-    peer_connection = GNUNET_TESTING_get_pub_key (num, cps->tl_system);
-    if (0 == GNUNET_memcmp (peer,
-                            peer_connection))
-      cps->con_num_notified++;
-    GNUNET_free (peer_connection);
-  }
-  if (cps->con_num == con_num)
-    cps->additional_connects_notified++;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "con_num: %u add: %u num_notified: %u add_notified: %u\n",
-              cps->con_num,
-              cps->additional_connects,
-              cps->con_num_notified,
-              cps->additional_connects_notified);
-  if (cps->con_num + cps->additional_connects == cps->con_num_notified
-      + cps->additional_connects_notified)
-  {
-    GNUNET_TESTING_async_finish (&cps->ac);
-  }
-  return ret;
-}
-
-
-/**
- * The cleanup function of this cmd frees resources the cmd allocated.
- *
- */
-static void
-connect_peers_cleanup (void *cls)
-{
-  struct ConnectPeersState *cps = cls;
-
-  GNUNET_free (cps);
-}
-
-
-/**
- * This function prepares an array with traits.
- *
- */
-enum GNUNET_GenericReturnValue
-connect_peers_traits (void *cls,
-                      const void **ret,
-                      const char *trait,
-                      unsigned int index)
-{
-  struct ConnectPeersState *cps = cls;
-  struct GNUNET_TESTING_Trait traits[] = {
-    GNUNET_TRANSPORT_make_trait_connect_peer_state ((const void *) cps),
-    GNUNET_TESTING_trait_end ()
-  };
-  return GNUNET_TESTING_get_trait (traits,
-                                   ret,
-                                   trait,
-                                   index);
-}
-
-
-/**
- * Create command
- *
- * @param label name for command
- * @param start_peer_label Label of the cmd to start a peer.
- * @param create_peer_label Label of the cmd which started the test system.
- * @param num Number globally identifying the node.
- * @param The topology for the test setup.
- * @param additional_connects Number of additional connects this cmd will wait for not triggered by this cmd.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TRANSPORT_cmd_connect_peers (const char *label,
-                                    const char *start_peer_label,
-                                    const char *create_label,
-                                    uint32_t num,
-                                    struct GNUNET_TESTING_NetjailTopology *
-                                    topology,
-                                    unsigned int additional_connects)
-{
-  struct ConnectPeersState *cps;
-
-  cps = GNUNET_new (struct ConnectPeersState);
-  cps->start_peer_label = start_peer_label;
-  cps->num = num;
-  cps->create_label = create_label;
-  cps->topology = topology;
-  cps->notify_connect = notify_connect;
-  cps->additional_connects = additional_connects;
-
-  {
-    struct GNUNET_TESTING_Command cmd = {
-      .cls = cps,
-      .label = label,
-      .run = &connect_peers_run,
-      .ac = &cps->ac,
-      .cleanup = &connect_peers_cleanup,
-      .traits = &connect_peers_traits
-    };
-
-    return cmd;
-  }
-}
diff --git a/src/transport/transport_api_cmd_send_simple.c b/src/transport/transport_api_cmd_send_simple.c
deleted file mode 100644
index ade0cc914..000000000
--- a/src/transport/transport_api_cmd_send_simple.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2021 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testing_api_cmd_start_peer.c
- * @brief cmd to start a peer.
- * @author t3sserakt
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_netjail_lib.h"
-#include "transport-testing2.h"
-#include "transport-testing-cmds.h"
-
-/**
- * Generic logging shortcut
- */
-#define LOG(kind, ...) GNUNET_log (kind, __VA_ARGS__)
-
-/**
- * Struct to hold information for callbacks.
- *
- */
-struct SendSimpleState
-{
-  /**
-   * Number globally identifying the node.
-   *
-   */
-  uint32_t num;
-
-  /**
-   * Label of the cmd to start a peer.
-   *
-   */
-  const char *start_peer_label;
-
-  /**
-   * Label of the cmd which started the test system.
-   *
-   */
-  const char *create_label;
-
-  /**
-   * The topology we get the connected nodes from.
-   */
-  struct GNUNET_TESTING_NetjailTopology *topology;
-};
-
-
-/**
- * The cleanup function of this cmd frees resources the cmd allocated.
- *
- */
-static void
-send_simple_cleanup (void *cls)
-{
-  struct SendSimpleState *sss = cls;
-
-  GNUNET_free (sss);
-}
-
-
-static int
-send_simple_cb  (void *cls,
-                 const struct GNUNET_ShortHashCode *key,
-                 void *value)
-{
-  struct SendSimpleState *sss = cls;
-  struct GNUNET_MQ_Handle *mq = value;
-  struct GNUNET_MQ_Envelope *env;
-  struct GNUNET_TRANSPORT_TESTING_TestMessage *test;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Sending simple test message\n");
-
-  env = GNUNET_MQ_msg_extra (test,
-                             1000 - sizeof(*test),
-                             GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE);
-  test->num = htonl (sss->num);
-  memset (&test[1],
-          sss->num,
-          1000 - sizeof(*test));
-  GNUNET_MQ_send (mq,
-                  env);
-  return GNUNET_OK;
-}
-
-
-/**
- * The run method of this cmd will send a simple message to the connected peers.
- *
- */
-static void
-send_simple_run (void *cls,
-                 struct GNUNET_TESTING_Interpreter *is)
-{
-  struct SendSimpleState *sss = cls;
-  const struct GNUNET_CONTAINER_MultiShortmap *connected_peers_map;
-  const struct GNUNET_TESTING_Command *peer1_cmd;
-  // struct GNUNET_ShortHashCode *key = GNUNET_new (struct GNUNET_ShortHashCode);
-  struct GNUNET_HashCode hc;
-  struct GNUNET_TESTING_NodeConnection *node_connections_head;
-  struct GNUNET_PeerIdentity *peer;
-  struct GNUNET_CRYPTO_EddsaPublicKey public_key;
-  uint32_t num;
-  struct GNUNET_TESTING_NodeConnection *pos_connection;
-  const struct GNUNET_TESTING_Command *system_cmd;
-  const struct GNUNET_TESTING_System *tl_system;
-
-  peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
-                                                         sss->start_peer_label);
-  GNUNET_TRANSPORT_get_trait_connected_peers_map (peer1_cmd,
-                                                  &connected_peers_map);
-
-  system_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
-                                                          sss->create_label);
-  GNUNET_TESTING_get_trait_test_system (system_cmd,
-                                        &tl_system);
-
-  node_connections_head = GNUNET_TESTING_get_connections (sss->num,
-                                                          sss->topology);
-
-  GNUNET_CONTAINER_multishortmap_iterate (
-    (struct GNUNET_CONTAINER_MultiShortmap *)
-    connected_peers_map, send_simple_cb,
-    sss);
-  /*for (int i = 0; i < 1; i++)
-  {
-    for (pos_connection = node_connections_head; NULL != pos_connection;
-         pos_connection = pos_connection->next)
-    {
-      num = GNUNET_TESTING_calculate_num (pos_connection, sss->topology);
-      peer = GNUNET_TESTING_get_pub_key (num, tl_system);
-      public_key = peer->public_key;
-      GNUNET_CRYPTO_hash (&public_key, sizeof(public_key), &hc);
-
-      memcpy (key,
-              &hc,
-              sizeof (*key));
-      mq = GNUNET_CONTAINER_multishortmap_get (connected_peers_map,
-                                               key);
-      env = GNUNET_MQ_msg_extra (test,
-                                 1000 - sizeof(*test),
-                                 GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE);
-      test->num = htonl (sss->num);
-      memset (&test[1],
-              sss->num,
-              1000 - sizeof(*test));
-      GNUNET_MQ_send (mq,
-                      env);
-    }
-    }*/
-
-  // GNUNET_free (key);
-
-}
-
-
-/**
- * Create command.
- *
- * @param label name for command.
- * @param start_peer_label Label of the cmd to start a peer.
- * @param start_peer_label Label of the cmd which started the test system.
- * @param num Number globally identifying the node.
- * @param The topology for the test setup.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TRANSPORT_cmd_send_simple (const char *label,
-                                  const char *start_peer_label,
-                                  const char *create_label,
-                                  uint32_t num,
-                                  struct GNUNET_TESTING_NetjailTopology *
-                                  topology)
-{
-  struct SendSimpleState *sss;
-
-  sss = GNUNET_new (struct SendSimpleState);
-  sss->num = num;
-  sss->start_peer_label = start_peer_label;
-  sss->create_label = create_label;
-  sss->topology = topology;
-
-  struct GNUNET_TESTING_Command cmd = {
-    .cls = sss,
-    .label = label,
-    .run = &send_simple_run,
-    .cleanup = &send_simple_cleanup
-  };
-
-  return cmd;
-}
diff --git a/src/transport/transport_api_cmd_start_peer.c b/src/transport/transport_api_cmd_start_peer.c
deleted file mode 100644
index 7448eff5a..000000000
--- a/src/transport/transport_api_cmd_start_peer.c
+++ /dev/null
@@ -1,491 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2021 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testing_api_cmd_start_peer.c
- * @brief cmd to start a peer.
- * @author t3sserakt
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_netjail_lib.h"
-#include "gnunet_peerstore_service.h"
-#include "gnunet_transport_core_service.h"
-#include "gnunet_transport_application_service.h"
-#include "transport-testing-cmds.h"
-
-/**
- * Generic logging shortcut
- */
-#define LOG(kind, ...) GNUNET_log (kind, __VA_ARGS__)
-
-
-static void
-retrieve_hello (void *cls);
-
-
-/**
- * Callback delivering the hello of this peer from peerstore.
- *
- */
-static void
-hello_iter_cb (void *cb_cls,
-               const struct GNUNET_PEERSTORE_Record *record,
-               const char *emsg)
-{
-  struct StartPeerState *sps = cb_cls;
-  if (NULL == record)
-  {
-    sps->pic = NULL;
-    sps->rh_task = GNUNET_SCHEDULER_add_now (retrieve_hello, sps);
-    return;
-  }
-  // Check record type et al?
-  sps->hello_size = record->value_size;
-  sps->hello = GNUNET_malloc (sps->hello_size);
-  memcpy (sps->hello, record->value, sps->hello_size);
-  sps->hello[sps->hello_size - 1] = '\0';
-
-  GNUNET_PEERSTORE_iterate_cancel (sps->pic);
-  sps->pic = NULL;
-  GNUNET_TESTING_async_finish (&sps->ac);
-}
-
-
-/**
- * Function to start the retrieval task to retrieve the hello of this peer
- * from the peerstore.
- *
- */
-static void
-retrieve_hello (void *cls)
-{
-  struct StartPeerState *sps = cls;
-  sps->rh_task = NULL;
-  sps->pic = GNUNET_PEERSTORE_iterate (sps->ph,
-                                       "transport",
-                                       &sps->id,
-                                       GNUNET_PEERSTORE_TRANSPORT_HELLO_KEY,
-                                       hello_iter_cb,
-                                       sps);
-
-}
-
-
-/**
- * Disconnect callback for the connection to the core service.
- *
- */
-static void
-notify_disconnect (void *cls,
-                   const struct GNUNET_PeerIdentity *peer,
-                   void *handler_cls)
-{
-  struct StartPeerState *sps = cls;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Peer %s disconnected from peer %u (`%s')\n",
-       GNUNET_i2s (peer),
-       sps->no,
-       GNUNET_i2s (&sps->id));
-
-}
-
-
-/**
- * Connect callback for the connection to the core service.
- *
- */
-static void *
-notify_connect (void *cls,
-                const struct GNUNET_PeerIdentity *peer,
-                struct GNUNET_MQ_Handle *mq)
-{
-  struct StartPeerState *sps = cls;
-  struct GNUNET_ShortHashCode *key = GNUNET_new (struct GNUNET_ShortHashCode);
-  struct GNUNET_HashCode hc;
-  struct GNUNET_CRYPTO_EddsaPublicKey public_key = peer->public_key;
-
-  void *ret = (struct GNUNET_PeerIdentity *) peer;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "This Peer %s \n",
-       GNUNET_i2s (&sps->id));
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Peer %s connected to peer number %u\n",
-       GNUNET_i2s (peer),
-       sps->no);
-
-  GNUNET_CRYPTO_hash (&public_key, sizeof(public_key), &hc);
-
-
-  memcpy (key,
-          &hc,
-          sizeof (*key));
-  GNUNET_CONTAINER_multishortmap_put (sps->connected_peers_map,
-                                      key,
-                                      mq,
-                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-
-  GNUNET_free (key);
-
-  sps->notify_connect (sps->ac.is,
-                       peer);
-
-  return ret;
-}
-
-
-/**
- * The run method of this cmd will start all services of a peer to test the transport service.
- *
- */
-static void
-start_peer_run (void *cls,
-                struct GNUNET_TESTING_Interpreter *is)
-{
-  struct StartPeerState *sps = cls;
-  char *emsg = NULL;
-  struct GNUNET_PeerIdentity dummy;
-  const struct GNUNET_TESTING_Command *system_cmd;
-  const struct GNUNET_TESTING_System *tl_system;
-  char *home;
-  char *transport_unix_path;
-  char *tcp_communicator_unix_path;
-  char *udp_communicator_unix_path;
-  char *bindto;
-  char *bindto_udp;
-
-  if (GNUNET_NO == GNUNET_DISK_file_test (sps->cfgname))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "File not found: `%s'\n",
-         sps->cfgname);
-    GNUNET_TESTING_interpreter_fail (is);
-    return;
-  }
-
-
-  sps->cfg = GNUNET_CONFIGURATION_create ();
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONFIGURATION_load (sps->cfg, sps->cfgname));
-
-  GNUNET_asprintf (&home,
-                   "$GNUNET_TMP/test-transport/api-tcp-p%u",
-                   sps->no);
-
-  GNUNET_asprintf (&transport_unix_path,
-                   "$GNUNET_RUNTIME_DIR/tng-p%u.sock",
-                   sps->no);
-
-  GNUNET_asprintf (&tcp_communicator_unix_path,
-                   "$GNUNET_RUNTIME_DIR/tcp-comm-p%u.sock",
-                   sps->no);
-
-  GNUNET_asprintf (&udp_communicator_unix_path,
-                   "$GNUNET_RUNTIME_DIR/tcp-comm-p%u.sock",
-                   sps->no);
-
-  GNUNET_asprintf (&bindto,
-                   "%s:60002",
-                   sps->node_ip);
-
-  GNUNET_asprintf (&bindto_udp,
-                   "2086");
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "node_ip %s\n",
-       bindto);
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "bind_udp %s\n",
-       GNUNET_YES == sps->broadcast ?
-       bindto_udp : bindto);
-
-  GNUNET_CONFIGURATION_set_value_string (sps->cfg, "PATHS", "GNUNET_TEST_HOME",
-                                         home);
-  GNUNET_CONFIGURATION_set_value_string (sps->cfg, "transport", "UNIXPATH",
-                                         transport_unix_path);
-  GNUNET_CONFIGURATION_set_value_string (sps->cfg, "communicator-tcp",
-                                         "BINDTO",
-                                         bindto);
-  GNUNET_CONFIGURATION_set_value_string (sps->cfg, "communicator-udp",
-                                         "BINDTO",
-                                         GNUNET_YES == sps->broadcast ?
-                                         bindto_udp : bindto);
-  GNUNET_CONFIGURATION_set_value_string (sps->cfg, "communicator-tcp",
-                                         "UNIXPATH",
-                                         tcp_communicator_unix_path);
-  GNUNET_CONFIGURATION_set_value_string (sps->cfg, "communicator-udp",
-                                         "UNIXPATH",
-                                         udp_communicator_unix_path);
-
-  system_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
-                                                          sps->system_label);
-  GNUNET_TESTING_get_trait_test_system (system_cmd,
-                                        &tl_system);
-
-  sps->tl_system = tl_system;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Creating testing library with key number %u\n",
-       sps->no);
-
-  if (GNUNET_SYSERR ==
-      GNUNET_TESTING_configuration_create ((struct
-                                            GNUNET_TESTING_System *) tl_system,
-                                           sps->cfg))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Testing library failed to create unique configuration based on `%s'\n",
-         sps->cfgname);
-    GNUNET_CONFIGURATION_destroy (sps->cfg);
-    GNUNET_TESTING_interpreter_fail (is);
-    return;
-  }
-
-  sps->peer = GNUNET_TESTING_peer_configure ((struct
-                                              GNUNET_TESTING_System *) sps->
-                                             tl_system,
-                                             sps->cfg,
-                                             sps->no,
-                                             NULL,
-                                             &emsg);
-  if (NULL == sps->peer)
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Testing library failed to create unique configuration based on `%s': `%s' with key number %u\n",
-         sps->cfgname,
-         emsg,
-         sps->no);
-    GNUNET_free (emsg);
-    GNUNET_TESTING_interpreter_fail (is);
-    return;
-  }
-
-  if (GNUNET_OK != GNUNET_TESTING_peer_start (sps->peer))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Testing library failed to create unique configuration based on `%s'\n",
-         sps->cfgname);
-    GNUNET_free (emsg);
-    GNUNET_TESTING_interpreter_fail (is);
-    return;
-  }
-
-  memset (&dummy,
-          '\0',
-          sizeof(dummy));
-
-  GNUNET_TESTING_peer_get_identity (sps->peer,
-                                    &sps->id);
-
-  if (0 == memcmp (&dummy,
-                   &sps->id,
-                   sizeof(struct GNUNET_PeerIdentity)))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Testing library failed to obtain peer identity for peer %u\n",
-         sps->no);
-    GNUNET_free (emsg);
-    GNUNET_TESTING_interpreter_fail (is);
-    return;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Peer %u configured with identity `%s'\n",
-       sps->no,
-       GNUNET_i2s_full (&sps->id));
-
-  sps->th = GNUNET_TRANSPORT_core_connect (sps->cfg,
-                                           NULL,
-                                           sps->handlers,
-                                           sps,
-                                           &notify_connect,
-                                           &notify_disconnect);
-  if (NULL == sps->th)
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Failed to connect to transport service for peer `%s': `%s'\n",
-         sps->cfgname,
-         emsg);
-    GNUNET_free (emsg);
-    GNUNET_TESTING_interpreter_fail (is);
-    return;
-  }
-
-  sps->ph = GNUNET_PEERSTORE_connect (sps->cfg);
-  if (NULL == sps->th)
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Failed to connect to peerstore service for peer `%s': `%s'\n",
-         sps->cfgname,
-         emsg);
-    GNUNET_free (emsg);
-    GNUNET_TESTING_interpreter_fail (is);
-    return;
-  }
-
-  sps->ah = GNUNET_TRANSPORT_application_init (sps->cfg);
-  if (NULL == sps->ah)
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Failed to initialize the TRANSPORT application suggestion client handle for peer `%s': `%s'\n",
-         sps->cfgname,
-         emsg);
-    GNUNET_free (emsg);
-    GNUNET_TESTING_interpreter_fail (is);
-    return;
-  }
-  sps->rh_task = GNUNET_SCHEDULER_add_now (retrieve_hello, sps);
-  GNUNET_free (home);
-  GNUNET_free (transport_unix_path);
-  GNUNET_free (tcp_communicator_unix_path);
-  GNUNET_free (udp_communicator_unix_path);
-  GNUNET_free (bindto);
-  GNUNET_free (bindto_udp);
-}
-
-
-/**
- * The cleanup function of this cmd frees resources the cmd allocated.
- *
- */
-static void
-start_peer_cleanup (void *cls)
-{
-  struct StartPeerState *sps = cls;
-
-  if (NULL != sps->handlers)
-  {
-    GNUNET_free (sps->handlers);
-    sps->handlers = NULL;
-  }
-  if (NULL != sps->cfg)
-  {
-    GNUNET_CONFIGURATION_destroy (sps->cfg);
-    sps->cfg = NULL;
-  }
-  GNUNET_free (sps->hello);
-  GNUNET_free (sps->connected_peers_map);
-  GNUNET_free (sps);
-}
-
-
-/**
- * This function prepares an array with traits.
- *
- */
-static int
-start_peer_traits (void *cls,
-                   const void **ret,
-                   const char *trait,
-                   unsigned int index)
-{
-  struct StartPeerState *sps = cls;
-  struct GNUNET_TRANSPORT_ApplicationHandle *ah = sps->ah;
-  struct GNUNET_PeerIdentity *id = &sps->id;
-  struct GNUNET_CONTAINER_MultiShortmap *connected_peers_map =
-    sps->connected_peers_map;
-  char *hello = sps->hello;
-  size_t hello_size = sps->hello_size;
-
-
-  struct GNUNET_TESTING_Trait traits[] = {
-    GNUNET_TRANSPORT_make_trait_application_handle ((const void *) ah),
-    GNUNET_TRANSPORT_make_trait_peer_id ((const void *) id),
-    GNUNET_TRANSPORT_make_trait_connected_peers_map ((const
-                                                      void *)
-                                                     connected_peers_map),
-    GNUNET_TRANSPORT_make_trait_hello ((const void *) hello),
-    GNUNET_TRANSPORT_make_trait_hello_size ((const void *) hello_size),
-    GNUNET_TRANSPORT_make_trait_state ((const void *) sps),
-    GNUNET_TRANSPORT_make_trait_broadcast ((const void *) &sps->broadcast),
-    GNUNET_TESTING_trait_end ()
-  };
-
-  return GNUNET_TESTING_get_trait (traits,
-                                   ret,
-                                   trait,
-                                   index);
-}
-
-
-/**
- * Create command.
- *
- * @param label name for command.
- * @param system_label Label of the cmd to setup a test environment.
- * @param m The number of the local node of the actual network namespace.
- * @param n The number of the actual namespace.
- * @param local_m Number of local nodes in each namespace.
- * @param handlers Handler for messages received by this peer.
- * @param cfgname Configuration file name for this peer.
- * @param notify_connect Method which will be called, when a peer connects.
- * @param broadcast Flag indicating, if broadcast should be switched on.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TRANSPORT_cmd_start_peer (const char *label,
-                                 const char *system_label,
-                                 uint32_t no,
-                                 char *node_ip,
-                                 struct GNUNET_MQ_MessageHandler *handlers,
-                                 const char *cfgname,
-                                 GNUNET_TRANSPORT_notify_connect_cb
-                                 notify_connect,
-                                 unsigned int broadcast)
-{
-  struct StartPeerState *sps;
-  struct GNUNET_CONTAINER_MultiShortmap *connected_peers_map =
-    GNUNET_CONTAINER_multishortmap_create (1,GNUNET_NO);
-  unsigned int i;
-
-  sps = GNUNET_new (struct StartPeerState);
-  sps->no = no;
-  sps->system_label = system_label;
-  sps->connected_peers_map = connected_peers_map;
-  sps->cfgname = cfgname;
-  sps->node_ip = node_ip;
-  sps->notify_connect = notify_connect;
-  sps->broadcast = broadcast;
-
-  if (NULL != handlers)
-  {
-    for (i = 0; NULL != handlers[i].cb; i++)
-      ;
-    sps->handlers = GNUNET_new_array (i + 1,
-                                      struct GNUNET_MQ_MessageHandler);
-    GNUNET_memcpy (sps->handlers,
-                   handlers,
-                   i * sizeof(struct GNUNET_MQ_MessageHandler));
-  }
-
-  struct GNUNET_TESTING_Command cmd = {
-    .cls = sps,
-    .label = label,
-    .run = &start_peer_run,
-    .ac = &sps->ac,
-    .cleanup = &start_peer_cleanup,
-    .traits = &start_peer_traits
-  };
-
-  return cmd;
-}
diff --git a/src/transport/transport_api_cmd_stop_peer.c b/src/transport/transport_api_cmd_stop_peer.c
deleted file mode 100644
index 4ca730add..000000000
--- a/src/transport/transport_api_cmd_stop_peer.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2021 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testing_api_cmd_stop_peer.c
- * @brief cmd to stop a peer.
- * @author t3sserakt
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_netjail_lib.h"
-#include "gnunet_peerstore_service.h"
-#include "gnunet_transport_core_service.h"
-#include "gnunet_transport_application_service.h"
-#include "transport-testing-cmds.h"
-
-/**
- * Generic logging shortcut
- */
-#define LOG(kind, ...) GNUNET_log (kind, __VA_ARGS__)
-
-
-/**
- * Struct to hold information for callbacks.
- *
- */
-struct StopPeerState
-{
-  // Label of the cmd to start the peer.
-  const char *start_label;
-};
-
-
-/**
- * The run method of this cmd will stop all services of a peer which were used to test the transport service.
- *
- */
-static void
-stop_peer_run (void *cls,
-               struct GNUNET_TESTING_Interpreter *is)
-{
-  struct StopPeerState *stop_ps = cls;
-  const struct StartPeerState *sps;
-  const struct GNUNET_TESTING_Command *start_cmd;
-
-  start_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
-                                                         stop_ps->start_label);
-  GNUNET_TRANSPORT_get_trait_state (start_cmd,
-                                    &sps);
-
-  if (NULL != sps->pic)
-  {
-    GNUNET_PEERSTORE_iterate_cancel (sps->pic);
-  }
-  if (NULL != sps->th)
-  {
-    GNUNET_TRANSPORT_core_disconnect (sps->th);
-  }
-  if (NULL != sps->ah)
-  {
-    GNUNET_TRANSPORT_application_done (sps->ah);
-  }
-  if (NULL != sps->ph)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Disconnecting from PEERSTORE service\n");
-    GNUNET_PEERSTORE_disconnect (sps->ph, GNUNET_NO);
-  }
-  if (NULL != sps->peer)
-  {
-    if (GNUNET_OK !=
-        GNUNET_TESTING_peer_stop (sps->peer))
-    {
-      LOG (GNUNET_ERROR_TYPE_ERROR,
-           "Testing lib failed to stop peer %u (`%s')\n",
-           sps->no,
-           GNUNET_i2s (&sps->id));
-    }
-    GNUNET_TESTING_peer_destroy (sps->peer);
-  }
-  if (NULL != sps->rh_task)
-    GNUNET_SCHEDULER_cancel (sps->rh_task);
-}
-
-
-/**
- * The cleanup function of this cmd frees resources the cmd allocated.
- *
- */
-static void
-stop_peer_cleanup (void *cls)
-{
-  struct StopPeerState *sps = cls;
-
-  GNUNET_free (sps);
-}
-
-
-/**
- * Trait function of this cmd does nothing.
- *
- */
-static int
-stop_peer_traits (void *cls,
-                  const void **ret,
-                  const char *trait,
-                  unsigned int index)
-{
-  return GNUNET_OK;
-}
-
-
-/**
- * Create command.
- *
- * @param label name for command.
- * @param start_label Label of the cmd to start the peer.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TRANSPORT_cmd_stop_peer (const char *label,
-                                const char *start_label)
-{
-  struct StopPeerState *sps;
-
-  sps = GNUNET_new (struct StopPeerState);
-  sps->start_label = start_label;
-  {
-    struct GNUNET_TESTING_Command cmd = {
-      .cls = sps,
-      .label = label,
-      .run = &stop_peer_run,
-      .cleanup = &stop_peer_cleanup,
-      .traits = &stop_peer_traits
-    };
-    return cmd;
-  }
-}
diff --git a/src/transport/transport_api_core.c b/src/transport/transport_api_core.c
deleted file mode 100644
index 0ffaeb444..000000000
--- a/src/transport/transport_api_core.c
+++ /dev/null
@@ -1,968 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2009-2013, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/transport_api_core.c
- * @brief library to access the transport service for message exchange
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_constants.h"
-#include "gnunet_arm_service.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_protocols.h"
-#include "gnunet_transport_service.h"
-#include "transport.h"
-
-#define LOG(kind, ...) GNUNET_log_from (kind, "transport-api-core", __VA_ARGS__)
-
-/**
- * If we could not send any payload to a peer for this amount of
- * time, we print a warning.
- */
-#define UNREADY_WARN_TIME GNUNET_TIME_UNIT_MINUTES
-
-/**
- * How large to start with for the hashmap of neighbours.
- */
-#define STARTING_NEIGHBOURS_SIZE 16
-
-
-/**
- * Entry in hash table of all of our current (connected) neighbours.
- */
-struct Neighbour
-{
-  /**
-   * Overall transport handle.
-   */
-  struct GNUNET_TRANSPORT_CoreHandle *h;
-
-  /**
-   * Active message queue for the peer.
-   */
-  struct GNUNET_MQ_Handle *mq;
-
-  /**
-   * Envelope with the message we are currently transmitting (or NULL).
-   */
-  struct GNUNET_MQ_Envelope *env;
-
-  /**
-   * Closure for @e mq handlers.
-   */
-  void *handlers_cls;
-
-  /**
-   * Identity of this neighbour.
-   */
-  struct GNUNET_PeerIdentity id;
-
-  /**
-   * Outbound bandwidh tracker.
-   */
-  struct GNUNET_BANDWIDTH_Tracker out_tracker;
-
-  /**
-   * Entry in our readiness heap (which is sorted by @e next_ready
-   * value).  NULL if there is no pending transmission request for
-   * this neighbour or if we're waiting for @e is_ready to become
-   * true AFTER the @e out_tracker suggested that this peer's quota
-   * has been satisfied (so once @e is_ready goes to #GNUNET_YES,
-   * we should immediately go back into the heap).
-   */
-  struct GNUNET_CONTAINER_HeapNode *hn;
-
-  /**
-   * Task to trigger MQ when we have enough bandwidth for the
-   * next transmission.
-   */
-  struct GNUNET_SCHEDULER_Task *timeout_task;
-
-  /**
-   * Sending consumed more bytes on wire than payload was announced
-   * This overhead is added to the delay of next sending operation
-   */
-  unsigned long long traffic_overhead;
-
-  /**
-   * Is this peer currently ready to receive a message?
-   */
-  int is_ready;
-
-  /**
-   * Size of the message in @e env.
-   */
-  uint16_t env_size;
-};
-
-
-/**
- * Handle for the transport service (includes all of the
- * state for the transport service).
- */
-struct GNUNET_TRANSPORT_CoreHandle
-{
-  /**
-   * Closure for the callbacks.
-   */
-  void *cls;
-
-  /**
-   * Functions to call for received data (template for
-   * new message queues).
-   */
-  struct GNUNET_MQ_MessageHandler *handlers;
-
-  /**
-   * function to call on connect events
-   */
-  GNUNET_TRANSPORT_NotifyConnect nc_cb;
-
-  /**
-   * function to call on disconnect events
-   */
-  GNUNET_TRANSPORT_NotifyDisconnect nd_cb;
-
-  /**
-   * function to call on excess bandwidth events
-   */
-  GNUNET_TRANSPORT_NotifyExcessBandwidth neb_cb;
-
-  /**
-   * My client connection to the transport service.
-   */
-  struct GNUNET_MQ_Handle *mq;
-
-  /**
-   * My configuration.
-   */
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  /**
-   * Hash map of the current connected neighbours of this peer.
-   * Maps peer identities to `struct Neighbour` entries.
-   */
-  struct GNUNET_CONTAINER_MultiPeerMap *neighbours;
-
-  /**
-   * Peer identity as assumed by this process, or all zeros.
-   */
-  struct GNUNET_PeerIdentity self;
-
-  /**
-   * ID of the task trying to reconnect to the service.
-   */
-  struct GNUNET_SCHEDULER_Task *reconnect_task;
-
-  /**
-   * Delay until we try to reconnect.
-   */
-  struct GNUNET_TIME_Relative reconnect_delay;
-
-  /**
-   * Internal counter to check how many more receive OK messages this
-   * CORE service is allowed to send in total. Just to detect easy
-   * cases of protocol violations by the CORE implementation.
-   * NOTE: we may want to make this stronger by counting per peer
-   * instead of globally.
-   */
-  unsigned int rom_pending;
-
-  /**
-   * Should we check that @e self matches what the service thinks?
-   * (if #GNUNET_NO, then @e self is all zeros!).
-   */
-  int check_self;
-};
-
-
-/**
- * Function that will schedule the job that will try
- * to connect us again to the client.
- *
- * @param h transport service to reconnect
- */
-static void
-disconnect_and_schedule_reconnect (struct GNUNET_TRANSPORT_CoreHandle *h);
-
-
-/**
- * Get the neighbour list entry for the given peer
- *
- * @param h our context
- * @param peer peer to look up
- * @return NULL if no such peer entry exists
- */
-static struct Neighbour *
-neighbour_find (struct GNUNET_TRANSPORT_CoreHandle *h,
-                const struct GNUNET_PeerIdentity *peer)
-{
-  return GNUNET_CONTAINER_multipeermap_get (h->neighbours, peer);
-}
-
-
-/**
- * Function called by the bandwidth tracker if we have excess
- * bandwidth.
- *
- * @param cls the `struct Neighbour` that has excess bandwidth
- */
-static void
-notify_excess_cb (void *cls)
-{
-  struct Neighbour *n = cls;
-  struct GNUNET_TRANSPORT_CoreHandle *h = n->h;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Notifying CORE that more bandwidth is available for %s\n",
-       GNUNET_i2s (&n->id));
-
-  if (NULL != h->neb_cb)
-    h->neb_cb (h->cls, &n->id, n->handlers_cls);
-}
-
-
-/**
- * Iterator over hash map entries, for deleting state of a neighbour.
- *
- * @param cls the `struct GNUNET_TRANSPORT_CoreHandle *`
- * @param key peer identity
- * @param value value in the hash map, the neighbour entry to delete
- * @return #GNUNET_YES if we should continue to
- *         iterate,
- *         #GNUNET_NO if not.
- */
-static int
-neighbour_delete (void *cls, const struct GNUNET_PeerIdentity *key, void *value)
-{
-  struct GNUNET_TRANSPORT_CoreHandle *handle = cls;
-  struct Neighbour *n = value;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Dropping entry for neighbour `%s'.\n",
-       GNUNET_i2s (key));
-  GNUNET_BANDWIDTH_tracker_notification_stop (&n->out_tracker);
-  if (NULL != handle->nd_cb)
-    handle->nd_cb (handle->cls, &n->id, n->handlers_cls);
-  if (NULL != n->timeout_task)
-  {
-    GNUNET_SCHEDULER_cancel (n->timeout_task);
-    n->timeout_task = NULL;
-  }
-  if (NULL != n->env)
-  {
-    GNUNET_MQ_send_cancel (n->env);
-    n->env = NULL;
-  }
-  GNUNET_MQ_destroy (n->mq);
-  GNUNET_assert (NULL == n->mq);
-  GNUNET_assert (
-    GNUNET_YES ==
-    GNUNET_CONTAINER_multipeermap_remove (handle->neighbours, key, n));
-  GNUNET_free (n);
-  return GNUNET_YES;
-}
-
-
-/**
- * Generic error handler, called with the appropriate
- * error code and the same closure specified at the creation of
- * the message queue.
- * Not every message queue implementation supports an error handler.
- *
- * @param cls closure with the `struct GNUNET_TRANSPORT_CoreHandle *`
- * @param error error code
- */
-static void
-mq_error_handler (void *cls, enum GNUNET_MQ_Error error)
-{
-  struct GNUNET_TRANSPORT_CoreHandle *h = cls;
-
-  LOG (GNUNET_ERROR_TYPE_ERROR,
-       "Error receiving from transport service (%d), disconnecting temporarily.\n",
-       error);
-  disconnect_and_schedule_reconnect (h);
-}
-
-
-/**
- * Function we use for checking incoming HELLO messages.
- *
- * @param cls closure, a `struct GNUNET_TRANSPORT_CoreHandle *`
- * @param msg message received
- * @return #GNUNET_OK if message is well-formed
- */
-static int
-check_hello (void *cls, const struct GNUNET_MessageHeader *msg)
-{
-  struct GNUNET_PeerIdentity me;
-
-  if (GNUNET_OK !=
-      GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *) msg, &me))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Function we use for handling incoming HELLO messages.
- *
- * @param cls closure, a `struct GNUNET_TRANSPORT_CoreHandle *`
- * @param msg message received
- */
-static void
-handle_hello (void *cls, const struct GNUNET_MessageHeader *msg)
-{
-  /* we do not care => FIXME: signal in options to NEVER send HELLOs! */
-}
-
-
-/**
- * A message from the handler's message queue to a neighbour was
- * transmitted.  Now trigger (possibly delayed) notification of the
- * neighbour's message queue that we are done and thus ready for
- * the next message.
- *
- * @param cls the `struct Neighbour` where the message was sent
- */
-static void
-notify_send_done_fin (void *cls)
-{
-  struct Neighbour *n = cls;
-
-  n->timeout_task = NULL;
-  n->is_ready = GNUNET_YES;
-  GNUNET_MQ_impl_send_continue (n->mq);
-}
-
-
-/**
- * A message from the handler's message queue to a neighbour was
- * transmitted.  Now trigger (possibly delayed) notification of the
- * neighbour's message queue that we are done and thus ready for
- * the next message.
- *
- * @param cls the `struct Neighbour` where the message was sent
- */
-static void
-notify_send_done (void *cls)
-{
-  struct Neighbour *n = cls;
-  struct GNUNET_TIME_Relative delay;
-
-  n->timeout_task = NULL;
-  if (NULL != n->env)
-  {
-    GNUNET_BANDWIDTH_tracker_consume (&n->out_tracker,
-                                      n->env_size + n->traffic_overhead);
-    n->env = NULL;
-    n->traffic_overhead = 0;
-  }
-  delay = GNUNET_BANDWIDTH_tracker_get_delay (&n->out_tracker, 128);
-  if (0 == delay.rel_value_us)
-  {
-    n->is_ready = GNUNET_YES;
-    GNUNET_MQ_impl_send_continue (n->mq);
-    return;
-  }
-  GNUNET_MQ_impl_send_in_flight (n->mq);
-  /* cannot send even a small message without violating
-     quota, wait a before allowing MQ to send next message */
-  n->timeout_task =
-    GNUNET_SCHEDULER_add_delayed (delay, &notify_send_done_fin, n);
-}
-
-
-/**
- * Implement sending functionality of a message queue.
- * Called one message at a time. Should send the @a msg
- * to the transport service and then notify the queue
- * once we are ready for the next one.
- *
- * @param mq the message queue
- * @param msg the message to send
- * @param impl_state state of the implementation
- */
-static void
-mq_send_impl (struct GNUNET_MQ_Handle *mq,
-              const struct GNUNET_MessageHeader *msg,
-              void *impl_state)
-{
-  struct Neighbour *n = impl_state;
-  struct GNUNET_TRANSPORT_CoreHandle *h = n->h;
-  struct OutboundMessage *obm;
-  uint16_t msize;
-
-  GNUNET_assert (GNUNET_YES == n->is_ready);
-  msize = ntohs (msg->size);
-  if (msize >= GNUNET_MAX_MESSAGE_SIZE - sizeof(*obm))
-  {
-    GNUNET_break (0);
-    GNUNET_MQ_impl_send_continue (mq);
-    return;
-  }
-  GNUNET_assert (NULL == n->env);
-  n->env =
-    GNUNET_MQ_msg_nested_mh (obm, GNUNET_MESSAGE_TYPE_TRANSPORT_SEND, msg);
-  {
-    struct GNUNET_MQ_Envelope *env;
-
-    env = GNUNET_MQ_get_current_envelope (mq);
-    obm->priority = htonl ((uint32_t) GNUNET_MQ_env_get_options (env));
-  }
-  obm->timeout = GNUNET_TIME_relative_hton (
-    GNUNET_TIME_UNIT_MINUTES); /* FIXME: to be removed */
-  obm->peer = n->id;
-  GNUNET_assert (NULL == n->timeout_task);
-  n->is_ready = GNUNET_NO;
-  n->env_size = ntohs (msg->size);
-  GNUNET_MQ_notify_sent (n->env, &notify_send_done, n);
-  GNUNET_MQ_send (h->mq, n->env);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Queued message of type %u for neighbour `%s'.\n",
-       ntohs (msg->type),
-       GNUNET_i2s (&n->id));
-}
-
-
-/**
- * Handle destruction of a message queue.  Implementations must not
- * free @a mq, but should take care of @a impl_state.
- *
- * @param mq the message queue to destroy
- * @param impl_state state of the implementation
- */
-static void
-mq_destroy_impl (struct GNUNET_MQ_Handle *mq, void *impl_state)
-{
-  struct Neighbour *n = impl_state;
-
-  GNUNET_assert (mq == n->mq);
-  n->mq = NULL;
-}
-
-
-/**
- * Implementation function that cancels the currently sent message.
- * Should basically undo whatever #mq_send_impl() did.
- *
- * @param mq message queue
- * @param impl_state state specific to the implementation
- */
-static void
-mq_cancel_impl (struct GNUNET_MQ_Handle *mq, void *impl_state)
-{
-  struct Neighbour *n = impl_state;
-
-  GNUNET_assert (GNUNET_NO == n->is_ready);
-  if (NULL != n->env)
-  {
-    GNUNET_MQ_send_cancel (n->env);
-    n->env = NULL;
-  }
-
-  n->is_ready = GNUNET_YES;
-}
-
-
-/**
- * We had an error processing a message we forwarded from a peer to
- * the CORE service.  We should just complain about it but otherwise
- * continue processing.
- *
- * @param cls closure
- * @param error error code
- */
-static void
-peer_mq_error_handler (void *cls, enum GNUNET_MQ_Error error)
-{
-  /* struct Neighbour *n = cls; */
-
-  GNUNET_break_op (0);
-}
-
-
-/**
- * The outbound quota has changed in a way that may require
- * us to reset the timeout.  Update the timeout.
- *
- * @param cls the `struct Neighbour` for which the timeout changed
- */
-static void
-outbound_bw_tracker_update (void *cls)
-{
-  struct Neighbour *n = cls;
-  struct GNUNET_TIME_Relative delay;
-
-  if (NULL == n->timeout_task)
-    return;
-  delay = GNUNET_BANDWIDTH_tracker_get_delay (&n->out_tracker, 128);
-  GNUNET_SCHEDULER_cancel (n->timeout_task);
-  n->timeout_task = GNUNET_SCHEDULER_add_delayed (delay, &notify_send_done, n);
-}
-
-
-/**
- * Function we use for handling incoming connect messages.
- *
- * @param cls closure, a `struct GNUNET_TRANSPORT_Handle *`
- * @param cim message received
- */
-static void
-handle_connect (void *cls, const struct ConnectInfoMessage *cim)
-{
-  struct GNUNET_TRANSPORT_CoreHandle *h = cls;
-  struct Neighbour *n;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Receiving CONNECT message for `%s' with quota %u\n",
-       GNUNET_i2s (&cim->id),
-       ntohl (cim->quota_out.value__));
-  n = neighbour_find (h, &cim->id);
-  if (NULL != n)
-  {
-    GNUNET_break (0);  /* FIXME: this assertion seems to fail sometimes!? */
-    disconnect_and_schedule_reconnect (h);
-    return;
-  }
-  n = GNUNET_new (struct Neighbour);
-  n->id = cim->id;
-  n->h = h;
-  n->is_ready = GNUNET_YES;
-  n->traffic_overhead = 0;
-  GNUNET_BANDWIDTH_tracker_init2 (&n->out_tracker,
-                                  &outbound_bw_tracker_update,
-                                  n,
-                                  GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT,
-                                  MAX_BANDWIDTH_CARRY_S,
-                                  &notify_excess_cb,
-                                  n);
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONTAINER_multipeermap_put (
-                   h->neighbours,
-                   &n->id,
-                   n,
-                   GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
-
-  GNUNET_BANDWIDTH_tracker_update_quota (&n->out_tracker, cim->quota_out);
-  n->mq = GNUNET_MQ_queue_for_callbacks (&mq_send_impl,
-                                         &mq_destroy_impl,
-                                         &mq_cancel_impl,
-                                         n,
-                                         h->handlers,
-                                         &peer_mq_error_handler,
-                                         n);
-  if (NULL != h->nc_cb)
-  {
-    n->handlers_cls = h->nc_cb (h->cls, &n->id, n->mq);
-    GNUNET_MQ_set_handlers_closure (n->mq, n->handlers_cls);
-  }
-}
-
-
-/**
- * Function we use for handling incoming disconnect messages.
- *
- * @param cls closure, a `struct GNUNET_TRANSPORT_CoreHandle *`
- * @param dim message received
- */
-static void
-handle_disconnect (void *cls, const struct DisconnectInfoMessage *dim)
-{
-  struct GNUNET_TRANSPORT_CoreHandle *h = cls;
-  struct Neighbour *n;
-
-  GNUNET_break (ntohl (dim->reserved) == 0);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Receiving DISCONNECT message for `%s'.\n",
-       GNUNET_i2s (&dim->peer));
-  n = neighbour_find (h, &dim->peer);
-  if (NULL == n)
-  {
-    GNUNET_break (0);
-    disconnect_and_schedule_reconnect (h);
-    return;
-  }
-  GNUNET_assert (GNUNET_YES == neighbour_delete (h, &dim->peer, n));
-}
-
-
-/**
- * Function we use for handling incoming send-ok messages.
- *
- * @param cls closure, a `struct GNUNET_TRANSPORT_CoreHandle *`
- * @param okm message received
- */
-static void
-handle_send_ok (void *cls, const struct SendOkMessage *okm)
-{
-  struct GNUNET_TRANSPORT_CoreHandle *h = cls;
-  struct Neighbour *n;
-  uint32_t bytes_msg;
-  uint32_t bytes_physical;
-  uint16_t success =  ntohs (okm->success);
-
-  bytes_msg = ntohs (okm->bytes_msg);
-  bytes_physical = ntohl (okm->bytes_physical);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Receiving SEND_OK message, transmission to %s %s.\n",
-       GNUNET_i2s (&okm->peer),
-       success == GNUNET_OK ? "succeeded" : "failed");
-  n = neighbour_find (h, &okm->peer);
-  if (NULL == n)
-  {
-    /* We should never get a 'SEND_OK' for a peer that we are not
-       connected to */
-    GNUNET_break (0);
-    disconnect_and_schedule_reconnect (h);
-    return;
-  }
-  if (bytes_physical > bytes_msg)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Overhead for %u byte message was %u\n",
-         bytes_msg,
-         bytes_physical - bytes_msg);
-    n->traffic_overhead += bytes_physical - bytes_msg;
-  }
-}
-
-
-/**
- * Function we use for checking incoming "inbound" messages.
- *
- * @param cls closure, a `struct GNUNET_TRANSPORT_CoreHandle *`
- * @param im message received
- */
-static int
-check_recv (void *cls, const struct InboundMessage *im)
-{
-  const struct GNUNET_MessageHeader *imm;
-  uint16_t size;
-
-  size = ntohs (im->header.size) - sizeof(*im);
-  if (size < sizeof(struct GNUNET_MessageHeader))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  imm = (const struct GNUNET_MessageHeader *) &im[1];
-  if (ntohs (imm->size) != size)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Function we use for handling incoming messages.
- *
- * @param cls closure, a `struct GNUNET_TRANSPORT_CoreHandle *`
- * @param im message received
- */
-static void
-handle_recv (void *cls, const struct InboundMessage *im)
-{
-  struct GNUNET_TRANSPORT_CoreHandle *h = cls;
-  const struct GNUNET_MessageHeader *imm =
-    (const struct GNUNET_MessageHeader *) &im[1];
-  struct Neighbour *n;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Received message of type %u with %u bytes from `%s'.\n",
-       (unsigned int) ntohs (imm->type),
-       (unsigned int) ntohs (imm->size),
-       GNUNET_i2s (&im->peer));
-  n = neighbour_find (h, &im->peer);
-  if (NULL == n)
-  {
-    GNUNET_break (0);
-    disconnect_and_schedule_reconnect (h);
-    return;
-  }
-  h->rom_pending++;
-  GNUNET_MQ_inject_message (n->mq, imm);
-}
-
-
-/**
- * Function we use for handling incoming set quota messages.
- *
- * @param cls closure, a `struct GNUNET_TRANSPORT_CoreHandle *`
- * @param msg message received
- */
-static void
-handle_set_quota (void *cls, const struct QuotaSetMessage *qm)
-{
-  struct GNUNET_TRANSPORT_CoreHandle *h = cls;
-  struct Neighbour *n;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Receiving SET_QUOTA message for `%s' with quota %u\n",
-       GNUNET_i2s (&qm->peer),
-       ntohl (qm->quota.value__));
-  n = neighbour_find (h, &qm->peer);
-  if (NULL == n)
-  {
-    GNUNET_break (
-      0);   /* FIXME: julius reports this assertion fails sometimes? */
-    disconnect_and_schedule_reconnect (h);
-    return;
-  }
-  GNUNET_BANDWIDTH_tracker_update_quota (&n->out_tracker, qm->quota);
-}
-
-
-/**
- * Try again to connect to transport service.
- *
- * @param cls the handle to the transport service
- */
-static void
-reconnect (void *cls)
-{
-  struct GNUNET_TRANSPORT_CoreHandle *h = cls;
-  struct GNUNET_MQ_MessageHandler handlers[] =
-  { GNUNET_MQ_hd_var_size (hello,
-                           GNUNET_MESSAGE_TYPE_HELLO,
-                           struct GNUNET_MessageHeader,
-                           h),
-    GNUNET_MQ_hd_fixed_size (connect,
-                             GNUNET_MESSAGE_TYPE_TRANSPORT_CONNECT,
-                             struct ConnectInfoMessage,
-                             h),
-    GNUNET_MQ_hd_fixed_size (disconnect,
-                             GNUNET_MESSAGE_TYPE_TRANSPORT_DISCONNECT,
-                             struct DisconnectInfoMessage,
-                             h),
-    GNUNET_MQ_hd_fixed_size (send_ok,
-                             GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK,
-                             struct SendOkMessage,
-                             h),
-    GNUNET_MQ_hd_var_size (recv,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_RECV,
-                           struct InboundMessage,
-                           h),
-    GNUNET_MQ_hd_fixed_size (set_quota,
-                             GNUNET_MESSAGE_TYPE_TRANSPORT_SET_QUOTA,
-                             struct QuotaSetMessage,
-                             h),
-    GNUNET_MQ_handler_end () };
-  struct GNUNET_MQ_Envelope *env;
-  struct StartMessage *s;
-  uint32_t options;
-
-  h->reconnect_task = NULL;
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Connecting to transport service.\n");
-  GNUNET_assert (NULL == h->mq);
-  h->mq =
-    GNUNET_CLIENT_connect (h->cfg, "transport", handlers, &mq_error_handler, h);
-  if (NULL == h->mq)
-    return;
-  env = GNUNET_MQ_msg (s, GNUNET_MESSAGE_TYPE_TRANSPORT_START);
-  options = 0;
-  if (h->check_self)
-    options |= 1;
-  if (NULL != h->handlers)
-    options |= 2;
-  s->options = htonl (options);
-  s->self = h->self;
-  GNUNET_MQ_send (h->mq, env);
-}
-
-
-/**
- * Function that will schedule the job that will try
- * to connect us again to the client.
- *
- * @param h transport service to reconnect
- */
-static void
-disconnect_and_schedule_reconnect (struct GNUNET_TRANSPORT_CoreHandle *h)
-{
-  GNUNET_assert (NULL == h->reconnect_task);
-  /* Forget about all neighbours that we used to be connected to */
-  GNUNET_CONTAINER_multipeermap_iterate (h->neighbours, &neighbour_delete, h);
-  if (NULL != h->mq)
-  {
-    GNUNET_MQ_destroy (h->mq);
-    h->mq = NULL;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Scheduling task to reconnect to transport service in %s.\n",
-       GNUNET_STRINGS_relative_time_to_string (h->reconnect_delay, GNUNET_YES));
-  h->reconnect_task =
-    GNUNET_SCHEDULER_add_delayed (h->reconnect_delay, &reconnect, h);
-  h->reconnect_delay = GNUNET_TIME_STD_BACKOFF (h->reconnect_delay);
-}
-
-
-/**
- * Checks if a given peer is connected to us and get the message queue.
- *
- * @param handle connection to transport service
- * @param peer the peer to check
- * @return NULL if disconnected, otherwise message queue for @a peer
- */
-struct GNUNET_MQ_Handle *
-GNUNET_TRANSPORT_core_get_mq (struct GNUNET_TRANSPORT_CoreHandle *handle,
-                              const struct GNUNET_PeerIdentity *peer)
-{
-  struct Neighbour *n;
-
-  n = neighbour_find (handle, peer);
-  if (NULL == n)
-    return NULL;
-  return n->mq;
-}
-
-
-/**
- * Connect to the transport service.  Note that the connection may
- * complete (or fail) asynchronously.
- *
- * @param cfg configuration to use
- * @param self our own identity (API should check that it matches
- *             the identity found by transport), or NULL (no check)
- * @param cls closure for the callbacks
- * @param rec receive function to call
- * @param nc function to call on connect events
- * @param nd function to call on disconnect events
- * @param neb function to call if we have excess bandwidth to a peer
- * @return NULL on error
- */
-struct GNUNET_TRANSPORT_CoreHandle *
-GNUNET_TRANSPORT_core_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                               const struct GNUNET_PeerIdentity *self,
-                               const struct GNUNET_MQ_MessageHandler *handlers,
-                               void *cls,
-                               GNUNET_TRANSPORT_NotifyConnect nc,
-                               GNUNET_TRANSPORT_NotifyDisconnect nd,
-                               GNUNET_TRANSPORT_NotifyExcessBandwidth neb)
-{
-  struct GNUNET_TRANSPORT_CoreHandle *h;
-  unsigned int i;
-
-  h = GNUNET_new (struct GNUNET_TRANSPORT_CoreHandle);
-  if (NULL != self)
-  {
-    h->self = *self;
-    h->check_self = GNUNET_YES;
-  }
-  h->cfg = cfg;
-  h->cls = cls;
-  h->nc_cb = nc;
-  h->nd_cb = nd;
-  h->neb_cb = neb;
-  h->reconnect_delay = GNUNET_TIME_UNIT_ZERO;
-  if (NULL != handlers)
-  {
-    for (i = 0; NULL != handlers[i].cb; i++)
-      ;
-    h->handlers = GNUNET_new_array (i + 1, struct GNUNET_MQ_MessageHandler);
-    GNUNET_memcpy (h->handlers,
-                   handlers,
-                   i * sizeof(struct GNUNET_MQ_MessageHandler));
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Connecting to transport service\n");
-  reconnect (h);
-  if (NULL == h->mq)
-  {
-    GNUNET_free (h->handlers);
-    GNUNET_free (h);
-    return NULL;
-  }
-  h->neighbours =
-    GNUNET_CONTAINER_multipeermap_create (STARTING_NEIGHBOURS_SIZE, GNUNET_YES);
-  return h;
-}
-
-
-/**
- * Disconnect from the transport service.
- *
- * @param handle handle to the service as returned from
- * #GNUNET_TRANSPORT_core_connect()
- */
-void
-GNUNET_TRANSPORT_core_disconnect (struct GNUNET_TRANSPORT_CoreHandle *handle)
-{
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Transport disconnect called!\n");
-  /* this disconnects all neighbours... */
-  if (NULL == handle->reconnect_task)
-    disconnect_and_schedule_reconnect (handle);
-  /* and now we stop trying to connect again... */
-  if (NULL != handle->reconnect_task)
-  {
-    GNUNET_SCHEDULER_cancel (handle->reconnect_task);
-    handle->reconnect_task = NULL;
-  }
-  GNUNET_CONTAINER_multipeermap_destroy (handle->neighbours);
-  handle->neighbours = NULL;
-  GNUNET_free (handle->handlers);
-  handle->handlers = NULL;
-  GNUNET_free (handle);
-}
-
-
-/**
- * Notification from the CORE service to the TRANSPORT service
- * that the CORE service has finished processing a message from
- * TRANSPORT (via the @code{handlers} of #GNUNET_TRANSPORT_core_connect())
- * and that it is thus now OK for TRANSPORT to send more messages
- * for @a pid.
- *
- * Used to provide flow control, this is our equivalent to
- * #GNUNET_SERVICE_client_continue() of an ordinary service.
- *
- * Note that due to the use of a window, TRANSPORT may send multiple
- * messages destined for the same peer even without an intermediate
- * call to this function. However, CORE must still call this function
- * once per message received, as otherwise eventually the window will
- * be full and TRANSPORT will stop providing messages to CORE for @a
- * pid.
- *
- * @param ch core handle
- * @param pid which peer was the message from that was fully processed by CORE
- */
-void
-GNUNET_TRANSPORT_core_receive_continue (struct GNUNET_TRANSPORT_CoreHandle *ch,
-                                        const struct GNUNET_PeerIdentity *pid)
-{
-  struct RecvOkMessage *rom;
-  struct GNUNET_MQ_Envelope *env;
-
-  GNUNET_assert (ch->rom_pending > 0);
-  ch->rom_pending--;
-  env = GNUNET_MQ_msg (rom, GNUNET_MESSAGE_TYPE_TRANSPORT_RECV_OK);
-  rom->increase_window_delta = htonl (1);
-  rom->peer = *pid;
-  GNUNET_MQ_send (ch->mq, env);
-}
-
-
-/* end of transport_api_core.c */
diff --git a/src/transport/transport_api_hello_get.c b/src/transport/transport_api_hello_get.c
deleted file mode 100644
index f8bcc5f07..000000000
--- a/src/transport/transport_api_hello_get.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2009-2013, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/transport_api_hello_get.c
- * @brief library to obtain our HELLO from our transport service
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_constants.h"
-#include "gnunet_arm_service.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_protocols.h"
-#include "gnunet_transport_hello_service.h"
-#include "transport.h"
-
-
-/**
- * Functions to call with this peer's HELLO.
- */
-struct GNUNET_TRANSPORT_HelloGetHandle
-{
-  /**
-   * Our configuration.
-   */
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  /**
-   * Transport handle.
-   */
-  struct GNUNET_MQ_Handle *mq;
-
-  /**
-   * Callback to call once we got our HELLO.
-   */
-  GNUNET_TRANSPORT_HelloUpdateCallback rec;
-
-  /**
-   * Closure for @e rec.
-   */
-  void *rec_cls;
-
-  /**
-   * Task for calling the HelloUpdateCallback when we already have a HELLO
-   */
-  struct GNUNET_SCHEDULER_Task *notify_task;
-
-  /**
-   * ID of the task trying to reconnect to the service.
-   */
-  struct GNUNET_SCHEDULER_Task *reconnect_task;
-
-  /**
-   * Delay until we try to reconnect.
-   */
-  struct GNUNET_TIME_Relative reconnect_delay;
-
-  /**
-   * Type of HELLOs client cares about.
-   */
-  enum GNUNET_TRANSPORT_AddressClass ac;
-};
-
-
-/**
- * Function we use for checking incoming HELLO messages.
- *
- * @param cls closure, a `struct GNUNET_TRANSPORT_Handle *`
- * @param msg message received
- * @return #GNUNET_OK if message is well-formed
- */
-static int
-check_hello (void *cls,
-             const struct GNUNET_MessageHeader *msg)
-{
-  struct GNUNET_PeerIdentity me;
-
-  if (GNUNET_OK !=
-      GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *) msg,
-                           &me))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Receiving (my own) HELLO message (%u bytes), I am `%s'.\n",
-              (unsigned int) ntohs (msg->size),
-              GNUNET_i2s (&me));
-  return GNUNET_OK;
-}
-
-
-/**
- * Function we use for handling incoming HELLO messages.
- *
- * @param cls closure, a `struct GNUNET_TRANSPORT_HelloGetHandle *`
- * @param msg message received
- */
-static void
-handle_hello (void *cls,
-              const struct GNUNET_MessageHeader *msg)
-{
-  struct GNUNET_TRANSPORT_HelloGetHandle *ghh = cls;
-
-  ghh->rec (ghh->rec_cls,
-            msg);
-}
-
-
-/**
- * Function that will schedule the job that will try
- * to connect us again to the client.
- *
- * @param ghh transport service to reconnect
- */
-static void
-schedule_reconnect (struct GNUNET_TRANSPORT_HelloGetHandle *ghh);
-
-
-/**
- * Generic error handler, called with the appropriate
- * error code and the same closure specified at the creation of
- * the message queue.
- * Not every message queue implementation supports an error handler.
- *
- * @param cls closure with the `struct GNUNET_TRANSPORT_Handle *`
- * @param error error code
- */
-static void
-mq_error_handler (void *cls,
-                  enum GNUNET_MQ_Error error)
-{
-  struct GNUNET_TRANSPORT_HelloGetHandle *ghh = cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Error receiving from transport service, disconnecting temporarily.\n");
-  GNUNET_MQ_destroy (ghh->mq);
-  ghh->mq = NULL;
-  schedule_reconnect (ghh);
-}
-
-
-/**
- * Try again to connect to transport service.
- *
- * @param cls the handle to the transport service
- */
-static void
-reconnect (void *cls)
-{
-  struct GNUNET_TRANSPORT_HelloGetHandle *ghh = cls;
-  struct GNUNET_MQ_MessageHandler handlers[] = {
-    GNUNET_MQ_hd_var_size (hello,
-                           GNUNET_MESSAGE_TYPE_HELLO,
-                           struct GNUNET_MessageHeader,
-                           ghh),
-    GNUNET_MQ_handler_end ()
-  };
-  struct GNUNET_MQ_Envelope *env;
-  struct StartMessage *s;
-
-  ghh->reconnect_task = NULL;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Connecting to transport service.\n");
-  GNUNET_assert (NULL == ghh->mq);
-  ghh->mq = GNUNET_CLIENT_connect (ghh->cfg,
-                                   "transport",
-                                   handlers,
-                                   &mq_error_handler,
-                                   ghh);
-  if (NULL == ghh->mq)
-    return;
-  env = GNUNET_MQ_msg (s,
-                       GNUNET_MESSAGE_TYPE_TRANSPORT_START);
-  s->options = htonl (0);
-  GNUNET_MQ_send (ghh->mq,
-                  env);
-}
-
-
-/**
- * Function that will schedule the job that will try
- * to connect us again to the client.
- *
- * @param ghh transport service to reconnect
- */
-static void
-schedule_reconnect (struct GNUNET_TRANSPORT_HelloGetHandle *ghh)
-{
-  ghh->reconnect_task =
-    GNUNET_SCHEDULER_add_delayed (ghh->reconnect_delay,
-                                  &reconnect,
-                                  ghh);
-  ghh->reconnect_delay = GNUNET_TIME_STD_BACKOFF (ghh->reconnect_delay);
-}
-
-
-/**
- * Obtain the HELLO message for this peer.  The callback given in this function
- * is never called synchronously.
- *
- * @param cfg configuration
- * @param ac which network type should the addresses from the HELLO belong to?
- * @param rec function to call with the HELLO, sender will be our peer
- *            identity; message and sender will be NULL on timeout
- *            (handshake with transport service pending/failed).
- *             cost estimate will be 0.
- * @param rec_cls closure for @a rec
- * @return handle to cancel the operation
- */
-struct GNUNET_TRANSPORT_HelloGetHandle *
-GNUNET_TRANSPORT_hello_get (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                            enum GNUNET_TRANSPORT_AddressClass ac,
-                            GNUNET_TRANSPORT_HelloUpdateCallback rec,
-                            void *rec_cls)
-{
-  struct GNUNET_TRANSPORT_HelloGetHandle *ghh;
-
-  ghh = GNUNET_new (struct GNUNET_TRANSPORT_HelloGetHandle);
-  ghh->rec = rec;
-  ghh->rec_cls = rec_cls;
-  ghh->cfg = cfg;
-  ghh->ac = ac;
-  reconnect (ghh);
-  if (NULL == ghh->mq)
-  {
-    GNUNET_free (ghh);
-    return NULL;
-  }
-  return ghh;
-}
-
-
-/**
- * Stop receiving updates about changes to our HELLO message.
- *
- * @param ghh handle to cancel
- */
-void
-GNUNET_TRANSPORT_hello_get_cancel (struct GNUNET_TRANSPORT_HelloGetHandle *ghh)
-{
-  if (NULL != ghh->reconnect_task)
-  {
-    GNUNET_SCHEDULER_cancel (ghh->reconnect_task);
-    ghh->reconnect_task = NULL;
-  }
-  if (NULL != ghh->mq)
-  {
-    GNUNET_MQ_destroy (ghh->mq);
-    ghh->mq = NULL;
-  }
-  GNUNET_free (ghh);
-}
-
-
-/* end of transport_api_hello_get.c */
diff --git a/src/transport/transport_api_manipulation.c b/src/transport/transport_api_manipulation.c
deleted file mode 100644
index 4f4ccc4a0..000000000
--- a/src/transport/transport_api_manipulation.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2009-2013, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/transport_api_manipulation.c
- * @brief library to access the low-level P2P IO service
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_constants.h"
-#include "gnunet_arm_service.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_protocols.h"
-#include "gnunet_transport_service.h"
-#include "transport.h"
-
-#define LOG(kind, ...) GNUNET_log_from (kind, "transport-api", __VA_ARGS__)
-
-
-/**
- * Handle for the transport service (includes all of the
- * state for the transport service).
- */
-struct GNUNET_TRANSPORT_ManipulationHandle
-{
-  /**
-   * My client connection to the transport service.
-   */
-  struct GNUNET_MQ_Handle *mq;
-
-  /**
-   * My configuration.
-   */
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  /**
-   * ID of the task trying to reconnect to the service.
-   */
-  struct GNUNET_SCHEDULER_Task *reconnect_task;
-
-  /**
-   * Delay until we try to reconnect.
-   */
-  struct GNUNET_TIME_Relative reconnect_delay;
-
-  /**
-   * Reconnect in progress
-   */
-  int reconnecting;
-};
-
-
-/**
- * Function that will schedule the job that will try
- * to connect us again to the client.
- *
- * @param h transport service to reconnect
- */
-static void
-disconnect_and_schedule_reconnect (struct
-                                   GNUNET_TRANSPORT_ManipulationHandle *h);
-
-
-/**
- * Generic error handler, called with the appropriate
- * error code and the same closure specified at the creation of
- * the message queue.
- * Not every message queue implementation supports an error handler.
- *
- * @param cls closure with the `struct GNUNET_TRANSPORT_ManipulationHandle *`
- * @param error error code
- */
-static void
-mq_error_handler (void *cls,
-                  enum GNUNET_MQ_Error error)
-{
-  struct GNUNET_TRANSPORT_ManipulationHandle *h = cls;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Error receiving from transport service, disconnecting temporarily.\n");
-  h->reconnecting = GNUNET_YES;
-  disconnect_and_schedule_reconnect (h);
-}
-
-
-/**
- * Try again to connect to transport service.
- *
- * @param cls the handle to the transport service
- */
-static void
-reconnect (void *cls)
-{
-  struct GNUNET_TRANSPORT_ManipulationHandle *h = cls;
-  struct GNUNET_MQ_MessageHandler handlers[] = {
-    GNUNET_MQ_handler_end ()
-  };
-  struct GNUNET_MQ_Envelope *env;
-  struct StartMessage *s;
-
-  h->reconnect_task = NULL;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Connecting to transport service.\n");
-  GNUNET_assert (NULL == h->mq);
-  h->reconnecting = GNUNET_NO;
-  h->mq = GNUNET_CLIENT_connect (h->cfg,
-                                 "transport",
-                                 handlers,
-                                 &mq_error_handler,
-                                 h);
-  if (NULL == h->mq)
-    return;
-  env = GNUNET_MQ_msg (s,
-                       GNUNET_MESSAGE_TYPE_TRANSPORT_START);
-  GNUNET_MQ_send (h->mq,
-                  env);
-}
-
-
-/**
- * Function that will schedule the job that will try
- * to connect us again to the client.
- *
- * @param h transport service to reconnect
- */
-static void
-disconnect_and_schedule_reconnect (struct
-                                   GNUNET_TRANSPORT_ManipulationHandle *h)
-{
-  GNUNET_assert (NULL == h->reconnect_task);
-  if (NULL != h->mq)
-  {
-    GNUNET_MQ_destroy (h->mq);
-    h->mq = NULL;
-  }
-  h->reconnect_task =
-    GNUNET_SCHEDULER_add_delayed (h->reconnect_delay,
-                                  &reconnect,
-                                  h);
-  h->reconnect_delay = GNUNET_TIME_STD_BACKOFF (h->reconnect_delay);
-}
-
-
-/**
- * Set transport metrics for a peer and a direction.
- *
- * @param handle transport handle
- * @param peer the peer to set the metric for
- * @param prop the performance metrics to set
- * @param delay_in inbound delay to introduce
- * @param delay_out outbound delay to introduce
- *
- * Note: Delay restrictions in receiving direction will be enforced
- * with one message delay.
- */
-void
-GNUNET_TRANSPORT_manipulation_set (struct
-                                   GNUNET_TRANSPORT_ManipulationHandle *handle,
-                                   const struct GNUNET_PeerIdentity *peer,
-                                   const struct GNUNET_ATS_Properties *prop,
-                                   struct GNUNET_TIME_Relative delay_in,
-                                   struct GNUNET_TIME_Relative delay_out)
-{
-  struct GNUNET_MQ_Envelope *env;
-  struct TrafficMetricMessage *msg;
-
-  if (NULL == handle->mq)
-    return;
-  env = GNUNET_MQ_msg (msg,
-                       GNUNET_MESSAGE_TYPE_TRANSPORT_TRAFFIC_METRIC);
-  msg->reserved = htonl (0);
-  msg->peer = *peer;
-  GNUNET_ATS_properties_hton (&msg->properties,
-                              prop);
-  msg->delay_in = GNUNET_TIME_relative_hton (delay_in);
-  msg->delay_out = GNUNET_TIME_relative_hton (delay_out);
-  GNUNET_MQ_send (handle->mq,
-                  env);
-}
-
-
-/**
- * Connect to the transport service.  Note that the connection may
- * complete (or fail) asynchronously.
- *
- * @param cfg configuration to use
- * @return NULL on error
- */
-struct GNUNET_TRANSPORT_ManipulationHandle *
-GNUNET_TRANSPORT_manipulation_connect (const struct
-                                       GNUNET_CONFIGURATION_Handle *cfg)
-{
-  struct GNUNET_TRANSPORT_ManipulationHandle *h;
-
-  h = GNUNET_new (struct GNUNET_TRANSPORT_ManipulationHandle);
-  h->cfg = cfg;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Connecting to transport service.\n");
-  reconnect (h);
-  if (NULL == h->mq)
-  {
-    GNUNET_free (h);
-    return NULL;
-  }
-  return h;
-}
-
-
-/**
- * Disconnect from the transport service.
- *
- * @param handle handle to the service as returned from #GNUNET_TRANSPORT_manipulation_connect()
- */
-void
-GNUNET_TRANSPORT_manipulation_disconnect (struct
-                                          GNUNET_TRANSPORT_ManipulationHandle *
-                                          handle)
-{
-  if (NULL == handle->reconnect_task)
-    disconnect_and_schedule_reconnect (handle);
-  /* and now we stop trying to connect again... */
-  if (NULL != handle->reconnect_task)
-  {
-    GNUNET_SCHEDULER_cancel (handle->reconnect_task);
-    handle->reconnect_task = NULL;
-  }
-  GNUNET_free (handle);
-}
-
-
-/* end of transport_api_manipulation.c */
diff --git a/src/transport/transport_api_monitor_peers.c b/src/transport/transport_api_monitor_peers.c
deleted file mode 100644
index 2f0f07f23..000000000
--- a/src/transport/transport_api_monitor_peers.c
+++ /dev/null
@@ -1,469 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2009-2014, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/transport_api_monitor_peers.c
- * @brief montoring api for transport peer status
- *
- * This api provides the ability to query the transport service about
- * the connection status of a specific or all peers.
- *
- * Calls back with information about peer(s) including address used, state and
- * state timeout for peer requests.
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_arm_service.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_protocols.h"
-#include "gnunet_transport_service.h"
-#include "transport.h"
-
-/**
- * Context for iterating validation entries.
- */
-struct GNUNET_TRANSPORT_PeerMonitoringContext
-{
-  /**
-   * Function to call with the binary address.
-   */
-  GNUNET_TRANSPORT_PeerIterateCallback cb;
-
-  /**
-   * Closure for @e cb.
-   */
-  void *cb_cls;
-
-  /**
-   * Connection to the service.
-   */
-  struct GNUNET_MQ_Handle *mq;
-
-  /**
-   * Configuration we use.
-   */
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  /**
-   * Backoff for reconnect.
-   */
-  struct GNUNET_TIME_Relative backoff;
-
-  /**
-   * Task ID for reconnect.
-   */
-  struct GNUNET_SCHEDULER_Task *reconnect_task;
-
-  /**
-   * Identity of the peer to monitor.
-   */
-  struct GNUNET_PeerIdentity peer;
-
-  /**
-   * Was this a one-shot request?
-   */
-  int one_shot;
-};
-
-
-/**
- * Check if a state is defined as connected
- *
- * @param state the state value
- * @return #GNUNET_YES or #GNUNET_NO
- */
-int
-GNUNET_TRANSPORT_is_connected (enum GNUNET_TRANSPORT_PeerState state)
-{
-  switch (state)
-  {
-  case GNUNET_TRANSPORT_PS_NOT_CONNECTED:
-  case GNUNET_TRANSPORT_PS_INIT_ATS:
-  case GNUNET_TRANSPORT_PS_SYN_SENT:
-  case GNUNET_TRANSPORT_PS_SYN_RECV_ATS:
-  case GNUNET_TRANSPORT_PS_SYN_RECV_ACK:
-    return GNUNET_NO;
-
-  case GNUNET_TRANSPORT_PS_CONNECTED:
-  case GNUNET_TRANSPORT_PS_RECONNECT_ATS:
-  case GNUNET_TRANSPORT_PS_RECONNECT_SENT:
-  case GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT:
-    return GNUNET_YES;
-
-  case GNUNET_TRANSPORT_PS_DISCONNECT:
-  case GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED:
-    return GNUNET_NO;
-
-  default:
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unhandled state `%s'\n",
-                GNUNET_TRANSPORT_ps2s (state));
-    GNUNET_break (0);
-    break;
-  }
-  return GNUNET_SYSERR;
-}
-
-
-/**
- * Convert peer state to human-readable string.
- *
- * @param state the state value
- * @return corresponding string
- */
-const char *
-GNUNET_TRANSPORT_ps2s (enum GNUNET_TRANSPORT_PeerState state)
-{
-  switch (state)
-  {
-  case GNUNET_TRANSPORT_PS_NOT_CONNECTED:
-    return "S_NOT_CONNECTED";
-
-  case GNUNET_TRANSPORT_PS_INIT_ATS:
-    return "S_INIT_ATS";
-
-  case GNUNET_TRANSPORT_PS_SYN_SENT:
-    return "S_SYN_SENT";
-
-  case GNUNET_TRANSPORT_PS_SYN_RECV_ATS:
-    return "S_SYN_RECV_ATS";
-
-  case GNUNET_TRANSPORT_PS_SYN_RECV_ACK:
-    return "S_SYN_RECV_ACK";
-
-  case GNUNET_TRANSPORT_PS_CONNECTED:
-    return "S_CONNECTED";
-
-  case GNUNET_TRANSPORT_PS_RECONNECT_ATS:
-    return "S_RECONNECT_ATS";
-
-  case GNUNET_TRANSPORT_PS_RECONNECT_SENT:
-    return "S_RECONNECT_SENT";
-
-  case GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT:
-    return "S_SWITCH_SYN_SENT";
-
-  case GNUNET_TRANSPORT_PS_DISCONNECT:
-    return "S_DISCONNECT";
-
-  case GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED:
-    return "S_DISCONNECT_FINISHED";
-
-  default:
-    GNUNET_break (0);
-    return "UNDEFINED";
-  }
-}
-
-
-/**
- * Task run to re-establish the connection.
- *
- * @param cls our `struct GNUNET_TRANSPORT_PeerMonitoringContext *`
- */
-static void
-do_peer_connect (void *cls);
-
-
-/**
- * Cut the existing connection and reconnect.
- *
- * @param pal_ctx our context
- */
-static void
-reconnect_peer_ctx (struct GNUNET_TRANSPORT_PeerMonitoringContext *pal_ctx)
-{
-  GNUNET_assert (GNUNET_NO == pal_ctx->one_shot);
-  GNUNET_MQ_destroy (pal_ctx->mq);
-  pal_ctx->mq = NULL;
-  pal_ctx->cb (pal_ctx->cb_cls,
-               NULL,
-               NULL,
-               GNUNET_TRANSPORT_PS_NOT_CONNECTED,
-               GNUNET_TIME_UNIT_ZERO_ABS);
-  pal_ctx->backoff = GNUNET_TIME_STD_BACKOFF (pal_ctx->backoff);
-  pal_ctx->reconnect_task = GNUNET_SCHEDULER_add_delayed (pal_ctx->backoff,
-                                                          &do_peer_connect,
-                                                          pal_ctx);
-}
-
-
-/**
- * Function called with responses from the service.
- *
- * @param cls our `struct GNUNET_TRANSPORT_PeerMonitoringContext *`
- * @param msg message from service
- */
-static void
-handle_response_end (void *cls,
-                     const struct GNUNET_MessageHeader *msg)
-{
-  struct GNUNET_TRANSPORT_PeerMonitoringContext *pal_ctx = cls;
-
-  if (pal_ctx->one_shot)
-  {
-    /* iteration finished */
-    pal_ctx->cb (pal_ctx->cb_cls,
-                 NULL,
-                 NULL,
-                 GNUNET_TRANSPORT_PS_NOT_CONNECTED,
-                 GNUNET_TIME_UNIT_ZERO_ABS);
-    GNUNET_TRANSPORT_monitor_peers_cancel (pal_ctx);
-    return;
-  }
-  /* not quite what we expected, reconnect */
-  GNUNET_break (0);
-  reconnect_peer_ctx (pal_ctx);
-}
-
-
-/**
- * Function called to check responses from the service.
- *
- * @param cls our `struct GNUNET_TRANSPORT_PeerMonitoringContext *`
- * @param pir_msg  message with the human-readable address
- * @return #GNUNET_OK if @a pir_msg is well-formed
- */
-static int
-check_response (void *cls,
-                const struct PeerIterateResponseMessage *pir_msg)
-{
-  uint16_t size = ntohs (pir_msg->header.size) - sizeof(*pir_msg);
-  size_t alen = ntohl (pir_msg->addrlen);
-  size_t tlen = ntohl (pir_msg->pluginlen);
-  const char *addr;
-  const char *transport_name;
-
-  if (size != tlen + alen)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  if ((0 == tlen) && (0 == alen))
-    return GNUNET_OK;
-  if (0 == tlen)
-  {
-    GNUNET_break (0);  /* This must not happen: address without plugin */
-    return GNUNET_SYSERR;
-  }
-  addr = (const char *) &pir_msg[1];
-  transport_name = &addr[alen];
-  if (transport_name[tlen - 1] != '\0')
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Function called with responses from the service.
- *
- * @param cls our `struct GNUNET_TRANSPORT_PeerMonitoringContext *`
- * @param msg  message with the human-readable address
- */
-static void
-handle_response (void *cls,
-                 const struct PeerIterateResponseMessage *pir_msg)
-{
-  struct GNUNET_TRANSPORT_PeerMonitoringContext *pal_ctx = cls;
-  struct GNUNET_HELLO_Address *address;
-  size_t alen = ntohl (pir_msg->addrlen);
-  size_t tlen = ntohl (pir_msg->pluginlen);
-  const char *addr;
-  const char *transport_name;
-
-  if ((0 == tlen) &&
-      (0 == alen))
-  {
-    /* No address available */
-    pal_ctx->cb (pal_ctx->cb_cls,
-                 &pir_msg->peer,
-                 NULL,
-                 ntohl (pir_msg->state),
-                 GNUNET_TIME_absolute_ntoh (pir_msg->state_timeout));
-    return;
-  }
-  addr = (const char *) &pir_msg[1];
-  transport_name = &addr[alen];
-
-  /* notify client */
-  address = GNUNET_HELLO_address_allocate (&pir_msg->peer,
-                                           transport_name,
-                                           addr,
-                                           alen,
-                                           ntohl (pir_msg->local_address_info));
-  pal_ctx->cb (pal_ctx->cb_cls,
-               &pir_msg->peer,
-               address,
-               ntohl (pir_msg->state),
-               GNUNET_TIME_absolute_ntoh (pir_msg->state_timeout));
-  GNUNET_HELLO_address_free (address);
-}
-
-
-/**
- * Generic error handler, called with the appropriate error code and
- * the same closure specified at the creation of the message queue.
- * Not every message queue implementation supports an error handler.
- *
- * @param cls closure with the `struct GNUNET_TRANSPORT_PeerMonitoringContext *`
- * @param error error code
- */
-static void
-mq_error_handler (void *cls,
-                  enum GNUNET_MQ_Error error)
-{
-  struct GNUNET_TRANSPORT_PeerMonitoringContext *pal_ctx = cls;
-
-  if (pal_ctx->one_shot)
-  {
-    /* Disconnect */
-    pal_ctx->cb (pal_ctx->cb_cls,
-                 NULL,
-                 NULL,
-                 GNUNET_TRANSPORT_PS_NOT_CONNECTED,
-                 GNUNET_TIME_UNIT_ZERO_ABS);
-    GNUNET_TRANSPORT_monitor_peers_cancel (pal_ctx);
-    return;
-  }
-  reconnect_peer_ctx (pal_ctx);
-}
-
-
-/**
- * Task run to re-establish the connection.
- *
- * @param cls our `struct GNUNET_TRANSPORT_PeerMonitoringContext *`
- */
-static void
-do_peer_connect (void *cls)
-{
-  struct GNUNET_TRANSPORT_PeerMonitoringContext *pal_ctx = cls;
-  struct GNUNET_MQ_MessageHandler handlers[] = {
-    GNUNET_MQ_hd_var_size (response,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_PEER_RESPONSE,
-                           struct PeerIterateResponseMessage,
-                           pal_ctx),
-    GNUNET_MQ_hd_fixed_size (response_end,
-                             GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_PEER_RESPONSE_END,
-                             struct GNUNET_MessageHeader,
-                             pal_ctx),
-    GNUNET_MQ_handler_end ()
-  };
-  struct PeerMonitorMessage *msg;
-  struct GNUNET_MQ_Envelope *env;
-
-  pal_ctx->reconnect_task = NULL;
-  pal_ctx->mq = GNUNET_CLIENT_connect (pal_ctx->cfg,
-                                       "transport",
-                                       handlers,
-                                       &mq_error_handler,
-                                       pal_ctx);
-  if (NULL == pal_ctx->mq)
-    return;
-  env = GNUNET_MQ_msg (msg,
-                       GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_PEER_REQUEST);
-  msg->one_shot = htonl (pal_ctx->one_shot);
-  msg->peer = pal_ctx->peer;
-  GNUNET_MQ_send (pal_ctx->mq,
-                  env);
-}
-
-
-/**
- * Return information about a specific peer or all peers currently known to
- * transport service once or in monitoring mode. To obtain information about
- * a specific peer, a peer identity can be passed. To obtain information about
- * all peers currently known to transport service, NULL can be passed as peer
- * identity.
- *
- * For each peer, the callback is called with information about the address used
- * to communicate with this peer, the state this peer is currently in and the
- * the current timeout for this state.
- *
- * Upon completion, the 'GNUNET_TRANSPORT_PeerIterateCallback' is called one
- * more time with 'NULL'. After this, the operation must no longer be
- * explicitly canceled.
- *
- * The #GNUNET_TRANSPORT_monitor_peers_cancel call MUST not be called in the
- * the peer_callback!
- *
- * @param cfg configuration to use
- * @param peer a specific peer identity to obtain information for,
- *      NULL for all peers
- * @param one_shot #GNUNET_YES to return the current state and then end (with NULL+NULL),
- *                 #GNUNET_NO to monitor peers continuously
- * @param peer_callback function to call with the results
- * @param peer_callback_cls closure for @a peer_address_callback
- */
-struct GNUNET_TRANSPORT_PeerMonitoringContext *
-GNUNET_TRANSPORT_monitor_peers (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                const struct GNUNET_PeerIdentity *peer,
-                                int one_shot,
-                                GNUNET_TRANSPORT_PeerIterateCallback
-                                peer_callback,
-                                void *peer_callback_cls)
-{
-  struct GNUNET_TRANSPORT_PeerMonitoringContext *pal_ctx
-    = GNUNET_new (struct GNUNET_TRANSPORT_PeerMonitoringContext);
-
-  pal_ctx->cb = peer_callback;
-  pal_ctx->cb_cls = peer_callback_cls;
-  pal_ctx->cfg = cfg;
-  if (NULL != peer)
-    pal_ctx->peer = *peer;
-  pal_ctx->one_shot = one_shot;
-  do_peer_connect (pal_ctx);
-  if (NULL == pal_ctx->mq)
-  {
-    GNUNET_free (pal_ctx);
-    return NULL;
-  }
-  return pal_ctx;
-}
-
-
-/**
- * Cancel request to monitor peers
- *
- * @param pic handle for the request to cancel
- */
-void
-GNUNET_TRANSPORT_monitor_peers_cancel (struct
-                                       GNUNET_TRANSPORT_PeerMonitoringContext *
-                                       pic)
-{
-  if (NULL != pic->mq)
-  {
-    GNUNET_MQ_destroy (pic->mq);
-    pic->mq = NULL;
-  }
-  if (NULL != pic->reconnect_task)
-  {
-    GNUNET_SCHEDULER_cancel (pic->reconnect_task);
-    pic->reconnect_task = NULL;
-  }
-  GNUNET_free (pic);
-}
-
-
-/* end of transport_api_monitor_peers.c */
diff --git a/src/transport/transport_api_monitor_plugins.c b/src/transport/transport_api_monitor_plugins.c
deleted file mode 100644
index d8eddddaa..000000000
--- a/src/transport/transport_api_monitor_plugins.c
+++ /dev/null
@@ -1,463 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2014, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/transport_api_monitor_plugins.c
- * @brief montoring api for transport plugin session status
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_arm_service.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_protocols.h"
-#include "gnunet_transport_service.h"
-#include "transport.h"
-
-
-/**
- * Handle for a plugin session state monitor.
- */
-struct GNUNET_TRANSPORT_PluginMonitor
-{
-  /**
-   * Connection to the service.
-   */
-  struct GNUNET_MQ_Handle *mq;
-
-  /**
-   * Our configuration.
-   */
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  /**
-   * Callback to call.
-   */
-  GNUNET_TRANSPORT_SessionMonitorCallback cb;
-
-  /**
-   * Closure for @e cb
-   */
-  void *cb_cls;
-
-  /**
-   * Map of session_ids (reduced to 32-bits) to
-   * `struct GNUNET_TRANSPORT_PluginSession` objects.
-   */
-  struct GNUNET_CONTAINER_MultiHashMap32 *sessions;
-
-  /**
-   * Backoff for reconnect.
-   */
-  struct GNUNET_TIME_Relative backoff;
-
-  /**
-   * Task ID for reconnect.
-   */
-  struct GNUNET_SCHEDULER_Task *reconnect_task;
-};
-
-
-/**
- * Abstract representation of a plugin's session.
- * Corresponds to the `struct GNUNET_ATS_Session` within the TRANSPORT service.
- */
-struct GNUNET_TRANSPORT_PluginSession
-{
-  /**
-   * Unique session identifier.
-   */
-  uint64_t session_id;
-
-  /**
-   * Location for the client to store "data".
-   */
-  void *client_ctx;
-};
-
-
-/**
- * Task run to re-establish the connection.
- *
- * @param cls our `struct GNUNET_TRANSPORT_PluginMonitor *`
- */
-static void
-do_plugin_connect (void *cls);
-
-
-/**
- * Free the session entry and notify the callback about its demise.
- *
- * @param cls our `struct GNUNET_TRANSPORT_PluginMonitor`
- * @param key key of the session in the map
- * @param value the session to free
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-free_entry (void *cls,
-            uint32_t key,
-            void *value)
-{
-  struct GNUNET_TRANSPORT_PluginMonitor *pm = cls;
-  struct GNUNET_TRANSPORT_PluginSession *ps = value;
-
-  pm->cb (pm->cb_cls,
-          ps,
-          &ps->client_ctx,
-          NULL);
-  GNUNET_break (GNUNET_YES ==
-                GNUNET_CONTAINER_multihashmap32_remove (pm->sessions,
-                                                        key,
-                                                        ps));
-  GNUNET_break (NULL == ps->client_ctx);
-  GNUNET_free (ps);
-  return GNUNET_OK;
-}
-
-
-/**
- * Cut the existing connection and reconnect.
- *
- * @param pm our context
- */
-static void
-reconnect_plugin_ctx (struct GNUNET_TRANSPORT_PluginMonitor *pm)
-{
-  GNUNET_MQ_destroy (pm->mq);
-  pm->mq = NULL;
-  GNUNET_CONTAINER_multihashmap32_iterate (pm->sessions,
-                                           &free_entry,
-                                           pm);
-  pm->backoff = GNUNET_TIME_STD_BACKOFF (pm->backoff);
-  pm->reconnect_task = GNUNET_SCHEDULER_add_delayed (pm->backoff,
-                                                     &do_plugin_connect,
-                                                     pm);
-}
-
-
-/**
- * Convert 64-bit session ID to 32-bit index for hash map.
- *
- * @param id 64-bit session ID
- * @return 32-bit hash map index
- */
-static uint32_t
-wrap_id (uint64_t id)
-{
-  return ((uint32_t) id) ^ ((uint32_t) (id >> 32));
-}
-
-
-/**
- * Context for #locate_by_id().
- */
-struct SearchContext
-{
-  /**
-   * Result.
-   */
-  struct GNUNET_TRANSPORT_PluginSession *ps;
-
-  /**
-   * ID to locate.
-   */
-  uint64_t session_id;
-};
-
-
-/**
- * Locate a session entry.
- *
- * @param cls our `struct SearchContext`
- * @param key key of the session in the map
- * @param value a session
- * @return #GNUNET_OK (continue to iterate), or #GNUNET_SYSERR (match found)
- */
-static int
-locate_by_id (void *cls,
-              uint32_t key,
-              void *value)
-{
-  struct SearchContext *sc = cls;
-  struct GNUNET_TRANSPORT_PluginSession *ps = value;
-
-  if (sc->session_id == ps->session_id)
-  {
-    sc->ps = ps;
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Function called with responses from the service.
- *
- * @param cls our `struct GNUNET_TRANSPORT_PluginMonitor *`
- * @paramm tpmm message with event data
- * @return #GNUNET_Ok if message is well-formed
- */
-static int
-check_event (void *cls,
-             const struct TransportPluginMonitorMessage *tpmm)
-{
-  const char *pname;
-  size_t pname_len;
-  size_t paddr_len;
-
-  pname = (const char *) &tpmm[1];
-  pname_len = ntohs (tpmm->plugin_name_len);
-  paddr_len = ntohs (tpmm->plugin_address_len);
-  if ((pname_len
-       + paddr_len
-       + sizeof(struct TransportPluginMonitorMessage) != ntohs (
-         tpmm->header.size)) ||
-      ((0 != pname_len) &&
-       ('\0' != pname[pname_len - 1])))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Function called with responses from the service.
- *
- * @param cls our `struct GNUNET_TRANSPORT_PluginMonitor *`
- * @paramm tpmm message with event data
- */
-static void
-handle_event (void *cls,
-              const struct TransportPluginMonitorMessage *tpmm)
-{
-  struct GNUNET_TRANSPORT_PluginMonitor *pm = cls;
-  struct GNUNET_TRANSPORT_PluginSession *ps;
-  const char *pname;
-  const void *paddr;
-  enum GNUNET_TRANSPORT_SessionState ss;
-  size_t pname_len;
-  size_t paddr_len;
-  struct GNUNET_TRANSPORT_SessionInfo info;
-  struct GNUNET_HELLO_Address addr;
-  struct SearchContext rv;
-
-  pname = (const char *) &tpmm[1];
-  pname_len = ntohs (tpmm->plugin_name_len);
-  paddr_len = ntohs (tpmm->plugin_address_len);
-  paddr = &pname[pname_len];
-  ps = NULL;
-  ss = (enum GNUNET_TRANSPORT_SessionState) ntohs (tpmm->session_state);
-  if (GNUNET_TRANSPORT_SS_INIT == ss)
-  {
-    ps = GNUNET_new (struct GNUNET_TRANSPORT_PluginSession);
-    ps->session_id = tpmm->session_id;
-    (void) GNUNET_CONTAINER_multihashmap32_put (pm->sessions,
-                                                wrap_id (tpmm->session_id),
-                                                ps,
-                                                GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-  }
-  else
-  {
-    rv.session_id = tpmm->session_id;
-    rv.ps = NULL;
-    (void) GNUNET_CONTAINER_multihashmap32_get_multiple (pm->sessions,
-                                                         wrap_id (
-                                                           tpmm->session_id),
-                                                         &locate_by_id,
-                                                         &rv);
-    ps = rv.ps;
-    if (NULL == ps)
-    {
-      GNUNET_break (0);
-      reconnect_plugin_ctx (pm);
-      return;
-    }
-  }
-  info.state = ss;
-  info.is_inbound = (int16_t) ntohs (tpmm->is_inbound);
-  info.num_msg_pending = ntohl (tpmm->msgs_pending);
-  info.num_bytes_pending = ntohl (tpmm->bytes_pending);
-  info.receive_delay = GNUNET_TIME_absolute_ntoh (tpmm->delay);
-  info.session_timeout = GNUNET_TIME_absolute_ntoh (tpmm->timeout);
-  info.address = &addr;
-  addr.peer = tpmm->peer;
-  addr.address = (0 == paddr_len) ? NULL : paddr;
-  addr.address_length = paddr_len;
-  addr.transport_name = (0 == pname_len) ? NULL : pname;
-  addr.local_info = GNUNET_HELLO_ADDRESS_INFO_NONE;
-  pm->cb (pm->cb_cls,
-          ps,
-          &ps->client_ctx,
-          &info);
-
-  if (GNUNET_TRANSPORT_SS_DONE == ss)
-  {
-    GNUNET_break (NULL == ps->client_ctx);
-    GNUNET_assert (GNUNET_YES ==
-                   GNUNET_CONTAINER_multihashmap32_remove (pm->sessions,
-                                                           wrap_id (
-                                                             tpmm->session_id),
-                                                           ps));
-    GNUNET_free (ps);
-  }
-}
-
-
-/**
- * Function called with sync responses from the service.
- *
- * @param cls our `struct GNUNET_TRANSPORT_PluginMonitor *`
- * @param msg message from the service
- */
-static void
-handle_sync (void *cls,
-             const struct GNUNET_MessageHeader *msg)
-{
-  struct GNUNET_TRANSPORT_PluginMonitor *pm = cls;
-
-  /* we are in sync, notify callback */
-  pm->cb (pm->cb_cls,
-          NULL,
-          NULL,
-          NULL);
-}
-
-
-/**
- * Generic error handler, called with the appropriate
- * error code and the same closure specified at the creation of
- * the message queue.
- * Not every message queue implementation supports an error handler.
- *
- * @param cls closure with the `struct GNUNET_NSE_Handle *`
- * @param error error code
- */
-static void
-mq_error_handler (void *cls,
-                  enum GNUNET_MQ_Error error)
-{
-  struct GNUNET_TRANSPORT_PluginMonitor *pm = cls;
-
-  reconnect_plugin_ctx (pm);
-}
-
-
-/**
- * Task run to re-establish the connection.
- *
- * @param cls our `struct GNUNET_TRANSPORT_PluginMonitor *`
- */
-static void
-do_plugin_connect (void *cls)
-{
-  struct GNUNET_TRANSPORT_PluginMonitor *pm = cls;
-  struct GNUNET_MQ_MessageHandler handlers[] = {
-    GNUNET_MQ_hd_var_size (event,
-                           GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_PLUGIN_EVENT,
-                           struct TransportPluginMonitorMessage,
-                           pm),
-    GNUNET_MQ_hd_fixed_size (sync,
-                             GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_PLUGIN_SYNC,
-                             struct GNUNET_MessageHeader,
-                             pm),
-    GNUNET_MQ_handler_end ()
-  };
-  struct GNUNET_MessageHeader *msg;
-  struct GNUNET_MQ_Envelope *env;
-
-  pm->reconnect_task = NULL;
-  pm->mq = GNUNET_CLIENT_connect (pm->cfg,
-                                  "transport",
-                                  handlers,
-                                  &mq_error_handler,
-                                  pm);
-  if (NULL == pm->mq)
-    return;
-  env = GNUNET_MQ_msg (msg,
-                       GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_PLUGIN_START);
-  GNUNET_MQ_send (pm->mq,
-                  env);
-}
-
-
-/**
- * Install a plugin session state monitor callback.  The callback
- * will be notified whenever the session changes.
- *
- * @param cfg configuration to use
- * @param cb callback to invoke on events
- * @param cb_cls closure for @a cb
- * @return NULL on error, otherwise handle for cancellation
- */
-struct GNUNET_TRANSPORT_PluginMonitor *
-GNUNET_TRANSPORT_monitor_plugins (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                  GNUNET_TRANSPORT_SessionMonitorCallback cb,
-                                  void *cb_cls)
-{
-  struct GNUNET_TRANSPORT_PluginMonitor *pm;
-
-  pm = GNUNET_new (struct GNUNET_TRANSPORT_PluginMonitor);
-  pm->cb = cb;
-  pm->cb_cls = cb_cls;
-  pm->cfg = cfg;
-  do_plugin_connect (pm);
-  if (NULL == pm->mq)
-  {
-    GNUNET_free (pm);
-    return NULL;
-  }
-  pm->sessions = GNUNET_CONTAINER_multihashmap32_create (128);
-  return pm;
-}
-
-
-/**
- * Cancel monitoring the plugin session state.  The callback will
- * be called once for each session that is up with the information
- * #GNUNET_TRANSPORT_SS_FINI (even though the session may stay up;
- * this is just to enable client-side cleanup).
- *
- * @param pm handle of the request that is to be cancelled
- */
-void
-GNUNET_TRANSPORT_monitor_plugins_cancel (struct
-                                         GNUNET_TRANSPORT_PluginMonitor *pm)
-{
-  if (NULL != pm->mq)
-  {
-    GNUNET_MQ_destroy (pm->mq);
-    pm->mq = NULL;
-  }
-  if (NULL != pm->reconnect_task)
-  {
-    GNUNET_SCHEDULER_cancel (pm->reconnect_task);
-    pm->reconnect_task = NULL;
-  }
-  GNUNET_CONTAINER_multihashmap32_iterate (pm->sessions,
-                                           &free_entry,
-                                           pm);
-  GNUNET_CONTAINER_multihashmap32_destroy (pm->sessions);
-  GNUNET_free (pm);
-}
-
-
-/* end of transport_api_monitor_plugins.c */
diff --git a/src/transport/transport_api_offer_hello.c b/src/transport/transport_api_offer_hello.c
deleted file mode 100644
index eb342f57c..000000000
--- a/src/transport/transport_api_offer_hello.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2009-2013, 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/transport_api_offer_hello.c
- * @brief library to offer HELLOs to transport service
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_protocols.h"
-#include "gnunet_transport_service.h"
-
-
-/**
- * Entry in linked list for all offer-HELLO requests.
- */
-struct GNUNET_TRANSPORT_OfferHelloHandle
-{
-  /**
-   * Transport service handle we use for transmission.
-   */
-  struct GNUNET_MQ_Handle *mq;
-
-  /**
-   * Function to call once we are done.
-   */
-  GNUNET_SCHEDULER_TaskCallback cont;
-
-  /**
-   * Closure for @e cont
-   */
-  void *cls;
-};
-
-
-/**
- * Done sending HELLO message to the service, notify application.
- *
- * @param cls the handle for the operation
- */
-static void
-finished_hello (void *cls)
-{
-  struct GNUNET_TRANSPORT_OfferHelloHandle *ohh = cls;
-
-  if (NULL != ohh->cont)
-    ohh->cont (ohh->cls);
-  GNUNET_TRANSPORT_offer_hello_cancel (ohh);
-}
-
-
-/**
- * Offer the transport service the HELLO of another peer.  Note that
- * the transport service may just ignore this message if the HELLO is
- * malformed or useless due to our local configuration.
- *
- * @param cfg configuration
- * @param hello the hello message
- * @param cont continuation to call when HELLO has been sent,
- *      tc reason #GNUNET_SCHEDULER_REASON_TIMEOUT for fail
- *      tc reasong #GNUNET_SCHEDULER_REASON_READ_READY for success
- * @param cont_cls closure for @a cont
- * @return a `struct GNUNET_TRANSPORT_OfferHelloHandle` handle or NULL on failure,
- *      in case of failure @a cont will not be called
- *
- */
-struct GNUNET_TRANSPORT_OfferHelloHandle *
-GNUNET_TRANSPORT_offer_hello (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                              const struct GNUNET_MessageHeader *hello,
-                              GNUNET_SCHEDULER_TaskCallback cont,
-                              void *cont_cls)
-{
-  struct GNUNET_TRANSPORT_OfferHelloHandle *ohh
-    = GNUNET_new (struct GNUNET_TRANSPORT_OfferHelloHandle);
-  struct GNUNET_MQ_Envelope *env;
-  struct GNUNET_PeerIdentity peer;
-
-  if (GNUNET_OK !=
-      GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *) hello,
-                           &peer))
-  {
-    GNUNET_break (0);
-    GNUNET_free (ohh);
-    return NULL;
-  }
-  ohh->mq = GNUNET_CLIENT_connect (cfg,
-                                   "transport",
-                                   NULL,
-                                   NULL,
-                                   ohh);
-  if (NULL == ohh->mq)
-  {
-    GNUNET_free (ohh);
-    return NULL;
-  }
-  ohh->cont = cont;
-  ohh->cls = cont_cls;
-  GNUNET_break (ntohs (hello->type) == GNUNET_MESSAGE_TYPE_HELLO);
-  env = GNUNET_MQ_msg_copy (hello);
-  GNUNET_MQ_notify_sent (env,
-                         &finished_hello,
-                         ohh);
-  GNUNET_MQ_send (ohh->mq,
-                  env);
-  return ohh;
-}
-
-
-/**
- * Cancel the request to transport to offer the HELLO message
- *
- * @param ohh the handle for the operation to cancel
- */
-void
-GNUNET_TRANSPORT_offer_hello_cancel (struct
-                                     GNUNET_TRANSPORT_OfferHelloHandle *ohh)
-{
-  GNUNET_MQ_destroy (ohh->mq);
-  GNUNET_free (ohh);
-}
-
-
-/* end of transport_api_offer_hello.c */
diff --git a/src/transport/transport_api_traits.c b/src/transport/transport_api_traits.c
deleted file mode 100644
index 7e66cc3d1..000000000
--- a/src/transport/transport_api_traits.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2021 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/test_transport_start_with_config.c
- * @brief Generic program to start testcases in an configurable topology.
- * @author t3sserakt
- */
-#include "platform.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_netjail_lib.h"
-#include "transport-testing-cmds.h"
-#include "gnunet_util_lib.h"
-
-GNUNET_TRANSPORT_SIMPLE_TRAITS (GNUNET_TRANSPORT_MAKE_IMPL_SIMPLE_TRAIT)