Author: toad
Date: 2008-09-24 16:40:27 +0000 (Wed, 24 Sep 2008)
New Revision: 22807
Modified:
trunk/freenet/src/freenet/node/FNPPacketMangler.java
Log:
Log the originator in invalid seed client message
Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java 2008-09-24
16:39:36 UTC (rev 22806)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java 2008-09-24
16:40:27 UTC (rev 22807)
@@ -1133,7 +1133,7 @@
// construct the peernode
if(unknownInitiator) {
- pn = getPeerNodeFromUnknownInitiator(hisRef, setupType,
pn);
+ pn = getPeerNodeFromUnknownInitiator(hisRef, setupType,
pn, replyTo);
}
if(pn == null) {
if(unknownInitiator)
@@ -1189,7 +1189,7 @@
Logger.error(this,"Message3 Processing packet
for"+pn.getPeer()+" took "+TimeUtil.formatTime(t2-t1, 3, true));
}
- private PeerNode getPeerNodeFromUnknownInitiator(byte[] hisRef, int
setupType, PeerNode pn) {
+ private PeerNode getPeerNodeFromUnknownInitiator(byte[] hisRef, int
setupType, PeerNode pn, Peer from) {
if(setupType == SETUP_OPENNET_SEEDNODE) {
OpennetManager om = node.getOpennet();
if(om == null) {
@@ -1207,13 +1207,13 @@
try {
seed = new SeedClientPeerNode(ref, node,
crypto, node.peers, false, true, crypto.packetMangler);
} catch (FSParseException e) {
- Logger.error(this, "Invalid seed client
noderef: "+e, e);
+ Logger.error(this, "Invalid seed client
noderef: "+e+" from "+from, e);
return null;
} catch (PeerParseException e) {
- Logger.error(this, "Invalid seed client
noderef: "+e, e);
+ Logger.error(this, "Invalid seed client
noderef: "+e+" from "+from, e);
return null;
} catch (ReferenceSignatureVerificationException e) {
- Logger.error(this, "Invalid seed client
noderef: "+e, e);
+ Logger.error(this, "Invalid seed client
noderef: "+e+" from "+from, e);
return null;
}
if(seed.equals(pn)) {
