From 21a90fc2ec2fc47e26733343bda6608ef8e36649 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 23 Nov 2022 17:51:18 -0500 Subject: [PATCH] Tunnels: Adjust expiration job start if default reject time overridden by config reported by drzed --- router/java/src/net/i2p/router/RouterThrottleImpl.java | 4 ++-- router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/router/java/src/net/i2p/router/RouterThrottleImpl.java b/router/java/src/net/i2p/router/RouterThrottleImpl.java index ac3000762..418b272db 100644 --- a/router/java/src/net/i2p/router/RouterThrottleImpl.java +++ b/router/java/src/net/i2p/router/RouterThrottleImpl.java @@ -34,9 +34,9 @@ public class RouterThrottleImpl implements RouterThrottle { public static final String PROP_MAX_TUNNELS = "router.maxParticipatingTunnels"; public static final int DEFAULT_MAX_TUNNELS = 10*1000; private static final String PROP_MAX_PROCESSINGTIME = "router.defaultProcessingTimeThrottle"; - private static final long DEFAULT_REJECT_STARTUP_TIME = 10*60*1000; + public static final long DEFAULT_REJECT_STARTUP_TIME = 10*60*1000; private static final long MIN_REJECT_STARTUP_TIME = 90*1000; - private static final String PROP_REJECT_STARTUP_TIME = "router.rejectStartupTime"; + public static final String PROP_REJECT_STARTUP_TIME = "router.rejectStartupTime"; private static final int DEFAULT_MIN_THROTTLE_TUNNELS = SystemVersion.isAndroid() ? 100 : SystemVersion.isARM() ? 500 : 1000; diff --git a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java index 4e92a2d36..ce287f2d6 100644 --- a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java +++ b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java @@ -22,6 +22,7 @@ import net.i2p.data.i2np.VariableTunnelBuildReplyMessage; import net.i2p.router.JobImpl; import net.i2p.router.Router; import net.i2p.router.RouterContext; +import net.i2p.router.RouterThrottleImpl; import net.i2p.router.Service; import net.i2p.router.peermanager.PeerProfile; import net.i2p.router.tunnel.pool.PooledTunnelCreatorConfig; @@ -927,7 +928,8 @@ public class TunnelDispatcher implements Service { super(ctx); _configs = new LinkedBlockingQueue(); // 10 min no tunnels accepted + 10 min tunnel expiration - getTiming().setStartAfter(ctx.clock().now() + 20*60*1000); + long rejectStartupTime = ctx.getProperty(RouterThrottleImpl.PROP_REJECT_STARTUP_TIME, RouterThrottleImpl.DEFAULT_REJECT_STARTUP_TIME); + getTiming().setStartAfter(ctx.clock().now() + rejectStartupTime + 10*60*1000); getContext().jobQueue().addJob(LeaveTunnel.this); }