diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-04-22 16:23:51 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-04-22 16:23:51 +0000 |
| commit | a25b424d4b52096efa9cf0341cc6ed278c7b6c18 (patch) | |
| tree | 186d3161d5585f8a3608c07c7726ecd1db125d0c | |
| parent | 8a05bd90ce78c70e0c5a9362bcfda9c24f43f492 (diff) | |
| download | tor-a25b424d4b52096efa9cf0341cc6ed278c7b6c18.tar.gz tor-a25b424d4b52096efa9cf0341cc6ed278c7b6c18.zip | |
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
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/or/command.c | 7 |
2 files changed, 7 insertions, 2 deletions
@@ -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 diff --git a/src/or/command.c b/src/or/command.c index d05f6cdae9..552624fb76 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -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 " |