Author: zothar
Date: 2007-02-10 00:02:08 +0000 (Sat, 10 Feb 2007)
New Revision: 11729
Modified:
trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
trunk/freenet/src/freenet/clients/http/QueueToadlet.java
trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
trunk/freenet/src/freenet/node/CHKInsertSender.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/NodeClientCore.java
trunk/freenet/src/freenet/node/NodeDispatcher.java
trunk/freenet/src/freenet/node/RequestSender.java
trunk/freenet/src/freenet/node/SSKInsertSender.java
Log:
More Advanced Darknet -> Advanced Mode
Modified: trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2007-02-09
23:59:45 UTC (rev 11728)
+++ trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2007-02-10
00:02:08 UTC (rev 11729)
@@ -101,13 +101,13 @@
public void handleGet(URI uri, HTTPRequest req, ToadletContext ctx)
throws ToadletContextClosedException, IOException {
SubConfig[] sc = config.getConfigs();
Arrays.sort(sc);
- boolean advancedEnabled = core.isAdvancedDarknetEnabled();
+ boolean advancedModeEnabled = core.isAdvancedModeEnabled();
HTMLNode pageNode = ctx.getPageMaker().getPageNode("Freenet
Node Configuration of " + node.getMyName());
HTMLNode contentNode =
ctx.getPageMaker().getContentNode(pageNode);
contentNode.addChild(core.alerts.createSummary());
- if(advancedEnabled){
+ if(advancedModeEnabled){
HTMLNode navigationBar =
ctx.getPageMaker().getInfobox("navbar", "Configuration Navigation");
HTMLNode navigationContent =
ctx.getPageMaker().getContentNode(navigationBar).addChild("ul");
for(int i=0; i<sc.length;i++){
@@ -128,7 +128,7 @@
HTMLNode configGroupUlNode = new HTMLNode("ul",
"class", "config");
for(int j=0; j<o.length; j++){
- if(! (!advancedEnabled && o[j].isExpert())){
+ if(! (!advancedModeEnabled && o[j].isExpert())){
displayedConfigElements++;
String configName = o[j].getName();
Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2007-02-09 23:59:45 UTC (rev 11728)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2007-02-10 00:02:08 UTC (rev 11729)
@@ -63,7 +63,7 @@
return;
}
- final boolean advancedEnabled = node.isAdvancedDarknetEnabled();
+ final boolean advancedModeEnabled =
node.isAdvancedModeEnabled();
final boolean fProxyJavascriptEnabled =
node.isFProxyJavascriptEnabled();
/* gather connection statistics */
@@ -127,7 +127,7 @@
int numberOfSimpleConnected = numberOfConnected +
numberOfRoutingBackedOff;
int numberOfNotConnected = numberOfTooNew + numberOfTooOld +
numberOfDisconnected + numberOfNeverConnected + numberOfDisabled +
numberOfBursting + numberOfListening + numberOfListenOnly;
String titleCountString = null;
- if(advancedEnabled) {
+ if(advancedModeEnabled) {
titleCountString = "(" + numberOfConnected + '/' +
numberOfRoutingBackedOff + '/' + numberOfTooNew + '/' + numberOfTooOld + '/' +
numberOfNotConnected + ')';
} else {
titleCountString = (numberOfNotConnected +
numberOfSimpleConnected)>0 ? String.valueOf(numberOfSimpleConnected) : "";
@@ -164,7 +164,7 @@
HTMLNode nextTableCell =
overviewTableRow.addChild("td", "class", "first");
/* node status overview box */
- if(advancedEnabled) {
+ if(advancedModeEnabled) {
HTMLNode overviewInfobox =
nextTableCell.addChild("div", "class", "infobox");
overviewInfobox.addChild("div", "class",
"infobox-header", "Node status overview");
HTMLNode overviewInfoboxContent =
overviewInfobox.addChild("div", "class", "infobox-content");
@@ -204,7 +204,7 @@
if (numTransferringRequests > 0) {
activityList.addChild("li",
"Transferring\u00a0Requests:\u00a0" + numTransferringRequests);
}
- if (advancedEnabled) {
+ if (advancedModeEnabled) {
if (numARKFetchers > 0) {
activityList.addChild("li",
"ARK\u00a0Fetch\u00a0Requests:\u00a0" + numARKFetchers);
}
@@ -232,7 +232,7 @@
}
}
- nextTableCell = advancedEnabled ?
overviewTableRow.addChild("td") : overviewTableRow.addChild("td", "class",
"last");
+ nextTableCell = advancedModeEnabled ?
overviewTableRow.addChild("td") : overviewTableRow.addChild("td", "class",
"last");
// Peer statistics box
HTMLNode peerStatsInfobox =
nextTableCell.addChild("div", "class", "infobox");
@@ -246,7 +246,7 @@
}
if (numberOfRoutingBackedOff > 0) {
HTMLNode peerStatsRoutingBackedOffListItem =
peerStatsList.addChild("li").addChild("span");
-
peerStatsRoutingBackedOffListItem.addChild("span", new String[] { "class",
"title", "style" }, new String[] { "peer_backed_off", (advancedEnabled ?
"Connected but backed off: These peers are connected but we're backed off of
them" : "Busy: These peers are connected but they're busy") + ", so the node is
not routing requests to them", "border-bottom: 1px dotted; cursor: help;" },
advancedEnabled ? "Backed off" : "Busy");
+
peerStatsRoutingBackedOffListItem.addChild("span", new String[] { "class",
"title", "style" }, new String[] { "peer_backed_off", (advancedModeEnabled ?
"Connected but backed off: These peers are connected but we're backed off of
them" : "Busy: These peers are connected but they're busy") + ", so the node is
not routing requests to them", "border-bottom: 1px dotted; cursor: help;" },
advancedModeEnabled ? "Backed off" : "Busy");
peerStatsRoutingBackedOffListItem.addChild("span", ":\u00a0" +
numberOfRoutingBackedOff);
}
if (numberOfTooNew > 0) {
@@ -291,7 +291,7 @@
}
// Peer routing backoff reason box
- if(advancedEnabled) {
+ if(advancedModeEnabled) {
nextTableCell = overviewTableRow.addChild("td",
"class", "last");
HTMLNode backoffReasonInfobox =
nextTableCell.addChild("div", "class", "infobox");
backoffReasonInfobox.addChild("div", "class",
"infobox-header", "Peer backoff reasons");
@@ -346,7 +346,7 @@
HTMLNode peerTableInfobox = contentNode.addChild("div",
"class", "infobox infobox-normal");
HTMLNode peerTableInfoboxHeader =
peerTableInfobox.addChild("div", "class", "infobox-header");
peerTableInfoboxHeader.addChild("#", "My peers");
- if (advancedEnabled) {
+ if (advancedModeEnabled) {
if (!path.endsWith("displaymessagetypes.html"))
{
peerTableInfoboxHeader.addChild("#", "
");
peerTableInfoboxHeader.addChild("a",
"href", "displaymessagetypes.html", "(more detailed)");
@@ -365,11 +365,11 @@
peerTableHeaderRow.addChild("th");
peerTableHeaderRow.addChild("th").addChild("a",
"href", sortString(isReversed, "status")).addChild("#", "Status");
peerTableHeaderRow.addChild("th").addChild("a",
"href", sortString(isReversed, "name")).addChild("span", new String[] {
"title", "style" }, new String[] { "The node's name. Click on the name link to
send the node a N2NTM (Node To Node Text Message)", "border-bottom: 1px dotted;
cursor: help;" }, "Name");
- if (advancedEnabled) {
+ if (advancedModeEnabled) {
peerTableHeaderRow.addChild("th").addChild("a", "href", sortString(isReversed,
"address")).addChild("span", new String[] { "title", "style" }, new String[] {
"The node's network address as IP:Port", "border-bottom: 1px dotted; cursor:
help;" }, "Address");
}
peerTableHeaderRow.addChild("th").addChild("a",
"href", sortString(isReversed, "version")).addChild("#", "Version");
- if (advancedEnabled) {
+ if (advancedModeEnabled) {
peerTableHeaderRow.addChild("th").addChild("a", "href", sortString(isReversed,
"location")).addChild("#", "Location");
peerTableHeaderRow.addChild("th").addChild("span", new String[] { "title",
"style" }, new String[] { "Other node busy? Display: Percentage of time the
node is overloaded, Current wait time remaining (0=not overloaded)/total/last
overload reason", "border-bottom: 1px dotted; cursor: help;" }, "Backoff");
@@ -378,7 +378,7 @@
peerTableHeaderRow.addChild("th").addChild("span", new String[] { "title",
"style" }, new String[] { "How long since the node was connected or last seen",
"border-bottom: 1px dotted; cursor: help;" }, "Connected\u00a0/\u00a0Idle");
peerTableHeaderRow.addChild("th").addChild("a",
"href", sortString(isReversed, "privnote")).addChild("span", new String[] {
"title", "style" }, new String[] { "A private note concerning this peer",
"border-bottom: 1px dotted; cursor: help;" }, "Private Note");
- if(advancedEnabled) {
+ if(advancedModeEnabled) {
peerTableHeaderRow.addChild("th",
"%\u00a0Time Routable");
peerTableHeaderRow.addChild("th",
"Total\u00a0Traffic\u00a0(in/out)");
peerTableHeaderRow.addChild("th",
"Congestion\u00a0Control");
@@ -393,7 +393,7 @@
// status column
String statusString =
peerNodeStatus.getStatusName();
- if (!advancedEnabled &&
(peerNodeStatus.getStatusValue() == Node.PEER_NODE_STATUS_ROUTING_BACKED_OFF)) {
+ if (!advancedModeEnabled &&
(peerNodeStatus.getStatusValue() == Node.PEER_NODE_STATUS_ROUTING_BACKED_OFF)) {
statusString = "BUSY";
}
peerRow.addChild("td", "class",
"peer-status").addChild("span", "class", peerNodeStatus.getStatusCSSName(),
statusString + (peerNodeStatus.isFetchingARK() ? "*" : ""));
@@ -402,7 +402,7 @@
peerRow.addChild("td", "class",
"peer-name").addChild("a", "href", "/send_n2ntm/?peernode_hashcode=" +
peerNodeStatus.hashCode(), peerNodeStatus.getName());
// address column
- if (advancedEnabled) {
+ if (advancedModeEnabled) {
String pingTime = "";
if
(peerNodeStatus.isConnected()) {
pingTime = " (" + (int)
peerNodeStatus.getAveragePingTime() + "ms)";
@@ -418,11 +418,11 @@
}
// location column
- if (advancedEnabled) {
+ if (advancedModeEnabled) {
peerRow.addChild("td", "class",
"peer-location", String.valueOf(peerNodeStatus.getLocation()));
}
- if (advancedEnabled) {
+ if (advancedModeEnabled) {
// backoff column
HTMLNode backoffCell =
peerRow.addChild("td", "class", "peer-backoff");
backoffCell.addChild("#",
fix1.format(peerNodeStatus.getBackedOffPercent()));
@@ -459,7 +459,7 @@
peerRow.addChild("td", "class",
"peer-private-darknet-comment-note").addChild("input", new String[] { "type",
"name", "size", "maxlength", "value" }, new String[] { "text",
"peerPrivateNote_" + peerNodeStatus.hashCode(), "16", "250",
peerNodeStatus.getPrivateDarknetCommentNote() });
}
- if(advancedEnabled) {
+ if(advancedModeEnabled) {
// percent of time connected
column
peerRow.addChild("td", "class",
"peer-idle" /* FIXME */).addChild("#",
fix1.format(peerNodeStatus.getPercentTimeRoutableConnection()));
// total traffic column
@@ -478,7 +478,7 @@
if
(path.endsWith("displaymessagetypes.html")) {
HTMLNode messageCountRow =
peerTable.addChild("tr", "class", "message-status");
messageCountRow.addChild("td",
"colspan", "2");
- HTMLNode messageCountCell =
messageCountRow.addChild("td", "colspan", String.valueOf(advancedEnabled ? 9 :
5)); // = total table row width - 2 from above colspan
+ HTMLNode messageCountCell =
messageCountRow.addChild("td", "colspan", String.valueOf(advancedModeEnabled ?
9 : 5)); // = total table row width - 2 from above colspan
HTMLNode messageCountTable =
messageCountCell.addChild("table", "class", "message-count");
HTMLNode countHeaderRow =
messageCountTable.addChild("tr");
countHeaderRow.addChild("th",
"Message");
@@ -525,7 +525,7 @@
actionSelect.addChild("option", "value", "",
"-- Select action --");
actionSelect.addChild("option", "value",
"send_n2ntm", "Send N2NTM to selected peers");
actionSelect.addChild("option", "value",
"update_notes", "Update changed private notes");
- if(advancedEnabled) {
+ if(advancedModeEnabled) {
actionSelect.addChild("option",
"value", "enable", "Enable selected peers");
actionSelect.addChild("option",
"value", "disable", "Disable selected peers");
actionSelect.addChild("option",
"value", "set_burst_only", "On selected peers, set BurstOnly (only set this if
you have a static IP and are not NATed and neither is the peer)");
Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2007-02-09
23:59:45 UTC (rev 11728)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2007-02-10
00:02:08 UTC (rev 11729)
@@ -528,13 +528,13 @@
contentNode.addChild(createPanicBox(pageMaker, ctx));
}
- boolean advancedEnabled = core.isAdvancedDarknetEnabled();
+ boolean advancedModeEnabled = core.isAdvancedModeEnabled();
if (!completedDownloadToTemp.isEmpty()) {
contentNode.addChild("a", "name",
"completedDownloadToTemp");
HTMLNode completedDownloadsTempInfobox =
contentNode.addChild(pageMaker.getInfobox("completed_requests", "Completed:
Downloads to temporary directory (" + completedDownloadToTemp.size() + ')'));
HTMLNode completedDownloadsToTempContent =
pageMaker.getContentNode(completedDownloadsTempInfobox);
- if (advancedEnabled) {
+ if (advancedModeEnabled) {
completedDownloadsToTempContent.addChild(createRequestTable(pageMaker, ctx,
completedDownloadToTemp, new int[] { LIST_IDENTIFIER, LIST_SIZE,
LIST_MIME_TYPE, LIST_DOWNLOAD, LIST_PERSISTENCE, LIST_KEY }));
} else {
completedDownloadsToTempContent.addChild(createRequestTable(pageMaker, ctx,
completedDownloadToTemp, new int[] { LIST_SIZE, LIST_MIME_TYPE, LIST_DOWNLOAD,
LIST_PERSISTENCE, LIST_KEY }));
@@ -545,7 +545,7 @@
contentNode.addChild("a", "name",
"completedDownloadToDisk");
HTMLNode completedToDiskInfobox =
contentNode.addChild(pageMaker.getInfobox("completed_requests", "Completed:
Downloads to download directory (" + completedDownloadToDisk.size() + ')'));
HTMLNode completedToDiskInfoboxContent =
pageMaker.getContentNode(completedToDiskInfobox);
- if (advancedEnabled) {
+ if (advancedModeEnabled) {
completedToDiskInfoboxContent.addChild(createRequestTable(pageMaker, ctx,
completedDownloadToDisk, new int[] { LIST_IDENTIFIER, LIST_FILENAME, LIST_SIZE,
LIST_MIME_TYPE, LIST_DOWNLOAD, LIST_PERSISTENCE, LIST_KEY }));
} else {
completedToDiskInfoboxContent.addChild(createRequestTable(pageMaker, ctx,
completedDownloadToDisk, new int[] { LIST_FILENAME, LIST_SIZE, LIST_MIME_TYPE,
LIST_DOWNLOAD, LIST_PERSISTENCE, LIST_KEY }));
@@ -556,7 +556,7 @@
contentNode.addChild("a", "name", "completedUpload");
HTMLNode completedUploadInfobox =
contentNode.addChild(pageMaker.getInfobox("completed_requests", "Completed:
Uploads (" + completedUpload.size() + ')'));
HTMLNode completedUploadInfoboxContent =
pageMaker.getContentNode(completedUploadInfobox);
- if (advancedEnabled) {
+ if (advancedModeEnabled) {
completedUploadInfoboxContent.addChild(createRequestTable(pageMaker, ctx,
completedUpload, new int[] { LIST_IDENTIFIER, LIST_FILENAME, LIST_SIZE,
LIST_MIME_TYPE, LIST_PERSISTENCE, LIST_KEY }));
} else {
completedUploadInfoboxContent.addChild(createRequestTable(pageMaker, ctx,
completedUpload, new int[] { LIST_FILENAME, LIST_SIZE, LIST_MIME_TYPE,
LIST_PERSISTENCE, LIST_KEY }));
@@ -567,7 +567,7 @@
contentNode.addChild("a", "name", "completedDirUpload");
HTMLNode completedUploadDirInfobox =
contentNode.addChild(pageMaker.getInfobox("completed_requests", "Completed:
Directory Uploads (" + completedDirUpload.size() + ')'));
HTMLNode completedUploadDirContent =
pageMaker.getContentNode(completedUploadDirInfobox);
- if (advancedEnabled) {
+ if (advancedModeEnabled) {
completedUploadDirContent.addChild(createRequestTable(pageMaker, ctx,
completedDirUpload, new int[] { LIST_IDENTIFIER, LIST_FILES, LIST_TOTAL_SIZE,
LIST_PERSISTENCE, LIST_KEY }));
} else {
completedUploadDirContent.addChild(createRequestTable(pageMaker, ctx,
completedDirUpload, new int[] { LIST_FILES, LIST_TOTAL_SIZE, LIST_PERSISTENCE,
LIST_KEY }));
@@ -578,7 +578,7 @@
contentNode.addChild("a", "name", "failedDownload");
HTMLNode failedInfobox =
contentNode.addChild(pageMaker.getInfobox("failed_requests", "Failed: Downloads
(" + failedDownload.size() + ')'));
HTMLNode failedContent =
pageMaker.getContentNode(failedInfobox);
- if (advancedEnabled) {
+ if (advancedModeEnabled) {
failedContent.addChild(createRequestTable(pageMaker, ctx, failedDownload, new
int[] { LIST_IDENTIFIER, LIST_FILENAME, LIST_SIZE, LIST_MIME_TYPE,
LIST_PROGRESS, LIST_REASON, LIST_PERSISTENCE, LIST_KEY }));
} else {
failedContent.addChild(createRequestTable(pageMaker, ctx, failedDownload, new
int[] { LIST_FILENAME, LIST_SIZE, LIST_MIME_TYPE, LIST_PROGRESS, LIST_REASON,
LIST_PERSISTENCE, LIST_KEY }));
@@ -589,7 +589,7 @@
contentNode.addChild("a", "name", "failedUpload");
HTMLNode failedInfobox =
contentNode.addChild(pageMaker.getInfobox("failed_requests", "Failed: Uploads
(" + failedUpload.size() + ')'));
HTMLNode failedContent =
pageMaker.getContentNode(failedInfobox);
- if (advancedEnabled) {
+ if (advancedModeEnabled) {
failedContent.addChild(createRequestTable(pageMaker, ctx, failedUpload, new
int[] { LIST_IDENTIFIER, LIST_FILENAME, LIST_SIZE, LIST_MIME_TYPE,
LIST_PROGRESS, LIST_REASON, LIST_PERSISTENCE, LIST_KEY }));
} else {
failedContent.addChild(createRequestTable(pageMaker, ctx, failedUpload, new
int[] { LIST_FILENAME, LIST_SIZE, LIST_MIME_TYPE, LIST_PROGRESS, LIST_REASON,
LIST_PERSISTENCE, LIST_KEY }));
@@ -600,7 +600,7 @@
contentNode.addChild("a", "name", "failedDirUpload");
HTMLNode failedInfobox =
contentNode.addChild(pageMaker.getInfobox("failed_requests", "Failed: Directory
Uploads (" + failedDirUpload.size() + ')'));
HTMLNode failedContent =
pageMaker.getContentNode(failedInfobox);
- if (advancedEnabled) {
+ if (advancedModeEnabled) {
failedContent.addChild(createRequestTable(pageMaker, ctx, failedDirUpload, new
int[] { LIST_IDENTIFIER, LIST_FILES, LIST_TOTAL_SIZE, LIST_PROGRESS,
LIST_REASON, LIST_PERSISTENCE, LIST_KEY }));
} else {
failedContent.addChild(createRequestTable(pageMaker, ctx, failedDirUpload, new
int[] { LIST_FILES, LIST_TOTAL_SIZE, LIST_PROGRESS, LIST_REASON,
LIST_PERSISTENCE, LIST_KEY }));
@@ -611,7 +611,7 @@
contentNode.addChild("a", "name",
"uncompletedDownload");
HTMLNode uncompletedInfobox =
contentNode.addChild(pageMaker.getInfobox("requests_in_progress", "In Progress:
Downloads (" + uncompletedDownload.size() + ')'));
HTMLNode uncompletedContent =
pageMaker.getContentNode(uncompletedInfobox);
- if (advancedEnabled) {
+ if (advancedModeEnabled) {
uncompletedContent.addChild(createRequestTable(pageMaker, ctx,
uncompletedDownload, new int[] { LIST_IDENTIFIER, LIST_PRIORITY, LIST_SIZE,
LIST_MIME_TYPE, LIST_PROGRESS, LIST_PERSISTENCE, LIST_FILENAME, LIST_KEY }));
} else {
uncompletedContent.addChild(createRequestTable(pageMaker, ctx,
uncompletedDownload, new int[] { LIST_FILENAME, LIST_SIZE, LIST_MIME_TYPE,
LIST_PROGRESS, LIST_PERSISTENCE, LIST_KEY }));
@@ -622,7 +622,7 @@
contentNode.addChild("a", "name", "uncompletedUpload");
HTMLNode uncompletedInfobox =
contentNode.addChild(pageMaker.getInfobox("requests_in_progress", "In Progress:
Uploads (" + uncompletedUpload.size() + ')'));
HTMLNode uncompletedContent =
pageMaker.getContentNode(uncompletedInfobox);
- if (advancedEnabled) {
+ if (advancedModeEnabled) {
uncompletedContent.addChild(createRequestTable(pageMaker, ctx,
uncompletedUpload, new int[] { LIST_IDENTIFIER, LIST_PRIORITY, LIST_SIZE,
LIST_MIME_TYPE, LIST_PROGRESS, LIST_PERSISTENCE, LIST_FILENAME, LIST_KEY }));
} else {
uncompletedContent.addChild(createRequestTable(pageMaker, ctx,
uncompletedUpload, new int[] { LIST_FILENAME, LIST_SIZE, LIST_MIME_TYPE,
LIST_PROGRESS, LIST_PERSISTENCE, LIST_KEY }));
@@ -633,7 +633,7 @@
contentNode.addChild("a", "name",
"uncompletedDirUpload");
HTMLNode uncompletedInfobox =
contentNode.addChild(pageMaker.getInfobox("requests_in_progress", "In Progress:
DirUploads (" + uncompletedDirUpload.size() + ')'));
HTMLNode uncompletedContent =
pageMaker.getContentNode(uncompletedInfobox);
- if (advancedEnabled) {
+ if (advancedModeEnabled) {
uncompletedContent.addChild(createRequestTable(pageMaker, ctx,
uncompletedDirUpload, new int[] { LIST_IDENTIFIER, LIST_FILES, LIST_PRIORITY,
LIST_TOTAL_SIZE, LIST_PROGRESS, LIST_PERSISTENCE, LIST_KEY }));
} else {
uncompletedContent.addChild(createRequestTable(pageMaker, ctx,
uncompletedDirUpload, new int[] { LIST_FILES, LIST_TOTAL_SIZE, LIST_PROGRESS,
LIST_PERSISTENCE, LIST_KEY }));
@@ -663,7 +663,7 @@
}
//double frac = p.getSuccessFraction();
- if (!core.isAdvancedDarknetEnabled()) {
+ if (!core.isAdvancedModeEnabled()) {
total = min;
}
Modified: trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2007-02-09 23:59:45 UTC (rev 11728)
+++ trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2007-02-10 00:02:08 UTC (rev 11729)
@@ -56,7 +56,7 @@
private final LinkedList toadlets;
private String cssName;
private Thread myThread;
- private boolean advancedDarknetEnabled;
+ private boolean advancedModeEnabled;
private boolean fProxyJavascriptEnabled;
private final PageMaker pageMaker;
private final NodeClientCore core;
@@ -148,21 +148,21 @@
}
}
- private static class FProxyAdvancedDarknetEnabledCallback implements
BooleanCallback {
+ private static class FProxyAdvancedModeEnabledCallback implements
BooleanCallback {
private final SimpleToadletServer ts;
- FProxyAdvancedDarknetEnabledCallback(SimpleToadletServer ts){
+ FProxyAdvancedModeEnabledCallback(SimpleToadletServer ts){
this.ts = ts;
}
public boolean get() {
- return ts.isAdvancedDarknetEnabled();
+ return ts.isAdvancedModeEnabled();
}
public void set(boolean val) throws InvalidConfigValueException
{
if(val == get()) return;
- ts.enableAdvancedDarknet(val);
+ ts.enableAdvancedMode(val);
}
}
@@ -250,8 +250,8 @@
"Be careful who you give fproxy access to!",
new FProxyAllowedHostsCallback());
fproxyConfig.register("css", "clean", configItemOrder++, false,
false, "CSS Name", "Name of the CSS FProxy should use "+themes.toString(),
new FProxyCSSNameCallback());
- fproxyConfig.register("advancedDarknetEnabled", false,
configItemOrder++, false, false, "Enable Advanced Mode?", "Whether to show or
not informations meant for advanced users/devs. This setting should be turned
to false in most cases.",
- new FProxyAdvancedDarknetEnabledCallback(this));
+ fproxyConfig.register("advancedModeEnabled", false,
configItemOrder++, false, false, "Enable Advanced Mode?", "Whether to show or
not informations meant for advanced users/devs. This setting should be turned
to false in most cases.",
+ new FProxyAdvancedModeEnabledCallback(this));
fproxyConfig.register("javascriptEnabled", false,
configItemOrder++, false, false, "Enable FProxy use of Javascript?", "Whether
or not FProxy should use Javascript \"helpers\". This setting should be turned
to false in most cases. Note that freesites may not use javascript even if this
is enabled.",
new FProxyJavascriptEnabledCallback(this));
fproxyConfig.register("showPanicButton", false,
configItemOrder++, true, true, "Show the panic button?", "Whether to show or
not the panic button on the /queue/ page.",
@@ -274,7 +274,7 @@
cssName = fproxyConfig.getString("css");
if((cssName.indexOf(':') != -1) || (cssName.indexOf('/') != -1))
throw new InvalidConfigValueException("CSS name must
not contain slashes or colons!");
- this.advancedDarknetEnabled =
fproxyConfig.getBoolean("advancedDarknetEnabled");
+ this.advancedModeEnabled =
fproxyConfig.getBoolean("advancedModeEnabled");
pageMaker = new PageMaker(cssName);
toadlets = new LinkedList();
@@ -421,12 +421,12 @@
this.cssName = name;
}
- public synchronized boolean isAdvancedDarknetEnabled() {
- return this.advancedDarknetEnabled;
+ public synchronized boolean isAdvancedModeEnabled() {
+ return this.advancedModeEnabled;
}
- public synchronized void enableAdvancedDarknet(boolean b){
- advancedDarknetEnabled = b;
+ public synchronized void enableAdvancedMode(boolean b){
+ advancedModeEnabled = b;
}
public synchronized boolean isFProxyJavascriptEnabled() {
Modified: trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
2007-02-09 23:59:45 UTC (rev 11728)
+++ trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
2007-02-10 00:02:08 UTC (rev 11729)
@@ -87,7 +87,7 @@
public void handleGet(URI uri, HTTPRequest request, ToadletContext ctx)
throws ToadletContextClosedException, IOException, RedirectException {
- final boolean advancedEnabled = node.isAdvancedDarknetEnabled();
+ final boolean advancedModeEnabled =
node.isAdvancedModeEnabled();
/* gather connection statistics */
PeerNodeStatus[] peerNodeStatuses = node.getPeerNodeStatuses();
@@ -130,7 +130,7 @@
}
// BDB statistics dump
- if(advancedEnabled) {
+ if(advancedModeEnabled) {
HTMLNode JEinfobox =
contentNode.addChild(ctx.getPageMaker().getInfobox("Dump Database runtime
statistics to wrapper.log"));
HTMLNode JEStatsForm =
ctx.addFormChild(ctx.getPageMaker().getContentNode(JEinfobox), "/",
"JEStatsForm");
JEStatsForm.addChild("input", new String[] { "type",
"name", "value" }, new String[] { "submit", "getJEStatsDump", "Generate a JE
Dump" });
@@ -170,7 +170,7 @@
HTMLNode nextTableCell =
overviewTableRow.addChild("td", "class", "first");
/* node status overview box */
- if(advancedEnabled) {
+ if(advancedModeEnabled) {
HTMLNode overviewInfobox =
nextTableCell.addChild("div", "class", "infobox");
overviewInfobox.addChild("div", "class",
"infobox-header", "Node status overview");
HTMLNode overviewInfoboxContent =
overviewInfobox.addChild("div", "class", "infobox-content");
@@ -217,14 +217,14 @@
if (numTransferringRequests > 0) {
activityList.addChild("li",
"Transferring\u00a0Requests:\u00a0" + numTransferringRequests);
}
- if (advancedEnabled) {
+ if (advancedModeEnabled) {
if (numARKFetchers > 0) {
activityList.addChild("li",
"ARK\u00a0Fetch\u00a0Requests:\u00a0" + numARKFetchers);
}
}
}
- nextTableCell = advancedEnabled ?
overviewTableRow.addChild("td") : overviewTableRow.addChild("td", "class",
"last");
+ nextTableCell = advancedModeEnabled ?
overviewTableRow.addChild("td") : overviewTableRow.addChild("td", "class",
"last");
// Peer statistics box
HTMLNode peerStatsInfobox =
nextTableCell.addChild("div", "class", "infobox");
@@ -238,7 +238,7 @@
}
if (numberOfRoutingBackedOff > 0) {
HTMLNode peerStatsRoutingBackedOffListItem =
peerStatsList.addChild("li").addChild("span");
-
peerStatsRoutingBackedOffListItem.addChild("span", new String[] { "class",
"title", "style" }, new String[] { "peer_backed_off", (advancedEnabled ?
"Connected but backed off: These peers are connected but we're backed off of
them" : "Busy: These peers are connected but they're busy") + ", so the node is
not routing requests to them", "border-bottom: 1px dotted; cursor: help;" },
advancedEnabled ? "Backed off" : "Busy");
+
peerStatsRoutingBackedOffListItem.addChild("span", new String[] { "class",
"title", "style" }, new String[] { "peer_backed_off", (advancedModeEnabled ?
"Connected but backed off: These peers are connected but we're backed off of
them" : "Busy: These peers are connected but they're busy") + ", so the node is
not routing requests to them", "border-bottom: 1px dotted; cursor: help;" },
advancedModeEnabled ? "Backed off" : "Busy");
peerStatsRoutingBackedOffListItem.addChild("span", ":\u00a0" +
numberOfRoutingBackedOff);
}
if (numberOfTooNew > 0) {
@@ -281,9 +281,9 @@
peerStatsListenOnlyListItem.addChild("span",
new String[] { "class", "title", "style" }, new String[] { "peer_listen_only",
"Not connected and listen only: this node won't try to connect to these peers
at all because the user has set ListenOnly on them", "border-bottom: 1px
dotted; cursor: help;" }, "Listen Only");
peerStatsListenOnlyListItem.addChild("span",
":\u00a0" + numberOfListenOnly);
}
- nextTableCell = advancedEnabled ?
overviewTableRow.addChild("td") : overviewTableRow.addChild("td", "class",
"last");
+ nextTableCell = advancedModeEnabled ?
overviewTableRow.addChild("td") : overviewTableRow.addChild("td", "class",
"last");
- if(advancedEnabled) {
+ if(advancedModeEnabled) {
// Peer routing backoff reason box
HTMLNode backoffReasonInfobox =
nextTableCell.addChild("div", "class", "infobox");
@@ -443,7 +443,7 @@
storeSizeList.addChild("li",
"Avg. access rate:\u00a0" +
thousendPoint.format(overallAccesses/nodeUptimeSeconds) + "/s");
- nextTableCell = advancedEnabled ?
overviewTableRow.addChild("td") : overviewTableRow.addChild("td", "class",
"last");
+ nextTableCell = advancedModeEnabled ?
overviewTableRow.addChild("td") : overviewTableRow.addChild("td", "class",
"last");
// jvm stats box
HTMLNode jvmStatsInfobox =
nextTableCell.addChild("div", "class", "infobox");
Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2007-02-09
23:59:45 UTC (rev 11728)
+++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2007-02-10
00:02:08 UTC (rev 11729)
@@ -425,7 +425,7 @@
}
public void handleGet(URI uri, HTTPRequest request, ToadletContext ctx)
throws ToadletContextClosedException, IOException {
- boolean advancedDarknetOutputEnabled =
core.getToadletContainer().isAdvancedDarknetEnabled();
+ boolean advancedModeOutputEnabled =
core.getToadletContainer().isAdvancedModeEnabled();
if (request.getParam("newbookmark").length() > 0) {
HTMLNode pageNode = ctx.getPageMaker().getPageNode("Add
a Bookmark");
@@ -578,7 +578,7 @@
activityList.addChild("li", "Inserts: " + node.getNumInserts());
activityList.addChild("li", "Requests: " +
node.getNumRequests());
activityList.addChild("li", "Transferring Requests: " +
node.getNumTransferringRequests());
- if (advancedDarknetOutputEnabled) {
+ if (advancedModeOutputEnabled) {
activityList.addChild("li", "ARK Fetch Requests: " +
node.getNumARKFetchers());
}
Modified: trunk/freenet/src/freenet/node/CHKInsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/CHKInsertSender.java 2007-02-09 23:59:45 UTC
(rev 11728)
+++ trunk/freenet/src/freenet/node/CHKInsertSender.java 2007-02-10 00:02:08 UTC
(rev 11729)
@@ -242,7 +242,7 @@
PeerNode next;
// Can backtrack, so only route to nodes closer than we are to
target.
double nextValue;
- next = node.peers.closerPeer(source, nodesRoutedTo,
nodesNotIgnored, target, true, node.isAdvancedDarknetEnabled(), -1);
+ next = node.peers.closerPeer(source, nodesRoutedTo,
nodesNotIgnored, target, true, node.isAdvancedModeEnabled(), -1);
if(next != null)
nextValue = next.getLocation().getValue();
else
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2007-02-09 23:59:45 UTC (rev
11728)
+++ trunk/freenet/src/freenet/node/Node.java 2007-02-10 00:02:08 UTC (rev
11729)
@@ -3295,8 +3295,8 @@
return lm.numberOfRemotePeerLocationsSeenInSwaps;
}
- public boolean isAdvancedDarknetEnabled() {
- return clientCore.isAdvancedDarknetEnabled();
+ public boolean isAdvancedModeEnabled() {
+ return clientCore.isAdvancedModeEnabled();
}
public boolean isFProxyJavascriptEnabled() {
Modified: trunk/freenet/src/freenet/node/NodeClientCore.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeClientCore.java 2007-02-09 23:59:45 UTC
(rev 11728)
+++ trunk/freenet/src/freenet/node/NodeClientCore.java 2007-02-10 00:02:08 UTC
(rev 11729)
@@ -778,9 +778,9 @@
return node.isTestnetEnabled();
}
- public boolean isAdvancedDarknetEnabled() {
+ public boolean isAdvancedModeEnabled() {
return (getToadletContainer() != null) &&
- getToadletContainer().isAdvancedDarknetEnabled();
+ getToadletContainer().isAdvancedModeEnabled();
}
public boolean isFProxyJavascriptEnabled() {
Modified: trunk/freenet/src/freenet/node/NodeDispatcher.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeDispatcher.java 2007-02-09 23:59:45 UTC
(rev 11728)
+++ trunk/freenet/src/freenet/node/NodeDispatcher.java 2007-02-10 00:02:08 UTC
(rev 11729)
@@ -344,7 +344,7 @@
// Forward
m = preForward(m, htl);
while(true) {
- PeerNode next = node.peers.closerPeer(pn, ctx.routedTo,
ctx.notIgnored, target, true, node.isAdvancedDarknetEnabled(), -1);
+ PeerNode next = node.peers.closerPeer(pn, ctx.routedTo,
ctx.notIgnored, target, true, node.isAdvancedModeEnabled(), -1);
if(logMINOR) Logger.minor(this, "Next: "+next+"
message: "+m);
if(next != null) {
// next is connected, or at least has been =>
next.getPeer() CANNOT be null.
Modified: trunk/freenet/src/freenet/node/RequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestSender.java 2007-02-09 23:59:45 UTC
(rev 11728)
+++ trunk/freenet/src/freenet/node/RequestSender.java 2007-02-10 00:02:08 UTC
(rev 11729)
@@ -131,7 +131,7 @@
// Route it
PeerNode next;
double nextValue;
- next = node.peers.closerPeer(source, nodesRoutedTo,
nodesNotIgnored, target, true, node.isAdvancedDarknetEnabled(), -1);
+ next = node.peers.closerPeer(source, nodesRoutedTo,
nodesNotIgnored, target, true, node.isAdvancedModeEnabled(), -1);
if(next != null)
nextValue = next.getLocation().getValue();
else
Modified: trunk/freenet/src/freenet/node/SSKInsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/SSKInsertSender.java 2007-02-09 23:59:45 UTC
(rev 11728)
+++ trunk/freenet/src/freenet/node/SSKInsertSender.java 2007-02-10 00:02:08 UTC
(rev 11729)
@@ -133,7 +133,7 @@
// Can backtrack, so only route to nodes closer than we are to
target.
double nextValue;
synchronized(node.peers) {
- next = node.peers.closerPeer(source, nodesRoutedTo,
nodesNotIgnored, target, true, node.isAdvancedDarknetEnabled(), -1);
+ next = node.peers.closerPeer(source, nodesRoutedTo,
nodesNotIgnored, target, true, node.isAdvancedModeEnabled(), -1);
if(next != null)
nextValue = next.getLocation().getValue();
else
