Change connection and timeout times

Author: cpacia

dht/crawling.py

@@ -159,6 +159,7 @@ def _handleFoundValues(self, values):
 
 
 class NodeSpiderCrawl(SpiderCrawl):
+
     def find(self):
         """
         Find the closest nodes.

dht/tests/test_crawling.py

@@ -85,9 +85,9 @@ def test_find(self):
         spider = ValueSpiderCrawl(self.protocol, node, nearest, 20, 3)
         spider.find()
 
-        self.clock.advance(100 * constants.PACKET_TIMEOUT)
+        self.clock.advance(constants.PACKET_TIMEOUT)
         connection.REACTOR.runUntilCurrent()
-        self.assertEqual(len(self.proto_mock.send_datagram.call_args_list), 7)
+        self.assertEqual(len(self.proto_mock.send_datagram.call_args_list), 4)
 
     def test_nodesFound(self):
         self._connecting_to_connected()
@@ -107,9 +107,9 @@ def test_nodesFound(self):
                            self.node3.getProto().SerializeToString()))
         responses = {self.node1.id: response}
         spider._nodesFound(responses)
-        self.clock.advance(100 * constants.PACKET_TIMEOUT)
+        self.clock.advance(constants.PACKET_TIMEOUT)
         connection.REACTOR.runUntilCurrent()
-        self.assertEqual(len(self.proto_mock.send_datagram.call_args_list), 7)
+        self.assertEqual(len(self.proto_mock.send_datagram.call_args_list), 4)
 
         # test all been contacted
         spider = ValueSpiderCrawl(self.protocol, node, nearest, 20, 3)
@@ -170,7 +170,7 @@ def test_handleFoundValues(self):
         # test store value at nearest without value
         spider.nearestWithoutValue.push(self.node1)
         spider._handleFoundValues(found_values)
-        self.clock.advance(100 * constants.PACKET_TIMEOUT)
+        self.clock.advance(constants.PACKET_TIMEOUT)
         connection.REACTOR.runUntilCurrent()
         self.assertTrue(len(self.proto_mock.send_datagram.call_args_list) > 1)
         self.proto_mock.send_datagram.call_args_list = []
@@ -266,9 +266,9 @@ def test_find(self):
         spider = NodeSpiderCrawl(self.protocol, node, nearest, 20, 3)
         spider.find()
 
-        self.clock.advance(100 * constants.PACKET_TIMEOUT)
+        self.clock.advance(constants.PACKET_TIMEOUT)
         connection.REACTOR.runUntilCurrent()
-        self.assertEqual(len(self.proto_mock.send_datagram.call_args_list), 7)
+        self.assertEqual(len(self.proto_mock.send_datagram.call_args_list), 4)
 
     def test_nodesFound(self):
         self._connecting_to_connected()
@@ -288,9 +288,9 @@ def test_nodesFound(self):
         responses = {self.node1.id: response}
         spider._nodesFound(responses)
 
-        self.clock.advance(100 * constants.PACKET_TIMEOUT)
+        self.clock.advance(constants.PACKET_TIMEOUT)
         connection.REACTOR.runUntilCurrent()
-        self.assertEqual(len(self.proto_mock.send_datagram.call_args_list), 7)
+        self.assertEqual(len(self.proto_mock.send_datagram.call_args_list), 4)
 
         response = (True, (self.node1.getProto().SerializeToString(), self.node2.getProto().SerializeToString(),
                            self.node3.getProto().SerializeToString()))

dht/tests/test_protocol.py

@@ -404,7 +404,7 @@ def test_callPing(self):
         self.wire_protocol[self.addr1] = self.con
         self.protocol.callPing(n)
 
-        self.clock.advance(100 * constants.PACKET_TIMEOUT)
+        self.clock.advance(constants.PACKET_TIMEOUT)
         connection.REACTOR.runUntilCurrent()
         sent_packet = packet.Packet.from_bytes(self.proto_mock.send_datagram.call_args_list[0][0][0])
         sent_message = sent_packet.payload
@@ -425,7 +425,7 @@ def test_callStore(self):
         self.protocol.callStore(n, digest("Keyword"), digest("Key"),
                                 self.protocol.sourceNode.getProto().SerializeToString(), 10)
 
-        self.clock.advance(100 * constants.PACKET_TIMEOUT)
+        self.clock.advance(constants.PACKET_TIMEOUT)
         connection.REACTOR.runUntilCurrent()
         sent_packet = packet.Packet.from_bytes(self.proto_mock.send_datagram.call_args_list[0][0][0])
         sent_message = sent_packet.payload
@@ -449,7 +449,7 @@ def test_callFindValue(self):
         keyword = Node(digest("Keyword"))
         self.protocol.callFindValue(n, keyword)
 
-        self.clock.advance(100 * constants.PACKET_TIMEOUT)
+        self.clock.advance(constants.PACKET_TIMEOUT)
         connection.REACTOR.runUntilCurrent()
         sent_packet = packet.Packet.from_bytes(self.proto_mock.send_datagram.call_args_list[0][0][0])
         sent_message = sent_packet.payload
@@ -471,7 +471,7 @@ def test_callFindNode(self):
         keyword = Node(digest("nodetofind"))
         self.protocol.callFindNode(n, keyword)
 
-        self.clock.advance(100 * constants.PACKET_TIMEOUT)
+        self.clock.advance(constants.PACKET_TIMEOUT)
         connection.REACTOR.runUntilCurrent()
         sent_packet = packet.Packet.from_bytes(self.proto_mock.send_datagram.call_args_list[0][0][0])
         sent_message = sent_packet.payload
@@ -492,7 +492,7 @@ def test_callDelete(self):
         self.wire_protocol[self.addr1] = self.con
         self.protocol.callDelete(n, digest("Keyword"), digest("Key"), digest("Signature"))
 
-        self.clock.advance(100 * constants.PACKET_TIMEOUT)
+        self.clock.advance(constants.PACKET_TIMEOUT)
         connection.REACTOR.runUntilCurrent()
         sent_packet = packet.Packet.from_bytes(self.proto_mock.send_datagram.call_args_list[0][0][0])
         sent_message = sent_packet.payload

net/rpcudp.py

@@ -25,7 +25,7 @@ class RPCProtocol:
     """
     __metaclass__ = abc.ABCMeta
 
-    def __init__(self, sourceNode, router, waitTimeout=15):
+    def __init__(self, sourceNode, router, waitTimeout=30):
         """
         Args:
             sourceNode: A protobuf `Node` object containing info about this node.

net/wireprotocol.py

@@ -11,7 +11,7 @@
 from log import Logger
 from net.dos import BanScore
 from protos.message import Message, PING, NOT_FOUND
-from protos.objects import RESTRICTED, FULL_CONE
+from protos.objects import FULL_CONE
 from random import shuffle
 from twisted.internet import task, reactor
 from twisted.internet.task import LoopingCall
@@ -50,7 +50,7 @@ def __init__(self, db, ip_address, nat_type, testnet=False, relaying=False):
         self.factory = self.ConnHandlerFactory(self.processors, nat_type, self.relay_node, self.ban_score)
         self.log = Logger(system=self)
         self.keep_alive_loop = LoopingCall(self.keep_alive)
-        self.keep_alive_loop.start(30 if nat_type == RESTRICTED else 1200, now=False)
+        self.keep_alive_loop.start(30, now=False)
         ConnectionMultiplexer.__init__(self, CryptoConnectionFactory(self.factory), self.ip_address[0], relaying)
 
     class ConnHandler(Handler):
@@ -143,7 +143,7 @@ def keep_alive(self):
             router = self.processors[0].router
             if (
                     self.node is not None and
-                    t - self.time_last_message >= 900 and
+                    t - self.time_last_message >= 300 and
                     router.isNewNode(self.node) and
                     self.relay_node != (self.connection.dest_addr[0], self.connection.dest_addr[1])
             ):