diff options
| author | David Goulet <dgoulet@torproject.org> | 2021-01-12 10:55:21 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2021-01-12 10:55:21 -0500 |
| commit | 9b59ede8d342a11d7949a4793b7d456de2a3ff5d (patch) | |
| tree | efa10799bb4d2778b73a82358d9039a48bed1524 /src/feature/hs/hs_client.c | |
| parent | d1f474160638e10478a2ab14fb93b1e8b6a720a2 (diff) | |
| parent | b3652f2104c880bf626cb4e97e6088bca5a1571f (diff) | |
| download | tor-9b59ede8d342a11d7949a4793b7d456de2a3ff5d.tar.gz tor-9b59ede8d342a11d7949a4793b7d456de2a3ff5d.zip | |
Merge branch 'ticket40237_044_01' into ticket40237_045_01
Diffstat (limited to 'src/feature/hs/hs_client.c')
| -rw-r--r-- | src/feature/hs/hs_client.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index 7cec2e0dce..4b4e268542 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -30,6 +30,7 @@ #include "feature/hs/hs_descriptor.h" #include "feature/hs/hs_ident.h" #include "feature/nodelist/describe.h" +#include "feature/nodelist/microdesc.h" #include "feature/nodelist/networkstatus.h" #include "feature/nodelist/nodelist.h" #include "feature/nodelist/routerset.h" @@ -1303,9 +1304,10 @@ can_client_refetch_desc(const ed25519_public_key_t *identity_pk, goto cannot; } - /* Without a live consensus we can't do any client actions. It is needed to - * compute the hashring for a service. */ - if (!networkstatus_get_live_consensus(approx_time())) { + /* Without a usable consensus we can't do any client actions. It is needed + * to compute the hashring for a service. */ + if (!networkstatus_get_reasonably_live_consensus(approx_time(), + usable_consensus_flavor())) { log_info(LD_REND, "Can't fetch descriptor for service %s because we " "are missing a live consensus. Stalling connection.", safe_str_client(ed25519_fmt(identity_pk))); |