Author: toad
Date: 2006-01-23 20:00:42 +0000 (Mon, 23 Jan 2006)
New Revision: 7901
Modified:
trunk/freenet/src/freenet/node/Version.java
trunk/freenet/src/freenet/node/fcp/ClientPut.java
trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java
Log:
373:
Add GetCHKOnly flag for ClientPut. If enabled, the node won't actually insert
the data, but it will return an accurate CHK. At least, it should. I think
there's a bug that causes it not to...
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-01-23 19:52:30 UTC (rev
7900)
+++ trunk/freenet/src/freenet/node/Version.java 2006-01-23 20:00:42 UTC (rev
7901)
@@ -20,7 +20,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- public static final int buildNumber = 372;
+ public static final int buildNumber = 373;
/** Oldest build of Fred we will talk to */
public static final int lastGoodBuild = 372;
Modified: trunk/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPut.java 2006-01-23 19:52:30 UTC
(rev 7900)
+++ trunk/freenet/src/freenet/node/fcp/ClientPut.java 2006-01-23 20:00:42 UTC
(rev 7901)
@@ -15,10 +15,12 @@
final InsertBlock block;
final FCPConnectionHandler handler;
final String identifier;
+ final boolean getCHKOnly;
public ClientPut(FCPConnectionHandler handler, ClientPutMessage
message) {
this.handler = handler;
this.identifier = message.identifier;
+ this.getCHKOnly = message.getCHKOnly;
ctx = new InserterContext(handler.defaultInsertContext);
// Now go through the fields one at a time
uri = message.uri;
@@ -37,7 +39,7 @@
public void run() {
try {
- FreenetURI uri = inserter.run(block, false, false,
false, null);
+ FreenetURI uri = inserter.run(block, false, getCHKOnly,
false, null);
FCPMessage msg = new PutSuccessfulMessage(identifier,
uri);
handler.outputHandler.queue(msg);
} catch (InserterException e) {
Modified: trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java 2006-01-23
19:52:30 UTC (rev 7900)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java 2006-01-23
20:00:42 UTC (rev 7901)
@@ -29,6 +29,7 @@
final String identifier;
final int verbosity;
final int maxRetries;
+ final boolean getCHKOnly;
public ClientPutMessage(SimpleFieldSet fs) throws
MessageInvalidException {
try {
@@ -69,6 +70,7 @@
throw new
MessageInvalidException(ProtocolErrorMessage.ERROR_PARSING_NUMBER, "Error
parsing MaxSize field: "+e.getMessage());
}
}
+ getCHKOnly = Boolean.getBoolean(fs.get("GetCHKOnly"));
}
public SimpleFieldSet getFieldSet() {
