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

Tunnels: Adjust expiration job start if default reject time overridden by config

Browse Source 
reported by drzed
This commit is contained in:
zzz
2022-11-23 17:51:18 -05:00
parent 17aa96ce09
commit 21a90fc2ec
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
router/java/src/net/i2p/router/RouterThrottleImpl.java
View File

@@ -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;

4
router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java
View File

@@ -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<HopConfig>();
// 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);
}