at least compiling fix

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

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 7cd4596df12d44a17b482eda239fa4e367dd78af..e8c1f5d4aa6ef8a4167b0a3b656acae74eb481a8 100644 (file)
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -10,7 +10,6 @@ libexecdir= $(pkglibdir)/libexec/
 pkgcfg_DATA = \
   transport.conf
 
-
 if HAVE_MHD
  GN_LIBMHD = -lmicrohttpd
  HTTP_SERVER_PLUGIN_LA = libgnunet_plugin_transport_http_server.la
@@ -79,6 +78,7 @@ 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
@@ -121,6 +121,8 @@ if MINGW
 endif
 endif
 
+# end of HAVE_EXPERIMENTAL
+endif
 
 
 if !MINGW
@@ -150,10 +152,15 @@ lib_LTLIBRARIES = \
   $(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)
@@ -161,12 +168,16 @@ libgnunettransporttesting_la_LDFLAGS = \
  $(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 \
@@ -182,6 +193,8 @@ libexec_PROGRAMS = \
  $(BT_BIN) \
  gnunet-service-transport
 
+
+
 bin_PROGRAMS = \
  gnunet-transport \
  gnunet-transport-certificate-creation
@@ -226,7 +239,6 @@ gnunet_transport_profiler_SOURCES = \
  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 \
@@ -236,7 +248,6 @@ gnunet_transport_SOURCES = \
  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)
@@ -244,8 +255,6 @@ gnunet_transport_LDADD = \
 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 \
@@ -261,7 +270,6 @@ gnunet_service_transport_LDADD = \
   $(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) \
@@ -287,12 +295,12 @@ 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 = \
@@ -340,7 +348,7 @@ libgnunet_plugin_transport_udp_la_LIBADD = \
   $(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 = \
@@ -365,7 +373,6 @@ libgnunet_plugin_transport_http_client_la_LIBADD = \
   $(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)
@@ -381,7 +388,7 @@ libgnunet_plugin_transport_http_server_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
 libgnunet_plugin_transport_http_server_la_LDFLAGS = \
  $(GN_LIBMHD) \
@@ -396,7 +403,6 @@ libgnunet_plugin_transport_https_client_la_LIBADD = \
   $(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)
@@ -412,7 +418,7 @@ libgnunet_plugin_transport_https_server_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
 libgnunet_plugin_transport_https_server_la_LDFLAGS = \
  $(GN_LIBMHD) \
@@ -423,13 +429,10 @@ libgnunet_plugin_transport_https_server_la_CFLAGS = \
 
 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) \
@@ -440,11 +443,11 @@ check_PROGRAMS = \
  $(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 \
@@ -467,7 +470,6 @@ check_PROGRAMS = \
  $(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 \
@@ -502,20 +504,21 @@ 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 \
@@ -531,7 +534,6 @@ TESTS = \
  $(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 \
@@ -563,11 +565,7 @@ TESTS = \
  $(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
@@ -590,17 +588,9 @@ test_transport_testing_restart_LDADD = \
  $(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 \
@@ -671,15 +661,6 @@ test_transport_api_disconnect_tcp_LDADD = \
  $(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 = \
@@ -778,29 +759,23 @@ test_transport_api_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
 
@@ -1200,7 +1175,6 @@ 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 \
  libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/ats/libgnunetats.la \
@@ -1232,14 +1206,6 @@ test_transport_api_monitor_peers_LDADD = \
  $(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 = \
@@ -1285,6 +1251,8 @@ 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\
@@ -1295,6 +1263,8 @@ 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\
@@ -1307,14 +1277,16 @@ 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_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\
@@ -1358,7 +1330,6 @@ 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_startonly.conf\
 test_transport_api_disconnect_tcp_peer1.conf\
 test_transport_api_disconnect_tcp_peer2.conf\
 test_transport_api_timeout_http_peer1.conf\
@@ -1378,4 +1349,8 @@ 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
+test_transport_api_slow_ats_peer2.conf \
+  tcp_connection_legacy.c \
+  tcp_server_mst_legacy.c \
+  tcp_server_legacy.c \
+  tcp_service_legacy.c