Update of /cvsroot/freenet/freenet/src/freenet/client/cli
In directory sc8-pr-cvs1:/tmp/cvs-serv8807/src/freenet/client/cli
Modified Files:
Tag: stable
CLI.java CLIFNPClient.java CLISplitFileStatus.java
ComputeCHKCommand.java GetCommand.java GetSizeCommand.java
InvertPrivateKeyCommand.java Main.java PutCommand.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: CLI.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/cli/CLI.java,v
retrieving revision 1.7.4.3.2.7
retrieving revision 1.7.4.3.2.8
diff -u -w -r1.7.4.3.2.7 -r1.7.4.3.2.8
--- CLI.java 23 Jul 2003 01:56:50 -0000 1.7.4.3.2.7
+++ CLI.java 1 Nov 2003 16:55:20 -0000 1.7.4.3.2.8
@@ -1,22 +1,28 @@
package freenet.client.cli;
-import freenet.client.*;
-import freenet.client.events.*;
-import freenet.client.listeners.EventLogger;
-import freenet.config.*;
-import freenet.support.*;
-import freenet.support.io.ReadInputStream;
-import java.io.*;
-import java.net.BindException;
-import java.util.Stack;
-import java.util.Hashtable;
-import java.util.Enumeration;
-import java.util.Date;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
import java.lang.reflect.InvocationTargetException;
-import freenet.crypt.*;
-import freenet.support.Fields;
-import freenet.support.Loader;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+import freenet.client.Client;
+import freenet.client.Request;
+import freenet.client.RequestProcess;
+import freenet.client.listeners.EventLogger;
+import freenet.config.Config;
+import freenet.config.Params;
+import freenet.support.Bucket;
import freenet.support.FileBucket;
-import freenet.support.ArrayBucket;
+import freenet.support.FileLoggerHook;
+import freenet.support.Loader;
+import freenet.support.Logger;
+import freenet.support.NullBucket;
/**
* This class contains methods for reading options in CLI clients.
*
@@ -441,7 +447,7 @@
} else {
ClientCommand cc = getCommand(params.getArg(0));
if (cc == null) {
- logger.log(this, "Command time: " + cc + " not supported.",
logger.ERROR);
+ logger.log(this, "Command time: " + cc + " not supported.",
Logger.ERROR);
usage();
return true;
}
@@ -473,7 +479,7 @@
}
}
} catch (IOException e) {
- logger.log(this, "Error with data: " + e, e, logger.ERROR);
+ logger.log(this, "Error with data: " + e, e, Logger.ERROR);
return false;
}
@@ -481,7 +487,7 @@
try {
rp = cc.getProcess(params, metadata, data);
} catch (CLIException e) {
- logger.log(this, e.getMessage(), e, logger.ERROR);
+ logger.log(this, e.getMessage(), e, Logger.ERROR);
return false;
}
@@ -493,7 +499,7 @@
while ((r = rp.getNextRequest()) != null) {
if (!clientFactory.supportsRequest(r.getClass())) {
logger.log(this, "Current client cannot make request of type "
- + r, logger.ERROR);
+ + r, Logger.ERROR);
rp.abort();
return false;
}
@@ -506,32 +512,32 @@
Client c = clientFactory.getClient(r);
c.start();
} catch (IOException e) {
- logger.log(this, "IO error: " + e, e, logger.ERROR);
+ logger.log(this, "IO error: " + e, e, Logger.ERROR);
return false;
} catch (freenet.KeyException e) {
- logger.log(this, "Key error: " + e, e, logger.ERROR);
+ logger.log(this, "Key error: " + e, e, Logger.ERROR);
return false;
}
}
if (!rp.failed() && rp.getMetadata() != null) {
- if (logger.shouldLog(logger.NORMAL)) {
- logger.log(this, "Document metadata:", logger.NORMAL);
- logger.log(this, ""+rp.getMetadata(), logger.NORMAL);
+ if (logger.shouldLog(Logger.NORMAL)) {
+ logger.log(this, "Document metadata:", Logger.NORMAL);
+ logger.log(this, ""+rp.getMetadata(), Logger.NORMAL);
if (metadata != null) {
try {
OutputStream out = metadata.getOutputStream();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
rp.getMetadata().writeTo(baos);
out.close();
- logger.log(this, new String(baos.toByteArray()),
logger.NORMAL);
+ logger.log(this, new String(baos.toByteArray()),
Logger.NORMAL);
} catch (IOException e) {
logger.log(this, "IO error writing metadata: " +
- e.getMessage(), e, logger.ERROR);
+ e.getMessage(), e, Logger.ERROR);
}
}
}
} else if (rp.failed())
- logger.log(this, "Request failed.", logger.ERROR);
+ logger.log(this, "Request failed.", Logger.ERROR);
if (!rp.failed() && cc.givesData() && stream) {
try {
@@ -542,7 +548,7 @@
out.write(b, 0, i);
}
} catch (IOException e) {
- logger.log(this, "IO error writing data: " + e.getMessage(), e,
logger.ERROR);
+ logger.log(this, "IO error writing data: " + e.getMessage(), e,
Logger.ERROR);
return false;
}
}
Index: CLIFNPClient.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/cli/CLIFNPClient.java,v
retrieving revision 1.2.4.1.2.1
retrieving revision 1.2.4.1.2.2
diff -u -w -r1.2.4.1.2.1 -r1.2.4.1.2.2
--- CLIFNPClient.java 28 Oct 2003 20:20:25 -0000 1.2.4.1.2.1
+++ CLIFNPClient.java 1 Nov 2003 16:55:20 -0000 1.2.4.1.2.2
@@ -1,20 +1,25 @@
package freenet.client.cli;
-import freenet.*;
-import freenet.config.*;
-import freenet.client.*;
-import freenet.support.Bucket;
-import freenet.support.FileBucket;
-import freenet.support.Logger;
-import freenet.support.io.*;
-import freenet.node.NodeReference;
-import freenet.node.BadReferenceException;
-import freenet.transport.TCP;
-import java.io.*;
-import java.util.Enumeration;
+import java.io.FileInputStream;
+import java.io.IOException;
import java.net.InetAddress;
import java.net.UnknownHostException;
-import java.net.BindException;
+
+import freenet.BadAddressException;
+import freenet.Core;
+import freenet.FieldSet;
+import freenet.ListenException;
+import freenet.Transport;
+import freenet.Version;
+import freenet.client.ClientCore;
+import freenet.client.FNPClient;
+import freenet.config.Config;
+import freenet.config.Params;
+import freenet.node.BadReferenceException;
+import freenet.node.NodeReference;
+import freenet.support.Logger;
+import freenet.support.io.ReadInputStream;
+import freenet.transport.TCP;
/**
* CLI extensions to FNP version of Client library
* @author oskar
Index: CLISplitFileStatus.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/cli/CLISplitFileStatus.java,v
retrieving revision 1.2.2.2.2.1
retrieving revision 1.2.2.2.2.2
diff -u -w -r1.2.2.2.2.1 -r1.2.2.2.2.2
--- CLISplitFileStatus.java 14 May 2003 20:44:49 -0000 1.2.2.2.2.1
+++ CLISplitFileStatus.java 1 Nov 2003 16:55:20 -0000 1.2.2.2.2.2
@@ -1,12 +1,16 @@
package freenet.client.cli;
-import freenet.message.client.FEC.SegmentHeader;
-import freenet.client.*;
-import freenet.client.events.*;
+import freenet.client.ClientEvent;
+import freenet.client.SplitFileStatus;
+import freenet.client.events.BlockFinishedEvent;
+import freenet.client.events.SegmentDecodingEvent;
+import freenet.client.events.SegmentEncodingEvent;
+import freenet.client.events.SegmentHealingStartedEvent;
+import freenet.client.events.SegmentRequestStartedEvent;
+import freenet.client.events.SplitFileEvent;
+import freenet.client.events.VerifyingChecksumEvent;
import freenet.support.Logger;
-import java.io.PrintWriter;
-
/**
* A SplitFileStatus subclass which dumps messages to
* stdout for the CLI client implementation.
@@ -39,18 +43,18 @@
(statusCode == DECODING)) {
// No block stats
log.log(this, statusString(statusCode) + " [" + (header.getSegmentNum() +
1) +
- "/" + (header.getSegments()) + "]", log.NORMAL);
+ "/" + (header.getSegments()) + "]", Logger.NORMAL);
}
else if (statusCode == VERIFYING_CHECKSUM) {
// Print out the checksum too
log.log(this, statusString(statusCode) + " [" + (header.getSegmentNum() +
1) +
- "/" + (header.getSegments()) + "]: " + checksum, log.NORMAL);
+ "/" + (header.getSegments()) + "]: " + checksum,
Logger.NORMAL);
}
else {
String fullStats = " (" + processed + "/" + denom + "):[" +
(header.getSegmentNum() + 1) +
"/" + (header.getSegments()) + "] queued: " + queued +
" running: " + running;
- log.log(this, statusString(statusCode) + fullStats, log.NORMAL);
+ log.log(this, statusString(statusCode) + fullStats, Logger.NORMAL);
}
}
Index: ComputeCHKCommand.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/cli/ComputeCHKCommand.java,v
retrieving revision 1.1.1.1.4.2
retrieving revision 1.1.1.1.4.2.2.1
diff -u -w -r1.1.1.1.4.2 -r1.1.1.1.4.2.2.1
--- ComputeCHKCommand.java 7 Mar 2003 23:27:07 -0000 1.1.1.1.4.2
+++ ComputeCHKCommand.java 1 Nov 2003 16:55:20 -0000 1.1.1.1.4.2.2.1
@@ -1,11 +1,16 @@
package freenet.client.cli;
-import freenet.client.RequestProcess;
+import java.io.IOException;
+
import freenet.client.ComputeCHKProcess;
-import freenet.client.metadata.*;
-import freenet.support.Bucket;
-import freenet.support.ArrayBucket;
+import freenet.client.RequestProcess;
+import freenet.client.metadata.DocumentCommand;
+import freenet.client.metadata.InfoPart;
+import freenet.client.metadata.InvalidPartException;
+import freenet.client.metadata.Metadata;
+import freenet.client.metadata.MetadataSettings;
+import freenet.client.metadata.MimeTypeUtils;
import freenet.config.Params;
-import java.io.IOException;
+import freenet.support.Bucket;
public class ComputeCHKCommand implements ClientCommand {
Index: GetCommand.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/cli/GetCommand.java,v
retrieving revision 1.3.4.2.2.1
retrieving revision 1.3.4.2.2.2
diff -u -w -r1.3.4.2.2.1 -r1.3.4.2.2.2
--- GetCommand.java 23 Jul 2003 16:21:12 -0000 1.3.4.2.2.1
+++ GetCommand.java 1 Nov 2003 16:55:20 -0000 1.3.4.2.2.2
@@ -1,15 +1,14 @@
package freenet.client.cli;
+import freenet.client.ClientFactory;
+import freenet.client.FreenetURI;
+import freenet.client.GetRequestProcess;
+import freenet.client.RequestProcess;
+import freenet.client.metadata.MetadataSettings;
import freenet.config.Params;
import freenet.support.Bucket;
-import freenet.support.FileBucket;
import freenet.support.Fields;
-import freenet.support.FileBucketFactory;
+import freenet.support.FileBucket;
import freenet.support.TempBucketFactory;
-import freenet.client.ClientFactory;
-import freenet.client.RequestProcess;
-import freenet.client.GetRequestProcess;
-import freenet.client.FreenetURI;
-import freenet.client.metadata.MetadataSettings;
/**
* Command plugin for Get (ie DataRequest).
Index: GetSizeCommand.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/cli/GetSizeCommand.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -w -r1.1.2.1 -r1.1.2.2
--- GetSizeCommand.java 23 Jul 2003 01:56:50 -0000 1.1.2.1
+++ GetSizeCommand.java 1 Nov 2003 16:55:20 -0000 1.1.2.2
@@ -1,17 +1,11 @@
package freenet.client.cli;
+import freenet.KeyException;
import freenet.client.ComputeSizeRequest;
+import freenet.client.FreenetURI;
+import freenet.client.RequestProcess;
import freenet.config.Params;
import freenet.support.Bucket;
-import freenet.support.FileBucket;
-import freenet.support.Fields;
-import freenet.support.FileBucketFactory;
-import freenet.support.TempBucketFactory;
-import freenet.client.ClientFactory;
-import freenet.client.RequestProcess;
-import freenet.client.GetRequestProcess;
-import freenet.client.FreenetURI;
-import freenet.KeyException;
/**
* Command plugin for getting the size of a key
Index: InvertPrivateKeyCommand.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/client/cli/InvertPrivateKeyCommand.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -w -r1.1.2.1 -r1.1.2.2
--- InvertPrivateKeyCommand.java 11 Apr 2003 00:13:10 -0000 1.1.2.1
+++ InvertPrivateKeyCommand.java 1 Nov 2003 16:55:20 -0000 1.1.2.2
@@ -1,9 +1,8 @@
package freenet.client.cli;
-import freenet.client.RequestProcess;
import freenet.client.InvertPrivateKeyProcess;
-import freenet.support.Bucket;
+import freenet.client.RequestProcess;
import freenet.config.Params;
-import java.io.IOException;
+import freenet.support.Bucket;
/**
* Command plugin for InvertPrivateKey (ie FCP InvertPrivateKey).
Index: Main.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/cli/Main.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
--- Main.java 5 Jul 2003 19:16:49 -0000 1.1.1.1.6.2
+++ Main.java 1 Nov 2003 16:55:20 -0000 1.1.1.1.6.3
@@ -10,7 +10,7 @@
CLI client = new CLI(p);
boolean r = client.execute();
client.stop();
- client.fh.close();
+ CLI.fh.close();
waitForThreadsAndExit(r ? 0 : 1);
} catch (CLIException e) {
System.err.println(e.getMessage());
Index: PutCommand.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/cli/PutCommand.java,v
retrieving revision 1.4.4.4.2.2
retrieving revision 1.4.4.4.2.3
diff -u -w -r1.4.4.4.2.2 -r1.4.4.4.2.3
--- PutCommand.java 28 Oct 2003 20:20:25 -0000 1.4.4.4.2.2
+++ PutCommand.java 1 Nov 2003 16:55:20 -0000 1.4.4.4.2.3
@@ -1,16 +1,23 @@
package freenet.client.cli;
+import java.io.IOException;
+
+import freenet.client.ClientFactory;
+import freenet.client.FreenetURI;
+import freenet.client.PutRequestProcess;
+import freenet.client.RequestProcess;
+import freenet.client.metadata.DocumentCommand;
+import freenet.client.metadata.InfoPart;
+import freenet.client.metadata.InvalidPartException;
+import freenet.client.metadata.Metadata;
+import freenet.client.metadata.MetadataSettings;
+import freenet.client.metadata.MimeTypeUtils;
+import freenet.client.metadata.Redirect;
+import freenet.client.metadata.SplitFile;
import freenet.config.Params;
import freenet.support.Bucket;
-import freenet.support.FileBucket;
import freenet.support.Fields;
-import freenet.support.FileBucketFactory;
+import freenet.support.FileBucket;
import freenet.support.TempBucketFactory;
-import freenet.client.ClientFactory;
-import freenet.client.RequestProcess;
-import freenet.client.PutRequestProcess;
-import freenet.client.FreenetURI;
-import freenet.client.metadata.*;
-import java.io.IOException;
/**
* Command pluging for Put (ie InsertRequest).
*
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
