diff options
| author | Roger Dingledine <arma@torproject.org> | 2011-02-11 02:59:29 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2011-02-11 02:59:29 -0500 |
| commit | 95cd7f6f67d4e57a5529382de088b52e222304ea (patch) | |
| tree | c85108de67517115f0d44bc1e01b8663e2218823 | |
| parent | 026204088a9b2d6659d8f7e46a12e47ec4b88592 (diff) | |
| parent | 28de4d83fd59bd656ebcda4442dc10482b8fb00a (diff) | |
| download | tor-95cd7f6f67d4e57a5529382de088b52e222304ea.tar.gz tor-95cd7f6f67d4e57a5529382de088b52e222304ea.zip | |
Merge branch 'maint-0.2.1' into release-0.2.1
| -rw-r--r-- | changes/bug1074-part2 | 6 | ||||
| -rw-r--r-- | src/or/directory.c | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/changes/bug1074-part2 b/changes/bug1074-part2 new file mode 100644 index 0000000000..6644f496d7 --- /dev/null +++ b/changes/bug1074-part2 @@ -0,0 +1,6 @@ + o Major bugfixes: + - Stop sending a CLOCK_SKEW controller status event whenever + we fetch directory information from a relay that has a wrong clock. + Instead, only inform the controller when it's a trusted authority + that claims our clock is wrong. Bugfix on tor-0.1.2.6-alpha; + fixes the other half of bug 1074. diff --git a/src/or/directory.c b/src/or/directory.c index 09ebccdc4f..7150fce407 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1468,9 +1468,10 @@ connection_dir_client_reached_eof(dir_connection_t *conn) delta>0 ? "ahead" : "behind", dbuf, delta>0 ? "behind" : "ahead"); skewed = 1; /* don't check the recommended-versions line */ - control_event_general_status(trusted ? LOG_WARN : LOG_NOTICE, - "CLOCK_SKEW SKEW=%ld SOURCE=DIRSERV:%s:%d", - delta, conn->_base.address, conn->_base.port); + if (trusted) + control_event_general_status(LOG_WARN, + "CLOCK_SKEW SKEW=%ld SOURCE=DIRSERV:%s:%d", + delta, conn->_base.address, conn->_base.port); } else { log_debug(LD_HTTP, "Time on received directory is within tolerance; " "we are %ld seconds skewed. (That's okay.)", delta); |