Fix bug checking if new node

Author: cpacia

dht/protocol.py

@@ -224,7 +224,7 @@ def handleCallResponse(self, result, node):
         we get no response, make sure it's removed from the routing table.
         """
         if result[0]:
-            if self.router.isNewNode(node):
+            if self.isNewConnection(node):
                 self.log.debug("Call response from new node, transferring key/values")
                 reactor.callLater(1, self.transferKeyValues, node)
             self.router.addContact(node)
@@ -239,11 +239,17 @@ def addToRouter(self, node):
         We add the node to our router and transfer our stored values
         if they are new and within our neighborhood.
         """
-        if self.router.isNewNode(node):
+        if self.isNewConnection(node):
             self.log.debug("Found a new node, transferring key/values")
             reactor.callLater(1, self.transferKeyValues, node)
         self.router.addContact(node)
 
+    def isNewConnection(self, node):
+        if (node.ip, node.port) in self.multiplexer:
+            return self.multiplexer[(node.ip, node.port)].handler.check_new_connection()
+        else:
+            return False
+
     def __iter__(self):
         return iter(self.handled_commands)
 

dht/tests/test_protocol.py

@@ -15,7 +15,6 @@
 from dht.protocol import KademliaProtocol
 from dht.utils import digest
 from dht.storage import ForgetfulStorage
-from dht.tests.utils import mknode
 from dht.node import Node
 from protos import message, objects
 from net.wireprotocol import OpenBazaarProtocol
@@ -613,7 +612,7 @@ def _connecting_to_connected(self):
         self.next_seqnum = seqnum + 1
 
     def test_badRPCDelete(self):
-        n = mknode()
+        n = Node(digest("S"), self.addr1[0], self.addr1[1])
         val = self.protocol.rpc_delete(n, 'testkeyword', 'key', 'testsig')
         self.assertEqual(val, ["False"])
         val = self.protocol.rpc_delete(n, '', '', '')

net/wireprotocol.py

@@ -60,6 +60,7 @@ def __init__(self, processors, nat_type, relay_node, *args, **kwargs):
             self.keep_alive_loop.start(300 if nat_type == FULL_CONE else 30, now=False)
             self.addr = None
             self.ban_score = None
+            self.is_new_node = True
             self.on_connection_made()
 
         def on_connection_made(self):
@@ -156,6 +157,13 @@ def change_relay_node(self):
                     processor.callPing(Node(digest("null"), self.relay_node[0], self.relay_node[1],
                                             relay_node=None, nat_type=FULL_CONE))
 
+        def check_new_connection(self):
+            if self.is_new_node:
+                self.is_new_node = False
+                return True
+            else:
+                return False
+
     class ConnHandlerFactory(HandlerFactory):
 
         def __init__(self, processors, nat_type, relay_node):