HTTP_REL_TEST = test_transport_api_reliability_http
HTTP_QUOTA_TEST = test_quota_compliance_http \
test_quota_compliance_http_asymmetric
+ HTTP_SWITCH = test_transport_address_switch_http
HTTPS_API_TEST = test_transport_api_https
HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https
HTTPS_REL_TEST = test_transport_api_reliability_https
HTTPS_QUOTA_TEST = test_quota_compliance_https \
test_quota_compliance_https_asymmetric
+ HTTPS_SWITCH = test_transport_address_switch_https
endif
endif
WLAN_API_TEST = test_transport_api_wlan
WLAN_TIMEOUT_TEST = test_transport_api_timeout_wlan
WLAN_REL_TEST = test_transport_api_reliability_wlan
- WLAN_UREL_TEST = test_transport_api_unreliability_wlan
WLAN_QUOTA_TEST = test_quota_compliance_wlan \
test_quota_compliance_wlan_asymmetric
endif
BT_API_TEST = test_transport_api_bluetooth
BT_TIMEOUT_TEST = test_transport_api_timeout_bluetooth
BT_REL_TEST = test_transport_api_reliability_bluetooth
- BT_UREL_TEST = test_transport_api_unreliability_bluetooth
BT_QUOTA_TEST = test_quota_compliance_bluetooth \
test_quota_compliance_bluetooth_asymmetric
endif
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_unreliability_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
endif
noinst_PROGRAMS = \
transport_api.c transport.h \
transport_api_blacklist.c \
transport_api_address_to_string.c \
- transport_api_address_lookup.c
+ transport_api_monitor_peers.c \
+ transport_api_monitor_validation.c
libgnunettransport_la_LIBADD = \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
libgnunettransport_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
- -version-info 3:0:1
+ -version-info 4:0:2
libexec_PROGRAMS = \
$(WLAN_BIN) \
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 = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(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) \
$(GN_LIBINTL)
+gnunet_service_transport_DEPENDENCIES = \
+ libgnunettransport.la
gnunet_service_transport_CFLAGS = \
$(CFLAGS)
# -DANALYZE
test_transport_api_restart_1peer \
test_transport_api_restart_2peers \
test_transport_api_timeout_tcp \
+ test_transport_address_switch_tcp \
test_transport_api_limited_sockets_tcp \
test_transport_api_tcp_nat \
test_transport_api_udp \
test_transport_api_timeout_udp \
+ test_transport_address_switch_udp \
$(UNIX_PLUGIN_TEST) \
$(UNIX_PLUGIN_TIMEOUT_TEST) \
+ $(UNIX_API_ABSTRACT_TEST) \
test_transport_api_udp_nat \
$(HTTP_API_TEST) \
$(HTTP_REVERSE_API_TEST) \
$(HTTP_API_TIMEOUT_TEST) \
+ $(HTTP_SWITCH) \
$(HTTPS_API_TEST) \
$(HTTPS_API_TIMEOUT_TEST) \
+ $(HTTPS_SWITCH) \
$(WLAN_API_TEST) \
$(WLAN_TIMEOUT_TEST) \
$(BT_API_TEST) \
$(BT_TIMEOUT_TEST) \
test_transport_api_multi \
+ test_transport_api_monitoring \
+ test_transport_api_monitoring_validation \
test_transport_blacklisting_no_bl \
test_transport_blacklisting_outbound_bl_full \
test_transport_blacklisting_outbound_bl_plugin \
test_transport_api_manipulation_cfg \
test_transport_api_reliability_tcp \
test_transport_api_reliability_tcp_nat \
- test_transport_api_unreliability_udp \
- test_transport_api_unreliability_constant_udp \
+ test_transport_api_reliability_udp \
$(UNIX_REL_TEST) \
$(HTTP_REL_TEST) \
$(HTTPS_REL_TEST) \
endif
if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
TESTS = \
test_transport_testing_startstop \
test_transport_testing_restart \
test_transport_api_timeout_tcp \
test_transport_api_limited_sockets_tcp \
test_transport_api_tcp_nat \
+ test_transport_address_switch_tcp \
test_transport_api_udp \
test_transport_api_timeout_udp \
+ test_transport_address_switch_udp \
$(UNIX_PLUGIN_TEST) \
$(UNIX_PLUGIN_TIMEOUT_TEST) \
+ $(UNIX_API_ABSTRACT_TEST) \
test_transport_api_udp_nat \
$(HTTP_API_TEST) \
$(HTTP_API_TIMEOUT_TEST) \
+ $(HTTP_SWITCH) \
$(HTTPS_API_TEST) \
$(HTTPS_API_TIMEOUT_TEST) \
+ $(HTTPS_SWITCH) \
$(WLAN_API_TEST) \
+ $(WLAN_TIMEOUT_TEST) \
$(BT_API_TEST) \
+ $(BT_TIMEOUT_TEST) \
test_transport_api_multi \
+ test_transport_api_monitoring \
+ test_transport_api_monitoring_validation \
test_transport_blacklisting_no_bl \
test_transport_blacklisting_outbound_bl_full \
test_transport_blacklisting_outbound_bl_plugin \
test_transport_api_manipulation_cfg \
test_transport_api_reliability_tcp \
test_transport_api_reliability_tcp_nat \
- test_transport_api_unreliability_udp \
- test_transport_api_unreliability_constant_udp \
+ test_transport_api_reliability_udp \
$(UNIX_REL_TEST) \
$(HTTP_REL_TEST) \
$(HTTPS_REL_TEST) \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/transport/libgnunettransporttesting.la
-
-
test_transport_api_reliability_tcp_SOURCES = \
test_transport_api_reliability.c
test_transport_api_reliability_tcp_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/transport/libgnunettransporttesting.la
-test_transport_api_reliability_wlan_SOURCES = \
- test_transport_api_reliability.c
-test_transport_api_reliability_wlan_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
-
test_transport_api_reliability_bluetooth_SOURCES = \
test_transport_api_reliability.c
test_transport_api_reliability_bluetooth_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/transport/libgnunettransporttesting.la
-test_transport_api_unreliability_wlan_SOURCES = \
- test_transport_api_unreliability.c
-test_transport_api_unreliability_wlan_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
-
-test_transport_api_unreliability_bluetooth_SOURCES = \
- test_transport_api_unreliability.c
-test_transport_api_unreliability_bluetooth_LDADD = \
+test_transport_api_reliability_wlan_SOURCES = \
+ test_transport_api_reliability.c
+test_transport_api_reliability_wlan_LDADD = \
$(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/transport/libgnunettransporttesting.la
+test_transport_api_unix_abstract_SOURCES = \
+ test_transport_api.c
+test_transport_api_unix_abstract_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la
+
# HTTP tests
test_transport_api_http_SOURCES = \
test_transport_api.c
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/transport/libgnunettransporttesting.la
-test_transport_api_unreliability_unix_SOURCES = \
- test_transport_api_unreliability.c
-test_transport_api_unreliability_unix_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
-
-test_transport_api_unreliability_udp_SOURCES = \
- test_transport_api_unreliability.c
-test_transport_api_unreliability_udp_LDADD = \
+test_transport_api_reliability_unix_SOURCES = \
+ test_transport_api_reliability.c
+test_transport_api_reliability_unix_LDADD = \
$(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/transport/libgnunettransporttesting.la
-test_transport_api_unreliability_constant_udp_SOURCES = \
- test_transport_api_unreliability_constant.c
-test_transport_api_unreliability_constant_udp_LDADD = \
+test_transport_api_reliability_udp_SOURCES = \
+ test_transport_api_reliability.c
+test_transport_api_reliability_udp_LDADD = \
$(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la \
endif
endif
+test_transport_address_switch_tcp_SOURCES = \
+ test_transport_address_switch.c
+test_transport_address_switch_tcp_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la
+
+ test_transport_address_switch_udp_SOURCES = \
+ test_transport_address_switch.c
+test_transport_address_switch_udp_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la
+
+
+ test_transport_address_switch_http_SOURCES = \
+ test_transport_address_switch.c
+test_transport_address_switch_http_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la
+
+ test_transport_address_switch_https_SOURCES = \
+ test_transport_address_switch.c
+test_transport_address_switch_https_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la
+
test_quota_compliance_tcp_SOURCES = \
test_quota_compliance.c
test_quota_compliance_tcp_LDADD = \
test_quota_compliance_bluetooth_SOURCES = \
test_quota_compliance.c
test_quota_compliance_bluetooth_LDADD = \
+ $(top_builddir)/src/nat/libgnunetnat.la \
$(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/transport/libgnunettransporttesting.la
+test_transport_api_monitoring_SOURCES = \
+ test_transport_api_monitoring.c
+test_transport_api_monitoring_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la
+
+test_transport_api_monitoring_validation_SOURCES = \
+ test_transport_api_monitoring_validation.c
+test_transport_api_monitoring_validation_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la
+
EXTRA_DIST = \
test_plugin_hostkey \
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_unreliability_udp_peer1.conf\
-test_transport_api_unreliability_udp_peer2.conf\
-test_transport_api_unreliability_unix_peer1.conf\
-test_transport_api_unreliability_unix_peer2.conf\
-test_transport_api_unreliability_wlan_peer1.conf\
-test_transport_api_unreliability_wlan_peer2.conf\
-test_transport_api_unreliability_bluetooth_peer1.conf\
-test_transport_api_unreliability_bluetooth_peer2.conf\
+test_transport_api_reliability_udp_peer1.conf\
+test_transport_api_reliability_udp_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_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_bluetooth_peer2.conf\
+test_transport_api_monitoring_peer1.conf\
+test_transport_api_monitoring_peer2.conf\
+test_transport_api_monitoring_validation_peer1.conf\
+test_transport_api_monitoring_validation_peer2.conf\
test_transport_defaults.conf\
test_transport_startonly.conf\
test_transport_api_disconnect_tcp_peer1.conf\
test_transport_api_timeout_http_peer2.conf\
test_transport_api_timeout_https_peer1.conf\
test_transport_api_timeout_https_peer2.conf\
-test_transport_api_unreliability_constant_udp_peer1.conf\
-test_transport_api_unreliability_constant_udp_peer2.conf\
test_transport_blacklisting_cfg_peer1.conf \
test_transport_blacklisting_cfg_peer2.conf \
test_transport_blacklisting_cfg_blp_peer1_full.conf\