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

Router: Tighten skew calculation window

Browse Source
This commit is contained in:
zzz
2023-02-10 12:42:36 -05:00
parent 12239124d6
commit 1f81d35423
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/i2pcontrol/java/net/i2p/i2pcontrol/servlets/jsonrpc2handlers/RouterInfoHandler.java
View File

@@ -170,7 +170,7 @@ public class RouterInfoHandler implements RequestHandler {
&& (!_context.router().gracefulShutdownInProgress())
&& !_context.clientManager().isAlive())
return (NETWORK_STATUS.ERROR_I2CP);
long skew = _context.commSystem().getFramedAveragePeerClockSkew(33);
long skew = _context.commSystem().getFramedAveragePeerClockSkew(10);
// Display the actual skew, not the offset
if (Math.abs(skew) > 60 * 1000)
return NETWORK_STATUS.ERROR_CLOCK_SKEW;

2
apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryHelper.java
View File

@@ -234,7 +234,7 @@ public class SummaryHelper extends HelperBase {
// Warn based on actual skew from peers, not update status, so if we successfully offset
// the clock, we don't complain.
//if (!_context.clock().getUpdatedSuccessfully())
long skew = _context.commSystem().getFramedAveragePeerClockSkew(33);
long skew = _context.commSystem().getFramedAveragePeerClockSkew(10);
// Display the actual skew, not the offset
if (Math.abs(skew) > 30*1000)
return new NetworkStateMessage(NetworkState.CLOCKSKEW, fixup(_t("ERR-Clock Skew of {0}", DataHelper.formatDuration2(Math.abs(skew)))));

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

@@ -155,7 +155,7 @@ public class RouterClock extends Clock {
// This may get called very early at startup, before RouterContext.initAll() is completed,
// so the comm system may be null. Avoid NPE.
CommSystemFacade csf = ((RouterContext)_context).commSystem();
long currentPeerClockSkew = (csf != null) ? csf.getFramedAveragePeerClockSkew(33) : 0;
long currentPeerClockSkew = (csf != null) ? csf.getFramedAveragePeerClockSkew(10) : 0;
// Predict the effect of applying the proposed clock offset
long predictedPeerClockSkew = currentPeerClockSkew + delta;

2
router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
View File

@@ -682,7 +682,7 @@ public class CommSystemFacadeImpl extends CommSystemFacade {
public void timeReached() {
// use the same % as in RouterClock so that check will never fail
// This is their our offset w.r.t. them...
long peerOffset = getFramedAveragePeerClockSkew(33);
long peerOffset = getFramedAveragePeerClockSkew(10);
if (peerOffset == 0)
return;
long currentOffset = _context.clock().getOffset();