aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2012-08-28 11:43:40 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2012-08-28 11:43:40 +0000
commit415c261ba0169b53235d5e96da4d058e5e1f2d00 (patch)
tree262d87a0bf229e8a97f10f6a68371797b31fcf28 /src
parent2ec32745cf8b61bb257f4cb159f0d0ff83246e77 (diff)
downloadgnunet-415c261ba0169b53235d5e96da4d058e5e1f2d00.tar.gz
gnunet-415c261ba0169b53235d5e96da4d058e5e1f2d00.zip
tests
Diffstat (limited to 'src')
-rw-r--r--src/transport/Makefile.am96
-rw-r--r--src/transport/plugin_transport_http_client.c2
-rw-r--r--src/transport/plugin_transport_http_server.c27
-rw-r--r--src/transport/test_quota_compliance_https_asymmetric_peer1.conf9
-rw-r--r--src/transport/test_quota_compliance_https_asymmetric_peer2.conf6
-rw-r--r--src/transport/test_quota_compliance_https_peer1.conf7
-rw-r--r--src/transport/test_quota_compliance_https_peer2.conf4
-rw-r--r--src/transport/test_transport_api_https_peer1.conf4
-rw-r--r--src/transport/test_transport_api_https_peer2.conf4
-rw-r--r--src/transport/test_transport_api_reliability_https_peer1.conf7
-rw-r--r--src/transport/test_transport_api_reliability_https_peer2.conf4
-rw-r--r--src/transport/test_transport_api_timeout_https_peer1.conf9
-rw-r--r--src/transport/test_transport_api_timeout_https_peer2.conf6
13 files changed, 70 insertions, 115 deletions
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index a2fa0f0e9..d4f16379a 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -34,22 +34,12 @@ if HAVE_LIBCURL
34 34
35 35
36 HTTPS_API_TEST = test_transport_api_https 36 HTTPS_API_TEST = test_transport_api_https
37endif
38endif
39
40if FALSE
41
42 HTTP_REL_TEST = test_transport_api_reliability_http
43 HTTP_NAT_REL_TEST = test_transport_api_reliability_http_nat
44
45 HTTPS_NAT_API_TEST = test_transport_api_https_nat
46 HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https 37 HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https
47 HTTPS_REL_TEST = test_transport_api_reliability_https 38 HTTPS_REL_TEST = test_transport_api_reliability_https
48 HTTPS_NAT_REL_TEST = test_transport_api_reliability_https_nat
49 HTTPS_QUOTA_TEST = test_quota_compliance_https \ 39 HTTPS_QUOTA_TEST = test_quota_compliance_https \
50 test_quota_compliance_https_asymmetric 40 test_quota_compliance_https_asymmetric
51endif 41endif
52 42endif
53 43
54if USE_COVERAGE 44if USE_COVERAGE
55 AM_CFLAGS = --coverage -O0 45 AM_CFLAGS = --coverage -O0
@@ -705,6 +695,21 @@ test_quota_compliance_http_asymmetric_LDADD = \
705 $(top_builddir)/src/util/libgnunetutil.la \ 695 $(top_builddir)/src/util/libgnunetutil.la \
706 $(top_builddir)/src/transport/libgnunettransporttesting.la 696 $(top_builddir)/src/transport/libgnunettransporttesting.la
707 697
698test_quota_compliance_https_SOURCES = \
699 test_quota_compliance.c
700test_quota_compliance_https_LDADD = \
701 $(top_builddir)/src/transport/libgnunettransport.la \
702 $(top_builddir)/src/hello/libgnunethello.la \
703 $(top_builddir)/src/util/libgnunetutil.la \
704 $(top_builddir)/src/transport/libgnunettransporttesting.la
705
706test_quota_compliance_https_asymmetric_SOURCES = \
707 test_quota_compliance.c
708test_quota_compliance_https_asymmetric_LDADD = \
709 $(top_builddir)/src/transport/libgnunettransport.la \
710 $(top_builddir)/src/hello/libgnunethello.la \
711 $(top_builddir)/src/util/libgnunetutil.la \
712 $(top_builddir)/src/transport/libgnunettransporttesting.la
708 713
709# HTTPS tests 714# HTTPS tests
710test_transport_api_https_SOURCES = \ 715test_transport_api_https_SOURCES = \
@@ -714,40 +719,15 @@ test_transport_api_https_LDADD = \
714 $(top_builddir)/src/hello/libgnunethello.la \ 719 $(top_builddir)/src/hello/libgnunethello.la \
715 $(top_builddir)/src/util/libgnunetutil.la \ 720 $(top_builddir)/src/util/libgnunetutil.la \
716 $(top_builddir)/src/transport/libgnunettransporttesting.la 721 $(top_builddir)/src/transport/libgnunettransporttesting.la
717 722
718if FALSE
719
720test_transport_api_timeout_https_SOURCES = \ 723test_transport_api_timeout_https_SOURCES = \
721 test_transport_api_timeout.c 724 test_transport_api_timeout.c
722test_transport_api_timeout_https_LDADD = \ 725test_transport_api_timeout_https_LDADD = \
723 $(top_builddir)/src/transport/libgnunettransport.la \ 726 $(top_builddir)/src/transport/libgnunettransport.la \
724 $(top_builddir)/src/hello/libgnunethello.la \ 727 $(top_builddir)/src/hello/libgnunethello.la \
725 $(top_builddir)/src/util/libgnunetutil.la \ 728 $(top_builddir)/src/util/libgnunetutil.la \
726 $(top_builddir)/src/transport/libgnunettransporttesting.la 729 $(top_builddir)/src/transport/libgnunettransporttesting.la
727 730
728test_transport_api_http_nat_SOURCES = \
729 test_transport_api.c
730test_transport_api_http_nat_LDADD = \
731 $(top_builddir)/src/transport/libgnunettransport.la \
732 $(top_builddir)/src/hello/libgnunethello.la \
733 $(top_builddir)/src/util/libgnunetutil.la \
734 $(top_builddir)/src/transport/libgnunettransporttesting.la
735
736test_transport_api_reliability_http_nat_SOURCES = \
737 test_transport_api_reliability.c
738test_transport_api_reliability_http_nat_LDADD = \
739 $(top_builddir)/src/transport/libgnunettransport.la \
740 $(top_builddir)/src/hello/libgnunethello.la \
741 $(top_builddir)/src/util/libgnunetutil.la \
742 $(top_builddir)/src/transport/libgnunettransporttesting.la
743
744test_transport_api_https_nat_SOURCES = \
745 test_transport_api.c
746test_transport_api_https_nat_LDADD = \
747 $(top_builddir)/src/transport/libgnunettransport.la \
748 $(top_builddir)/src/hello/libgnunethello.la \
749 $(top_builddir)/src/util/libgnunetutil.la \
750 $(top_builddir)/src/transport/libgnunettransporttesting.la
751 731
752test_transport_api_reliability_https_SOURCES = \ 732test_transport_api_reliability_https_SOURCES = \
753 test_transport_api_reliability.c 733 test_transport_api_reliability.c
@@ -757,42 +737,6 @@ test_transport_api_reliability_https_LDADD = \
757 $(top_builddir)/src/util/libgnunetutil.la \ 737 $(top_builddir)/src/util/libgnunetutil.la \
758 $(top_builddir)/src/transport/libgnunettransporttesting.la 738 $(top_builddir)/src/transport/libgnunettransporttesting.la
759 739
760test_transport_api_reliability_https_nat_SOURCES = \
761 test_transport_api_reliability.c
762test_transport_api_reliability_https_nat_LDADD = \
763 $(top_builddir)/src/transport/libgnunettransport.la \
764 $(top_builddir)/src/hello/libgnunethello.la \
765 $(top_builddir)/src/util/libgnunetutil.la \
766 $(top_builddir)/src/transport/libgnunettransporttesting.la
767
768test_quota_compliance_http_SOURCES = \
769 test_quota_compliance.c
770test_quota_compliance_http_LDADD = \
771 $(top_builddir)/src/transport/libgnunettransport.la \
772 $(top_builddir)/src/hello/libgnunethello.la \
773 $(top_builddir)/src/util/libgnunetutil.la \
774 $(top_builddir)/src/transport/libgnunettransporttesting.la
775
776
777test_quota_compliance_https_SOURCES = \
778 test_quota_compliance.c
779test_quota_compliance_https_LDADD = \
780 $(top_builddir)/src/transport/libgnunettransport.la \
781 $(top_builddir)/src/hello/libgnunethello.la \
782 $(top_builddir)/src/util/libgnunetutil.la \
783 $(top_builddir)/src/transport/libgnunettransporttesting.la
784
785test_quota_compliance_https_asymmetric_SOURCES = \
786 test_quota_compliance.c
787test_quota_compliance_https_asymmetric_LDADD = \
788 $(top_builddir)/src/transport/libgnunettransport.la \
789 $(top_builddir)/src/hello/libgnunethello.la \
790 $(top_builddir)/src/util/libgnunetutil.la \
791 $(top_builddir)/src/transport/libgnunettransporttesting.la
792
793
794endif
795
796test_transport_api_unreliability_unix_SOURCES = \ 740test_transport_api_unreliability_unix_SOURCES = \
797 test_transport_api_unreliability.c 741 test_transport_api_unreliability.c
798test_transport_api_unreliability_unix_LDADD = \ 742test_transport_api_unreliability_unix_LDADD = \
diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c
index eb601e30b..ebb4f9402 100644
--- a/src/transport/plugin_transport_http_client.c
+++ b/src/transport/plugin_transport_http_client.c
@@ -33,7 +33,7 @@
33#endif 33#endif
34 34
35 35
36#define VERBOSE_CURL GNUNET_YES 36#define VERBOSE_CURL GNUNET_NO
37 37
38#include "platform.h" 38#include "platform.h"
39#include "gnunet_protocols.h" 39#include "gnunet_protocols.h"
diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c
index 2ce844307..46734e144 100644
--- a/src/transport/plugin_transport_http_server.c
+++ b/src/transport/plugin_transport_http_server.c
@@ -1857,8 +1857,11 @@ server_add_address (void *cls, int add_remove, const struct sockaddr *addr,
1857 GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, 1857 GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
1858 "Notifying transport to add address `%s'\n", 1858 "Notifying transport to add address `%s'\n",
1859 http_common_plugin_address_to_string(NULL, w->addr, w->addrlen)); 1859 http_common_plugin_address_to_string(NULL, w->addr, w->addrlen));
1860 1860#if BUILD_HTTPS
1861 plugin->env->notify_address (plugin->env->cls, add_remove, w->addr, w->addrlen, "https_client");
1862#else
1861 plugin->env->notify_address (plugin->env->cls, add_remove, w->addr, w->addrlen, "http_client"); 1863 plugin->env->notify_address (plugin->env->cls, add_remove, w->addr, w->addrlen, "http_client");
1864#endif
1862} 1865}
1863 1866
1864 1867
@@ -1889,7 +1892,11 @@ server_remove_address (void *cls, int add_remove, const struct sockaddr *addr,
1889 "Notifying transport to remove address `%s'\n", 1892 "Notifying transport to remove address `%s'\n",
1890 http_common_plugin_address_to_string (NULL, w->addr, w->addrlen)); 1893 http_common_plugin_address_to_string (NULL, w->addr, w->addrlen));
1891 GNUNET_CONTAINER_DLL_remove (plugin->addr_head, plugin->addr_tail, w); 1894 GNUNET_CONTAINER_DLL_remove (plugin->addr_head, plugin->addr_tail, w);
1895#if BUILD_HTTPS
1896 plugin->env->notify_address (plugin->env->cls, add_remove, w->addr, w->addrlen, "https_client");
1897#else
1892 plugin->env->notify_address (plugin->env->cls, add_remove, w->addr, w->addrlen, "http_client"); 1898 plugin->env->notify_address (plugin->env->cls, add_remove, w->addr, w->addrlen, "http_client");
1899#endif
1893 GNUNET_free (w->addr); 1900 GNUNET_free (w->addr);
1894 GNUNET_free (w); 1901 GNUNET_free (w);
1895} 1902}
@@ -2253,9 +2260,16 @@ server_notify_external_hostname (void *cls, const struct GNUNET_SCHEDULER_TaskCo
2253 plugin->ext_addr_len = strlen (plugin->ext_addr) + 1; 2260 plugin->ext_addr_len = strlen (plugin->ext_addr) + 1;
2254 GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, 2261 GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
2255 "Notifying transport about external hostname address `%s'\n", plugin->ext_addr); 2262 "Notifying transport about external hostname address `%s'\n", plugin->ext_addr);
2263
2264#if BUILD_HTTPS
2265 plugin->env->notify_address (plugin->env->cls, GNUNET_YES,
2266 plugin->ext_addr, plugin->ext_addr_len,
2267 "https_client");
2268#else
2256 plugin->env->notify_address (plugin->env->cls, GNUNET_YES, 2269 plugin->env->notify_address (plugin->env->cls, GNUNET_YES,
2257 plugin->ext_addr, plugin->ext_addr_len, 2270 plugin->ext_addr, plugin->ext_addr_len,
2258 "http_client"); 2271 "http_client");
2272#endif
2259} 2273}
2260 2274
2261 2275
@@ -2494,11 +2508,20 @@ LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls)
2494 http_common_plugin_address_to_string (NULL, 2508 http_common_plugin_address_to_string (NULL,
2495 plugin->ext_addr, 2509 plugin->ext_addr,
2496 plugin->ext_addr_len)); 2510 plugin->ext_addr_len));
2511#if BUILD_HTTPS
2497 plugin->env->notify_address (plugin->env->cls, 2512 plugin->env->notify_address (plugin->env->cls,
2498 GNUNET_NO, 2513 GNUNET_NO,
2499 plugin->ext_addr, 2514 plugin->ext_addr,
2500 plugin->ext_addr_len, 2515 plugin->ext_addr_len,
2501 "http_client"); 2516 "https_client");
2517#else
2518 plugin->env->notify_address (plugin->env->cls,
2519 GNUNET_NO,
2520 plugin->ext_addr,
2521 plugin->ext_addr_len,
2522 "http_client");
2523#endif
2524
2502 } 2525 }
2503 2526
2504 /* Stop to report addresses to transport service */ 2527 /* Stop to report addresses to transport service */
diff --git a/src/transport/test_quota_compliance_https_asymmetric_peer1.conf b/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
index ad4aab0fd..092762781 100644
--- a/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
@@ -1,12 +1,9 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test_quota_compliance_peer1/ 3SERVICEHOME = /tmp/test_quota_compliance_peer1/
4DEFAULTCONFIG = test_quota_compliance_https_peer1.conf 4DEFAULTCONFIG = test_quota_compliance_https_asymmetric_peer1.conf
5 5
6[transport-https] 6[transport-https_client]
7PORT = 4001
8KEY_FILE = https_key_quota_p1.key
9CERT_FILE = https_cert_quota_p1.crt
10 7
11[arm] 8[arm]
12PORT = 4006 9PORT = 4006
@@ -26,7 +23,7 @@ UNIXPATH = /tmp/test_quota_compliance_https_peerinfo_peer1.sock
26 23
27[transport] 24[transport]
28PORT = 4002 25PORT = 4002
29PLUGINS = https 26PLUGINS = https_client
30UNIXPATH = /tmp/test_quota_compliance_https_transport_peer1.sock 27UNIXPATH = /tmp/test_quota_compliance_https_transport_peer1.sock
31 28
32 29
diff --git a/src/transport/test_quota_compliance_https_asymmetric_peer2.conf b/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
index 94d7412af..6646a582c 100644
--- a/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
@@ -1,9 +1,9 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test_quota_compliance_peer2 3SERVICEHOME = /tmp/test_quota_compliance_peer2
4DEFAULTCONFIG = test_quota_compliance_https_peer2.conf 4DEFAULTCONFIG = test_quota_compliance_https_asymmetric_peer2.conf
5 5
6[transport-https] 6[transport-https_server]
7PORT = 3001 7PORT = 3001
8KEY_FILE = https_key_quota_p2.key 8KEY_FILE = https_key_quota_p2.key
9CERT_FILE = https_cert_qutoa_p2.crt 9CERT_FILE = https_cert_qutoa_p2.crt
@@ -26,7 +26,7 @@ UNIXPATH = /tmp/test_quota_compliance_https_peerinfo_peer2.sock
26 26
27[transport] 27[transport]
28PORT = 3002 28PORT = 3002
29PLUGINS = https 29PLUGINS = https_server
30UNIXPATH = /tmp/https_transport_peer2.sock 30UNIXPATH = /tmp/https_transport_peer2.sock
31 31
32 32
diff --git a/src/transport/test_quota_compliance_https_peer1.conf b/src/transport/test_quota_compliance_https_peer1.conf
index ad4aab0fd..a23b2ad01 100644
--- a/src/transport/test_quota_compliance_https_peer1.conf
+++ b/src/transport/test_quota_compliance_https_peer1.conf
@@ -3,10 +3,7 @@
3SERVICEHOME = /tmp/test_quota_compliance_peer1/ 3SERVICEHOME = /tmp/test_quota_compliance_peer1/
4DEFAULTCONFIG = test_quota_compliance_https_peer1.conf 4DEFAULTCONFIG = test_quota_compliance_https_peer1.conf
5 5
6[transport-https] 6[transport-https_client]
7PORT = 4001
8KEY_FILE = https_key_quota_p1.key
9CERT_FILE = https_cert_quota_p1.crt
10 7
11[arm] 8[arm]
12PORT = 4006 9PORT = 4006
@@ -26,7 +23,7 @@ UNIXPATH = /tmp/test_quota_compliance_https_peerinfo_peer1.sock
26 23
27[transport] 24[transport]
28PORT = 4002 25PORT = 4002
29PLUGINS = https 26PLUGINS = https_client
30UNIXPATH = /tmp/test_quota_compliance_https_transport_peer1.sock 27UNIXPATH = /tmp/test_quota_compliance_https_transport_peer1.sock
31 28
32 29
diff --git a/src/transport/test_quota_compliance_https_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf
index 94d7412af..490b97983 100644
--- a/src/transport/test_quota_compliance_https_peer2.conf
+++ b/src/transport/test_quota_compliance_https_peer2.conf
@@ -3,7 +3,7 @@
3SERVICEHOME = /tmp/test_quota_compliance_peer2 3SERVICEHOME = /tmp/test_quota_compliance_peer2
4DEFAULTCONFIG = test_quota_compliance_https_peer2.conf 4DEFAULTCONFIG = test_quota_compliance_https_peer2.conf
5 5
6[transport-https] 6[transport-https_server]
7PORT = 3001 7PORT = 3001
8KEY_FILE = https_key_quota_p2.key 8KEY_FILE = https_key_quota_p2.key
9CERT_FILE = https_cert_qutoa_p2.crt 9CERT_FILE = https_cert_qutoa_p2.crt
@@ -26,7 +26,7 @@ UNIXPATH = /tmp/test_quota_compliance_https_peerinfo_peer2.sock
26 26
27[transport] 27[transport]
28PORT = 3002 28PORT = 3002
29PLUGINS = https 29PLUGINS = https_server
30UNIXPATH = /tmp/https_transport_peer2.sock 30UNIXPATH = /tmp/https_transport_peer2.sock
31 31
32 32
diff --git a/src/transport/test_transport_api_https_peer1.conf b/src/transport/test_transport_api_https_peer1.conf
index 8a93ca1e8..b387e5a10 100644
--- a/src/transport/test_transport_api_https_peer1.conf
+++ b/src/transport/test_transport_api_https_peer1.conf
@@ -3,7 +3,7 @@
3SERVICEHOME = /tmp/test-transport/api-https-p1/ 3SERVICEHOME = /tmp/test-transport/api-https-p1/
4DEFAULTCONFIG = test_transport_api_https_peer1.conf 4DEFAULTCONFIG = test_transport_api_https_peer1.conf
5 5
6[transport-https] 6[transport-https_client]
7PORT = 12100 7PORT = 12100
8KEY_FILE = $SERVICEHOME/https_key_p1.key 8KEY_FILE = $SERVICEHOME/https_key_p1.key
9CERT_FILE = $SERVICEHOME/https_cert_p1.crt 9CERT_FILE = $SERVICEHOME/https_cert_p1.crt
@@ -25,7 +25,7 @@ UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
25 25
26[transport] 26[transport]
27PORT = 12101 27PORT = 12101
28PLUGINS = https 28PLUGINS = https_client
29UNIXPATH = /tmp/gnunet-p1-service-transport.sock 29UNIXPATH = /tmp/gnunet-p1-service-transport.sock
30DEBUG = NO 30DEBUG = NO
31 31
diff --git a/src/transport/test_transport_api_https_peer2.conf b/src/transport/test_transport_api_https_peer2.conf
index 0710f41ce..345ef1518 100644
--- a/src/transport/test_transport_api_https_peer2.conf
+++ b/src/transport/test_transport_api_https_peer2.conf
@@ -3,7 +3,7 @@
3SERVICEHOME = /tmp/test-transport/api-https-p2/ 3SERVICEHOME = /tmp/test-transport/api-https-p2/
4DEFAULTCONFIG = test_transport_api_https_peer2.conf 4DEFAULTCONFIG = test_transport_api_https_peer2.conf
5 5
6[transport-https] 6[transport-https_server]
7PORT = 12110 7PORT = 12110
8KEY_FILE = $SERVICEHOME/https_key_p2.key 8KEY_FILE = $SERVICEHOME/https_key_p2.key
9CERT_FILE = $SERVICEHOME/https_cert_p2.crt 9CERT_FILE = $SERVICEHOME/https_cert_p2.crt
@@ -26,7 +26,7 @@ UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
26 26
27[transport] 27[transport]
28PORT = 12111 28PORT = 12111
29PLUGINS = https 29PLUGINS = https_server
30UNIXPATH = /tmp/gnunet-p2-service-transport.sock 30UNIXPATH = /tmp/gnunet-p2-service-transport.sock
31DEBUG = NO 31DEBUG = NO
32 32
diff --git a/src/transport/test_transport_api_reliability_https_peer1.conf b/src/transport/test_transport_api_reliability_https_peer1.conf
index 0699f69c8..4a2c0b5a6 100644
--- a/src/transport/test_transport_api_reliability_https_peer1.conf
+++ b/src/transport/test_transport_api_reliability_https_peer1.conf
@@ -3,10 +3,7 @@
3SERVICEHOME = /tmp/test-transport/api-https-p1/ 3SERVICEHOME = /tmp/test-transport/api-https-p1/
4DEFAULTCONFIG = test_transport_api_reliability_https_peer1.conf 4DEFAULTCONFIG = test_transport_api_reliability_https_peer1.conf
5 5
6[transport-https] 6[transport-https_client]
7PORT = 12300
8KEY_FILE = $SERVICEHOME/https_key_p1.key
9CERT_FILE = $SERVICEHOME/https_cert_p1.crt
10 7
11[arm] 8[arm]
12PORT = 12305 9PORT = 12305
@@ -26,6 +23,6 @@ UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
26 23
27[transport] 24[transport]
28PORT = 12301 25PORT = 12301
29PLUGINS = https 26PLUGINS = https_client
30UNIXPATH = /tmp/gnunet-p1-service-transport.sock 27UNIXPATH = /tmp/gnunet-p1-service-transport.sock
31 28
diff --git a/src/transport/test_transport_api_reliability_https_peer2.conf b/src/transport/test_transport_api_reliability_https_peer2.conf
index bd344abc4..5a21188da 100644
--- a/src/transport/test_transport_api_reliability_https_peer2.conf
+++ b/src/transport/test_transport_api_reliability_https_peer2.conf
@@ -3,7 +3,7 @@
3SERVICEHOME = /tmp/test-transport/api-https-p2/ 3SERVICEHOME = /tmp/test-transport/api-https-p2/
4DEFAULTCONFIG = test_transport_api_reliability_https_peer2.conf 4DEFAULTCONFIG = test_transport_api_reliability_https_peer2.conf
5 5
6[transport-https] 6[transport-https_server]
7PORT = 12310 7PORT = 12310
8KEY_FILE = $SERVICEHOME/https_key_p2.key 8KEY_FILE = $SERVICEHOME/https_key_p2.key
9CERT_FILE = $SERVICEHOME/https_cert_p2.crt 9CERT_FILE = $SERVICEHOME/https_cert_p2.crt
@@ -26,7 +26,7 @@ UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
26 26
27[transport] 27[transport]
28PORT = 12311 28PORT = 12311
29PLUGINS = https 29PLUGINS = https_server
30UNIXPATH = /tmp/gnunet-p2-service-transport.sock 30UNIXPATH = /tmp/gnunet-p2-service-transport.sock
31 31
32 32
diff --git a/src/transport/test_transport_api_timeout_https_peer1.conf b/src/transport/test_transport_api_timeout_https_peer1.conf
index 8a93ca1e8..c8a26d2af 100644
--- a/src/transport/test_transport_api_timeout_https_peer1.conf
+++ b/src/transport/test_transport_api_timeout_https_peer1.conf
@@ -1,12 +1,9 @@
1@INLINE@ template_cfg_peer1.conf 1@INLINE@ template_cfg_peer1.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-https-p1/ 3SERVICEHOME = /tmp/test-transport/api-https-p1/
4DEFAULTCONFIG = test_transport_api_https_peer1.conf 4DEFAULTCONFIG = test_transport_api_timeout_https_peer1.conf
5 5
6[transport-https] 6[transport-https_client]
7PORT = 12100
8KEY_FILE = $SERVICEHOME/https_key_p1.key
9CERT_FILE = $SERVICEHOME/https_cert_p1.crt
10 7
11[arm] 8[arm]
12PORT = 12105 9PORT = 12105
@@ -25,7 +22,7 @@ UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
25 22
26[transport] 23[transport]
27PORT = 12101 24PORT = 12101
28PLUGINS = https 25PLUGINS = https_client
29UNIXPATH = /tmp/gnunet-p1-service-transport.sock 26UNIXPATH = /tmp/gnunet-p1-service-transport.sock
30DEBUG = NO 27DEBUG = NO
31 28
diff --git a/src/transport/test_transport_api_timeout_https_peer2.conf b/src/transport/test_transport_api_timeout_https_peer2.conf
index 0710f41ce..3daf94bb1 100644
--- a/src/transport/test_transport_api_timeout_https_peer2.conf
+++ b/src/transport/test_transport_api_timeout_https_peer2.conf
@@ -1,9 +1,9 @@
1@INLINE@ template_cfg_peer2.conf 1@INLINE@ template_cfg_peer2.conf
2[PATHS] 2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-https-p2/ 3SERVICEHOME = /tmp/test-transport/api-https-p2/
4DEFAULTCONFIG = test_transport_api_https_peer2.conf 4DEFAULTCONFIG = test_transport_api_timeout_https_peer2.conf
5 5
6[transport-https] 6[transport-https_server]
7PORT = 12110 7PORT = 12110
8KEY_FILE = $SERVICEHOME/https_key_p2.key 8KEY_FILE = $SERVICEHOME/https_key_p2.key
9CERT_FILE = $SERVICEHOME/https_cert_p2.crt 9CERT_FILE = $SERVICEHOME/https_cert_p2.crt
@@ -26,7 +26,7 @@ UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
26 26
27[transport] 27[transport]
28PORT = 12111 28PORT = 12111
29PLUGINS = https 29PLUGINS = https_server
30UNIXPATH = /tmp/gnunet-p2-service-transport.sock 30UNIXPATH = /tmp/gnunet-p2-service-transport.sock
31DEBUG = NO 31DEBUG = NO
32 32