zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanups

Browse Source
This commit is contained in:
zzz
2010-06-16 13:22:35 +00:00
parent 2c4acce0f3
commit 8843cc2948
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java
View File

@@ -34,10 +34,10 @@ import net.i2p.util.SimpleTimer;
* *
*/ */
public class EstablishmentManager { public class EstablishmentManager {
private RouterContext _context; private final RouterContext _context;
private Log _log; private final Log _log;
private UDPTransport _transport; private final UDPTransport _transport;
private PacketBuilder _builder; private final PacketBuilder _builder;
/** map of RemoteHostId to InboundEstablishState */ /** map of RemoteHostId to InboundEstablishState */
private final ConcurrentHashMap<RemoteHostId, InboundEstablishState> _inboundStates; private final ConcurrentHashMap<RemoteHostId, InboundEstablishState> _inboundStates;
/** map of RemoteHostId to OutboundEstablishState */ /** map of RemoteHostId to OutboundEstablishState */
@@ -102,15 +102,7 @@ public class EstablishmentManager {
} }
private int getMaxConcurrentEstablish() { private int getMaxConcurrentEstablish() {
String val = _context.getProperty(PROP_MAX_CONCURRENT_ESTABLISH); return _context.getProperty(PROP_MAX_CONCURRENT_ESTABLISH, DEFAULT_MAX_CONCURRENT_ESTABLISH);
if (val != null) {
try {
return Integer.parseInt(val);
} catch (NumberFormatException nfe) {
return DEFAULT_MAX_CONCURRENT_ESTABLISH;
}
}
return DEFAULT_MAX_CONCURRENT_ESTABLISH;
} }
private static final int MAX_QUEUED_OUTBOUND = 10*1000; private static final int MAX_QUEUED_OUTBOUND = 10*1000;
@@ -654,8 +646,7 @@ public class EstablishmentManager {
} }
} }
/* FIXME Exporting non-public type through public API FIXME */ void receiveRelayResponse(RemoteHostId bob, UDPPacketReader reader) {
public void receiveRelayResponse(RemoteHostId bob, UDPPacketReader reader) {
long nonce = reader.getRelayResponseReader().readNonce(); long nonce = reader.getRelayResponseReader().readNonce();
OutboundEstablishState state = _liveIntroductions.remove(new Long(nonce)); OutboundEstablishState state = _liveIntroductions.remove(new Long(nonce));
if (state == null) if (state == null)
@@ -719,6 +710,7 @@ public class EstablishmentManager {
/** /**
* Drive through the inbound establishment states, adjusting one of them * Drive through the inbound establishment states, adjusting one of them
* as necessary * as necessary
* @return next requested time or -1
*/ */
private long handleInbound() { private long handleInbound() {
long now = _context.clock().now(); long now = _context.clock().now();
@@ -820,6 +812,7 @@ public class EstablishmentManager {
/** /**
* Drive through the outbound establishment states, adjusting one of them * Drive through the outbound establishment states, adjusting one of them
* as necessary * as necessary
* @return next requested time or -1
*/ */
private long handleOutbound() { private long handleOutbound() {
long now = _context.clock().now(); long now = _context.clock().now();