fixing unchecked return values

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

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 2e49b0cf03c1343f3ade6f570a1a1bbe4350bf09..d95e7e31d245c4e65dfb7f778a0e35c568339baa 100644 (file)
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -103,6 +103,9 @@ UNIX_PLUGIN_TIMEOUT_TEST = test_transport_api_timeout_unix
 UNIX_REL_TEST = test_transport_api_unreliability_unix
 UNIX_QUOTA_TEST = test_quota_compliance_unix \
      test_quota_compliance_unix_asymmetric
+if LINUX
+ UNIX_API_ABSTRACT_TEST = test_transport_api_unix_abstract
+endif
 endif
 
 noinst_PROGRAMS = \
@@ -134,7 +137,7 @@ libgnunettransport_la_SOURCES = \
   transport_api.c transport.h \
   transport_api_blacklist.c \
   transport_api_address_to_string.c \
-  transport_api_address_lookup.c
+  transport_api_monitoring.c
 libgnunettransport_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/util/libgnunetutil.la \
@@ -209,14 +212,23 @@ gnunet_service_transport_SOURCES = \
  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
@@ -393,6 +405,7 @@ check_PROGRAMS = \
  test_transport_api_timeout_udp \
  $(UNIX_PLUGIN_TEST) \
  $(UNIX_PLUGIN_TIMEOUT_TEST) \
+ $(UNIX_API_ABSTRACT_TEST) \
  test_transport_api_udp_nat \
  $(HTTP_API_TEST) \
  $(HTTP_REVERSE_API_TEST) \
@@ -404,6 +417,8 @@ check_PROGRAMS = \
  $(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 \
@@ -435,6 +450,7 @@ check_PROGRAMS = \
 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 \
@@ -458,14 +474,19 @@ TESTS = \
  test_transport_api_timeout_udp \
  $(UNIX_PLUGIN_TEST) \
  $(UNIX_PLUGIN_TIMEOUT_TEST) \
+ $(UNIX_API_ABSTRACT_TEST) \
  test_transport_api_udp_nat \
  $(HTTP_API_TEST) \
  $(HTTP_API_TIMEOUT_TEST) \
  $(HTTPS_API_TEST) \
  $(HTTPS_API_TIMEOUT_TEST) \
  $(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 \
@@ -764,8 +785,6 @@ test_transport_api_manipulation_cfg_LDADD = \
  $(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 = \
@@ -878,6 +897,14 @@ test_transport_api_unix_LDADD = \
  $(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
@@ -1074,6 +1101,7 @@ test_quota_compliance_wlan_asymmetric_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 \
@@ -1095,6 +1123,22 @@ test_transport_api_multi_LDADD = \
  $(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 \
@@ -1173,6 +1217,8 @@ 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 \
@@ -1191,6 +1237,10 @@ 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\