Author: nextgens
Date: 2007-11-10 19:54:14 +0000 (Sat, 10 Nov 2007)
New Revision: 15744
Modified:
trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
trunk/freenet/src/freenet/clients/http/StartupToadletServer.java
trunk/freenet/src/freenet/io/NetworkInterface.java
trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
trunk/freenet/src/freenet/node/fcp/FCPServer.java
Log:
Move the DEFAULT_BIND_TO variable into NetworkInterface
Modified: trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2007-11-10 19:49:24 UTC (rev 15743)
+++ trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2007-11-10 19:54:14 UTC (rev 15744)
@@ -66,7 +66,6 @@
static boolean isPanicButtonToBeShown;
public static final int DEFAULT_FPROXY_PORT = 8888;
- public static final String DEFAULT_BIND_TO =
"127.0.0.1,0:0:0:0:0:0:0:1";
class FProxyPortCallback implements IntCallback {
@@ -276,7 +275,7 @@
fproxyConfig.register("port", DEFAULT_FPROXY_PORT,
configItemOrder++, true, true, "SimpleToadletServer.port",
"SimpleToadletServer.portLong",
new FProxyPortCallback());
- fproxyConfig.register("bindTo", DEFAULT_BIND_TO,
configItemOrder++, true, true, "SimpleToadletServer.bindTo",
"SimpleToadletServer.bindToLong",
+ fproxyConfig.register("bindTo",
NetworkInterface.DEFAULT_BIND_TO, configItemOrder++, true, true,
"SimpleToadletServer.bindTo", "SimpleToadletServer.bindToLong",
new FProxyBindtoCallback());
fproxyConfig.register("css", "clean", configItemOrder++, false,
false, "SimpleToadletServer.cssName", "SimpleToadletServer.cssNameLong",
new FProxyCSSNameCallback());
Modified: trunk/freenet/src/freenet/clients/http/StartupToadletServer.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StartupToadletServer.java
2007-11-10 19:49:24 UTC (rev 15743)
+++ trunk/freenet/src/freenet/clients/http/StartupToadletServer.java
2007-11-10 19:54:14 UTC (rev 15744)
@@ -136,8 +136,8 @@
cssName = config.get("fproxy.css");
} catch (Exception e) {
port = SimpleToadletServer.DEFAULT_FPROXY_PORT;
- bindTo = SimpleToadletServer.DEFAULT_BIND_TO;
- allowedHosts = SimpleToadletServer.DEFAULT_BIND_TO;
+ bindTo = NetworkInterface.DEFAULT_BIND_TO;
+ allowedHosts = NetworkInterface.DEFAULT_BIND_TO;
cssName = PageMaker.DEFAULT_THEME;
}
Modified: trunk/freenet/src/freenet/io/NetworkInterface.java
===================================================================
--- trunk/freenet/src/freenet/io/NetworkInterface.java 2007-11-10 19:49:24 UTC
(rev 15743)
+++ trunk/freenet/src/freenet/io/NetworkInterface.java 2007-11-10 19:54:14 UTC
(rev 15744)
@@ -40,7 +40,9 @@
* @version $Id$
*/
public class NetworkInterface {
-
+
+ public static final String DEFAULT_BIND_TO =
"127.0.0.1,0:0:0:0:0:0:0:1";
+
/** Object for synchronisation purpose. */
protected final Object syncObject = new Object();
Modified: trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
2007-11-10 19:49:24 UTC (rev 15743)
+++ trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
2007-11-10 19:54:14 UTC (rev 15744)
@@ -64,8 +64,8 @@
SubConfig TMCIConfig = new SubConfig("console", config);
TMCIConfig.register("enabled", false, 1, true, true /* FIXME
only because can't be changed on the fly */,
"TextModeClientInterfaceServer.enabled",
"TextModeClientInterfaceServer.enabledLong", new TMCIEnabledCallback(core));
- TMCIConfig.register("bindTo", "127.0.0.1,0:0:0:0:0:0:0:1", 2,
true, false, "TextModeClientInterfaceServer.bindTo",
"TextModeClientInterfaceServer.bindToLong", new TMCIBindtoCallback(core));
- TMCIConfig.register("allowedHosts",
"127.0.0.1,0:0:0:0:0:0:0:1", 2, true, false,
"TextModeClientInterfaceServer.allowedHosts",
"TextModeClientInterfaceServer.allowedHostsLong", new
TMCIAllowedHostsCallback(core));
+ TMCIConfig.register("bindTo", NetworkInterface.DEFAULT_BIND_TO,
2, true, false, "TextModeClientInterfaceServer.bindTo",
"TextModeClientInterfaceServer.bindToLong", new TMCIBindtoCallback(core));
+ TMCIConfig.register("allowedHosts",
NetworkInterface.DEFAULT_BIND_TO, 2, true, false,
"TextModeClientInterfaceServer.allowedHosts",
"TextModeClientInterfaceServer.allowedHostsLong", new
TMCIAllowedHostsCallback(core));
TMCIConfig.register("port", 2323, 1, true, false,
"TextModeClientInterfaceServer.telnetPortNumber",
"TextModeClientInterfaceServer.telnetPortNumberLong", new
TCMIPortNumberCallback(core));
TMCIConfig.register("directEnabled", false, 1, true, false,
"TextModeClientInterfaceServer.enableInputOutput",
"TextModeClientInterfaceServer.enableInputOutputLong", new
TMCIDirectEnabledCallback(core));
@@ -144,7 +144,7 @@
if(core.getTextModeClientInterface()!=null)
return core.getTextModeClientInterface().bindTo;
else
- return "127.0.0.1";
+ return NetworkInterface.DEFAULT_BIND_TO;
}
public void set(String val) throws InvalidConfigValueException {
@@ -170,7 +170,7 @@
if (core.getTextModeClientInterface() != null) {
return
core.getTextModeClientInterface().allowedHosts;
}
- return "127.0.0.1";
+ return NetworkInterface.DEFAULT_BIND_TO;
}
public void set(String val) {
Modified: trunk/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPServer.java 2007-11-10 19:49:24 UTC
(rev 15743)
+++ trunk/freenet/src/freenet/node/fcp/FCPServer.java 2007-11-10 19:54:14 UTC
(rev 15744)
@@ -247,7 +247,6 @@
static class FCPAllowedHostsCallback implements StringCallback {
private final NodeClientCore node;
- public static final String DEFAULT =
"127.0.0.1,0:0:0:0:0:0:0:1";
public FCPAllowedHostsCallback(NodeClientCore node) {
this.node = node;
@@ -255,9 +254,9 @@
public String get() {
FCPServer server = node.getFCPServer();
- if(server == null) return DEFAULT;
+ if(server == null) return
NetworkInterface.DEFAULT_BIND_TO;
NetworkInterface netIface = server.networkInterface;
- return (netIface == null ? DEFAULT :
netIface.getAllowedHosts());
+ return (netIface == null ?
NetworkInterface.DEFAULT_BIND_TO : netIface.getAllowedHosts());
}
public void set(String val) {
@@ -369,9 +368,9 @@
short sortOrder = 0;
fcpConfig.register("enabled", true, sortOrder++, true, false,
"FcpServer.isEnabled", "FcpServer.isEnabledLong", new FCPEnabledCallback(core));
fcpConfig.register("port", FCPServer.DEFAULT_FCP_PORT /*
anagram of 1984, and 1000 up from old number */, 2, true, true,
"FcpServer.portNumber", "FcpServer.portNumberLong", new
FCPPortNumberCallback(core));
- fcpConfig.register("bindTo", "127.0.0.1,0:0:0:0:0:0:0:1",
sortOrder++, false, true, "FcpServer.bindTo", "FcpServer.bindToLong", new
FCPBindtoCallback(core));
- fcpConfig.register("allowedHosts", "127.0.0.1,0:0:0:0:0:0:0:1",
sortOrder++, false, true, "FcpServer.allowedHosts",
"FcpServer.allowedHostsLong", new FCPAllowedHostsCallback(core));
- fcpConfig.register("allowedHostsFullAccess",
"127.0.0.1,0:0:0:0:0:0:0:1", sortOrder++, false, true,
"FcpServer.allowedHostsFullAccess", "FcpServer.allowedHostsFullAccessLong", new
FCPAllowedHostsFullAccessCallback(core));
+ fcpConfig.register("bindTo", NetworkInterface.DEFAULT_BIND_TO,
sortOrder++, false, true, "FcpServer.bindTo", "FcpServer.bindToLong", new
FCPBindtoCallback(core));
+ fcpConfig.register("allowedHosts",
NetworkInterface.DEFAULT_BIND_TO, sortOrder++, false, true,
"FcpServer.allowedHosts", "FcpServer.allowedHostsLong", new
FCPAllowedHostsCallback(core));
+ fcpConfig.register("allowedHostsFullAccess",
NetworkInterface.DEFAULT_BIND_TO, sortOrder++, false, true,
"FcpServer.allowedHostsFullAccess", "FcpServer.allowedHostsFullAccessLong", new
FCPAllowedHostsFullAccessCallback(core));
PersistentDownloadsEnabledCallback cb1;
PersistentDownloadsFileCallback cb2;
PersistentDownloadsIntervalCallback cb3;
