[freenet-cvs] r17800 - in trunk/freenet/src/freenet/node: . simulator

[t...@freenetproject.org]

Author: toad
Date: 2008-02-12 00:26:09 +0000 (Tue, 12 Feb 2008)
New Revision: 17800

Modified:
   trunk/freenet/src/freenet/node/PeerManager.java
   trunk/freenet/src/freenet/node/simulator/RealNodeTest.java
Log:
More accurate is better

Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java     2008-02-12 00:23:26 UTC 
(rev 17799)
+++ trunk/freenet/src/freenet/node/PeerManager.java     2008-02-12 00:26:09 UTC 
(rev 17800)
@@ -1629,7 +1629,15 @@
                return count;
        }

-       public int countBackedOffDarknetPeers() {
-               return 
this.getPeerNodeStatusSize(PEER_NODE_STATUS_ROUTING_BACKED_OFF, true);
+       public int countBackedOffPeers() {
+               PeerNode[] peers = myPeers;
+               int count = 0;
+               for(int i=0;i<peers.length;i++) {
+                       if(!peers[i].isRealConnection()) continue;
+                       if(peers[i].isDisabled()) continue;
+                       if(peers[i].isRoutingBackedOff())
+                               count++;
+               }
+               return count;
        }
 }

Modified: trunk/freenet/src/freenet/node/simulator/RealNodeTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeTest.java  2008-02-12 
00:23:26 UTC (rev 17799)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeTest.java  2008-02-12 
00:26:09 UTC (rev 17800)
@@ -109,7 +109,7 @@
                        for(int i=0;i<nodes.length;i++) {
                                int countConnected = 
nodes[i].peers.countConnectedDarknetPeers();
                                int countTotal = 
nodes[i].peers.countValidPeers();
-                               int countBackedOff = 
nodes[i].peers.countBackedOffDarknetPeers();
+                               int countBackedOff = 
nodes[i].peers.countBackedOffPeers();
                                totalPeers += countTotal;
                                totalConnections += countConnected;
                                totalBackedOff += countBackedOff;