[or-cvs] r14408: Fix bug 663: warn less verbosely about clock skew from netin (in tor/trunk: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2008-04-22 12:23:47 -0400 (Tue, 22 Apr 2008)
New Revision: 14408

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/command.c
Log:
 r15269@tombo:  nickm | 2008-04-22 12:23:30 -0400
 Fix bug 663: warn less verbosely about clock skew from netinfo cells



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r15269] on 49666b30-7950-49c5-bedf-9dc8f3168102

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-04-22 16:05:11 UTC (rev 14407)
+++ tor/trunk/ChangeLog	2008-04-22 16:23:47 UTC (rev 14408)
@@ -27,6 +27,8 @@
     - 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.
 
   o Minor features:
     - Allow separate log levels to be configured for different logging

Modified: tor/trunk/src/or/command.c
===================================================================
--- tor/trunk/src/or/command.c	2008-04-22 16:05:11 UTC (rev 14407)
+++ tor/trunk/src/or/command.c	2008-04-22 16:23:47 UTC (rev 14408)
@@ -523,7 +523,7 @@
   }
   if (conn->_base.state != OR_CONN_STATE_OR_HANDSHAKING) {
     log_fn(LOG_PROTOCOL_WARN, LD_OR,
-           "Received a NETINFO cell on a non-handshaking; dropping.");
+           "Received a NETINFO cell on non-handshaking connection; dropping.");
     return;
   }
   tor_assert(conn->handshake_state &&
@@ -577,8 +577,12 @@
   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;
+    /*XXXX021 be smarter about when everybody says we are skewed. */
+    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 "