Update of /cvsroot/freenet/freenet/src/freenet/node/states/FCP
In directory sc8-pr-cvs1:/tmp/cvs-serv14016/src/freenet/node/states/FCP
Modified Files:
NewFECEncodeSegment.java NewClientPut.java
ReturnDiagnostics.java NewInfo.java NewFECSegmentFile.java
NewGenerateSVKPair.java NewFECSegmentSplitFile.java
NewFECDecodeSegment.java NewFECMakeMetadata.java
Log Message:
6290: don't show the request box either when in simple mode.
Index: NewFECEncodeSegment.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewFECEncodeSegment.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- NewFECEncodeSegment.java 30 Oct 2003 01:34:02 -0000 1.8
+++ NewFECEncodeSegment.java 31 Oct 2003 19:21:19 -0000 1.9
@@ -55,7 +55,7 @@
return null;
}
- BucketFactory bf = n.fecTools.getBucketFactory();
+ BucketFactory bf = Node.fecTools.getBucketFactory();
Bucket[] dataBlocks = null;
Bucket[] checkBlocks = null;
@@ -84,7 +84,7 @@
bf, true);
// Encode
- checkBlocks = n.fecTools.encodeSegment(header,
+ checkBlocks = Node.fecTools.encodeSegment(header,
requestList, // null ok
dataBlocks);
@@ -167,7 +167,7 @@
e.printStackTrace();
Core.logger.log(NewFECEncodeSegment.class,
"Caught EOFException in din.readFully: "+e,
- e, Core.logger.ERROR);
+ e, Logger.ERROR);
throw e;
}
Index: NewClientPut.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewClientPut.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -r1.13 -r1.14
--- NewClientPut.java 31 Oct 2003 18:25:12 -0000 1.13
+++ NewClientPut.java 31 Oct 2003 19:21:19 -0000 1.14
@@ -75,7 +75,7 @@
// initialize the ClientKey
FreenetURI uri = cpmo.getURI();
ClientKey ckey =
- AbstractClientKey.createFromInsertURI(n.getRandSource(), uri);
+ AbstractClientKey.createFromInsertURI(Core.getRandSource(), uri);
String cipher = cpmo.otherFields.get("Cipher");
if (cipher != null) ckey.setCipher(cipher);
Index: ReturnDiagnostics.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/ReturnDiagnostics.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- ReturnDiagnostics.java 4 Oct 2003 01:17:05 -0000 1.4
+++ ReturnDiagnostics.java 31 Oct 2003 19:21:19 -0000 1.5
@@ -3,6 +3,7 @@
import freenet.node.*;
import freenet.message.client.*;
import freenet.support.ArrayBucket;
+import freenet.support.Logger;
import freenet.diagnostics.FieldSetFormat;
import java.io.OutputStream;
import java.io.InputStream;
@@ -45,11 +46,11 @@
out.close();
}
} catch (SendFailedException sfe) {
- n.logger.log(this, "Failed to return diagnostic data message",
- sfe, n.logger.MINOR);
+ Core.logger.log(this, "Failed to return diagnostic data message",
+ sfe, Logger.MINOR);
} catch (IOException e) {
- n.logger.log(this, "IOException while sending diagnostic data",
- e, n.logger.MINOR);
+ Core.logger.log(this, "IOException while sending diagnostic data",
+ e, Logger.MINOR);
}
return null;
}
Index: NewInfo.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewInfo.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- NewInfo.java 31 Oct 2003 18:13:15 -0000 1.12
+++ NewInfo.java 31 Oct 2003 19:21:19 -0000 1.13
@@ -80,14 +80,14 @@
fs.put("FreeMemory",
Fields.longToHex((long)(Runtime.getRuntime().freeMemory())));
} catch (Throwable e) { }
- fs.put("DatastoreMax",
Fields.longToHex((long)(n.storeSize*n.storeFile.length)));
+ fs.put("DatastoreMax",
Fields.longToHex((long)(Node.storeSize*Node.storeFile.length)));
fs.put("DatastoreFree", Fields.longToHex((long)(n.dir.available())));
- fs.put("DatastoreUsed",
Fields.longToHex((long)(n.storeSize*n.storeFile.length - n.dir.available())));
+ fs.put("DatastoreUsed",
Fields.longToHex((long)(Node.storeSize*Node.storeFile.length - n.dir.available())));
fs.put("MaxFileSize",
Fields.longToHex(((FSDataStore)(n.ds)).maxDataSize));
fs.put("MostRecentTimestamp",
Fields.longToHex((long)((NativeFSDirectory)n.dir).mostRecentlyUsedTime()));
fs.put("LeastRecentTimestamp",
Fields.longToHex((long)((NativeFSDirectory)n.dir).leastRecentlyUsedTime()));
- fs.put("RoutingTime",
Fields.longToHex((long)(n.diagnostics.getValue("routingTime", Diagnostics.MINUTE,
Diagnostics.MEAN_VALUE))));
+ fs.put("RoutingTime",
Fields.longToHex((long)(Core.diagnostics.getValue("routingTime", Diagnostics.MINUTE,
Diagnostics.MEAN_VALUE))));
fs.put("AvailableThreads", Fields.longToHex(n.availableThreads()));
fs.put("ActiveJobs", Fields.longToHex(n.activeJobs()));
Index: NewFECSegmentFile.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewFECSegmentFile.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- NewFECSegmentFile.java 4 Oct 2003 01:17:02 -0000 1.2
+++ NewFECSegmentFile.java 31 Oct 2003 19:21:19 -0000 1.3
@@ -21,7 +21,7 @@
try {
FECSegmentFile msg = (FECSegmentFile)mo;
- SegmentHeader[] headers = n.fecTools.segmentFile(id, msg.getAlgoName(),
msg.getFileLength()) ;
+ SegmentHeader[] headers = Node.fecTools.segmentFile(id,
msg.getAlgoName(), msg.getFileLength()) ;
// Drop the connection after the final header is sent.
headers[headers.length - 1].setClose(true);
Index: NewGenerateSVKPair.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewGenerateSVKPair.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- NewGenerateSVKPair.java 27 Oct 2003 14:45:19 -0000 1.5
+++ NewGenerateSVKPair.java 31 Oct 2003 19:21:19 -0000 1.6
@@ -21,7 +21,7 @@
throw new BadStateException("expecting GenerateSVKPair");
ClientSVK svk;
try {
- svk = new ClientSVK(n.getRandSource());
+ svk = new ClientSVK(Core.getRandSource());
} catch (KeyException e) {
Core.logger.log(this, "KeyException creating ClientSVK: "+e, e,
Logger.ERROR);
sendMessage(new Failed(id, "Internal Error: KeyException creating
ClientSVK: "+e));
@@ -31,7 +31,7 @@
fs.put("PrivateKey", Base64.encode(svk.getPrivateKey()));
fs.put("PublicKey", Base64.encode(svk.getPublicKeyFingerPrint()));
byte[] cryptoKey = new byte[16]; // 64 bits should be plenty
- n.getRandSource().nextBytes(cryptoKey);
+ Core.getRandSource().nextBytes(cryptoKey);
fs.put("CryptoKey", Base64.encode(cryptoKey));
sendMessage(new Success(id, fs));
return null;
Index: NewFECSegmentSplitFile.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewFECSegmentSplitFile.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- NewFECSegmentSplitFile.java 30 Oct 2003 01:34:02 -0000 1.4
+++ NewFECSegmentSplitFile.java 31 Oct 2003 19:21:19 -0000 1.5
@@ -29,7 +29,7 @@
if (!(mo instanceof FECSegmentSplitFile))
throw new BadStateException("expecting FECSegmentSplitFile");
- BucketFactory bf = n.fecTools.getBucketFactory();
+ BucketFactory bf = Node.fecTools.getBucketFactory();
Bucket sfMeta = null;
try {
@@ -53,7 +53,7 @@
//BucketTools.dumpBucket(sfMeta, "__DEBUG_sfmeta.dat");
- FECTools.HeaderAndMap[] headers = n.fecTools.segmentSplitFile(id, sfMeta);
+ FECTools.HeaderAndMap[] headers = Node.fecTools.segmentSplitFile(id,
sfMeta);
int i = 0;
for (i = 0; i < headers.length; i++) {
Index: NewFECDecodeSegment.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewFECDecodeSegment.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- NewFECDecodeSegment.java 4 Oct 2003 01:17:01 -0000 1.5
+++ NewFECDecodeSegment.java 31 Oct 2003 19:21:20 -0000 1.6
@@ -36,7 +36,7 @@
throw new RuntimeException("Nothing to decode. No check blocks sent!");
}
- BucketFactory bf = n.fecTools.getBucketFactory();
+ BucketFactory bf = Node.fecTools.getBucketFactory();
Bucket[] blocks = new Bucket[checkList.length + blockList.length];
Bucket[] missing = null;
@@ -83,7 +83,7 @@
tmp = null;
// Decode
- missing = n.fecTools.decodeSegment(header,
+ missing = Node.fecTools.decodeSegment(header,
blockList,
checkList,
requestedList,
Index: NewFECMakeMetadata.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewFECMakeMetadata.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- NewFECMakeMetadata.java 30 Oct 2003 01:34:02 -0000 1.5
+++ NewFECMakeMetadata.java 31 Oct 2003 19:21:20 -0000 1.6
@@ -42,7 +42,7 @@
SegmentHeader[] headers = null;
BlockMap[] maps = null;
- BucketFactory bf = n.fecTools.getBucketFactory();
+ BucketFactory bf = Node.fecTools.getBucketFactory();
Bucket sfMeta = null;
@@ -77,7 +77,7 @@
// knows how to parse.
sfMeta = bf.makeBucket(FieldSet.MAX_PARSE_SIZE);
- n.fecTools.makeSplitFile(headers, maps,
+ Node.fecTools.makeSplitFile(headers, maps,
description, mimeType, checksum,
sfMeta);
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
