Author: toad
Date: 2008-09-04 21:13:15 +0000 (Thu, 04 Sep 2008)
New Revision: 22439
Modified:
trunk/freenet/src/freenet/io/AddressTracker.java
trunk/freenet/src/freenet/node/Announcer.java
trunk/freenet/src/freenet/node/OpennetPeerNode.java
Log:
Start the countdown to assuming failure if no positive outcome on connecting,
not on announcing.
Many nodes won't need to announce.
Modified: trunk/freenet/src/freenet/io/AddressTracker.java
===================================================================
--- trunk/freenet/src/freenet/io/AddressTracker.java 2008-09-04 21:10:09 UTC
(rev 22438)
+++ trunk/freenet/src/freenet/io/AddressTracker.java 2008-09-04 21:13:15 UTC
(rev 22439)
@@ -335,7 +335,8 @@
private long timePresumeGuilty = -1;
public synchronized void setPresumedGuiltyAt(long l) {
- timePresumeGuilty = l;
+ if(timePresumeGuilty <= 0)
+ timePresumeGuilty = l;
}
public synchronized void setPresumedInnocent() {
Modified: trunk/freenet/src/freenet/node/Announcer.java
===================================================================
--- trunk/freenet/src/freenet/node/Announcer.java 2008-09-04 21:10:09 UTC
(rev 22438)
+++ trunk/freenet/src/freenet/node/Announcer.java 2008-09-04 21:13:15 UTC
(rev 22439)
@@ -501,9 +501,6 @@
announceNow = true;
}
}
- if(totalAdded > 0) {
-
om.crypto.socket.getAddressTracker().setPresumedGuiltyAt(System.currentTimeMillis()+60*60*1000);
- }
// If it takes more than COOLING_OFF_PERIOD to
disconnect, we might not be able to reannounce to this
// node. However, we can't reannounce to it
anyway until announcedTo is cleared, which probably will
// be more than that period in the future.
Modified: trunk/freenet/src/freenet/node/OpennetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/OpennetPeerNode.java 2008-09-04 21:10:09 UTC
(rev 22438)
+++ trunk/freenet/src/freenet/node/OpennetPeerNode.java 2008-09-04 21:13:15 UTC
(rev 22439)
@@ -102,4 +102,8 @@
return false;
}
+ protected void onConnect() {
+
opennet.crypto.socket.getAddressTracker().setPresumedGuiltyAt(System.currentTimeMillis()+60*60*1000);
+ }
+
}
