commit 72cef6102845e556cf58636e47f8d411ba19f456 Merge: a546e0760 dd15998d2 Author: Mike Perry <mikeperry-git@torproject.org> Date: Mon Sep 17 23:31:34 2018 +0000 Merge branch 'bug23512-v4-032' into bug23512-v4-033 changes/bug23512 | 6 +++ src/or/channeltls.h | 2 + src/or/circuitlist.c | 59 ++++++++++++++++++++++++ src/or/circuitlist.h | 2 + src/or/or.h | 12 +++++ src/or/relay.c | 1 + src/or/rephist.c | 21 +++++---- src/or/rephist.h | 10 +++-- src/or/scheduler_kist.c | 2 - src/test/test_relay.c | 116 +++++++++++++++++++++++++++++++++++++++++++++--- 10 files changed, 212 insertions(+), 19 deletions(-) diff --cc src/or/circuitlist.c index 7bdef0b87,da19a534e..78d8a6602 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@@ -51,10 -51,9 +51,11 @@@ * logic, which was originally circuit-focused. **/ #define CIRCUITLIST_PRIVATE +#include "torint.h" /* TOR_PRIuSZ */ + #include "or.h" #include "channel.h" + #include "channeltls.h" #include "circpathbias.h" #include "circuitbuild.h" #include "circuitlist.h" diff --cc src/or/rephist.h index 507272159,e67209d3e..37a91fd9b --- a/src/or/rephist.h +++ b/src/or/rephist.h @@@ -13,9 -13,16 +13,9 @@@ #define TOR_REPHIST_H void rep_hist_init(void); -void rep_hist_note_connect_failed(const char* nickname, time_t when); -void rep_hist_note_connect_succeeded(const char* nickname, time_t when); -void rep_hist_note_disconnect(const char* nickname, time_t when); -void rep_hist_note_connection_died(const char* nickname, time_t when); -void rep_hist_note_extend_succeeded(const char *from_name, - const char *to_name); -void rep_hist_note_extend_failed(const char *from_name, const char *to_name); void rep_hist_dump_stats(time_t now, int severity); - void rep_hist_note_bytes_read(size_t num_bytes, time_t when); - void rep_hist_note_bytes_written(size_t num_bytes, time_t when); + void rep_hist_note_bytes_read(uint64_t num_bytes, time_t when); + void rep_hist_note_bytes_written(uint64_t num_bytes, time_t when); void rep_hist_make_router_pessimal(const char *id, time_t when);