- tests

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 5aaf217e6a7e4dc29670c568fc7523638d8df718..80c1055f50934063405c9b53d081783191c07ad8 100644 (file)
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -260,8 +260,9 @@ check_PROGRAMS = \
  test_transport_api_limited_sockets_tcp \
  test_transport_api_tcp_nat \
  test_transport_api_udp \
+ test_transport_api_timeout_udp \
  $(UNIX_PLUGIN_TEST) \
- test_transport_api_timeout_unix \
+ $(UNIX_PLUGIN_TIMEOUT_TEST) \
  test_transport_api_udp_nat \
  $(HTTP_API_TEST) \
  $(HTTP_NAT_API_TEST) \
@@ -303,8 +304,9 @@ TESTS = \
  test_transport_api_limited_sockets_tcp \
  test_transport_api_tcp_nat \
  test_transport_api_udp \
+ test_transport_api_timeout_udp \
  $(UNIX_PLUGIN_TEST) \
- test_transport_api_timeout_unix \
+ $(UNIX_PLUGIN_TIMEOUT_TEST) \
  test_transport_api_udp_nat \
  $(HTTP_API_TEST) \
  $(HTTP_NAT_API_TEST) \
@@ -496,7 +498,15 @@ test_transport_api_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 
+ $(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
@@ -514,14 +524,6 @@ test_transport_api_unix_LDADD = \
  $(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 = \
@@ -775,6 +777,8 @@ test_transport_api_udp_nat_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\

diff --git a/src/transport/test_transport_api_timeout_udp_peer1.conf b/src/transport/test_transport_api_timeout_udp_peer1.conf
new file mode 100644 (file)
index 0000000..a1216e4
--- /dev/null
+++ b/src/transport/test_transport_api_timeout_udp_peer1.conf
@@ -0,0 +1,34 @@
+@INLINE@ template_cfg_peer1.conf
+[PATHS]
+SERVICEHOME = /tmp/test-transport/api-udp-p1/
+DEFAULTCONFIG = test_transport_api_udp_peer1.conf
+
+[transport-udp]
+PORT = 12040
+BROADCAST = NO
+BROADCAST_INTERVAL = 30000
+MAX_BPS = 50000000
+
+[arm]
+PORT = 12045
+UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+
+[statistics]
+PORT = 12044
+UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+
+[resolver]
+PORT = 12043
+UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+
+[peerinfo]
+PORT = 12042
+UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+
+[transport]
+#PREFIX = valgrind --leak-check=full
+PORT = 12041
+PLUGINS = udp
+UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+
+

diff --git a/src/transport/test_transport_api_timeout_udp_peer2.conf b/src/transport/test_transport_api_timeout_udp_peer2.conf
new file mode 100644 (file)
index 0000000..3e487a6
--- /dev/null
+++ b/src/transport/test_transport_api_timeout_udp_peer2.conf
@@ -0,0 +1,32 @@
+@INLINE@ template_cfg_peer2.conf
+[PATHS]
+SERVICEHOME = /tmp/test-transport/api-udp-p2/
+DEFAULTCONFIG = test_transport_api_udp_peer2.conf
+
+[transport-udp]
+PORT = 12050
+BROADCAST = NO
+MAX_BPS = 50000000
+
+[arm]
+PORT = 12055
+UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+
+[statistics]
+PORT = 12054
+UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+
+[resolver]
+PORT = 12053
+UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+
+[peerinfo]
+PORT = 12052
+UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+
+[transport]
+PORT = 12051
+PLUGINS = udp
+UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+
+