Author: j16sdiz
Date: 2009-04-13 15:26:12 +0000 (Mon, 13 Apr 2009)
New Revision: 26755
Modified:
trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
trunk/freenet/src/freenet/node/NodeClientCore.java
trunk/freenet/src/freenet/node/NodeCryptoConfig.java
trunk/freenet/src/freenet/node/NodeStats.java
trunk/freenet/src/freenet/node/TestnetHandler.java
trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
trunk/freenet/src/freenet/node/fcp/FCPServer.java
Log:
Missing files in r26754
Modified: trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2009-04-13 15:15:51 UTC (rev 26754)
+++ trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2009-04-13 15:26:12 UTC (rev 26755)
@@ -328,7 +328,7 @@
fproxyConfig.register("ssl", false, configItemOrder++, true,
true, "SimpleToadletServer.ssl", "SimpleToadletServer.sslLong",
new FProxySSLCallback());
fproxyConfig.register("port", DEFAULT_FPROXY_PORT,
configItemOrder++, true, true, "SimpleToadletServer.port",
"SimpleToadletServer.portLong",
- new FProxyPortCallback());
+ new FProxyPortCallback(), false);
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",
@@ -447,7 +447,7 @@
});
enableActivelinks =
fproxyConfig.getBoolean("enableActivelinks");
- fproxyConfig.register("passthroughMaxSize", 2L*1024*1024,
configItemOrder++, true, false, "SimpleToadletServer.passthroughMaxSize",
"SimpleToadletServer.passthroughMaxSizeLong", new FProxyPassthruMaxSize());
+ fproxyConfig.register("passthroughMaxSize", 2L*1024*1024,
configItemOrder++, true, false, "SimpleToadletServer.passthroughMaxSize",
"SimpleToadletServer.passthroughMaxSizeLong", new FProxyPassthruMaxSize(),
true);
FProxyToadlet.MAX_LENGTH =
fproxyConfig.getLong("passthroughMaxSize");
fproxyConfig.register("allowedHosts",
"127.0.0.1,0:0:0:0:0:0:0:1", configItemOrder++, true, true,
"SimpleToadletServer.allowedHosts", "SimpleToadletServer.allowedHostsLong",
Modified: trunk/freenet/src/freenet/node/NodeClientCore.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeClientCore.java 2009-04-13 15:15:51 UTC
(rev 26754)
+++ trunk/freenet/src/freenet/node/NodeClientCore.java 2009-04-13 15:26:12 UTC
(rev 26755)
@@ -282,7 +282,7 @@
return;
tempBucketFactory.setMaxRAMBucketSize(val);
}
- });
+ }, true);
nodeConfig.register("RAMBucketPoolSize", "10MiB", sortOrder++,
true, false, "NodeClientCore.ramBucketPoolSize",
"NodeClientCore.ramBucketPoolSizeLong", new LongCallback() {
@Override
@@ -296,7 +296,7 @@
return;
tempBucketFactory.setMaxRamUsed(val);
}
- });
+ }, true);
nodeConfig.register("encryptTempBuckets", true, sortOrder++,
true, false, "NodeClientCore.encryptTempBuckets",
"NodeClientCore.encryptTempBucketsLong", new BooleanCallback() {
@@ -446,7 +446,7 @@
throw new
InvalidConfigValueException(l10n("maxUSKFetchersMustBeGreaterThanZero"));
maxBackgroundUSKFetchers = uskFetch;
}
- });
+ }, false);
maxBackgroundUSKFetchers =
nodeConfig.getInt("maxBackgroundUSKFetchers");
Modified: trunk/freenet/src/freenet/node/NodeCryptoConfig.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeCryptoConfig.java 2009-04-13
15:15:51 UTC (rev 26754)
+++ trunk/freenet/src/freenet/node/NodeCryptoConfig.java 2009-04-13
15:26:12 UTC (rev 26755)
@@ -86,7 +86,7 @@
public boolean isReadOnly() {
return true;
}
- });
+ }, false);
try{
portNumber = config.getInt("listenPort");
@@ -128,7 +128,7 @@
crypto.onSetDropProbability(val);
}
- });
+ }, false);
dropProbability = config.getInt("testingDropPacketsEvery");
config.register("oneConnectionPerIP", isOpennet, sortOrder++,
true, false, "Node.oneConnectionPerIP", "Node.oneConnectionPerIPLong",
Modified: trunk/freenet/src/freenet/node/NodeStats.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeStats.java 2009-04-13 15:15:51 UTC
(rev 26754)
+++ trunk/freenet/src/freenet/node/NodeStats.java 2009-04-13 15:26:12 UTC
(rev 26755)
@@ -241,7 +241,7 @@
throw new
InvalidConfigValueException(l10n("valueTooLow"));
threadLimit = val;
}
- });
+ },false);
threadLimit = statsConfig.getInt("threadLimit");
// Yes it could be in seconds insteed of multiples of 0.12, but
we don't want people to play with it :)
@@ -258,7 +258,7 @@
Logger.normal(this, "Changing
aggressiveGCModificator to "+val);
aggressiveGCModificator = val;
}
- });
+ },false);
aggressiveGCModificator = statsConfig.getInt("aggressiveGC");
myMemoryChecker = new MemoryChecker(node.ps,
aggressiveGCModificator);
Modified: trunk/freenet/src/freenet/node/TestnetHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/TestnetHandler.java 2009-04-13 15:15:51 UTC
(rev 26754)
+++ trunk/freenet/src/freenet/node/TestnetHandler.java 2009-04-13 15:26:12 UTC
(rev 26755)
@@ -266,7 +266,7 @@
// Get the testnet port
testnetConfig.register("port",
node.getDarknetPortNumber()+1000, 2, true, false, "TestnetHandler.port",
"TestnetHandler.portLong",
- new TestnetPortNumberCallback(node));
+ new TestnetPortNumberCallback(node), false);
int port = testnetConfig.getInt("port");
Modified: trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
2009-04-13 15:15:51 UTC (rev 26754)
+++ trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
2009-04-13 15:26:12 UTC (rev 26755)
@@ -70,7 +70,7 @@
TMCIConfig.register("ssl", false, 1, true, true ,
"TextModeClientInterfaceServer.ssl", "TextModeClientInterfaceServer.sslLong",
new TMCISSLCallback());
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("port", 2323, 1, true, false,
"TextModeClientInterfaceServer.telnetPortNumber",
"TextModeClientInterfaceServer.telnetPortNumberLong", new
TCMIPortNumberCallback(core), false);
TMCIConfig.register("directEnabled", false, 1, true, false,
"TextModeClientInterfaceServer.enableInputOutput",
"TextModeClientInterfaceServer.enableInputOutputLong", new
TMCIDirectEnabledCallback(core));
boolean TMCIEnabled = TMCIConfig.getBoolean("enabled");
Modified: trunk/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPServer.java 2009-04-13 15:15:51 UTC
(rev 26754)
+++ trunk/freenet/src/freenet/node/fcp/FCPServer.java 2009-04-13 15:26:12 UTC
(rev 26755)
@@ -416,7 +416,7 @@
short sortOrder = 0;
fcpConfig.register("enabled", true, sortOrder++, true, false,
"FcpServer.isEnabled", "FcpServer.isEnabledLong", new FCPEnabledCallback(core));
fcpConfig.register("ssl", false, sortOrder++, true, true,
"FcpServer.ssl", "FcpServer.sslLong", new FCPSSLCallback());
- 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("port", FCPServer.DEFAULT_FCP_PORT /*
anagram of 1984, and 1000 up from old number */, 2, true, true,
"FcpServer.portNumber", "FcpServer.portNumberLong", new
FCPPortNumberCallback(core), false);
fcpConfig.register("bindTo", NetworkInterface.DEFAULT_BIND_TO,
sortOrder++, true, true, "FcpServer.bindTo", "FcpServer.bindToLong", new
FCPBindtoCallback(core));
fcpConfig.register("allowedHosts",
NetworkInterface.DEFAULT_BIND_TO, sortOrder++, true, true,
"FcpServer.allowedHosts", "FcpServer.allowedHostsLong", new
FCPAllowedHostsCallback(core));
fcpConfig.register("allowedHostsFullAccess",
NetworkInterface.DEFAULT_BIND_TO, sortOrder++, true, true,
"FcpServer.allowedHostsFullAccess", "FcpServer.allowedHostsFullAccessLong", new
FCPAllowedHostsFullAccessCallback(core));
@@ -424,7 +424,7 @@
PersistentDownloadsEnabledCallback enabledCB = new
PersistentDownloadsEnabledCallback();
fcpConfig.register("persistentDownloadsEnabled", true,
sortOrder++, true, true, "FcpServer.enablePersistentDownload",
"FcpServer.enablePersistentDownloadLong", enabledCB);
fcpConfig.register("persistentDownloadsFile", "downloads.dat",
sortOrder++, true, false, "FcpServer.filenameToStorePData",
"FcpServer.filenameToStorePDataLong", cb2 = new
PersistentDownloadsFileCallback());
- fcpConfig.register("persistentDownloadsInterval", (5*60*1000),
sortOrder++, true, false, "FcpServer.intervalBetweenWrites",
"FcpServer.intervalBetweenWritesLong", (IntCallback) null);
+ fcpConfig.register("persistentDownloadsInterval", (5*60*1000),
sortOrder++, true, false, "FcpServer.intervalBetweenWrites",
"FcpServer.intervalBetweenWritesLong", (IntCallback) null, false);
String persistentDownloadsDir =
fcpConfig.getString("persistentDownloadsFile");
boolean persistentDownloadsEnabled =
fcpConfig.getBoolean("persistentDownloadsEnabled");
enabledCB.enabled = persistentDownloadsEnabled;
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
