rendered paste bodyIndex: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/client/ArchiveManager.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/client/ArchiveManager.java (revision 9510)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/client/ArchiveManager.java (working copy)
@@ -220,7 +220,7 @@
OutputStream out = output.getOutputStream();
int readBytes;
-inner: while((readBytes = zis.read(buf)) > 0) {
+ while((readBytes = zis.read(buf)) > 0) {
out.write(buf, 0, readBytes);
readBytes += realLen;
if(readBytes > maxArchivedFileSize) {
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/client/async/SimpleManifestPutter.java (revision 9510)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/client/async/SimpleManifestPutter.java (working copy)
@@ -32,7 +32,6 @@
protected PutHandler(String name, Bucket data, ClientMetadata cm, boolean getCHKOnly) throws InserterException {
super(SimpleManifestPutter.this.getPriorityClass(), SimpleManifestPutter.this.chkScheduler, SimpleManifestPutter.this.sskScheduler, SimpleManifestPutter.this.client);
- this.name = name;
this.cm = cm;
this.data = data;
InsertBlock block =
@@ -39,7 +38,6 @@
new InsertBlock(data, cm, FreenetURI.EMPTY_CHK_URI);
this.origSFI =
new SingleFileInserter(this, this, block, false, ctx, false, getCHKOnly, true, null, false);
- currentState = origSFI;
metadata = null;
}
@@ -45,7 +43,6 @@
protected PutHandler(String name, FreenetURI target, ClientMetadata cm) {
super(SimpleManifestPutter.this.getPriorityClass(), SimpleManifestPutter.this.chkScheduler, SimpleManifestPutter.this.sskScheduler, SimpleManifestPutter.this.client);
- this.name = name;
this.cm = cm;
this.data = null;
Metadata m = new Metadata(Metadata.SIMPLE_REDIRECT, target, cm);
@@ -51,7 +48,6 @@
Metadata m = new Metadata(Metadata.SIMPLE_REDIRECT, target, cm);
metadata = m;
origSFI = null;
- currentState = null;
}
protected PutHandler(String name, String targetInZip, ClientMetadata cm, Bucket data) {
@@ -56,7 +52,6 @@
protected PutHandler(String name, String targetInZip, ClientMetadata cm, Bucket data) {
super(SimpleManifestPutter.this.getPriorityClass(), SimpleManifestPutter.this.chkScheduler, SimpleManifestPutter.this.sskScheduler, SimpleManifestPutter.this.client);
- this.name = name;
this.cm = cm;
this.data = data;
this.targetInZip = targetInZip;
@@ -63,13 +58,10 @@
Metadata m = new Metadata(Metadata.ZIP_INTERNAL_REDIRECT, targetInZip, cm);
metadata = m;
origSFI = null;
- currentState = null;
}
private SingleFileInserter origSFI;
- private ClientPutState currentState;
private ClientMetadata cm;
- private final String name;
private Metadata metadata;
private boolean finished;
private String targetInZip;
@@ -116,13 +108,7 @@
}
}
- public void onTransition(ClientPutState oldState, ClientPutState newState) {
- if(oldState == this) {
- // We do not need to have a hashtable of state -> PutHandler.
- // Because we can just pull the parent off the state!
- this.currentState = newState;
- }
- }
+ public void onTransition(ClientPutState oldState, ClientPutState newState) {}
public void onMetadata(Metadata m, ClientPutState state) {
Logger.minor(this, "Assigning metadata: "+m+" for "+this+" from "+state,
@@ -339,10 +325,6 @@
resolveAndStartBase();
}
-
- private void startMetadataInsert() {
- resolveAndStartBase();
- }
private void resolveAndStartBase() {
Bucket bucket = null;
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/client/async/SingleBlockInserter.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/client/async/SingleBlockInserter.java (revision 9510)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/client/async/SingleBlockInserter.java (working copy)
@@ -9,7 +9,6 @@
import freenet.client.InserterException;
import freenet.keys.CHKEncodeException;
import freenet.keys.ClientCHKBlock;
-import freenet.keys.ClientKey;
import freenet.keys.ClientKeyBlock;
import freenet.keys.ClientSSKBlock;
import freenet.keys.FreenetURI;
@@ -36,7 +35,6 @@
private final FailureCodeTracker errors;
private boolean finished;
private final boolean dontSendEncoded;
- private ClientKey key;
private WeakReference refToClientKeyBlock;
final int token; // for e.g. splitfiles
private final Object tokenObject;
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/client/async/SingleFileInserter.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/client/async/SingleFileInserter.java (revision 9510)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/client/async/SingleFileInserter.java (working copy)
@@ -408,4 +408,8 @@
public Object getToken() {
return token;
}
+
+ public boolean isCancelled() {
+ return cancelled;
+ }
}
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/client/async/USKFetcherWrapper.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/client/async/USKFetcherWrapper.java (revision 9510)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/client/async/USKFetcherWrapper.java (working copy)
@@ -2,7 +2,6 @@
import freenet.keys.FreenetURI;
import freenet.keys.USK;
-import freenet.node.RequestStarter;
/**
* Wrapper for a backgrounded USKFetcher.
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/clients/http/ToadletContextImpl.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/clients/http/ToadletContextImpl.java (revision 9517)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/clients/http/ToadletContextImpl.java (working copy)
@@ -27,8 +27,6 @@
*
*/
public class ToadletContextImpl implements ToadletContext {
-
- private final Socket sock;
private final MultiValueTable headers;
private final OutputStream sockOutputStream;
private final PageMaker pagemaker;
@@ -40,7 +38,6 @@
private boolean closed;
public ToadletContextImpl(Socket sock, MultiValueTable headers, String CSSName, BucketFactory bf) throws IOException {
- this.sock = sock;
this.headers = headers;
this.closed = false;
sockOutputStream = sock.getOutputStream();
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/clients/http/filter/CSSTokenizerFilter.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/clients/http/filter/CSSTokenizerFilter.java (revision 9517)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/clients/http/filter/CSSTokenizerFilter.java (working copy)
@@ -547,9 +547,8 @@
/* error codes */
final private static int YY_UNKNOWN_ERROR = 0;
- final private static int YY_ILLEGAL_STATE = 1;
- final private static int YY_NO_MATCH = 2;
- final private static int YY_PUSHBACK_2BIG = 3;
+ final private static int YY_NO_MATCH = 1;
+ final private static int YY_PUSHBACK_2BIG = 2;
/* error messages for the codes above */
final private static String YY_ERROR_MSG[] = {
@@ -613,23 +612,6 @@
from input */
private int yy_endRead;
- /** number of newlines encountered up to the start of the matched text */
- private int yyline;
-
- /** the number of characters up to the start of the matched text */
- private int yychar;
-
- /**
- * the number of characters from the last newline up to the start of the
- * matched text
- */
- private int yycolumn;
-
- /**
- * yy_atBOL == true <=> the scanner is currently at the beginning of a line
- */
- private boolean yy_atBOL = true;
-
/** yy_atEOF == true <=> the scanner is at the EOF */
private boolean yy_atEOF;
@@ -952,11 +934,9 @@
final public void yyreset(java.io.Reader reader) throws java.io.IOException {
yyclose();
yy_reader = reader;
- yy_atBOL = true;
yy_atEOF = false;
yy_endRead = yy_startRead = 0;
yy_currentPos = yy_markedPos = yy_pushbackPos = 0;
- yyline = yychar = yycolumn = 0;
yy_lexical_state = YYINITIAL;
}
@@ -1068,7 +1048,6 @@
// cached fields:
int yy_currentPos_l;
- int yy_startRead_l;
int yy_markedPos_l;
int yy_endRead_l = yy_endRead;
char [] yy_buffer_l = yy_buffer;
@@ -1083,8 +1062,7 @@
yy_action = -1;
- yy_startRead_l = yy_currentPos_l = yy_currentPos =
- yy_startRead = yy_markedPos_l;
+ yy_currentPos_l = yy_currentPos = yy_startRead = yy_markedPos_l;
yy_state = yy_lexical_state;
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/clients/http/filter/GenericReadFilterCallback.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/clients/http/filter/GenericReadFilterCallback.java (revision 9517)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/clients/http/filter/GenericReadFilterCallback.java (working copy)
@@ -121,7 +121,6 @@
// REDFLAG any other options we should support?
// Obviously we don't want to support ?force= !!
// At the moment, ?type= and ?force= are the only options supported by FProxy anyway.
- String ret = path;
try {
URI uri = new URI(null, null, path, typeOverride == null ? null : "type="+typeOverride,
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/clients/http/filter/HTMLFilter.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/clients/http/filter/HTMLFilter.java (revision 9517)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/clients/http/filter/HTMLFilter.java (working copy)
@@ -32,33 +32,8 @@
public class HTMLFilter implements ContentDataFilter, CharsetExtractor {
- private boolean debug = false;
private static boolean deleteWierdStuff = true;
private static boolean deleteErrors = true;
- private boolean allowSecurityErrors = false;
- private boolean allowSecurityWarnings = false;
- private boolean cssParanoidStringCheck = false;
-
- private final static String possibleAnonCompromiseMsg =
- "You have retrieved some content which is not recognised by FProxy, and so we "
- + "don't know what your web browser might do with it. It could be harmless, "
- + "but it could make your web browser do something which would compromise your "
- + "anonymity.";
- public void setParanoidStringCheck(boolean b) {
- cssParanoidStringCheck = b;
- }
-
- public void setAllowSecurityWarnings(boolean value) {
- allowSecurityWarnings = value;
- }
-
- public void setAllowSecurityErrors(boolean value) {
- allowSecurityErrors = value;
- }
-
- public void setDebug(boolean debug) {
- this.debug = debug;
- }
public Bucket readFilter(Bucket bucket, BucketFactory bf, String charset, HashMap otherParams, FilterCallback cb) throws DataFilterException, IOException {
Logger.minor(this, "readFilter(): charset="+charset);
@@ -413,7 +388,6 @@
if (!pc.killTag) {
t = t.sanitize(pc);
if (t != null) {
- boolean deletedStyle = false;
if (pc.writeStyleScriptWithTag) {
pc.writeStyleScriptWithTag = false;
String style = pc.currentStyleScriptChunk;
@@ -1385,7 +1359,6 @@
ParsedTag p,
HTMLParseContext pc) throws DataFilterException {
// Call parent so we swallow the scripting
- Hashtable h = super.sanitizeHash(hn, p, pc);
return null; // Lose the tags
}
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/clients/http/filter/KnownUnsafeContentTypeException.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/clients/http/filter/KnownUnsafeContentTypeException.java (revision 9517)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/clients/http/filter/KnownUnsafeContentTypeException.java (working copy)
@@ -1,7 +1,7 @@
package freenet.clients.http.filter;
public class KnownUnsafeContentTypeException extends UnsafeContentTypeException {
-
+ private static final long serialVersionUID = -1;
MIMEType type;
public KnownUnsafeContentTypeException(MIMEType type) {
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/clients/http/filter/UnknownContentTypeException.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/clients/http/filter/UnknownContentTypeException.java (revision 9517)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/clients/http/filter/UnknownContentTypeException.java (working copy)
@@ -3,7 +3,7 @@
import freenet.support.HTMLEncoder;
public class UnknownContentTypeException extends UnsafeContentTypeException {
-
+ private static final long serialVersionUID = -1;
final String type;
final String encodedType;
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/config/InvalidConfigValueException.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/config/InvalidConfigValueException.java (revision 9510)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/config/InvalidConfigValueException.java (working copy)
@@ -8,6 +8,7 @@
* it.
*/
public class InvalidConfigValueException extends Exception {
+ private static final long serialVersionUID = -1;
public InvalidConfigValueException(String msg) {
super(msg);
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/config/OptionFormatException.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/config/OptionFormatException.java (revision 9510)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/config/OptionFormatException.java (working copy)
@@ -5,7 +5,7 @@
* type.
*/
public class OptionFormatException extends InvalidConfigValueException {
-
+ private static final long serialVersionUID = -1;
public OptionFormatException(String msg) {
super(msg);
}
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/config/StringArrOption.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/config/StringArrOption.java (revision 9510)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/config/StringArrOption.java (working copy)
@@ -5,8 +5,6 @@
import freenet.support.URLEncoder;
public class StringArrOption extends Option {
-
- private final String defaultValue;
private final StringArrCallback cb;
private String currentValue;
@@ -15,7 +13,6 @@
public StringArrOption(SubConfig conf, String optionName, String defaultValue, int sortOrder,
boolean expert, String shortDesc, String longDesc, StringArrCallback cb) {
super(conf, optionName, sortOrder, expert, shortDesc, longDesc);
- this.defaultValue = (defaultValue==null)?"":defaultValue;
this.cb = cb;
this.currentValue = (defaultValue==null)?"":defaultValue;
}
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/crypt/DHGroup.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/crypt/DHGroup.java (revision 9510)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/crypt/DHGroup.java (working copy)
@@ -33,7 +33,7 @@
}
public static CryptoKey readFromField(String field) {
- BigInteger p, q, g;
+ BigInteger p, g;
StringTokenizer str = new StringTokenizer(field, ",");
p = new NativeBigInteger(1, HexUtil.hexToBytes(str.nextToken()));
g = new NativeBigInteger(1, HexUtil.hexToBytes(str.nextToken()));
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/crypt/DSAGroup.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/crypt/DSAGroup.java (revision 9510)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/crypt/DSAGroup.java (working copy)
@@ -21,7 +21,6 @@
*/
public class DSAGroup extends CryptoKey {
private static final long serialVersionUID = -1;
- private static final boolean DEBUG = false;
private BigInteger p, q, g;
@@ -222,7 +221,7 @@
qg.start();
}
- step1: do {
+ do {
if ((cc++) % 15 == 0) System.err.print(".");
if (multithread) {
while (qg.qs.size() < 1) {
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/crypt/SHA1.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/crypt/SHA1.java (revision 9510)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/crypt/SHA1.java (working copy)
@@ -58,7 +58,6 @@
private int state[] = new int[5];
private long count;
- private boolean digestValid = false;
private byte[] digestBits;
private boolean NSA = true;
@@ -83,7 +82,6 @@
*/
public SHA1(boolean b) {
count = 0;
- digestValid = false;
NSA = b;
init();
}
@@ -250,7 +248,6 @@
state[4] = 0xC3D2E1F0;
count = 0;
digestBits = new byte[20];
- digestValid = false;
blockIndex = 0;
}
@@ -336,7 +333,6 @@
digestBits[i] = (byte)
((state[i>>2] >>> ((3-(i & 3)) << 3) ) & 0xff);
}
- digestValid = true;
}
/**
@@ -394,8 +390,6 @@
for (int i = 0; i < count; i++)
sha1.update(data);
long endSameUpdate = System.currentTimeMillis();
- byte digested[] = sha1.digest();
- long afterDigested = System.currentTimeMillis();
long updateTime = endSameUpdate - startSameUpdate;
long speed = 0;
long eachTime = 0;
@@ -414,8 +408,6 @@
for (int i = 0; i < count; i++)
sha1.update(data2[i]);
long endDifferentUpdate = System.currentTimeMillis();
- digested = sha1.digest();
- afterDigested = System.currentTimeMillis();
updateTime = endDifferentUpdate - differentStartTime;
speed = 0;
eachTime = 0;
@@ -454,7 +446,7 @@
* perfoms a self-test - spits out the test vector outputs on System.out
*/
public static void SHAselfTest(Digest s) {
- int i, j;
+ int i;
// This line may be safely deleted, its to make it easy to see
// the output of the program.
System.out.println("SHA-1 Test PROGRAM.");
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/crypt/Yarrow.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/crypt/Yarrow.java (revision 9510)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/crypt/Yarrow.java (working copy)
@@ -242,7 +242,7 @@
*/
private BlockCipher cipher_ctx;
private byte[] output_buffer, counter, allZeroString, tmp;
- private int output_count, fetch_counter, block_bytes;
+ private int output_count, fetch_counter;
private void generator_init(String cipher) {
cipher_ctx = Util.getCipherByName(cipher);
@@ -360,9 +360,8 @@
* 5.2 Entropy Accumulator
*/
private MessageDigest fast_pool, slow_pool;
- private int fast_entropy, slow_entropy, digestSize;
+ private int fast_entropy, slow_entropy;
private boolean fast_select;
- private byte[] long_buffer = new byte[8];
private Hashtable entropySeen;
private void accumulator_init(String digest) throws NoSuchAlgorithmException {
@@ -368,7 +367,6 @@
private void accumulator_init(String digest) throws NoSuchAlgorithmException {
fast_pool = MessageDigest.getInstance(digest);
slow_pool = MessageDigest.getInstance(digest);
- digestSize = fast_pool.getDigestLength()<<3;
entropySeen = new Hashtable();
}
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/crypt/ciphers/Twofish_Algorithm.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/crypt/ciphers/Twofish_Algorithm.java (revision 9510)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/crypt/ciphers/Twofish_Algorithm.java (working copy)
@@ -59,7 +59,6 @@
static final int BLOCK_SIZE = 16; // bytes in a data-block
private static final int ROUNDS = 16;
- private static final int MAX_ROUNDS = 16; // max # rounds (for allocating subkeys)
/* Subkey array indices */
private static final int INPUT_WHITEN = 0;
@@ -66,8 +65,6 @@
private static final int OUTPUT_WHITEN = INPUT_WHITEN + BLOCK_SIZE/4;
private static final int ROUND_SUBKEYS = OUTPUT_WHITEN + BLOCK_SIZE/4; // 2*(# rounds)
- private static final int TOTAL_SUBKEYS = ROUND_SUBKEYS + 2*MAX_ROUNDS;
-
private static final int SK_STEP = 0x02020202;
private static final int SK_BUMP = 0x01010101;
private static final int SK_ROTL = 9;
@@ -238,7 +235,6 @@
private static final int P_34 = 1;
/** Primitive polynomial for GF(256) */
- private static final int GF256_FDBK = 0x169;
private static final int GF256_FDBK_2 = 0x169 / 2;
private static final int GF256_FDBK_4 = 0x169 / 4;
@@ -331,7 +327,6 @@
((x & 0x01) != 0 ? GF256_FDBK_4 : 0);
}
- private static final int Mx_1( int x ) { return x; }
private static final int Mx_X( int x ) { return x ^ LFSR2(x); } // 5B
private static final int Mx_Y( int x ) { return x ^ LFSR1(x) ^ LFSR2(x); } // EF
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/io/comm/LowLevelFilter.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/io/comm/LowLevelFilter.java (revision 9517)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/io/comm/LowLevelFilter.java (working copy)
@@ -1,8 +1,5 @@
package freenet.io.comm;
-import freenet.node.PacketSequenceException;
-
-
/**
* Filter interface used by Freenet to decrypt incoming packets.
*/
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/io/comm/Peer.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/io/comm/Peer.java (revision 9517)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/io/comm/Peer.java (working copy)
@@ -34,7 +34,7 @@
public class Peer implements WritableToDataOutputStream {
public class LocalAddressException extends Exception {
-
+ private static final long serialVersionUID = -1;
}
public static final String VERSION = "$Id: Peer.java,v 1.4 2005/08/25 17:28:19 amphibian Exp $";
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/io/comm/UdpSocketManager.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/io/comm/UdpSocketManager.java (revision 9517)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/io/comm/UdpSocketManager.java (working copy)
@@ -38,7 +38,6 @@
/** _filters serves as lock for both */
private LinkedList _filters = new LinkedList();
private LinkedList _unclaimed = new LinkedList();
- private int _unclaimedPos = 0;
private int _dropProbability = 0;
private LowLevelFilter lowLevelFilter;
/** RNG for debugging, used with _dropProbability.
@@ -45,7 +44,6 @@
* NOT CRYPTO SAFE. DO NOT USE FOR THINGS THAT NEED CRYPTO SAFE RNG!
*/
private Random dropRandom;
- private boolean _active = true;
private boolean _isDone = false;
private static UdpSocketManager _usm;
private static final int MAX_UNMATCHED_FIFO_SIZE = 50000;
@@ -546,7 +544,6 @@
public void close(boolean exit) {
Logger.error(this, "Closing.", new Exception("error"));
- _active = false;
synchronized (this) {
while (!_isDone) {
try {
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/io/xfer/PacketThrottle.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/io/xfer/PacketThrottle.java (revision 9510)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/io/xfer/PacketThrottle.java (working copy)
@@ -33,7 +33,6 @@
public static final String VERSION = "$Id: PacketThrottle.java,v 1.3 2005/08/25 17:28:19 amphibian Exp $";
public static final long DEFAULT_DELAY = 200;
private static Map _throttles = new HashMap();
- private static Map _lastThrottleUse = new HashMap();
private final Peer _peer;
private long _roundTripTime = 500, _totalPackets = 0, _droppedPackets = 0;
private float _simulatedWindowSize = 2;
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/keys/SSKBlock.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/keys/SSKBlock.java (revision 9510)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/keys/SSKBlock.java (working copy)
@@ -8,7 +8,6 @@
import freenet.crypt.DSA;
import freenet.crypt.DSAPublicKey;
import freenet.crypt.DSASignature;
-import freenet.node.DSAPublicKeyDatabase;
import freenet.support.HexUtil;
/**
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/CHKInsertSender.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/CHKInsertSender.java (revision 9517)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/CHKInsertSender.java (working copy)
@@ -616,7 +616,7 @@
public void run() {
Logger.minor(this, "Starting "+this);
-outer: while(true) {
+ while(true) {
AwaitingCompletion[] waiters;
synchronized(nodesWaitingForCompletion) {
waiters = new AwaitingCompletion[nodesWaitingForCompletion.size()];
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/IPDetectorPluginManager.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/IPDetectorPluginManager.java (revision 9517)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/IPDetectorPluginManager.java (working copy)
@@ -246,8 +246,6 @@
// No locally detected IP, only one or two connections.
// Have we had more relatively recently?
int count = 0;
- long timeref = now;
- if(firstTimeMaybeFakePeers > 0) timeref = firstTimeMaybeFakePeers;
for(int i=0;i<peers.length;i++) {
PeerNode p = peers[i];
if((!p.isConnected()) || now - p.lastReceivedPacketTime() < 5*60*1000) {
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/InsertHandler.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/InsertHandler.java (revision 9517)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/InsertHandler.java (working copy)
@@ -39,7 +39,6 @@
private byte[] headers;
private BlockReceiver br;
private Thread runThread;
- private boolean sentSuccess;
PartiallyReceivedBlock prb;
@@ -144,7 +143,6 @@
if(htl == 0) {
canCommit = true;
msg = DMT.createFNPInsertReply(uid);
- sentSuccess = true;
try {
source.send(msg, null);
} catch (NotConnectedException e) {
@@ -253,7 +251,6 @@
if(status == CHKInsertSender.SUCCESS) {
msg = DMT.createFNPInsertReply(uid);
- sentSuccess = true;
try {
source.send(msg, null);
} catch (NotConnectedException e) {
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/Node.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/Node.java (revision 9517)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/Node.java (working copy)
@@ -498,8 +498,6 @@
private long myARKNumber;
/** FetcherContext for ARKs */
public final FetcherContext arkFetcherContext;
- /** ARK currently inserting? */
- private boolean arkCurrentlyInserting = false;
/** ARKFetcher's currently running, by identity */
private final HashMap arkFetchers;
/** Next time to log the PeerNode status summary */
@@ -3575,8 +3573,6 @@
* IP address.
*/
public void processDetectedIPs(DetectedIP[] list) {
- Vector fullAccess = new Vector();
- Vector fullCone = new Vector();
pluginDetectedIPs = list;
redetectAddress();
shouldInsertARK();
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/RequestHandler.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/RequestHandler.java (revision 9517)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/RequestHandler.java (working copy)
@@ -136,7 +136,6 @@
Message df = DMT.createFNPSSKDataFound(uid, rs.getHeaders(), rs.getSSKData());
source.send(df, null);
if(needsPubKey) {
- Message pk = DMT.createFNPSSKPubKey(uid, ((NodeSSK)rs.getSSKBlock().getKey()).getPubKey().asBytes());
source.send(df, null);
}
} else if(!rs.transferStarted()) {
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/RequestSender.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/RequestSender.java (revision 9517)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/RequestSender.java (working copy)
@@ -53,7 +53,6 @@
private DSAPublicKey pubKey;
private byte[] headers;
private byte[] sskData;
- private boolean sentRequest;
private SSKBlock block;
// Terminal status
@@ -142,7 +141,6 @@
next.send(req, this);
- sentRequest = true;
Message msg = null;
@@ -309,7 +307,6 @@
byte[] data = br.receive();
Logger.minor(this, "Received data");
// Received data
- CHKBlock block;
try {
verifyAndCommit(data);
} catch (KeyVerifyException e1) {
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/SSKInsertHandler.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/SSKInsertHandler.java (revision 9517)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/SSKInsertHandler.java (working copy)
@@ -8,7 +8,6 @@
import freenet.io.comm.Message;
import freenet.io.comm.MessageFilter;
import freenet.io.comm.NotConnectedException;
-import freenet.io.xfer.BlockReceiver;
import freenet.keys.NodeSSK;
import freenet.keys.SSKBlock;
import freenet.keys.SSKVerifyException;
@@ -37,11 +36,7 @@
private SSKInsertSender sender;
private byte[] data;
private byte[] headers;
- private BlockReceiver br;
- private Thread runThread;
- private boolean sentSuccess;
private boolean canCommit;
- private boolean collided;
SSKInsertHandler(Message req, long id, Node node, long startTime) {
this.req = req;
@@ -79,8 +74,6 @@
}
private void realRun() {
- runThread = Thread.currentThread();
-
// Send Accepted
Message accepted = DMT.createFNPSSKAccepted(uid, pubKey == null);
@@ -160,7 +153,6 @@
if(htl == 0) {
Message msg = DMT.createFNPInsertReply(uid);
- sentSuccess = true;
try {
source.send(msg, null);
} catch (NotConnectedException e) {
@@ -259,7 +251,6 @@
if(status == SSKInsertSender.SUCCESS) {
Message msg = DMT.createFNPInsertReply(uid);
- sentSuccess = true;
try {
source.send(msg, null);
} catch (NotConnectedException e) {
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/SSKInsertSender.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/SSKInsertSender.java (revision 9517)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/SSKInsertSender.java (working copy)
@@ -53,9 +53,6 @@
private boolean hasRecentlyCollided;
private SSKBlock block;
- /** Time at which we set status to a value other than NOT_FINISHED */
- private long setStatusTime = -1;
-
private int status = -1;
/** Still running */
static final int NOT_FINISHED = -1;
@@ -444,8 +441,6 @@
Logger.minor(this, "Finished: "+code+" on "+this, new Exception("debug"));
if(status != NOT_FINISHED)
throw new IllegalStateException("finish() called with "+code+" when was already "+status);
-
- setStatusTime = System.currentTimeMillis();
if(code == ROUTE_NOT_FOUND && !sentRequest)
code = ROUTE_REALLY_NOT_FOUND;
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/TextModeClientInterface.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/TextModeClientInterface.java (revision 9517)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/TextModeClientInterface.java (working copy)
@@ -239,7 +239,7 @@
outsb.append(new String(dataBytes));
} catch (FetchException e) {
outsb.append("Error: "+e.getMessage()+"\r\n");
- if(e.getMode() == e.SPLITFILE_ERROR && e.errorCodes != null) {
+ if(e.getMode() == FetchException.SPLITFILE_ERROR && e.errorCodes != null) {
outsb.append(e.errorCodes.toVerboseString());
}
if(e.newURI != null)
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/fcp/AddPeer.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/fcp/AddPeer.java (revision 9517)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/fcp/AddPeer.java (working copy)
@@ -11,12 +11,9 @@
import java.net.URLConnection;
import freenet.io.comm.PeerParseException;
-import freenet.keys.FreenetURI;
import freenet.node.FSParseException;
import freenet.node.Node;
import freenet.node.PeerNode;
-import freenet.support.Fields;
-import freenet.support.Logger;
import freenet.support.SimpleFieldSet;
public class AddPeer extends FCPMessage {
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/fcp/ModifyPeer.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/fcp/ModifyPeer.java (revision 9517)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/fcp/ModifyPeer.java (working copy)
@@ -1,8 +1,5 @@
package freenet.node.fcp;
-import java.io.File;
-
-import freenet.keys.FreenetURI;
import freenet.node.Node;
import freenet.node.PeerNode;
import freenet.support.Fields;
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/fcp/Peer.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/fcp/Peer.java (revision 9517)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/fcp/Peer.java (working copy)
@@ -1,8 +1,5 @@
package freenet.node.fcp;
-import java.io.File;
-
-import freenet.keys.FreenetURI;
import freenet.node.Node;
import freenet.node.PeerNode;
import freenet.support.SimpleFieldSet;
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/fcp/RemovePeer.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/fcp/RemovePeer.java (revision 9517)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/node/fcp/RemovePeer.java (working copy)
@@ -1,11 +1,7 @@
package freenet.node.fcp;
-import java.io.File;
-
-import freenet.keys.FreenetURI;
import freenet.node.Node;
import freenet.node.PeerNode;
-import freenet.support.Fields;
import freenet.support.SimpleFieldSet;
public class RemovePeer extends FCPMessage {
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/pluginmanager/PluginHandler.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/pluginmanager/PluginHandler.java (revision 9510)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/pluginmanager/PluginHandler.java (working copy)
@@ -57,10 +57,7 @@
return;
}
- if (plugin instanceof FredPlugin) {
- FredPlugin plug = ((FredPlugin)plugin);
- //if (plug.handles(FredPlugin.handleFProxy))
-
+ if (plugin instanceof FredPlugin) {
((FredPlugin)plugin).runPlugin(pr);
}
// If not FredPlugin, then the whole thing is aborted,
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/pluginmanager/PluginManager.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/pluginmanager/PluginManager.java (revision 9510)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/pluginmanager/PluginManager.java (working copy)
@@ -37,7 +37,6 @@
private HashMap toadletList;
private HashMap pluginInfo;
- private PluginManager pluginManager = null;
private PluginRespirator pluginRespirator = null;
private Node node;
SubConfig pmconfig;
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/pluginmanager/PluginRespirator.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/pluginmanager/PluginRespirator.java (revision 9510)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/pluginmanager/PluginRespirator.java (working copy)
@@ -1,7 +1,5 @@
package freenet.pluginmanager;
-import java.util.HashMap;
-
import freenet.client.HighLevelSimpleClient;
import freenet.node.Node;
import freenet.node.RequestStarter;
@@ -8,8 +6,6 @@
public class PluginRespirator {
private HighLevelSimpleClient hlsc = null;
- private PluginManager pm = null;
- private HashMap toadletList;
private Node node;
public PluginRespirator(Node node, PluginManager pm) {
@@ -15,8 +11,6 @@
public PluginRespirator(Node node, PluginManager pm) {
this.node = node;
this.hlsc = node.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS);
- this.toadletList = new HashMap();
- this.pm = pm;
}
//public HighLevelSimpleClient getHLSimpleClient() throws PluginSecurityException {
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/store/KeyCollisionException.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/store/KeyCollisionException.java (revision 9510)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/store/KeyCollisionException.java (working copy)
@@ -1,5 +1,5 @@
package freenet.store;
public class KeyCollisionException extends Exception {
-
+ private static final long serialVersionUID = -1;
}
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/support/DoublyLinkedListImpl.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/support/DoublyLinkedListImpl.java (revision 9517)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/support/DoublyLinkedListImpl.java (working copy)
@@ -69,7 +69,6 @@
// Help to detect removal after clear().
// The check in remove() is enough, strictly,
// as long as people don't add elements afterwards.
- Enumeration e = forwardElements();
DoublyLinkedList.Item pos = _headptr.next;
DoublyLinkedList.Item opos = _headptr;
while(true) {
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/support/NumberedRecentItems.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/support/NumberedRecentItems.java (revision 9517)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/support/NumberedRecentItems.java (working copy)
@@ -15,7 +15,6 @@
private NumberedItem[] items;
private int count;
private Comparator myComparator;
- private boolean wrapAround;
/**
* Create a NumberedRecentItems list.
@@ -27,7 +26,6 @@
public NumberedRecentItems(int maxSize, boolean wrap) {
items = new NumberedItem[maxSize];
count = 0;
- wrapAround = wrap;
myComparator = new NumberedItemComparator(wrap);
}
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/support/io/PersistentTempBucketFactory.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/support/io/PersistentTempBucketFactory.java (revision 9517)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/support/io/PersistentTempBucketFactory.java (working copy)
@@ -25,9 +25,6 @@
/** Directory containing persistent temporary files */
private final File dir;
- /** Temp file prefix; anything not matching this prefix will be ignored */
- private final String prefix;
-
/** Original contents of directory */
private HashSet originalFiles;
@@ -40,7 +37,6 @@
public PersistentTempBucketFactory(File dir, String prefix, RandomSource rand) throws IOException {
this.dir = dir;
this.rand = rand;
- this.prefix = prefix;
this.fg = new FilenameGenerator(rand, false, dir, prefix);
if(!dir.exists()) {
dir.mkdir();
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/support/io/TempBucketFactory.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/support/io/TempBucketFactory.java (revision 9517)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/support/io/TempBucketFactory.java (working copy)
@@ -19,7 +19,6 @@
* @author giannij
*/
public class TempBucketFactory implements BucketFactory {
- private File tmpDir = null;
private static class NOPHook implements TempBucketHook {
public void enlargeFile(long curLength, long finalLength) {
Index: /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/transport/IPAddressDetector.java
===================================================================
--- /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/transport/IPAddressDetector.java (revision 9510)
+++ /home/nextgens/src/eclipse/Freenet 0.7/src/freenet/transport/IPAddressDetector.java (working copy)
@@ -205,7 +205,6 @@
Logger.debug(
this,
"onGetAddresses found " + v.size() + " potential addresses)");
- boolean detectedInetAddress = false;
InetAddress addrDetected = null;
if (v.size() == 0) {
Logger.error(this, "No addresses found!");
@@ -229,7 +228,6 @@
addrDetected = i;
//Use the last detected valid IP as 'detected' IP
- detectedInetAddress = true;
if (preferedInetAddress != null
&& addrDetected.equals(
preferedInetAddress)) { //Prefer the specified address if it is still available to us. Do not look for more ones