From ec061eb3e0a65233ea2ec71985c6d2769e3201c8 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 24 Jul 2011 12:38:50 +0000 Subject: [PATCH] more final and cleanups --- .../transport/udp/IntroductionManager.java | 8 +++--- .../router/transport/udp/MessageReceiver.java | 6 ++--- .../transport/udp/OutboundEstablishState.java | 2 +- .../router/transport/udp/PacketBuilder.java | 6 ++--- .../router/transport/udp/PeerTestManager.java | 10 ++++---- .../i2p/router/transport/udp/UDPPacket.java | 25 +++++++++++-------- .../router/transport/udp/UDPPacketReader.java | 20 +++++++-------- 7 files changed, 40 insertions(+), 37 deletions(-) diff --git a/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java b/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java index b39f44de9..85855b039 100644 --- a/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java +++ b/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java @@ -21,10 +21,10 @@ import net.i2p.util.Log; * */ class IntroductionManager { - private RouterContext _context; - private Log _log; - private UDPTransport _transport; - private PacketBuilder _builder; + private final RouterContext _context; + private final Log _log; + private final UDPTransport _transport; + private final PacketBuilder _builder; /** map of relay tag to PeerState that should receive the introduction */ private final Map _outbound; /** list of peers (PeerState) who have given us introduction tags */ diff --git a/router/java/src/net/i2p/router/transport/udp/MessageReceiver.java b/router/java/src/net/i2p/router/transport/udp/MessageReceiver.java index dede98ef7..c0bce608e 100644 --- a/router/java/src/net/i2p/router/transport/udp/MessageReceiver.java +++ b/router/java/src/net/i2p/router/transport/udp/MessageReceiver.java @@ -20,9 +20,9 @@ import net.i2p.util.Log; * {@link net.i2p.router.InNetMessagePool} by way of the {@link UDPTransport}. */ class MessageReceiver { - private RouterContext _context; - private Log _log; - private UDPTransport _transport; + private final RouterContext _context; + private final Log _log; + private final UDPTransport _transport; /** list of messages (InboundMessageState) fully received but not interpreted yet */ private final BlockingQueue _completeMessages; private boolean _alive; diff --git a/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState.java b/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState.java index 76753a5f5..0c4f265f7 100644 --- a/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState.java +++ b/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState.java @@ -50,7 +50,7 @@ class OutboundEstablishState { private long _nextSend; private RemoteHostId _remoteHostId; private final RouterIdentity _remotePeer; - private SessionKey _introKey; + private final SessionKey _introKey; private final Queue _queuedMessages; private int _currentState; private long _introductionNonce; 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 cc43c4b2e..441c5cb7f 100644 --- a/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java +++ b/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java @@ -95,9 +95,9 @@ around briefly, to address packet loss and reordering.

* */ class PacketBuilder { - private I2PAppContext _context; - private Log _log; - private UDPTransport _transport; + private final I2PAppContext _context; + private final Log _log; + private final UDPTransport _transport; private static final ByteCache _ivCache = ByteCache.getInstance(64, UDPPacket.IV_SIZE); private static final ByteCache _hmacCache = ByteCache.getInstance(64, Hash.HASH_LENGTH); diff --git a/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java b/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java index 46b1e4666..752c5d37b 100644 --- a/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java +++ b/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java @@ -91,17 +91,17 @@ with either Bob or Charlie, but it is not required.

*/ class PeerTestManager { - private RouterContext _context; - private Log _log; - private UDPTransport _transport; - private PacketBuilder _packetBuilder; + private final RouterContext _context; + private final Log _log; + private final UDPTransport _transport; + private final PacketBuilder _packetBuilder; /** map of Long(nonce) to PeerTestState for tests currently in progress (as Bob/Charlie) */ private final Map _activeTests; /** current test we are running (as Alice), or null */ private PeerTestState _currentTest; private boolean _currentTestComplete; /** as Alice */ - private Queue _recentTests; + private final Queue _recentTests; /** longest we will keep track of a Charlie nonce for */ private static final int MAX_CHARLIE_LIFETIME = 10*1000; diff --git a/router/java/src/net/i2p/router/transport/udp/UDPPacket.java b/router/java/src/net/i2p/router/transport/udp/UDPPacket.java index 092431db3..1d8bad7a2 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPPacket.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPPacket.java @@ -19,13 +19,13 @@ import net.i2p.util.Log; class UDPPacket { private I2PAppContext _context; private static Log _log; - private volatile DatagramPacket _packet; + private final DatagramPacket _packet; private volatile short _priority; private volatile long _initializeTime; private volatile long _expiration; - private byte[] _data; - private byte[] _validateBuf; - private byte[] _ivBuf; + private final byte[] _data; + private final byte[] _validateBuf; + private final byte[] _ivBuf; private volatile int _markedType; private volatile RemoteHostId _remoteHost; private volatile boolean _released; @@ -81,22 +81,22 @@ class UDPPacket { private static final int MAX_VALIDATE_SIZE = MAX_PACKET_SIZE; - private UDPPacket(I2PAppContext ctx, boolean inbound) { + private UDPPacket(I2PAppContext ctx) { ctx.statManager().createRateStat("udp.fetchRemoteSlow", "How long it takes to grab the remote ip info", "udp", UDPTransport.RATES); // the data buffer is clobbered on init(..), but we need it to bootstrap _data = new byte[MAX_PACKET_SIZE]; _packet = new DatagramPacket(_data, MAX_PACKET_SIZE); _validateBuf = new byte[MAX_VALIDATE_SIZE]; _ivBuf = new byte[IV_SIZE]; - init(ctx, inbound); + init(ctx); } - // FIXME optimization, remove the inbound parameter, as it is unused. FIXME - private void init(I2PAppContext ctx, boolean inbound) { + + private void init(I2PAppContext ctx) { _context = ctx; //_dataBuf = _dataCache.acquire(); Arrays.fill(_data, (byte)0); //_packet = new DatagramPacket(_data, MAX_PACKET_SIZE); - _packet.setData(_data); + //_packet.setData(_data); // _isInbound = inbound; _initializeTime = _context.clock().now(); _markedType = -1; @@ -262,15 +262,18 @@ class UDPPacket { return buf.toString(); } + /** + * @param inbound unused + */ public static UDPPacket acquire(I2PAppContext ctx, boolean inbound) { UDPPacket rv = null; if (CACHE) { rv = _packetCache.poll(); if (rv != null) - rv.init(ctx, inbound); + rv.init(ctx); } if (rv == null) - rv = new UDPPacket(ctx, inbound); + rv = new UDPPacket(ctx); //if (rv._acquiredBy != null) { // _log.log(Log.CRIT, "Already acquired! current stack trace is:", new Exception()); // _log.log(Log.CRIT, "Earlier acquired:", rv._acquiredBy); diff --git a/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java b/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java index 493d62771..946191e4c 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java @@ -16,19 +16,19 @@ import net.i2p.util.Log; * */ class UDPPacketReader { - private I2PAppContext _context; - private Log _log; + private final I2PAppContext _context; + private final Log _log; private byte _message[]; private int _payloadBeginOffset; private int _payloadLength; - private SessionRequestReader _sessionRequestReader; - private SessionCreatedReader _sessionCreatedReader; - private SessionConfirmedReader _sessionConfirmedReader; - private DataReader _dataReader; - private PeerTestReader _peerTestReader; - private RelayRequestReader _relayRequestReader; - private RelayIntroReader _relayIntroReader; - private RelayResponseReader _relayResponseReader; + private final SessionRequestReader _sessionRequestReader; + private final SessionCreatedReader _sessionCreatedReader; + private final SessionConfirmedReader _sessionConfirmedReader; + private final DataReader _dataReader; + private final PeerTestReader _peerTestReader; + private final RelayRequestReader _relayRequestReader; + private final RelayIntroReader _relayIntroReader; + private final RelayResponseReader _relayResponseReader; private static final int KEYING_MATERIAL_LENGTH = 64;