Author: toad
Date: 2006-02-20 22:13:39 +0000 (Mon, 20 Feb 2006)
New Revision: 8072
Modified:
branches/config/src/freenet/node/Node.java
branches/config/src/freenet/node/TextModeClientInterface.java
branches/config/src/freenet/node/fcp/FCPServer.java
branches/config/src/freenet/support/FileLoggerHook.java
Log:
It starts up.
Modified: branches/config/src/freenet/node/Node.java
===================================================================
--- branches/config/src/freenet/node/Node.java 2006-02-20 13:43:34 UTC (rev
8071)
+++ branches/config/src/freenet/node/Node.java 2006-02-20 22:13:39 UTC (rev
8072)
@@ -480,7 +480,7 @@
});
- String ipOverrideString = nodeConfig.getString("ipAddressOVerride");
+ String ipOverrideString = nodeConfig.getString("ipAddressOverride");
if(ipOverrideString.length() == 0)
overrideIPAddress = null;
else {
@@ -521,14 +521,18 @@
for(int i=0;i<200000;i++) {
int portNo = 1024 + random.nextInt(65535-1024);
try {
- u = new UdpSocketManager(port);
+ u = new UdpSocketManager(portNo);
port = u.getPortNumber();
break;
} catch (SocketException e) {
+ Logger.normal(this, "Could not use port:
"+portNo+": "+e, e);
+ System.err.println("Could not use port:
"+portNo+": "+e);
+ e.printStackTrace();
continue;
}
}
- throw new NodeInitException(EXIT_NO_AVAILABLE_UDP_PORTS, "Could
not find an available UDP port number for FNP (none specified)");
+ if(u == null)
+ throw new
NodeInitException(EXIT_NO_AVAILABLE_UDP_PORTS, "Could not find an available UDP
port number for FNP (none specified)");
} else {
try {
u = new UdpSocketManager(port);
@@ -833,6 +837,7 @@
try {
FproxyToadlet.maybeCreateFproxyEtc(this, config);
} catch (IOException e) {
+ e.printStackTrace();
throw new
NodeInitException(EXIT_COULD_NOT_START_FPROXY, "Could not start fproxy: "+e);
}
@@ -1908,4 +1913,8 @@
public void setFproxy(FproxyToadlet fproxy) {
this.fproxyServlet = fproxy;
}
+
+ public void setFCPServer(FCPServer fcp) {
+ this.fcpServer = fcp;
+ }
}
Modified: branches/config/src/freenet/node/TextModeClientInterface.java
===================================================================
--- branches/config/src/freenet/node/TextModeClientInterface.java
2006-02-20 13:43:34 UTC (rev 8071)
+++ branches/config/src/freenet/node/TextModeClientInterface.java
2006-02-20 22:13:39 UTC (rev 8072)
@@ -689,5 +689,6 @@
public static void maybeCreate(Node node, Config config) {
// FIXME make this configurable.
// Depends on fixing QUIT issues. (bug #81)
+ new TextModeClientInterface(node);
}
}
Modified: branches/config/src/freenet/node/fcp/FCPServer.java
===================================================================
--- branches/config/src/freenet/node/fcp/FCPServer.java 2006-02-20 13:43:34 UTC
(rev 8071)
+++ branches/config/src/freenet/node/fcp/FCPServer.java 2006-02-20 22:13:39 UTC
(rev 8072)
@@ -73,8 +73,10 @@
// FIXME check enabled etc
fcpConfig.register("port", 9481 /* anagram of 1984, and 1000 up
from old number */,
2, true, "FCP port number", "FCP port number",
new FCPPortNumberCallback(node));
+ FCPServer fcp = new FCPServer(fcpConfig.getInt("port"), node);
+ node.setFCPServer(fcp);
fcpConfig.finishedInitialization();
- return new FCPServer(fcpConfig.getInt("port"), node);
+ return fcp;
}
}
Modified: branches/config/src/freenet/support/FileLoggerHook.java
===================================================================
--- branches/config/src/freenet/support/FileLoggerHook.java 2006-02-20
13:43:34 UTC (rev 8071)
+++ branches/config/src/freenet/support/FileLoggerHook.java 2006-02-20
22:13:39 UTC (rev 8072)
@@ -451,7 +451,7 @@
maxOldLogfilesDiskUsage);
}
- private Object trimOldLogFilesLock;
+ private final Object trimOldLogFilesLock = new Object();
public void trimOldLogFiles() {
synchronized(trimOldLogFilesLock) {
