Update of /cvsroot/freenet/freenet/src/freenet/node/states/FCP
In directory sc8-pr-cvs1:/tmp/cvs-serv8807/src/freenet/node/states/FCP
Modified Files:
Tag: stable
ClientGetToken.java ClientPutToken.java FCPFeedbackToken.java
NewClientGet.java NewClientPut.java NewFECDecodeSegment.java
NewFECEncodeSegment.java NewFECMakeMetadata.java
NewFECSegmentFile.java NewFECSegmentSplitFile.java
NewGenerateCHK.java NewGenerateSHA1.java
NewGenerateSVKPair.java NewGetSize.java NewHello.java
NewInfo.java NewInvertPrivateKey.java ReturnDiagnostics.java
Log Message:
5030: Merge minor(ish) changes from unstable:
Open Connections infolet
Minor implementation changes on normal mode
Show total bytes transmitted/received so far
Much new information on the PeerHandler mode
Fixed tons of eclipse warnings (almost all are style issues, not functional changes -
relating to logger and imports mostly). Remove deprecated FieldSet.add(String,String).
Update TestLocalNIOInterface to current API
Make 5029 mandatory (it can't connect to us anyway, only vice versa).
If incoming HTL is 25, 50% chance of not decrementing it, so we have some plausible
deniability when we send out an HTL 25 request (the client level HTL perturb mechanism
is insufficient although useful).
Don't use seednodes with no physical address.
Use our own URLEncoder/URLDecoder's, catch the exceptions. We were using java's, which
are deprecated.
Add support for deprecated options. These will be read form config file and handled,
but will not be written to it by --config. Currently bandwidthLimit and
averageBandwidthLimit are in this category. Separate code logs an error when these are
set.
Change the way bandwidthLimit set but others not set, to prevent it from constantly
getting 100% load due to bandwidth limit (0!) exceeded.
Set priority of entropy thread to MIN.
Remove old datastore code, GOOD RIDDENS!
Add a memory usage test for the Failure Table
Increase size of failure table to 20,000 (from 2,000).
Don't show the key request form in simple mode on the default infolet.
Major refactoring of HTML reporting, writing to disk, in NGRouting estimators.
Relative times in (for example) ?date= in fproxy: ?date=-1year gives the edition of a
DBR one year ago.
NIO refactoring (ASL.ChannelAttachmentPairQueue).
Logging.
Index: ClientGetToken.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/ClientGetToken.java,v
retrieving revision 1.4.6.5
retrieving revision 1.4.6.6
diff -u -w -r1.4.6.5 -r1.4.6.6
--- ClientGetToken.java 28 Oct 2003 20:20:41 -0000 1.4.6.5
+++ ClientGetToken.java 1 Nov 2003 16:55:35 -0000 1.4.6.6
@@ -1,16 +1,37 @@
package freenet.node.states.FCP;
-import freenet.*;
-import freenet.node.*;
-import freenet.message.client.*;
-import freenet.client.*;
-import freenet.crypt.*;
-import freenet.support.io.*;
-import freenet.support.Logger;
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import freenet.Core;
+import freenet.FieldSet;
+import freenet.KeyException;
+import freenet.MessageSendCallback;
+import freenet.OutputStreamTrailerWriter;
+import freenet.PeerHandler;
+import freenet.SendFailedException;
+import freenet.Storables;
+import freenet.TrailerWriter;
+import freenet.TrailerWriterOutputStream;
+import freenet.client.ClientKey;
+import freenet.client.Document;
+import freenet.client.FreenetURI;
+import freenet.message.client.ClientMessage;
+import freenet.message.client.DataChunk;
+import freenet.message.client.DataFound;
+import freenet.message.client.Failed;
+import freenet.message.client.MetadataHint;
+import freenet.message.client.URIError;
+import freenet.node.Node;
+import freenet.node.NodeReference;
import freenet.support.Bucket;
import freenet.support.BucketFactory;
+import freenet.support.Logger;
+import freenet.support.io.CBStripOutputStream;
+import freenet.support.io.CopyingOutputStream;
+import freenet.support.io.DataChunkOutputStream;
+import freenet.support.io.DataNotValidIOException;
/** Serves as a communication relay between the state chain and
* the FCP client after a ClientGet has been initiated.
Index: ClientPutToken.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/ClientPutToken.java,v
retrieving revision 1.2.6.3
retrieving revision 1.2.6.4
diff -u -w -r1.2.6.3 -r1.2.6.4
--- ClientPutToken.java 28 Oct 2003 20:20:41 -0000 1.2.6.3
+++ ClientPutToken.java 1 Nov 2003 16:55:35 -0000 1.2.6.4
@@ -1,10 +1,17 @@
package freenet.node.states.FCP;
-import freenet.*;
-import freenet.message.client.*;
-import freenet.node.*;
+import freenet.FieldSet;
+import freenet.MessageSendCallback;
+import freenet.PeerHandler;
+import freenet.SendFailedException;
+import freenet.Storables;
+import freenet.TrailerWriter;
+import freenet.message.client.KeyCollision;
+import freenet.message.client.Pending;
+import freenet.message.client.Success;
+import freenet.node.Node;
+import freenet.node.NodeReference;
import freenet.support.Fields;
-import java.io.*;
/** This is the FeedbackToken given to the InsertRequestInitiator.
* @author tavin
Index: FCPFeedbackToken.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/FCPFeedbackToken.java,v
retrieving revision 1.2.6.2
retrieving revision 1.2.6.3
diff -u -w -r1.2.6.2 -r1.2.6.3
--- FCPFeedbackToken.java 28 Oct 2003 20:20:41 -0000 1.2.6.2
+++ FCPFeedbackToken.java 1 Nov 2003 16:55:35 -0000 1.2.6.3
@@ -1,10 +1,17 @@
package freenet.node.states.FCP;
-import freenet.*;
-import freenet.message.client.*;
-import freenet.node.states.request.FeedbackToken;
+import freenet.FieldSet;
+import freenet.MessageSendCallback;
+import freenet.PeerHandler;
+import freenet.SendFailedException;
+import freenet.TrailerWriter;
+import freenet.message.client.ClientMessage;
+import freenet.message.client.DataNotFound;
+import freenet.message.client.Failed;
+import freenet.message.client.Restarted;
+import freenet.message.client.RouteNotFound;
import freenet.node.Node;
-import java.io.*;
+import freenet.node.states.request.FeedbackToken;
/** FeedbackToken to translate the results from the node's request states
* to FCP responses.
Index: NewClientGet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewClientGet.java,v
retrieving revision 1.6.4.1.2.2
retrieving revision 1.6.4.1.2.3
diff -u -w -r1.6.4.1.2.2 -r1.6.4.1.2.3
--- NewClientGet.java 28 Oct 2003 20:20:41 -0000 1.6.4.1.2.2
+++ NewClientGet.java 1 Nov 2003 16:55:35 -0000 1.6.4.1.2.3
@@ -3,6 +3,7 @@
import freenet.*;
import freenet.node.*;
import freenet.node.states.request.*;
+import freenet.support.Logger;
import freenet.message.client.*;
import freenet.client.*;
@@ -41,7 +42,7 @@
throw new BadStateException("expecting ClientGet");
}
- n.diagnostics.occurrenceCounting("inboundClientRequests", 1);
+ Core.diagnostics.occurrenceCounting("inboundClientRequests", 1);
ClientGet cgmo = (ClientGet) mo;
@@ -63,10 +64,10 @@
k, null, ft, ri)).received(n, ri);
}
catch (KeyException e) {
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this,
"KeyException trying to serve FCP request",
- e, Core.logger.DEBUG);
+ e, Logger.DEBUG);
sendMessage(new URIError(id, e.getMessage()));
}
return null;
Index: NewClientPut.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewClientPut.java,v
retrieving revision 1.6.6.3
retrieving revision 1.6.6.4
diff -u -w -r1.6.6.3 -r1.6.6.4
--- NewClientPut.java 28 Oct 2003 20:20:41 -0000 1.6.6.3
+++ NewClientPut.java 1 Nov 2003 16:55:35 -0000 1.6.6.4
@@ -1,15 +1,34 @@
package freenet.node.states.FCP;
-import freenet.*;
-import freenet.node.*;
-import freenet.node.states.request.*;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import freenet.Core;
+import freenet.FieldSet;
+import freenet.Key;
+import freenet.KeyException;
+import freenet.MessageObject;
+import freenet.PeerHandler;
+import freenet.client.AbstractClientKey;
+import freenet.client.Base64;
+import freenet.client.ClientKey;
+import freenet.client.ClientSVK;
+import freenet.client.FreenetURI;
import freenet.message.DataInsert;
-import freenet.message.client.*;
-import freenet.client.*;
-import freenet.support.*;
-import freenet.support.io.*;
-import freenet.crypt.*;
-import java.io.*;
+import freenet.message.client.ClientPut;
+import freenet.message.client.Failed;
+import freenet.message.client.URIError;
+import freenet.node.BadStateException;
+import freenet.node.Node;
+import freenet.node.State;
+import freenet.node.StateException;
+import freenet.node.states.request.FeedbackToken;
+import freenet.node.states.request.InsertPending;
+import freenet.node.states.request.RequestInitiator;
+import freenet.support.Bucket;
+import freenet.support.Logger;
+import freenet.support.io.DiscontinueInputStream;
+import freenet.support.io.FreeBucketInputStream;
/**
* This is the state pertaining to InsertRequests in their
@@ -35,7 +54,7 @@
throw new BadStateException("expecting ClientPut");
}
- n.diagnostics.occurrenceCounting("inboundClientRequests", 1);
+ Core.diagnostics.occurrenceCounting("inboundClientRequests", 1);
ClientPut cpmo = (ClientPut) mo;
@@ -56,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);
@@ -116,13 +135,13 @@
}
}
catch (KeyException e) {
- n.logger.log(this, "ClientPut got KeyException, sending URIError",
+ Core.logger.log(this, "ClientPut got KeyException, sending URIError",
e, Logger.MINOR);
sendMessage(new URIError(id, e.getMessage()));
return null;
}
catch (Exception e) {
- n.logger.log(this, "ClientPut failed", e, Logger.MINOR);
+ Core.logger.log(this, "ClientPut failed", e, Logger.MINOR);
sendMessage(new Failed(id, e.getMessage()));
return null;
}
Index: NewFECDecodeSegment.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewFECDecodeSegment.java,v
retrieving revision 1.1.4.1.2.3
retrieving revision 1.1.4.1.2.4
diff -u -w -r1.1.4.1.2.3 -r1.1.4.1.2.4
--- NewFECDecodeSegment.java 28 Oct 2003 20:20:41 -0000 1.1.4.1.2.3
+++ NewFECDecodeSegment.java 1 Nov 2003 16:55:35 -0000 1.1.4.1.2.4
@@ -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: NewFECEncodeSegment.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewFECEncodeSegment.java,v
retrieving revision 1.1.6.2
retrieving revision 1.1.6.3
diff -u -w -r1.1.6.2 -r1.1.6.3
--- NewFECEncodeSegment.java 28 Oct 2003 20:20:41 -0000 1.1.6.2
+++ NewFECEncodeSegment.java 1 Nov 2003 16:55:35 -0000 1.1.6.3
@@ -1,18 +1,30 @@
package freenet.node.states.FCP;
-import freenet.*;
-import freenet.support.Logger;
+import java.io.DataInputStream;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import freenet.Core;
+import freenet.MessageObject;
+import freenet.PeerHandler;
+import freenet.SendFailedException;
+import freenet.TrailerWriter;
+import freenet.TrailerWriterOutputStream;
+import freenet.message.client.BlocksEncoded;
+import freenet.message.client.DataChunk;
+import freenet.message.client.Failed;
+import freenet.message.client.FEC.FECEncodeSegment;
+import freenet.message.client.FEC.SegmentHeader;
+import freenet.node.BadStateException;
+import freenet.node.Node;
+import freenet.node.State;
import freenet.support.Bucket;
import freenet.support.BucketFactory;
import freenet.support.BucketTools;
+import freenet.support.Logger;
import freenet.support.io.ReadInputStream;
-import freenet.client.FECTools;
-
-import freenet.node.*;
-import freenet.message.client.*;
-import freenet.message.client.FEC.*;
-
-import java.io.*;
public class NewFECEncodeSegment extends NewClientRequest {
@@ -43,7 +55,7 @@
return null;
}
- BucketFactory bf = n.fecTools.getBucketFactory();
+ BucketFactory bf = Node.fecTools.getBucketFactory();
Bucket[] dataBlocks = null;
Bucket[] checkBlocks = null;
@@ -72,7 +84,7 @@
bf, true);
// Encode
- checkBlocks = n.fecTools.encodeSegment(header,
+ checkBlocks = Node.fecTools.encodeSegment(header,
requestList, // null ok
dataBlocks);
@@ -155,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: NewFECMakeMetadata.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewFECMakeMetadata.java,v
retrieving revision 1.1.4.2.2.1
retrieving revision 1.1.4.2.2.2
diff -u -w -r1.1.4.2.2.1 -r1.1.4.2.2.2
--- NewFECMakeMetadata.java 28 Oct 2003 20:20:41 -0000 1.1.4.2.2.1
+++ NewFECMakeMetadata.java 1 Nov 2003 16:55:35 -0000 1.1.4.2.2.2
@@ -1,15 +1,21 @@
package freenet.node.states.FCP;
-import freenet.*;
-import freenet.node.*;
-import freenet.message.client.*;
-import freenet.message.client.FEC.*;
-import freenet.support.io.ReadInputStream;
+import java.io.InputStream;
+
+import freenet.FieldSet;
+import freenet.MessageObject;
+import freenet.PeerHandler;
+import freenet.message.client.Failed;
+import freenet.message.client.MadeMetadata;
+import freenet.message.client.FEC.BlockMap;
+import freenet.message.client.FEC.FECMakeMetadata;
+import freenet.message.client.FEC.SegmentHeader;
+import freenet.node.BadStateException;
+import freenet.node.Node;
+import freenet.node.State;
import freenet.support.Bucket;
import freenet.support.BucketFactory;
-import freenet.support.BucketTools;
-import freenet.client.FECTools;
-import java.io.*;
+import freenet.support.io.ReadInputStream;
public class NewFECMakeMetadata extends NewClientRequest {
@@ -36,7 +42,7 @@
SegmentHeader[] headers = null;
BlockMap[] maps = null;
- BucketFactory bf = n.fecTools.getBucketFactory();
+ BucketFactory bf = Node.fecTools.getBucketFactory();
Bucket sfMeta = null;
@@ -71,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);
Index: NewFECSegmentFile.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewFECSegmentFile.java,v
retrieving revision 1.1.6.1
retrieving revision 1.1.6.2
diff -u -w -r1.1.6.1 -r1.1.6.2
--- NewFECSegmentFile.java 28 Oct 2003 20:20:41 -0000 1.1.6.1
+++ NewFECSegmentFile.java 1 Nov 2003 16:55:35 -0000 1.1.6.2
@@ -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: NewFECSegmentSplitFile.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewFECSegmentSplitFile.java,v
retrieving revision 1.1.4.1.2.1
retrieving revision 1.1.4.1.2.2
diff -u -w -r1.1.4.1.2.1 -r1.1.4.1.2.2
--- NewFECSegmentSplitFile.java 28 Oct 2003 20:20:41 -0000 1.1.4.1.2.1
+++ NewFECSegmentSplitFile.java 1 Nov 2003 16:55:35 -0000 1.1.4.1.2.2
@@ -1,15 +1,19 @@
package freenet.node.states.FCP;
-import freenet.*;
-import freenet.node.*;
-import freenet.message.client.*;
-import freenet.message.client.FEC.*;
-import freenet.support.Bucket;
-import freenet.support.BucketFactory;
-import freenet.support.BucketTools;
+import java.io.OutputStream;
+import freenet.MessageObject;
+import freenet.PeerHandler;
import freenet.client.FECTools;
-import java.io.*;
+import freenet.message.client.Failed;
+import freenet.message.client.FEC.BlockMap;
+import freenet.message.client.FEC.FECSegmentSplitFile;
+import freenet.message.client.FEC.SegmentHeader;
+import freenet.node.BadStateException;
+import freenet.node.Node;
+import freenet.node.State;
+import freenet.support.Bucket;
+import freenet.support.BucketFactory;
public class NewFECSegmentSplitFile extends NewClientRequest {
@@ -25,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 {
@@ -49,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: NewGenerateCHK.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewGenerateCHK.java,v
retrieving revision 1.1.1.1.6.2
retrieving revision 1.1.1.1.6.3
diff -u -w -r1.1.1.1.6.2 -r1.1.1.1.6.3
--- NewGenerateCHK.java 28 Oct 2003 20:20:41 -0000 1.1.1.1.6.2
+++ NewGenerateCHK.java 1 Nov 2003 16:55:35 -0000 1.1.1.1.6.3
@@ -1,12 +1,21 @@
package freenet.node.states.FCP;
-import freenet.*;
-import freenet.node.*;
-import freenet.message.client.*;
-import freenet.support.*;
-import freenet.client.*;
-import freenet.crypt.*;
-import java.io.*;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import freenet.Core;
+import freenet.FieldSet;
+import freenet.MessageObject;
+import freenet.PeerHandler;
+import freenet.client.ClientCHK;
+import freenet.message.client.Failed;
+import freenet.message.client.GenerateCHK;
+import freenet.message.client.Success;
+import freenet.node.BadStateException;
+import freenet.node.Node;
+import freenet.node.State;
+import freenet.support.Bucket;
+import freenet.support.Logger;
public class NewGenerateCHK extends NewClientRequest {
@@ -58,7 +67,7 @@
sendMessage(new Success(id, fs));
}
catch (Exception e) {
- n.logger.log(this, "GenerateCHK failed", e, Logger.MINOR);
+ Core.logger.log(this, "GenerateCHK failed", e, Logger.MINOR);
sendMessage(new Failed(id, e.getMessage()));
}
finally {
Index: NewGenerateSHA1.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewGenerateSHA1.java,v
retrieving revision 1.1.2.1.2.2
retrieving revision 1.1.2.1.2.3
diff -u -w -r1.1.2.1.2.2 -r1.1.2.1.2.3
--- NewGenerateSHA1.java 28 Oct 2003 20:20:41 -0000 1.1.2.1.2.2
+++ NewGenerateSHA1.java 1 Nov 2003 16:55:35 -0000 1.1.2.1.2.3
@@ -1,12 +1,18 @@
package freenet.node.states.FCP;
-import freenet.*;
-import freenet.node.*;
-import freenet.message.client.*;
-import freenet.support.*;
-import freenet.client.*;
-import freenet.crypt.*;
-import java.io.*;
+import freenet.Core;
+import freenet.FieldSet;
+import freenet.MessageObject;
+import freenet.PeerHandler;
+import freenet.crypt.SHA1;
+import freenet.crypt.Util;
+import freenet.message.client.Failed;
+import freenet.message.client.GenerateSHA1;
+import freenet.message.client.Success;
+import freenet.node.BadStateException;
+import freenet.node.Node;
+import freenet.node.State;
+import freenet.support.Logger;
public class NewGenerateSHA1 extends NewClientRequest {
@@ -39,7 +45,7 @@
sendMessage(new Success(id, fs));
}
catch (Exception e) {
- n.logger.log(this, "GenerateSHA1 failed", e, Logger.MINOR);
+ Core.logger.log(this, "GenerateSHA1 failed", e, Logger.MINOR);
sendMessage(new Failed(id, e.getMessage()));
}
return null;
Index: NewGenerateSVKPair.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewGenerateSVKPair.java,v
retrieving revision 1.1.1.1.6.3
retrieving revision 1.1.1.1.6.4
diff -u -w -r1.1.1.1.6.3 -r1.1.1.1.6.4
--- NewGenerateSVKPair.java 28 Oct 2003 20:20:41 -0000 1.1.1.1.6.3
+++ NewGenerateSVKPair.java 1 Nov 2003 16:55:35 -0000 1.1.1.1.6.4
@@ -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: NewGetSize.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewGetSize.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -w -r1.1.2.2 -r1.1.2.3
--- NewGetSize.java 28 Oct 2003 20:20:42 -0000 1.1.2.2
+++ NewGetSize.java 1 Nov 2003 16:55:35 -0000 1.1.2.3
@@ -1,15 +1,17 @@
package freenet.node.states.FCP;
-import freenet.*;
-import freenet.node.*;
-import freenet.node.states.request.*;
-import freenet.message.DataInsert;
-import freenet.message.client.*;
-import freenet.client.*;
-import freenet.support.*;
-import freenet.support.io.*;
-import freenet.crypt.*;
-import java.io.*;
+import freenet.FieldSet;
+import freenet.KeyException;
+import freenet.MessageObject;
+import freenet.PeerHandler;
+import freenet.client.ComputeSizeRequest;
+import freenet.client.FreenetURI;
+import freenet.message.client.GetSize;
+import freenet.message.client.Success;
+import freenet.message.client.URIError;
+import freenet.node.BadStateException;
+import freenet.node.Node;
+import freenet.node.State;
/** This is the state pertaining to GetSize's in their
* initial state
Index: NewHello.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewHello.java,v
retrieving revision 1.2.4.2.2.1
retrieving revision 1.2.4.2.2.2
diff -u -w -r1.2.4.2.2.1 -r1.2.4.2.2.2
--- NewHello.java 28 Oct 2003 20:20:42 -0000 1.2.4.2.2.1
+++ NewHello.java 1 Nov 2003 16:55:35 -0000 1.2.4.2.2.2
@@ -25,11 +25,11 @@
Core.logger.log(this, "Running ClientHello: "+mo+" on "+this,
Logger.DEBUG);
FieldSet fs = new FieldSet();
- fs.add("Node", Version.getVersionString());
- fs.add("Protocol", "1.2");
- fs.add("MaxFileSize", Fields.longToHex(((FSDataStore)(n.ds)).maxDataSize));
+ fs.put("Node", Version.getVersionString());
+ fs.put("Protocol", "1.2");
+ fs.put("MaxFileSize", Fields.longToHex(((FSDataStore)(n.ds)).maxDataSize));
if (Version.highestSeenBuild > Version.buildNumber) {
- fs.add("HighestSeenBuild", ""+Version.highestSeenBuild);
+ fs.put("HighestSeenBuild", ""+Version.highestSeenBuild);
}
sendMessage(new NodeHello(id, fs));
if(logDEBUG) Core.logger.log(this, "Finished running ClientHello "+
Index: NewInfo.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewInfo.java,v
retrieving revision 1.1.2.4.2.2
retrieving revision 1.1.2.4.2.3
diff -u -w -r1.1.2.4.2.2 -r1.1.2.4.2.3
--- NewInfo.java 28 Oct 2003 20:20:42 -0000 1.1.2.4.2.2
+++ NewInfo.java 1 Nov 2003 16:55:35 -0000 1.1.2.4.2.3
@@ -1,17 +1,22 @@
/* -*- Mode: java; c-basic-indent: 4; tab-width: 4 -*- */
package freenet.node.states.FCP;
-import freenet.*;
-import freenet.node.*;
-import freenet.support.*;
-import freenet.support.io.*;
-import freenet.message.client.*;
-import freenet.fs.dir.NativeFSDirectory;
-import freenet.transport.tcpAddress;
+import freenet.Core;
+import freenet.FieldSet;
+import freenet.MessageObject;
+import freenet.PeerHandler;
import freenet.diagnostics.Diagnostics;
+import freenet.fs.dir.NativeFSDirectory;
+import freenet.message.client.ClientInfo;
+import freenet.message.client.NodeInfo;
+import freenet.node.BadStateException;
+import freenet.node.Main;
+import freenet.node.Node;
+import freenet.node.State;
import freenet.node.ds.FSDataStore;
-
-import java.util.*;
+import freenet.support.Fields;
+import freenet.support.Logger;
+import freenet.transport.tcpAddress;
public class NewInfo extends NewClientRequest {
@@ -28,64 +33,64 @@
throw new BadStateException("expecting ClientInfo");
FieldSet fs = new FieldSet();
- fs.add("EstimatedLoad", Fields.longToHex((long)(n.estimatedLoad() *
100)));
+ fs.put("EstimatedLoad", Fields.longToHex((long)(n.estimatedLoad() *
100)));
- fs.add("IsTransient", n.isTransient() ? "true" : "false");
+ fs.put("IsTransient", n.isTransient() ? "true" : "false");
// Place all of these in their own try/catch set, so they the
parameters which are
// available to us will still be returned
try {
- fs.add("Architecture", System.getProperty("os.arch"));
+ fs.put("Architecture", System.getProperty("os.arch"));
} catch (Throwable e) { }
try {
- fs.add("Processors",
(String)Runtime.getRuntime().getClass().getMethod("availableProcessors",
null).invoke(Runtime.getRuntime(), null));
+ fs.put("Processors",
(String)Runtime.getRuntime().getClass().getMethod("availableProcessors",
null).invoke(Runtime.getRuntime(), null));
} catch (Throwable e) { }
try {
- fs.add("OperatingSystem", System.getProperty("os.name"));
+ fs.put("OperatingSystem", System.getProperty("os.name"));
} catch (Throwable e) { }
try {
- fs.add("OperatingSystemVersion",
System.getProperty("os.version"));
+ fs.put("OperatingSystemVersion",
System.getProperty("os.version"));
} catch (Throwable e) { }
try {
- fs.add("JavaVendor", System.getProperty("java.vendor.url"));
+ fs.put("JavaVendor", System.getProperty("java.vendor.url"));
} catch (Throwable e) { }
try {
- fs.add("JavaName", System.getProperty("java.vm.name"));
+ fs.put("JavaName", System.getProperty("java.vm.name"));
} catch (Throwable e) { }
try {
- fs.add("JavaVersion", System.getProperty("java.vm.version"));
+ fs.put("JavaVersion", System.getProperty("java.vm.version"));
} catch (Throwable e) { }
try {
- fs.add("MaximumMemory",
(String)Runtime.getRuntime().getClass().getMethod("maxMemory",
null).invoke(Runtime.getRuntime(), null));
+ fs.put("MaximumMemory",
(String)Runtime.getRuntime().getClass().getMethod("maxMemory",
null).invoke(Runtime.getRuntime(), null));
} catch (Throwable e) { }
try {
- fs.add("AllocatedMemory",
Fields.longToHex((long)(Runtime.getRuntime().totalMemory())));
+ fs.put("AllocatedMemory",
Fields.longToHex((long)(Runtime.getRuntime().totalMemory())));
} catch (Throwable e) { }
try {
- fs.add("FreeMemory",
Fields.longToHex((long)(Runtime.getRuntime().freeMemory())));
+ fs.put("FreeMemory",
Fields.longToHex((long)(Runtime.getRuntime().freeMemory())));
} catch (Throwable e) { }
- fs.add("DatastoreMax",
Fields.longToHex((long)(n.storeSize*n.storeFile.length)));
- fs.add("DatastoreFree", Fields.longToHex((long)(n.dir.available())));
- fs.add("DatastoreUsed",
Fields.longToHex((long)(n.storeSize*n.storeFile.length - n.dir.available())));
- fs.add("MaxFileSize",
Fields.longToHex(((FSDataStore)(n.ds)).maxDataSize));
- fs.add("MostRecentTimestamp",
Fields.longToHex((long)((NativeFSDirectory)n.dir).mostRecentlyUsedTime()));
- fs.add("LeastRecentTimestamp",
Fields.longToHex((long)((NativeFSDirectory)n.dir).leastRecentlyUsedTime()));
+ 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)(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.add("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.add("AvailableThreads", Fields.longToHex(n.availableThreads()));
- fs.add("ActiveJobs", Fields.longToHex(n.activeJobs()));
+ fs.put("AvailableThreads", Fields.longToHex(n.availableThreads()));
+ fs.put("ActiveJobs", Fields.longToHex(n.activeJobs()));
tcpAddress tcp = Main.getTcpAddress();
if(tcp!=null) {
@@ -94,11 +99,11 @@
addr = tcp.getHost().getHostAddress();
} catch (java.net.UnknownHostException e) {
Core.logger.log(this, "Cannot resolve own address,
sending hostname instead",
- Core.logger.ERROR);
+ Logger.ERROR);
addr = tcp.getValName();
}
- fs.add("NodeAddress", addr);
- fs.add("NodePort", Fields.longToHex((long)tcp.getPort()));
+ fs.put("NodeAddress", addr);
+ fs.put("NodePort", Fields.longToHex((long)tcp.getPort()));
}
// FIXME: add thread stats stuff here when I work it out ^_^
Index: NewInvertPrivateKey.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewInvertPrivateKey.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -w -r1.1.2.2 -r1.1.2.3
--- NewInvertPrivateKey.java 28 Oct 2003 20:20:42 -0000 1.1.2.2
+++ NewInvertPrivateKey.java 1 Nov 2003 16:55:35 -0000 1.1.2.3
@@ -1,12 +1,19 @@
package freenet.node.states.FCP;
-import freenet.*;
-import freenet.node.*;
-import freenet.message.client.*;
-import freenet.support.*;
-import freenet.client.*;
-import freenet.crypt.*;
-import java.io.*;
+import freenet.Core;
+import freenet.FieldSet;
+import freenet.MessageObject;
+import freenet.PeerHandler;
+import freenet.client.AbstractClientKey;
+import freenet.client.ClientSSK;
+import freenet.client.FreenetURI;
+import freenet.message.client.Failed;
+import freenet.message.client.InvertPrivateKey;
+import freenet.message.client.Success;
+import freenet.node.BadStateException;
+import freenet.node.Node;
+import freenet.node.State;
+import freenet.support.Logger;
/** State to handle the FCP command to invert a private key to its
* public value.
@@ -66,7 +73,7 @@
sendMessage(new Success(id, fs));
}
catch (Exception e) {
- n.logger.log(this, "InvertPrivateKey failed", e, Logger.MINOR);
+ Core.logger.log(this, "InvertPrivateKey failed", e, Logger.MINOR);
sendMessage(new Failed(id, e.getMessage()));
}
return null;
Index: ReturnDiagnostics.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/ReturnDiagnostics.java,v
retrieving revision 1.2.6.1
retrieving revision 1.2.6.2
diff -u -w -r1.2.6.1 -r1.2.6.2
--- ReturnDiagnostics.java 28 Oct 2003 20:20:42 -0000 1.2.6.1
+++ ReturnDiagnostics.java 1 Nov 2003 16:55:35 -0000 1.2.6.2
@@ -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;
@@ -29,7 +30,7 @@
ArrayBucket bucket = new ArrayBucket();
PrintWriter bout =
new PrintWriter(bucket.getOutputStream());
- n.diagnostics.writeVars(bout, new FieldSetFormat());
+ Core.diagnostics.writeVars(bout, new FieldSetFormat());
bout.close();
TrailerWriter tw =
@@ -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;
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
