[freenet-cvs] r15486 - trunk/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2007-10-22 23:13:53 +0000 (Mon, 22 Oct 2007)
New Revision: 15486

Modified:
   trunk/freenet/src/freenet/node/OpennetManager.java
   trunk/freenet/src/freenet/node/PeerManager.java
Log:
Fix opennet. :)
MAX_PEERS - < number of connected darknet peers > - *NOT* MAX_PEERS - < number 
of connected peers >

Modified: trunk/freenet/src/freenet/node/OpennetManager.java
===================================================================
--- trunk/freenet/src/freenet/node/OpennetManager.java  2007-10-22 23:05:47 UTC 
(rev 15485)
+++ trunk/freenet/src/freenet/node/OpennetManager.java  2007-10-22 23:13:53 UTC 
(rev 15486)
@@ -445,7 +445,7 @@
        }

        protected int getNumberOfConnectedPeersToAim() {
-               return MAX_PEERS - node.peers.quickCountConnectedPeers();
+               return MAX_PEERS - node.peers.countConnectedDarknetPeers();
        }

 }

Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java     2007-10-22 23:05:47 UTC 
(rev 15485)
+++ trunk/freenet/src/freenet/node/PeerManager.java     2007-10-22 23:13:53 UTC 
(rev 15486)
@@ -1375,4 +1375,16 @@
                if(conns == null) return 0;
                return connectedPeers.length;
        }
+
+       public int countConnectedDarknetPeers() {
+               int count = 0;
+               PeerNode[] peers = connectedPeers;
+               for(int i=0;i<peers.length;i++) {
+                       if(peers[i] == null) continue;
+                       if(peers[i].isOpennet()) continue;
+                       if(!peers[i].isRoutable()) continue;
+                       count++;
+               }
+               return count;
+       }
 }