Author: toad
Date: 2008-06-14 13:55:56 +0000 (Sat, 14 Jun 2008)
New Revision: 20341
Modified:
branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java
branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java
branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java
branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java
Log:
Remove NodeClientCore from FCPClient
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java 2008-06-14
13:51:33 UTC (rev 20340)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java 2008-06-14
13:55:56 UTC (rev 20341)
@@ -93,7 +93,7 @@
if(returnType == ClientGetMessage.RETURN_TYPE_DISK) {
this.targetFile = returnFilename;
this.tempFile = returnTempFilename;
- if(!(client.core.allowDownloadTo(returnTempFilename) &&
client.core.allowDownloadTo(returnFilename)))
+ if(!(server.core.allowDownloadTo(returnTempFilename) &&
server.core.allowDownloadTo(returnFilename)))
throw new NotAllowedException();
ret = new FileBucket(returnTempFilename, false, true,
false, false, false);
} else if(returnType == ClientGetMessage.RETURN_TYPE_NONE) {
@@ -124,7 +124,7 @@
ret.free();
throw e;
}
- getter = new ClientGetter(this,
client.core.requestStarters.chkFetchScheduler,
client.core.requestStarters.sskFetchScheduler, uri, fctx, priorityClass,
+ getter = new ClientGetter(this,
server.core.requestStarters.chkFetchScheduler,
server.core.requestStarters.sskFetchScheduler, uri, fctx, priorityClass,
persistenceType == PERSIST_CONNECTION ?
client.lowLevelClientTransient : client.lowLevelClientPersistent,
returnBucket, null);
if(persistenceType != PERSIST_CONNECTION) {
@@ -161,7 +161,7 @@
if(returnType == ClientGetMessage.RETURN_TYPE_DISK) {
this.targetFile = message.diskFile;
this.tempFile = message.tempFile;
- if(!(client.core.allowDownloadTo(tempFile) &&
client.core.allowDownloadTo(targetFile)))
+ if(!(server.core.allowDownloadTo(tempFile) &&
server.core.allowDownloadTo(targetFile)))
throw new
MessageInvalidException(ProtocolErrorMessage.ACCESS_DENIED, "Not allowed to
download to "+tempFile+" or "+targetFile, identifier, global);
else if(!(handler.allowDDAFrom(tempFile, true) &&
handler.allowDDAFrom(targetFile, true)))
throw new
MessageInvalidException(ProtocolErrorMessage.DIRECT_DISK_ACCESS_DENIED, "Not
allowed to download to "+tempFile+" or "+targetFile + ". You might need to do a
" + TestDDARequestMessage.NAME + " first.", identifier, global);
@@ -196,8 +196,8 @@
ret.free();
throw e;
}
- getter = new ClientGetter(this,
client.core.requestStarters.chkFetchScheduler,
-
client.core.requestStarters.sskFetchScheduler, uri, fctx, priorityClass,
+ getter = new ClientGetter(this,
server.core.requestStarters.chkFetchScheduler,
+
server.core.requestStarters.sskFetchScheduler, uri, fctx, priorityClass,
persistenceType == PERSIST_CONNECTION ?
client.lowLevelClientTransient : client.lowLevelClientPersistent,
binaryBlob ? new NullBucket() :
returnBucket, binaryBlob ? returnBucket : null);
if(persistenceType != PERSIST_CONNECTION) {
@@ -299,8 +299,8 @@
for(int i=0;i<allowed.length;i++)
fctx.allowedMIMETypes.add(allowed[i]);
}
- getter = new ClientGetter(this,
client.core.requestStarters.chkFetchScheduler,
- client.core.requestStarters.sskFetchScheduler,
uri,
+ getter = new ClientGetter(this,
server.core.requestStarters.chkFetchScheduler,
+ server.core.requestStarters.sskFetchScheduler,
uri,
fctx, priorityClass,
persistenceType == PERSIST_CONNECTION ?
client.lowLevelClientTransient : client.lowLevelClientPersistent,
binaryBlob ? new NullBucket() : returnBucket,
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java 2008-06-14
13:51:33 UTC (rev 20340)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java 2008-06-14
13:55:56 UTC (rev 20341)
@@ -98,8 +98,8 @@
public ClientPut(FCPClient globalClient, FreenetURI uri, String
identifier, int verbosity,
short priorityClass, short persistenceType, String
clientToken, boolean getCHKOnly,
boolean dontCompress, int maxRetries, short
uploadFromType, File origFilename, String contentType,
- Bucket data, FreenetURI redirectTarget, String
targetFilename, boolean earlyEncode) throws IdentifierCollisionException,
NotAllowedException, FileNotFoundException, MalformedURLException {
- super(uri, identifier, verbosity, null, globalClient,
priorityClass, persistenceType, null, true, getCHKOnly, dontCompress,
maxRetries, earlyEncode);
+ Bucket data, FreenetURI redirectTarget, String
targetFilename, boolean earlyEncode, FCPServer server) throws
IdentifierCollisionException, NotAllowedException, FileNotFoundException,
MalformedURLException {
+ super(uri, identifier, verbosity, null, globalClient,
priorityClass, persistenceType, null, true, getCHKOnly, dontCompress,
maxRetries, earlyEncode, server);
if(uploadFromType == ClientPutMessage.UPLOAD_FROM_DISK) {
if(!globalClient.core.allowUploadFrom(origFilename))
throw new NotAllowedException();
@@ -146,7 +146,7 @@
this.clientMetadata = cm;
putter = new ClientPutter(this, data, uri, cm,
- ctx,
client.core.requestStarters.chkPutScheduler,
client.core.requestStarters.sskPutScheduler, priorityClass,
+ ctx,
server.core.requestStarters.chkPutScheduler,
server.core.requestStarters.sskPutScheduler, priorityClass,
getCHKOnly, isMetadata,
persistenceType == PERSIST_CONNECTION ?
client.lowLevelClientTransient : client.lowLevelClientPersistent,
null, targetFilename, binaryBlob);
@@ -156,10 +156,10 @@
}
}
- public ClientPut(FCPConnectionHandler handler, ClientPutMessage
message) throws IdentifierCollisionException, MessageInvalidException,
MalformedURLException {
+ public ClientPut(FCPConnectionHandler handler, ClientPutMessage
message, FCPServer server) throws IdentifierCollisionException,
MessageInvalidException, MalformedURLException {
super(message.uri, message.identifier, message.verbosity,
handler,
message.priorityClass, message.persistenceType,
message.clientToken, message.global,
- message.getCHKOnly, message.dontCompress,
message.maxRetries, message.earlyEncode);
+ message.getCHKOnly, message.dontCompress,
message.maxRetries, message.earlyEncode, server);
String salt = null;
byte[] saltedHash = null;
binaryBlob = message.binaryBlob;
@@ -258,7 +258,7 @@
if(logMINOR) Logger.minor(this, "data = "+data+", uploadFrom =
"+ClientPutMessage.uploadFromString(uploadFrom));
putter = new ClientPutter(this, data, uri, cm,
- ctx,
client.core.requestStarters.chkPutScheduler,
client.core.requestStarters.sskPutScheduler, priorityClass,
+ ctx,
server.core.requestStarters.chkPutScheduler,
server.core.requestStarters.sskPutScheduler, priorityClass,
getCHKOnly, isMetadata,
persistenceType == PERSIST_CONNECTION ?
client.lowLevelClientTransient : client.lowLevelClientPersistent,
null, targetFilename, binaryBlob);
@@ -277,8 +277,8 @@
* @throws PersistenceParseException
* @throws IOException
*/
- public ClientPut(SimpleFieldSet fs, FCPClient client2) throws
PersistenceParseException, IOException {
- super(fs, client2);
+ public ClientPut(SimpleFieldSet fs, FCPClient client2, FCPServer
server) throws PersistenceParseException, IOException {
+ super(fs, client2, server);
logMINOR = Logger.shouldLog(Logger.MINOR, this);
String mimeType = fs.get("Metadata.ContentType");
@@ -352,8 +352,8 @@
this.clientMetadata = cm;
SimpleFieldSet oldProgress = fs.subset("progress");
if(finished) oldProgress = null; // Not useful any more
- putter = new ClientPutter(this, data, uri, cm, ctx,
client.core.requestStarters.chkPutScheduler,
- client.core.requestStarters.sskPutScheduler,
priorityClass, getCHKOnly, isMetadata,
+ putter = new ClientPutter(this, data, uri, cm, ctx,
server.core.requestStarters.chkPutScheduler,
+ server.core.requestStarters.sskPutScheduler,
priorityClass, getCHKOnly, isMetadata,
persistenceType == PERSIST_CONNECTION ?
client.lowLevelClientTransient : client.lowLevelClientPersistent,
oldProgress, targetFilename, binaryBlob);
if(persistenceType != PERSIST_CONNECTION) {
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
2008-06-14 13:51:33 UTC (rev 20340)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
2008-06-14 13:55:56 UTC (rev 20341)
@@ -129,7 +129,7 @@
private void makePutter() {
SimpleManifestPutter p;
try {
- p = new SimpleManifestPutter(this,
client.core.requestStarters.chkPutScheduler,
client.core.requestStarters.sskPutScheduler,
+ p = new SimpleManifestPutter(this,
server.core.requestStarters.chkPutScheduler,
server.core.requestStarters.sskPutScheduler,
manifestElements, priorityClass, uri,
defaultName, ctx, getCHKOnly,
persistenceType == PERSIST_CONNECTION ?
client.lowLevelClientTransient : client.lowLevelClientPersistent,
earlyEncode);
@@ -174,7 +174,7 @@
long sz =
Long.parseLong(subset.get("DataLength"));
if(!finished) {
try {
- data =
SerializableToFieldSetBucketUtil.create(fs.subset("ReturnBucket"), ctx.random,
client.server.core.persistentTempBucketFactory);
+ data =
SerializableToFieldSetBucketUtil.create(fs.subset("ReturnBucket"), ctx.random,
server.core.persistentTempBucketFactory);
} catch
(CannotCreateFromFieldSetException e) {
throw new
PersistenceParseException("Could not read old bucket for "+identifier+" : "+e,
e);
}
@@ -210,7 +210,7 @@
SimpleManifestPutter p = null;
try {
if(!finished)
- p = new SimpleManifestPutter(this,
client.core.requestStarters.chkPutScheduler,
client.core.requestStarters.sskPutScheduler,
+ p = new SimpleManifestPutter(this,
server.core.requestStarters.chkPutScheduler,
server.core.requestStarters.sskPutScheduler,
manifestElements,
priorityClass, uri, defaultName, ctx, getCHKOnly,
persistenceType ==
PERSIST_CONNECTION ? client.lowLevelClientTransient :
client.lowLevelClientPersistent,
earlyEncode);
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java
2008-06-14 13:51:33 UTC (rev 20340)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java
2008-06-14 13:55:56 UTC (rev 20341)
@@ -170,17 +170,17 @@
String type = fs.get("Type");
boolean lazyResume = server.core.lazyResume();
if(type.equals("GET")) {
- ClientGet cg = new ClientGet(fs, client);
+ ClientGet cg = new ClientGet(fs, client,
server);
client.register(cg, lazyResume);
if(!lazyResume) cg.start();
return cg;
} else if(type.equals("PUT")) {
- ClientPut cp = new ClientPut(fs, client);
+ ClientPut cp = new ClientPut(fs, client,
server);
client.register(cp, lazyResume);
if(!lazyResume) cp.start();
return cp;
} else if(type.equals("PUTDIR")) {
- ClientPutDir cp = new ClientPutDir(fs, client);
+ ClientPutDir cp = new ClientPutDir(fs, client,
server);
client.register(cp, lazyResume);
if(!lazyResume) cp.start();
return cp;
Modified: branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java 2008-06-14
13:51:33 UTC (rev 20340)
+++ branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java 2008-06-14
13:55:56 UTC (rev 20341)
@@ -24,7 +24,6 @@
this.completedUnackedRequests = new Vector();
this.clientRequestsByIdentifier = new HashMap();
this.server = server;
- this.core = server.core;
this.isGlobalQueue = isGlobalQueue;
this.persistenceType = persistenceType;
assert(persistenceType == ClientRequest.PERSIST_FOREVER ||
persistenceType == ClientRequest.PERSIST_REBOOT);
@@ -55,8 +54,6 @@
private final Vector completedUnackedRequests;
/** ClientRequest's by identifier */
private final HashMap clientRequestsByIdentifier;
- /** Client (one FCPClient = one HighLevelSimpleClient = one round-robin
slot) */
- public final NodeClientCore core;
/** Are we the global queue? */
public final boolean isGlobalQueue;
/** Are we watching the global queue? */
