Hit up seeds if bootstrap from cache fails

Author: cpacia

dht/network.py

@@ -151,7 +151,7 @@ def bootstrappableNeighbors(self):
         neighbors = self.protocol.router.findNeighbors(self.node)
         return [tuple(n)[-2:] for n in neighbors]
 
-    def bootstrap(self, addrs):
+    def bootstrap(self, addrs, deferred=None):
         """
         Bootstrap the server by connecting to other known nodes in the network.
 
@@ -165,9 +165,18 @@ def bootstrap(self, addrs):
             return task.deferLater(reactor, 1, self.bootstrap, addrs)
         self.log.info("bootstrapping with %s addresses, finding neighbors..." % len(addrs))
 
-        d = defer.Deferred()
+        if deferred is None:
+            d = defer.Deferred()
+        else:
+            d = deferred
 
         def initTable(results):
+            if len(results) == 0:
+                if self.protocol.multiplexer.testnet:
+                    self.bootstrap(self.querySeed(SEEDS_TESTNET), d)
+                else:
+                    self.bootstrap(self.querySeed(SEEDS), d)
+                return
             potential_relay_nodes = []
             for addr, result in results.items():
                 if result[0]:

net/wireprotocol.py

@@ -68,6 +68,7 @@ def __init__(self, processors, nat_type, relay_node, ban_score, *args, **kwargs)
             self.is_new_node = True
             self.on_connection_made()
             self.time_last_message = 0
+            self.ping_interval = 30 if nat_type != FULL_CONE else 300
 
         def on_connection_made(self):
             if self.connection is None or self.connection.state == State.CONNECTING:
@@ -144,7 +145,8 @@ def keep_alive(self):
             ):
                 self.connection.shutdown()
                 return
-            if t - self.time_last_message >= 30:
+
+            if t - self.time_last_message >= self.ping_interval:
                 for processor in self.processors:
                     if PING in processor and self.node is not None:
                         processor.callPing(self.node)