+from datetime import datetime
import os, sha, random
from twisted.internet import defer, reactor
from twisted.internet.abstract import isIPAddress
+from twisted.python import log
from twisted.trial import unittest
from zope.interface import implements
from apt_dht.interfaces import IDHT
from khashmir import Khashmir
+from bencode import bencode, bdecode
+
+khashmir_dir = 'apt-dht-Khashmir'
class DHTError(Exception):
"""Represents errors that occur in the DHT."""
self.bootstrap_node = False
self.joining = None
self.joined = False
+ self.outstandingJoins = 0
+ self.foundAddrs = []
self.storing = {}
self.retrieving = {}
self.retrieved = {}
self.config_parser = config
self.section = section
self.config = {}
- self.cache_dir = self.config_parser.get('DEFAULT', 'cache_dir')
+ self.cache_dir = os.path.join(self.config_parser.get(section, 'cache_dir'), khashmir_dir)
+ if not os.path.exists(self.cache_dir):
+ os.makedirs(self.cache_dir)
self.bootstrap = self.config_parser.getstringlist(section, 'BOOTSTRAP')
self.bootstrap_node = self.config_parser.getboolean(section, 'BOOTSTRAP_NODE')
for k in self.config_parser.options(section):
elif k in ['CHECKPOINT_INTERVAL', 'MIN_PING_INTERVAL',
'BUCKET_STALENESS', 'KEINITIAL_DELAY', 'KE_DELAY', 'KE_AGE']:
self.config[k] = self.config_parser.gettime(section, k)
+ elif k in ['SPEW']:
+ self.config[k] = self.config_parser.getboolean(section, k)
else:
self.config[k] = self.config_parser.get(section, k)
- if 'PORT' not in self.config:
- self.config['PORT'] = self.config_parser.getint('DEFAULT', 'PORT')
def join(self):
"""See L{apt_dht.interfaces.IDHT}."""
def _join_gotIP(self, ip, port):
"""Called after an IP address has been found for a single bootstrap node."""
- self.khashmir.addContact(ip, port, self._join_single)
+ self.outstandingJoins += 1
+ self.khashmir.addContact(ip, port, self._join_single, self._join_error)
- def _join_single(self):
+ def _join_single(self, addr):
"""Called when a single bootstrap node has been added."""
- self.khashmir.findCloseNodes(self._join_complete)
+ self.outstandingJoins -= 1
+ if addr:
+ self.foundAddrs.append(addr)
+ if addr or self.outstandingJoins <= 0:
+ self.khashmir.findCloseNodes(self._join_complete, self._join_complete)
+ log.msg('Got back from bootstrap node: %r' % (addr,))
+ def _join_error(self, failure = None):
+ """Called when a single bootstrap node has failed."""
+ self.outstandingJoins -= 1
+ log.msg("bootstrap node could not be reached")
+ if self.outstandingJoins <= 0:
+ self.khashmir.findCloseNodes(self._join_complete, self._join_complete)
+
def _join_complete(self, result):
"""Called when the tables have been initialized with nodes."""
- if not self.joined:
+ if not self.joined and len(result) > 0:
self.joined = True
- if len(result) > 0 or self.bootstrap_node:
- df = self.joining
- self.joining = None
- df.callback(result)
+ if self.joining and self.outstandingJoins <= 0:
+ df = self.joining
+ self.joining = None
+ if self.joined or self.bootstrap_node:
+ self.joined = True
+ df.callback(self.foundAddrs)
else:
- df = self.joining
- self.joining = None
df.errback(DHTError('could not find any nodes to bootstrap to'))
+ def getAddrs(self):
+ return self.foundAddrs
+
def leave(self):
"""See L{apt_dht.interfaces.IDHT}."""
if self.config is None:
self.joined = False
self.khashmir.shutdown()
- def normalizeKey(self, key):
- """Normalize a key's length suitable for insertion in the DHT."""
- key_bytes = (self.config['HASH_LENGTH'] - 1) // 8 + 1
- if len(key) < key_bytes:
- key = key + '\000'*(key_bytes - len(key))
- elif len(key) > key_bytes:
- key = key[:key_bytes]
- return key
-
def getValue(self, key):
"""See L{apt_dht.interfaces.IDHT}."""
if self.config is None:
raise DHTError, "have not joined a network yet"
d = defer.Deferred()
- key = self.normalizeKey(key)
if key not in self.retrieving:
self.khashmir.valueForKey(key, self._getValue)
self.retrieving.setdefault(key, []).append(d)
def _getValue(self, key, result):
if result:
- self.retrieved.setdefault(key, []).extend(result)
+ self.retrieved.setdefault(key, []).extend([bdecode(r) for r in result])
else:
final_result = []
if key in self.retrieved:
if not self.joined:
raise DHTError, "have not joined a network yet"
- key = self.normalizeKey(key)
- if key in self.storing and value in self.storing[key]:
+ bvalue = bencode(value)
+
+ if key in self.storing and bvalue in self.storing[key]:
raise DHTError, "already storing that key with the same value"
d = defer.Deferred()
- self.khashmir.storeValueForKey(key, value, self._storeValue)
- self.storing.setdefault(key, {})[value] = d
+ self.khashmir.storeValueForKey(key, bvalue, self._storeValue)
+ self.storing.setdefault(key, {})[bvalue] = d
return d
- def _storeValue(self, key, value, result):
- if key in self.storing and value in self.storing[key]:
+ def _storeValue(self, key, bvalue, result):
+ if key in self.storing and bvalue in self.storing[key]:
if len(result) > 0:
- self.storing[key][value].callback(result)
+ self.storing[key][bvalue].callback(result)
else:
- self.storing[key][value].errback(DHTError('could not store value %s in key %s' % (value, key)))
- del self.storing[key][value]
+ self.storing[key][bvalue].errback(DHTError('could not store value %s in key %s' % (bvalue, key)))
+ del self.storing[key][bvalue]
if len(self.storing[key].keys()) == 0:
del self.storing[key]
'STORE_REDUNDANCY': 3, 'MAX_FAILURES': 3,
'MIN_PING_INTERVAL': 900,'BUCKET_STALENESS': 3600,
'KEINITIAL_DELAY': 15, 'KE_DELAY': 1200,
- 'KE_AGE': 3600, }
+ 'KE_AGE': 3600, 'SPEW': False, }
def setUp(self):
self.a = DHT()
self.b.bootstrap = ["127.0.0.1:4044"]
self.b.cache_dir = '/tmp'
- def test_normalizeKey(self):
- self.failUnless(self.a.normalizeKey('12345678901234567890') == '12345678901234567890')
- self.failUnless(self.a.normalizeKey('12345678901234567') == '12345678901234567\000\000\000')
- self.failUnless(self.a.normalizeKey('1234567890123456789012345') == '12345678901234567890')
- self.failUnless(self.a.normalizeKey('1234567890123456789') == '1234567890123456789\000')
- self.failUnless(self.a.normalizeKey('123456789012345678901') == '12345678901234567890')
-
def test_bootstrap_join(self):
d = self.a.join()
return d
def tearDown(self):
self.a.leave()
try:
- os.unlink(self.a.khashmir.db)
+ os.unlink(self.a.khashmir.store.db)
except:
pass
self.b.leave()
try:
- os.unlink(self.b.khashmir.db)
+ os.unlink(self.b.khashmir.store.db)
except:
pass
'STORE_REDUNDANCY': 3, 'MAX_FAILURES': 3,
'MIN_PING_INTERVAL': 900,'BUCKET_STALENESS': 3600,
'KEINITIAL_DELAY': 15, 'KE_DELAY': 1200,
- 'KE_AGE': 3600, }
+ 'KE_AGE': 3600, 'SPEW': False, }
def setUp(self):
self.l = []
d.addCallback(self.node_join, 1)
return self.lastDefer
- def value_stored(self, result, value):
- self.stored -= 1
- if self.stored == 0:
+ def store_values(self, result, i = 0, j = 0):
+ if j > i:
+ j -= i+1
+ i += 1
+ if i == len(self.l):
self.get_values()
-
- def store_values(self, result):
- self.stored = 0
- for i in range(len(self.l)):
- for j in range(0, i+1):
- self.stored += 1
- d = self.l[j].storeValue(sha.new(str(self.startport+i)).digest(), str((self.startport+i)*(j+1)))
- d.addCallback(self.value_stored, self.startport+i)
+ else:
+ d = self.l[j].storeValue(sha.new(str(self.startport+i)).digest(), str((self.startport+i)*(j+1)))
+ d.addCallback(self.store_values, i, j+1)
- def check_values(self, result, values):
- self.checked -= 1
- self.failUnless(len(result) == len(values))
- for v in result:
- self.failUnless(v in values)
- if self.checked == 0:
+ def get_values(self, result = None, check = None, i = 0, j = 0):
+ if result is not None:
+ self.failUnless(len(result) == len(check))
+ for v in result:
+ self.failUnless(v in check)
+ if j >= len(self.l):
+ j -= len(self.l)
+ i += 1
+ if i == len(self.l):
self.lastDefer.callback(1)
-
- def get_values(self):
- self.checked = 0
- for i in range(len(self.l)):
- for j in random.sample(xrange(len(self.l)), 4):
- self.checked += 1
- d = self.l[i].getValue(sha.new(str(self.startport+j)).digest())
- check = []
- for k in range(self.startport+j, (self.startport+j)*(j+1)+1, self.startport+j):
- check.append(str(k))
- d.addCallback(self.check_values, check)
+ else:
+ d = self.l[i].getValue(sha.new(str(self.startport+j)).digest())
+ check = []
+ for k in range(self.startport+j, (self.startport+j)*(j+1)+1, self.startport+j):
+ check.append(str(k))
+ d.addCallback(self.get_values, check, i, j + random.randrange(1, min(len(self.l), 10)))
def store_join(self, result, next_node):
d = self.l[next_node].join()
for i in self.l:
try:
i.leave()
- os.unlink(i.khashmir.db)
+ os.unlink(i.khashmir.store.db)
except:
pass
projects / quix0rs-apt-p2p.git / blobdiff