Author: nextgens
Date: 2007-12-01 13:55:50 +0000 (Sat, 01 Dec 2007)
New Revision: 16179
Modified:
trunk/freenet/src/freenet/node/FNPPacketMangler.java
trunk/freenet/src/freenet/node/PeerNode.java
Log:
JFK: don't display such a worrying message if there is no need to
Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java 2007-12-01
13:45:01 UTC (rev 16178)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java 2007-12-01
13:55:50 UTC (rev 16179)
@@ -812,7 +812,9 @@
DiffieHellmanLightContext ctx =
findContextByExponential(_ourExponential);
if(ctx == null) {
- Logger.error(this, "WTF? the HMAC verified but we don't
know about that exponential! SHOULDN'T HAPPEN!");
+ // It ca be null if we have just rekeyed and we have
more than one handshake/jfk run
+ if(!pn.isConnected())
+ Logger.error(this, "WTF? the HMAC verified but
we don't know about that exponential! SHOULDN'T HAPPEN!");
return;
}
BigInteger computedExponential =
ctx.getHMACKey(_hisExponential, Global.DHgroupA);
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2007-12-01 13:45:01 UTC
(rev 16178)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2007-12-01 13:55:50 UTC
(rev 16179)
@@ -926,10 +926,6 @@
Logger.normal(this, "We are asking for the key to be
renewed (" + this.detectedPeer + ')');
}
- protected synchronized boolean isRekeying() {
- return isRekeying;
- }
-
/**
* @return The time this PeerNode was added to the node (persistent
across restarts).
*/
