Author: toad
Date: 2008-12-04 17:33:13 +0000 (Thu, 04 Dec 2008)
New Revision: 24041
Modified:
trunk/freenet/src/freenet/node/FNPPacketMangler.java
trunk/freenet/src/freenet/node/PeerNode.java
Log:
dropHostName()!!!
Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java 2008-12-04
15:45:10 UTC (rev 24040)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java 2008-12-04
17:33:13 UTC (rev 24041)
@@ -812,7 +812,7 @@
node.random.nextBytes(nonce);
synchronized (pn) {
- pn.jfkNoncesSent.put(replyTo, nonce);
+ pn.jfkNoncesSent.put(replyTo.dropHostName(), nonce);
}
int modulusLength = DiffieHellman.modulusLengthInBytes();
@@ -967,7 +967,7 @@
// sanity check
byte[] myNi;
synchronized (pn) {
- myNi = pn.jfkNoncesSent.get(replyTo);
+ myNi = pn.jfkNoncesSent.get(replyTo.dropHostName());
}
// We don't except such a message;
if(myNi == null) {
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2008-12-04 15:45:10 UTC
(rev 24040)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2008-12-04 17:33:13 UTC
(rev 24041)
@@ -1674,6 +1674,8 @@
if(!isConnected)
return;
// Prevent leak by clearing, *but keep the
current handshake*
+ newPeer = newPeer.dropHostName();
+ oldPeer = oldPeer.dropHostName();
byte[] newPeerHandshake =
jfkNoncesSent.get(newPeer);
byte[] oldPeerHandshake =
jfkNoncesSent.get(oldPeer);
jfkNoncesSent.clear();
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
