Author: toad
Date: 2007-11-29 00:28:57 +0000 (Thu, 29 Nov 2007)
New Revision: 16052
Modified:
trunk/freenet/src/freenet/node/FNPPacketMangler.java
trunk/freenet/src/freenet/node/PeerNode.java
Log:
Don't deprecate
Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java 2007-11-29
00:17:12 UTC (rev 16051)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java 2007-11-29
00:28:57 UTC (rev 16052)
@@ -1823,7 +1823,7 @@
}
}
- tracker.pn.maybeRekey(tracker);
+ tracker.pn.maybeRekey();
if(logMINOR) Logger.minor(this, "Done");
}
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2007-11-29 00:17:12 UTC
(rev 16051)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2007-11-29 00:28:57 UTC
(rev 16052)
@@ -962,7 +962,7 @@
return timeLastRoutable;
}
- protected void maybeRekey(final KeyTracker tracker) {
+ protected void maybeRekey() {
long now = System.currentTimeMillis();
boolean hasRekeyed = false;
if(hasLiveHandshake(now)) return;
@@ -971,7 +971,6 @@
if((timeLastRekeyed +
FNPPacketMangler.SESSION_KEY_REKEYING_INTERVAL < now) ||
(totalBytesExchangedWithCurrentTracker >
FNPPacketMangler.AMOUNT_OF_BYTES_ALLOWED_BEFORE_WE_REKEY)) {
hasRekeyed = true;
isRekeying = true;
- tracker.deprecated();
}
}
if(hasRekeyed)
