[freenet-cvs] r15176 - in trunk/freenet/src/freenet/node: . useralerts

[t...@freenetproject.org]

Author: toad
Date: 2007-09-14 19:01:52 +0000 (Fri, 14 Sep 2007)
New Revision: 15176

Modified:
   trunk/freenet/src/freenet/node/PeerManager.java
   trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
Log:
Mostly we are interested in the total number of connections...

Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java     2007-09-14 18:57:54 UTC 
(rev 15175)
+++ trunk/freenet/src/freenet/node/PeerManager.java     2007-09-14 19:01:52 UTC 
(rev 15176)
@@ -817,10 +817,17 @@
         */
        public void updatePMUserAlert() {
                if(ua == null) return;
-               int peers = this.getDarknetPeers().length;
+               int peers, darknetPeers;
+               synchronized(this) {
+                       peers = this.myPeers.length;
+                       darknetPeers = this.getDarknetPeers().length;
+               }
                synchronized(ua) {
-                       ua.conns = 
getPeerNodeStatusSize(PEER_NODE_STATUS_CONNECTED, true) +
+                       ua.darknetConns = 
getPeerNodeStatusSize(PEER_NODE_STATUS_CONNECTED, true) +
                                
getPeerNodeStatusSize(PEER_NODE_STATUS_ROUTING_BACKED_OFF, true);
+                       ua.conns = 
getPeerNodeStatusSize(PEER_NODE_STATUS_CONNECTED, false) +
+                       
getPeerNodeStatusSize(PEER_NODE_STATUS_ROUTING_BACKED_OFF, false);
+                       ua.darknetPeers = darknetPeers;
                        ua.peers = peers;
                        ua.neverConn = 
getPeerNodeStatusSize(PEER_NODE_STATUS_NEVER_CONNECTED, true);
                        ua.clockProblem = 
getPeerNodeStatusSize(PEER_NODE_STATUS_CLOCK_PROBLEM, true);

Modified: trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java 
2007-09-14 18:57:54 UTC (rev 15175)
+++ trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java 
2007-09-14 19:01:52 UTC (rev 15176)
@@ -19,6 +19,8 @@
        int bwlimitDelayTime = 1;
        int nodeAveragePingTime = 1;
        long oldestNeverConnectedPeerAge = 0;
+       public int darknetConns = 0;
+       public int darknetPeers = 0;

        /** How many connected peers we need to not get alert about not enough 
*/
        static final int MIN_CONN_ALERT_THRESHOLD = 3;