[GNUnet-SVN] r29496 - gnunet/src/dv

[gnunet]

Author: wachs
Date: 2013-09-23 15:43:21 +0200 (Mon, 23 Sep 2013)
New Revision: 29496

Added:
   gnunet/src/dv/template_dv.conf
Modified:
   gnunet/src/dv/test_transport_blacklist_data.conf
   gnunet/src/dv/test_transport_dv_data.conf
Log:
updated configuration file: 
- moved topology information to template
- blacklist peer IDs match hostkey


Added: gnunet/src/dv/template_dv.conf
===================================================================
--- gnunet/src/dv/template_dv.conf                              (rev 0)
+++ gnunet/src/dv/template_dv.conf      2013-09-23 13:43:21 UTC (rev 29496)
@@ -0,0 +1,68 @@
+# Peers:
+#
+# OF84
+# M1RG
+# 548J
+# 93AR
+#
+# Topology:
+# 
+# Allowed connections: 
+# OF84 - M1RG
+# OF84 - 548J
+# OF84 - 93AR
+
+# 548J - M1RG
+# 548J - 93AR
+#
+# Disallowed connections:
+# M1RG - 93AR
+
+[transport-blacklist-OF84RAOAU2B1SOSEHJH6350MA0F7C98U55RI76LGIQOM7O33TFHPNUFB47CDBSCOLIINMVJ2U82445ABOBQRIVREG20L31KVDV5HG60]
+
+[transport-blacklist-M1RGJB4FQSM17JJ3M9BF7Q0I8MCO8C462NMOHI26RLT7C7A2KE6HCOPRA4ARM5HPL1J9IDDK5G8SFU5GUSHCTBH90ECETK1BFQD76R0]
+93ARIS6Q347RPU9EFPS9LA00VPHQLG3RBLKEKTHV4D6UVGEAC75KIIBFB5U9KK9P9P1RU1CBPV4BSSDUTB2AL2N2LG9KSO9APQNLS0O
 = tcp
+
+[transport-blacklist-548J7M14O4I0F8I84U0UFARVJ97DB6QOT3MCA8O8SNAIT5JJ8TR95LUVAP3N5L7DN33IB49SNMF3Q3C0VPLTGP9ASCULA9S2OIMHHH8]
+
+[transport-blacklist-93ARIS6Q347RPU9EFPS9LA00VPHQLG3RBLKEKTHV4D6UVGEAC75KIIBFB5U9KK9P9P1RU1CBPV4BSSDUTB2AL2N2LG9KSO9APQNLS0O]
+M1RGJB4FQSM17JJ3M9BF7Q0I8MCO8C462NMOHI26RLT7C7A2KE6HCOPRA4ARM5HPL1J9IDDK5G8SFU5GUSHCTBH90ECETK1BFQD76R0
 = tcp
+
+[PATHS]
+SERVICEHOME = /tmp/test-gnunet-dv-testing/
+
+[peerinfo]
+USE_INCLUDED_HELLOS = NO
+
+[arm]
+DEFAULTSERVICES = core
+
+[fs]
+AUTOSTART = NO
+
+[datastore]
+AUTOSTART = NO
+
+[dns]
+AUTOSTART = NO
+
+[nse]
+AUTOSTART = NO
+
+[chat]
+AUTOSTART = NO
+
+[gns]
+AUTOSTART = NO
+
+[vpn]
+AUTOSTART = NO
+
+[namestore]
+AUTOSTART = NO
+
+[lockmanager]
+AUTOSTART = NO
+
+[consensus]
+AUTOSTART = NO

Modified: gnunet/src/dv/test_transport_blacklist_data.conf
===================================================================
--- gnunet/src/dv/test_transport_blacklist_data.conf    2013-09-23 13:13:18 UTC 
(rev 29495)
+++ gnunet/src/dv/test_transport_blacklist_data.conf    2013-09-23 13:43:21 UTC 
(rev 29496)
@@ -1,69 +1,10 @@
-[PATHS]
-SERVICEHOME = /tmp/test-gnunet-dv-testing/
address@hidden@ template_dv.conf
 
 [transport]
 PORT = 2565
 PLUGINS = tcp 
 
-[arm]
-DEFAULTSERVICES = core
-
-[dv]
-AUTOSTART = YES
-PREFIX = valgrind 
-
-[consensus]
-AUTOSTART = NO
-
 [testbed]
 OVERLAY_TOPOLOGY = CLIQUE
 SETUP_TIMEOUT = 5 s
 
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[chat]
-AUTOSTART = NO
-
-[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]
-

Modified: gnunet/src/dv/test_transport_dv_data.conf
===================================================================
--- gnunet/src/dv/test_transport_dv_data.conf   2013-09-23 13:13:18 UTC (rev 
29495)
+++ gnunet/src/dv/test_transport_dv_data.conf   2013-09-23 13:43:21 UTC (rev 
29496)
@@ -1,13 +1,9 @@
-[PATHS]
-SERVICEHOME = /tmp/test-gnunet-dv-testing/
address@hidden@ template_dv.conf
 
 [transport]
 PORT = 2565
 PLUGINS = tcp dv
 
-[arm]
-DEFAULTSERVICES = core
-
 [dv]
 AUTOSTART = YES
 #PREFIX = valgrind 
@@ -15,58 +11,6 @@
 [set]
 AUTOSTART = YES
 
-[consensus]
-AUTOSTART = NO
-
 [testbed]
 OVERLAY_TOPOLOGY = CLIQUE
 SETUP_TIMEOUT = 30 s
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[chat]
-AUTOSTART = NO
-
-[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]
-