libexecdir= $(pkglibdir)/libexec/
pkgcfg_DATA = \
- transport.conf
-
+ transport.conf \
+ communicator-unix.conf
if HAVE_MHD
GN_LIBMHD = -lmicrohttpd
AM_CFLAGS = --coverage -O0
endif
+if HAVE_EXPERIMENTAL
if LINUX
WLAN_BIN = gnunet-helper-transport-wlan
WLAN_BIN_DUMMY = gnunet-helper-transport-wlan-dummy
endif
endif
+# end of HAVE_EXPERIMENTAL
+endif
if !MINGW
noinst_PROGRAMS = \
gnunet-transport-profiler \
+ gnunet-communicator-tcp \
+ gnunet-communicator-udp \
+ gnunet-service-tng \
$(WLAN_BIN_SENDER) \
$(WLAN_BIN_RECEIVER)
if HAVE_TESTING
-TESTING_LIBS = libgnunettransporttesting.la
+TESTING_LIBS = libgnunettransporttesting.la \
+ libgnunettransporttesting2.la
endif
lib_LTLIBRARIES = \
libgnunettransport.la \
+ libgnunettransportaddress.la \
+ libgnunettransportapplication.la \
+ libgnunettransportcore.la \
+ libgnunettransportcommunicator.la \
+ libgnunettransportmonitor.la \
$(TESTING_LIBS)
libgnunettransporttesting_la_SOURCES = \
libgnunettransporttesting_la_LDFLAGS = \
$(GN_LIB_LDFLAGS)
+libgnunettransporttesting2_la_SOURCES = \
+ transport-testing2.c transport-testing2.h
+libgnunettransporttesting2_la_LIBADD = \
+ libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+libgnunettransporttesting2_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
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
-version-info 4:0:2
+libgnunettransportapplication_la_SOURCES = \
+ transport_api2_application.c
+libgnunettransportapplication_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
+libgnunettransportapplication_la_LDFLAGS = \
+ $(GN_LIB_LDFLAGS) $(WINFLAGS) \
+ -version-info 0:0:0
+
+
+libgnunettransportaddress_la_SOURCES = \
+ transport_api2_address.c
+libgnunettransportaddress_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+libgnunettransportaddress_la_LDFLAGS = \
+ $(GN_LIB_LDFLAGS) $(WINFLAGS) \
+ -version-info 0:0:0
+
+libgnunettransportcore_la_SOURCES = \
+ transport_api2_core.c
+libgnunettransportcore_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+libgnunettransportcore_la_LDFLAGS = \
+ $(GN_LIB_LDFLAGS) $(WINFLAGS) \
+ -version-info 0:0:0
+
+libgnunettransportcommunicator_la_SOURCES = \
+ transport_api2_communication.c
+libgnunettransportcommunicator_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+libgnunettransportcommunicator_la_LDFLAGS = \
+ $(GN_LIB_LDFLAGS) $(WINFLAGS) \
+ -version-info 0:0:0
+
+
+libgnunettransportmonitor_la_SOURCES = \
+ transport_api2_monitor.c
+libgnunettransportmonitor_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+libgnunettransportmonitor_la_LDFLAGS = \
+ $(GN_LIB_LDFLAGS) $(WINFLAGS) \
+ -version-info 0:0:0
+
+
libexec_PROGRAMS = \
$(WLAN_BIN) \
$(WLAN_BIN_DUMMY) \
$(BT_BIN) \
- gnunet-service-transport
+ gnunet-service-transport \
+ gnunet-communicator-unix
+
+
bin_PROGRAMS = \
gnunet-transport \
gnunet_transport_certificate_creation_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la
+gnunet_communicator_unix_SOURCES = \
+ gnunet-communicator-unix.c
+gnunet_communicator_unix_LDADD = \
+ libgnunettransportcommunicator.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+gnunet_communicator_tcp_SOURCES = \
+ gnunet-communicator-tcp.c
+gnunet_communicator_tcp_LDADD = \
+ libgnunettransportcommunicator.la \
+ $(top_builddir)/src/nat/libgnunetnatnew.la \
+ $(top_builddir)/src/nt/libgnunetnt.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LIBGCRYPT_LIBS)
+
+gnunet_communicator_udp_SOURCES = \
+ gnunet-communicator-udp.c
+gnunet_communicator_udp_LDADD = \
+ libgnunettransportapplication.la \
+ libgnunettransportcommunicator.la \
+ $(top_builddir)/src/nat/libgnunetnatnew.la \
+ $(top_builddir)/src/nt/libgnunetnt.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LIBGCRYPT_LIBS)
+
+
gnunet_helper_transport_wlan_SOURCES = \
gnunet-helper-transport-wlan.c
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 \
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)
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 \
libgnunettransport.la \
$(top_builddir)/src/ats/libgnunetats.la \
$(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/nt/libgnunetnt.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) \
$(CFLAGS)
# -DANALYZE
+
+gnunet_service_tng_SOURCES = \
+ gnunet-service-tng.c
+gnunet_service_tng_LDADD = \
+ $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LIBGCRYPT_LIBS) \
+ $(GN_LIBINTL)
+
plugin_LTLIBRARIES = \
libgnunet_plugin_transport_tcp.la \
libgnunet_plugin_transport_udp.la \
$(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 = \
$(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 = \
$(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)
$(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) \
$(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)
$(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) \
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_api_disconnect_tcp \
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 \
$(HTTP_QUOTA_TEST) \
$(HTTPS_QUOTA_TEST) \
$(WLAN_QUOTA_TEST) \
- $(BT_QUOTA_TEST)
+ $(BT_QUOTA_TEST) \
+ test_communicator_unix
if HAVE_GETOPT_BINARY
check_PROGRAMS += \
test_transport_api_slow_ats
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_plugin_tcp \
$(HTTPS_API_TIMEOUT_TEST) \
$(WLAN_TIMEOUT_TEST) \
$(BT_TIMEOUT_TEST) \
- test_transport_address_switch_tcp \
- test_transport_address_switch_udp \
- $(HTTP_SWITCH) \
- $(HTTPS_SWITCH)
+ test_communicator_unix
if HAVE_GETOPT_BINARY
TESTS += \
test_transport_api_slow_ats
$(top_builddir)/src/util/libgnunetutil.la \
libgnunettransporttesting.la
+test_communicator_unix_SOURCES = \
+ test_communicator_unix.c
+test_communicator_unix_LDADD = \
+ libgnunettransporttesting2.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
test_plugin_unix_SOURCES = \
test_plugin_transport.c
test_plugin_unix_LDADD = \
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 \
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 \
libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/ats/libgnunetats.la \
+ $(top_builddir)/src/nt/libgnunetnt.la \
$(top_builddir)/src/util/libgnunetutil.la \
libgnunettransporttesting.la
libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/ats/libgnunetats.la \
+ $(top_builddir)/src/nt/libgnunetnt.la \
$(top_builddir)/src/util/libgnunetutil.la \
libgnunettransporttesting.la
libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/ats/libgnunetats.la \
+ $(top_builddir)/src/nt/libgnunetnt.la \
$(top_builddir)/src/util/libgnunetutil.la \
libgnunettransporttesting.la
libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/ats/libgnunetats.la \
+ $(top_builddir)/src/nt/libgnunetnt.la \
$(top_builddir)/src/util/libgnunetutil.la \
libgnunettransporttesting.la
libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/ats/libgnunetats.la \
+ $(top_builddir)/src/nt/libgnunetnt.la \
$(top_builddir)/src/util/libgnunetutil.la \
libgnunettransporttesting.la
test_quota_compliance_tcp_asymmetric_LDADD = \
libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/nt/libgnunetnt.la \
$(top_builddir)/src/ats/libgnunetats.la \
$(top_builddir)/src/util/libgnunetutil.la \
libgnunettransporttesting.la
libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/ats/libgnunetats.la \
+ $(top_builddir)/src/nt/libgnunetnt.la \
$(top_builddir)/src/util/libgnunetutil.la \
libgnunettransporttesting.la
libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/ats/libgnunetats.la \
+ $(top_builddir)/src/nt/libgnunetnt.la \
$(top_builddir)/src/util/libgnunetutil.la \
libgnunettransporttesting.la
libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/ats/libgnunetats.la \
+ $(top_builddir)/src/nt/libgnunetnt.la \
$(top_builddir)/src/util/libgnunetutil.la \
libgnunettransporttesting.la
libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/ats/libgnunetats.la \
+ $(top_builddir)/src/nt/libgnunetnt.la \
$(top_builddir)/src/util/libgnunetutil.la \
libgnunettransporttesting.la
libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/ats/libgnunetats.la \
+ $(top_builddir)/src/nt/libgnunetnt.la \
$(top_builddir)/src/util/libgnunetutil.la \
libgnunettransporttesting.la
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 \
+ $(top_builddir)/src/nt/libgnunetnt.la \
$(top_builddir)/src/util/libgnunetutil.la \
libgnunettransporttesting.la
libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/ats/libgnunetats.la \
+ $(top_builddir)/src/nt/libgnunetnt.la \
$(top_builddir)/src/util/libgnunetutil.la \
libgnunettransporttesting.la
EXTRA_DIST = \
+communicator-unix.conf \
test_plugin_hostkey \
test_plugin_hostkey.ecc \
test_delay \
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\
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