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

[t...@freenetproject.org]

Author: toad
Date: 2007-12-05 17:01:51 +0000 (Wed, 05 Dec 2007)
New Revision: 16330

Modified:
   trunk/freenet/src/freenet/node/NodeDispatcher.java
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
PeerNode.canAcceptAnnouncements()

Modified: trunk/freenet/src/freenet/node/NodeDispatcher.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeDispatcher.java  2007-12-05 16:54:48 UTC 
(rev 16329)
+++ trunk/freenet/src/freenet/node/NodeDispatcher.java  2007-12-05 17:01:51 UTC 
(rev 16330)
@@ -279,8 +279,7 @@
        private boolean handleAnnounceRequest(Message m, PeerNode source) {
                long uid = m.getLong(DMT.UID);
                OpennetManager om = node.getOpennet();
-               if(om == null || 
-                               ((!source.isOpennet()) && 
(!node.passOpennetRefsThroughDarknet()))) {
+               if(om == null || !source.canAcceptAnnouncements()) {
                        Message msg = DMT.createFNPOpennetDisabled(uid);
                        try {
                                source.sendAsync(msg, null, 0, null);

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2007-12-05 16:54:48 UTC 
(rev 16329)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2007-12-05 17:01:51 UTC 
(rev 16330)
@@ -3184,4 +3184,8 @@
     /** Does this peernode want to be returned by for example 
PeerManager.getByPeer() ? */
        public abstract boolean isSearchable();

+       public boolean canAcceptAnnouncements() {
+               return isOpennet() || node.passOpennetRefsThroughDarknet();
+       }
+
 }