X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2FMakefile.am;h=d0db6b141c73a4d79fa111c99f227303c9b91a63;hb=ec50a665dc884f7997419d0351ae8ade9c1aeabe;hp=1579602da156adbee98111ea9f4220c36913820e;hpb=d0701eb6315fc3f5aca74415bbf0ff7418409f87;p=oweals%2Fgnunet.git diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 1579602da..d0db6b141 100644 --- 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 @@ -166,11 +168,11 @@ 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 \ @@ -191,6 +193,8 @@ libexec_PROGRAMS = \ $(BT_BIN) \ gnunet-service-transport + + bin_PROGRAMS = \ gnunet-transport \ gnunet-transport-certificate-creation @@ -235,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 \ @@ -245,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) @@ -253,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 \ @@ -270,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) \ @@ -290,6 +289,12 @@ plugin_LTLIBRARIES = \ $(WLAN_PLUGIN_LA) \ $(BT_PLUGIN_LA) +if HAVE_EXPERIMENTAL +plugin_LTLIBRARIES += \ + libgnunet_plugin_transport_xt.la \ + libgnunet_plugin_transport_xu.la +endif + # Note: real plugins of course need to be added # to the plugin_LTLIBRARIES above noinst_LTLIBRARIES = \ @@ -301,12 +306,24 @@ 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 = \ $(GN_PLUGIN_LDFLAGS) +libgnunet_plugin_transport_xt_la_SOURCES = \ + plugin_transport_xt.c +libgnunet_plugin_transport_xt_la_LIBADD = \ + $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/statistics/libgnunetstatistics.la \ + $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ + $(top_builddir)/src/nat/libgnunetnatnew.la \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(LTLIBINTL) +libgnunet_plugin_transport_xt_la_LDFLAGS = \ + $(GN_PLUGIN_LDFLAGS) + libgnunet_plugin_transport_template_la_SOURCES = \ plugin_transport_template.c libgnunet_plugin_transport_template_la_LIBADD = \ @@ -349,12 +366,25 @@ 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 = \ $(GN_PLUGIN_LDFLAGS) +libgnunet_plugin_transport_xu_la_SOURCES = \ + plugin_transport_xu.c plugin_transport_xu.h +libgnunet_plugin_transport_xu_la_LIBADD = \ + $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/fragmentation/libgnunetfragmentation.la \ + $(top_builddir)/src/statistics/libgnunetstatistics.la \ + $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ + $(top_builddir)/src/nat/libgnunetnatnew.la \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(LTLIBINTL) +libgnunet_plugin_transport_xu_la_LDFLAGS = \ + $(GN_PLUGIN_LDFLAGS) + libgnunet_plugin_transport_unix_la_SOURCES = \ plugin_transport_unix.c libgnunet_plugin_transport_unix_la_LIBADD = \ @@ -374,7 +404,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) @@ -390,7 +419,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) \ @@ -405,7 +434,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) @@ -421,7 +449,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) \ @@ -507,7 +535,7 @@ 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 \ @@ -568,7 +596,7 @@ TESTS = \ $(HTTP_API_TIMEOUT_TEST) \ $(HTTPS_API_TIMEOUT_TEST) \ $(WLAN_TIMEOUT_TEST) \ - $(BT_TIMEOUT_TEST) + $(BT_TIMEOUT_TEST) if HAVE_GETOPT_BINARY TESTS += \ test_transport_api_slow_ats @@ -1178,7 +1206,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 \ @@ -1334,7 +1361,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\ @@ -1354,4 +1380,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