Return a token in find_node responses, use it in store_value requests.

[quix0rs-apt-p2p.git] / apt_dht / apt_dht_conf.py

diff --git a/apt_dht/apt_dht_conf.py b/apt_dht/apt_dht_conf.py
index 7ad5d9d2ee086010dd4fdb966642d13904c57931..42a3d38d3bdd002b0e5fc852ab807b7e4123d3a7 100644 (file)
--- a/apt_dht/apt_dht_conf.py
+++ b/apt_dht/apt_dht_conf.py
@@ -16,6 +16,8 @@ if home == '${HOME}' or not os.path.isdir(home):
     home = os.path.expanduser('~')
     if not os.path.isdir(home):
         home = os.path.abspath(os.path.dirname(sys.argv[0]))
+DEFAULT_CONFIG_FILES=['/etc/apt-dht/apt-dht.conf',
+                      home + '/.apt-dht/apt-dht.conf']
 
 DEFAULTS = {
 
@@ -25,8 +27,16 @@ DEFAULTS = {
     # Directory to store the downloaded files in
     'CACHE_DIR': home + '/.apt-dht/cache',
     
+    # Other directories containing packages to share with others
+    # WARNING: all files in these directories will be hashed and available
+    #          for everybody to download
+    'OTHER_DIRS': """""",
+    
     # User name to try and run as
     'USERNAME': '',
+    
+    # Whether it's OK to use an IP addres from a known local/private range
+    'LOCAL_OK': 'no',
 
     # Which DHT implementation to use.
     # It must be possile to do "from <DHT>.DHT import DHT" to get a class that
@@ -40,7 +50,7 @@ DEFAULTS = {
 DHT_DEFAULTS = {
     # bootstrap nodes to contact to join the DHT
     'BOOTSTRAP': """www.camrdale.org:9977
-        steveholt.hopto.org:9977""",
+        steveholt.hopto.org:9976""",
     
     # whether this node is a bootstrap node
     'BOOTSTRAP_NODE': "no",
@@ -52,7 +62,7 @@ DHT_DEFAULTS = {
     'HASH_LENGTH': '160',
     
     # checkpoint every this many seconds
-    'CHECKPOINT_INTERVAL': '15m', # fifteen minutes
+    'CHECKPOINT_INTERVAL': '5m', # five minutes
     
     ### SEARCHING/STORING
     # concurrent xmlrpc calls per find node/value request!
@@ -80,6 +90,9 @@ DHT_DEFAULTS = {
     
     # expire entries older than this
     'KE_AGE': '1h', # 60 minutes
+    
+    # whether to spew info about the requests/responses in the protocol
+    'SPEW': 'yes',
 }
 
 class AptDHTConfigParser(SafeConfigParser):