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

SSU: More work on introducer expiration (proposal 133)

Browse Source
This commit is contained in:
zzz
2017-03-20 22:31:32 +00:00
parent b9a7a76174
commit 13ad5d72ae
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/src/net/i2p/data/DataHelper.java
View File

@@ -68,9 +68,9 @@ public class DataHelper {
"cost", "host", "port", "cost", "host", "port",
// SSU RouterAddress options // SSU RouterAddress options
"key", "mtu", "key", "mtu",
"ihost0", "iport0", "ikey0", "itag0", "ihost0", "iport0", "ikey0", "itag0", "iexp0",
"ihost1", "iport1", "ikey1", "itag1", "ihost1", "iport1", "ikey1", "itag1", "iexp1",
"ihost2", "iport2", "ikey2", "itag2", "ihost2", "iport2", "ikey2", "itag2", "iexp2",
// RouterInfo options // RouterInfo options
"caps", "coreVersion", "netId", "router.version", "caps", "coreVersion", "netId", "router.version",
"netdb.knownLeaseSets", "netdb.knownRouters", "netdb.knownLeaseSets", "netdb.knownRouters",

3
router/java/src/net/i2p/router/transport/udp/PacketBuilder.java
View File

@@ -1215,17 +1215,20 @@ class PacketBuilder {
UDPAddress addr = state.getRemoteAddress(); UDPAddress addr = state.getRemoteAddress();
int count = addr.getIntroducerCount(); int count = addr.getIntroducerCount();
List<UDPPacket> rv = new ArrayList<UDPPacket>(count); List<UDPPacket> rv = new ArrayList<UDPPacket>(count);
long cutoff = _context.clock().now() + 5*60*1000L;
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
InetAddress iaddr = addr.getIntroducerHost(i); InetAddress iaddr = addr.getIntroducerHost(i);
int iport = addr.getIntroducerPort(i); int iport = addr.getIntroducerPort(i);
byte ikey[] = addr.getIntroducerKey(i); byte ikey[] = addr.getIntroducerKey(i);
long tag = addr.getIntroducerTag(i); long tag = addr.getIntroducerTag(i);
long exp = addr.getIntroducerExpiration(i);
// let's not use an introducer on a privileged port, sounds like trouble // let's not use an introducer on a privileged port, sounds like trouble
if (ikey == null || !TransportUtil.isValidPort(iport) || if (ikey == null || !TransportUtil.isValidPort(iport) ||
iaddr == null || tag <= 0 || iaddr == null || tag <= 0 ||
// must be IPv4 for now as we don't send Alice IP/port, see below // must be IPv4 for now as we don't send Alice IP/port, see below
iaddr.getAddress().length != 4 || iaddr.getAddress().length != 4 ||
(!_transport.isValid(iaddr.getAddress())) || (!_transport.isValid(iaddr.getAddress())) ||
(exp > 0 && exp < cutoff) ||
(Arrays.equals(iaddr.getAddress(), _transport.getExternalIP()) && !_transport.allowLocal())) { (Arrays.equals(iaddr.getAddress(), _transport.getExternalIP()) && !_transport.allowLocal())) {
if (_log.shouldLog(Log.WARN)) if (_log.shouldLog(Log.WARN))
_log.warn("Cannot build a relay request to " + state.getRemoteIdentity().calculateHash() _log.warn("Cannot build a relay request to " + state.getRemoteIdentity().calculateHash()

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

@@ -203,6 +203,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
private static final int MIN_PEERS_IF_HAVE_V6 = 30; private static final int MIN_PEERS_IF_HAVE_V6 = 30;
/** minimum peers volunteering to be introducers if we need that */ /** minimum peers volunteering to be introducers if we need that */
private static final int MIN_INTRODUCER_POOL = 5; private static final int MIN_INTRODUCER_POOL = 5;
private static final long INTRODUCER_EXPIRATION_MARGIN = 20*60*1000L;
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;
@@ -1558,17 +1559,21 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
RouterAddress addr = getCurrentAddress(false); RouterAddress addr = getCurrentAddress(false);
if (introducersRequired()) { if (introducersRequired()) {
UDPAddress ua = new UDPAddress(addr); UDPAddress ua = new UDPAddress(addr);
long now = _context.clock().now();
int valid = 0; int valid = 0;
for (int i = 0; i < ua.getIntroducerCount(); i++) { for (int i = 0; i < ua.getIntroducerCount(); i++) {
// warning: this is only valid as long as we use the ident hash as their key. // warning: this is only valid as long as we use the ident hash as their key.
byte[] key = ua.getIntroducerKey(i); byte[] key = ua.getIntroducerKey(i);
if (key.length != Hash.HASH_LENGTH) if (key.length != Hash.HASH_LENGTH)
continue; continue;
long exp = ua.getIntroducerExpiration(i);
if (exp > 0 && exp < now + INTRODUCER_EXPIRATION_MARGIN)
continue;
PeerState peer = getPeerState(new Hash(key)); PeerState peer = getPeerState(new Hash(key));
if (peer != null) if (peer != null)
valid++; valid++;
} }
long sinceSelected = _context.clock().now() - _introducersSelectedOn; long sinceSelected = now - _introducersSelectedOn;
if (valid >= PUBLIC_RELAY_COUNT) { if (valid >= PUBLIC_RELAY_COUNT) {
// try to shift 'em around every 10 minutes or so // try to shift 'em around every 10 minutes or so
if (sinceSelected > 17*60*1000) { if (sinceSelected > 17*60*1000) {