commit ad52fe7e88754fd8c7c1eb3da9bbf593d7752af9 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jun 15 12:56:54 2018 -0400 Move network_liveness_t into circuitstats.h and make it private This type is only used in one place and never exposed. --- src/or/circuitstats.h | 15 +++++++++++++++ src/or/or.h | 15 --------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/or/circuitstats.h b/src/or/circuitstats.h index 86116cb7f..5fe80acfe 100644 --- a/src/or/circuitstats.h +++ b/src/or/circuitstats.h @@ -73,6 +73,21 @@ int circuit_build_times_network_check_live(const circuit_build_times_t *cbt); void circuit_build_times_network_circ_success(circuit_build_times_t *cbt); #ifdef CIRCUITSTATS_PRIVATE +/** Information about the state of our local network connection */ +typedef struct { + /** The timestamp we last completed a TLS handshake or received a cell */ + time_t network_last_live; + /** If the network is not live, how many timeouts has this caused? */ + int nonlive_timeouts; + /** Circular array of circuits that have made it to the first hop. Slot is + * 1 if circuit timed out, 0 if circuit succeeded */ + int8_t *timeouts_after_firsthop; + /** Number of elements allocated for the above array */ + int num_recent_circs; + /** Index into circular array. */ + int after_firsthop_idx; +} network_liveness_t; + /** Structure for circuit build times history */ struct circuit_build_times_s { /** The circular array of recorded build times in milliseconds */ diff --git a/src/or/or.h b/src/or/or.h index 3d0611c63..5707e0202 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3733,21 +3733,6 @@ int32_t circuit_build_times_initial_timeout(void); #error "RECENT_CIRCUITS is set too low." #endif -/** Information about the state of our local network connection */ -typedef struct { - /** The timestamp we last completed a TLS handshake or received a cell */ - time_t network_last_live; - /** If the network is not live, how many timeouts has this caused? */ - int nonlive_timeouts; - /** Circular array of circuits that have made it to the first hop. Slot is - * 1 if circuit timed out, 0 if circuit succeeded */ - int8_t *timeouts_after_firsthop; - /** Number of elements allocated for the above array */ - int num_recent_circs; - /** Index into circular array. */ - int after_firsthop_idx; -} network_liveness_t; - typedef struct circuit_build_times_s circuit_build_times_t; /********************************* config.c ***************************/