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

Tunnels: Implement Bloom filter for short TBM

Browse Source 
Reduce TBM Bloom filter size and interval for EC routers
This commit is contained in:
zzz
2021-09-25 09:12:15 -04:00
parent d466fd6799
commit d7c89be9a2
3 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
history.txt
View File

@@ -1,3 +1,8 @@
2021-09-25 zzz
* Tunnels:
- Implement Bloom filter for short TBM
- Reduce TBM Bloom filter size and interval for EC routers
2021-09-22 zzz
* UDP: Replace ACKSender thread with per-PeerState ack timers

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

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

31
router/java/src/net/i2p/router/tunnel/pool/BuildMessageProcessor.java
View File

@@ -1,5 +1,7 @@
package net.i2p.router.tunnel.pool;
import java.io.File;
import net.i2p.crypto.ChaCha20;
import net.i2p.crypto.EncType;
import net.i2p.data.Base64;
@@ -76,9 +78,27 @@ class BuildMessageProcessor {
// appx 2K part. tunnels or 24K req/hr
m = 19;
}
// Too early, keys not registered with key manager yet
//boolean isEC = ctx.keyManager().getPrivateKey().getType() == EncType.ECIES_X25519;
// ... rather than duplicating all the logic in LoadRouterInfoJob,
// just look for a short router.keys.dat file.
// If it doesn't exist, it will be created later as EC.
// If we're rekeing to EC, it's ok to have a longer duration this time.
File f = new File(ctx.getConfigDir(), "router.keys.dat");
boolean isEC = f.length() < 663;
int duration;
if (isEC) {
// EC build records have a minute timestamp, so the Bloom filter can turn over faster
duration = 8*60*1000;
// shorter duration filter does not need to be as big
m = Math.max(m - 3, 17);
} else {
// ElG build records have an hour timestamp
duration = 60*60*1000;
}
if (log.shouldInfo())
log.info("Selected Bloom filter m = " + m);
return new DecayingBloomFilter(ctx, 60*60*1000, 32, "TunnelBMP", m);
return new DecayingBloomFilter(ctx, duration, 32, "TunnelBMP", m);
}
/**
@@ -105,7 +125,14 @@ class BuildMessageProcessor {
rv = new BuildRequestRecord(ctx, privKey, rec);
if (isShort) {
// Bloom filter TBD
SessionKey sk = rv.getChaChaReplyKey();
boolean isDup = _filter.add(sk.getData(), 0, 32);
if (isDup) {
if (log.shouldWarn())
log.warn(msg.getUniqueId() + ": Dup record: " + rv);
ctx.statManager().addRateData("tunnel.buildRequestDup", 1);
return null;
}
} else {
// i2pd bug
boolean isBad = SessionKey.INVALID_KEY.equals(rv.readReplyKey());