diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/transport/Makefile.am | 26 | ||||
-rw-r--r-- | src/transport/test_transport_api_timeout_udp_peer1.conf | 34 | ||||
-rw-r--r-- | src/transport/test_transport_api_timeout_udp_peer2.conf | 32 |
3 files changed, 81 insertions, 11 deletions
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 5aaf217e6..80c1055f5 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -260,8 +260,9 @@ check_PROGRAMS = \ | |||
260 | test_transport_api_limited_sockets_tcp \ | 260 | test_transport_api_limited_sockets_tcp \ |
261 | test_transport_api_tcp_nat \ | 261 | test_transport_api_tcp_nat \ |
262 | test_transport_api_udp \ | 262 | test_transport_api_udp \ |
263 | test_transport_api_timeout_udp \ | ||
263 | $(UNIX_PLUGIN_TEST) \ | 264 | $(UNIX_PLUGIN_TEST) \ |
264 | test_transport_api_timeout_unix \ | 265 | $(UNIX_PLUGIN_TIMEOUT_TEST) \ |
265 | test_transport_api_udp_nat \ | 266 | test_transport_api_udp_nat \ |
266 | $(HTTP_API_TEST) \ | 267 | $(HTTP_API_TEST) \ |
267 | $(HTTP_NAT_API_TEST) \ | 268 | $(HTTP_NAT_API_TEST) \ |
@@ -303,8 +304,9 @@ TESTS = \ | |||
303 | test_transport_api_limited_sockets_tcp \ | 304 | test_transport_api_limited_sockets_tcp \ |
304 | test_transport_api_tcp_nat \ | 305 | test_transport_api_tcp_nat \ |
305 | test_transport_api_udp \ | 306 | test_transport_api_udp \ |
307 | test_transport_api_timeout_udp \ | ||
306 | $(UNIX_PLUGIN_TEST) \ | 308 | $(UNIX_PLUGIN_TEST) \ |
307 | test_transport_api_timeout_unix \ | 309 | $(UNIX_PLUGIN_TIMEOUT_TEST) \ |
308 | test_transport_api_udp_nat \ | 310 | test_transport_api_udp_nat \ |
309 | $(HTTP_API_TEST) \ | 311 | $(HTTP_API_TEST) \ |
310 | $(HTTP_NAT_API_TEST) \ | 312 | $(HTTP_NAT_API_TEST) \ |
@@ -496,7 +498,15 @@ test_transport_api_udp_LDADD = \ | |||
496 | $(top_builddir)/src/transport/libgnunettransport.la \ | 498 | $(top_builddir)/src/transport/libgnunettransport.la \ |
497 | $(top_builddir)/src/hello/libgnunethello.la \ | 499 | $(top_builddir)/src/hello/libgnunethello.la \ |
498 | $(top_builddir)/src/util/libgnunetutil.la \ | 500 | $(top_builddir)/src/util/libgnunetutil.la \ |
499 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 501 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
502 | |||
503 | test_transport_api_timeout_udp_SOURCES = \ | ||
504 | test_transport_api_timeout.c | ||
505 | test_transport_api_timeout_udp_LDADD = \ | ||
506 | $(top_builddir)/src/transport/libgnunettransport.la \ | ||
507 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
508 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
509 | $(top_builddir)/src/transport/libgnunettransporttesting.la | ||
500 | 510 | ||
501 | test_transport_api_udp_nat_SOURCES = \ | 511 | test_transport_api_udp_nat_SOURCES = \ |
502 | test_transport_api.c | 512 | test_transport_api.c |
@@ -514,14 +524,6 @@ test_transport_api_unix_LDADD = \ | |||
514 | $(top_builddir)/src/util/libgnunetutil.la \ | 524 | $(top_builddir)/src/util/libgnunetutil.la \ |
515 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 525 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
516 | 526 | ||
517 | #test_plugin_transport_http_SOURCES = \ | ||
518 | # test_plugin_transport_http.c | ||
519 | #test_plugin_transport_http_LDADD = \ | ||
520 | # $(top_builddir)/src/statistics/libgnunetstatistics.la \ | ||
521 | # @LIBCURL@ \ | ||
522 | # $(top_builddir)/src/hello/libgnunethello.la \ | ||
523 | # $(top_builddir)/src/util/libgnunetutil.la | ||
524 | |||
525 | test_transport_api_http_SOURCES = \ | 527 | test_transport_api_http_SOURCES = \ |
526 | test_transport_api.c | 528 | test_transport_api.c |
527 | test_transport_api_http_LDADD = \ | 529 | test_transport_api_http_LDADD = \ |
@@ -775,6 +777,8 @@ test_transport_api_udp_nat_peer1.conf\ | |||
775 | test_transport_api_udp_nat_peer2.conf\ | 777 | test_transport_api_udp_nat_peer2.conf\ |
776 | test_transport_api_udp_peer1.conf\ | 778 | test_transport_api_udp_peer1.conf\ |
777 | test_transport_api_udp_peer2.conf\ | 779 | test_transport_api_udp_peer2.conf\ |
780 | test_transport_api_timeout_udp_peer1.conf\ | ||
781 | test_transport_api_timeout_udp_peer2.conf\ | ||
778 | test_transport_api_unix_peer1.conf\ | 782 | test_transport_api_unix_peer1.conf\ |
779 | test_transport_api_unix_peer2.conf\ | 783 | test_transport_api_unix_peer2.conf\ |
780 | test_transport_api_timeout_unix_peer1.conf\ | 784 | 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 index 000000000..a1216e4aa --- /dev/null +++ b/src/transport/test_transport_api_timeout_udp_peer1.conf | |||
@@ -0,0 +1,34 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | ||
2 | [PATHS] | ||
3 | SERVICEHOME = /tmp/test-transport/api-udp-p1/ | ||
4 | DEFAULTCONFIG = test_transport_api_udp_peer1.conf | ||
5 | |||
6 | [transport-udp] | ||
7 | PORT = 12040 | ||
8 | BROADCAST = NO | ||
9 | BROADCAST_INTERVAL = 30000 | ||
10 | MAX_BPS = 50000000 | ||
11 | |||
12 | [arm] | ||
13 | PORT = 12045 | ||
14 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock | ||
15 | |||
16 | [statistics] | ||
17 | PORT = 12044 | ||
18 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock | ||
19 | |||
20 | [resolver] | ||
21 | PORT = 12043 | ||
22 | UNIXPATH = /tmp/gnunet-p1-service-resolver.sock | ||
23 | |||
24 | [peerinfo] | ||
25 | PORT = 12042 | ||
26 | UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock | ||
27 | |||
28 | [transport] | ||
29 | #PREFIX = valgrind --leak-check=full | ||
30 | PORT = 12041 | ||
31 | PLUGINS = udp | ||
32 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock | ||
33 | |||
34 | |||
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 index 000000000..3e487a6bf --- /dev/null +++ b/src/transport/test_transport_api_timeout_udp_peer2.conf | |||
@@ -0,0 +1,32 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | ||
2 | [PATHS] | ||
3 | SERVICEHOME = /tmp/test-transport/api-udp-p2/ | ||
4 | DEFAULTCONFIG = test_transport_api_udp_peer2.conf | ||
5 | |||
6 | [transport-udp] | ||
7 | PORT = 12050 | ||
8 | BROADCAST = NO | ||
9 | MAX_BPS = 50000000 | ||
10 | |||
11 | [arm] | ||
12 | PORT = 12055 | ||
13 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock | ||
14 | |||
15 | [statistics] | ||
16 | PORT = 12054 | ||
17 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock | ||
18 | |||
19 | [resolver] | ||
20 | PORT = 12053 | ||
21 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock | ||
22 | |||
23 | [peerinfo] | ||
24 | PORT = 12052 | ||
25 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock | ||
26 | |||
27 | [transport] | ||
28 | PORT = 12051 | ||
29 | PLUGINS = udp | ||
30 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock | ||
31 | |||
32 | |||