[freenet-cvs] r8421 - in trunk/freenet/src/freenet/node: . fcp

[t...@freenetproject.org]

Author: toad
Date: 2006-04-01 14:09:19 +0000 (Sat, 01 Apr 2006)
New Revision: 8421

Modified:
   trunk/freenet/src/freenet/node/Version.java
   trunk/freenet/src/freenet/node/fcp/GetResultsMessage.java
Log:
605: GetResults {Global=true}. :)

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-04-01 13:57:27 UTC (rev 
8420)
+++ trunk/freenet/src/freenet/node/Version.java 2006-04-01 14:09:19 UTC (rev 
8421)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 604;
+       private static final int buildNumber = 605;

        /** Oldest build of Fred we will talk to */
        private static final int lastGoodBuild = 591;

Modified: trunk/freenet/src/freenet/node/fcp/GetResultsMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/GetResultsMessage.java   2006-04-01 
13:57:27 UTC (rev 8420)
+++ trunk/freenet/src/freenet/node/fcp/GetResultsMessage.java   2006-04-01 
14:09:19 UTC (rev 8421)
@@ -1,19 +1,18 @@
 package freenet.node.fcp;

 import freenet.node.Node;
+import freenet.support.Fields;
 import freenet.support.SimpleFieldSet;

 public class GetResultsMessage extends FCPMessage {

        final String identifier;
+       final boolean global;
        final static String name = "GetResults";

-       GetResultsMessage(String id) {
-               this.identifier = id;
-       }
-       
        public GetResultsMessage(SimpleFieldSet fs) {
                this.identifier = fs.get("Identifier");
+               this.global = Fields.stringToBool(fs.get("Global"), false);
        }

        public SimpleFieldSet getFieldSet() {
@@ -28,8 +27,12 @@

        public void run(FCPConnectionHandler handler, Node node)
                        throws MessageInvalidException {
-               ClientRequest req = (ClientRequest) 
-                       handler.getClient().getRequest(identifier);
+               ClientRequest req;
+               if(global)
+                       req = 
handler.server.globalClient.getRequest(identifier);
+               else
+                       req = (ClientRequest) 
+                               handler.getClient().getRequest(identifier);
                if(req == null) {
                        ProtocolErrorMessage msg = new 
ProtocolErrorMessage(ProtocolErrorMessage.NO_SUCH_IDENTIFIER, false, null, 
identifier);
                        handler.outputHandler.queue(msg);