From a9fadbb9d0012cd7b65bd0c5cf3196f1fc54d3e8 Mon Sep 17 00:00:00 2001 From: "Schanzenbach, Martin" Date: Thu, 12 Dec 2019 21:02:35 +0100 Subject: make udp transport experimental --- src/transport/Makefile.am | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) (limited to 'src/transport/Makefile.am') diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 45b6977ab..5069e95b6 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -369,7 +369,9 @@ gnunet_service_tng_LDADD = \ plugin_LTLIBRARIES = \ libgnunet_plugin_transport_tcp.la \ +if HAVE_EXPERIMENTAL libgnunet_plugin_transport_udp.la \ +endif $(UNIX_PLUGIN_LA) \ $(HTTP_CLIENT_PLUGIN_LA) \ $(HTTPS_CLIENT_PLUGIN_LA) \ @@ -429,6 +431,7 @@ libgnunet_plugin_transport_bluetooth_la_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 @@ -442,6 +445,7 @@ libgnunet_plugin_transport_udp_la_LIBADD = \ $(LTLIBINTL) libgnunet_plugin_transport_udp_la_LDFLAGS = \ $(GN_PLUGIN_LDFLAGS) +endif libgnunet_plugin_transport_unix_la_SOURCES = \ plugin_transport_unix.c @@ -519,11 +523,15 @@ libgnunet_plugin_transport_https_server_la_CFLAGS = \ if HAVE_TESTING check_PROGRAMS = \ test_transport_address_switch_tcp \ +if HAVE_EXPERIMENTAL test_transport_address_switch_udp \ +endif test_transport_testing_startstop \ test_transport_testing_restart \ test_plugin_tcp \ +if HAVE_EXPERIMENTAL test_plugin_udp \ +endif $(UNIX_TEST) \ $(WLAN_PLUGIN_TEST) \ $(BT_PLUGIN_TEST) \ @@ -540,12 +548,16 @@ check_PROGRAMS = \ test_transport_api_timeout_tcp \ test_transport_api_limited_sockets_tcp \ test_transport_api_tcp_nat \ +if HAVE_EXPERIMENTAL test_transport_api_udp \ test_transport_api_timeout_udp \ +endif $(UNIX_PLUGIN_TEST) \ $(UNIX_PLUGIN_TIMEOUT_TEST) \ $(UNIX_API_ABSTRACT_TEST) \ +if HAVE_EXPERIMENTAL test_transport_api_udp_nat \ +endif $(HTTP_API_TEST) \ $(HTTP_REVERSE_API_TEST) \ $(HTTP_API_TIMEOUT_TEST) \ @@ -570,7 +582,9 @@ check_PROGRAMS = \ test_transport_api_manipulation_cfg \ test_transport_api_reliability_tcp \ test_transport_api_reliability_tcp_nat \ +if HAVE_EXPERIMENTAL test_transport_api_reliability_udp \ +endif $(UNIX_REL_TEST) \ $(HTTP_REL_TEST) \ $(HTTPS_REL_TEST) \ @@ -580,7 +594,9 @@ check_PROGRAMS = \ $(BT_UREL_TEST) \ test_quota_compliance_tcp \ test_quota_compliance_tcp_asymmetric \ +if HAVE_EXPERIMENTAL test_quota_compliance_udp \ +endif $(UNIX_QUOTA_TEST) \ $(HTTP_QUOTA_TEST) \ $(HTTPS_QUOTA_TEST) \ @@ -598,13 +614,17 @@ 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 \ +if HAVE_EXPERIMENTAL test_transport_address_switch_udp \ +endif $(HTTP_SWITCH) \ $(HTTPS_SWITCH) \ test_transport_testing_startstop \ test_transport_testing_restart \ test_plugin_tcp \ +if HAVE_EXPERIMENTAL test_plugin_udp \ +endif $(UNIX_TEST) \ $(WLAN_PLUGIN_TEST) \ $(BT_PLUGIN_TEST) \ @@ -615,10 +635,14 @@ TESTS = \ test_transport_api_restart_2peers \ test_transport_api_limited_sockets_tcp \ test_transport_api_tcp_nat \ +if HAVE_EXPERIMENTAL test_transport_api_udp \ +endif $(UNIX_PLUGIN_TEST) \ $(UNIX_API_ABSTRACT_TEST) \ +if HAVE_EXPERIMENTAL test_transport_api_udp_nat \ +endif $(HTTP_API_TEST) \ $(HTTPS_API_TEST) \ $(WLAN_API_TEST) \ @@ -636,7 +660,9 @@ TESTS = \ test_transport_api_manipulation_cfg \ test_transport_api_reliability_tcp \ test_transport_api_reliability_tcp_nat \ +if HAVE_EXPERIMENTAL test_transport_api_reliability_udp \ +endif $(UNIX_REL_TEST) \ $(HTTP_REL_TEST) \ $(HTTPS_REL_TEST) \ @@ -646,12 +672,16 @@ TESTS = \ $(BT_UREL_TEST) \ test_quota_compliance_tcp \ test_quota_compliance_tcp_asymmetric \ +if HAVE_EXPERIMENTAL test_quota_compliance_udp \ +endif $(UNIX_QUOTA_TEST) \ $(HTTP_QUOTA_TEST) \ $(HTTPS_QUOTA_TEST) \ test_transport_api_timeout_tcp \ +if HAVE_EXPERIMENTAL test_transport_api_timeout_udp \ +endif $(UNIX_PLUGIN_TIMEOUT_TEST) \ $(HTTP_API_TIMEOUT_TEST) \ $(HTTPS_API_TIMEOUT_TEST) \ @@ -761,6 +791,7 @@ test_plugin_tcp_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ libgnunettransporttesting.la +if HAVE_EXPERIMENTAL test_plugin_udp_SOURCES = \ test_plugin_transport.c test_plugin_udp_LDADD = \ @@ -769,6 +800,7 @@ test_plugin_udp_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ libgnunettransporttesting.la +endif test_communicator_unix_SOURCES = \ test_communicator_unix.c @@ -980,6 +1012,7 @@ test_transport_api_reliability_wlan_LDADD = \ $(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 = \ @@ -1003,6 +1036,7 @@ test_transport_api_udp_nat_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ libgnunettransporttesting.la +endif test_transport_api_unix_SOURCES = \ test_transport_api.c @@ -1143,6 +1177,7 @@ test_transport_api_reliability_unix_LDADD = \ $(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 = \ @@ -1150,6 +1185,7 @@ test_transport_api_reliability_udp_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ libgnunettransporttesting.la +endif if LINUX test_transport_api_wlan_SOURCES = \ @@ -1182,7 +1218,8 @@ test_transport_address_switch_tcp_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ libgnunettransporttesting.la - test_transport_address_switch_udp_SOURCES = \ +if HAVE_EXPERIMENTAL +test_transport_address_switch_udp_SOURCES = \ test_transport_address_switch.c test_transport_address_switch_udp_LDADD = \ libgnunettransport.la \ @@ -1190,7 +1227,7 @@ test_transport_address_switch_udp_LDADD = \ $(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 @@ -1230,6 +1267,7 @@ test_quota_compliance_tcp_asymmetric_LDADD = \ $(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 = \ @@ -1239,6 +1277,7 @@ test_quota_compliance_udp_LDADD = \ $(top_builddir)/src/nt/libgnunetnt.la \ $(top_builddir)/src/util/libgnunetutil.la \ libgnunettransporttesting.la +endif test_quota_compliance_unix_SOURCES = \ test_quota_compliance.c -- cgit v1.2.3