aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-08-08 09:15:42 -0400
committerNick Mathewson <nickm@torproject.org>2019-08-08 09:15:42 -0400
commitcd6cb453720a5300d00d7996c5b3a03f054cd293 (patch)
treeac4b09fda584a4fe14bd9b37c02cf18c5a9576de
parent0849d2a2fdaeea2871f32bed35d410f19703aae1 (diff)
downloadtor-cd6cb453720a5300d00d7996c5b3a03f054cd293.tar.gz
tor-cd6cb453720a5300d00d7996c5b3a03f054cd293.zip
Restore proper behavior of netinfo skew check
My previous fix removed a comparison, which would have caused us to warn about every skew instead of skews of over an hour.
-rw-r--r--src/or/channeltls.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/channeltls.c b/src/or/channeltls.c
index ea69792f12..d44f719138 100644
--- a/src/or/channeltls.c
+++ b/src/or/channeltls.c
@@ -1721,7 +1721,7 @@ channel_tls_process_netinfo_cell(cell_t *cell, channel_tls_t *chan)
/* Act on apparent skew. */
/** Warn when we get a netinfo skew with at least this value. */
#define NETINFO_NOTICE_SKEW 3600
- if (time_abs(apparent_skew) &&
+ if (time_abs(apparent_skew) > NETINFO_NOTICE_SKEW &&
router_get_by_id_digest(chan->conn->identity_digest)) {
int trusted = router_digest_is_trusted_dir(chan->conn->identity_digest);
clock_skew_warning(TO_CONN(chan->conn), apparent_skew, trusted, LD_GENERAL,