diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-05-08 13:54:59 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-05-08 13:54:59 -0400 |
| commit | 4d30dde15670bd4fb572025116304286880db636 (patch) | |
| tree | 7a368ad50ff8949ff106f03012888f0b9f2a5521 /src/or/networkstatus.c | |
| parent | 35025ee51ff9204271fcfc787a99334082e531a1 (diff) | |
| parent | 9f8e462c89a8320f161f5a77661d573d889651cf (diff) | |
| download | tor-4d30dde15670bd4fb572025116304286880db636.tar.gz tor-4d30dde15670bd4fb572025116304286880db636.zip | |
Merge branch 'netflow_padding-v6-rebased2-squashed'
Diffstat (limited to 'src/or/networkstatus.c')
| -rw-r--r-- | src/or/networkstatus.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 1b21dd7b45..ac5c5c526c 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -64,6 +64,7 @@ #include "shared_random.h" #include "transports.h" #include "torcert.h" +#include "channelpadding.h" /** Map from lowercase nickname to identity digest of named server, if any. */ static strmap_t *named_server_map = NULL; @@ -73,11 +74,11 @@ static strmap_t *unnamed_server_map = NULL; /** Most recently received and validated v3 "ns"-flavored consensus network * status. */ -static networkstatus_t *current_ns_consensus = NULL; +STATIC networkstatus_t *current_ns_consensus = NULL; /** Most recently received and validated v3 "microdec"-flavored consensus * network status. */ -static networkstatus_t *current_md_consensus = NULL; +STATIC networkstatus_t *current_md_consensus = NULL; /** A v3 consensus networkstatus that we've received, but which we don't * have enough certificates to be happy about. */ @@ -1988,6 +1989,7 @@ networkstatus_set_current_consensus(const char *consensus, circuit_build_times_new_consensus_params( get_circuit_build_times_mutable(), c); + channelpadding_new_consensus_params(c); } /* Reset the failure count only if this consensus is actually valid. */ |