I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* Clock:

Browse Source 
- Don't let a client update the router clock
      - Restore and enhance vanished clock error log message
This commit is contained in:
zzz
2010-01-24 02:14:39 +00:00
parent 959bf4a7f4
commit f1c50b7fc3
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/src/net/i2p/client/SetDateMessageHandler.java
View File

@ -27,7 +27,11 @@ class SetDateMessageHandler extends HandlerImpl {
public void handleMessage(I2CPMessage message, I2PSessionImpl session) { public void handleMessage(I2CPMessage message, I2PSessionImpl session) {
_log.debug("Handle message " + message); _log.debug("Handle message " + message);
SetDateMessage msg = (SetDateMessage) message; SetDateMessage msg = (SetDateMessage) message;
Clock.getInstance().setNow(msg.getDate().getTime()); // Only do this if we are NOT in the router context;
// otherwise, it sets getUpdatedSuccessfully() in Clock when all
// we did was get the time from ourselves.
if (!_context.isRouterContext())
Clock.getInstance().setNow(msg.getDate().getTime());
session.dateUpdated(); session.dateUpdated();
} }
} }

9
core/java/src/net/i2p/time/Timestamper.java
View File

@ -155,8 +155,13 @@ public class Timestamper implements Runnable {
try { try {
lastFailed = !queryTime(_servers.toArray(new String[_servers.size()])); lastFailed = !queryTime(_servers.toArray(new String[_servers.size()]));
} catch (IllegalArgumentException iae) { } catch (IllegalArgumentException iae) {
if ( (!lastFailed) && (_log.shouldLog(Log.ERROR)) ) if ( (!_initialized) && (_log.shouldLog(Log.ERROR)) ) {
_log.error("Unable to reach any of the NTP servers - network disconnected?"); List<String> all = new ArrayList();
if (_priorityServers != null)
all.addAll(_priorityServers);
all.addAll(_servers);
_log.error("Unable to reach any of the NTP servers " + all + " - network disconnected? Or set time.sntpServerList=myserver1.com,myserver2.com in advanced configuration.");
}
lastFailed = true; lastFailed = true;
} }
} }