pkgcfgdir= $(pkgdatadir)/config.d/
-dist_pkgcfg_DATA = \
+pkgcfg_DATA = \
transport.conf
endif
if LINUX
- WLAN_BIN = gnunet-transport-wlan-helper
- WLAN_BIN_DUMMY = gnunet-transport-wlan-helper-dummy
- WLAN_BIN_SENDER = gnunet_wlan_sender
+ WLAN_BIN = gnunet-helper-transport-wlan
+ WLAN_BIN_DUMMY = gnunet-helper-transport-wlan-dummy
+ WLAN_BIN_SENDER = gnunet-transport-wlan-sender
WLAN_PLUGIN_LA = libgnunet_plugin_transport_wlan.la
WLAN_API_TEST = test_transport_api_wlan
WLAN_REL_TEST = test_transport_api_reliability_wlan
if LINUX
install-exec-hook:
- $(SUDO_BINARY) chown root:root $(bindir)/gnunet-transport-wlan-helper || true
- $(SUDO_BINARY) chmod u+s $(bindir)/gnunet-transport-wlan-helper || true
+ $(SUDO_BINARY) chown root:root $(bindir)/gnunet-helper-transport-wlan || true
+ $(SUDO_BINARY) chmod u+s $(bindir)/gnunet-helper-transport-wlan || true
else
install-exec-hook:
endif
if !MINGW
UNIX_PLUGIN_LA = libgnunet_plugin_transport_unix.la
UNIX_PLUGIN_TEST = test_transport_api_unix
+UNIX_PLUGIN_TIMEOUT_TEST = test_transport_api_timeout_unix
UNIX_REL_TEST = test_transport_api_unreliability_unix
UNIX_QUOTA_TEST = test_quota_compliance_unix \
test_quota_compliance_unix_asymmetric
libgnunettransport_la_SOURCES = \
transport_api.c transport.h \
transport_api_blacklist.c \
- transport_api_address_lookup.c \
- transport_api_peer_address_lookup.c \
- transport_api_address_iterate.c
+ transport_api_address_to_string.c \
+ transport_api_address_lookup.c
libgnunettransport_la_LIBADD = \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la \
gnunet_transport_certificate_creation_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la
-gnunet_transport_wlan_helper_SOURCES = \
- wlan/byteorder.h \
- wlan/crctable_osdep.h \
- wlan/helper_common.c wlan/helper_common.h \
- wlan/ieee80211.h \
- wlan/ieee80211_radiotap.h \
- wlan/loopback_helper.h \
- wlan/radiotap-parser.c wlan/radiotap-parser.h \
- gnunet-transport-wlan-helper.c gnunet-transport-wlan-helper.h
-gnunet_transport_wlan_helper_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+gnunet_helper_transport_wlan_SOURCES = \
+ gnunet-helper-transport-wlan.c
-gnunet_transport_wlan_helper_dummy_SOURCES = \
- wlan/radiotap-parser.c \
- wlan/helper_common.c \
- test_plugin_transport_wlan_dummy.c
-gnunet_transport_wlan_helper_dummy_LDADD = \
+gnunet_helper_transport_wlan_dummy_SOURCES = \
+ gnunet-helper-transport-wlan-dummy.c
+gnunet_helper_transport_wlan_dummy_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la
-gnunet_wlan_sender_SOURCES = \
- gnunet_wlan_sender.c
-gnunet_wlan_sender_LDADD = \
+gnunet_transport_wlan_sender_SOURCES = \
+ gnunet-transport-wlan-sender.c
+gnunet_transport_wlan_sender_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la
gnunet_transport_SOURCES = \
gnunet_transport_LDADD = \
$(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/nat/libgnunetnat.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
gnunet_transport_DEPENDENCIES = \
$(GN_PLUGIN_LDFLAGS)
libgnunet_plugin_transport_udp_la_SOURCES = \
- plugin_transport_udp.c
+ plugin_transport_udp.c plugin_transport_udp.h \
+ plugin_transport_udp_broadcasting.c
libgnunet_plugin_transport_udp_la_LIBADD = \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/fragmentation/libgnunetfragmentation.la \
$(GN_PLUGIN_LDFLAGS)
libgnunet_plugin_transport_http_la_SOURCES = \
- plugin_transport_http.c plugin_transport_http_client.c plugin_transport_http_server.c
+ plugin_transport_http.c plugin_transport_http.h \
+ plugin_transport_http_client.c plugin_transport_http_server.c
libgnunet_plugin_transport_http_la_LIBADD = \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
@LIBCURL_CPPFLAGS@
libgnunet_plugin_transport_https_la_SOURCES = \
- plugin_transport_http.c plugin_transport_http_client.c plugin_transport_http_server.c
+ plugin_transport_http.c plugin_transport_http.h \
+ plugin_transport_http_client.c plugin_transport_http_server.c
libgnunet_plugin_transport_https_la_LIBADD = \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
check_PROGRAMS = \
test_transport_testing \
test_transport_startonly \
+ test_transport_api_blacklisting \
test_transport_api_disconnect_tcp \
test_transport_api_bidirectional_connect \
test_transport_api_tcp \
test_transport_api_limited_sockets_tcp \
test_transport_api_tcp_nat \
test_transport_api_udp \
+ test_transport_api_timeout_udp \
$(UNIX_PLUGIN_TEST) \
+ $(UNIX_PLUGIN_TIMEOUT_TEST) \
test_transport_api_udp_nat \
$(HTTP_API_TEST) \
$(HTTP_NAT_API_TEST) \
TESTS = \
test_transport_testing \
test_transport_startonly \
+ test_transport_api_blacklisting \
test_transport_api_disconnect_tcp \
test_transport_api_bidirectional_connect \
test_transport_api_tcp \
test_transport_api_limited_sockets_tcp \
test_transport_api_tcp_nat \
test_transport_api_udp \
+ test_transport_api_timeout_udp \
$(UNIX_PLUGIN_TEST) \
+ $(UNIX_PLUGIN_TIMEOUT_TEST) \
test_transport_api_udp_nat \
$(HTTP_API_TEST) \
$(HTTP_NAT_API_TEST) \
# $(top_builddir)/src/util/libgnunetutil.la \
# $(top_builddir)/src/transport/libgnunettransporttesting.la
+test_transport_api_blacklisting_SOURCES = \
+ test_transport_api_blacklisting.c
+test_transport_api_blacklisting_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la
+
test_transport_api_disconnect_tcp_SOURCES = \
test_transport_api_disconnect.c
test_transport_api_disconnect_tcp_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/transport/libgnunettransporttesting.la
+test_transport_api_timeout_unix_SOURCES = \
+ test_transport_api_timeout.c
+test_transport_api_timeout_unix_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la
+
test_transport_api_timeout_http_SOURCES = \
test_transport_api_timeout.c
test_transport_api_timeout_http_LDADD = \
$(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ $(top_builddir)/src/transport/libgnunettransporttesting.la
+
+test_transport_api_timeout_udp_SOURCES = \
+ test_transport_api_timeout.c
+test_transport_api_timeout_udp_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la
test_transport_api_udp_nat_SOURCES = \
test_transport_api.c
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/transport/libgnunettransporttesting.la
-#test_plugin_transport_http_SOURCES = \
-# test_plugin_transport_http.c
-#test_plugin_transport_http_LDADD = \
-# $(top_builddir)/src/statistics/libgnunetstatistics.la \
-# @LIBCURL@ \
-# $(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 = \
test_transport_api_reliability_tcp_peer2.conf\
test_transport_api_reliability_wlan_peer1.conf\
test_transport_api_reliability_wlan_peer2.conf\
+test_transport_api_bidirectional_connect_peer1.conf\
+test_transport_api_bidirectional_connect_peer2.conf\
test_transport_api_tcp_nat_peer1.conf\
test_transport_api_tcp_nat_peer2.conf\
test_transport_api_tcp_peer1.conf\
test_transport_api_udp_nat_peer2.conf\
test_transport_api_udp_peer1.conf\
test_transport_api_udp_peer2.conf\
+test_transport_api_timeout_udp_peer1.conf\
+test_transport_api_timeout_udp_peer2.conf\
test_transport_api_unix_peer1.conf\
test_transport_api_unix_peer2.conf\
+test_transport_api_timeout_unix_peer1.conf\
+test_transport_api_timeout_unix_peer2.conf\
test_transport_api_unreliability_udp_peer1.conf\
test_transport_api_unreliability_udp_peer2.conf\
test_transport_api_unreliability_unix_peer1.conf\