-INCLUDES = -I$(top_srcdir)/src/include
+INCLUDES = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
plugindir = $(libdir)/gnunet
test_quota_compliance_https_asymmetric_recv_constant
endif
+if HAVE_LIBGLPK
+ TRANSPORT_ATS_SRC = gnunet-service-transport_ats.c
+ TEST_TRANSPORT_ATS = \
+ test_transport_ats \
+ test_transport_ats_multiple_peers
+ GN_GLPK = -lglpk
+if HAVE_BENCHMARKS
+ ATS_TRANSPORT_BENCHMARKS = \
+ perf_transport_ats
+endif
+endif
+
if USE_COVERAGE
AM_CFLAGS = --coverage -O0
endif
test_quota_compliance_unix_asymmetric_recv_constant
endif
-#noinst_PROGRAMS = ${check_PROGRAMS}
+noinst_PROGRAMS = $(WLAN_BIN_DUMMY)
+
lib_LTLIBRARIES = \
libgnunettransport.la \
- libgnunettransportnew.la
-
-libgnunettransportnew_la_SOURCES = \
- transport_api_new.c transport.h \
- transport_api_blacklist.c \
- transport_api_address_lookup.c
-libgnunettransportnew_la_LIBADD = \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(GN_LIBINTL)
-libgnunettransportnew_la_LDFLAGS = \
- $(GN_LIB_LDFLAGS) $(WINFLAGS) \
- -version-info 0:0:0
+ libgnunettransporttesting.la
+
+libgnunettransporttesting_la_SOURCES = \
+ transport-testing.c
libgnunettransport_la_SOURCES = \
transport_api.c transport.h \
transport_api_blacklist.c \
- transport_api_address_lookup.c
+ transport_api_address_lookup.c \
+ transport_api_peer_address_lookup.c \
+ transport_api_address_iterate.c
libgnunettransport_la_LIBADD = \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
-version-info 0:0:0
-
bin_PROGRAMS = \
gnunet-transport \
$(WLAN_BIN) \
gnunet-service-transport \
- $(WLAN_BIN_DUMMY)
-
-bin_SCRIPTS = \
+ gnunet-service-transport-new \
+ gnunet-transport-list-connections \
gnunet-transport-certificate-creation
+#bin_SCRIPTS = \
+# gnunet-transport-certificate-creation
+
+gnunet_transport_certificate_creation_SOURCES = \
+ gnunet-transport-certificate-creation.c
+gnunet_transport_certificate_creation_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la
gnunet_transport_wlan_helper_SOURCES = \
wlan/byteorder.h \
gnunet_transport_wlan_helper_dummy_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la
+gnunet_transport_list_connections_SOURCES = \
+ gnunet-transport-list-connections.c
+gnunet_transport_list_connections_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+gnunet_transport_list_connections_DEPENDENCIES = \
+ libgnunettransport.la
+
gnunet_transport_SOURCES = \
gnunet-transport.c
gnunet_transport_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
gnunet_transport_DEPENDENCIES = \
- libgnunettransportnew.la
-
-if HAVE_LIBGLPK
- GN_GLPK = -lglpk
-endif
+ libgnunettransport.la
gnunet_service_transport_SOURCES = \
- gnunet-service-transport.c transport_ats.c
+ gnunet-service-transport.c $(TRANSPORT_ATS_SRC)
gnunet_service_transport_LDADD = \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
$(GN_GLPK) \
$(GN_LIBINTL)
+gnunet_service_transport_new_SOURCES = \
+ gnunet-service-transport-new.c gnunet-service-transport.h \
+ gnunet-service-transport_ats-new.h gnunet-service-transport_ats-new.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 \
+ gnunet-service-transport_validation.h gnunet-service-transport_validation.c
+gnunet_service_transport_new_LDADD = \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(GN_GLPK) \
+ $(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/fragmentation/libgnunetfragmentation.la \
$(top_builddir)/src/util/libgnunetutil.la
libgnunet_plugin_transport_wlan_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
plugin_transport_udp.c
libgnunet_plugin_transport_udp_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/libgnunetnat.la \
libgnunet_plugin_transport_https_la_CPPFLAGS = \
@LIBCURL_CPPFLAGS@
-if HAVE_BENCHMARKS
- TRANSPORT_BENCHMARKS = \
- perf_transport_ats
-endif
check_PROGRAMS = \
- test_transport_ats \
- test_transport_ats_multiple_peers \
- $(TRANSPORT_BENCHMARKS) \
+ test_transport_testing \
+ test_transport_api_disconnect \
+ $(TEST_TRANSPORT_ATS) \
+ $(ATS_TRANSPORT_BENCHMARKS) \
test_transport_api_tcp \
test_transport_api_tcp_nat \
test_transport_api_udp \
if ENABLE_TEST_RUN
TESTS = \
- test_transport_ats \
- test_transport_ats_multiple_peers \
- perf_transport_ats \
+ test_transport_testing \
+ test_transport_api_disconnect \
+ $(TEST_TRANSPORT_ATS) \
+ $(ATS_TRANSPORT_BENCHMARKS) \
test_transport_api_tcp \
test_transport_api_tcp_nat \
test_transport_api_udp \
$(WLAN_UREL_TEST)
endif
+test_transport_testing_SOURCES = \
+ test_transport_testing.c
+test_transport_testing_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la
+
+test_transport_api_disconnect_SOURCES = \
+ test_transport_api_disconnect.c
+test_transport_api_disconnect_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+
test_transport_ats_SOURCES = \
- test_transport_ats.c transport_ats.c
+ test_transport_ats.c $(TRANSPORT_ATS_SRC)
test_transport_ats_LDADD = -lm \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ -lglpk \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(GN_GLPK)
+ $(top_builddir)/src/util/libgnunetutil.la
test_transport_ats_multiple_peers_SOURCES = \
- test_transport_ats_multiple_peers.c
+ test_transport_ats_multiple_peers.c $(TRANSPORT_ATS_SRC)
test_transport_ats_multiple_peers_LDADD = -lm \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ -lglpk \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/testing/libgnunettesting.la \
$(top_builddir)/src/util/libgnunetutil.la
perf_transport_ats_SOURCES = \
perf_transport_ats.c
perf_transport_ats_LDADD = \
- $(GN_GLPK) \
+ -lglpk \
$(top_builddir)/src/util/libgnunetutil.la
test_transport_api_tcp_SOURCES = \
test_transport_api.c
test_transport_api_tcp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la
test_transport_api_tcp_nat_SOURCES = \
test_transport_api.c
test_transport_api_tcp_nat_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la
test_transport_api_reliability_tcp_SOURCES = \
test_transport_api_reliability.c
test_transport_api_reliability_tcp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la
test_transport_api_multiaddress_tcp_SOURCES = \
test_transport_api_multiaddress.c
test_transport_api_multiaddress_tcp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la
test_transport_api_reliability_tcp_nat_SOURCES = \
test_transport_api_reliability.c
test_transport_api_reliability_tcp_nat_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la
test_transport_api_reliability_wlan_SOURCES = \
test_transport_api_reliability.c
test_transport_api_reliability_wlan_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la
test_transport_api_unreliability_wlan_SOURCES = \
test_transport_api_unreliability.c
test_transport_api_unreliability_wlan_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la
test_transport_api_udp_SOURCES = \
test_transport_api.c
test_transport_api_udp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la
test_transport_api_udp_nat_SOURCES = \
test_transport_api.c
test_transport_api_udp_nat_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la
test_transport_api_unix_SOURCES = \
test_transport_api.c
test_transport_api_unix_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la
test_transport_api_http_SOURCES = \
test_transport_api.c
test_transport_api_http_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la
test_transport_api_reliability_http_SOURCES = \
test_transport_api_reliability.c
test_transport_api_reliability_http_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la
test_transport_api_https_SOURCES = \
test_transport_api.c
test_transport_api_https_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la
test_transport_api_reliability_https_SOURCES = \
test_transport_api_reliability.c
test_transport_api_reliability_https_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la
test_transport_api_unreliability_unix_SOURCES = \
test_transport_api_unreliability.c
test_transport_api_unreliability_unix_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la
test_transport_api_unreliability_udp_SOURCES = \
test_transport_api_unreliability.c
test_transport_api_unreliability_udp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la
test_transport_api_wlan_SOURCES = \
test_transport_api.c
test_transport_api_wlan_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la
endif
test_quota_compliance_tcp_SOURCES = \
test_quota_compliance.c
test_quota_compliance_tcp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la
test_quota_compliance_tcp_asymmetric_recv_constant_SOURCES = \
test_quota_compliance.c
test_quota_compliance_tcp_asymmetric_recv_constant_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la
#test_quota_compliance_tcp_asymmetric_send_constant_SOURCES = \
# test_quota_compliance.c
#test_quota_compliance_tcp_asymmetric_send_constant_LDADD = \
-# $(top_builddir)/src/transport/libgnunettransportnew.la \
+# $(top_builddir)/src/transport/libgnunettransport.la \
# $(top_builddir)/src/util/libgnunetutil.la
test_quota_compliance_http_SOURCES = \
test_quota_compliance.c
test_quota_compliance_http_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la
test_quota_compliance_http_asymmetric_recv_constant_SOURCES = \
test_quota_compliance.c
test_quota_compliance_http_asymmetric_recv_constant_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la
#test_quota_compliance_http_asymmetric_send_constant_SOURCES = \
# test_quota_compliance.c
#test_quota_compliance_http_asymmetric_send_constant_LDADD = \
-# $(top_builddir)/src/transport/libgnunettransportnew.la \
+# $(top_builddir)/src/transport/libgnunettransport.la \
# $(top_builddir)/src/util/libgnunetutil.la
test_quota_compliance_https_SOURCES = \
test_quota_compliance.c
test_quota_compliance_https_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la
test_quota_compliance_https_asymmetric_recv_constant_SOURCES = \
test_quota_compliance.c
test_quota_compliance_https_asymmetric_recv_constant_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la
#test_quota_compliance_https_asymmetric_send_constant_SOURCES = \
# test_quota_compliance.c
#test_quota_compliance_https_asymmetric_send_constant_LDADD = \
-# $(top_builddir)/src/transport/libgnunettransportnew.la \
+# $(top_builddir)/src/transport/libgnunettransport.la \
# $(top_builddir)/src/util/libgnunetutil.la
test_quota_compliance_udp_SOURCES = \
test_quota_compliance.c
test_quota_compliance_udp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la
test_quota_compliance_udp_asymmetric_recv_constant_SOURCES = \
test_quota_compliance.c
test_quota_compliance_udp_asymmetric_recv_constant_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la
#test_quota_compliance_udp_asymmetric_send_constant_SOURCES = \
# test_quota_compliance.c
#test_quota_compliance_udp_asymmetric_send_constant_LDADD = \
-# $(top_builddir)/src/transport/libgnunettransportnew.la \
+# $(top_builddir)/src/transport/libgnunettransport.la \
# $(top_builddir)/src/util/libgnunetutil.la
test_quota_compliance_unix_SOURCES = \
test_quota_compliance.c
test_quota_compliance_unix_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la
test_quota_compliance_unix_asymmetric_recv_constant_SOURCES = \
test_quota_compliance.c
test_quota_compliance_unix_asymmetric_recv_constant_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la
test_transport_api_multi_SOURCES = \
test_transport_api.c
test_transport_api_multi_LDADD = \
- $(top_builddir)/src/transport/libgnunettransportnew.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la
EXTRA_DIST = \
gnunet-transport-certificate-creation \
ats_mlp_p100_m400.problem \
+ test_transport_defaults.conf \
test_transport_api_data.conf \
test_transport_api_tcp_peer1.conf \
test_transport_api_tcp_peer2.conf \