- 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 8232461e53873ea037d523d09e1efe5e0c0349ac..839cd771a0250e249085e71666f00d1fb0d9fb92 100644 (file)
--- a/src/dv/test_transport_dv_data.conf
+++ b/src/dv/test_transport_dv_data.conf
@@ -1,74 +1,72 @@
 [PATHS]
 SERVICEHOME = /tmp/test-gnunet-dv-testing/
 
-[resolver]
-PORT = 2564
-
 [transport]
 PORT = 2565
 PLUGINS = tcp dv
-BLACKLIST_FILE = $SERVICEHOME/blacklist
-BINARY = gnunet-service-transport
-USE_LOCALADDR = NO
 
 [arm]
-PORT = 2566
-DEFAULTSERVICES =
-
-[statistics]
-PORT = 2567
+DEFAULTSERVICES = core
 
-[transport-tcp]
-PORT = 2568
-BINDTO = 127.0.0.1
+[dv]
+AUTOSTART = YES
+#PREFIX = valgrind 
 
-[transport-udp]
-PORT = 2568
+[set]
+AUTOSTART = YES
 
-[peerinfo]
-PORT = 2569
+[consensus]
+AUTOSTART = NO
 
-[core]
-PORT = 2570
-
-[dv]
-AUTOSTART = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-dv
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 2571
-
-[testing]
-NUM_PEERS = 3
-ADDITIONAL_MESSAGES = 10
-WEAKRANDOM = YES
-TOPOLOGY = CLIQUE
-CONNECT_TOPOLOGY = LINE
-BLACKLIST_TOPOLOGY = LINE
-BLACKLIST_TRANSPORTS = tcp
-F2F = YES
-HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
+[testbed]
+OVERLAY_TOPOLOGY = CLIQUE
+SETUP_TIMEOUT = 30 s
 
 [fs]
 AUTOSTART = NO
 
-[nat]
-DISABLEV6 = YES
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = NO
+[datastore]
+AUTOSTART = NO
 
 [dns]
 AUTOSTART = NO
 
+[nse]
+AUTOSTART = NO
 
+[chat]
+AUTOSTART = NO
 
-[nse]
+[gns]
+AUTOSTART = NO
+
+[vpn]
+AUTOSTART = NO
+
+[namestore]
+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]