commit c223377ce60ed07a11e0c3b5af29601722b07bac Author: Taylor Yu catalyst@torproject.org Date: Thu May 3 20:57:07 2018 -0500

Make clock_skew_warning() mockable --- src/or/connection.c | 8 ++++---- src/or/connection.h | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/or/connection.c b/src/or/connection.c index 4361e1ca0..fa9881cb8 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -5233,10 +5233,10 @@ connection_free_all(void) * that we had more faith in and therefore the warning level should have higher * severity. */ -void -clock_skew_warning(const connection_t *conn, long apparent_skew, int trusted, - log_domain_mask_t domain, const char *received, - const char *source) +MOCK_IMPL(void, +clock_skew_warning, (const connection_t *conn, long apparent_skew, int trusted, + log_domain_mask_t domain, const char *received, + const char *source)) { char dbuf[64]; char *ext_source = NULL, *warn = NULL; diff --git a/src/or/connection.h b/src/or/connection.h index a2dce2435..ad3129c9d 100644 --- a/src/or/connection.h +++ b/src/or/connection.h @@ -254,9 +254,10 @@ void assert_connection_ok(connection_t *conn, time_t now); int connection_or_nonopen_was_started_here(or_connection_t *conn); void connection_dump_buffer_mem_stats(int severity);

-void clock_skew_warning(const connection_t *conn, long apparent_skew, - int trusted, log_domain_mask_t domain, - const char *received, const char *source); +MOCK_DECL(void, clock_skew_warning, + (const connection_t *conn, long apparent_skew, int trusted, + log_domain_mask_t domain, const char *received, + const char *source));

/** Check if a connection is on the way out so the OOS handler doesn't try * to kill more than it needs. */