[tor-commits] [tor/master] Make trusted clock skew a bootstrap warning

[nickm at torproject.org]

commit 449bb2351eadd8d01fe89f8d46b4706d50b661b2
Author: Taylor Yu <catalyst at torproject.org>
Date:   Wed Sep 13 14:47:48 2017 -0500

    Make trusted clock skew a bootstrap warning
    
    Make clock skew events based on trusted sources produce a bootstrap
    warning so controllers can more easily alert users about clock skew
    problems.
---
 src/or/connection.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/or/connection.c b/src/or/connection.c
index 5c675acca..b831d231b 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -5221,7 +5221,7 @@ clock_skew_warning(const connection_t *conn, long apparent_skew, int trusted,
                    const char *source)
 {
   char dbuf[64];
-  char *ext_source = NULL;
+  char *ext_source = NULL, *warn = NULL;
   format_time_interval(dbuf, sizeof(dbuf), apparent_skew);
   if (conn)
     tor_asprintf(&ext_source, "%s:%s:%d", source, conn->address, conn->port);
@@ -5235,9 +5235,14 @@ clock_skew_warning(const connection_t *conn, long apparent_skew, int trusted,
          apparent_skew > 0 ? "ahead" : "behind", dbuf,
          apparent_skew > 0 ? "behind" : "ahead",
          (!conn || trusted) ? "" : ", or they are sending us the wrong time");
-  if (trusted)
+  if (trusted) {
     control_event_general_status(LOG_WARN, "CLOCK_SKEW SKEW=%ld SOURCE=%s",
                                  apparent_skew, ext_source);
+    tor_asprintf(&warn, "Clock skew %ld in %s from %s", apparent_skew,
+                 received, source);
+    control_event_bootstrap_problem(warn, "CLOCK_SKEW", conn, 1);
+  }
+  tor_free(warn);
   tor_free(ext_source);
 }