aboutsummaryrefslogtreecommitdiff
path: root/src/dv
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2013-09-23 13:43:21 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2013-09-23 13:43:21 +0000
commit7cb3d0097e196f821007dd8aae52bd488824f2ee (patch)
tree7d97949288759e4047405006ce923467c771ea33 /src/dv
parentd7575b6d9168273a406c3d7df6e3406c23aa05ef (diff)
downloadgnunet-7cb3d0097e196f821007dd8aae52bd488824f2ee.tar.gz
gnunet-7cb3d0097e196f821007dd8aae52bd488824f2ee.zip
updated configuration file:
- moved topology information to template - blacklist peer IDs match hostkey
Diffstat (limited to 'src/dv')
-rw-r--r--src/dv/template_dv.conf68
-rw-r--r--src/dv/test_transport_blacklist_data.conf61
-rw-r--r--src/dv/test_transport_dv_data.conf58
3 files changed, 70 insertions, 117 deletions
diff --git a/src/dv/template_dv.conf b/src/dv/template_dv.conf
new file mode 100644
index 000000000..f0567e823
--- /dev/null
+++ b/src/dv/template_dv.conf
@@ -0,0 +1,68 @@
1# Peers:
2#
3# OF84
4# M1RG
5# 548J
6# 93AR
7#
8# Topology:
9#
10# Allowed connections:
11# OF84 - M1RG
12# OF84 - 548J
13# OF84 - 93AR
14
15# 548J - M1RG
16# 548J - 93AR
17#
18# Disallowed connections:
19# M1RG - 93AR
20
21[transport-blacklist-OF84RAOAU2B1SOSEHJH6350MA0F7C98U55RI76LGIQOM7O33TFHPNUFB47CDBSCOLIINMVJ2U82445ABOBQRIVREG20L31KVDV5HG60]
22
23[transport-blacklist-M1RGJB4FQSM17JJ3M9BF7Q0I8MCO8C462NMOHI26RLT7C7A2KE6HCOPRA4ARM5HPL1J9IDDK5G8SFU5GUSHCTBH90ECETK1BFQD76R0]
2493ARIS6Q347RPU9EFPS9LA00VPHQLG3RBLKEKTHV4D6UVGEAC75KIIBFB5U9KK9P9P1RU1CBPV4BSSDUTB2AL2N2LG9KSO9APQNLS0O = tcp
25
26[transport-blacklist-548J7M14O4I0F8I84U0UFARVJ97DB6QOT3MCA8O8SNAIT5JJ8TR95LUVAP3N5L7DN33IB49SNMF3Q3C0VPLTGP9ASCULA9S2OIMHHH8]
27
28[transport-blacklist-93ARIS6Q347RPU9EFPS9LA00VPHQLG3RBLKEKTHV4D6UVGEAC75KIIBFB5U9KK9P9P1RU1CBPV4BSSDUTB2AL2N2LG9KSO9APQNLS0O]
29M1RGJB4FQSM17JJ3M9BF7Q0I8MCO8C462NMOHI26RLT7C7A2KE6HCOPRA4ARM5HPL1J9IDDK5G8SFU5GUSHCTBH90ECETK1BFQD76R0 = tcp
30
31[PATHS]
32SERVICEHOME = /tmp/test-gnunet-dv-testing/
33
34[peerinfo]
35USE_INCLUDED_HELLOS = NO
36
37[arm]
38DEFAULTSERVICES = core
39
40[fs]
41AUTOSTART = NO
42
43[datastore]
44AUTOSTART = NO
45
46[dns]
47AUTOSTART = NO
48
49[nse]
50AUTOSTART = NO
51
52[chat]
53AUTOSTART = NO
54
55[gns]
56AUTOSTART = NO
57
58[vpn]
59AUTOSTART = NO
60
61[namestore]
62AUTOSTART = NO
63
64[lockmanager]
65AUTOSTART = NO
66
67[consensus]
68AUTOSTART = NO
diff --git a/src/dv/test_transport_blacklist_data.conf b/src/dv/test_transport_blacklist_data.conf
index 8a266a970..11f7cde9c 100644
--- a/src/dv/test_transport_blacklist_data.conf
+++ b/src/dv/test_transport_blacklist_data.conf
@@ -1,69 +1,10 @@
1[PATHS] 1@INLINE@ template_dv.conf
2SERVICEHOME = /tmp/test-gnunet-dv-testing/
3 2
4[transport] 3[transport]
5PORT = 2565 4PORT = 2565
6PLUGINS = tcp 5PLUGINS = tcp
7 6
8[arm]
9DEFAULTSERVICES = core
10
11[dv]
12AUTOSTART = YES
13PREFIX = valgrind
14
15[consensus]
16AUTOSTART = NO
17
18[testbed] 7[testbed]
19OVERLAY_TOPOLOGY = CLIQUE 8OVERLAY_TOPOLOGY = CLIQUE
20SETUP_TIMEOUT = 5 s 9SETUP_TIMEOUT = 5 s
21 10
22[fs]
23AUTOSTART = NO
24
25[datastore]
26AUTOSTART = NO
27
28[dns]
29AUTOSTART = NO
30
31[nse]
32AUTOSTART = NO
33
34[chat]
35AUTOSTART = NO
36
37[gns]
38AUTOSTART = NO
39
40[vpn]
41AUTOSTART = NO
42
43[namestore]
44AUTOSTART = NO
45
46[lockmanager]
47AUTOSTART = NO
48
49# Topology:
50# 5M-HT
51# HT-P5
52# HT-AG
53# 5M-P5
54# 5M-AG
55# Disallowed: P5-AG => needs DV!
56
57[transport-blacklist-HT3HI3HOVEI05OQANEDN3OELVO8LPS6DDGVI612TKMH0TA1R06NGB197LS0HGSIA4BQVBA93S6PCU4M70NN6GSLLML6ADI2CV5KIIE0]
58
59[transport-blacklist-P565723JO1C2HSN6J29TAQ22MN6CI8HTMUU55T0FUQG4CMDGGEQ8UCNBKUMB94GC8R9G4FB2SF9LDOBAJ6AMINBP4JHHDD6L7VD801G]
60# forbid P565 to talk to AG2P via TCP to force DV @ distance 2
61AG2PHES1BARB9IJCPAMJTFPVJ5V3A72S3F2A8SBUB8DAQ2V0O3V8G6G2JU56FHGFOHMQVKBSQFV98TCGTC3RJ1NINP82G0RC00N1520 = tcp
62
63[transport-blacklist-AG2PHES1BARB9IJCPAMJTFPVJ5V3A72S3F2A8SBUB8DAQ2V0O3V8G6G2JU56FHGFOHMQVKBSQFV98TCGTC3RJ1NINP82G0RC00N1520]
64
65# forbid P565 to talk to AG2P via TCP to force DV @ distance 2 (again, just to be sure)
66P565723JO1C2HSN6J29TAQ22MN6CI8HTMUU55T0FUQG4CMDGGEQ8UCNBKUMB94GC8R9G4FB2SF9LDOBAJ6AMINBP4JHHDD6L7VD801G = tcp
67
68[transport-blacklist-5MBMI6V7A8UFH0BD965HNNAQEDBIQRCC4LDNT9Q7KMEAQU00VEJFEQKDU4KCL9E64ACCRO0PJ1C689K765NCAHFUVSV99Q15KPK1RRO]
69
diff --git a/src/dv/test_transport_dv_data.conf b/src/dv/test_transport_dv_data.conf
index 839cd771a..b80ded243 100644
--- a/src/dv/test_transport_dv_data.conf
+++ b/src/dv/test_transport_dv_data.conf
@@ -1,13 +1,9 @@
1[PATHS] 1@INLINE@ template_dv.conf
2SERVICEHOME = /tmp/test-gnunet-dv-testing/
3 2
4[transport] 3[transport]
5PORT = 2565 4PORT = 2565
6PLUGINS = tcp dv 5PLUGINS = tcp dv
7 6
8[arm]
9DEFAULTSERVICES = core
10
11[dv] 7[dv]
12AUTOSTART = YES 8AUTOSTART = YES
13#PREFIX = valgrind 9#PREFIX = valgrind
@@ -15,58 +11,6 @@ AUTOSTART = YES
15[set] 11[set]
16AUTOSTART = YES 12AUTOSTART = YES
17 13
18[consensus]
19AUTOSTART = NO
20
21[testbed] 14[testbed]
22OVERLAY_TOPOLOGY = CLIQUE 15OVERLAY_TOPOLOGY = CLIQUE
23SETUP_TIMEOUT = 30 s 16SETUP_TIMEOUT = 30 s
24
25[fs]
26AUTOSTART = NO
27
28[datastore]
29AUTOSTART = NO
30
31[dns]
32AUTOSTART = NO
33
34[nse]
35AUTOSTART = NO
36
37[chat]
38AUTOSTART = NO
39
40[gns]
41AUTOSTART = NO
42
43[vpn]
44AUTOSTART = NO
45
46[namestore]
47AUTOSTART = NO
48
49[lockmanager]
50AUTOSTART = NO
51
52# Topology:
53# 5M-HT
54# HT-P5
55# HT-AG
56# 5M-P5
57# 5M-AG
58# Disallowed: P5-AG => needs DV!
59
60[transport-blacklist-HT3HI3HOVEI05OQANEDN3OELVO8LPS6DDGVI612TKMH0TA1R06NGB197LS0HGSIA4BQVBA93S6PCU4M70NN6GSLLML6ADI2CV5KIIE0]
61
62[transport-blacklist-P565723JO1C2HSN6J29TAQ22MN6CI8HTMUU55T0FUQG4CMDGGEQ8UCNBKUMB94GC8R9G4FB2SF9LDOBAJ6AMINBP4JHHDD6L7VD801G]
63# forbid P565 to talk to AG2P via TCP to force DV @ distance 2
64AG2PHES1BARB9IJCPAMJTFPVJ5V3A72S3F2A8SBUB8DAQ2V0O3V8G6G2JU56FHGFOHMQVKBSQFV98TCGTC3RJ1NINP82G0RC00N1520 = tcp
65
66[transport-blacklist-AG2PHES1BARB9IJCPAMJTFPVJ5V3A72S3F2A8SBUB8DAQ2V0O3V8G6G2JU56FHGFOHMQVKBSQFV98TCGTC3RJ1NINP82G0RC00N1520]
67
68# forbid P565 to talk to AG2P via TCP to force DV @ distance 2 (again, just to be sure)
69P565723JO1C2HSN6J29TAQ22MN6CI8HTMUU55T0FUQG4CMDGGEQ8UCNBKUMB94GC8R9G4FB2SF9LDOBAJ6AMINBP4JHHDD6L7VD801G = tcp
70
71[transport-blacklist-5MBMI6V7A8UFH0BD965HNNAQEDBIQRCC4LDNT9Q7KMEAQU00VEJFEQKDU4KCL9E64ACCRO0PJ1C689K765NCAHFUVSV99Q15KPK1RRO]
72
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 09:48:21 +0000