diff options
| author | George Kadianakis <desnacked@riseup.net> | 2017-08-04 12:21:14 +0300 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-08-08 20:29:34 -0400 |
| commit | b89d2fa1db2379bffd2e2b4c851c3facc57b6ed8 (patch) | |
| tree | 6f4769adc1ddfd5d4c82958eba03ce5575bd113c /src/or/networkstatus.h | |
| parent | 440eaa9b22573cdb0d38bf5c13200cc1077a453f (diff) | |
| download | tor-b89d2fa1db2379bffd2e2b4c851c3facc57b6ed8.tar.gz tor-b89d2fa1db2379bffd2e2b4c851c3facc57b6ed8.zip | |
Don't set HSDir index if we don't have a live consensus.
We also had to alter the SRV functions to take a consensus as optional
input, since we might be setting our HSDir index using a consensus that
is currently being processed and won't be returned by the
networkstatus_get_live_consensus() function.
This change has two results:
a) It makes sure we are using a fresh consensus with the right SRV value
when we are calculating the HSDir hash ring.
b) It ensures that we will not use the sr_get_current/previous()
functions when we don't have a consensus which would have falsely
triggered the disaster SRV logic.
Diffstat (limited to 'src/or/networkstatus.h')
| -rw-r--r-- | src/or/networkstatus.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h index e774c4d266..f9320747d2 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -81,6 +81,7 @@ MOCK_DECL(networkstatus_t *,networkstatus_get_latest_consensus,(void)); MOCK_DECL(networkstatus_t *,networkstatus_get_latest_consensus_by_flavor, (consensus_flavor_t f)); MOCK_DECL(networkstatus_t *, networkstatus_get_live_consensus,(time_t now)); +int networkstatus_is_live(const networkstatus_t *ns, time_t now); int networkstatus_consensus_reasonably_live(const networkstatus_t *consensus, time_t now); int networkstatus_valid_until_is_reasonably_live(time_t valid_until, |