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

Transports: New config options i2np.udp.minpeers and i2np.udp.minv6peers,

Browse Source 
for testing (ticket #1876)
This commit is contained in:
zzz
2016-11-04 14:20:56 +00:00
parent 843351956e
commit 8c71b883bb
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
router/java/src/net/i2p/router/transport/udp/UDPTransport.java
View File

@ -97,6 +97,8 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
*/ */
private volatile boolean _haveIPv6Address; private volatile boolean _haveIPv6Address;
private long _lastInboundIPv6; private long _lastInboundIPv6;
private final int _min_peers;
private final int _min_v6_peers;
/** do we need to rebuild our external router address asap? */ /** do we need to rebuild our external router address asap? */
private boolean _needsRebuild; private boolean _needsRebuild;
@ -196,6 +198,11 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
private static final int TEST_FREQUENCY = 13*60*1000; private static final int TEST_FREQUENCY = 13*60*1000;
private static final int MIN_TEST_FREQUENCY = 45*1000; private static final int MIN_TEST_FREQUENCY = 45*1000;
static final long[] RATES = { 10*60*1000 }; static final long[] RATES = { 10*60*1000 };
/** minimum active peers to maintain IP detection, etc. */
private static final int MIN_PEERS = 5;
private static final int MIN_PEERS_IF_HAVE_V6 = 30;
/** minimum peers volunteering to be introducers if we need that */
private static final int MIN_INTRODUCER_POOL = 5;
private static final int[] BID_VALUES = { 15, 20, 50, 65, 80, 95, 100, 115, TransportBid.TRANSIENT_FAIL }; private static final int[] BID_VALUES = { 15, 20, 50, 65, 80, 95, 100, 115, TransportBid.TRANSIENT_FAIL };
private static final int FAST_PREFERRED_BID = 0; private static final int FAST_PREFERRED_BID = 0;
@ -267,6 +274,8 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
_mtu_ipv6 = PeerState.MIN_IPV6_MTU; _mtu_ipv6 = PeerState.MIN_IPV6_MTU;
setupPort(); setupPort();
_needsRebuild = true; _needsRebuild = true;
_min_peers = _context.getProperty("i2np.udp.minpeers", MIN_PEERS);
_min_v6_peers = _context.getProperty("i2np.udp.minv6peers", MIN_PEERS_IF_HAVE_V6);
_context.statManager().createRateStat("udp.alreadyConnected", "What is the lifetime of a reestablished session", "udp", RATES); _context.statManager().createRateStat("udp.alreadyConnected", "What is the lifetime of a reestablished session", "udp", RATES);
_context.statManager().createRateStat("udp.droppedPeer", "How long ago did we receive from a dropped peer (duration == session lifetime", "udp", RATES); _context.statManager().createRateStat("udp.droppedPeer", "How long ago did we receive from a dropped peer (duration == session lifetime", "udp", RATES);
@ -1695,12 +1704,6 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
} }
} }
/** minimum active peers to maintain IP detection, etc. */
private static final int MIN_PEERS = 5;
private static final int MIN_PEERS_IF_HAVE_V6 = 30;
/** minimum peers volunteering to be introducers if we need that */
private static final int MIN_INTRODUCER_POOL = 5;
public TransportBid bid(RouterInfo toAddress, long dataSize) { public TransportBid bid(RouterInfo toAddress, long dataSize) {
if (dataSize > OutboundMessageState.MAX_MSG_SIZE) { if (dataSize > OutboundMessageState.MAX_MSG_SIZE) {
// NTCP max is lower, so msg will get dropped // NTCP max is lower, so msg will get dropped
@ -1762,8 +1765,8 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
// (Otherwise we only talk UDP to those that are firewalled, and we will // (Otherwise we only talk UDP to those that are firewalled, and we will
// never get any introducers) // never get any introducers)
int count = _peersByIdent.size(); int count = _peersByIdent.size();
if (alwaysPreferUDP() || count < MIN_PEERS || if (alwaysPreferUDP() || count < _min_peers ||
(_haveIPv6Address && count < MIN_PEERS_IF_HAVE_V6) || (_haveIPv6Address && count < _min_v6_peers) ||
(introducersRequired() && _introManager.introducerCount() < MIN_INTRODUCER_POOL)) (introducersRequired() && _introManager.introducerCount() < MIN_INTRODUCER_POOL))
return _cachedBid[SLOW_PREFERRED_BID]; return _cachedBid[SLOW_PREFERRED_BID];
else if (preferUDP()) else if (preferUDP())