Update of /cvsroot/freenet/freenet/src/freenet/client/http
In directory sc8-pr-cvs1:/tmp/cvs-serv8807/src/freenet/client/http
Modified Files:
Tag: stable
BaseContext.java ConnectionPoller.java FproxyServlet.java
HttpServletRunner.java ImageServlet.java InsertContext.java
InsertServlet_.java NodeStatusServlet.java ParamParse.java
SFRContext.java SplitFileRequestContext.java
SplitFileRequestServlet.java StreamInsertServlet.java
StreamServlet.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: BaseContext.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/BaseContext.java,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -u -w -r1.2.4.1 -r1.2.4.2
--- BaseContext.java 27 Mar 2003 02:58:03 -0000 1.2.4.1
+++ BaseContext.java 1 Nov 2003 16:55:21 -0000 1.2.4.2
@@ -1,16 +1,7 @@
/* -*- Mode: java; c-basic-indent: 4; tab-width: 4 -*- */
package freenet.client.http;
-import javax.servlet.*;
-import javax.servlet.http.*;
-
-
-// REDFLAG: get rid of the node dependency
-import freenet.node.Node;
-
-import java.io.*;
-import freenet.support.*;
-import freenet.client.ClientFactory;
+import java.io.PrintWriter;
/**
Index: ConnectionPoller.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/ConnectionPoller.java,v
retrieving revision 1.2.2.1.2.1
retrieving revision 1.2.2.1.2.2
diff -u -w -r1.2.2.1.2.1 -r1.2.2.1.2.2
--- ConnectionPoller.java 12 Jul 2003 01:50:22 -0000 1.2.2.1.2.1
+++ ConnectionPoller.java 1 Nov 2003 16:55:22 -0000 1.2.2.1.2.2
@@ -1,11 +1,10 @@
package freenet.client.http;
-import freenet.Connection;
import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.io.InputStream;
import javax.servlet.http.HttpServletRequest;
+
+import freenet.Connection;
/**
Index: FproxyServlet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/FproxyServlet.java,v
retrieving revision 1.43.2.25.2.10
retrieving revision 1.43.2.25.2.11
diff -u -w -r1.43.2.25.2.10 -r1.43.2.25.2.11
--- FproxyServlet.java 28 Oct 2003 20:20:26 -0000 1.43.2.25.2.10
+++ FproxyServlet.java 1 Nov 2003 16:55:22 -0000 1.43.2.25.2.11
@@ -1,17 +1,48 @@
package freenet.client.http;
-import freenet.*;
-import freenet.client.*;
-import freenet.client.events.*;
-import freenet.client.listeners.*;
-import freenet.client.metadata.*;
-import freenet.client.http.filter.*;
-import freenet.config.*;
-import freenet.keys.*;
-import freenet.support.io.DataNotValidIOException;
-import freenet.support.mime.*;
-import freenet.support.servlet.*;
-import freenet.support.servlet.http.*;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.MalformedURLException;
+import java.net.SocketException;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Random;
+import java.util.Vector;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import freenet.Core;
+import freenet.KeyException;
+import freenet.client.AutoRequester;
+import freenet.client.ClientEvent;
+import freenet.client.ClientEventListener;
+import freenet.client.ClientFactory;
+import freenet.client.FreenetURI;
+import freenet.client.KeyNotInManifestException;
+import freenet.client.RequestSizeException;
+import freenet.client.events.DataNotFoundEvent;
+import freenet.client.events.RedirectFollowedEvent;
+import freenet.client.events.RouteNotFoundEvent;
+import freenet.client.http.filter.ContentFilter;
+import freenet.client.http.filter.ContentFilterFactory;
+import freenet.client.http.filter.FilterException;
+import freenet.client.http.filter.SaferFilter;
+import freenet.client.metadata.DateRedirect;
+import freenet.client.metadata.MetadataPart;
+import freenet.client.metadata.MimeTypeUtils;
+import freenet.client.metadata.SplitFile;
+import freenet.node.Node;
+import freenet.node.http.SimpleAdvanced_ModeUtils;
import freenet.support.Bucket;
import freenet.support.BucketFactory;
import freenet.support.Fields;
@@ -22,14 +53,9 @@
import freenet.support.LoggerHook;
import freenet.support.TempBucketFactory;
import freenet.support.URLEncoder;
-import freenet.node.Node;
-import freenet.node.http.SimpleAdvanced_ModeUtils;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import freenet.support.io.DataNotValidIOException;
+import freenet.support.servlet.HtmlTemplate;
+import freenet.support.servlet.http.HttpServletResponseImpl;
/*
* This code is part of fproxy, an HTTP proxy server for Freenet.
@@ -657,12 +683,12 @@
// Determine real mime type again
String fullMimeType = mimeType;
if(logDEBUG) logger.log(this, "MIME type: "+mimeType+", charset: "+charset,
- logger.DEBUG);
+ Logger.DEBUG);
if(mimeType.startsWith("text/")) {
fullMimeType += ";charset="+charset;
if(logDEBUG)
logger.log(this, "fullMimeType now "+
- fullMimeType, logger.DEBUG);
+ fullMimeType, Logger.DEBUG);
}
SplitFile splitFile = r.getMetadata().getSplitFile();
@@ -737,7 +763,7 @@
resp.setContentType(fullMimeType);
if(logDEBUG) logger.log(this, "Content-Type was "+fullMimeType+
" now charEncoding: "+
- resp.getCharacterEncoding(), logger.DEBUG);
+ resp.getCharacterEncoding(), Logger.DEBUG);
if(size != -1)
resp.setContentLength((int) data.size());
// set up for binary output
@@ -980,7 +1006,7 @@
pw = new PrintWriter(sw);
if(logDEBUG) logger.log(this, "Reporting exception to browser: "+e, e,
- logger.DEBUG);
+ Logger.DEBUG);
if (e instanceof FilterException) {
FilterException fe = (FilterException) e;
pageTmp = simplePageTmp;
@@ -1590,7 +1616,7 @@
if(!(t instanceof Exception)) {
logger.log(this,
"Non-Exception Throwable from AutoRequester",
- t, logger.NORMAL);
+ t, Logger.NORMAL);
return new
Exception("Non-Exception Throwable from AutoRequester: "+
t.toString());
Index: HttpServletRunner.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/HttpServletRunner.java,v
retrieving revision 1.8.2.3.2.3
retrieving revision 1.8.2.3.2.4
diff -u -w -r1.8.2.3.2.3 -r1.8.2.3.2.4
--- HttpServletRunner.java 28 Oct 2003 20:20:27 -0000 1.8.2.3.2.3
+++ HttpServletRunner.java 1 Nov 2003 16:55:22 -0000 1.8.2.3.2.4
@@ -6,25 +6,37 @@
package freenet.client.http;
-import freenet.*;
-import freenet.thread.*;
-import freenet.interfaces.*;
-import freenet.interfaces.servlet.*;
-import freenet.config.*;
-import freenet.crypt.*;
-import freenet.fs.*;
-import freenet.support.*;
-import freenet.support.io.*;
-import freenet.client.ClientFactory;
-import freenet.client.cli.*;
-import freenet.node.Node;
-
-import java.util.*;
-import java.net.*;
-import java.io.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.PrintStream;
import java.lang.reflect.InvocationTargetException;
+import java.util.Date;
+import java.util.Vector;
+
import javax.servlet.Servlet;
import javax.servlet.http.HttpServlet;
+
+import freenet.Core;
+import freenet.Version;
+import freenet.client.ClientFactory;
+import freenet.client.cli.CLIClientFactory;
+import freenet.client.cli.CLIException;
+import freenet.config.Config;
+import freenet.config.Params;
+import freenet.config.Setup;
+import freenet.interfaces.Interface;
+import freenet.interfaces.LocalInterface;
+import freenet.interfaces.Service;
+import freenet.interfaces.ServiceException;
+import freenet.interfaces.servlet.SingleHttpServletContainer;
+import freenet.node.Node;
+import freenet.support.Fields;
+import freenet.support.FileLoggerHook;
+import freenet.support.Loader;
+import freenet.support.Logger;
+import freenet.thread.FastThreadFactory;
+import freenet.thread.ThreadFactory;
/**
* App to run HttpServlets in a separate JVM from the node.
Index: ImageServlet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/ImageServlet.java,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -w -r1.4 -r1.4.4.1
--- ImageServlet.java 25 Oct 2002 20:12:43 -0000 1.4
+++ ImageServlet.java 1 Nov 2003 16:55:22 -0000 1.4.4.1
@@ -6,6 +6,7 @@
import freenet.node.Node;
+import freenet.support.Logger;
import freenet.support.servlet.HtmlTemplate;
/**
@@ -45,7 +46,7 @@
InputStream imagenbIS =
this.getClass().getResourceAsStream(HtmlTemplate.TEMPLATEDIR
+ "images/" +
image);
if (imagenbIS == null) {
- Node.logger.log(this, "Can't find image " + image, Node.logger.ERROR);
+ Node.logger.log(this, "Can't find image " + image, Logger.ERROR);
resp.sendError(404);
return;
}
@@ -59,7 +60,7 @@
r = imageIS.read();
}
} catch (Exception e) {
- Node.logger.log(this, "Failed to read/write image", e, Node.logger.ERROR);
+ Node.logger.log(this, "Failed to read/write image", e, Logger.ERROR);
}
}
Index: InsertContext.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/InsertContext.java,v
retrieving revision 1.8.2.2.2.3
retrieving revision 1.8.2.2.2.4
diff -u -w -r1.8.2.2.2.3 -r1.8.2.2.2.4
--- InsertContext.java 4 Jul 2003 02:45:05 -0000 1.8.2.2.2.3
+++ InsertContext.java 1 Nov 2003 16:55:22 -0000 1.8.2.2.2.4
@@ -6,29 +6,47 @@
package freenet.client.http;
-import freenet.keys.SVK;
-import freenet.KeyException;
-import freenet.Core;
-import freenet.support.*;
-import freenet.support.mime.*;
-import freenet.client.*;
-import freenet.client.metadata.*;
-import freenet.client.events.StateReachedEvent;
-import freenet.client.events.TransferEvent;
-import freenet.client.events.TransferCompletedEvent;
-import freenet.client.listeners.ClientCollisionListener; // hmmm build issue gone?
-
-import freenet.message.client.FEC.SegmentHeader;
-import freenet.message.client.FEC.BlockMap;
-
+import java.io.CharArrayWriter;
import java.io.IOException;
-import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintWriter;
-import java.io.CharArrayWriter;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import freenet.Core;
+import freenet.KeyException;
+import freenet.client.AutoRequester;
+import freenet.client.BlockInserter;
+import freenet.client.Client;
+import freenet.client.ClientEvent;
+import freenet.client.ClientEventListener;
+import freenet.client.ClientFactory;
+import freenet.client.FECTools;
+import freenet.client.FreenetURI;
+import freenet.client.InsertSizeException;
+import freenet.client.PutRequest;
+import freenet.client.Request;
+import freenet.client.events.StateReachedEvent;
+import freenet.client.events.TransferCompletedEvent;
+import freenet.client.events.TransferEvent;
+import freenet.client.listeners.ClientCollisionListener;
+import freenet.client.metadata.DocumentCommand;
+import freenet.client.metadata.InvalidPartException;
+import freenet.client.metadata.Metadata;
+import freenet.client.metadata.MetadataSettings;
+import freenet.client.metadata.Redirect;
+import freenet.keys.SVK;
+import freenet.message.client.FEC.BlockMap;
+import freenet.message.client.FEC.SegmentHeader;
+import freenet.support.Bucket;
+import freenet.support.BucketFactory;
+import freenet.support.BucketTools;
+import freenet.support.FileBucket;
+import freenet.support.Logger;
+import freenet.support.NullBucket;
+import freenet.support.mime.MIME_binary;
// REDFLAG: Cleanly factor SplitFile inserting into a
// separate component. LATER.
Index: InsertServlet_.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/InsertServlet_.java,v
retrieving revision 1.4.2.7.2.5
retrieving revision 1.4.2.7.2.6
diff -u -w -r1.4.2.7.2.5 -r1.4.2.7.2.6
--- InsertServlet_.java 28 Oct 2003 20:20:27 -0000 1.4.2.7.2.5
+++ InsertServlet_.java 1 Nov 2003 16:55:22 -0000 1.4.2.7.2.6
@@ -1,21 +1,36 @@
package freenet.client.http;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import java.io.*;
-import java.util.*;
-import java.text.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.text.NumberFormat;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
-import freenet.client.*;
-import freenet.support.*;
-import freenet.support.servlet.*;
-import freenet.support.mime.*;
-import freenet.client.http.filter.*;
-import freenet.node.Node;
-import freenet.keys.SVK;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import freenet.client.AutoRequester;
+import freenet.client.ClientEvent;
+import freenet.client.SplitFileStatus;
import freenet.client.events.SplitFileEvent;
+import freenet.keys.SVK;
import freenet.message.client.FEC.SegmentHeader;
+import freenet.node.Node;
+import freenet.support.HTMLEncoder;
+import freenet.support.Logger;
+import freenet.support.URLDecoder;
+import freenet.support.URLEncodedFormatException;
+import freenet.support.URLEncoder;
+import freenet.support.mime.MIME;
+import freenet.support.mime.MIMEFormatException;
+import freenet.support.mime.MIME_binary;
+import freenet.support.mime.MIME_multipart;
+import freenet.support.servlet.HtmlTemplate;
public class InsertServlet_ extends ServletWithContext {
Index: NodeStatusServlet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/NodeStatusServlet.java,v
retrieving revision 1.43.2.4.2.9
retrieving revision 1.43.2.4.2.10
diff -u -w -r1.43.2.4.2.9 -r1.43.2.4.2.10
--- NodeStatusServlet.java 28 Oct 2003 20:20:27 -0000 1.43.2.4.2.9
+++ NodeStatusServlet.java 1 Nov 2003 16:55:22 -0000 1.43.2.4.2.10
@@ -1,49 +1,57 @@
/* -*- Mode: java; c-basic-indent: 4; indent-tabs-mode: nil -*- */
package freenet.client.http;
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
import java.text.DateFormat;
import java.text.NumberFormat;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import java.util.Date;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.TreeMap;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import freenet.ContactCounter;
-import freenet.support.Logger;
-import freenet.ConnectionHandlerComparator;
import freenet.Core;
-import freenet.Key;
import freenet.DSAIdentity;
import freenet.Identity;
-import freenet.node.Main;
-import freenet.node.Node;
-import freenet.node.NodeReference;
-import freenet.node.rt.RTDiagSnapshot;
-import freenet.node.rt.NGRoutingTable;
-import freenet.node.rt.CPAlgoRoutingTable;
-import freenet.node.rt.TimeEstimator;
-import freenet.node.LoadStats;
+import freenet.Key;
import freenet.diagnostics.Diagnostics;
import freenet.diagnostics.DiagnosticsFormat;
-import freenet.diagnostics.HtmlDiagnosticsFormat;
-import freenet.diagnostics.HtmlIndexFormat;
-import freenet.diagnostics.RowDiagnosticsFormat;
import freenet.diagnostics.FieldSetFormat;
+import freenet.diagnostics.GraphDiagnosticsFormat;
+import freenet.diagnostics.GraphHtmlDiagnosticsFormat;
import freenet.diagnostics.GraphRange;
import freenet.diagnostics.GraphRangeDiagnosticsFormat;
-import freenet.diagnostics.GraphHtmlDiagnosticsFormat;
-import freenet.diagnostics.GraphDiagnosticsFormat;
-import freenet.node.rt.RoutingTable;
+import freenet.diagnostics.HtmlDiagnosticsFormat;
+import freenet.diagnostics.HtmlIndexFormat;
+import freenet.diagnostics.RowDiagnosticsFormat;
+import freenet.node.LoadStats;
+import freenet.node.Main;
+import freenet.node.Node;
+import freenet.node.NodeReference;
import freenet.node.ds.FSDataStore;
-import freenet.support.servlet.http.HttpServletResponseImpl;
-import freenet.support.io.WriteOutputStream;
-import freenet.support.URLEncodedFormatException;
-import freenet.support.sort.*;
-import freenet.support.StringMap;
+import freenet.node.rt.CPAlgoRoutingTable;
+import freenet.node.rt.NGRoutingTable;
+import freenet.node.rt.RTDiagSnapshot;
+import freenet.node.rt.RoutingTable;
+import freenet.node.rt.TimeEstimator;
import freenet.support.KeyHistogram;
import freenet.support.KeySizeHistogram;
+import freenet.support.Logger;
+import freenet.support.StringMap;
+import freenet.support.URLEncodedFormatException;
import freenet.support.graph.BitmapEncoder;
+import freenet.support.io.WriteOutputStream;
+import freenet.support.servlet.http.HttpServletResponseImpl;
+import freenet.support.sort.ArraySorter;
+import freenet.support.sort.HeapSorter;
/*
This code is distributed under the GNU Public Licence (GPL)
@@ -102,11 +110,11 @@
node = n;
if (node != null) {
rt = node.rt;
- diagnostics = node.diagnostics;
- inboundContacts = node.inboundContacts;
- outboundContacts = node.outboundContacts;
- inboundRequests = node.inboundRequests;
- outboundRequests = node.outboundRequests;
+ diagnostics = Node.diagnostics;
+ inboundContacts = Node.inboundContacts;
+ outboundContacts = Node.outboundContacts;
+ inboundRequests = Node.inboundRequests;
+ outboundRequests = Node.outboundRequests;
loadStats = node.loadStats;
}
}
@@ -213,8 +221,8 @@
if (uri.endsWith("inbound_request_histogram.txt")) {
int[] bins = null;
- if (node.requestDataDistribution != null) {
- bins = node.requestDataDistribution.getBins();
+ if (Node.requestDataDistribution != null) {
+ bins = Node.requestDataDistribution.getBins();
}
sendKeyHistogram(resp, false, bins,
"Histogram of requested keys.",
@@ -225,8 +233,8 @@
if (uri.endsWith("inbound_insert_histogram.txt")) {
int[] bins = null;
- if (node.requestInsertDistribution != null) {
- bins = node.requestInsertDistribution.getBins();
+ if (Node.requestInsertDistribution != null) {
+ bins = Node.requestInsertDistribution.getBins();
}
sendKeyHistogram(resp, false, bins,
"Histogram of insert attempted keys.",
@@ -237,8 +245,8 @@
if (uri.endsWith("inbound_request_histogram_detail.txt")) {
int[] bins = null;
- if (node.requestDataDistribution != null) {
- bins = node.requestDataDistribution.getBiggerBins();
+ if (Node.requestDataDistribution != null) {
+ bins = Node.requestDataDistribution.getBiggerBins();
}
sendKeyHistogram(resp, false, bins,
"Histogram of requested keys.",
@@ -249,8 +257,8 @@
if (uri.endsWith("inbound_insert_histogram_detail.txt")) {
int[] bins = null;
- if (node.requestInsertDistribution != null) {
- bins = node.requestInsertDistribution.getBiggerBins();
+ if (Node.requestInsertDistribution != null) {
+ bins = Node.requestInsertDistribution.getBiggerBins();
}
sendKeyHistogram(resp, false, bins,
"Histogram of attempted insert keys.",
@@ -261,8 +269,8 @@
if (uri.endsWith("inbound_success_histogram.txt")) {
int [] bins = null;
- if (node.successDataDistribution != null) {
- bins = node.successDataDistribution.getBins();
+ if (Node.successDataDistribution != null) {
+ bins = Node.successDataDistribution.getBins();
}
sendKeyHistogram(resp, false, bins,
"Histogram of successful externally requested keys.",
@@ -273,8 +281,8 @@
if (uri.endsWith("inbound_insert_success_histogram.txt")) {
int [] bins = null;
- if (node.successInsertDistribution != null) {
- bins = node.successInsertDistribution.getBins();
+ if (Node.successInsertDistribution != null) {
+ bins = Node.successInsertDistribution.getBins();
}
sendKeyHistogram(resp, false, bins,
"Histogram of externally originated successfully
inserted keys.",
@@ -285,8 +293,8 @@
if (uri.endsWith("inbound_success_histogram_detail.txt")) {
int [] bins = null;
- if (node.successDataDistribution != null) {
- bins = node.successDataDistribution.getBiggerBins();
+ if (Node.successDataDistribution != null) {
+ bins = Node.successDataDistribution.getBiggerBins();
}
sendKeyHistogram(resp, false, bins,
"Histogram of successfully requested keys.",
@@ -297,8 +305,8 @@
if (uri.endsWith("inbound_insert_success_histogram_detail.txt")) {
int [] bins = null;
- if (node.successInsertDistribution != null) {
- bins = node.successInsertDistribution.getBiggerBins();
+ if (Node.successInsertDistribution != null) {
+ bins = Node.successInsertDistribution.getBiggerBins();
}
sendKeyHistogram(resp, false, bins,
"Histogram of externally originated successfully
inserted keys.",
@@ -334,8 +342,8 @@
if (uri.endsWith("inbound_request_histogram_data.txt")) {
int[] bins = null;
- if (node.requestDataDistribution != null) {
- bins = node.requestDataDistribution.getBins();
+ if (Node.requestDataDistribution != null) {
+ bins = Node.requestDataDistribution.getBins();
}
sendKeyHistogram(resp, true, bins,
@@ -348,8 +356,8 @@
if (uri.endsWith("inbound_insert_histogram_data.txt")) {
int [] bins = null;
- if (node.requestInsertDistribution != null) {
- bins = node.requestInsertDistribution.getBins();
+ if (Node.requestInsertDistribution != null) {
+ bins = Node.requestInsertDistribution.getBins();
}
sendKeyHistogram(resp, true, bins,
@@ -362,8 +370,8 @@
if (uri.endsWith("inbound_request_histogram_data_detail.txt")) {
int[] bins = null;
- if (node.requestDataDistribution != null) {
- bins = node.requestDataDistribution.getBiggerBins();
+ if (Node.requestDataDistribution != null) {
+ bins = Node.requestDataDistribution.getBiggerBins();
}
sendKeyHistogram(resp, true, bins,
@@ -375,8 +383,8 @@
if (uri.endsWith("inbound_insert_histogram_data_detail.txt")) {
int[] bins = null;
- if (node.requestInsertDistribution != null) {
- bins = node.requestDataDistribution.getBiggerBins();
+ if (Node.requestInsertDistribution != null) {
+ bins = Node.requestDataDistribution.getBiggerBins();
}
sendKeyHistogram(resp, true, bins,
@@ -388,8 +396,8 @@
if (uri.endsWith("inbound_success_histogram_data.txt")) {
int[] bins = null;
- if (node.successDataDistribution != null) {
- bins = node.successDataDistribution.getBins();
+ if (Node.successDataDistribution != null) {
+ bins = Node.successDataDistribution.getBins();
}
sendKeyHistogram(resp, true, bins,
@@ -401,8 +409,8 @@
if (uri.endsWith("inbound_insert_success_histogram_data.txt")) {
int[] bins = null;
- if (node.successInsertDistribution != null) {
- bins = node.successInsertDistribution.getBins();
+ if (Node.successInsertDistribution != null) {
+ bins = Node.successInsertDistribution.getBins();
}
sendKeyHistogram(resp, true, bins,
@@ -414,8 +422,8 @@
if (uri.endsWith("inbound_success_histogram_data_detail.txt")) {
int [] bins = null;
- if (node.successDataDistribution != null) {
- bins = node.successDataDistribution.getBiggerBins();
+ if (Node.successDataDistribution != null) {
+ bins = Node.successDataDistribution.getBiggerBins();
}
sendKeyHistogram(resp, true, bins,
@@ -427,8 +435,8 @@
if (uri.endsWith("inbound_insert_success_histogram_data_detail.txt")) {
int [] bins = null;
- if (node.successInsertDistribution != null) {
- bins = node.successInsertDistribution.getBiggerBins();
+ if (Node.successInsertDistribution != null) {
+ bins = Node.successInsertDistribution.getBiggerBins();
}
sendKeyHistogram(resp, true, bins,
@@ -936,11 +944,11 @@
(inserts?"insert":"request"));
if(inserts) {
boolean b = false;
- if(node.successInsertDistribution == null) {
+ if(Node.successInsertDistribution == null) {
pw.println(MSG_NO_INSERT_SUCCESS_DIST);
b = true;
}
- if(node.requestInsertDistribution == null) {
+ if(Node.requestInsertDistribution == null) {
pw.println(MSG_NO_INBOUND_INSERT_DIST);
b = true;
}
@@ -953,9 +961,9 @@
String date = df.format(new Date(System.currentTimeMillis()));
pw.println(date);
float pMax = 0;
- int iMax = node.binLength(detail);
+ int iMax = Node.binLength(detail);
for (int i = 0; i < iMax; i++) {
- float p = node.pSuccess(i, detail, inserts);
+ float p = Node.pSuccess(i, detail, inserts);
if(Float.isNaN(p))
{
pw.println(Integer.toString(i, 16) + " | -");
@@ -968,7 +976,7 @@
};
pw.println("");
pw.println("Max: " + pMax);
- int x = node.binMostSuccessful(detail, inserts);
+ int x = Node.binMostSuccessful(detail, inserts);
if(x != -1) pw.println("Most successful: " + Integer.toString(x,16));
resp.flushBuffer();
}
@@ -1126,7 +1134,7 @@
(clip.equalsIgnoreCase("true") || clip.equalsIgnoreCase("yes")))
clippoints = true;
resp.setContentType("image/bmp");
- e.drawGraphBMP(width, height, !clippoints, resp.getOutputStream());
+ e.getHTMLReportingTool().drawGraphBMP(width, height, !clippoints,
resp.getOutputStream());
} else {
resp.sendError(404, "Not an NGRoutingTable");
}
@@ -1162,7 +1170,7 @@
(clip.equalsIgnoreCase("true") || clip.equalsIgnoreCase("yes")))
clippoints = true;
resp.setContentType("image/bmp");
- e.drawGraphBMP(width, height, !clippoints, resp.getOutputStream());
+ e.getHTMLReportingTool().drawGraphBMP(width, height, !clippoints,
resp.getOutputStream());
} else {
resp.sendError(404, "Not an NGRoutingTable");
}
@@ -1449,7 +1457,7 @@
if(ref.noPhysical()) {
if(logDEBUG)
Core.logger.log(this, "sendRefList skipping node "+i+" of "+
- refs.length+" because noPhysical", Logger.DEBUG);
+ refs.length+" because noPhysical", Logger.NORMAL);
continue; // not much use without a physical addr
}
ref.getFieldSet().writeFields(out);
Index: ParamParse.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/ParamParse.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.2.2.1
diff -u -w -r1.1.2.2 -r1.1.2.2.2.1
--- ParamParse.java 30 Jan 2003 01:42:39 -0000 1.1.2.2
+++ ParamParse.java 1 Nov 2003 16:55:22 -0000 1.1.2.2.2.1
@@ -1,13 +1,9 @@
package freenet.client.http;
-import freenet.*;
-import freenet.support.*;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import freenet.support.Logger;
/*
* This code is part of fproxy, an HTTP proxy server for Freenet.
Index: SFRContext.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/SFRContext.java,v
retrieving revision 1.2.4.17
retrieving revision 1.2.4.18
diff -u -w -r1.2.4.17 -r1.2.4.18
--- SFRContext.java 28 Oct 2003 20:20:27 -0000 1.2.4.17
+++ SFRContext.java 1 Nov 2003 16:55:22 -0000 1.2.4.18
@@ -105,7 +105,7 @@
SFRContext(long lifeTimeMs, String uri, String path, SplitFileRequestServlet
servlet, BucketFactory bf) {
super(lifeTimeMs);
this.uri = uri;
- this.bf = bf;
+ SFRContext.bf = bf;
this.path = path;
this.servlet = servlet;
servlet.setDefaultContextValues(this);
@@ -399,7 +399,7 @@
decoderErrMsg = "No FEC decoder specified in
SplitFile metadata!";
if(logger.shouldLog(Logger.DEBUG,this))
logger.log(this, "No FEC decoder specified for
"+uri,
- new Exception("debug"), logger.DEBUG);
+ new Exception("debug"), Logger.DEBUG);
}
}
Index: SplitFileRequestContext.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/client/http/SplitFileRequestContext.java,v
retrieving revision 1.10.2.3.2.2
retrieving revision 1.10.2.3.2.3
diff -u -w -r1.10.2.3.2.2 -r1.10.2.3.2.3
--- SplitFileRequestContext.java 4 Jul 2003 02:45:05 -0000 1.10.2.3.2.2
+++ SplitFileRequestContext.java 1 Nov 2003 16:55:22 -0000 1.10.2.3.2.3
@@ -6,19 +6,32 @@
package freenet.client.http;
-import freenet.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InterruptedIOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.util.StringTokenizer;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import freenet.Connection;
+import freenet.Core;
+import freenet.client.ClientFactory;
+import freenet.client.FECFactory;
+import freenet.client.SplitFileDownloader;
+import freenet.client.http.filter.ContentFilter;
+import freenet.client.http.filter.FilterException;
+import freenet.client.metadata.SplitFile;
import freenet.node.Node;
-
-import freenet.client.*;
-import freenet.client.http.filter.*;
-import freenet.client.metadata.*;
-import freenet.support.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import freenet.support.BucketFactory;
+import freenet.support.BucketSequence;
+import freenet.support.HTMLEncoder;
+import freenet.support.Logger;
+import freenet.support.URLEncodedFormatException;
+import freenet.support.URLEncoder;
/**
* Stateful "sub-servlet" to provide user feedback for
@@ -397,7 +410,7 @@
String linkURI = null;
// LATER: clean up so browsers get better filename?
- linkURI = java.net.URLEncoder.encode(PREFIX + contextID + "/download/" + uri);
+ linkURI = URLEncoder.encode(PREFIX + contextID + "/download/" + uri);
String htlAsString = Integer.toString(htl);
String retryHtlIncrementAsString = Integer.toString(retryHtlIncrement);
Index: SplitFileRequestServlet.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/client/http/SplitFileRequestServlet.java,v
retrieving revision 1.18.2.14.2.13
retrieving revision 1.18.2.14.2.14
diff -u -w -r1.18.2.14.2.13 -r1.18.2.14.2.14
--- SplitFileRequestServlet.java 28 Oct 2003 20:20:28 -0000 1.18.2.14.2.13
+++ SplitFileRequestServlet.java 1 Nov 2003 16:55:22 -0000 1.18.2.14.2.14
@@ -674,15 +674,15 @@
Writer w = resp.getWriter();
String s = "<html><head><title>";
- if(context.state == context.STATE_FILTER_FAILED ||
- context.state == context.STATE_CANCELED ||
- context.state == context.STATE_FAILED)
+ if(context.state == SFRContext.STATE_FILTER_FAILED ||
+ context.state == SFRContext.STATE_CANCELED ||
+ context.state == SFRContext.STATE_FAILED)
s += "Failed download - ";
- else if(context.state == context.STATE_DONE)
+ else if(context.state == SFRContext.STATE_DONE)
s += "Finished download - ";
- else if (context.state == context.STATE_SENDING_DATA)
+ else if (context.state == SFRContext.STATE_SENDING_DATA)
s += "Sending data - ";
- else if (context.state == context.STATE_FILTERING_DATA)
+ else if (context.state == SFRContext.STATE_FILTERING_DATA)
s += "Filtering data - ";
else s += ((int)(context.progress()*100.0))+" % - ";
w.write(s + HTMLEncoder.encode(context.filename())+
@@ -699,11 +699,11 @@
if(context.mimeType.equals(DEFAULT_MIME_TYPE)) {
if(logDEBUG) logger.log(this, "Writing *,0 frameset for "+
- context.uri, logger.DEBUG);
+ context.uri, Logger.DEBUG);
w.write("<frameset rows=\"*,0\">");
} else {
if(logDEBUG) logger.log(this, "Writing 1,1 frameset for "+
- context.uri, logger.DEBUG);
+ context.uri, Logger.DEBUG);
w.write("<frameset rows=\"1,1\">");
}
w.write(detailFrame);
@@ -2001,7 +2001,7 @@
protected void setDefaultContextValues(SFRContext context) {
context.logger = logger;
context.cf = cf;
- context.bf = bf;
+ SFRContext.bf = bf;
context.htl = defaultHtl;
context.blockHtl = defaultBlockHtl;
Index: StreamInsertServlet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/StreamInsertServlet.java,v
retrieving revision 1.8.4.8
retrieving revision 1.8.4.9
diff -u -w -r1.8.4.8 -r1.8.4.9
--- StreamInsertServlet.java 3 Jul 2003 01:37:22 -0000 1.8.4.8
+++ StreamInsertServlet.java 1 Nov 2003 16:55:22 -0000 1.8.4.9
@@ -9,26 +9,49 @@
package freenet.client.http;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-
-import freenet.*;
-import freenet.node.*;
-import freenet.support.*;
-import freenet.support.io.*;
-import freenet.client.*;
-import freenet.client.http.*;
-import freenet.client.events.*;
-import freenet.client.listeners.*;
-import freenet.client.metadata.*;
-import freenet.thread.*;
-
-// FEC stuff
-import com.onionnetworks.fec.*;
-import com.onionnetworks.util.*;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.LinkedList;
+import java.util.ListIterator;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.onionnetworks.fec.FECCode;
+import com.onionnetworks.fec.FECCodeFactory;
+import com.onionnetworks.util.Buffer;
+
+import freenet.Core;
+import freenet.KeyException;
+import freenet.client.Client;
+import freenet.client.ClientEvent;
+import freenet.client.ClientEventListener;
+import freenet.client.ClientFactory;
+import freenet.client.ClientKey;
+import freenet.client.ClientSSK;
+import freenet.client.FreenetURI;
+import freenet.client.PutRequest;
+import freenet.client.Request;
+import freenet.client.events.GeneratedURIEvent;
+import freenet.client.listeners.DoneListener;
+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.StreamPart;
+import freenet.node.Node;
+import freenet.support.Bucket;
+import freenet.support.Logger;
+import freenet.support.NullBucket;
public class StreamInsertServlet extends FproxyServlet
{
@@ -365,15 +388,15 @@
q=insertDbr(requestUri, myHtl, dbrTime, publicUri, pw);
else
q=insertMetadata(requestUri, myHtl, null, feck, fecn,
0, streamType, mimeType, pw);
- while(q.state()>=0 && q.state()!=q.DONE) {
- pw.println(q.nameOf(q.state()));
+ while(q.state()>=0 && q.state()!=Request.DONE) {
+ pw.println(Request.nameOf(q.state()));
pw.flush();
try {
Thread.sleep(1000);
} catch (Exception e) {}
}
if(q.state()<0) {
- pw.println(q.nameOf(q.state()));
+ pw.println(Request.nameOf(q.state()));
pw.println("----------------------------------");
pw.println("WARNING: Metadata insert failed!\n");
pw.println("----------------------------------");
@@ -422,7 +445,7 @@
myIs=myUrl.openStream();
} catch (IOException e) {
Core.logger.log(this, "Aborting
StreamInsertServlet due to "+
- "IOException:
"+e, e, Core.logger.ERROR);
+ "IOException:
"+e, e, Logger.ERROR);
pw.println("Aborting stream insert due to
IOException: "+e);
e.printStackTrace(pw);
if(autoReconnect) {
@@ -471,11 +494,11 @@
if(dbrRequest.state()<0) {
// FIXME: Give some reason.
pw.println("dbrish Metadata insert
failed!: "+suri);
-
pw.println(dbrRequest.nameOf(dbrRequest.state()));
+
pw.println(Request.nameOf(dbrRequest.state()));
resp.flushBuffer();
//
dbrRequest.finalize();
dbrRequest=null;
- } else if(dbrRequest.state()==dbrRequest.DONE)
{
+ } else if(dbrRequest.state()==Request.DONE) {
pw.println("dbrish metadata insert
done: "+suri);
resp.flushBuffer();
//
dbrRequest.finalize();
@@ -488,7 +511,7 @@
resp.flushBuffer();
//
mainDbr.finalize();
mainDbr=null;
- } else if(mainDbr.state()==dbrRequest.DONE) {
+ } else if(mainDbr.state()==Request.DONE) {
pw.println("*** main DBR reinserted");
resp.flushBuffer();
//
mainDbr.finalize();
@@ -523,7 +546,7 @@
} catch (IOException
e) {
logger.log(this, "StreamInsertServlet fetching source "+
"stream failed due to IOException: "+e, e,
-
Core.logger.ERROR);
+
Logger.ERROR);
pw.println("Fetching source stream due to "+
"IOException: "+e);
pw.flush();
@@ -614,7 +637,7 @@
pw.println(j.uri+" failed to insert!");
j.finalize();
l.remove();
- } else if(j.r.state()==j.r.DONE) {
+ } else if(j.r.state()==Request.DONE) {
if(j.needMore) {
pw.println(j.uri+": inserted
data, inserting redirect");
j.more();
@@ -623,12 +646,12 @@
j.finalize();
l.remove();
}
- } else if(j.r.state()==j.r.INIT) {
+ } else if(j.r.state()==Request.INIT) {
pw.println(j.uri+": something went
hairy, stuck in INIT state - restarting!");
j.restart();
} else {
long x = System.currentTimeMillis();
- pw.println(j.uri+":
"+j.r.nameOf(j.r.state())+" for "+
+ pw.println(j.uri+":
"+Request.nameOf(j.r.state())+" for "+
((x-j.restartedTime)/1000)+", started "+
((x-j.constructedTime)/1000));
}
@@ -704,7 +727,7 @@
dc.addPart(info);
} catch (InvalidPartException e) {
Core.logger.log(this, "Invalid part exception adding info", e,
- Core.logger.ERROR);
+ Logger.ERROR);
}
StreamPart st = new StreamPart(1, (streamType!=staticStream),
"OnionFEC_a_1_2",
@@ -715,11 +738,11 @@
dc.addPart(st);
} catch (InvalidPartException e) {
Core.logger.log(this, "Invalid part exception adding stream",
e,
- Core.logger.ERROR);
+ Logger.ERROR);
}
String mymeta = meta.writeString();
- Core.logger.log(this, "Inserting: "+mymeta, Core.logger.DEBUG);
+ Core.logger.log(this, "Inserting: "+mymeta, Logger.DEBUG);
// mymeta="Version\nRevision=1\nEndPart\nDocument\n";
// mymeta=mymeta+"Info.Stream.Format=fproxy\n";
// if(streamUri!=null)
Index: StreamServlet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/StreamServlet.java,v
retrieving revision 1.4.4.6
retrieving revision 1.4.4.7
diff -u -w -r1.4.4.6 -r1.4.4.7
--- StreamServlet.java 23 Jul 2003 01:56:51 -0000 1.4.4.6
+++ StreamServlet.java 1 Nov 2003 16:55:22 -0000 1.4.4.7
@@ -8,26 +8,45 @@
package freenet.client.http;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-
-import freenet.*;
-import freenet.node.*;
-import freenet.support.*;
-import freenet.support.io.*;
-import freenet.client.*;
-import freenet.client.events.*;
-import freenet.client.listeners.*;
-import freenet.client.metadata.*;
-import freenet.client.http.*;
-import freenet.thread.*;
-
-// FEC stuff
-import com.onionnetworks.fec.*;
-import com.onionnetworks.util.*;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.net.MalformedURLException;
+import java.util.LinkedList;
+import java.util.ListIterator;
+import java.util.Random;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.onionnetworks.fec.FECCode;
+import com.onionnetworks.fec.FECCodeFactory;
+import com.onionnetworks.util.Buffer;
+
+import freenet.FieldSet;
+import freenet.KeyException;
+import freenet.client.AutoRequester;
+import freenet.client.Client;
+import freenet.client.ClientEvent;
+import freenet.client.ClientFactory;
+import freenet.client.FreenetURI;
+import freenet.client.GetRequest;
+import freenet.client.Request;
+import freenet.client.listeners.DoneListener;
+import freenet.client.metadata.DateRedirect;
+import freenet.client.metadata.DocumentCommand;
+import freenet.client.metadata.InvalidPartException;
+import freenet.client.metadata.Metadata;
+import freenet.client.metadata.MetadataPart;
+import freenet.client.metadata.MetadataSettings;
+import freenet.client.metadata.Redirect;
+import freenet.client.metadata.StreamPart;
+import freenet.node.Node;
+import freenet.support.Bucket;
+import freenet.support.Logger;
+import freenet.support.io.ReadInputStream;
public class StreamServlet extends FproxyServlet // FIXME!
{
@@ -39,7 +58,7 @@
class MyDoneListener extends DoneListener {
public void receive(ClientEvent ce) {
logger.log(this, "Got event "+ce.getDescription(),
- logger.DEBUG);
+ Logger.DEBUG);
if(ce instanceof freenet.client.events.ExceptionEvent) {
Exception e =
((freenet.client.events.ExceptionEvent)ce).getException();
@@ -61,7 +80,7 @@
public boolean getDataAsync(FreenetURI uri, int htl, Bucket metadata,
Bucket data) throws IOException, KeyException
{
logger.log(this, "getDataAsync("+uri+","+htl+",,)",
- logger.DEBUG);
+ Logger.DEBUG);
System.out.println("async requesting: "+uri);
g=new GetRequest(htl, uri, metadata, data);
dl = new MyDoneListener();
@@ -82,7 +101,7 @@
done=true;
return false;
}
- if(g.state()==g.DONE)
+ if(g.state()==Request.DONE)
{
// handle redirects
// FIXME: add DBR handling
@@ -135,7 +154,7 @@
Thread.sleep(100);
} catch (InterruptedException e) {}
}
- if(g.state()==g.DONE)
+ if(g.state()==Request.DONE)
return true;
else
return false;
@@ -257,7 +276,7 @@
catch (MalformedURLException e)
{
//writeErrorMessage(e, resp, null, key, null, htlUsed, null,
null, tryNum+1)
- logger.log(this, "Malformed URL Exception", e, logger.DEBUG);
+ logger.log(this, "Malformed URL Exception", e, Logger.DEBUG);
writeErrorMessage(e, req,resp, null, requestString, null,
myHtl, null, null, null, 0);
return;
}
@@ -292,7 +311,7 @@
catch (Exception e) {}
}
- logger.log(this, "HTL: "+myHtl, logger.DEBUG);
+ logger.log(this, "HTL: "+myHtl, Logger.DEBUG);
// Precache Probability is the probability that it will fetch a
// random chunk between here and endChunk rather than the next
required chunk!
@@ -489,13 +508,13 @@
{
outputBuffer.add(j);
logger.log(this, "Adding chunk
#"+myUri+" to outputBuffer",
-
logger.DEBUG);
+
Logger.DEBUG);
}
l.remove();
} else {
logger.log(this, "Chunk #"+myUri+
"
failed, not adding to outputBuffer",
-
logger.DEBUG);
+
Logger.DEBUG);
failedBlock=true;
}
}
@@ -622,7 +641,7 @@
return;
if(r.done)
{
- if(r.g.state()==r.g.DONE)
+ if(r.g.state()==Request.DONE)
{
FieldSet streamMetadata=null;
try {
@@ -808,7 +827,7 @@
}
fecbitch.decode(landingZone, index);
- logger.log(this, "Decoded segment: "+myUri,
logger.DEBUG);
+ logger.log(this, "Decoded segment: "+myUri,
Logger.DEBUG);
// I'd prefer to use System.arraycopy() here, but it
// seems to not quite do what I want, according to the
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
