Author: toad
Date: 2009-01-22 14:24:53 +0000 (Thu, 22 Jan 2009)
New Revision: 25208
Modified:
trunk/freenet/src/freenet/io/AddressTracker.java
trunk/freenet/src/freenet/node/FNPPacketMangler.java
trunk/freenet/src/freenet/node/PeerNode.java
Log:
Paranoia w.r.t. last commit.
Modified: trunk/freenet/src/freenet/io/AddressTracker.java
===================================================================
--- trunk/freenet/src/freenet/io/AddressTracker.java 2009-01-22 13:57:24 UTC
(rev 25207)
+++ trunk/freenet/src/freenet/io/AddressTracker.java 2009-01-22 14:24:53 UTC
(rev 25208)
@@ -139,6 +139,10 @@
private void packetTo(Peer peer, boolean sent) {
peer = peer.dropHostName();
+ if(peer == null) {
+ Logger.error(this, "Impossible: No host name in
AddressTracker.packetTo for "+peer);
+ return;
+ }
InetAddress ip = peer.getAddress();
long now = System.currentTimeMillis();
synchronized(this) {
Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java 2009-01-22
13:57:24 UTC (rev 25207)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java 2009-01-22
14:24:53 UTC (rev 25208)
@@ -2855,6 +2855,13 @@
pn.couldNotSendHandshake(notRegistered);
return;
}
+ Peer oldPeer = peer;
+ peer = peer.dropHostName();
+ if(peer == null) {
+ Logger.error(this, "No address for peer "+oldPeer+" so
cannot send handshake");
+ pn.couldNotSendHandshake(notRegistered);
+ return;
+ }
sendJFKMessage1(pn, peer, pn.handshakeUnknownInitiator(),
pn.handshakeSetupType(), negType);
if(logMINOR)
Logger.minor(this, "Sending handshake to "+peer+" for
"+pn);
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2009-01-22 13:57:24 UTC
(rev 25207)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2009-01-22 14:24:53 UTC
(rev 25208)
@@ -1673,6 +1673,12 @@
private void setDetectedPeer(Peer newPeer) {
// Only clear lastAttemptedHandshakeIPUpdateTime if we have a
new IP.
// Also, we need to call .equals() to propagate any DNS lookups
that have been done if the two have the same domain.
+ Peer p = newPeer;
+ newPeer = newPeer.dropHostName();
+ if(newPeer == null) {
+ Logger.error(this, "Impossible: No address for detected
peer! "+p+" on "+this);
+ return;
+ }
synchronized(this) {
Peer oldPeer = detectedPeer;
if((newPeer != null) && ((oldPeer == null) ||
!oldPeer.equals(newPeer))) {
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
