- replace deprecated INCLUDES with AM_CPPFLAGS

[oweals/gnunet.git] / src / dv / test_transport_dv_data.conf

diff --git a/src/dv/test_transport_dv_data.conf b/src/dv/test_transport_dv_data.conf
index 9ff130f9c1867d75312a28af86ccc33abf9f6fd3..839cd771a0250e249085e71666f00d1fb0d9fb92 100644 (file)
--- a/src/dv/test_transport_dv_data.conf
+++ b/src/dv/test_transport_dv_data.conf
@@ -4,7 +4,6 @@ SERVICEHOME = /tmp/test-gnunet-dv-testing/
 [transport]
 PORT = 2565
 PLUGINS = tcp dv
-BLACKLIST_FILE = $SERVICEHOME/blacklist
 
 [arm]
 DEFAULTSERVICES = core
@@ -13,11 +12,15 @@ DEFAULTSERVICES = core
 AUTOSTART = YES
 #PREFIX = valgrind 
 
+[set]
+AUTOSTART = YES
+
 [consensus]
-PREFIX = valgrind
+AUTOSTART = NO
 
 [testbed]
 OVERLAY_TOPOLOGY = CLIQUE
+SETUP_TIMEOUT = 30 s
 
 [fs]
 AUTOSTART = NO
@@ -46,3 +49,24 @@ AUTOSTART = NO
 [lockmanager]
 AUTOSTART = NO
 
+# Topology:
+# 5M-HT
+# HT-P5
+# HT-AG
+# 5M-P5
+# 5M-AG
+# Disallowed: P5-AG => needs DV!
+
+[transport-blacklist-HT3HI3HOVEI05OQANEDN3OELVO8LPS6DDGVI612TKMH0TA1R06NGB197LS0HGSIA4BQVBA93S6PCU4M70NN6GSLLML6ADI2CV5KIIE0]
+
+[transport-blacklist-P565723JO1C2HSN6J29TAQ22MN6CI8HTMUU55T0FUQG4CMDGGEQ8UCNBKUMB94GC8R9G4FB2SF9LDOBAJ6AMINBP4JHHDD6L7VD801G]
+# forbid P565 to talk to AG2P via TCP to force DV @ distance 2
+AG2PHES1BARB9IJCPAMJTFPVJ5V3A72S3F2A8SBUB8DAQ2V0O3V8G6G2JU56FHGFOHMQVKBSQFV98TCGTC3RJ1NINP82G0RC00N1520 = tcp
+
+[transport-blacklist-AG2PHES1BARB9IJCPAMJTFPVJ5V3A72S3F2A8SBUB8DAQ2V0O3V8G6G2JU56FHGFOHMQVKBSQFV98TCGTC3RJ1NINP82G0RC00N1520]
+
+# forbid P565 to talk to AG2P via TCP to force DV @ distance 2 (again, just to be sure)
+P565723JO1C2HSN6J29TAQ22MN6CI8HTMUU55T0FUQG4CMDGGEQ8UCNBKUMB94GC8R9G4FB2SF9LDOBAJ6AMINBP4JHHDD6L7VD801G = tcp
+
+[transport-blacklist-5MBMI6V7A8UFH0BD965HNNAQEDBIQRCC4LDNT9Q7KMEAQU00VEJFEQKDU4KCL9E64ACCRO0PJ1C689K765NCAHFUVSV99Q15KPK1RRO]
+