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

[t...@freenetproject.org]

Author: toad
Date: 2007-10-23 00:34:25 +0000 (Tue, 23 Oct 2007)
New Revision: 15494

Modified:
   trunk/freenet/src/freenet/node/RequestHandler.java
Log:
Relay opennet noderefs to darknet nodes if pass-opennet-refs-through-darknet is 
enabled.
Previously opennet noderefs would only be sent to the direct predecessor, not 
relayed, on darknet-but-pass-through-opennet nodes.

Modified: trunk/freenet/src/freenet/node/RequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestHandler.java  2007-10-23 00:30:47 UTC 
(rev 15493)
+++ trunk/freenet/src/freenet/node/RequestHandler.java  2007-10-23 00:34:25 UTC 
(rev 15494)
@@ -265,7 +265,8 @@
        }

        private void finishOpennetChecked() {
-               if(!source.isOpennet()) {
+               if(!(source.isOpennet() || 
+                               (node.passOpennetRefsThroughDarknet() && 
node.isOpennetEnabled()))) {
                        Message msg = DMT.createFNPOpennetCompletedAck(uid);
                        try {
                                source.sendAsync(msg, null, 0, this);