aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/transport/test_quota_compliance_http_peer1.conf22
-rw-r--r--src/transport/test_quota_compliance_http_peer2.conf31
-rw-r--r--src/transport/test_quota_compliance_https_peer1.conf29
-rw-r--r--src/transport/test_quota_compliance_https_peer2.conf30
4 files changed, 52 insertions, 60 deletions
diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf
index 190410d91..d709a4f53 100644
--- a/src/transport/test_quota_compliance_http_peer1.conf
+++ b/src/transport/test_quota_compliance_http_peer1.conf
@@ -31,7 +31,7 @@ MINIMUM-FRIENDS = 0
31AUTOSTART = NO 31AUTOSTART = NO
32 32
33[transport-http] 33[transport-http]
34PORT = 4389 34PORT = 4010
35DEBUG = NO 35DEBUG = NO
36USE_IPv4 = YES 36USE_IPv4 = YES
37USE_IPv6 = NO 37USE_IPv6 = NO
@@ -39,6 +39,8 @@ BINDTO4 = 127.0.0.1
39#BINDTO6 = ::1 39#BINDTO6 = ::1
40 40
41[transport] 41[transport]
42PORT = 4011
43UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_http_transport_peer1.sock
42plugins = http 44plugins = http
43#DEBUG = YES 45#DEBUG = YES
44PREFIX = 46PREFIX =
@@ -49,10 +51,10 @@ BINARY = gnunet-service-transport
49CONFIG = $DEFAULTCONFIG 51CONFIG = $DEFAULTCONFIG
50HOME = $SERVICEHOME 52HOME = $SERVICEHOME
51HOSTNAME = localhost 53HOSTNAME = localhost
52PORT = 4091
53UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_transport_peer1.sock
54 54
55[peerinfo] 55[peerinfo]
56PORT = 4012
57UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_http_peerinfo_peer1.sock
56TRUST = $SERVICEHOME/data/credit/ 58TRUST = $SERVICEHOME/data/credit/
57HOSTS = $SERVICEHOME/data/hosts/ 59HOSTS = $SERVICEHOME/data/hosts/
58ACCEPT_FROM6 = ::1; 60ACCEPT_FROM6 = ::1;
@@ -61,30 +63,30 @@ BINARY = gnunet-service-peerinfo
61CONFIG = $DEFAULTCONFIG 63CONFIG = $DEFAULTCONFIG
62HOME = $SERVICEHOME 64HOME = $SERVICEHOME
63HOSTNAME = localhost 65HOSTNAME = localhost
64PORT = 4090
65UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_peerinfo_peer1.sock
66 66
67[resolver] 67[resolver]
68PORT = 4013
69UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_http_resolver_peer1.sock
68ACCEPT_FROM6 = ::1; 70ACCEPT_FROM6 = ::1;
69ACCEPT_FROM = 127.0.0.1; 71ACCEPT_FROM = 127.0.0.1;
70BINARY = gnunet-service-resolver 72BINARY = gnunet-service-resolver
71CONFIG = $DEFAULTCONFIG 73CONFIG = $DEFAULTCONFIG
72HOME = $SERVICEHOME 74HOME = $SERVICEHOME
73HOSTNAME = localhost 75HOSTNAME = localhost
74PORT = 4089
75UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_resolver_peer1.sock
76 76
77[statistics] 77[statistics]
78PORT = 4014
79UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_http_statistics_peer1.sock
78ACCEPT_FROM6 = ::1; 80ACCEPT_FROM6 = ::1;
79ACCEPT_FROM = 127.0.0.1; 81ACCEPT_FROM = 127.0.0.1;
80BINARY = gnunet-service-statistics 82BINARY = gnunet-service-statistics
81CONFIG = $DEFAULTCONFIG 83CONFIG = $DEFAULTCONFIG
82HOME = $SERVICEHOME 84HOME = $SERVICEHOME
83HOSTNAME = localhost 85HOSTNAME = localhost
84PORT = 4088
85UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_statistics_peer1.sock
86 86
87[arm] 87[arm]
88PORT = 4015
89UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_http_arm_peer1.sock
88DEFAULTSERVICES = 90DEFAULTSERVICES =
89ACCEPT_FROM6 = ::1; 91ACCEPT_FROM6 = ::1;
90ACCEPT_FROM = 127.0.0.1; 92ACCEPT_FROM = 127.0.0.1;
@@ -92,8 +94,6 @@ BINARY = gnunet-service-arm
92CONFIG = $DEFAULTCONFIG 94CONFIG = $DEFAULTCONFIG
93HOME = $SERVICEHOME 95HOME = $SERVICEHOME
94HOSTNAME = localhost 96HOSTNAME = localhost
95PORT = 4087
96UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_arm_peer1.sock
97 97
98[TESTING] 98[TESTING]
99WEAKRANDOM = YES 99WEAKRANDOM = YES
diff --git a/src/transport/test_quota_compliance_http_peer2.conf b/src/transport/test_quota_compliance_http_peer2.conf
index b69e77200..0781778ff 100644
--- a/src/transport/test_quota_compliance_http_peer2.conf
+++ b/src/transport/test_quota_compliance_http_peer2.conf
@@ -3,22 +3,13 @@ SERVICEHOME = /tmp/test_quota_compliance_peer2
3DEFAULTCONFIG = test_quota_compliance_http_peer2.conf 3DEFAULTCONFIG = test_quota_compliance_http_peer2.conf
4 4
5[transport-http] 5[transport-http]
6PORT = 3389 6PORT = 3010
7DEBUG = NO 7DEBUG = NO
8USE_IPv4 = YES 8USE_IPv4 = YES
9USE_IPv6 = NO 9USE_IPv6 = NO
10BINDTO4 = 127.0.0.1 10BINDTO4 = 127.0.0.1
11#BINDTO6 = ::1 11#BINDTO6 = ::1
12 12
13
14[transport-udp]
15PORT = 3094
16
17[transport-tcp]
18TIMEOUT = 300000
19PORT = 3094
20BINDTO = 127.0.0.1
21
22[fs] 13[fs]
23AUTOSTART = NO 14AUTOSTART = NO
24 15
@@ -48,6 +39,8 @@ MINIMUM-FRIENDS = 0
48AUTOSTART = NO 39AUTOSTART = NO
49 40
50[transport] 41[transport]
42PORT = 3011
43UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_http_transport_peer2.sock
51plugins = http 44plugins = http
52#DEBUG = YES 45#DEBUG = YES
53PREFIX = 46PREFIX =
@@ -58,10 +51,10 @@ BINARY = gnunet-service-transport
58CONFIG = $DEFAULTCONFIG 51CONFIG = $DEFAULTCONFIG
59HOME = $SERVICEHOME 52HOME = $SERVICEHOME
60HOSTNAME = localhost 53HOSTNAME = localhost
61PORT = 3091
62UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_transport_peer2.sock
63 54
64[peerinfo] 55[peerinfo]
56PORT = 3012
57UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_http_peerinfo_peer2.sock
65TRUST = $SERVICEHOME/data/credit/ 58TRUST = $SERVICEHOME/data/credit/
66HOSTS = $SERVICEHOME/data/hosts/ 59HOSTS = $SERVICEHOME/data/hosts/
67ACCEPT_FROM6 = ::1; 60ACCEPT_FROM6 = ::1;
@@ -70,30 +63,30 @@ BINARY = gnunet-service-peerinfo
70CONFIG = $DEFAULTCONFIG 63CONFIG = $DEFAULTCONFIG
71HOME = $SERVICEHOME 64HOME = $SERVICEHOME
72HOSTNAME = localhost 65HOSTNAME = localhost
73PORT = 3090
74UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_peerinfo_peer2.sock
75 66
76[resolver] 67[resolver]
68PORT = 3013
69UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_http_resolver_peer2.sock
77ACCEPT_FROM6 = ::1; 70ACCEPT_FROM6 = ::1;
78ACCEPT_FROM = 127.0.0.1; 71ACCEPT_FROM = 127.0.0.1;
79BINARY = gnunet-service-resolver 72BINARY = gnunet-service-resolver
80CONFIG = $DEFAULTCONFIG 73CONFIG = $DEFAULTCONFIG
81HOME = $SERVICEHOME 74HOME = $SERVICEHOME
82HOSTNAME = localhost 75HOSTNAME = localhost
83PORT = 3089
84UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_resolver_peer2.sock
85 76
86[statistics] 77[statistics]
78PORT = 3014
79UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_http_statistics_peer2.sock
87ACCEPT_FROM6 = ::1; 80ACCEPT_FROM6 = ::1;
88ACCEPT_FROM = 127.0.0.1; 81ACCEPT_FROM = 127.0.0.1;
89BINARY = gnunet-service-statistics 82BINARY = gnunet-service-statistics
90CONFIG = $DEFAULTCONFIG 83CONFIG = $DEFAULTCONFIG
91HOME = $SERVICEHOME 84HOME = $SERVICEHOME
92HOSTNAME = localhost 85HOSTNAME = localhost
93PORT = 3088
94UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_statistics_peer2.sock
95 86
96[arm] 87[arm]
88PORT = 3015
89UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_http_arm_peer2.sock
97DEFAULTSERVICES = 90DEFAULTSERVICES =
98ACCEPT_FROM6 = ::1; 91ACCEPT_FROM6 = ::1;
99ACCEPT_FROM = 127.0.0.1; 92ACCEPT_FROM = 127.0.0.1;
@@ -101,8 +94,6 @@ BINARY = gnunet-service-arm
101CONFIG = $DEFAULTCONFIG 94CONFIG = $DEFAULTCONFIG
102HOME = $SERVICEHOME 95HOME = $SERVICEHOME
103HOSTNAME = localhost 96HOSTNAME = localhost
104PORT = 3087
105UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_arm_peer2.sock
106 97
107[TESTING] 98[TESTING]
108WEAKRANDOM = YES 99WEAKRANDOM = YES
diff --git a/src/transport/test_quota_compliance_https_peer1.conf b/src/transport/test_quota_compliance_https_peer1.conf
index b2c4ea9f2..cb95e92bc 100644
--- a/src/transport/test_quota_compliance_https_peer1.conf
+++ b/src/transport/test_quota_compliance_https_peer1.conf
@@ -37,14 +37,16 @@ USE_IPv4 = YES
37USE_IPv6 = NO 37USE_IPv6 = NO
38BINDTO4 = 127.0.0.1 38BINDTO4 = 127.0.0.1
39#BINDTO6 = ::1 39#BINDTO6 = ::1
40KEY_FILE = https_key_p1.key 40KEY_FILE = https_key_quota_p1.key
41CERT_FILE = https_cert_p1.crt 41CERT_FILE = https_cert_quota_p1.crt
42CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL 42CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
43#CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL 43#CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL
44#CRYPTO_INIT = PERFORMANCE 44#CRYPTO_INIT = PERFORMANCE
45 45
46 46
47[transport] 47[transport]
48PORT = 4002
49UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_ctransport_peer1.sock
48plugins = https 50plugins = https
49#DEBUG = YES 51#DEBUG = YES
50PREFIX = 52PREFIX =
@@ -55,10 +57,11 @@ BINARY = gnunet-service-transport
55CONFIG = $DEFAULTCONFIG 57CONFIG = $DEFAULTCONFIG
56HOME = $SERVICEHOME 58HOME = $SERVICEHOME
57HOSTNAME = localhost 59HOSTNAME = localhost
58PORT = 4091 60
59UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_transport_peer1.sock
60 61
61[peerinfo] 62[peerinfo]
63PORT = 4003
64UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_https_peerinfo_peer1.sock
62TRUST = $SERVICEHOME/data/credit/ 65TRUST = $SERVICEHOME/data/credit/
63HOSTS = $SERVICEHOME/data/hosts/ 66HOSTS = $SERVICEHOME/data/hosts/
64ACCEPT_FROM6 = ::1; 67ACCEPT_FROM6 = ::1;
@@ -67,30 +70,31 @@ BINARY = gnunet-service-peerinfo
67CONFIG = $DEFAULTCONFIG 70CONFIG = $DEFAULTCONFIG
68HOME = $SERVICEHOME 71HOME = $SERVICEHOME
69HOSTNAME = localhost 72HOSTNAME = localhost
70PORT = 4090 73
71UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_peerinfo_peer1.sock
72 74
73[resolver] 75[resolver]
76PORT = 4004
77UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_https_resolver_peer1.sock
74ACCEPT_FROM6 = ::1; 78ACCEPT_FROM6 = ::1;
75ACCEPT_FROM = 127.0.0.1; 79ACCEPT_FROM = 127.0.0.1;
76BINARY = gnunet-service-resolver 80BINARY = gnunet-service-resolver
77CONFIG = $DEFAULTCONFIG 81CONFIG = $DEFAULTCONFIG
78HOME = $SERVICEHOME 82HOME = $SERVICEHOME
79HOSTNAME = localhost 83HOSTNAME = localhost
80PORT = 4089
81UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_resolver_peer1.sock
82 84
83[statistics] 85[statistics]
86PORT = 4005
87UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_https_statistics_peer1.sock
84ACCEPT_FROM6 = ::1; 88ACCEPT_FROM6 = ::1;
85ACCEPT_FROM = 127.0.0.1; 89ACCEPT_FROM = 127.0.0.1;
86BINARY = gnunet-service-statistics 90BINARY = gnunet-service-statistics
87CONFIG = $DEFAULTCONFIG 91CONFIG = $DEFAULTCONFIG
88HOME = $SERVICEHOME 92HOME = $SERVICEHOME
89HOSTNAME = localhost 93HOSTNAME = localhost
90PORT = 4088
91UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_statistics_peer1.sock
92 94
93[arm] 95[arm]
96PORT = 4006
97UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_https_arm_peer1.sock
94DEFAULTSERVICES = 98DEFAULTSERVICES =
95ACCEPT_FROM6 = ::1; 99ACCEPT_FROM6 = ::1;
96ACCEPT_FROM = 127.0.0.1; 100ACCEPT_FROM = 127.0.0.1;
@@ -98,8 +102,6 @@ BINARY = gnunet-service-arm
98CONFIG = $DEFAULTCONFIG 102CONFIG = $DEFAULTCONFIG
99HOME = $SERVICEHOME 103HOME = $SERVICEHOME
100HOSTNAME = localhost 104HOSTNAME = localhost
101PORT = 4087
102UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_arm_peer1.sock
103 105
104[TESTING] 106[TESTING]
105WEAKRANDOM = YES 107WEAKRANDOM = YES
@@ -107,8 +109,5 @@ WEAKRANDOM = YES
107[gnunetd] 109[gnunetd]
108HOSTKEY = $SERVICEHOME/.hostkey 110HOSTKEY = $SERVICEHOME/.hostkey
109 111
110
111[dht] 112[dht]
112AUTOSTART = NO 113AUTOSTART = NO
113
114
diff --git a/src/transport/test_quota_compliance_https_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf
index bf9debcf0..1602c0ae7 100644
--- a/src/transport/test_quota_compliance_https_peer2.conf
+++ b/src/transport/test_quota_compliance_https_peer2.conf
@@ -1,5 +1,5 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/test_quota_compliance_peer2 2SERVICEHOME = /tmp/test_quota_compliance_https_peer2
3DEFAULTCONFIG = test_quota_compliance_https_peer2.conf 3DEFAULTCONFIG = test_quota_compliance_https_peer2.conf
4 4
5[transport-https] 5[transport-https]
@@ -9,13 +9,12 @@ USE_IPv4 = YES
9USE_IPv6 = NO 9USE_IPv6 = NO
10BINDTO4 = 127.0.0.1 10BINDTO4 = 127.0.0.1
11#BINDTO6 = ::1 11#BINDTO6 = ::1
12KEY_FILE = https_key_p1.key 12KEY_FILE = https_key_quota_p2.key
13CERT_FILE = https_cert_p1.crt 13CERT_FILE = https_cert_qutoa_p2.crt
14CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL 14CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
15#CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL 15#CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL
16#CRYPTO_INIT = PERFORMANCE 16#CRYPTO_INIT = PERFORMANCE
17 17
18
19[fs] 18[fs]
20AUTOSTART = NO 19AUTOSTART = NO
21 20
@@ -45,6 +44,8 @@ MINIMUM-FRIENDS = 0
45AUTOSTART = NO 44AUTOSTART = NO
46 45
47[transport] 46[transport]
47PORT = 3002
48UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_https_transport_peer2.sock
48plugins = https 49plugins = https
49#DEBUG = YES 50#DEBUG = YES
50PREFIX = 51PREFIX =
@@ -55,10 +56,11 @@ BINARY = gnunet-service-transport
55CONFIG = $DEFAULTCONFIG 56CONFIG = $DEFAULTCONFIG
56HOME = $SERVICEHOME 57HOME = $SERVICEHOME
57HOSTNAME = localhost 58HOSTNAME = localhost
58PORT = 3091 59
59UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_transport_peer2.sock
60 60
61[peerinfo] 61[peerinfo]
62PORT = 3003
63UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_https_peerinfo_peer2.sock
62TRUST = $SERVICEHOME/data/credit/ 64TRUST = $SERVICEHOME/data/credit/
63HOSTS = $SERVICEHOME/data/hosts/ 65HOSTS = $SERVICEHOME/data/hosts/
64ACCEPT_FROM6 = ::1; 66ACCEPT_FROM6 = ::1;
@@ -67,30 +69,31 @@ BINARY = gnunet-service-peerinfo
67CONFIG = $DEFAULTCONFIG 69CONFIG = $DEFAULTCONFIG
68HOME = $SERVICEHOME 70HOME = $SERVICEHOME
69HOSTNAME = localhost 71HOSTNAME = localhost
70PORT = 3090
71UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_peerinfo_peer2.sock
72 72
73[resolver] 73[resolver]
74PORT = 3004
75UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_https_resolver_peer2.sock
74ACCEPT_FROM6 = ::1; 76ACCEPT_FROM6 = ::1;
75ACCEPT_FROM = 127.0.0.1; 77ACCEPT_FROM = 127.0.0.1;
76BINARY = gnunet-service-resolver 78BINARY = gnunet-service-resolver
77CONFIG = $DEFAULTCONFIG 79CONFIG = $DEFAULTCONFIG
78HOME = $SERVICEHOME 80HOME = $SERVICEHOME
79HOSTNAME = localhost 81HOSTNAME = localhost
80PORT = 3089
81UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_resolver_peer2.sock
82 82
83[statistics] 83[statistics]
84PORT = 3005
85UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_https_statistics_peer2.sock
84ACCEPT_FROM6 = ::1; 86ACCEPT_FROM6 = ::1;
85ACCEPT_FROM = 127.0.0.1; 87ACCEPT_FROM = 127.0.0.1;
86BINARY = gnunet-service-statistics 88BINARY = gnunet-service-statistics
87CONFIG = $DEFAULTCONFIG 89CONFIG = $DEFAULTCONFIG
88HOME = $SERVICEHOME 90HOME = $SERVICEHOME
89HOSTNAME = localhost 91HOSTNAME = localhost
90PORT = 3088 92
91UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_statistics_peer2.sock
92 93
93[arm] 94[arm]
95PORT = 3006
96UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_https_arm_peer2.sock
94DEFAULTSERVICES = 97DEFAULTSERVICES =
95ACCEPT_FROM6 = ::1; 98ACCEPT_FROM6 = ::1;
96ACCEPT_FROM = 127.0.0.1; 99ACCEPT_FROM = 127.0.0.1;
@@ -98,8 +101,7 @@ BINARY = gnunet-service-arm
98CONFIG = $DEFAULTCONFIG 101CONFIG = $DEFAULTCONFIG
99HOME = $SERVICEHOME 102HOME = $SERVICEHOME
100HOSTNAME = localhost 103HOSTNAME = localhost
101PORT = 3087 104
102UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_arm_peer2.sock
103 105
104[TESTING] 106[TESTING]
105WEAKRANDOM = YES 107WEAKRANDOM = YES