From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 3 Jan 2013 18:26:59 +0000 (-0500)
Subject: Better handling (I think) for onionskin timing w jumpy clocks
X-Git-Tag: tor-0.2.4.10-alpha~20^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=677d18278e5b27a43f3f56906d97a9575d26c6f4;p=thirdparty%2Ftor.git

Better handling (I think) for onionskin timing w jumpy clocks

The fix: Instead of clipping huge/negative times, ignore them as
probably invalid.
---

diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c
index 42f7b9572c..52a0117d39 100644
--- a/src/or/cpuworker.c
+++ b/src/or/cpuworker.c
@@ -320,19 +320,18 @@ connection_cpu_process_inbuf(connection_t *conn)
       tor_gettimeofday(&tv_end);
       timersub(&tv_end, &rpl.started_at, &tv_diff);
       usec_roundtrip = ((int64_t)tv_diff.tv_sec)*1000000 + tv_diff.tv_usec;
-      if (usec_roundtrip < 0 ||
-          usec_roundtrip > MAX_BELIEVABLE_ONIONSKIN_DELAY) {
-        usec_roundtrip = MAX_BELIEVABLE_ONIONSKIN_DELAY;
-      }
-      ++onionskins_n_processed[rpl.handshake_type];
-      onionskins_usec_internal[rpl.handshake_type] += rpl.n_usec;
-      onionskins_usec_roundtrip[rpl.handshake_type] += usec_roundtrip;
-      if (onionskins_n_processed[rpl.handshake_type] >= 500000) {
-        /* Scale down every 500000 handshakes.  On a busy server, that's
-         * less impressive than it sounds. */
-        onionskins_n_processed[rpl.handshake_type] /= 2;
-        onionskins_usec_internal[rpl.handshake_type] /= 2;
-        onionskins_usec_roundtrip[rpl.handshake_type] /= 2;
+      if (usec_roundtrip >= 0 &&
+          usec_roundtrip < MAX_BELIEVABLE_ONIONSKIN_DELAY) {
+        ++onionskins_n_processed[rpl.handshake_type];
+        onionskins_usec_internal[rpl.handshake_type] += rpl.n_usec;
+        onionskins_usec_roundtrip[rpl.handshake_type] += usec_roundtrip;
+        if (onionskins_n_processed[rpl.handshake_type] >= 500000) {
+          /* Scale down every 500000 handshakes.  On a busy server, that's
+           * less impressive than it sounds. */
+          onionskins_n_processed[rpl.handshake_type] /= 2;
+          onionskins_usec_internal[rpl.handshake_type] /= 2;
+          onionskins_usec_roundtrip[rpl.handshake_type] /= 2;
+        }
       }
     }
     /* parse out the circ it was talking about */