diff --git a/apps/i2psnark/java/src/org/klomp/snark/ExtensionHandler.java b/apps/i2psnark/java/src/org/klomp/snark/ExtensionHandler.java index 4a134dee4..e67466f4a 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/ExtensionHandler.java +++ b/apps/i2psnark/java/src/org/klomp/snark/ExtensionHandler.java @@ -167,8 +167,6 @@ abstract class ExtensionHandler { private static final int TYPE_DATA = 1; private static final int TYPE_REJECT = 2; - private static final int CHUNK_SIZE = 16*1024; - /** * REF: BEP 9 * @since 0.8.4 @@ -253,9 +251,11 @@ abstract class ExtensionHandler { sendMessage(peer, TYPE_REQUEST, piece); } + /**** private static void sendReject(Peer peer, int piece) { sendMessage(peer, TYPE_REJECT, piece); } + ****/ /** REQUEST and REJECT are the same except for message type */ private static void sendMessage(Peer peer, int type, int piece) { diff --git a/apps/i2psnark/java/src/org/klomp/snark/Snark.java b/apps/i2psnark/java/src/org/klomp/snark/Snark.java index 7d609324d..5ae2fbe1f 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/Snark.java +++ b/apps/i2psnark/java/src/org/klomp/snark/Snark.java @@ -71,10 +71,11 @@ public class Snark //public static int debug = NOTICE; // Whether or not to ask the user for commands while sharing - private static boolean command_interpreter = true; + //private static boolean command_interpreter = true; private static final String newline = System.getProperty("line.separator"); +/**** private static final String copyright = "The Hunting of the Snark Project - Copyright (C) 2003 Mark J. Wielaard" + newline + newline @@ -90,10 +91,12 @@ public class Snark "Press return for help. Type \"quit\" and return to stop."; private static final String help = "Commands: 'info', 'list', 'quit'."; +****/ // String indicating main activity String activity = "Not started"; +/**** private static class OOMListener implements I2PThread.OOMEventListener { public void outOfMemory(OutOfMemoryError err) { try { @@ -106,6 +109,7 @@ public class Snark } } +****/ /******** No, not maintaining a command-line client @@ -597,10 +601,12 @@ public class Snark _util.disconnect(); } +/**** private static Snark parseArguments(String[] args) { return parseArguments(args, null, null); } +****/ // Accessors @@ -907,7 +913,7 @@ public class Snark } else if (args[i].equals("--no-commands")) { - command_interpreter = false; + //command_interpreter = false; i++; } //else if (args[i].equals("--eepproxy")) @@ -1077,7 +1083,7 @@ public class Snark } } - private boolean allocating = false; + //private boolean allocating = false; public void storageCreateFile(Storage storage, String name, long length) { //if (allocating) @@ -1085,7 +1091,7 @@ public class Snark //System.out.print("Creating file '" + name // + "' of length " + length + ": "); - allocating = true; + //allocating = true; } // How much storage space has been allocated @@ -1093,9 +1099,9 @@ public class Snark public void storageAllocated(Storage storage, long length) { - allocating = true; + //allocating = true; //System.out.print("."); - allocated += length; + //allocated += length; //if (allocated == meta.getTotalLength()) // System.out.println(); // We have all the disk space we need. } @@ -1105,7 +1111,7 @@ public class Snark private boolean prechecking = true; public void storageChecked(Storage storage, int num, boolean checked) { - allocating = false; + //allocating = false; if (!allChecked && !checking) { // Use the MetaInfo from the storage since our own might not diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java index d08c16c59..51f8b539a 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -2258,10 +2258,6 @@ private static class FetchAndAdd implements Runnable { } } - private String _(String s) { - return _manager.util().getString(s); - } - private String _(String s, String o) { return _manager.util().getString(s, o); } diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/RunStandalone.java b/apps/i2psnark/java/src/org/klomp/snark/web/RunStandalone.java index 2bf912410..543fc8a7e 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/RunStandalone.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/RunStandalone.java @@ -8,8 +8,6 @@ import net.i2p.util.FileUtil; import org.mortbay.jetty.Server; public class RunStandalone { - private Server _server; - static { System.setProperty("org.mortbay.http.Version.paranoid", "true"); System.setProperty("org.mortbay.xml.XmlParser.NotValidating", "true"); diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java index 83f8cc8ae..51f405388 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java @@ -43,7 +43,6 @@ class HTTPResponseOutputStream extends FilterOutputStream { private boolean _headerWritten; private final byte _buf1[]; protected boolean _gzip; - private long _dataWritten; protected long _dataExpected; protected String _contentType; @@ -76,7 +75,6 @@ class HTTPResponseOutputStream extends FilterOutputStream { public void write(byte buf[], int off, int len) throws IOException { if (_headerWritten) { out.write(buf, off, len); - _dataWritten += len; //out.flush(); return; } @@ -92,7 +90,6 @@ class HTTPResponseOutputStream extends FilterOutputStream { if (i + 1 < len) { // write out the remaining out.write(buf, off+i+1, len-i-1); - _dataWritten += len-i-1; //out.flush(); } return; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java index 32804a858..aca83e490 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java @@ -64,7 +64,6 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna // private byte[] pubkey; - private String handlerName; private String privKeyFile; // true if we are chained from a server. @@ -99,7 +98,6 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna _clientId = clientId; this.localPort = localPort; this.l = l; - this.handlerName = localPort + " #" + _clientId; _ownDest = true; // == ! shared client _context = tunnel.getContext(); _context.statManager().createRateStat("i2ptunnel.client.closeBacklog", "How many pending sockets remain when we close one due to backlog?", "I2PTunnel", new long[] { 60*1000, 10*60*1000, 60*60*1000 }); @@ -166,7 +164,6 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna _clientId = ++__clientId; this.localPort = localPort; this.l = l; - this.handlerName = handlerName + _clientId; _ownDest = ownDest; // == ! shared client diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java index 1b5ca2173..7909f3bb9 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java @@ -1014,10 +1014,8 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn * Todo: Limit line length for buffered reads, or go back to unbuffered for all */ private static class InputReader { - BufferedReader _br; InputStream _s; public InputReader(InputStream s) { - _br = null; _s = s; } String readLine(String method) throws IOException { @@ -1213,8 +1211,6 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn } } - private final static String SUPPORTED_HOSTS[] = { "i2p", "www.i2p.com", "i2p."}; - /** @param host ignored */ private static boolean isSupportedAddress(String host, String protocol) { if ((host == null) || (protocol == null)) return false; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/DCCClientManager.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/DCCClientManager.java index e0383fe17..f98f8d0ab 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/DCCClientManager.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/DCCClientManager.java @@ -48,8 +48,6 @@ public class DCCClientManager extends EventReceiver { private static final int MAX_INCOMING_PENDING = 10; private static final int MAX_INCOMING_ACTIVE = 10; - private static final long ACTIVE_EXPIRE = 60*60*1000; - public DCCClientManager(I2PSocketManager sktMgr, Logging logging, EventDispatcher dispatch, I2PTunnel tunnel) { sockMgr = sktMgr; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/I2PTunnelDCCServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/I2PTunnelDCCServer.java index 07be3a57b..8b4a3e295 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/I2PTunnelDCCServer.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/I2PTunnelDCCServer.java @@ -49,9 +49,6 @@ public class I2PTunnelDCCServer extends I2PTunnelServer { private final ConcurrentHashMap _resume; private final List _sockList; - // list of client tunnels? - private static long _id; - /** just to keep super() happy */ private static final InetAddress DUMMY; static { @@ -67,8 +64,6 @@ public class I2PTunnelDCCServer extends I2PTunnelServer { private static final int MAX_OUTGOING_PENDING = 20; private static final int MAX_OUTGOING_ACTIVE = 20; private static final long OUTBOUND_EXPIRE = 30*60*1000; - private static final long ACTIVE_EXPIRE = 60*60*1000; - /** * There's no support for unsolicited incoming I2P connections, * so there's no server host or port parameters. @@ -233,17 +228,6 @@ public class I2PTunnelDCCServer extends I2PTunnelServer { return -1; } - private InetAddress getListenHost(Logging l) { - try { - return InetAddress.getByName(getTunnel().listenHost); - } catch (UnknownHostException uhe) { - l.log("Could not find listen host to bind to [" + getTunnel().host + "]"); - _log.error("Error finding host to bind", uhe); - notifyEvent("openBaseClientResult", "error"); - return null; - } - } - private void expireOutbound() { for (Iterator iter = _outgoing.values().iterator(); iter.hasNext(); ) { LocalAddress a = iter.next(); diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/streamr/Subscriber.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/streamr/Subscriber.java index 377292dde..f93d87404 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/streamr/Subscriber.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/streamr/Subscriber.java @@ -62,9 +62,6 @@ public class Subscriber implements Sink { - private I2PSession sess; - private Source listener; private Set subscriptions; private MultiSource multi; - private Source server; } diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udpTunnel/I2PTunnelUDPClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udpTunnel/I2PTunnelUDPClientBase.java index de5fd597f..442c1533f 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udpTunnel/I2PTunnelUDPClientBase.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udpTunnel/I2PTunnelUDPClientBase.java @@ -53,24 +53,9 @@ import net.i2p.util.EventDispatcher; protected Destination dest = null; - private boolean listenerReady = false; - - private ServerSocket ss; - private final Object startLock = new Object(); - private boolean startRunning = false; - - private byte[] pubkey; - - private String handlerName; - private Object conLock = new Object(); - /** How many connections will we allow to be in the process of being built at once? */ - private int _numConnectionBuilders; - /** How long will we allow sockets to sit in the _waitingSockets map before killing them? */ - private int _maxWaitTime; - private I2PSession _session; private Source _i2pSource; private Sink _i2pSink; @@ -141,7 +126,6 @@ import net.i2p.util.EventDispatcher; throw new RuntimeException("failed to connect session", exc); } start(); - startRunning = true; startLock.notify(); } open = true; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udpTunnel/I2PTunnelUDPServerBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udpTunnel/I2PTunnelUDPServerBase.java index a301f5d6b..dc17522b8 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udpTunnel/I2PTunnelUDPServerBase.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udpTunnel/I2PTunnelUDPServerBase.java @@ -51,8 +51,6 @@ public class I2PTunnelUDPServerBase extends I2PTunnelTask implements Source, Sin private final Object lock = new Object(); protected Object slock = new Object(); - private static volatile long __serverId = 0; - protected Logging l; private static final long DEFAULT_READ_TIMEOUT = -1; // 3*60*1000; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java index 647a7bd85..75991e393 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java @@ -76,7 +76,6 @@ public class IndexBean { private String _profile; private boolean _startOnLoad; private boolean _sharedClient; - private boolean _privKeyGenerate; private boolean _removeConfirmed; private final Set _booleanOptions; private final Map _otherOptions; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java index 3561def58..5541d0eba 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java @@ -21,10 +21,8 @@ import net.i2p.router.web.ConfigServiceHandler; */ public class ConfigNetHandler extends FormHandler { private String _hostname; - private boolean _reseedRequested; private boolean _saveRequested; private boolean _recheckReachabilityRequested; - private boolean _timeSyncEnabled; private boolean _requireIntroductions; private boolean _hiddenMode; private boolean _dynamicKeys; @@ -45,8 +43,6 @@ public class ConfigNetHandler extends FormHandler { private String _outboundRate; private String _outboundBurstRate; private String _outboundBurst; - private String _reseedFrom; - private boolean _enableLoadTesting; private String _sharePct; private boolean _ratesOnly; private boolean _udpDisabled; @@ -65,11 +61,11 @@ public class ConfigNetHandler extends FormHandler { } public void setSave(String moo) { _saveRequested = true; } - public void setEnabletimesync(String moo) { _timeSyncEnabled = true; } + public void setEnabletimesync(String moo) { } public void setRecheckReachability(String moo) { _recheckReachabilityRequested = true; } public void setRequireIntroductions(String moo) { _requireIntroductions = true; } public void setDynamicKeys(String moo) { _dynamicKeys = true; } - public void setEnableloadtesting(String moo) { _enableLoadTesting = true; } + public void setEnableloadtesting(String moo) { } public void setUdpAutoIP(String mode) { _udpAutoIP = mode; _hiddenMode = "hidden".equals(mode); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java index b08fb3b01..d33d4e44f 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java @@ -21,8 +21,6 @@ public class ConfigNetHelper extends HelperBase { public final static String PROP_I2NP_NTCP_AUTO_PORT = "i2np.ntcp.autoport"; public final static String PROP_I2NP_NTCP_AUTO_IP = "i2np.ntcp.autoip"; private final static String CHECKED = " checked=\"checked\" "; - private final static String DISABLED = " disabled=\"disabled\" "; - public String getUdphostname() { return _context.getProperty(UDPTransport.PROP_EXTERNAL_HOST, ""); } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java index 8ef108817..152764831 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java @@ -345,22 +345,6 @@ class ProfileOrganizerRenderer { return Messages.getString(s, _context); } - /** - * translate a string with a parameter - * This is a lot more expensive than _(s), so use sparingly. - * - * @param s string to be translated containing {0} - * The {0} will be replaced by the parameter. - * Single quotes must be doubled, i.e. ' -> '' in the string. - * @param o parameter, not translated. - * To tranlslate parameter also, use _("foo {0} bar", _("baz")) - * Do not double the single quotes in the parameter. - * Use autoboxing to call with ints, longs, floats, etc. - */ - private String _(String s, Object o) { - return Messages.getString(s, o, _context); - } - /** translate (ngettext) @since 0.8.5 */ public String ngettext(String s, String p, int n) { return Messages.getString(n, s, p, _context); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ReseedHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ReseedHandler.java index 9d3fce6c4..acf7494a7 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ReseedHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ReseedHandler.java @@ -7,8 +7,6 @@ import net.i2p.router.networkdb.reseed.Reseeder; * Handler to deal with reseed requests. */ public class ReseedHandler extends HelperBase { - private static Reseeder _reseedRunner; - public ReseedHandler() { this(ContextHelper.getContext(null)); } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java index ba36d928f..f058a6a38 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java @@ -67,7 +67,6 @@ public class RouterConsoleRunner { private String _sslListenHost; private String _webAppsDir; - private static final String PROP_WEBAPP_CONFIG_FILENAME = "router.webappsConfigFile"; private static final String DEFAULT_WEBAPP_CONFIG_FILENAME = "webapps.config"; private static final DigestAuthenticator authenticator = new DigestAuthenticator(); public static final String ROUTERCONSOLE = "routerconsole"; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java index 5e22c1edc..a61e543cc 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java @@ -385,9 +385,4 @@ public class SummaryBarRenderer { private String _(String s) { return Messages.getString(s, _context); } - - /** translate a string with a parameter */ - private String _(String s, Object o) { - return Messages.getString(s, o, _context); - } } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java index 96ad1a6bf..f971e66cb 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java @@ -46,7 +46,6 @@ class SummaryListener implements RateSummaryListener { private String _eventName; private RrdDb _db; private Sample _sample; - private RrdMemoryBackendFactory _factory; private SummaryRenderer _renderer; private int _rows; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/WrapperListener.java b/apps/routerconsole/java/src/net/i2p/router/web/WrapperListener.java index a2bfd4dbf..8562398a7 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/WrapperListener.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/WrapperListener.java @@ -18,7 +18,6 @@ import org.tanukisoftware.wrapper.event.WrapperEventListener; * @since 0.8.13 */ class WrapperListener { - private final RouterContext _context; private final WrapperEventListener _listener; private static final String PROP_GRACEFUL_HUP = "router.gracefulHUP"; @@ -28,7 +27,6 @@ class WrapperListener { * Registers with the wrapper in the constructor. */ public WrapperListener(RouterContext ctx) { - _context = ctx; _listener = new SignalHandler(ctx); long mask = WrapperEventListener.EVENT_FLAG_CONTROL; WrapperManager.addWrapperEventListener(_listener, mask); diff --git a/apps/sam/java/src/net/i2p/sam/client/SAMStreamSink.java b/apps/sam/java/src/net/i2p/sam/client/SAMStreamSink.java index 89d7bf7de..83dcf510f 100644 --- a/apps/sam/java/src/net/i2p/sam/client/SAMStreamSink.java +++ b/apps/sam/java/src/net/i2p/sam/client/SAMStreamSink.java @@ -185,7 +185,6 @@ public class SAMStreamSink { private String _remoteDestination; private boolean _closed; private long _started; - private long _totalReceived; private long _lastReceivedOn; private OutputStream _out; @@ -222,7 +221,6 @@ public class SAMStreamSink { } public void received(byte data[], int offset, int len) { if (_closed) return; - _totalReceived += len; try { _out.write(data, offset, len); } catch (IOException ioe) { diff --git a/apps/streaming/java/src/net/i2p/client/streaming/Connection.java b/apps/streaming/java/src/net/i2p/client/streaming/Connection.java index 6ce781840..8db219c60 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/Connection.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/Connection.java @@ -1069,7 +1069,6 @@ class Connection { * fired to reschedule event notification */ class ConEvent implements SimpleTimer.TimedEvent { - private Exception _addedBy; // unused? public ConEvent() { //_addedBy = new Exception("added by"); } diff --git a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionManager.java b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionManager.java index ee757aeaa..09ba238c1 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionManager.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionManager.java @@ -36,7 +36,6 @@ class ConnectionManager { private final ConcurrentHashMap _connectionByInboundId; /** Ping ID (Long) to PingRequest */ private final Map _pendingPings; - private boolean _allowIncoming; private boolean _throttlersInitialized; private int _maxConcurrentStreams; private final ConnectionOptions _defaultOptions; @@ -494,13 +493,9 @@ class ConnectionManager { private static class PingRequest { private boolean _ponged; - private final Destination _peer; - private final PacketLocal _packet; private final PingNotifier _notifier; public PingRequest(Destination peer, PacketLocal packet, PingNotifier notifier) { - _peer = peer; - _packet = packet; _notifier = notifier; } diff --git a/apps/streaming/java/src/net/i2p/client/streaming/I2PSocketFull.java b/apps/streaming/java/src/net/i2p/client/streaming/I2PSocketFull.java index 5a490ce84..6f1caeaf0 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/I2PSocketFull.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/I2PSocketFull.java @@ -14,7 +14,6 @@ import net.i2p.data.Destination; */ class I2PSocketFull implements I2PSocket { private Connection _connection; - private I2PSocket.SocketErrorListener _listener; private Destination _remotePeer; private Destination _localPeer; @@ -118,7 +117,6 @@ class I2PSocketFull implements I2PSocket { } public void setSocketErrorListener(I2PSocket.SocketErrorListener lsnr) { - _listener = lsnr; } public boolean isClosed() { @@ -142,8 +140,7 @@ class I2PSocketFull implements I2PSocket { * @since 0.8.13 */ void destroy2() { - _connection = null; - _listener = null; + _connection = null; } /** diff --git a/apps/streaming/java/src/net/i2p/client/streaming/MessageInputStream.java b/apps/streaming/java/src/net/i2p/client/streaming/MessageInputStream.java index fbb723728..3dc510fd5 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/MessageInputStream.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/MessageInputStream.java @@ -19,7 +19,6 @@ import net.i2p.util.Log; * */ class MessageInputStream extends InputStream { - private final I2PAppContext _context; private final Log _log; /** * List of ByteArray objects of data ready to be read, @@ -57,7 +56,6 @@ class MessageInputStream extends InputStream { private final Object _dataLock; public MessageInputStream(I2PAppContext ctx) { - _context = ctx; _log = ctx.logManager().getLog(MessageInputStream.class); _readyDataBlocks = new ArrayList(4); _highestReadyBlockId = -1; diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java index 1a3801248..b7b7c8669 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java +++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java @@ -74,10 +74,6 @@ public class WebMail extends HttpServlet private static final long serialVersionUID = 1L; - private static final int DEFAULT_PAGESIZE = 10; - - private static final int BUFSIZE = 4096; - private static final String DEFAULT_HOST = "127.0.0.1"; private static final int DEFAULT_POP3PORT = 7660; private static final int DEFAULT_SMTPPORT = 7659; @@ -142,8 +138,6 @@ public class WebMail extends HttpServlet private static final String LIST = "list"; private static final String PREV = "prev"; private static final String NEXT = "next"; - private static final String NEXTUNREAD = "nextunread"; - private static final String SORT_ID = "sort_id"; private static final String SORT_SENDER = "sort_sender"; private static final String SORT_SUBJECT = "sort_subject"; @@ -162,8 +156,6 @@ public class WebMail extends HttpServlet private static final String CONFIG_PORTS_POP3 = "ports.pop3"; private static final String CONFIG_PORTS_SMTP = "ports.smtp"; - private static final String CONFIG_FAST_START = "fast.start"; - private static final String CONFIG_SENDER_FIXED = "sender.fixed"; private static final String CONFIG_SENDER_DOMAIN = "sender.domain"; @@ -174,8 +166,6 @@ public class WebMail extends HttpServlet private static final String spacer = "   "; private static final String thSpacer = " \n"; - private static final String thTags = "\n\n"; - /** * sorts Mail objects by id field * @@ -371,16 +361,6 @@ public class WebMail extends HttpServlet { return "" + label + " \"^\"\"v\""; } - /** - * prints debug message as a html comment - * - * @param out - * @param msg - */ - private static void debug( PrintWriter out, String msg ) - { - out.println( "" ); - } /** * check, if a given button "was pressed" in the received http request * diff --git a/apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java b/apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java index 4434cff5e..dfbe90d20 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java +++ b/apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java @@ -402,37 +402,6 @@ public class POP3MailBox { } } - /** - * send command to pop3 server (and expect single line answer), if any - * exception occurs, reconnect and try again - * - * @param cmd command to send - * @return true if command was successful (+OK) - */ - private boolean sendCmd1(String cmd) { - boolean result = false; - - synchronized (synchronizer) { - - if (!isConnected()) - connect(); - - try { - result = sendCmd1a(cmd); - } - catch (Exception e) { - Debug.debug(Debug.ERROR, "Exception: " + e.getCause()); - Debug.debug(Debug.ERROR, "trying to reconnect" ); - connect(); - try { - result = sendCmd1a(cmd); - } catch (IOException e2) { - Debug.debug(Debug.ERROR, "reconnect failed: " + e2.getCause()); - } - } - } - return result; - } /** * send command to pop3 server (and expect single line answer) * diff --git a/core/java/src/net/i2p/client/I2PSessionImpl2.java b/core/java/src/net/i2p/client/I2PSessionImpl2.java index e2afae6ea..fd48bcc06 100644 --- a/core/java/src/net/i2p/client/I2PSessionImpl2.java +++ b/core/java/src/net/i2p/client/I2PSessionImpl2.java @@ -225,8 +225,6 @@ class I2PSessionImpl2 extends I2PSessionImpl { return compressed; } - private static final int NUM_TAGS = 50; - /** * @param keyUsed unused - no end-to-end crypto * @param tagsSent unused - no end-to-end crypto diff --git a/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java b/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java index 6bacb95f2..cf4dfb604 100644 --- a/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java +++ b/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java @@ -102,10 +102,7 @@ class RequestLeaseSetMessageHandler extends HandlerImpl { private final PrivateKey _privKey; private final SigningPublicKey _signingPubKey; private final SigningPrivateKey _signingPrivKey; - private final Destination _dest; - public LeaseInfo(Destination dest) { - _dest = dest; Object encKeys[] = KeyGenerator.getInstance().generatePKIKeypair(); Object signKeys[] = KeyGenerator.getInstance().generateSigningKeypair(); _pubKey = (PublicKey) encKeys[0]; diff --git a/core/java/src/net/i2p/client/naming/BlockfileNamingService.java b/core/java/src/net/i2p/client/naming/BlockfileNamingService.java index 6eccd62d6..04af6d646 100644 --- a/core/java/src/net/i2p/client/naming/BlockfileNamingService.java +++ b/core/java/src/net/i2p/client/naming/BlockfileNamingService.java @@ -999,6 +999,7 @@ public class BlockfileNamingService extends DummyNamingService { _invalid.clear(); } + /**** private void dumpDB() { synchronized(_bf) { if (_isClosed) @@ -1028,6 +1029,7 @@ public class BlockfileNamingService extends DummyNamingService { deleteInvalid(); } } + ****/ private void close() { synchronized(_bf) { diff --git a/core/java/src/net/i2p/crypto/CryptixRijndael_Algorithm.java b/core/java/src/net/i2p/crypto/CryptixRijndael_Algorithm.java index af8815d43..02a11431f 100644 --- a/core/java/src/net/i2p/crypto/CryptixRijndael_Algorithm.java +++ b/core/java/src/net/i2p/crypto/CryptixRijndael_Algorithm.java @@ -828,6 +828,7 @@ public final class CryptixRijndael_Algorithm // implicit no-argument constructor * * @return true if the arrays have identical contents */ + /**** private static final boolean areEqual(byte[] a, byte[] b) { int aLength = a.length; if (aLength != b.length) return false; @@ -835,15 +836,18 @@ public final class CryptixRijndael_Algorithm // implicit no-argument constructor if (a[i] != b[i]) return false; return true; } + ****/ /** * Returns a string of 2 hexadecimal digits (most significant * digit first) corresponding to the lowest 8 bits of n. */ + /**** private static final String byteToString(int n) { char[] buf = { _HEX_DIGITS[(n >>> 4) & 0x0F], _HEX_DIGITS[n & 0x0F]}; return new String(buf); } + ****/ /** * Returns a string of 8 hexadecimal digits (most significant diff --git a/core/java/src/net/i2p/crypto/DSAEngine.java b/core/java/src/net/i2p/crypto/DSAEngine.java index 31af8c64a..e26031fd7 100644 --- a/core/java/src/net/i2p/crypto/DSAEngine.java +++ b/core/java/src/net/i2p/crypto/DSAEngine.java @@ -453,7 +453,7 @@ public class DSAEngine { return rv; } - private static final int RUNS = 1000; + //private static final int RUNS = 1000; /** * Run consistency and speed tests with both TheCrypto and java.security libraries. diff --git a/core/java/src/net/i2p/crypto/SHA1.java b/core/java/src/net/i2p/crypto/SHA1.java index 8557f1a07..7ea68de56 100644 --- a/core/java/src/net/i2p/crypto/SHA1.java +++ b/core/java/src/net/i2p/crypto/SHA1.java @@ -737,7 +737,7 @@ public final class SHA1 extends MessageDigest implements Cloneable { hC += /* c= */ (c << 30) | (c >>> 2); } - private static final int RUNS = 100000; + //private static final int RUNS = 100000; /** * Test the GNU and the JVM's implementations for speed diff --git a/core/java/src/net/i2p/crypto/SHA256Generator.java b/core/java/src/net/i2p/crypto/SHA256Generator.java index dfd77b688..d46488fe9 100644 --- a/core/java/src/net/i2p/crypto/SHA256Generator.java +++ b/core/java/src/net/i2p/crypto/SHA256Generator.java @@ -132,7 +132,7 @@ public final class SHA256Generator { } } - private static final int RUNS = 100000; + //private static final int RUNS = 100000; /** * Test the GNU and the JVM's implementations for speed diff --git a/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java b/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java index 4fb29a901..e31adcada 100644 --- a/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java +++ b/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java @@ -1035,13 +1035,6 @@ public class TransientSessionKeyManager extends SessionKeyManager { return _key; } - /** - * Caller must synch. - */ - public boolean contains(SessionTag tag) { - return _sessionTags.contains(tag); - } - /** * Caller must synch. */ diff --git a/core/java/src/net/i2p/data/Base32.java b/core/java/src/net/i2p/data/Base32.java index 1a510a04c..75671c31d 100644 --- a/core/java/src/net/i2p/data/Base32.java +++ b/core/java/src/net/i2p/data/Base32.java @@ -56,8 +56,6 @@ public class Base32 { }; private final static byte BAD_ENCODING = -9; // Indicates error in encoding - private final static byte EQUALS_SIGN_ENC = -1; // Indicates equals sign in encoding - /** Defeats instantiation. */ private Base32() { // nop } diff --git a/core/java/src/net/i2p/data/Base64.java b/core/java/src/net/i2p/data/Base64.java index ef7b1c618..2731b6ce9 100644 --- a/core/java/src/net/i2p/data/Base64.java +++ b/core/java/src/net/i2p/data/Base64.java @@ -93,9 +93,6 @@ public class Base64 { /** The equals sign (=) as a byte. */ private final static byte EQUALS_SIGN = (byte) '='; - /** The new line character (\n) as a byte. */ - private final static byte NEW_LINE = (byte) '\n'; - /** The 64 valid Base64 values. */ private final static byte[] ALPHABET = { (byte) 'A', (byte) 'B', (byte) 'C', (byte) 'D', (byte) 'E', (byte) 'F', (byte) 'G', (byte) 'H', (byte) 'I', (byte) 'J', (byte) 'K', (byte) 'L', @@ -159,7 +156,6 @@ public class Base64 { -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9 // Decimal 244 - 255 */ }; - private final static byte BAD_ENCODING = -9; // Indicates error in encoding private final static byte WHITE_SPACE_ENC = -5; // Indicates white space in encoding private final static byte EQUALS_SIGN_ENC = -1; // Indicates equals sign in encoding @@ -557,21 +553,7 @@ public class Base64 { } // end encodeString ******/ - /** - * Encodes a string in Base64 notation with line breaks - * after every 75 Base64 characters. - * - * @param s the string to encode - * @param breakLines Break lines at 80 characters or less. - * @return the encoded string - * @since 1.3 - */ - private static String encodeString(String s, boolean breakLines) { - byte src[] = new byte[s.length()]; - for (int i = 0; i < src.length; i++) - src[i] = (byte)(s.charAt(i) & 0xFF); - return encodeBytes(src, breakLines); - } // end encodeString + /* ******** D E C O D I N G M E T H O D S ******** */ diff --git a/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java b/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java index e459d65da..6bf9859b4 100644 --- a/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java +++ b/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java @@ -159,9 +159,6 @@ public class RequestLeaseSetMessage extends I2CPMessageImpl { private Hash _router; private TunnelId _tunnelId; - public TunnelEndpoint() { - } - public TunnelEndpoint(Hash router, TunnelId id) { _router = router; _tunnelId = id; @@ -171,16 +168,8 @@ public class RequestLeaseSetMessage extends I2CPMessageImpl { return _router; } - public void setRouter(Hash router) { - _router = router; - } - public TunnelId getTunnelId() { return _tunnelId; } - - public void setTunnelId(TunnelId tunnelId) { - _tunnelId = tunnelId; - } } } diff --git a/core/java/src/net/i2p/util/EepPost.java b/core/java/src/net/i2p/util/EepPost.java index c139bf69c..c3fe98b40 100644 --- a/core/java/src/net/i2p/util/EepPost.java +++ b/core/java/src/net/i2p/util/EepPost.java @@ -19,7 +19,6 @@ import net.i2p.I2PAppContext; * @deprecated unused */ public class EepPost { - private I2PAppContext _context; private Log _log; private static final String CRLF = "\r\n"; @@ -27,7 +26,6 @@ public class EepPost { this(I2PAppContext.getGlobalContext()); } public EepPost(I2PAppContext ctx) { - _context = ctx; _log = ctx.logManager().getLog(EepPost.class); } diff --git a/core/java/src/net/i2p/util/Log.java b/core/java/src/net/i2p/util/Log.java index 538e3986b..59dd2b38b 100644 --- a/core/java/src/net/i2p/util/Log.java +++ b/core/java/src/net/i2p/util/Log.java @@ -202,13 +202,9 @@ public class Log { } private static final class LogScope { - private final String _scopeName; - private final Class _scopeClass; private final String _scopeCache; public LogScope(String name, Class cls) { - _scopeName = name; - _scopeClass = cls; _scopeCache = getScope(name, cls); } diff --git a/core/java/src/net/i2p/util/LogWriter.java b/core/java/src/net/i2p/util/LogWriter.java index a0c9654fd..5cde9ce33 100644 --- a/core/java/src/net/i2p/util/LogWriter.java +++ b/core/java/src/net/i2p/util/LogWriter.java @@ -31,7 +31,6 @@ class LogWriter implements Runnable { // volatile as it changes on log file rotation private volatile Writer _currentOut; private int _rotationNum = -1; - private String _logFilenamePattern; private File _currentFile; private final LogManager _manager; diff --git a/core/java/src/net/i2p/util/ResettableGZIPInputStream.java b/core/java/src/net/i2p/util/ResettableGZIPInputStream.java index 81c2ecd1c..dee068202 100644 --- a/core/java/src/net/i2p/util/ResettableGZIPInputStream.java +++ b/core/java/src/net/i2p/util/ResettableGZIPInputStream.java @@ -20,12 +20,10 @@ import net.i2p.data.DataHelper; */ public class ResettableGZIPInputStream extends InflaterInputStream { private static final int FOOTER_SIZE = 8; // CRC32 + ISIZE - private static final boolean DEBUG = false; /** See below for why this is necessary */ private final ExtraByteInputStream _extraByteInputStream; /** keep a typesafe copy of this */ private final LookaheadInputStream _lookaheadStream; - private final InputStream _sequenceStream = null; private final CRC32 _crc32; private final byte _buf1[] = new byte[1]; private boolean _complete; @@ -179,8 +177,6 @@ public class ResettableGZIPInputStream extends InflaterInputStream { return "Read: " + getTotalRead() + " expanded: " + getTotalExpanded() + " remaining: " + getRemaining() + " finished: " + getFinished(); } - private long getCurrentCRCVal() { return _crc32.getValue(); } - private void verifyFooter() throws IOException { byte footer[] = _lookaheadStream.getFooter(); diff --git a/router/java/src/net/i2p/router/JobQueueRunner.java b/router/java/src/net/i2p/router/JobQueueRunner.java index 0d3b0af3b..b6c2ccc88 100644 --- a/router/java/src/net/i2p/router/JobQueueRunner.java +++ b/router/java/src/net/i2p/router/JobQueueRunner.java @@ -8,7 +8,6 @@ class JobQueueRunner implements Runnable { private final RouterContext _context; private boolean _keepRunning; private final int _id; - private long _numJobs; private Job _currentJob; private Job _lastJob; private long _lastBegin; diff --git a/router/java/src/net/i2p/router/MessageHistory.java b/router/java/src/net/i2p/router/MessageHistory.java index 4a745e0c5..7931514da 100644 --- a/router/java/src/net/i2p/router/MessageHistory.java +++ b/router/java/src/net/i2p/router/MessageHistory.java @@ -73,7 +73,6 @@ public class MessageHistory { _doLog = false; } - private void setDoLog(boolean log) { _doLog = log; } public boolean getDoLog() { return _doLog; } /** @deprecated unused */ diff --git a/router/java/src/net/i2p/router/MessageStateMonitor.java b/router/java/src/net/i2p/router/MessageStateMonitor.java index 80ff6f8af..1b0a1d8fa 100644 --- a/router/java/src/net/i2p/router/MessageStateMonitor.java +++ b/router/java/src/net/i2p/router/MessageStateMonitor.java @@ -9,19 +9,15 @@ import net.i2p.util.Log; */ public class MessageStateMonitor { private Log _log; - private RouterContext _context; private volatile int _inboundLiveCount; private volatile int _inboundReadCount; - private volatile int _inboundFinalizedCount; private volatile int _outboundLiveCount; private volatile int _outboundDiscardedCount; public MessageStateMonitor(RouterContext context) { - _context = context; _log = context.logManager().getLog(MessageStateMonitor.class); _inboundLiveCount = 0; _inboundReadCount = 0; - _inboundFinalizedCount = 0; _outboundLiveCount = 0; _outboundDiscardedCount = 0; } @@ -37,7 +33,6 @@ public class MessageStateMonitor { } public void inboundMessageFinalized() { _inboundReadCount--; - _inboundFinalizedCount++; logStatus("inboundFinalized "); } diff --git a/router/java/src/net/i2p/router/RouterThrottleImpl.java b/router/java/src/net/i2p/router/RouterThrottleImpl.java index 63bd4b34a..3c5d09353 100644 --- a/router/java/src/net/i2p/router/RouterThrottleImpl.java +++ b/router/java/src/net/i2p/router/RouterThrottleImpl.java @@ -24,17 +24,8 @@ class RouterThrottleImpl implements RouterThrottle { * */ private static int JOB_LAG_LIMIT = 2*1000; - /** - * Arbitrary hard limit - if we throttle our network connection this many - * times in the previous 2 minute period, don't accept requests to - * participate in tunnels. - * - */ - private static int THROTTLE_EVENT_LIMIT = 30; - private static final String PROP_MAX_TUNNELS = "router.maxParticipatingTunnels"; private static final int DEFAULT_MAX_TUNNELS = 5000; - private static final String PROP_DEFAULT_KBPS_THROTTLE = "router.defaultKBpsThrottle"; private static final String PROP_MAX_PROCESSINGTIME = "router.defaultProcessingTimeThrottle"; /** diff --git a/router/java/src/net/i2p/router/client/ClientManager.java b/router/java/src/net/i2p/router/client/ClientManager.java index d447f771a..681527ae3 100644 --- a/router/java/src/net/i2p/router/client/ClientManager.java +++ b/router/java/src/net/i2p/router/client/ClientManager.java @@ -52,9 +52,6 @@ class ClientManager { /** SSL interface (only) @since 0.8.3 */ private static final String PROP_ENABLE_SSL = "i2cp.SSL"; - /** ms to wait before rechecking for inbound messages to deliver to clients */ - private final static int INBOUND_POLL_INTERVAL = 300; - public ClientManager(RouterContext context, int port) { _ctx = context; _log = context.logManager().getLog(ClientManager.class); diff --git a/router/java/src/net/i2p/router/client/MessageReceivedJob.java b/router/java/src/net/i2p/router/client/MessageReceivedJob.java index 82744659a..88b1ca10b 100644 --- a/router/java/src/net/i2p/router/client/MessageReceivedJob.java +++ b/router/java/src/net/i2p/router/client/MessageReceivedJob.java @@ -24,15 +24,11 @@ import net.i2p.util.Log; class MessageReceivedJob extends JobImpl { private Log _log; private ClientConnectionRunner _runner; - private Destination _to; - private Destination _from; private Payload _payload; public MessageReceivedJob(RouterContext ctx, ClientConnectionRunner runner, Destination toDest, Destination fromDest, Payload payload) { super(ctx); _log = ctx.logManager().getLog(MessageReceivedJob.class); _runner = runner; - _to = toDest; - _from = fromDest; _payload = payload; } diff --git a/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java b/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java index 1ac0b93d0..1abb54c88 100644 --- a/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java +++ b/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java @@ -29,20 +29,12 @@ import net.i2p.util.Log; class RequestLeaseSetJob extends JobImpl { private final Log _log; private final ClientConnectionRunner _runner; - private final LeaseSet _ls; - private final long _expiration; - private final Job _onCreate; - private final Job _onFail; private final LeaseRequestState _requestState; public RequestLeaseSetJob(RouterContext ctx, ClientConnectionRunner runner, LeaseSet set, long expiration, Job onCreate, Job onFail, LeaseRequestState state) { super(ctx); _log = ctx.logManager().getLog(RequestLeaseSetJob.class); _runner = runner; - _ls = set; - _expiration = expiration; - _onCreate = onCreate; - _onFail = onFail; _requestState = state; ctx.statManager().createRateStat("client.requestLeaseSetSuccess", "How frequently the router requests successfully a new leaseSet?", "ClientMessages", new long[] { 60*60*1000 }); ctx.statManager().createRateStat("client.requestLeaseSetTimeout", "How frequently the router requests a new leaseSet but gets no reply?", "ClientMessages", new long[] { 60*60*1000 }); diff --git a/router/java/src/net/i2p/router/message/GarlicMessageReceiver.java b/router/java/src/net/i2p/router/message/GarlicMessageReceiver.java index 2ebe042b9..0f902c01e 100644 --- a/router/java/src/net/i2p/router/message/GarlicMessageReceiver.java +++ b/router/java/src/net/i2p/router/message/GarlicMessageReceiver.java @@ -32,8 +32,6 @@ public class GarlicMessageReceiver { private final Hash _clientDestination; private final GarlicMessageParser _parser; - private final static int FORWARD_PRIORITY = 50; - public interface CloveReceiver { public void handleClove(DeliveryInstructions instructions, I2NPMessage data); } diff --git a/router/java/src/net/i2p/router/message/HandleGarlicMessageJob.java b/router/java/src/net/i2p/router/message/HandleGarlicMessageJob.java index fb0aaeea5..21788d760 100644 --- a/router/java/src/net/i2p/router/message/HandleGarlicMessageJob.java +++ b/router/java/src/net/i2p/router/message/HandleGarlicMessageJob.java @@ -34,8 +34,6 @@ class HandleGarlicMessageJob extends JobImpl implements GarlicMessageReceiver.Cl //private MessageHandler _handler; //private GarlicMessageParser _parser; - private final static int FORWARD_PRIORITY = 50; - /** * @param from ignored * @param fromHash ignored diff --git a/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java b/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java index edd57d3c7..4896e57d4 100644 --- a/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java +++ b/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java @@ -77,9 +77,6 @@ public class OutboundClientMessageOneShotJob extends JobImpl { private final static long OVERALL_TIMEOUT_MS_DEFAULT = 60*1000; private final static long OVERALL_TIMEOUT_MS_MIN = 8*1000; - /** priority of messages, that might get honored some day... */ - private final static int SEND_PRIORITY = 500; - /** * If the client's config specifies shouldBundleReplyInfo=true, messages sent from * that client to any peers will probabalistically include the sending destination's diff --git a/router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java b/router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java index 354b610f4..00dd07f24 100644 --- a/router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java +++ b/router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java @@ -37,8 +37,6 @@ import net.i2p.util.Log; public class HandleDatabaseLookupMessageJob extends JobImpl { private Log _log; private DatabaseLookupMessage _message; - private RouterIdentity _from; - private Hash _fromHash; private final static int MAX_ROUTERS_RETURNED = 3; private final static int CLOSENESS_THRESHOLD = 8; // FNDF.MAX_TO_FLOOD + 1 private final static int REPLY_TIMEOUT = 60*1000; @@ -54,8 +52,6 @@ public class HandleDatabaseLookupMessageJob extends JobImpl { super(ctx); _log = getContext().logManager().getLog(HandleDatabaseLookupMessageJob.class); _message = receivedMessage; - _from = from; - _fromHash = fromHash; } protected boolean answerAllQueries() { return false; } diff --git a/router/java/src/net/i2p/router/networkdb/HandleDatabaseStoreMessageJob.java b/router/java/src/net/i2p/router/networkdb/HandleDatabaseStoreMessageJob.java index 183d1da04..ce4d07801 100644 --- a/router/java/src/net/i2p/router/networkdb/HandleDatabaseStoreMessageJob.java +++ b/router/java/src/net/i2p/router/networkdb/HandleDatabaseStoreMessageJob.java @@ -32,9 +32,6 @@ public class HandleDatabaseStoreMessageJob extends JobImpl { private RouterIdentity _from; private Hash _fromHash; - private static final int ACK_TIMEOUT = 15*1000; - private static final int ACK_PRIORITY = 100; - public HandleDatabaseStoreMessageJob(RouterContext ctx, DatabaseStoreMessage receivedMessage, RouterIdentity from, Hash fromHash) { super(ctx); _log = ctx.logManager().getLog(HandleDatabaseStoreMessageJob.class); diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodSearchJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodSearchJob.java index a54549b23..3cd7d84eb 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodSearchJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodSearchJob.java @@ -86,8 +86,6 @@ public class FloodSearchJob extends JobImpl { protected static final int CONCURRENT_SEARCHES = 2; private static final int FLOOD_SEARCH_TIME_FACTOR = 2; - private static final int FLOOD_SEARCH_TIME_MIN = 30*1000; - /** * Deprecated, unused, see FOSJ override */ diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillPeerSelector.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillPeerSelector.java index f2cc42656..135b2f92d 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillPeerSelector.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillPeerSelector.java @@ -291,12 +291,6 @@ class FloodfillPeerSelector extends PeerSelector { _wanted = wanted; } - /** - * @return unsorted list of all with the 'f' mark in their netdb - * except for shitlisted ones. - */ - public List getFloodfillParticipants() { return _floodfillMatches; } - private static final int EXTRA_MATCHES = 100; public void add(Hash entry) { //if (_context.profileOrganizer().isFailing(entry)) diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java index 21c6a5ccd..731901527 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java @@ -35,9 +35,6 @@ public class HandleFloodfillDatabaseStoreMessageJob extends JobImpl { private Hash _fromHash; private FloodfillNetworkDatabaseFacade _facade; - private static final int ACK_TIMEOUT = 15*1000; - private static final int ACK_PRIORITY = 100; - public HandleFloodfillDatabaseStoreMessageJob(RouterContext ctx, DatabaseStoreMessage receivedMessage, RouterIdentity from, Hash fromHash, FloodfillNetworkDatabaseFacade facade) { super(ctx); _log = ctx.logManager().getLog(getClass()); diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java b/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java index eeff28086..7182ae3f3 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java @@ -43,7 +43,6 @@ class KBucketImpl implements KBucket { private int _end; /** when did we last shake things up */ private long _lastShuffle; - private static final int SHUFFLE_DELAY = 10*60*1000; private I2PAppContext _context; public KBucketImpl(I2PAppContext context, LocalHash local) { diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java index 393bbda5d..fd4fef091 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java @@ -409,18 +409,6 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade { return rv; } - /* aparently, not used?? should be public if used elsewhere. */ - private class CountLeaseSets implements SelectionCollector { - private int _count; - public int size() { return _count; } - public void add(Hash entry) { - if (_ds == null) return; - DatabaseEntry o = _ds.get(entry); - if (o != null && o.getType() == DatabaseEntry.KEY_TYPE_LEASESET) - _count++; - } - } - /** * This is fast and doesn't use synchronization, * but it includes both routerinfos and leasesets. diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java b/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java index 92c8add81..63cc67383 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java @@ -204,11 +204,6 @@ class PersistentDataStore extends TransientDataStore { _context.statManager().addRateData("netDb.writePending", pending); } - /** check to see if it's in the write queue */ - public DatabaseEntry get(Hash key) { - return _keys.get(key); - } - public void remove(Hash key) { _keys.remove(key); } @@ -502,10 +497,6 @@ class PersistentDataStore extends TransientDataStore { return ROUTERINFO_PREFIX + hash.toBase64() + ROUTERINFO_SUFFIX; } - private static Hash getLeaseSetHash(String filename) { - return getHash(filename, LEASESET_PREFIX, LEASESET_SUFFIX); - } - private static Hash getRouterInfoHash(String filename) { return getHash(filename, ROUTERINFO_PREFIX, ROUTERINFO_SUFFIX); } diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/RepublishLeaseSetJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/RepublishLeaseSetJob.java index 9684effba..5d8d93280 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/RepublishLeaseSetJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/RepublishLeaseSetJob.java @@ -22,7 +22,6 @@ import net.i2p.util.Log; */ public class RepublishLeaseSetJob extends JobImpl { private final Log _log; - private final static long REPUBLISH_LEASESET_DELAY = 5*60*1000; public final static long REPUBLISH_LEASESET_TIMEOUT = 60*1000; private final static int RETRY_DELAY = 20*1000; private final Hash _dest; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java index 346bb4ef2..0b5b8dd96 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java @@ -46,7 +46,6 @@ class SearchJob extends JobImpl { private final long _expiration; private final long _timeoutMs; private final boolean _keepStats; - private final boolean _isLease; private Job _pendingRequeueJob; private final PeerSelector _peerSelector; private final List _deferredSearches; @@ -56,7 +55,6 @@ class SearchJob extends JobImpl { private int _floodfillSearchesOutstanding; private static final int SEARCH_BREDTH = 3; // 10 peers at a time - private static final int SEARCH_PRIORITY = 400; // large because the search is probably for a real search /** only send the 10 closest "dont tell me about" refs */ static final int MAX_CLOSEST = 10; @@ -96,7 +94,6 @@ class SearchJob extends JobImpl { _onFailure = onFailure; _timeoutMs = timeoutMs; _keepStats = keepStats; - _isLease = isLease; _deferredSearches = new ArrayList(0); _peerSelector = facade.getPeerSelector(); _startedOn = -1; @@ -759,7 +756,6 @@ class SearchJob extends JobImpl { public Job getOnFind() { return _onFind; } public Job getOnFail() { return _onFail; } public long getExpiration() { return _expiration; } - public boolean getIsLease() { return _isLease; } } public String getName() { return "Kademlia NetDb Search"; } diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java index b47184da4..f91df9b2b 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java @@ -43,16 +43,6 @@ class StoreJob extends JobImpl { private final static int PARALLELIZATION = 4; // how many sent at a time private final static int REDUNDANCY = 4; // we want the data sent to 6 peers - /** - * additionally send to 1 outlier(s), in case all of the routers chosen in our - * REDUNDANCY set are attacking us by accepting DbStore messages but dropping - * the data. - * - * TODO: um, honor this. make sure we send to this many peers that aren't - * closest to the key. - * - */ - private final static int EXPLORATORY_REDUNDANCY = 1; private final static int STORE_PRIORITY = 100; /** diff --git a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java index cdce1e290..2880cd862 100644 --- a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java +++ b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java @@ -501,16 +501,6 @@ public class Reseeder { } - /** - * Mark a string for extraction by xgettext and translation. - * Use this only in static initializers. - * It does not translate! - * @return s - */ - private static final String _x(String s) { - return s; - } - private static final String BUNDLE_NAME = "net.i2p.router.web.messages"; /** translate */ diff --git a/router/java/src/net/i2p/router/peermanager/PeerTestJob.java b/router/java/src/net/i2p/router/peermanager/PeerTestJob.java index 241fd8bb4..1cbd035a4 100644 --- a/router/java/src/net/i2p/router/peermanager/PeerTestJob.java +++ b/router/java/src/net/i2p/router/peermanager/PeerTestJob.java @@ -32,8 +32,6 @@ public class PeerTestJob extends JobImpl { private PeerManager _manager; private boolean _keepTesting; private static final long DEFAULT_PEER_TEST_DELAY = 5*60*1000; - private static final int TEST_PRIORITY = 100; - /** Creates a new instance of PeerTestJob */ public PeerTestJob(RouterContext context) { super(context); diff --git a/router/java/src/net/i2p/router/peermanager/ProfileManagerImpl.java b/router/java/src/net/i2p/router/peermanager/ProfileManagerImpl.java index b2a4dad93..d6911b8e7 100644 --- a/router/java/src/net/i2p/router/peermanager/ProfileManagerImpl.java +++ b/router/java/src/net/i2p/router/peermanager/ProfileManagerImpl.java @@ -148,11 +148,6 @@ public class ProfileManagerImpl implements ProfileManager { } - private int getSlowThreshold() { - // perhaps we should have this compare vs. tunnel.testSuccessTime? - return 5*1000; - } - /** * Note that the peer participated in a tunnel that failed. Its failure may not have * been the peer's fault however. diff --git a/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java b/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java index 8c4ae734c..b7834fe18 100644 --- a/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java +++ b/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java @@ -808,10 +808,6 @@ public class FIFOBandwidthLimiter { satisfiedBuffer = new ArrayList(1); init(0, 0, null); } - public SimpleRequest(int in, int out, String target) { - satisfiedBuffer = new ArrayList(1); - init(in, out, target); - } public SimpleRequest(int in, int out, String target, CompleteListener lsnr, Object attachment) { satisfiedBuffer = new ArrayList(1); _lsnr = lsnr; @@ -830,7 +826,6 @@ public class FIFOBandwidthLimiter { _requestId = ++__requestId; _requestTime = now(); } - public Object getAvailabilityMonitor() { return SimpleRequest.this; } public String getRequestName() { return "Req" + _requestId + " to " + _target; } public long getRequestTime() { return _requestTime; } public int getTotalOutboundRequested() { return _outTotal; } @@ -873,14 +868,6 @@ public class FIFOBandwidthLimiter { _lsnr.complete(SimpleRequest.this); } int getAllocationsSinceWait() { return _waited ? _allocationsSinceWait : 0; } - void allocateAll() { - _inAllocated = _inTotal; - _outAllocated = _outTotal; - if (_lsnr == null) - _allocationsSinceWait++; - if (_log.shouldLog(Log.DEBUG)) _log.debug("allocate all"); - notifyAllocation(); - } void allocateBytes(int in, int out) { _inAllocated += in; _outAllocated += out; diff --git a/router/java/src/net/i2p/router/transport/TransportManager.java b/router/java/src/net/i2p/router/transport/TransportManager.java index 41ed91b11..9f91dc0c4 100644 --- a/router/java/src/net/i2p/router/transport/TransportManager.java +++ b/router/java/src/net/i2p/router/transport/TransportManager.java @@ -193,15 +193,6 @@ public class TransportManager implements TransportEventListener { int getTransportCount() { return _transports.size(); } - private boolean isSupported(Set addresses, Transport t) { - for (Iterator iter = addresses.iterator(); iter.hasNext(); ) { - RouterAddress addr = (RouterAddress)iter.next(); - if (addr.getTransportStyle().equals(t.getStyle())) - return true; - } - return false; - } - public int countActivePeers() { int peers = 0; for (Transport t : _transports.values()) { diff --git a/router/java/src/net/i2p/router/transport/ntcp/EstablishState.java b/router/java/src/net/i2p/router/transport/ntcp/EstablishState.java index 6f65d5bdb..a39395d53 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/EstablishState.java +++ b/router/java/src/net/i2p/router/transport/ntcp/EstablishState.java @@ -93,9 +93,6 @@ class EstablishState { /** bytes received so far */ private int _received; - /** bytes sent so far */ - private int _sent; - private byte _extra[]; private final DHSessionKeyBuilder _dh; diff --git a/router/java/src/net/i2p/router/transport/ntcp/Writer.java b/router/java/src/net/i2p/router/transport/ntcp/Writer.java index 260569df7..c414d80de 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/Writer.java +++ b/router/java/src/net/i2p/router/transport/ntcp/Writer.java @@ -14,7 +14,6 @@ import net.i2p.util.Log; * */ class Writer { - private final RouterContext _context; private final Log _log; private final List _pendingConnections; private final List _liveWrites; @@ -22,7 +21,6 @@ class Writer { private final List _runners; public Writer(RouterContext ctx) { - _context = ctx; _log = ctx.logManager().getLog(getClass()); _pendingConnections = new ArrayList(16); _runners = new ArrayList(5); diff --git a/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java b/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java index 78b27e22c..435e809f8 100644 --- a/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java +++ b/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java @@ -431,8 +431,6 @@ class PacketBuilder { return buildACK(peer, Collections.EMPTY_LIST); } - private static final int ACK_PRIORITY = 1; - /** * Build the ack packet. The list need not be sorted into full and partial; * this method will put all fulls before the partials in the outgoing packet. diff --git a/router/java/src/net/i2p/router/transport/udp/PeerState.java b/router/java/src/net/i2p/router/transport/udp/PeerState.java index e6b5f221c..d1107685b 100644 --- a/router/java/src/net/i2p/router/transport/udp/PeerState.java +++ b/router/java/src/net/i2p/router/transport/udp/PeerState.java @@ -180,8 +180,6 @@ class PeerState { private long _packetsPeriodTransmitted; private int _packetsPeriodRetransmitted; private int _packetRetransmissionRate; - /** at what time did we last break off the retransmission counter period */ - private long _retransmissionPeriodStart; /** how many dup packets were received within the last RETRANSMISSION_PERIOD_WIDTH packets */ private long _packetsReceivedDuplicate; private long _packetsReceived; diff --git a/router/java/src/net/i2p/router/transport/udp/UDPReceiver.java b/router/java/src/net/i2p/router/transport/udp/UDPReceiver.java index 1ab25f017..1491030bb 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPReceiver.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPReceiver.java @@ -187,11 +187,13 @@ class UDPReceiver { return queueSize; } + /**** private class ArtificiallyDelayedReceive implements SimpleTimer.TimedEvent { private UDPPacket _packet; public ArtificiallyDelayedReceive(UDPPacket packet) { _packet = packet; } public void timeReached() { doReceive(_packet); } } + ****/ /** * Blocking call to retrieve the next inbound packet, or null if we have diff --git a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java index fdc3d6f93..ef1e381cf 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java @@ -98,8 +98,6 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority private int _lastOurPort; private static final int DROPLIST_PERIOD = 10*60*1000; - private static final int MAX_DROPLIST_SIZE = 256; - public static final String STYLE = "SSU"; public static final String PROP_INTERNAL_PORT = "i2np.udp.internalPort"; /** now unused, we pick a random port */ @@ -1456,8 +1454,6 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority return 0; } - private static final int DROP_INACTIVITY_TIME = 60*1000; - public void failed(OutboundMessageState msg) { failed(msg, true); } void failed(OutboundMessageState msg, boolean allowPeerFailure) { if (msg == null) return; @@ -2218,13 +2214,6 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority } } private static final DecimalFormat _pctFmt = new DecimalFormat("#0.0%"); - private static final String formatPct(double pct) { - synchronized (_pctFmt) { - return _pctFmt.format(pct); - } - } - - private static final String BUNDLE_NAME = "net.i2p.router.web.messages"; /** @@ -2311,15 +2300,6 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority } } - /** - * If we haven't had a non-unknown test result in 5 minutes, we really dont know. Otherwise, - * when we receive an unknown we should ignore that value and try again (with different peers) - * - */ - private static final long STATUS_GRACE_PERIOD = 5*60*1000; - private long _statusLastCalled; - private short _lastStatus = CommSystemFacade.STATUS_UNKNOWN; - void setReachabilityStatus(short status) { short old = _reachabilityStatus; long now = _context.clock().now(); @@ -2355,8 +2335,6 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority //} break; } - _statusLastCalled = now; - _lastStatus = status; if ( (status != old) && (status != CommSystemFacade.STATUS_UNKNOWN) ) { if (_log.shouldLog(Log.INFO)) _log.info("Old status: " + old + " New status: " + status + " from: ", new Exception("traceback")); @@ -2404,8 +2382,6 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority return null; } - private static final String PROP_SHOULD_TEST = "i2np.udp.shouldTest"; - private boolean shouldTest() { return ! _context.router().isHidden(); //String val = _context.getProperty(PROP_SHOULD_TEST); diff --git a/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java b/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java index 619985868..149c87ec2 100644 --- a/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java +++ b/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java @@ -32,8 +32,6 @@ class InboundMessageDistributor implements GarlicMessageReceiver.CloveReceiver { private final Hash _client; private final GarlicMessageReceiver _receiver; - private static final int MAX_DISTRIBUTE_TIME = 10*1000; - public InboundMessageDistributor(RouterContext ctx, Hash client) { _context = ctx; _client = client; diff --git a/router/java/src/net/i2p/router/tunnel/TrivialPreprocessor.java b/router/java/src/net/i2p/router/tunnel/TrivialPreprocessor.java index 63f667804..5ff23456c 100644 --- a/router/java/src/net/i2p/router/tunnel/TrivialPreprocessor.java +++ b/router/java/src/net/i2p/router/tunnel/TrivialPreprocessor.java @@ -143,7 +143,7 @@ class TrivialPreprocessor implements TunnelGateway.QueuePreprocessor { /** is this a follw up byte? */ private static final byte MASK_IS_SUBSEQUENT = FragmentHandler.MASK_IS_SUBSEQUENT; /** how should this be delivered? shift this 5 the right and get TYPE_* */ - private static final byte MASK_TYPE = FragmentHandler.MASK_TYPE; + //private static final byte MASK_TYPE = FragmentHandler.MASK_TYPE; /** is this the first of a fragmented message? */ private static final byte MASK_FRAGMENTED = FragmentHandler.MASK_FRAGMENTED; diff --git a/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java b/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java index 3bbd455dd..1b8e0a9b9 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java +++ b/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java @@ -186,7 +186,6 @@ abstract class BuildRequestor { private static final boolean SEND_VARIABLE = true; /** 5 (~2600 bytes) fits nicely in 3 tunnel messages */ private static final int SHORT_RECORDS = 5; - private static final int LONG_RECORDS = TunnelBuildMessage.MAX_RECORD_COUNT; private static final VersionComparator _versionComparator = new VersionComparator(); private static final List SHORT_ORDER = new ArrayList(SHORT_RECORDS); static { diff --git a/router/java/src/net/i2p/router/tunnel/pool/PooledTunnelCreatorConfig.java b/router/java/src/net/i2p/router/tunnel/pool/PooledTunnelCreatorConfig.java index ad65c04e4..914e8bf39 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/PooledTunnelCreatorConfig.java +++ b/router/java/src/net/i2p/router/tunnel/pool/PooledTunnelCreatorConfig.java @@ -15,10 +15,6 @@ import net.i2p.util.Log; class PooledTunnelCreatorConfig extends TunnelCreatorConfig { private TunnelPool _pool; private TestJob _testJob; - // private Job _expireJob; - // private TunnelInfo _pairedTunnel; - private boolean _live; - /** Creates a new instance of PooledTunnelCreatorConfig */ public PooledTunnelCreatorConfig(RouterContext ctx, int length, boolean isInbound) { @@ -34,13 +30,11 @@ class PooledTunnelCreatorConfig extends TunnelCreatorConfig { if (_testJob != null) _testJob.testSuccessful(ms); super.testSuccessful(ms); - _live = true; } /** called from TestJob */ public void testJobSuccessful(int ms) { super.testSuccessful(ms); - _live = true; } /** diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java index 2a7ae09f1..22508a2ce 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java @@ -337,7 +337,6 @@ public abstract class TunnelPeerSelector { } } - private static final long DONT_EXCLUDE_PERIOD = 15*60*1000; /** 0.7.8 and earlier had major message corruption bugs */ private static final String MIN_VERSION = "0.7.9"; private static final VersionComparator _versionComparator = new VersionComparator();