r16278@catbus: nickm | 2007-10-30 09:46:28 -0400

 Accept future networkstatus documents, but warn about skew when we get them.


svn:r12282

2 files changed, 7 insertions, 5 deletions

diff --git a/doc/TODO b/doc/TODO
index 659c531e70..e72a2cc998 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -58,8 +58,8 @@ Things we'd like to do in 0.2.0.x:
         - Revised handshake.
         - Have a 'waiting_for_authentication' state.
         - Only do version negotiation if we use the normalized TLS.
-    - Skew issues:
-      - if you load (nick says receive/set/anything) a consensus that's
+    . Skew issues:
+      o if you load (nick says receive/set/anything) a consensus that's
         in the future, then log about skew.
       - should change the "skew complaint" to specify in largest units
         rather than just seconds.
diff --git a/doc/spec/control-spec.txt b/doc/spec/control-spec.txt
index a2826241c3..424deea736 100644
--- a/doc/spec/control-spec.txt
+++ b/doc/spec/control-spec.txt
@@ -1200,12 +1200,14 @@ $Id$
 
      CLOCK_SKEW
        SKEW="+" / "-" SECONDS
-       SOURCE="DIRSERV:IP:Port" / "NETWORKSTATUS:IP:PORT"
+       SOURCE="DIRSERV:IP:Port" / "NETWORKSTATUS:IP:PORT" / "CONSENSUS"
          If "SKEW" is present, it's an estimate of how far we are from the
          time declared in the source.  If the source is a DIRSERV, we got
          the current time from a connection to a dirserver.  If the source is
-         a NETWORKSTATUS, we decided we're skewed because we got a
-         networkstatus from far in the future.
+         a NETWORKSTATUS, we decided we're skewed because we got a v2
+         networkstatus from far in the future.  If the source is
+         CONSENSUS, we decided we're skewed because we got a networkstatus
+         consensus from the future.
 
          {Controllers may want to warn the user if the skew is high, or if
          multiple skew messages appear at severity WARN.  Controllers