sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

r15270@tombo: nickm | 2008-04-22 12:23:39 -0400 

Backport: Fix bug 663: warn less verbosely about clock skew from netinfo cells


svn:r14409
This commit is contained in:
Nick Mathewson 2008-04-22 16:23:51 +00:00
parent 8a05bd90ce
commit a25b424d4b
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -26,6 +26,8 @@ Changes in version 0.2.0.24-rc - 2008-04-0?
- Use recursive pthread mutexes in order to avoid deadlock when
logging debug-level messages to a controller. Bug spotted by
nwf, bugfix on 0.2.0.16-alpha.
- Warn less verbosely about clock skew from netinfo cells from
untrusted sources. Fixes bug 663.
Changes in version 0.2.0.23-rc - 2008-03-24

7
src/or/command.c
View File

@ -577,8 +577,11 @@ command_process_netinfo_cell(cell_t *cell, or_connection_t *conn)
if (labs(apparent_skew) > NETINFO_NOTICE_SKEW &&
router_get_by_digest(conn->identity_digest)) {
char dbuf[64];
/*XXXX This should check the trustedness of the other side. */
int severity = server_mode(get_options()) ? LOG_INFO : LOG_WARN;
int severity;
if (router_digest_is_trusted_dir(conn->identity_digest))
severity = LOG_WARN;
else
severity = LOG_INFO;
format_time_interval(dbuf, sizeof(dbuf), apparent_skew);
log_fn(severity, LD_GENERAL, "Received NETINFO cell with skewed time from "
"server at %s:%d. It seems that our clock is %s by %s, or "