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

[t...@freenetproject.org]

Author: toad
Date: 2007-12-07 18:51:46 +0000 (Fri, 07 Dec 2007)
New Revision: 16395

Modified:
   trunk/freenet/src/freenet/node/Announcer.java
Log:
more readable

Modified: trunk/freenet/src/freenet/node/Announcer.java
===================================================================
--- trunk/freenet/src/freenet/node/Announcer.java       2007-12-07 13:27:16 UTC 
(rev 16394)
+++ trunk/freenet/src/freenet/node/Announcer.java       2007-12-07 18:51:46 UTC 
(rev 16395)
@@ -191,11 +191,11 @@
        /** @return True if we have enough peers that we don't need to 
announce. */
        boolean enoughPeers() {
                // Do we want to send an announcement to the node?
-               int opennetCount = node.peers.countConnectedOpennetPeers();
+               int opennetCount = node.peers.countConnectedOpennetPeers() + 
node.peers.countConnectedDarknetPeers();
                // First, do we actually need to announce?
-               if(opennetCount > Math.min(MIN_OPENNET_CONNECTED_PEERS, 
om.getNumberOfConnectedPeersToAim())) {
+               int target = Math.min(MIN_OPENNET_CONNECTED_PEERS, 
om.getNumberOfConnectedPeersToAim() / 2);
+               if(opennetCount > target)
                        return true;
-               }
                return false;
        }