Author: toad
Date: 2007-07-07 21:12:30 +0000 (Sat, 07 Jul 2007)
New Revision: 13985
Modified:
trunk/freenet/src/freenet/io/comm/FreenetInetAddress.java
trunk/freenet/src/freenet/io/comm/Peer.java
trunk/freenet/src/freenet/node/PeerNode.java
Log:
Record detected.udp numerically even if it's matched something with a domain
name.
Modified: trunk/freenet/src/freenet/io/comm/FreenetInetAddress.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/FreenetInetAddress.java 2007-07-07
20:47:51 UTC (rev 13984)
+++ trunk/freenet/src/freenet/io/comm/FreenetInetAddress.java 2007-07-07
21:12:30 UTC (rev 13985)
@@ -248,6 +248,13 @@
return _address.getHostAddress();
}
}
+
+ public String toStringPrefNumeric() {
+ if(_address != null)
+ return _address.getHostAddress();
+ else
+ return hostname;
+ }
public void writeToDataOutputStream(DataOutputStream dos, boolean
oldForm) throws IOException {
InetAddress addr = this.getAddress();
Modified: trunk/freenet/src/freenet/io/comm/Peer.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/Peer.java 2007-07-07 20:47:51 UTC (rev
13984)
+++ trunk/freenet/src/freenet/io/comm/Peer.java 2007-07-07 21:12:30 UTC (rev
13985)
@@ -195,4 +195,11 @@
public boolean isRealInternetAddress(boolean lookup, boolean
defaultVal) {
return addr.isRealInternetAddress(lookup, defaultVal);
}
+
+ /**
+ * Get the address:port string, but prefer numeric IPs - don't return
the name.
+ */
+ public String toStringPrefNumeric() {
+ return addr.toStringPrefNumeric()+':'+_port;
+ }
}
\ No newline at end of file
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2007-07-07 20:47:51 UTC
(rev 13984)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2007-07-07 21:12:30 UTC
(rev 13985)
@@ -1851,7 +1851,7 @@
public synchronized SimpleFieldSet exportMetadataFieldSet() {
SimpleFieldSet fs = new SimpleFieldSet(true);
if(detectedPeer != null)
- fs.putSingle("detected.udp", detectedPeer.toString());
+ fs.putSingle("detected.udp",
detectedPeer.toStringPrefNumeric());
if(lastReceivedPacketTime() > 0)
fs.putSingle("timeLastReceivedPacket",
Long.toString(timeLastReceivedPacket));
if(timeLastConnected() > 0)
