diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2012-08-28 15:11:31 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-08-28 15:11:31 +0000 |
commit | 6a0322e710513236be163c8d7ef5951760292a04 (patch) | |
tree | 525c0920f11c628587d8b21017fce85f659ac351 /src/transport | |
parent | d688b398b2a74767546056958fd8f82db70c4043 (diff) | |
download | gnunet-6a0322e710513236be163c8d7ef5951760292a04.tar.gz gnunet-6a0322e710513236be163c8d7ef5951760292a04.zip |
confs + coverity
Diffstat (limited to 'src/transport')
-rw-r--r-- | src/transport/Makefile.am | 30 | ||||
-rw-r--r-- | src/transport/plugin_transport_http_common.c | 1 | ||||
-rw-r--r-- | src/transport/plugin_transport_http_common.h | 1 | ||||
-rw-r--r-- | src/transport/plugin_transport_http_server.c | 1 | ||||
-rw-r--r-- | src/transport/test_transport_api_http_nat_peer2.conf | 31 | ||||
-rw-r--r-- | src/transport/test_transport_api_http_peer1.conf | 2 | ||||
-rw-r--r-- | src/transport/test_transport_api_http_reverse_peer1.conf (renamed from src/transport/test_transport_api_http_nat_peer1.conf) | 14 | ||||
-rw-r--r-- | src/transport/test_transport_api_http_reverse_proxy.conf | 47 | ||||
-rw-r--r-- | src/transport/test_transport_api_https_nat_peer1.conf | 36 | ||||
-rw-r--r-- | src/transport/test_transport_api_https_nat_peer2.conf | 33 | ||||
-rw-r--r-- | src/transport/test_transport_api_reliability_http_nat_peer1.conf | 38 | ||||
-rw-r--r-- | src/transport/test_transport_api_reliability_http_nat_peer2.conf | 31 | ||||
-rw-r--r-- | src/transport/test_transport_api_reliability_https_nat_peer1.conf | 36 | ||||
-rw-r--r-- | src/transport/test_transport_api_reliability_https_nat_peer2.conf | 33 |
14 files changed, 21 insertions, 313 deletions
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 21a1aa165..008f827fe 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -41,6 +41,10 @@ if HAVE_LIBCURL | |||
41 | endif | 41 | endif |
42 | endif | 42 | endif |
43 | 43 | ||
44 | #if FALSE | ||
45 | |||
46 | #endif | ||
47 | |||
44 | if USE_COVERAGE | 48 | if USE_COVERAGE |
45 | AM_CFLAGS = --coverage -O0 | 49 | AM_CFLAGS = --coverage -O0 |
46 | endif | 50 | endif |
@@ -323,10 +327,9 @@ check_PROGRAMS = \ | |||
323 | $(UNIX_PLUGIN_TIMEOUT_TEST) \ | 327 | $(UNIX_PLUGIN_TIMEOUT_TEST) \ |
324 | test_transport_api_udp_nat \ | 328 | test_transport_api_udp_nat \ |
325 | $(HTTP_API_TEST) \ | 329 | $(HTTP_API_TEST) \ |
326 | $(HTTP_NAT_API_TEST) \ | 330 | $(HTTP_REVERSE_API_TEST) \ |
327 | $(HTTP_API_TIMEOUT_TEST) \ | 331 | $(HTTP_API_TIMEOUT_TEST) \ |
328 | $(HTTPS_API_TEST) \ | 332 | $(HTTPS_API_TEST) \ |
329 | $(HTTPS_NAT_API_TEST) \ | ||
330 | $(HTTPS_API_TIMEOUT_TEST) \ | 333 | $(HTTPS_API_TIMEOUT_TEST) \ |
331 | $(WLAN_API_TEST) \ | 334 | $(WLAN_API_TEST) \ |
332 | test_transport_api_multi \ | 335 | test_transport_api_multi \ |
@@ -336,9 +339,7 @@ check_PROGRAMS = \ | |||
336 | test_transport_api_unreliability_constant_udp \ | 339 | test_transport_api_unreliability_constant_udp \ |
337 | $(UNIX_REL_TEST) \ | 340 | $(UNIX_REL_TEST) \ |
338 | $(HTTP_REL_TEST) \ | 341 | $(HTTP_REL_TEST) \ |
339 | $(HTTP_NAT_REL_TEST) \ | ||
340 | $(HTTPS_REL_TEST) \ | 342 | $(HTTPS_REL_TEST) \ |
341 | $(HTTPS_NAT_REL_TEST) \ | ||
342 | $(WLAN_REL_TEST) \ | 343 | $(WLAN_REL_TEST) \ |
343 | $(WLAN_UREL_TEST) \ | 344 | $(WLAN_UREL_TEST) \ |
344 | test_quota_compliance_tcp \ | 345 | test_quota_compliance_tcp \ |
@@ -374,10 +375,9 @@ TESTS = \ | |||
374 | $(UNIX_PLUGIN_TIMEOUT_TEST) \ | 375 | $(UNIX_PLUGIN_TIMEOUT_TEST) \ |
375 | test_transport_api_udp_nat \ | 376 | test_transport_api_udp_nat \ |
376 | $(HTTP_API_TEST) \ | 377 | $(HTTP_API_TEST) \ |
377 | $(HTTP_NAT_API_TEST) \ | 378 | $(HTTP_REVERSE_API_TEST) \ |
378 | $(HTTP_API_TIMEOUT_TEST) \ | 379 | $(HTTP_API_TIMEOUT_TEST) \ |
379 | $(HTTPS_API_TEST) \ | 380 | $(HTTPS_API_TEST) \ |
380 | $(HTTPS_NAT_API_TEST) \ | ||
381 | $(HTTPS_API_TIMEOUT_TEST) \ | 381 | $(HTTPS_API_TIMEOUT_TEST) \ |
382 | $(WLAN_API_TEST) \ | 382 | $(WLAN_API_TEST) \ |
383 | test_transport_api_multi \ | 383 | test_transport_api_multi \ |
@@ -387,9 +387,7 @@ TESTS = \ | |||
387 | test_transport_api_unreliability_constant_udp \ | 387 | test_transport_api_unreliability_constant_udp \ |
388 | $(UNIX_REL_TEST) \ | 388 | $(UNIX_REL_TEST) \ |
389 | $(HTTP_REL_TEST) \ | 389 | $(HTTP_REL_TEST) \ |
390 | $(HTTP_NAT_REL_TEST) \ | ||
391 | $(HTTPS_REL_TEST) \ | 390 | $(HTTPS_REL_TEST) \ |
392 | $(HTTPS_NAT_REL_TEST) \ | ||
393 | $(WLAN_REL_TEST) \ | 391 | $(WLAN_REL_TEST) \ |
394 | $(WLAN_UREL_TEST) \ | 392 | $(WLAN_UREL_TEST) \ |
395 | test_quota_compliance_tcp \ | 393 | test_quota_compliance_tcp \ |
@@ -663,6 +661,14 @@ test_transport_api_http_LDADD = \ | |||
663 | $(top_builddir)/src/util/libgnunetutil.la \ | 661 | $(top_builddir)/src/util/libgnunetutil.la \ |
664 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 662 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
665 | 663 | ||
664 | test_transport_api_http_reverse_SOURCES = \ | ||
665 | test_transport_api.c | ||
666 | test_transport_api_http_reverse_LDADD = \ | ||
667 | $(top_builddir)/src/transport/libgnunettransport.la \ | ||
668 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
669 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
670 | $(top_builddir)/src/transport/libgnunettransporttesting.la | ||
671 | |||
666 | test_transport_api_timeout_http_SOURCES = \ | 672 | test_transport_api_timeout_http_SOURCES = \ |
667 | test_transport_api_timeout.c | 673 | test_transport_api_timeout.c |
668 | test_transport_api_timeout_http_LDADD = \ | 674 | test_transport_api_timeout_http_LDADD = \ |
@@ -910,14 +916,6 @@ test_transport_defaults.conf\ | |||
910 | test_transport_startonly.conf\ | 916 | test_transport_startonly.conf\ |
911 | test_transport_api_disconnect_tcp_peer1.conf\ | 917 | test_transport_api_disconnect_tcp_peer1.conf\ |
912 | test_transport_api_disconnect_tcp_peer2.conf\ | 918 | test_transport_api_disconnect_tcp_peer2.conf\ |
913 | test_transport_api_http_nat_peer1.conf\ | ||
914 | test_transport_api_http_nat_peer2.conf\ | ||
915 | test_transport_api_https_nat_peer1.conf\ | ||
916 | test_transport_api_https_nat_peer2.conf\ | ||
917 | test_transport_api_reliability_http_nat_peer1.conf\ | ||
918 | test_transport_api_reliability_http_nat_peer2.conf\ | ||
919 | test_transport_api_reliability_https_nat_peer1.conf\ | ||
920 | test_transport_api_reliability_https_nat_peer2.conf\ | ||
921 | test_transport_api_timeout_http_peer1.conf\ | 919 | test_transport_api_timeout_http_peer1.conf\ |
922 | test_transport_api_timeout_http_peer2.conf\ | 920 | test_transport_api_timeout_http_peer2.conf\ |
923 | test_transport_api_timeout_https_peer1.conf\ | 921 | test_transport_api_timeout_https_peer1.conf\ |
diff --git a/src/transport/plugin_transport_http_common.c b/src/transport/plugin_transport_http_common.c index e71b16e93..a34f4c342 100644 --- a/src/transport/plugin_transport_http_common.c +++ b/src/transport/plugin_transport_http_common.c | |||
@@ -146,7 +146,6 @@ http_common_address_from_socket (const char *protocol, const struct sockaddr *ad | |||
146 | /** | 146 | /** |
147 | * Create a socketaddr from a HTTP address | 147 | * Create a socketaddr from a HTTP address |
148 | * | 148 | * |
149 | * @param protocol protocol | ||
150 | * @param addr sockaddr * address | 149 | * @param addr sockaddr * address |
151 | * @param addrlen length of the address | 150 | * @param addrlen length of the address |
152 | * @param res the result: | 151 | * @param res the result: |
diff --git a/src/transport/plugin_transport_http_common.h b/src/transport/plugin_transport_http_common.h index 65516e595..85793ce7f 100644 --- a/src/transport/plugin_transport_http_common.h +++ b/src/transport/plugin_transport_http_common.h | |||
@@ -124,7 +124,6 @@ http_common_address_from_socket (const char *protocol, | |||
124 | /** | 124 | /** |
125 | * Create a socketaddr from a HTTP address | 125 | * Create a socketaddr from a HTTP address |
126 | * | 126 | * |
127 | * @param protocol protocol | ||
128 | * @param addr sockaddr * address | 127 | * @param addr sockaddr * address |
129 | * @param addrlen length of the address | 128 | * @param addrlen length of the address |
130 | * @param res the result: | 129 | * @param res the result: |
diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c index a554fb988..6ec0c77a0 100644 --- a/src/transport/plugin_transport_http_server.c +++ b/src/transport/plugin_transport_http_server.c | |||
@@ -664,6 +664,7 @@ server_stop_session_timeout (struct Session *s) | |||
664 | * starts the task waiting for them. | 664 | * starts the task waiting for them. |
665 | * @param plugin plugin | 665 | * @param plugin plugin |
666 | * @param daemon_handle the MHD daemon handle | 666 | * @param daemon_handle the MHD daemon handle |
667 | * @param now schedule immediately | ||
667 | * @return gnunet task identifier | 668 | * @return gnunet task identifier |
668 | */ | 669 | */ |
669 | static GNUNET_SCHEDULER_TaskIdentifier | 670 | static GNUNET_SCHEDULER_TaskIdentifier |
diff --git a/src/transport/test_transport_api_http_nat_peer2.conf b/src/transport/test_transport_api_http_nat_peer2.conf deleted file mode 100644 index 2f56eabda..000000000 --- a/src/transport/test_transport_api_http_nat_peer2.conf +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | ||
2 | [PATHS] | ||
3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ | ||
4 | DEFAULTCONFIG = test_transport_api_http_nat_peer2.conf | ||
5 | |||
6 | [transport-http] | ||
7 | PORT = 12090 | ||
8 | |||
9 | [arm] | ||
10 | PORT = 12095 | ||
11 | DEFAULTSERVICES = transport | ||
12 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock | ||
13 | |||
14 | [statistics] | ||
15 | PORT = 12094 | ||
16 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock | ||
17 | |||
18 | [resolver] | ||
19 | PORT = 12093 | ||
20 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock | ||
21 | |||
22 | [peerinfo] | ||
23 | PORT = 12092 | ||
24 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock | ||
25 | |||
26 | [transport] | ||
27 | #DEBUG = YES | ||
28 | PORT = 12091 | ||
29 | PLUGINS = http | ||
30 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock | ||
31 | #PREFIX = valgrind --leak-check=full | ||
diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf index 4af712a43..1d8f88438 100644 --- a/src/transport/test_transport_api_http_peer1.conf +++ b/src/transport/test_transport_api_http_peer1.conf | |||
@@ -28,6 +28,6 @@ PORT = 12081 | |||
28 | PLUGINS = http_client | 28 | PLUGINS = http_client |
29 | #BINARY = .libs/gnunet-service-transport | 29 | #BINARY = .libs/gnunet-service-transport |
30 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock | 30 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock |
31 | #PREFIX = valgrind --leak-check=full | 31 | PREFIX = valgrind --leak-check=full |
32 | #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args | 32 | #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args |
33 | 33 | ||
diff --git a/src/transport/test_transport_api_http_nat_peer1.conf b/src/transport/test_transport_api_http_reverse_peer1.conf index 447508c36..2bee439bb 100644 --- a/src/transport/test_transport_api_http_nat_peer1.conf +++ b/src/transport/test_transport_api_http_reverse_peer1.conf | |||
@@ -1,14 +1,10 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ |
4 | DEFAULTCONFIG = test_transport_api_http_nat_peer1.conf | 4 | DEFAULTCONFIG = test_transport_api_http_reverse_peer1.conf |
5 | 5 | ||
6 | [nat] | ||
7 | BEHIND_NAT = YES | ||
8 | ENABLE_NAT_SERVER = YES | ||
9 | 6 | ||
10 | [transport-http] | 7 | [transport-http_client] |
11 | PORT = 0 | ||
12 | 8 | ||
13 | [arm] | 9 | [arm] |
14 | PORT = 12085 | 10 | PORT = 12085 |
@@ -30,9 +26,9 @@ UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock | |||
30 | [transport] | 26 | [transport] |
31 | #DEBUG = YES | 27 | #DEBUG = YES |
32 | PORT = 12081 | 28 | PORT = 12081 |
33 | PLUGINS = http | 29 | PLUGINS = http_client |
34 | #BINARY = .libs/gnunet-service-transport | 30 | #BINARY = .libs/gnunet-service-transport |
35 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock | 31 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock |
36 | #PREFIX = valgrind --leak-check=full | 32 | PREFIX = valgrind --leak-check=full |
37 | #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args | 33 | #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args |
38 | 34 | ||
diff --git a/src/transport/test_transport_api_http_reverse_proxy.conf b/src/transport/test_transport_api_http_reverse_proxy.conf deleted file mode 100644 index c8162df0d..000000000 --- a/src/transport/test_transport_api_http_reverse_proxy.conf +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | INLINE@ template_cfg_peer1.conf | ||
2 | [PATHS] | ||
3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ | ||
4 | DEFAULTCONFIG = test_transport_api_http_reverse_proxy.conf | ||
5 | |||
6 | |||
7 | [transport-http_client] | ||
8 | |||
9 | [transport-http_server] | ||
10 | PORT = 12080 | ||
11 | EXTERNAL_HOSTNAME = fulcrum.net.in.tum.de:12080/peer | ||
12 | #USE_IPV4 = YES | ||
13 | #USE_IPV6 = YES | ||
14 | #BINDTO = 127.0.0.1 | ||
15 | #BINDTO6 = ::1 | ||
16 | |||
17 | [transport-https_server] | ||
18 | PORT = 12090 | ||
19 | |||
20 | [arm] | ||
21 | PORT = 12085 | ||
22 | DEFAULTSERVICES = transport | ||
23 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock | ||
24 | |||
25 | [statistics] | ||
26 | PORT = 12084 | ||
27 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock | ||
28 | |||
29 | [resolver] | ||
30 | PORT = 12083 | ||
31 | UNIXPATH = /tmp/gnunet-p1-service-resolver.sock | ||
32 | |||
33 | [peerinfo] | ||
34 | PORT = 12082 | ||
35 | UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock | ||
36 | |||
37 | [transport] | ||
38 | #DEBUG = YES | ||
39 | PORT = 12081 | ||
40 | #PLUGINS = http_server | ||
41 | PLUGINS = http_client http_server | ||
42 | # http_client | ||
43 | #BINARY = .libs/gnunet-service-transport | ||
44 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock | ||
45 | PREFIX = valgrind --leak-check=full | ||
46 | #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args | ||
47 | |||
diff --git a/src/transport/test_transport_api_https_nat_peer1.conf b/src/transport/test_transport_api_https_nat_peer1.conf deleted file mode 100644 index e97b47317..000000000 --- a/src/transport/test_transport_api_https_nat_peer1.conf +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | ||
2 | [PATHS] | ||
3 | SERVICEHOME = /tmp/test-transport/api-https-p1/ | ||
4 | DEFAULTCONFIG = test_transport_api_https_nat_peer1.conf | ||
5 | |||
6 | [nat] | ||
7 | BEHIND_NAT = YES | ||
8 | ENABLE_NAT_SERVER = YES | ||
9 | |||
10 | [transport-https] | ||
11 | PORT = 0 | ||
12 | KEY_FILE = $SERVICEHOME/https_key_p1.key | ||
13 | CERT_FILE = $SERVICEHOME/https_cert_p1.crt | ||
14 | |||
15 | [arm] | ||
16 | PORT = 12105 | ||
17 | |||
18 | [statistics] | ||
19 | PORT = 12104 | ||
20 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock | ||
21 | |||
22 | [resolver] | ||
23 | PORT = 12103 | ||
24 | UNIXPATH = /tmp/gnunet-p1-service-resolver.sock | ||
25 | |||
26 | [peerinfo] | ||
27 | PORT = 12102 | ||
28 | UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock | ||
29 | |||
30 | [transport] | ||
31 | PORT = 12101 | ||
32 | PLUGINS = https | ||
33 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock | ||
34 | DEBUG = NO | ||
35 | |||
36 | |||
diff --git a/src/transport/test_transport_api_https_nat_peer2.conf b/src/transport/test_transport_api_https_nat_peer2.conf deleted file mode 100644 index a23f3a5b4..000000000 --- a/src/transport/test_transport_api_https_nat_peer2.conf +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | ||
2 | [PATHS] | ||
3 | SERVICEHOME = /tmp/test-transport/api-https-p2/ | ||
4 | DEFAULTCONFIG = test_transport_api_https_nat_peer2.conf | ||
5 | |||
6 | [transport-https] | ||
7 | PORT = 12110 | ||
8 | KEY_FILE = $SERVICEHOME/https_key_p2.key | ||
9 | CERT_FILE = $SERVICEHOME/https_cert_p2.crt | ||
10 | |||
11 | [arm] | ||
12 | PORT = 12115 | ||
13 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock | ||
14 | |||
15 | [statistics] | ||
16 | PORT = 12114 | ||
17 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock | ||
18 | |||
19 | [resolver] | ||
20 | PORT = 12113 | ||
21 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock | ||
22 | |||
23 | [peerinfo] | ||
24 | PORT = 12112 | ||
25 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock | ||
26 | |||
27 | [transport] | ||
28 | PORT = 12111 | ||
29 | PLUGINS = https | ||
30 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock | ||
31 | DEBUG = NO | ||
32 | |||
33 | |||
diff --git a/src/transport/test_transport_api_reliability_http_nat_peer1.conf b/src/transport/test_transport_api_reliability_http_nat_peer1.conf deleted file mode 100644 index cd841a3ca..000000000 --- a/src/transport/test_transport_api_reliability_http_nat_peer1.conf +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | ||
2 | [PATHS] | ||
3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ | ||
4 | DEFAULTCONFIG = test_transport_api_reliability_http_nat_peer1.conf | ||
5 | |||
6 | [nat] | ||
7 | BEHIND_NAT = YES | ||
8 | ENABLE_NAT_SERVER = YES | ||
9 | |||
10 | [transport-http] | ||
11 | PORT = 0 | ||
12 | |||
13 | [arm] | ||
14 | PORT = 12085 | ||
15 | DEFAULTSERVICES = transport | ||
16 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock | ||
17 | |||
18 | [statistics] | ||
19 | PORT = 12084 | ||
20 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock | ||
21 | |||
22 | [resolver] | ||
23 | PORT = 12083 | ||
24 | UNIXPATH = /tmp/gnunet-p1-service-resolver.sock | ||
25 | |||
26 | [peerinfo] | ||
27 | PORT = 12082 | ||
28 | UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock | ||
29 | |||
30 | [transport] | ||
31 | #DEBUG = YES | ||
32 | PORT = 12081 | ||
33 | PLUGINS = http | ||
34 | #BINARY = .libs/gnunet-service-transport | ||
35 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock | ||
36 | #PREFIX = valgrind --leak-check=full | ||
37 | #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args | ||
38 | |||
diff --git a/src/transport/test_transport_api_reliability_http_nat_peer2.conf b/src/transport/test_transport_api_reliability_http_nat_peer2.conf deleted file mode 100644 index 4a5cbbad0..000000000 --- a/src/transport/test_transport_api_reliability_http_nat_peer2.conf +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | ||
2 | [PATHS] | ||
3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ | ||
4 | DEFAULTCONFIG = test_transport_api_reliability_http_nat_peer2.conf | ||
5 | |||
6 | [transport-http] | ||
7 | PORT = 12090 | ||
8 | |||
9 | [arm] | ||
10 | PORT = 12095 | ||
11 | DEFAULTSERVICES = transport | ||
12 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock | ||
13 | |||
14 | [statistics] | ||
15 | PORT = 12094 | ||
16 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock | ||
17 | |||
18 | [resolver] | ||
19 | PORT = 12093 | ||
20 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock | ||
21 | |||
22 | [peerinfo] | ||
23 | PORT = 12092 | ||
24 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock | ||
25 | |||
26 | [transport] | ||
27 | #DEBUG = YES | ||
28 | PORT = 12091 | ||
29 | PLUGINS = http | ||
30 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock | ||
31 | #PREFIX = valgrind --leak-check=full | ||
diff --git a/src/transport/test_transport_api_reliability_https_nat_peer1.conf b/src/transport/test_transport_api_reliability_https_nat_peer1.conf deleted file mode 100644 index ca14c720a..000000000 --- a/src/transport/test_transport_api_reliability_https_nat_peer1.conf +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | ||
2 | [PATHS] | ||
3 | SERVICEHOME = /tmp/test-transport/api-https-p1/ | ||
4 | DEFAULTCONFIG = test_transport_api_reliability_https_nat_peer1.conf | ||
5 | |||
6 | [nat] | ||
7 | BEHIND_NAT = YES | ||
8 | ENABLE_NAT_SERVER = YES | ||
9 | |||
10 | [transport-https] | ||
11 | PORT = 0 | ||
12 | KEY_FILE = $SERVICEHOME/https_key_p1.key | ||
13 | CERT_FILE = $SERVICEHOME/https_cert_p1.crt | ||
14 | |||
15 | [arm] | ||
16 | PORT = 12105 | ||
17 | |||
18 | [statistics] | ||
19 | PORT = 12104 | ||
20 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock | ||
21 | |||
22 | [resolver] | ||
23 | PORT = 12103 | ||
24 | UNIXPATH = /tmp/gnunet-p1-service-resolver.sock | ||
25 | |||
26 | [peerinfo] | ||
27 | PORT = 12102 | ||
28 | UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock | ||
29 | |||
30 | [transport] | ||
31 | PORT = 12101 | ||
32 | PLUGINS = https | ||
33 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock | ||
34 | DEBUG = NO | ||
35 | |||
36 | |||
diff --git a/src/transport/test_transport_api_reliability_https_nat_peer2.conf b/src/transport/test_transport_api_reliability_https_nat_peer2.conf deleted file mode 100644 index b7c2e9769..000000000 --- a/src/transport/test_transport_api_reliability_https_nat_peer2.conf +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | ||
2 | [PATHS] | ||
3 | SERVICEHOME = /tmp/test-transport/api-https-p2/ | ||
4 | DEFAULTCONFIG = test_transport_api_reliability_https_nat_peer2.conf | ||
5 | |||
6 | [transport-https] | ||
7 | PORT = 12110 | ||
8 | KEY_FILE = $SERVICEHOME/https_key_p2.key | ||
9 | CERT_FILE = $SERVICEHOME/https_cert_p2.crt | ||
10 | |||
11 | [arm] | ||
12 | PORT = 12115 | ||
13 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock | ||
14 | |||
15 | [statistics] | ||
16 | PORT = 12114 | ||
17 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock | ||
18 | |||
19 | [resolver] | ||
20 | PORT = 12113 | ||
21 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock | ||
22 | |||
23 | [peerinfo] | ||
24 | PORT = 12112 | ||
25 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock | ||
26 | |||
27 | [transport] | ||
28 | PORT = 12111 | ||
29 | PLUGINS = https | ||
30 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock | ||
31 | DEBUG = NO | ||
32 | |||
33 | |||