Author: toad
Date: 2007-11-27 19:18:24 +0000 (Tue, 27 Nov 2007)
New Revision: 15990
Modified:
trunk/freenet/src/freenet/io/PeerAddressTrackerItem.java
trunk/freenet/src/freenet/io/comm/FreenetInetAddress.java
trunk/freenet/src/freenet/io/comm/Peer.java
Log:
drop the hostname, if any, before using a Peer object in the address tracker.
Modified: trunk/freenet/src/freenet/io/PeerAddressTrackerItem.java
===================================================================
--- trunk/freenet/src/freenet/io/PeerAddressTrackerItem.java 2007-11-27
19:16:48 UTC (rev 15989)
+++ trunk/freenet/src/freenet/io/PeerAddressTrackerItem.java 2007-11-27
19:18:24 UTC (rev 15990)
@@ -29,7 +29,7 @@
public PeerAddressTrackerItem(long timeDefinitelyNoPacketsReceived,
long timeDefinitelyNoPacketsSent, Peer peer) {
super(timeDefinitelyNoPacketsReceived,
timeDefinitelyNoPacketsSent);
- this.peer = peer;
+ this.peer = peer.dropHostName();
}
public PeerAddressTrackerItem(SimpleFieldSet fs) throws
FSParseException {
Modified: trunk/freenet/src/freenet/io/comm/FreenetInetAddress.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/FreenetInetAddress.java 2007-11-27
19:16:48 UTC (rev 15989)
+++ trunk/freenet/src/freenet/io/comm/FreenetInetAddress.java 2007-11-27
19:18:24 UTC (rev 15990)
@@ -364,4 +364,10 @@
return defaultVal;
}
}
+
+ public FreenetInetAddress dropHostname() {
+ if(hostname != null) {
+ return new FreenetInetAddress(getAddress());
+ } else return this;
+ }
}
Modified: trunk/freenet/src/freenet/io/comm/Peer.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/Peer.java 2007-11-27 19:16:48 UTC (rev
15989)
+++ trunk/freenet/src/freenet/io/comm/Peer.java 2007-11-27 19:18:24 UTC (rev
15990)
@@ -238,4 +238,11 @@
public String toStringPrefNumeric() {
return addr.toStringPrefNumeric()+':'+_port;
}
+
+ public Peer dropHostName() {
+ FreenetInetAddress newAddr = addr.dropHostname();
+ if(addr != newAddr) {
+ return new Peer(newAddr, _port);
+ } else return this;
+ }
}
\ No newline at end of file
