Author: toad
Date: 2008-12-09 15:11:48 +0000 (Tue, 09 Dec 2008)
New Revision: 24140
Modified:
trunk/freenet/src/freenet/node/OpennetManager.java
trunk/freenet/src/freenet/node/PacketSender.java
Log:
Stop trying to connect to an old-opennet-peer after a month.
Modified: trunk/freenet/src/freenet/node/OpennetManager.java
===================================================================
--- trunk/freenet/src/freenet/node/OpennetManager.java 2008-12-09 15:05:38 UTC
(rev 24139)
+++ trunk/freenet/src/freenet/node/OpennetManager.java 2008-12-09 15:11:48 UTC
(rev 24140)
@@ -101,6 +101,8 @@
public static final int MIN_PEERS_FOR_SCALING = 10;
/** Maximum number of peers */
public static final int MAX_PEERS_FOR_SCALING = 20;
+ /** Stop trying to reconnect to an old-opennet-peer after a month. */
+ public static final long MAX_TIME_ON_OLD_OPENNET_PEERS = 31 * 24 * 60 *
60 * 1000;
private final long creationTime;
Modified: trunk/freenet/src/freenet/node/PacketSender.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSender.java 2008-12-09 15:05:38 UTC
(rev 24139)
+++ trunk/freenet/src/freenet/node/PacketSender.java 2008-12-09 15:11:48 UTC
(rev 24140)
@@ -316,6 +316,14 @@
PeerNode[] peers = om.getOldPeers();
for(PeerNode pn : peers) {
+ if(pn.timeLastConnected() <= 0)
+ Logger.error(this, "Last connected is
zero or negative for old-opennet-peer "+pn);
+ // Will be removed by next line.
+ if(now - pn.timeLastConnected() >
OpennetManager.MAX_TIME_ON_OLD_OPENNET_PEERS) {
+ om.purgeOldOpennetPeer(pn);
+ if(logMINOR) Logger.minor(this,
"Removing old opennet peer (too old): "+pn);
+ continue;
+ }
if(pn.isConnected()) continue; // Race
condition??
if(pn.noContactDetails()) {
pn.startARKFetcher();
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
