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

[t...@freenetproject.org]

Author: toad
Date: 2008-02-28 22:13:57 +0000 (Thu, 28 Feb 2008)
New Revision: 18230

Modified:
   trunk/freenet/src/freenet/node/AnnounceSender.java
   trunk/freenet/src/freenet/node/Announcer.java
Log:
Stop announcement when opennet is disabled.

Modified: trunk/freenet/src/freenet/node/AnnounceSender.java
===================================================================
--- trunk/freenet/src/freenet/node/AnnounceSender.java  2008-02-28 19:59:44 UTC 
(rev 18229)
+++ trunk/freenet/src/freenet/node/AnnounceSender.java  2008-02-28 22:13:57 UTC 
(rev 18230)
@@ -114,6 +114,11 @@
                return;
             }

+            if(!node.isOpennetEnabled()) {
+               complete();
+               return;
+            }
+            
             if(onlyNode == null) {
                // Route it
                next = node.peers.closerPeer(source, nodesRoutedTo, 
nodesNotIgnored, target, true, node.isAdvancedModeEnabled(), -1, null, null);

Modified: trunk/freenet/src/freenet/node/Announcer.java
===================================================================
--- trunk/freenet/src/freenet/node/Announcer.java       2008-02-28 19:59:44 UTC 
(rev 18229)
+++ trunk/freenet/src/freenet/node/Announcer.java       2008-02-28 22:13:57 UTC 
(rev 18230)
@@ -75,6 +75,7 @@
        }

        public void start() {
+               if(!node.isOpennetEnabled()) return;
                registerAlert();
                if(node.peers.getDarknetPeers().length + 
node.peers.getOpennetPeers().length + om.countOldOpennetPeers() == 0) {
                        // We know opennet is enabled.
@@ -104,6 +105,7 @@
        }

        private void connectSomeSeednodes() {
+               if(!node.isOpennetEnabled()) return;
                boolean announceNow = false;
                if(logMINOR)
                        Logger.minor(this, "Connecting some seednodes...");
@@ -266,6 +268,7 @@
                if(logMINOR)
                        Logger.minor(this, "maybeSendAnnouncement()");
                long now = System.currentTimeMillis();
+               if(!node.isOpennetEnabled()) return;
                if(enoughPeers()) {
                        node.getTicker().queueTimedJob(new Runnable() {
                                public void run() {
@@ -386,6 +389,7 @@
        }

        public void sendAnnouncement(final SeedServerPeerNode seed) {
+               if(!node.isOpennetEnabled()) return;
                System.out.println("Announcement to "+seed.userToString()+" 
starting...");
                if(logMINOR)
                        Logger.minor(this, "Announcement to 
"+seed.userToString()+" starting...");
@@ -527,7 +531,7 @@
                }

                public boolean isValid() {
-                       return started && !enoughPeers();
+                       return started && !enoughPeers() && 
node.isOpennetEnabled();
                }

                public void isValid(boolean validity) {