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

[t...@freenetproject.org]

Author: toad
Date: 2006-03-04 20:56:02 +0000 (Sat, 04 Mar 2006)
New Revision: 8162

Modified:
   trunk/freenet/src/freenet/node/Version.java
   trunk/freenet/src/freenet/node/fcp/FCPClient.java
   trunk/freenet/src/freenet/node/fcp/RemovePersistentRequest.java
Log:
495:
Allow removal of global requests.
Show all global completed requests on WatchGlobal.

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-03-04 20:25:41 UTC (rev 
8161)
+++ trunk/freenet/src/freenet/node/Version.java 2006-03-04 20:56:02 UTC (rev 
8162)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

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

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

Modified: trunk/freenet/src/freenet/node/fcp/FCPClient.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPClient.java   2006-03-04 20:25:41 UTC 
(rev 8161)
+++ trunk/freenet/src/freenet/node/fcp/FCPClient.java   2006-03-04 20:56:02 UTC 
(rev 8162)
@@ -181,6 +181,10 @@
                        watchGlobal = false;
                } else if(enabled && !watchGlobal) {
                        server.globalClient.watch(this);
+                       FCPConnectionHandler connHandler = currentConnection;
+                       if(connHandler != null) {
+                               
server.globalClient.queuePendingMessagesOnConnectionRestart(connHandler.outputHandler);
+                       }
                        watchGlobal = true;
                }
                // Otherwise the status is unchanged.

Modified: trunk/freenet/src/freenet/node/fcp/RemovePersistentRequest.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/RemovePersistentRequest.java     
2006-03-04 20:25:41 UTC (rev 8161)
+++ trunk/freenet/src/freenet/node/fcp/RemovePersistentRequest.java     
2006-03-04 20:56:02 UTC (rev 8162)
@@ -1,6 +1,7 @@
 package freenet.node.fcp;

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

 /**
@@ -11,11 +12,13 @@
        final static String name = "RemovePersistentRequest";

        final String identifier;
+       final boolean global;

        public RemovePersistentRequest(SimpleFieldSet fs) throws 
MessageInvalidException {
                this.identifier = fs.get("Identifier");
                if(identifier == null)
                        throw new 
MessageInvalidException(ProtocolErrorMessage.MISSING_FIELD, "Must have 
Identifier", null);
+               this.global = Fields.stringToBool(fs.get("Global"), false);
        }

        public SimpleFieldSet getFieldSet() {
@@ -30,7 +33,8 @@

        public void run(FCPConnectionHandler handler, Node node)
                        throws MessageInvalidException {
-               handler.getClient().removeByIdentifier(identifier);
+               FCPClient client = global ? handler.server.globalClient : 
handler.getClient();
+               client.removeByIdentifier(identifier);
        }

 }