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

Ratchet: Expire unused tagsets sooner

Browse Source
This commit is contained in:
zzz
2020-04-06 13:54:49 +00:00
parent f9f64a441b
commit 916b296ee0
3 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 5;
public final static long BUILD = 6;
/** for example "-test" */
public final static String EXTRA = "";

11
router/java/src/net/i2p/router/crypto/ratchet/RatchetTagSet.java
View File

@ -272,12 +272,14 @@ class RatchetTagSet implements TagSetHandle {
/**
* For inbound and outbound: Expiration.
* Expiration is getDate() + getTimeout().
* Expiration is getDate() + getTimeout() if acked.
* May be shorter if not acked.
* @since 0.9.46
*/
public synchronized long getExpiration() {
// TODO return shorter if not acked?
return _date + _timeout;
if (_acked)
return _date + _timeout;
return _created + Math.min(_timeout, RatchetSKM.SESSION_PENDING_DURATION_MS);
}
/** for debugging */
@ -528,6 +530,9 @@ class RatchetTagSet implements TagSetHandle {
byte[] key = new byte[32];
hkdf.calculate(_symmkey_ck, _symmkey_constant, INFO_5, _symmkey_ck, key, 0);
_lastKey++;
// for outbound, set acked
if (_sessionTags == null && _lastKey == 0)
_acked = true;
// fill in ID and remoteKey as this may be for inbound
return new SessionKeyAndNonce(key, _id, _lastKey, _remoteKey);
}