[freenet-cvs] r15742 - in trunk/freenet/src/freenet/node: . fcp

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-11-10 19:22:53 +0000 (Sat, 10 Nov 2007)
New Revision: 15742

Modified:
   trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
   trunk/freenet/src/freenet/node/fcp/FCPServer.java
Log:
Bind both FCP and TMCI to ipv4 and ipv6 loopback addresses

Modified: trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java   
2007-11-10 19:10:10 UTC (rev 15741)
+++ trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java   
2007-11-10 19:22:53 UTC (rev 15742)
@@ -64,7 +64,7 @@
                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", 2, true, false, 
"TextModeClientInterfaceServer.bindTo", 
"TextModeClientInterfaceServer.bindToLong", new TMCIBindtoCallback(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("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));

Modified: trunk/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPServer.java   2007-11-10 19:10:10 UTC 
(rev 15741)
+++ trunk/freenet/src/freenet/node/fcp/FCPServer.java   2007-11-10 19:22:53 UTC 
(rev 15742)
@@ -369,7 +369,7 @@
                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", sortOrder++, false, 
true, "FcpServer.bindTo", "FcpServer.bindToLong", new FCPBindtoCallback(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));
                PersistentDownloadsEnabledCallback cb1;