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

Tunnels: Prop. 157 updates

Browse Source 
- Enable handling
- Remove option to disable garlic reply
- Add option to enable sending
This commit is contained in:
zzz
2021-07-29 09:51:21 -04:00
parent 9db50256a8
commit c652d597c9
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java
View File

@ -106,7 +106,7 @@ class BuildHandler implements Runnable {
private static final long JOB_LAG_LIMIT_TUNNEL = 350;
// TODO remove when finished
private static final boolean HANDLE_SHORT = false;
private static final boolean HANDLE_SHORT = true;
public BuildHandler(RouterContext ctx, TunnelPoolManager manager, BuildExecutor exec) {
_context = ctx;
@ -1026,7 +1026,7 @@ class BuildHandler implements Runnable {
replyMsg.setMessageExpiration(expires);
boolean replyGwIsUs = _context.routerHash().equals(nextPeer);
I2NPMessage outMessage;
if (!replyGwIsUs && state.msg.getType() == ShortTunnelBuildMessage.MESSAGE_TYPE && !_context.getBooleanProperty("router.disableEncryptOTBRM")) {
if (!replyGwIsUs && state.msg.getType() == ShortTunnelBuildMessage.MESSAGE_TYPE) {
// garlic encrypt
outMessage = MessageWrapper.wrap(_context, replyMsg, req.readGarlicKeys());
if (outMessage == null) {

9
router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java
View File

@ -338,7 +338,8 @@ abstract class BuildRequestor {
long replyTunnel = 0;
Hash replyRouter;
boolean useVariable = SEND_VARIABLE && cfg.getLength() <= MEDIUM_RECORDS;
boolean useShortTBM = SEND_SHORT && ctx.keyManager().getPublicKey().getType() == EncType.ECIES_X25519;
boolean useShortTBM = (SEND_SHORT || ctx.getBooleanProperty("router.useShortTBM")) &&
ctx.keyManager().getPublicKey().getType() == EncType.ECIES_X25519;
if (useShortTBM && !cfg.isInbound() && !pool.getSettings().isExploratory()) {
// client must be EC also to get garlic OTBRM reply
LeaseSetKeys lsk = ctx.keyManager().getKeys(pool.getSettings().getDestination());
@ -350,6 +351,7 @@ abstract class BuildRequestor {
}
}
/*
// Testing, send to explicitPeers only
List<Hash> explicitPeers = null;
if (useShortTBM) {
@ -371,6 +373,7 @@ abstract class BuildRequestor {
useShortTBM = false;
}
}
*/
if (cfg.isInbound()) {
//replyTunnel = 0; // as above
@ -379,7 +382,7 @@ abstract class BuildRequestor {
// check all the tunnel peers except ourselves
for (int i = 0; i < cfg.getLength() - 1; i++) {
// TODO remove explicit check
if (!explicitPeers.contains(cfg.getPeer(i)) || !supportsShortTBM(ctx, cfg.getPeer(i))) {
if (/* !explicitPeers.contains(cfg.getPeer(i)) || */ !supportsShortTBM(ctx, cfg.getPeer(i))) {
useShortTBM = false;
break;
}
@ -392,7 +395,7 @@ abstract class BuildRequestor {
// check all the tunnel peers except ourselves
for (int i = 1; i < cfg.getLength(); i++) {
// TODO remove explicit check
if (!explicitPeers.contains(cfg.getPeer(i)) || !supportsShortTBM(ctx, cfg.getPeer(i))) {
if (/* !explicitPeers.contains(cfg.getPeer(i)) || */ !supportsShortTBM(ctx, cfg.getPeer(i))) {
useShortTBM = false;
break;
}