[freenet-cvs] r16513 - in trunk/freenet/src/freenet: clients/http node

[t...@freenetproject.org]

Author: toad
Date: 2007-12-13 23:12:18 +0000 (Thu, 13 Dec 2007)
New Revision: 16513

Modified:
   trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
   trunk/freenet/src/freenet/node/PeerNodeStatus.java
Log:
Only show statuses of nodes which are eligible to have their statuses collected.

Modified: trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java       
2007-12-13 22:48:31 UTC (rev 16512)
+++ trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java       
2007-12-13 23:12:18 UTC (rev 16513)
@@ -96,6 +96,8 @@
        private int getPeerStatusCount(PeerNodeStatus[] peerNodeStatuses, int 
status) {
                int count = 0;
                for (int peerIndex = 0, peerCount = peerNodeStatuses.length; 
peerIndex < peerCount; peerIndex++) {
+                       if(!peerNodeStatuses[peerIndex].recordStatus())
+                               continue;
                        if (peerNodeStatuses[peerIndex].getStatusValue() == 
status) {
                                count++;
                        }

Modified: trunk/freenet/src/freenet/node/PeerNodeStatus.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNodeStatus.java  2007-12-13 22:48:31 UTC 
(rev 16512)
+++ trunk/freenet/src/freenet/node/PeerNodeStatus.java  2007-12-13 23:12:18 UTC 
(rev 16513)
@@ -79,6 +79,8 @@
        private PacketThrottle throttle;

        private long clockDelta;
+       
+       private final boolean recordStatus;

        PeerNodeStatus(PeerNode peerNode) {
                Peer p = peerNode.getPeer();
@@ -118,6 +120,7 @@
                this.percentTimeRoutableConnection = 
peerNode.getPercentTimeRoutableConnection();
                this.throttle = peerNode.getThrottle();
                this.clockDelta = peerNode.getClockDelta();
+               this.recordStatus = peerNode.recordStatus();
        }

        /**
@@ -336,4 +339,8 @@
        public long getClockDelta() {
                return clockDelta;
        }
+       
+       public boolean recordStatus() {
+               return recordStatus;
+       }
 }