Ilgrim/kademlia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Created new method welcomeIfNewNode in protocol.

Browse Source 
This commit consolidates the maybeTransferKeyValues and addContact calls into
the transferKeyValues method and renames it.
This commit is contained in:
Chris 2015-07-17 21:29:36 -04:00
parent 2f363cba84
commit 237d89b6b6
1 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
kademlia/protocol.py
View File

@ -32,14 +32,12 @@ class KademliaProtocol(RPCProtocol):
def rpc_ping(self, sender, nodeid): def rpc_ping(self, sender, nodeid):
source = Node(nodeid, sender[0], sender[1]) source = Node(nodeid, sender[0], sender[1])
self.maybeTransferKeyValues(source) self.welcomeIfNewNode(source)
self.router.addContact(source)
return self.sourceNode.id return self.sourceNode.id
def rpc_store(self, sender, nodeid, key, value): def rpc_store(self, sender, nodeid, key, value):
source = Node(nodeid, sender[0], sender[1]) source = Node(nodeid, sender[0], sender[1])
self.maybeTransferKeyValues(source) self.welcomeIfNewNode(source)
self.router.addContact(source)
self.log.debug("got a store request from %s, storing value" % str(sender)) self.log.debug("got a store request from %s, storing value" % str(sender))
self.storage[key] = value self.storage[key] = value
return True return True
@ -47,15 +45,13 @@ class KademliaProtocol(RPCProtocol):
def rpc_find_node(self, sender, nodeid, key): def rpc_find_node(self, sender, nodeid, key):
self.log.info("finding neighbors of %i in local table" % long(nodeid.encode('hex'), 16)) self.log.info("finding neighbors of %i in local table" % long(nodeid.encode('hex'), 16))
source = Node(nodeid, sender[0], sender[1]) source = Node(nodeid, sender[0], sender[1])
self.maybeTransferKeyValues(source) self.welcomeIfNewNode(source)
self.router.addContact(source)
node = Node(key) node = Node(key)
return map(tuple, self.router.findNeighbors(node, exclude=source)) return map(tuple, self.router.findNeighbors(node, exclude=source))
def rpc_find_value(self, sender, nodeid, key): def rpc_find_value(self, sender, nodeid, key):
source = Node(nodeid, sender[0], sender[1]) source = Node(nodeid, sender[0], sender[1])
self.maybeTransferKeyValues(source) self.welcomeIfNewNode(source)
self.router.addContact(source)
value = self.storage.get(key, None) value = self.storage.get(key, None)
if value is None: if value is None:
return self.rpc_find_node(sender, nodeid, key) return self.rpc_find_node(sender, nodeid, key)
@ -81,9 +77,10 @@ class KademliaProtocol(RPCProtocol):
d = self.store(address, self.sourceNode.id, key, value) d = self.store(address, self.sourceNode.id, key, value)
return d.addCallback(self.handleCallResponse, nodeToAsk) return d.addCallback(self.handleCallResponse, nodeToAsk)
def transferKeyValues(self, node): def welcomeIfNewNode(self, node):
""" """
Given a new node, send it all the keys/values it should be storing. Given a new node, send it all the keys/values it should be storing,
then add it to the routing table.
@param node: A new node that just joined (or that we just found out @param node: A new node that just joined (or that we just found out
about). about).
@ -94,20 +91,18 @@ class KademliaProtocol(RPCProtocol):
is closer than the closest in that list, then store the key/value is closer than the closest in that list, then store the key/value
on the new node (per section 2.5 of the paper) on the new node (per section 2.5 of the paper)
""" """
ds = []
for key, value in self.storage.iteritems():
keynode = Node(digest(key))
neighbors = self.router.findNeighbors(keynode)
if len(neighbors) > 0:
newNodeClose = node.distanceTo(keynode) < neighbors[-1].distanceTo(keynode)
thisNodeClosest = self.sourceNode.distanceTo(keynode) < neighbors[0].distanceTo(keynode)
if len(neighbors) == 0 or (newNodeClose and thisNodeClosest):
ds.append(self.callStore(node, key, value))
return defer.gatherResults(ds)
def maybeTransferKeyValues(self, node):
if self.router.isNewNode(node): if self.router.isNewNode(node):
self.transferKeyValues(node) ds = []
for key, value in self.storage.iteritems():
keynode = Node(digest(key))
neighbors = self.router.findNeighbors(keynode)
if len(neighbors) > 0:
newNodeClose = node.distanceTo(keynode) < neighbors[-1].distanceTo(keynode)
thisNodeClosest = self.sourceNode.distanceTo(keynode) < neighbors[0].distanceTo(keynode)
if len(neighbors) == 0 or (newNodeClose and thisNodeClosest):
ds.append(self.callStore(node, key, value))
self.router.addContact(node)
return defer.gatherResults(ds)
def handleCallResponse(self, result, node): def handleCallResponse(self, result, node):
""" """
@ -116,9 +111,7 @@ class KademliaProtocol(RPCProtocol):
""" """
if result[0]: if result[0]:
self.log.info("got response from %s, adding to router" % node) self.log.info("got response from %s, adding to router" % node)
if self.router.isNewNode(node): self.welcomeIfNewNode(node)
self.transferKeyValues(node)
self.router.addContact(node)
else: else:
self.log.debug("no response from %s, removing from router" % node) self.log.debug("no response from %s, removing from router" % node)
self.router.removeContact(node) self.router.removeContact(node)