[freenet-cvs] r17316 - in trunk/freenet/src/freenet: clients/http l10n

[nextg...@freenetproject.org]

Author: nextgens
Date: 2008-01-27 12:30:24 +0000 (Sun, 27 Jan 2008)
New Revision: 17316

Modified:
   trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
   trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
Log:
close #2018: Peers with dontRoute isn't shown on the statistics page
(patch from Nogasso)

Modified: trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java       
2008-01-27 12:13:14 UTC (rev 17315)
+++ trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java       
2008-01-27 12:30:24 UTC (rev 17316)
@@ -156,6 +156,7 @@
                int numberOfListenOnly = getPeerStatusCount(peerNodeStatuses, 
PeerManager.PEER_NODE_STATUS_LISTEN_ONLY);
                int numberOfSeedServers = getCountSeedServers(peerNodeStatuses);
                int numberOfSeedClients = getCountSeedClients(peerNodeStatuses);
+               int numberOfRoutingDisabled = 
getPeerStatusCount(peerNodeStatuses, 
PeerManager.PEER_NODE_STATUS_ROUTING_DISABLED);

                HTMLNode pageNode = 
ctx.getPageMaker().getPageNode(l10n("fullTitle", new String[] { "name" }, new 
String[] { node.getMyName() }), ctx);
                HTMLNode contentNode = 
ctx.getPageMaker().getContentNode(pageNode);
@@ -253,7 +254,8 @@

                        drawPeerStatsBox(peerStatsInfobox, advancedModeEnabled, 
numberOfConnected, numberOfRoutingBackedOff, 
                                        numberOfTooNew, numberOfTooOld, 
numberOfDisconnected, numberOfNeverConnected, numberOfDisabled, 
-                                       numberOfBursting, numberOfListening, 
numberOfListenOnly, numberOfSeedServers, numberOfSeedClients);
+                                       numberOfBursting, numberOfListening, 
numberOfListenOnly, numberOfSeedServers, numberOfSeedClients,
+                                       numberOfRoutingDisabled);

                        // Bandwidth box
                        HTMLNode bandwidthInfobox = 
nextTableCell.addChild("div", "class", "infobox");
@@ -638,7 +640,7 @@
        private void drawPeerStatsBox(HTMLNode peerStatsInfobox, boolean 
advancedModeEnabled, int numberOfConnected, 
                        int numberOfRoutingBackedOff, int numberOfTooNew, int 
numberOfTooOld, int numberOfDisconnected, 
                        int numberOfNeverConnected, int numberOfDisabled, int 
numberOfBursting, int numberOfListening, 
-                       int numberOfListenOnly, int numberOfSeedServers, int 
numberOfSeedClients) {
+                       int numberOfListenOnly, int numberOfSeedServers, int 
numberOfSeedClients, int numberOfRoutingDisabled) {

                peerStatsInfobox.addChild("div", "class", "infobox-header", 
l10n("peerStatsTitle"));
                HTMLNode peerStatsContent = peerStatsInfobox.addChild("div", 
"class", "infobox-content");
@@ -704,6 +706,11 @@
                                        new String[] { "peer_listen_only", 
l10nDark("listenOnly"), "border-bottom: 1px dotted; cursor: help;" }, 
l10nDark("listenOnlyShort"));
                        peerStatsListenOnlyListItem.addChild("span", ":\u00a0" 
+ numberOfListenOnly);
                }
+               if (numberOfRoutingDisabled > 0) {
+                       HTMLNode peerStatsRoutingDisabledListItem = 
peerStatsList.addChild("li").addChild("span");
+                       peerStatsRoutingDisabledListItem.addChild("span", new 
String[] { "class", "title", "style" }, new String[] { "peer_routing_disabled", 
l10n("routingDisabled"), "border-bottom: 1px dotted; cursor: help;" }, 
l10n("routingDisabledShort"));
+                       peerStatsRoutingDisabledListItem.addChild("span", 
":\u00a0" + numberOfRoutingDisabled);
+               }
                if (numberOfSeedServers > 0) {
                        HTMLNode peerStatsSeedServersListItem = 
peerStatsList.addChild("li").addChild("span");
                        peerStatsSeedServersListItem.addChild("span", new 
String[] { "class", "title", "style" },

Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties   2008-01-27 
12:13:14 UTC (rev 17315)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties   2008-01-27 
12:30:24 UTC (rev 17316)
@@ -961,6 +961,8 @@
 StatisticsToadlet.outputRate=Output Rate: ${rate}/sec (of ${max})
 StatisticsToadlet.payloadOutput=Payload Output: ${total} 
(${rate}/sec)(${percent}%)
 StatisticsToadlet.peerStatsTitle=Peer statistics
+StatisticsToadlet.routingDisabled=Not routing traffic (we are currently 
connected to the node but we or it refuse to route traffic)
+StatisticsToadlet.routingDisabledShort=Not routing traffic
 StatisticsToadlet.statisticGatheringTitle=Statistics Gathering
 StatisticsToadlet.threadDumpButton=Generate a Thread Dump
 StatisticsToadlet.threads=Running threads: ${running}/${max}