Author: j16sdiz
Date: 2008-12-31 07:03:47 +0000 (Wed, 31 Dec 2008)
New Revision: 24848
Modified:
trunk/freenet/src/freenet/node/NodeStats.java
Log:
GetNode/WithVolatile returns all peer status (not just darknet)
Modified: trunk/freenet/src/freenet/node/NodeStats.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeStats.java 2008-12-30 08:39:22 UTC
(rev 24847)
+++ trunk/freenet/src/freenet/node/NodeStats.java 2008-12-31 07:03:47 UTC
(rev 24848)
@@ -916,17 +916,17 @@
fs.put("unclaimedFIFOSize", node.usm.getUnclaimedFIFOSize());
/* gather connection statistics */
- DarknetPeerNodeStatus[] peerNodeStatuses =
peers.getDarknetPeerNodeStatuses(true);
- Arrays.sort(peerNodeStatuses, new
Comparator<DarknetPeerNodeStatus>() {
- public int compare(DarknetPeerNodeStatus firstNode,
DarknetPeerNodeStatus secondNode) {
+ PeerNodeStatus[] peerNodeStatuses =
peers.getPeerNodeStatuses(true);
+ Arrays.sort(peerNodeStatuses, new Comparator<PeerNodeStatus>() {
+ public int compare(PeerNodeStatus firstNode,
PeerNodeStatus secondNode) {
int statusDifference =
firstNode.getStatusValue() - secondNode.getStatusValue();
if (statusDifference != 0) {
return statusDifference;
}
- return
firstNode.getName().compareToIgnoreCase(secondNode.getName());
+ return 0;
}
});
-
+
int numberOfConnected =
PeerNodeStatus.getPeerStatusCount(peerNodeStatuses,
PeerManager.PEER_NODE_STATUS_CONNECTED);
int numberOfRoutingBackedOff =
PeerNodeStatus.getPeerStatusCount(peerNodeStatuses,
PeerManager.PEER_NODE_STATUS_ROUTING_BACKED_OFF);
int numberOfTooNew =
PeerNodeStatus.getPeerStatusCount(peerNodeStatuses,
PeerManager.PEER_NODE_STATUS_TOO_NEW);
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
