aboutsummaryrefslogtreecommitdiff
path: root/src/transport
diff options
context:
space:
mode:
Diffstat (limited to 'src/transport')
-rw-r--r--src/transport/Makefile.am57
-rw-r--r--src/transport/test_transport_api_http_peer1.conf4
-rw-r--r--src/transport/test_transport_api_http_peer2.conf2
-rw-r--r--src/transport/test_transport_api_timeout.c (renamed from src/transport/test_transport_api_multiaddress.c)14
-rw-r--r--src/transport/test_transport_api_timeout_http_peer1.conf42
-rw-r--r--src/transport/test_transport_api_timeout_http_peer2.conf38
-rw-r--r--src/transport/test_transport_api_timeout_https_peer1.conf35
-rw-r--r--src/transport/test_transport_api_timeout_https_peer2.conf36
-rw-r--r--src/transport/test_transport_api_timeout_tcp_peer1.conf (renamed from src/transport/test_transport_api_multiaddress_tcp_peer1.conf)0
-rw-r--r--src/transport/test_transport_api_timeout_tcp_peer2.conf (renamed from src/transport/test_transport_api_multiaddress_tcp_peer2.conf)0
-rw-r--r--src/transport/test_transport_api_unreliability.c2
11 files changed, 191 insertions, 39 deletions
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index a421e089a..a76e74804 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -7,14 +7,14 @@ if HAVE_MHD
7if HAVE_EXPERIMENTAL 7if HAVE_EXPERIMENTAL
8 GN_LIBMHD = -lmicrohttpd 8 GN_LIBMHD = -lmicrohttpd
9 HTTP_PLUGIN_LA = libgnunet_plugin_transport_http.la 9 HTTP_PLUGIN_LA = libgnunet_plugin_transport_http.la
10# HTTP_PLUGIN_TEST = test_plugin_transport_http
11 HTTP_API_TEST = test_transport_api_http 10 HTTP_API_TEST = test_transport_api_http
11 HTTP_API_TIMEOUT_TEST = test_transport_api_timeout_http
12 HTTP_REL_TEST = test_transport_api_reliability_http 12 HTTP_REL_TEST = test_transport_api_reliability_http
13 HTTP_QUOTA_TEST = test_quota_compliance_http \ 13 HTTP_QUOTA_TEST = test_quota_compliance_http \
14 test_quota_compliance_http_asymmetric_recv_constant 14 test_quota_compliance_http_asymmetric_recv_constant
15 HTTPS_PLUGIN_LA = libgnunet_plugin_transport_https.la 15 HTTPS_PLUGIN_LA = libgnunet_plugin_transport_https.la
16# HTTPS_PLUGIN_TEST = test_plugin_transport_https
17 HTTPS_API_TEST = test_transport_api_https 16 HTTPS_API_TEST = test_transport_api_https
17 HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https
18 HTTPS_REL_TEST = test_transport_api_reliability_https 18 HTTPS_REL_TEST = test_transport_api_reliability_https
19 HTTPS_QUOTA_TEST = test_quota_compliance_https \ 19 HTTPS_QUOTA_TEST = test_quota_compliance_https \
20 test_quota_compliance_https_asymmetric_recv_constant 20 test_quota_compliance_https_asymmetric_recv_constant
@@ -253,17 +253,17 @@ check_PROGRAMS = \
253 test_transport_testing \ 253 test_transport_testing \
254 test_transport_startonly \ 254 test_transport_startonly \
255 test_transport_api_disconnect \ 255 test_transport_api_disconnect \
256 test_transport_api_multiaddress_tcp \
257 test_transport_api_tcp \ 256 test_transport_api_tcp \
257 test_transport_api_timeout_tcp \
258 test_transport_api_limited_sockets_tcp \ 258 test_transport_api_limited_sockets_tcp \
259 test_transport_api_tcp_nat \ 259 test_transport_api_tcp_nat \
260 test_transport_api_udp \ 260 test_transport_api_udp \
261 $(UNIX_PLUGIN_TEST) \ 261 $(UNIX_PLUGIN_TEST) \
262 test_transport_api_udp_nat \ 262 test_transport_api_udp_nat \
263 $(HTTP_PLUGIN_TEST) \
264 $(HTTP_API_TEST) \ 263 $(HTTP_API_TEST) \
265 $(HTTPS_PLUGIN_TEST) \ 264 $(HTTP_API_TIMEOUT_TEST) \
266 $(HTTPS_API_TEST) \ 265 $(HTTPS_API_TEST) \
266 $(HTTPS_API_TIMEOUT_TEST) \
267 test_transport_api_multi \ 267 test_transport_api_multi \
268 test_transport_api_reliability_tcp \ 268 test_transport_api_reliability_tcp \
269 test_transport_api_reliability_tcp_nat \ 269 test_transport_api_reliability_tcp_nat \
@@ -288,17 +288,17 @@ TESTS = \
288 test_transport_testing \ 288 test_transport_testing \
289 test_transport_startonly \ 289 test_transport_startonly \
290 test_transport_api_disconnect \ 290 test_transport_api_disconnect \
291 test_transport_api_multiaddress_tcp \
292 test_transport_api_tcp \ 291 test_transport_api_tcp \
292 test_transport_api_timeout_tcp \
293 test_transport_api_limited_sockets_tcp \ 293 test_transport_api_limited_sockets_tcp \
294 test_transport_api_tcp_nat \ 294 test_transport_api_tcp_nat \
295 test_transport_api_udp \ 295 test_transport_api_udp \
296 $(UNIX_PLUGIN_TEST) \ 296 $(UNIX_PLUGIN_TEST) \
297 test_transport_api_udp_nat \ 297 test_transport_api_udp_nat \
298 $(HTTP_PLUGIN_TEST) \
299 $(HTTP_API_TEST) \ 298 $(HTTP_API_TEST) \
300 $(HTTPS_PLUGIN_TEST) \ 299 $(HTTP_API_TIMEOUT_TEST) \
301 $(HTTPS_API_TEST) \ 300 $(HTTPS_API_TEST) \
301 $(HTTPS_API_TIMEOUT_TEST) \
302 test_transport_api_multi \ 302 test_transport_api_multi \
303 test_transport_api_reliability_tcp \ 303 test_transport_api_reliability_tcp \
304 test_transport_api_reliability_tcp_nat \ 304 test_transport_api_reliability_tcp_nat \
@@ -384,14 +384,30 @@ test_transport_api_reliability_tcp_LDADD = \
384 $(top_builddir)/src/util/libgnunetutil.la \ 384 $(top_builddir)/src/util/libgnunetutil.la \
385 $(top_builddir)/src/transport/libgnunettransporttesting.la 385 $(top_builddir)/src/transport/libgnunettransporttesting.la
386 386
387test_transport_api_multiaddress_tcp_SOURCES = \ 387test_transport_api_timeout_tcp_SOURCES = \
388 test_transport_api_multiaddress.c 388 test_transport_api_timeout.c
389test_transport_api_multiaddress_tcp_LDADD = \ 389test_transport_api_timeout_tcp_LDADD = \
390 $(top_builddir)/src/transport/libgnunettransport.la \ 390 $(top_builddir)/src/transport/libgnunettransport.la \
391 $(top_builddir)/src/hello/libgnunethello.la \ 391 $(top_builddir)/src/hello/libgnunethello.la \
392 $(top_builddir)/src/util/libgnunetutil.la \ 392 $(top_builddir)/src/util/libgnunetutil.la \
393 $(top_builddir)/src/transport/libgnunettransporttesting.la 393 $(top_builddir)/src/transport/libgnunettransporttesting.la
394 394
395test_transport_api_timeout_http_SOURCES = \
396 test_transport_api_timeout.c
397test_transport_api_timeout_http_LDADD = \
398 $(top_builddir)/src/transport/libgnunettransport.la \
399 $(top_builddir)/src/hello/libgnunethello.la \
400 $(top_builddir)/src/util/libgnunetutil.la \
401 $(top_builddir)/src/transport/libgnunettransporttesting.la
402
403test_transport_api_timeout_https_SOURCES = \
404 test_transport_api_timeout.c
405test_transport_api_timeout_https_LDADD = \
406 $(top_builddir)/src/transport/libgnunettransport.la \
407 $(top_builddir)/src/hello/libgnunethello.la \
408 $(top_builddir)/src/util/libgnunetutil.la \
409 $(top_builddir)/src/transport/libgnunettransporttesting.la
410
395test_transport_api_reliability_tcp_nat_SOURCES = \ 411test_transport_api_reliability_tcp_nat_SOURCES = \
396 test_transport_api_reliability.c 412 test_transport_api_reliability.c
397test_transport_api_reliability_tcp_nat_LDADD = \ 413test_transport_api_reliability_tcp_nat_LDADD = \
@@ -464,14 +480,6 @@ test_transport_api_reliability_http_LDADD = \
464 $(top_builddir)/src/util/libgnunetutil.la \ 480 $(top_builddir)/src/util/libgnunetutil.la \
465 $(top_builddir)/src/transport/libgnunettransporttesting.la 481 $(top_builddir)/src/transport/libgnunettransporttesting.la
466 482
467#test_plugin_transport_https_SOURCES = \
468# test_plugin_transport_https.c
469#test_plugin_transport_https_LDADD = \
470# $(top_builddir)/src/statistics/libgnunetstatistics.la \
471# @LIBCURL@ \
472# $(top_builddir)/src/hello/libgnunethello.la \
473# $(top_builddir)/src/util/libgnunetutil.la
474
475test_transport_api_https_SOURCES = \ 483test_transport_api_https_SOURCES = \
476 test_transport_api.c 484 test_transport_api.c
477test_transport_api_https_LDADD = \ 485test_transport_api_https_LDADD = \
@@ -597,12 +605,6 @@ test_quota_compliance_udp_asymmetric_recv_constant_LDADD = \
597 $(top_builddir)/src/hello/libgnunethello.la \ 605 $(top_builddir)/src/hello/libgnunethello.la \
598 $(top_builddir)/src/util/libgnunetutil.la 606 $(top_builddir)/src/util/libgnunetutil.la
599 607
600#test_quota_compliance_udp_asymmetric_send_constant_SOURCES = \
601# test_quota_compliance.c
602#test_quota_compliance_udp_asymmetric_send_constant_LDADD = \
603# $(top_builddir)/src/transport/libgnunettransport.la \
604# $(top_builddir)/src/util/libgnunetutil.la
605
606test_quota_compliance_unix_SOURCES = \ 608test_quota_compliance_unix_SOURCES = \
607 test_quota_compliance.c 609 test_quota_compliance.c
608test_quota_compliance_unix_LDADD = \ 610test_quota_compliance_unix_LDADD = \
@@ -617,7 +619,6 @@ test_quota_compliance_unix_asymmetric_recv_constant_LDADD = \
617 $(top_builddir)/src/hello/libgnunethello.la \ 619 $(top_builddir)/src/hello/libgnunethello.la \
618 $(top_builddir)/src/util/libgnunetutil.la 620 $(top_builddir)/src/util/libgnunetutil.la
619 621
620
621test_transport_api_multi_SOURCES = \ 622test_transport_api_multi_SOURCES = \
622 test_transport_api.c 623 test_transport_api.c
623test_transport_api_multi_LDADD = \ 624test_transport_api_multi_LDADD = \
@@ -652,8 +653,8 @@ test_transport_api_https_peer1.conf\
652test_transport_api_https_peer2.conf\ 653test_transport_api_https_peer2.conf\
653test_transport_api_limited_sockets_tcp_peer1.conf\ 654test_transport_api_limited_sockets_tcp_peer1.conf\
654test_transport_api_limited_sockets_tcp_peer2.conf\ 655test_transport_api_limited_sockets_tcp_peer2.conf\
655test_transport_api_multiaddress_tcp_peer1.conf\ 656test_transport_api_timeout_tcp_peer1.conf\
656test_transport_api_multiaddress_tcp_peer2.conf\ 657test_transport_api_timeout_tcp_peer2.conf\
657test_transport_api_multi_peer1.conf\ 658test_transport_api_multi_peer1.conf\
658test_transport_api_multi_peer2.conf\ 659test_transport_api_multi_peer2.conf\
659test_transport_api_reliability_http_peer1.conf\ 660test_transport_api_reliability_http_peer1.conf\
diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf
index 5525bc5ab..c322c36c1 100644
--- a/src/transport/test_transport_api_http_peer1.conf
+++ b/src/transport/test_transport_api_http_peer1.conf
@@ -8,7 +8,7 @@ DISABLEV6 = NO
8 8
9[transport-http] 9[transport-http]
10PORT = 12080 10PORT = 12080
11USE_IPv6 = NO 11USE_IPv6 = YES
12USE_IPv4 = YES 12USE_IPv4 = YES
13DISABLEV6 = NO 13DISABLEV6 = NO
14#BINDTO = 127.0.0.1 14#BINDTO = 127.0.0.1
@@ -32,7 +32,7 @@ PORT = 12082
32UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock 32UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
33 33
34[transport] 34[transport]
35DEBUG = YES 35#DEBUG = YES
36PORT = 12081 36PORT = 12081
37PLUGINS = http 37PLUGINS = http
38#BINARY = .libs/gnunet-service-transport 38#BINARY = .libs/gnunet-service-transport
diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf
index 39c2639c2..1f5087e04 100644
--- a/src/transport/test_transport_api_http_peer2.conf
+++ b/src/transport/test_transport_api_http_peer2.conf
@@ -11,7 +11,7 @@ PORT = 12090
11USE_IPv6 = YES 11USE_IPv6 = YES
12USE_IPv4 = YES 12USE_IPv4 = YES
13DISABLEV6 = NO 13DISABLEV6 = NO
14BINDTO = 127.0.0.1 14#BINDTO = 127.0.0.1
15 15
16[arm] 16[arm]
17PORT = 12095 17PORT = 12095
diff --git a/src/transport/test_transport_api_multiaddress.c b/src/transport/test_transport_api_timeout.c
index 1096df840..cec60e989 100644
--- a/src/transport/test_transport_api_multiaddress.c
+++ b/src/transport/test_transport_api_timeout.c
@@ -18,13 +18,13 @@
18 Boston, MA 02111-1307, USA. 18 Boston, MA 02111-1307, USA.
19*/ 19*/
20/** 20/**
21 * @file transport/test_transport_api.c 21 * @file transport/test_transport_api_timeout.c
22 * @brief base test case for transport implementations 22 * @brief test case for transport plugin implementations complying timeout
23 * settings
23 * 24 *
24 * This test case serves as a base for tcp, udp, and udp-nat 25 *
25 * transport test cases. Based on the executable being run 26 * This test case serves ensures that no peer disconnect events occurs
26 * the correct test case will be performed. Conservation of 27 * while plugins are idle
27 * C code apparently.
28 */ 28 */
29 29
30#include "platform.h" 30#include "platform.h"
@@ -346,4 +346,4 @@ main (int argc, char *argv[])
346 return ret; 346 return ret;
347} 347}
348 348
349/* end of test_transport_api.c */ 349/* end of test_transport_api_timeout.c*/
diff --git a/src/transport/test_transport_api_timeout_http_peer1.conf b/src/transport/test_transport_api_timeout_http_peer1.conf
new file mode 100644
index 000000000..c322c36c1
--- /dev/null
+++ b/src/transport/test_transport_api_timeout_http_peer1.conf
@@ -0,0 +1,42 @@
1@INLINE@ test_transport_defaults.conf
2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-http-p1/
4DEFAULTCONFIG = test_transport_api_http_peer1.conf
5
6[nat]
7DISABLEV6 = NO
8
9[transport-http]
10PORT = 12080
11USE_IPv6 = YES
12USE_IPv4 = YES
13DISABLEV6 = NO
14#BINDTO = 127.0.0.1
15#BINDTO6 = ::1
16
17[arm]
18PORT = 12085
19DEFAULTSERVICES = transport
20UNIXPATH = /tmp/gnunet-p1-service-arm.sock
21
22[statistics]
23PORT = 12084
24UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
25
26[resolver]
27PORT = 12083
28UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
29
30[peerinfo]
31PORT = 12082
32UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
33
34[transport]
35#DEBUG = YES
36PORT = 12081
37PLUGINS = http
38#BINARY = .libs/gnunet-service-transport
39UNIXPATH = /tmp/gnunet-p1-service-transport.sock
40#PREFIX = valgrind --leak-check=full
41#PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
42
diff --git a/src/transport/test_transport_api_timeout_http_peer2.conf b/src/transport/test_transport_api_timeout_http_peer2.conf
new file mode 100644
index 000000000..1f5087e04
--- /dev/null
+++ b/src/transport/test_transport_api_timeout_http_peer2.conf
@@ -0,0 +1,38 @@
1@INLINE@ test_transport_defaults.conf
2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-http-p2/
4DEFAULTCONFIG = test_transport_api_http_peer2.conf
5
6[nat]
7DISABLEV6 = NO
8
9[transport-http]
10PORT = 12090
11USE_IPv6 = YES
12USE_IPv4 = YES
13DISABLEV6 = NO
14#BINDTO = 127.0.0.1
15
16[arm]
17PORT = 12095
18DEFAULTSERVICES = transport
19UNIXPATH = /tmp/gnunet-p2-service-arm.sock
20
21[statistics]
22PORT = 12094
23UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
24
25[resolver]
26PORT = 12093
27UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
28
29[peerinfo]
30PORT = 12092
31UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
32
33[transport]
34DEBUG = YES
35PORT = 12091
36PLUGINS = http
37UNIXPATH = /tmp/gnunet-p2-service-transport.sock
38#PREFIX = valgrind --leak-check=full
diff --git a/src/transport/test_transport_api_timeout_https_peer1.conf b/src/transport/test_transport_api_timeout_https_peer1.conf
new file mode 100644
index 000000000..7a3a225f0
--- /dev/null
+++ b/src/transport/test_transport_api_timeout_https_peer1.conf
@@ -0,0 +1,35 @@
1@INLINE@ test_transport_defaults.conf
2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-https-p1/
4DEFAULTCONFIG = test_transport_api_https_peer1.conf
5
6[transport-https]
7PORT = 12100
8CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
9KEY_FILE = $SERVICEHOME/https_key_p1.key
10CERT_FILE = $SERVICEHOME/https_cert_p1.crt
11USE_IPv6 = YES
12USE_IPv4 = YES
13
14[arm]
15PORT = 12105
16
17[statistics]
18PORT = 12104
19UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
20
21[resolver]
22PORT = 12103
23UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
24
25[peerinfo]
26PORT = 12102
27UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
28
29[transport]
30PORT = 12101
31PLUGINS = https
32UNIXPATH = /tmp/gnunet-p1-service-transport.sock
33DEBUG = NO
34
35
diff --git a/src/transport/test_transport_api_timeout_https_peer2.conf b/src/transport/test_transport_api_timeout_https_peer2.conf
new file mode 100644
index 000000000..2c45b27f7
--- /dev/null
+++ b/src/transport/test_transport_api_timeout_https_peer2.conf
@@ -0,0 +1,36 @@
1@INLINE@ test_transport_defaults.conf
2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-https-p2/
4DEFAULTCONFIG = test_transport_api_https_peer2.conf
5
6[transport-https]
7PORT = 12110
8CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
9KEY_FILE = $SERVICEHOME/https_key_p2.key
10CERT_FILE = $SERVICEHOME/https_cert_p2.crt
11USE_IPv6 = YES
12USE_IPv4 = YES
13
14[arm]
15PORT = 12115
16UNIXPATH = /tmp/gnunet-p2-service-arm.sock
17
18[statistics]
19PORT = 12114
20UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
21
22[resolver]
23PORT = 12113
24UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
25
26[peerinfo]
27PORT = 12112
28UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
29
30[transport]
31PORT = 12111
32PLUGINS = https
33UNIXPATH = /tmp/gnunet-p2-service-transport.sock
34DEBUG = NO
35
36
diff --git a/src/transport/test_transport_api_multiaddress_tcp_peer1.conf b/src/transport/test_transport_api_timeout_tcp_peer1.conf
index 974481fde..974481fde 100644
--- a/src/transport/test_transport_api_multiaddress_tcp_peer1.conf
+++ b/src/transport/test_transport_api_timeout_tcp_peer1.conf
diff --git a/src/transport/test_transport_api_multiaddress_tcp_peer2.conf b/src/transport/test_transport_api_timeout_tcp_peer2.conf
index 0d4869f77..0d4869f77 100644
--- a/src/transport/test_transport_api_multiaddress_tcp_peer2.conf
+++ b/src/transport/test_transport_api_timeout_tcp_peer2.conf
diff --git a/src/transport/test_transport_api_unreliability.c b/src/transport/test_transport_api_unreliability.c
index 5d4f86820..9a30f54b8 100644
--- a/src/transport/test_transport_api_unreliability.c
+++ b/src/transport/test_transport_api_unreliability.c
@@ -39,7 +39,7 @@
39#include "transport.h" 39#include "transport.h"
40#include "transport-testing.h" 40#include "transport-testing.h"
41 41
42#define VERBOSE GNUNET_YES 42#define VERBOSE GNUNET_NO
43 43
44#define VERBOSE_ARM GNUNET_NO 44#define VERBOSE_ARM GNUNET_NO
45 45