[freenet-cvs] r15292 - trunk/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2007-09-25 15:17:11 +0000 (Tue, 25 Sep 2007)
New Revision: 15292

Modified:
   trunk/freenet/src/freenet/node/PacketSender.java
Log:
don't wait that long

Modified: trunk/freenet/src/freenet/node/PacketSender.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSender.java    2007-09-25 15:10:40 UTC 
(rev 15291)
+++ trunk/freenet/src/freenet/node/PacketSender.java    2007-09-25 15:17:11 UTC 
(rev 15292)
@@ -44,6 +44,9 @@
         * this many milliseconds. */
        static final int MIN_OLD_OPENNET_CONNECT_DELAY = 60*1000;

+       /** Wait this long before trying any old-opennet-peers */
+       static final int TRY_OLD_OPENNET_PEERS_STARTUP_DELAY = 30*1000;
+       
     final LinkedList resendPackets;
     /** ~= Ticker :) */
     private final TreeMap timedJobsByTime;
@@ -331,7 +334,7 @@
                if(now - timeLastSentOldOpennetConnectAttempt > minDelay &&
                                connCount <= 
MIN_CONNECTIONS_TRY_OLD_OPENNET_PEERS &&
                                om.countOldOpennetPeers() > 0 &&
-                               now - node.startupTime > 
OpennetManager.DROP_STARTUP_DELAY) {
+                               now - node.startupTime > 
TRY_OLD_OPENNET_PEERS_STARTUP_DELAY) {
                PeerNode pn = om.randomOldOpennetNode();
                if(pn != null) {
                        pn.getOutgoingMangler().sendHandshake(pn);