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

NetDb: Allow longer expiration for Meta LS2

Browse Source
This commit is contained in:
zzz
2018-12-08 18:24:14 +00:00
parent bdc4d82eb2
commit 399899e7e7
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
View File

@ -136,6 +136,12 @@ public abstract class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacad
private final static long ROUTER_INFO_EXPIRATION_FLOODFILL = 60*60*1000l; private final static long ROUTER_INFO_EXPIRATION_FLOODFILL = 60*60*1000l;
private final static long ROUTER_INFO_EXPIRATION_INTRODUCED = 45*60*1000l; private final static long ROUTER_INFO_EXPIRATION_INTRODUCED = 45*60*1000l;
/**
* Don't let leaseSets go too far into the future
*/
private static final long MAX_LEASE_FUTURE = 15*60*1000;
private static final long MAX_META_LEASE_FUTURE = 65535*1000;
private final static long EXPLORE_JOB_DELAY = 10*60*1000l; private final static long EXPLORE_JOB_DELAY = 10*60*1000l;
/** this needs to be long enough to give us time to start up, /** this needs to be long enough to give us time to start up,
@ -771,11 +777,6 @@ public abstract class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacad
} }
***/ ***/
/**
* Don't let leaseSets go 20 minutes into the future
*/
static final long MAX_LEASE_FUTURE = 20*60*1000;
/** /**
* Determine whether this leaseSet will be accepted as valid and current * Determine whether this leaseSet will be accepted as valid and current
* given what we know now. * given what we know now.
@ -818,7 +819,9 @@ public abstract class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacad
return "Expired leaseSet for " + leaseSet.getDestination().toBase32() return "Expired leaseSet for " + leaseSet.getDestination().toBase32()
+ " expired " + DataHelper.formatDuration(age) + " ago"; + " expired " + DataHelper.formatDuration(age) + " ago";
} }
if (latest > now + (Router.CLOCK_FUDGE_FACTOR + MAX_LEASE_FUTURE)) { if (latest > now + (Router.CLOCK_FUDGE_FACTOR + MAX_LEASE_FUTURE) &&
(leaseSet.getType() != DatabaseEntry.KEY_TYPE_META_LS2 ||
latest > now + (Router.CLOCK_FUDGE_FACTOR + MAX_META_LEASE_FUTURE))) {
long age = latest - now; long age = latest - now;
// let's not make this an error, it happens when peers have bad clocks // let's not make this an error, it happens when peers have bad clocks
if (_log.shouldLog(Log.WARN)) if (_log.shouldLog(Log.WARN))