Author: toad
Date: 2006-03-09 18:46:57 +0000 (Thu, 09 Mar 2006)
New Revision: 8200
Modified:
trunk/freenet/src/freenet/node/Version.java
trunk/freenet/src/freenet/node/fcp/ClientGet.java
trunk/freenet/src/freenet/node/fcp/ClientPut.java
trunk/freenet/src/freenet/node/fcp/ClientRequest.java
trunk/freenet/src/freenet/node/fcp/ModifyPersistentRequest.java
Log:
510:
ModifyPersistentRequest: can change ClientToken.
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-03-09 18:40:59 UTC (rev
8199)
+++ trunk/freenet/src/freenet/node/Version.java 2006-03-09 18:46:57 UTC (rev
8200)
@@ -20,7 +20,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 509;
+ private static final int buildNumber = 510;
/** Oldest build of Fred we will talk to */
private static final int lastGoodBuild = 507;
Modified: trunk/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientGet.java 2006-03-09 18:40:59 UTC
(rev 8199)
+++ trunk/freenet/src/freenet/node/fcp/ClientGet.java 2006-03-09 18:46:57 UTC
(rev 8200)
@@ -49,7 +49,7 @@
private boolean finished;
private final File targetFile;
private final File tempFile;
- final String clientToken;
+ String clientToken;
/** Bucket passed in to the ClientGetter to return data in. Null unless
returntype=disk */
private final Bucket returnBucket;
@@ -469,4 +469,8 @@
getter.setPriorityClass(priorityClass);
}
+ public void setClientToken(String clientToken) {
+ this.clientToken = clientToken;
+ }
+
}
Modified: trunk/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPut.java 2006-03-09 18:40:59 UTC
(rev 8199)
+++ trunk/freenet/src/freenet/node/fcp/ClientPut.java 2006-03-09 18:46:57 UTC
(rev 8200)
@@ -48,7 +48,7 @@
/** Has the request finished? */
private boolean finished;
/** Client token - opaque string returned to client in PersistentPut */
- private final String clientToken;
+ private String clientToken;
/** Was this from disk? Purely for PersistentPut */
private final boolean fromDisk;
/** Original filename if from disk, otherwise null. Purely for
PersistentPut. */
@@ -378,4 +378,8 @@
inserter.setPriorityClass(priorityClass);
}
+ public void setClientToken(String clientToken) {
+ this.clientToken = clientToken;
+ }
+
}
Modified: trunk/freenet/src/freenet/node/fcp/ClientRequest.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientRequest.java 2006-03-09
18:40:59 UTC (rev 8199)
+++ trunk/freenet/src/freenet/node/fcp/ClientRequest.java 2006-03-09
18:46:57 UTC (rev 8200)
@@ -101,4 +101,6 @@
public abstract void setPriorityClass(short priorityClass);
+ public abstract void setClientToken(String clientToken);
+
}
Modified: trunk/freenet/src/freenet/node/fcp/ModifyPersistentRequest.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ModifyPersistentRequest.java
2006-03-09 18:40:59 UTC (rev 8199)
+++ trunk/freenet/src/freenet/node/fcp/ModifyPersistentRequest.java
2006-03-09 18:46:57 UTC (rev 8200)
@@ -25,9 +25,11 @@
final boolean global;
// negative means don't change
final short priorityClass;
+ final String clientToken;
ModifyPersistentRequest(SimpleFieldSet fs) throws
MessageInvalidException {
this.identifier = fs.get("Identifier");
+ this.clientToken = fs.get("ClientToken");
if(identifier == null)
throw new
MessageInvalidException(ProtocolErrorMessage.MISSING_FIELD, "Missing field:
Identifier", null);
this.global = Fields.stringToBool(fs.get("Global"), false);
@@ -60,6 +62,8 @@
throws MessageInvalidException {
FCPClient client = global ? handler.server.globalClient :
handler.getClient();
ClientRequest req = client.getRequest(identifier);
+ if(clientToken != null)
+ req.setClientToken(clientToken);
if(priorityClass > 0)
req.setPriorityClass(priorityClass);
if(req.isPersistentForever())
