X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2FMakefile.am;h=7687f2348703ed8babe5783d1593eaefb0d4a2ca;hb=5a7cef0202631204485cbcb1e36671e4321a936f;hp=43a87ed334cfd6ed2ace7f8a06bef3a72650e442;hpb=53f0f13a919c33f6bfcb7823ee4908084b259f20;p=oweals%2Fgnunet.git diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 43a87ed33..7687f2348 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -153,7 +153,8 @@ libgnunettransporttesting_la_SOURCES = \ transport-testing.c transport-testing.h \ transport-testing-filenames.c \ transport-testing-loggers.c \ - transport-testing-main.c + transport-testing-main.c \ + transport-testing-send.c libgnunettransporttesting_la_LIBADD = \ libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ @@ -165,11 +166,12 @@ libgnunettransporttesting_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) libgnunettransport_la_SOURCES = \ - transport_api.c transport.h \ + transport.h \ transport_api_address_to_string.c \ transport_api_blacklist.c \ transport_api_core.c \ - transport_api_get_hello.c \ + transport_api_hello_get.c \ + transport_api_manipulation.c \ transport_api_monitor_peers.c \ transport_api_monitor_plugins.c \ transport_api_offer_hello.c @@ -189,6 +191,8 @@ libexec_PROGRAMS = \ $(BT_BIN) \ gnunet-service-transport + + bin_PROGRAMS = \ gnunet-transport \ gnunet-transport-certificate-creation @@ -233,7 +237,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 \ @@ -243,7 +246,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) @@ -251,8 +253,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 \ @@ -268,7 +268,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) \ @@ -299,7 +298,7 @@ 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 = \ @@ -347,7 +346,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 = \ @@ -372,7 +371,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) @@ -388,7 +386,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) \ @@ -403,7 +401,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) @@ -419,7 +416,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) \ @@ -430,13 +427,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) \ @@ -447,11 +441,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 \ @@ -508,20 +502,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 \ @@ -568,11 +563,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 @@ -595,17 +586,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 \ @@ -676,15 +659,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 = \ @@ -783,16 +757,8 @@ 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 \ @@ -802,7 +768,7 @@ test_transport_api_restart_1peer_LDADD = \ 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 \ @@ -1207,7 +1173,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 \ @@ -1284,6 +1249,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\ @@ -1294,6 +1261,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\ @@ -1306,14 +1275,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\