Author: toad
Date: 2007-11-29 18:50:17 +0000 (Thu, 29 Nov 2007)
New Revision: 16096
Modified:
trunk/freenet/src/freenet/io/comm/UdpSocketHandler.java
trunk/freenet/src/freenet/node/NodeCrypto.java
Log:
better titles
Modified: trunk/freenet/src/freenet/io/comm/UdpSocketHandler.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/UdpSocketHandler.java 2007-11-29
18:41:38 UTC (rev 16095)
+++ trunk/freenet/src/freenet/io/comm/UdpSocketHandler.java 2007-11-29
18:50:17 UTC (rev 16096)
@@ -40,10 +40,12 @@
private boolean _isDone;
private boolean _active = true;
private final int listenPort;
+ private final String title;
- public UdpSocketHandler(int listenPort, InetAddress bindto, Node node,
long startupTime) throws SocketException {
+ public UdpSocketHandler(int listenPort, InetAddress bindto, Node node,
long startupTime, String title) throws SocketException {
super("UdpSocketHandler packet receiver thread on port " +
listenPort);
this.node = node;
+ this.title = title;
_bindTo = bindto;
// Keep the Updater code in, just commented out, for now
// We may want to be able to do on-line updates.
@@ -78,6 +80,10 @@
return _bindTo;
}
+ public String getTitle() {
+ return title;
+ }
+
public void run() { // Listen for packets
tracker.startReceive(System.currentTimeMillis());
try {
Modified: trunk/freenet/src/freenet/node/NodeCrypto.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeCrypto.java 2007-11-29 18:41:38 UTC
(rev 16095)
+++ trunk/freenet/src/freenet/node/NodeCrypto.java 2007-11-29 18:50:17 UTC
(rev 16096)
@@ -104,7 +104,7 @@
for(int i=0;i<200000;i++) {
int portNo = 1024 + random.nextInt(65535-1024);
try {
- u = new UdpSocketHandler(portNo,
bindto.getAddress(), node, startupTime);
+ u = new UdpSocketHandler(portNo,
bindto.getAddress(), node, startupTime, getTitle());
port = u.getPortNumber();
break;
} catch (Exception e) {
@@ -118,7 +118,7 @@
throw new
NodeInitException(NodeInitException.EXIT_NO_AVAILABLE_UDP_PORTS, "Could not
find an available UDP port number for FNP (none specified)");
} else {
try {
- u = new UdpSocketHandler(port,
bindto.getAddress(), node, startupTime);
+ u = new UdpSocketHandler(port,
bindto.getAddress(), node, startupTime, getTitle());
} catch (Exception e) {
Logger.error(this, "Caught "+e, e);
System.err.println(e);
@@ -166,6 +166,11 @@
}
}
+ private String getTitle() {
+ // FIXME l10n
+ return (isOpennet ? "Opennet " : "Darknet ") + "port " +
portNumber;
+ }
+
/**
* Read the cryptographic keys etc from a SimpleFieldSet
* @param fs
