pkgcfg_DATA = \
transport.conf
-
if HAVE_MHD
GN_LIBMHD = -lmicrohttpd
HTTP_SERVER_PLUGIN_LA = libgnunet_plugin_transport_http_server.la
AM_CFLAGS = --coverage -O0
endif
+if HAVE_EXPERIMENTAL
if LINUX
WLAN_BIN = gnunet-helper-transport-wlan
WLAN_BIN_DUMMY = gnunet-helper-transport-wlan-dummy
if LINUX
install-exec-hook:
- $(top_srcdir)/src/transport/install-wlan-helper.sh $(libexecdir) $(SUDO_BINARY) || true
+ $(top_srcdir)/src/transport/install-wlan-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true
if HAVE_LIBBLUETOOTH
- $(top_srcdir)/src/transport/install-bluetooth-helper.sh $(libexecdir) $(SUDO_BINARY) || true
+ $(top_srcdir)/src/transport/install-bluetooth-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true
endif
else
install-exec-hook:
endif
endif
+# end of HAVE_EXPERIMENTAL
+endif
if !MINGW
$(TESTING_LIBS)
libgnunettransporttesting_la_SOURCES = \
- transport-testing.c transport-testing.h
+ 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 \
$(GN_LIBINTL)
$(GN_LIB_LDFLAGS)
libgnunettransport_la_SOURCES = \
- transport_api.c transport.h \
- transport_api_blacklist.c \
+ 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_monitor_validation.c
+ transport_api_offer_hello.c
+
libgnunettransport_la_LIBADD = \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/ats/libgnunetats.la \
$(BT_BIN) \
gnunet-service-transport
+
+
bin_PROGRAMS = \
gnunet-transport \
gnunet-transport-certificate-creation
gnunet-transport-profiler.c
gnunet_transport_profiler_LDADD = \
libgnunettransport.la \
- $(top_builddir)/src/nat/libgnunetnat.la \
$(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
gnunet-transport.c
gnunet_transport_LDADD = \
libgnunettransport.la \
- $(top_builddir)/src/nat/libgnunetnat.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_blacklist.h gnunet-service-transport_blacklist.c \
- gnunet-service-transport_clients.h gnunet-service-transport_clients.c \
gnunet-service-transport_hello.h gnunet-service-transport_hello.c \
gnunet-service-transport_neighbours.h gnunet-service-transport_neighbours.c \
gnunet-service-transport_plugins.h gnunet-service-transport_plugins.c \
$(top_builddir)/src/ats/libgnunetats.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
- $(top_builddir)/src/nat/libgnunetnat.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_GLPK) \
$(HTTP_SERVER_PLUGIN_LA) \
$(HTTPS_SERVER_PLUGIN_LA) \
$(WLAN_PLUGIN_LA) \
- $(BT_PLUGIN_LA) \
+ $(BT_PLUGIN_LA)
+
+# Note: real plugins of course need to be added
+# to the plugin_LTLIBRARIES above
+noinst_LTLIBRARIES = \
libgnunet_plugin_transport_template.la
libgnunet_plugin_transport_tcp_la_SOURCES = \
- plugin_transport_tcp.c
+ 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/libgnunetnat.la \
+ $(top_builddir)/src/nat/libgnunetnatnew.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(LTLIBINTL)
libgnunet_plugin_transport_tcp_la_LDFLAGS = \
$(top_builddir)/src/fragmentation/libgnunetfragmentation.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
- $(top_builddir)/src/nat/libgnunetnat.la \
+ $(top_builddir)/src/nat/libgnunetnatnew.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(LTLIBINTL)
libgnunet_plugin_transport_udp_la_LDFLAGS = \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
$(LIB_GNURL) \
- $(top_builddir)/src/nat/libgnunetnat.la \
$(top_builddir)/src/util/libgnunetutil.la
libgnunet_plugin_transport_http_client_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
- $(top_builddir)/src/nat/libgnunetnat.la \
+ $(top_builddir)/src/nat/libgnunetnatnew.la \
$(top_builddir)/src/util/libgnunetutil.la
libgnunet_plugin_transport_http_server_la_LDFLAGS = \
$(GN_LIBMHD) \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
$(LIB_GNURL) \
- $(top_builddir)/src/nat/libgnunetnat.la \
$(top_builddir)/src/util/libgnunetutil.la
libgnunet_plugin_transport_https_client_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
- $(top_builddir)/src/nat/libgnunetnat.la \
+ $(top_builddir)/src/nat/libgnunetnatnew.la \
$(top_builddir)/src/util/libgnunetutil.la
libgnunet_plugin_transport_https_server_la_LDFLAGS = \
$(GN_LIBMHD) \
if HAVE_TESTING
check_PROGRAMS = \
- test_transport_api_restart_2peers \
test_transport_address_switch_tcp \
test_transport_address_switch_udp \
test_transport_testing_startstop \
test_transport_testing_restart \
- test_transport_testing \
- test_transport_startonly \
test_plugin_tcp \
test_plugin_udp \
$(UNIX_TEST) \
$(HTTPS_CLIENT_PLUGIN_TEST) \
$(HTTP_SERVER_PLUGIN_TEST) \
$(HTTPS_SERVER_PLUGIN_TEST) \
- test_transport_api_blacklisting \
+ test_transport_api_blacklisting_tcp \
test_transport_api_disconnect_tcp \
- test_transport_api_bidirectional_connect \
test_transport_api_tcp \
test_transport_api_restart_1peer \
+ test_transport_api_restart_2peers \
test_transport_api_timeout_tcp \
test_transport_api_limited_sockets_tcp \
test_transport_api_tcp_nat \
$(BT_TIMEOUT_TEST) \
test_transport_api_multi \
test_transport_api_monitor_peers \
- test_transport_api_monitor_validation \
test_transport_blacklisting_no_bl \
test_transport_blacklisting_outbound_bl_full \
test_transport_blacklisting_outbound_bl_plugin \
$(HTTP_QUOTA_TEST) \
$(HTTPS_QUOTA_TEST) \
$(WLAN_QUOTA_TEST) \
- $(BT_QUOTA_TEST) \
- test_transport_api_slow_ats
+ $(BT_QUOTA_TEST)
+if HAVE_GETOPT_BINARY
+check_PROGRAMS += \
+test_transport_api_slow_ats
+endif
endif
if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+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 \
+ test_transport_address_switch_udp \
+ $(HTTP_SWITCH) \
+ $(HTTPS_SWITCH) \
test_transport_testing_startstop \
test_transport_testing_restart \
- test_transport_testing \
- test_transport_startonly \
test_plugin_tcp \
test_plugin_udp \
$(UNIX_TEST) \
$(WLAN_PLUGIN_TEST) \
$(BT_PLUGIN_TEST) \
- test_transport_api_blacklisting \
+ test_transport_api_blacklisting_tcp \
test_transport_api_disconnect_tcp \
- test_transport_api_bidirectional_connect \
test_transport_api_tcp \
test_transport_api_restart_1peer \
test_transport_api_restart_2peers \
$(BT_API_TEST) \
test_transport_api_multi \
test_transport_api_monitor_peers \
- test_transport_api_monitor_validation \
test_transport_blacklisting_no_bl \
test_transport_blacklisting_outbound_bl_full \
test_transport_blacklisting_outbound_bl_plugin \
$(UNIX_QUOTA_TEST) \
$(HTTP_QUOTA_TEST) \
$(HTTPS_QUOTA_TEST) \
- test_transport_api_slow_ats \
test_transport_api_timeout_tcp \
test_transport_api_timeout_udp \
$(UNIX_PLUGIN_TIMEOUT_TEST) \
$(HTTP_API_TIMEOUT_TEST) \
$(HTTPS_API_TIMEOUT_TEST) \
$(WLAN_TIMEOUT_TEST) \
- $(BT_TIMEOUT_TEST) \
- test_transport_address_switch_tcp \
- test_transport_address_switch_udp \
- $(HTTP_SWITCH) \
- $(HTTPS_SWITCH)
+ $(BT_TIMEOUT_TEST)
+if HAVE_GETOPT_BINARY
+TESTS += \
+test_transport_api_slow_ats
+endif
endif
test_transport_testing_startstop_SOURCES = \
$(top_builddir)/src/hello/libgnunethello.la \
libgnunettransporttesting.la
-test_transport_testing_SOURCES = \
- test_transport_testing.c
-test_transport_testing_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- libgnunettransporttesting.la
-
-test_transport_api_blacklisting_SOURCES = \
+test_transport_api_blacklisting_tcp_SOURCES = \
test_transport_api_blacklisting.c
-test_transport_api_blacklisting_LDADD = \
+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_startonly_SOURCES = \
- test_transport_startonly.c
-test_transport_startonly_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 = \
$(top_builddir)/src/util/libgnunetutil.la \
libgnunettransporttesting.la
-test_transport_api_bidirectional_connect_SOURCES = \
- test_transport_api_bidirectional_connect.c
-test_transport_api_bidirectional_connect_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
test_transport_api_restart_1peer_SOURCES = \
- test_transport_api_restart_1peer.c
+ 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_2peers.c
+ test_transport_api_restart_reconnect.c
test_transport_api_restart_2peers_LDADD = \
libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
+$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/util/libgnunetutil.la \
libgnunettransporttesting.la
test_quota_compliance_bluetooth_SOURCES = \
test_quota_compliance.c
test_quota_compliance_bluetooth_LDADD = \
- $(top_builddir)/src/nat/libgnunetnat.la \
libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/ats/libgnunetats.la \
$(top_builddir)/src/util/libgnunetutil.la \
libgnunettransporttesting.la
-test_transport_api_monitor_validation_SOURCES = \
- test_transport_api_monitor_validation.c
-test_transport_api_monitor_validation_LDADD = \
- libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettransporttesting.la
-
test_transport_api_slow_ats_SOURCES = \
test_transport_api.c
test_transport_api_slow_ats_LDADD = \
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_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_wlan_peer2.conf\
test_transport_api_reliability_bluetooth_peer1.conf\
test_transport_api_reliability_bluetooth_peer2.conf\
-test_transport_api_bidirectional_connect_peer1.conf\
-test_transport_api_bidirectional_connect_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_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_test_transport_address_switch_http_peer1.conf\
-test_transport_test_transport_address_switch_http_peer2.conf\
-test_transport_test_transport_address_switch_https_peer1.conf\
-test_transport_test_transport_address_switch_https_peer2.conf\
-test_transport_test_transport_address_switch_udp_peer1.conf\
-test_transport_test_transport_address_switch_udp_peer2.conf\
-test_transport_test_transport_address_switch_tcp_peer1.conf\
-test_transport_test_transport_address_switch_tcp_peer2.conf\
test_transport_api_wlan_peer1.conf\
test_transport_api_wlan_peer2.conf\
test_transport_api_bluetooth_peer1.conf\
test_transport_api_monitor_validation_peer1.conf\
test_transport_api_monitor_validation_peer2.conf\
test_transport_defaults.conf\
-test_transport_startonly.conf\
test_transport_api_disconnect_tcp_peer1.conf\
test_transport_api_disconnect_tcp_peer2.conf\
test_transport_api_timeout_http_peer1.conf\
perf_tcp_peer1.conf \
perf_tcp_peer2.conf \
test_transport_api_slow_ats_peer1.conf \
-test_transport_api_slow_ats_peer2.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