mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 21:23:58 +01:00
Merge branch 'tor-gitlab/mr/254' into maint-0.3.5
This commit is contained in:
commit
1bdccc03a9
5
changes/ticket40237
Normal file
5
changes/ticket40237
Normal file
@ -0,0 +1,5 @@
|
||||
o Major bugfixes (onion service v3):
|
||||
- Stop requiring a live consensus for v3 clients and services to work. The
|
||||
use of a reasonably live consensus will allow v3 to work properly in most
|
||||
cases if the network failed to generate a consensus for more than 2 hours
|
||||
in a row. Fixes bug 40237; bugfix on 0.3.5.1-alpha.
|
@ -2511,7 +2511,8 @@ hs_service_callback(time_t now, const or_options_t *options)
|
||||
/* We need to at least be able to build circuits and that we actually have
|
||||
* a working network. */
|
||||
if (!have_completed_a_circuit() || net_is_disabled() ||
|
||||
networkstatus_get_live_consensus(now) == NULL) {
|
||||
!networkstatus_get_reasonably_live_consensus(now,
|
||||
usable_consensus_flavor())) {
|
||||
goto end;
|
||||
}
|
||||
|
||||
|
@ -17,6 +17,7 @@
|
||||
#include "feature/hs/hs_common.h"
|
||||
#include "feature/hs/hs_client.h"
|
||||
#include "feature/hs/hs_descriptor.h"
|
||||
#include "feature/nodelist/microdesc.h"
|
||||
#include "feature/nodelist/networkstatus.h"
|
||||
#include "feature/rend/rendcache.h"
|
||||
|
||||
@ -673,7 +674,9 @@ cached_client_descriptor_has_expired(time_t now,
|
||||
/* We use the current consensus time to see if we should expire this
|
||||
* descriptor since we use consensus time for all other parts of the protocol
|
||||
* as well (e.g. to build the blinded key and compute time periods). */
|
||||
const networkstatus_t *ns = networkstatus_get_live_consensus(now);
|
||||
const networkstatus_t *ns =
|
||||
networkstatus_get_reasonably_live_consensus(now,
|
||||
usable_consensus_flavor());
|
||||
/* If we don't have a recent consensus, consider this entry expired since we
|
||||
* will want to fetch a new HS desc when we get a live consensus. */
|
||||
if (!ns) {
|
||||
|
@ -29,6 +29,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"
|
||||
@ -1181,9 +1182,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)));
|
||||
|
@ -25,6 +25,7 @@
|
||||
#include "feature/hs/hs_service.h"
|
||||
#include "feature/hs_common/shared_random_client.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"
|
||||
@ -272,7 +273,9 @@ hs_get_time_period_num(time_t now)
|
||||
if (now != 0) {
|
||||
current_time = now;
|
||||
} else {
|
||||
networkstatus_t *ns = networkstatus_get_live_consensus(approx_time());
|
||||
networkstatus_t *ns =
|
||||
networkstatus_get_reasonably_live_consensus(approx_time(),
|
||||
usable_consensus_flavor());
|
||||
current_time = ns ? ns->valid_after : approx_time();
|
||||
}
|
||||
|
||||
@ -1098,7 +1101,8 @@ hs_in_period_between_tp_and_srv,(const networkstatus_t *consensus, time_t now))
|
||||
time_t srv_start_time, tp_start_time;
|
||||
|
||||
if (!consensus) {
|
||||
consensus = networkstatus_get_live_consensus(now);
|
||||
consensus = networkstatus_get_reasonably_live_consensus(now,
|
||||
usable_consensus_flavor());
|
||||
if (!consensus) {
|
||||
return 0;
|
||||
}
|
||||
@ -1343,7 +1347,9 @@ hs_get_responsible_hsdirs(const ed25519_public_key_t *blinded_pk,
|
||||
sorted_nodes = smartlist_new();
|
||||
|
||||
/* Make sure we actually have a live consensus */
|
||||
networkstatus_t *c = networkstatus_get_live_consensus(approx_time());
|
||||
networkstatus_t *c =
|
||||
networkstatus_get_reasonably_live_consensus(approx_time(),
|
||||
usable_consensus_flavor());
|
||||
if (!c || smartlist_len(c->routerstatus_list) == 0) {
|
||||
log_warn(LD_REND, "No live consensus so we can't get the responsible "
|
||||
"hidden service directories.");
|
||||
|
@ -23,6 +23,7 @@
|
||||
#include "feature/hs_common/shared_random_client.h"
|
||||
#include "feature/keymgt/loadkey.h"
|
||||
#include "feature/nodelist/describe.h"
|
||||
#include "feature/nodelist/microdesc.h"
|
||||
#include "feature/nodelist/networkstatus.h"
|
||||
#include "feature/nodelist/nickname.h"
|
||||
#include "feature/nodelist/node_select.h"
|
||||
@ -2500,7 +2501,8 @@ should_rotate_descriptors(hs_service_t *service, time_t now)
|
||||
|
||||
tor_assert(service);
|
||||
|
||||
ns = networkstatus_get_live_consensus(now);
|
||||
ns = networkstatus_get_reasonably_live_consensus(now,
|
||||
usable_consensus_flavor());
|
||||
if (ns == NULL) {
|
||||
goto no_rotation;
|
||||
}
|
||||
@ -3100,7 +3102,8 @@ should_service_upload_descriptor(const hs_service_t *service,
|
||||
}
|
||||
|
||||
/* Don't upload desc if we don't have a live consensus */
|
||||
if (!networkstatus_get_live_consensus(now)) {
|
||||
if (!networkstatus_get_reasonably_live_consensus(now,
|
||||
usable_consensus_flavor())) {
|
||||
goto cannot;
|
||||
}
|
||||
|
||||
|
@ -13,6 +13,7 @@
|
||||
|
||||
#include "app/config/config.h"
|
||||
#include "feature/dircommon/voting_schedule.h"
|
||||
#include "feature/nodelist/microdesc.h"
|
||||
#include "feature/nodelist/networkstatus.h"
|
||||
#include "lib/encoding/binascii.h"
|
||||
|
||||
@ -37,7 +38,9 @@ int
|
||||
get_voting_interval(void)
|
||||
{
|
||||
int interval;
|
||||
networkstatus_t *consensus = networkstatus_get_live_consensus(time(NULL));
|
||||
networkstatus_t *consensus =
|
||||
networkstatus_get_reasonably_live_consensus(time(NULL),
|
||||
usable_consensus_flavor());
|
||||
|
||||
if (consensus) {
|
||||
interval = (int)(consensus->fresh_until - consensus->valid_after);
|
||||
@ -142,7 +145,8 @@ sr_get_current(const networkstatus_t *ns)
|
||||
if (ns) {
|
||||
consensus = ns;
|
||||
} else {
|
||||
consensus = networkstatus_get_live_consensus(approx_time());
|
||||
consensus = networkstatus_get_reasonably_live_consensus(approx_time(),
|
||||
usable_consensus_flavor());
|
||||
}
|
||||
/* Ideally we would never be asked for an SRV without a live consensus. Make
|
||||
* sure this assumption is correct. */
|
||||
@ -165,7 +169,8 @@ sr_get_previous(const networkstatus_t *ns)
|
||||
if (ns) {
|
||||
consensus = ns;
|
||||
} else {
|
||||
consensus = networkstatus_get_live_consensus(approx_time());
|
||||
consensus = networkstatus_get_reasonably_live_consensus(approx_time(),
|
||||
usable_consensus_flavor());
|
||||
}
|
||||
/* Ideally we would never be asked for an SRV without a live consensus. Make
|
||||
* sure this assumption is correct. */
|
||||
@ -237,10 +242,14 @@ sr_state_get_start_time_of_current_protocol_run(void)
|
||||
int voting_interval = get_voting_interval();
|
||||
time_t beginning_of_curr_round;
|
||||
|
||||
/* This function is not used for voting purposes, so if we have a live
|
||||
consensus, use its valid-after as the beginning of the current round,
|
||||
otherwise resort to the voting schedule which should always exist. */
|
||||
networkstatus_t *ns = networkstatus_get_live_consensus(approx_time());
|
||||
/* This function is not used for voting purposes, so if we have a reasonably
|
||||
* live consensus, use its valid-after as the beginning of the current
|
||||
* round. If we have no consensus but we're an authority, use our own
|
||||
* schedule. Otherwise, try using our view of the voting interval to figure
|
||||
* out when the current round _should_ be starting. */
|
||||
networkstatus_t *ns =
|
||||
networkstatus_get_reasonably_live_consensus(approx_time(),
|
||||
usable_consensus_flavor());
|
||||
if (ns) {
|
||||
beginning_of_curr_round = ns->valid_after;
|
||||
} else {
|
||||
|
@ -361,7 +361,7 @@ node_set_hsdir_index(node_t *node, const networkstatus_t *ns)
|
||||
tor_assert(node);
|
||||
tor_assert(ns);
|
||||
|
||||
if (!networkstatus_is_live(ns, now)) {
|
||||
if (!networkstatus_consensus_reasonably_live(ns, now)) {
|
||||
static struct ratelim_t live_consensus_ratelim = RATELIM_INIT(30 * 60);
|
||||
log_fn_ratelim(&live_consensus_ratelim, LOG_INFO, LD_GENERAL,
|
||||
"Not setting hsdir index with a non-live consensus.");
|
||||
|
@ -443,9 +443,10 @@ test_hsdir_revision_counter_check(void *arg)
|
||||
static networkstatus_t mock_ns;
|
||||
|
||||
static networkstatus_t *
|
||||
mock_networkstatus_get_live_consensus(time_t now)
|
||||
mock_networkstatus_get_reasonably_live_consensus(time_t now, int flavor)
|
||||
{
|
||||
(void) now;
|
||||
(void) flavor;
|
||||
return &mock_ns;
|
||||
}
|
||||
|
||||
@ -466,8 +467,8 @@ test_client_cache(void *arg)
|
||||
/* Initialize HSDir cache subsystem */
|
||||
init_test();
|
||||
|
||||
MOCK(networkstatus_get_live_consensus,
|
||||
mock_networkstatus_get_live_consensus);
|
||||
MOCK(networkstatus_get_reasonably_live_consensus,
|
||||
mock_networkstatus_get_reasonably_live_consensus);
|
||||
|
||||
/* Set consensus time */
|
||||
parse_rfc1123_time("Sat, 26 Oct 1985 13:00:00 UTC",
|
||||
|
@ -62,16 +62,18 @@ static networkstatus_t mock_ns;
|
||||
|
||||
/* Always return NULL. */
|
||||
static networkstatus_t *
|
||||
mock_networkstatus_get_live_consensus_false(time_t now)
|
||||
mock_networkstatus_get_reasonably_live_consensus_false(time_t now, int flavor)
|
||||
{
|
||||
(void) now;
|
||||
(void) flavor;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static networkstatus_t *
|
||||
mock_networkstatus_get_live_consensus(time_t now)
|
||||
mock_networkstatus_get_reasonably_live_consensus(time_t now, int flavor)
|
||||
{
|
||||
(void) now;
|
||||
(void) flavor;
|
||||
return &mock_ns;
|
||||
}
|
||||
|
||||
@ -340,8 +342,8 @@ test_client_pick_intro(void *arg)
|
||||
ed25519_keypair_t service_kp;
|
||||
hs_descriptor_t *desc = NULL;
|
||||
|
||||
MOCK(networkstatus_get_live_consensus,
|
||||
mock_networkstatus_get_live_consensus);
|
||||
MOCK(networkstatus_get_reasonably_live_consensus,
|
||||
mock_networkstatus_get_reasonably_live_consensus);
|
||||
|
||||
(void) arg;
|
||||
|
||||
@ -565,15 +567,15 @@ test_descriptor_fetch(void *arg)
|
||||
get_options_mutable()->FetchHidServDescriptors = 1;
|
||||
|
||||
/* 2. We don't have a live consensus. */
|
||||
MOCK(networkstatus_get_live_consensus,
|
||||
mock_networkstatus_get_live_consensus_false);
|
||||
MOCK(networkstatus_get_reasonably_live_consensus,
|
||||
mock_networkstatus_get_reasonably_live_consensus_false);
|
||||
ret = hs_client_refetch_hsdesc(&service_pk);
|
||||
UNMOCK(networkstatus_get_live_consensus);
|
||||
UNMOCK(networkstatus_get_reasonably_live_consensus);
|
||||
tt_int_op(ret, OP_EQ, HS_CLIENT_FETCH_MISSING_INFO);
|
||||
|
||||
/* From now on, return a live consensus. */
|
||||
MOCK(networkstatus_get_live_consensus,
|
||||
mock_networkstatus_get_live_consensus);
|
||||
MOCK(networkstatus_get_reasonably_live_consensus,
|
||||
mock_networkstatus_get_reasonably_live_consensus);
|
||||
|
||||
/* 3. Not enough dir information. */
|
||||
MOCK(router_have_minimum_dir_info,
|
||||
@ -615,7 +617,7 @@ test_descriptor_fetch(void *arg)
|
||||
|
||||
done:
|
||||
connection_free_minimal(ENTRY_TO_CONN(ec));
|
||||
UNMOCK(networkstatus_get_live_consensus);
|
||||
UNMOCK(networkstatus_get_reasonably_live_consensus);
|
||||
UNMOCK(router_have_minimum_dir_info);
|
||||
hs_free_all();
|
||||
}
|
||||
@ -808,8 +810,8 @@ test_desc_has_arrived_cleanup(void *arg)
|
||||
|
||||
hs_init();
|
||||
|
||||
MOCK(networkstatus_get_live_consensus,
|
||||
mock_networkstatus_get_live_consensus);
|
||||
MOCK(networkstatus_get_reasonably_live_consensus,
|
||||
mock_networkstatus_get_reasonably_live_consensus);
|
||||
MOCK(connection_mark_unattached_ap_,
|
||||
mock_connection_mark_unattached_ap_);
|
||||
MOCK(router_have_minimum_dir_info,
|
||||
@ -880,7 +882,7 @@ test_desc_has_arrived_cleanup(void *arg)
|
||||
tor_free(desc_str);
|
||||
hs_free_all();
|
||||
|
||||
UNMOCK(networkstatus_get_live_consensus);
|
||||
UNMOCK(networkstatus_get_reasonably_live_consensus);
|
||||
UNMOCK(connection_mark_unattached_ap_);
|
||||
UNMOCK(router_have_minimum_dir_info);
|
||||
}
|
||||
@ -900,8 +902,8 @@ test_close_intro_circuits_new_desc(void *arg)
|
||||
|
||||
/* This is needed because of the client cache expiration timestamp is based
|
||||
* on having a consensus. See cached_client_descriptor_has_expired(). */
|
||||
MOCK(networkstatus_get_live_consensus,
|
||||
mock_networkstatus_get_live_consensus);
|
||||
MOCK(networkstatus_get_reasonably_live_consensus,
|
||||
mock_networkstatus_get_reasonably_live_consensus);
|
||||
|
||||
/* Set consensus time */
|
||||
parse_rfc1123_time("Sat, 26 Oct 1985 13:00:00 UTC",
|
||||
@ -968,7 +970,7 @@ test_close_intro_circuits_new_desc(void *arg)
|
||||
tt_int_op(ret, OP_EQ, 0);
|
||||
tt_assert(encoded);
|
||||
|
||||
hs_cache_store_as_client(encoded, &service_kp.pubkey);
|
||||
ret = hs_cache_store_as_client(encoded, &service_kp.pubkey);
|
||||
tt_int_op(ret, OP_EQ, 0);
|
||||
tor_free(encoded);
|
||||
tt_assert(hs_cache_lookup_as_client(&service_kp.pubkey));
|
||||
@ -983,7 +985,7 @@ test_close_intro_circuits_new_desc(void *arg)
|
||||
hs_descriptor_free(desc1);
|
||||
hs_descriptor_free(desc2);
|
||||
hs_free_all();
|
||||
UNMOCK(networkstatus_get_live_consensus);
|
||||
UNMOCK(networkstatus_get_reasonably_live_consensus);
|
||||
}
|
||||
|
||||
struct testcase_t hs_client_tests[] = {
|
||||
|
@ -359,9 +359,10 @@ mock_networkstatus_get_latest_consensus(void)
|
||||
}
|
||||
|
||||
static networkstatus_t *
|
||||
mock_networkstatus_get_live_consensus(time_t now)
|
||||
mock_networkstatus_get_reasonably_live_consensus(time_t now, int flavor)
|
||||
{
|
||||
(void) now;
|
||||
(void) flavor;
|
||||
|
||||
tt_assert(mock_ns);
|
||||
|
||||
@ -381,6 +382,8 @@ test_responsible_hsdirs(void *arg)
|
||||
|
||||
MOCK(networkstatus_get_latest_consensus,
|
||||
mock_networkstatus_get_latest_consensus);
|
||||
MOCK(networkstatus_get_reasonably_live_consensus,
|
||||
mock_networkstatus_get_reasonably_live_consensus);
|
||||
|
||||
ns = networkstatus_get_latest_consensus();
|
||||
|
||||
@ -417,6 +420,8 @@ test_responsible_hsdirs(void *arg)
|
||||
smartlist_clear(ns->routerstatus_list);
|
||||
networkstatus_vote_free(mock_ns);
|
||||
cleanup_nodelist();
|
||||
|
||||
UNMOCK(networkstatus_get_reasonably_live_consensus);
|
||||
}
|
||||
|
||||
static void
|
||||
@ -466,6 +471,8 @@ test_desc_reupload_logic(void *arg)
|
||||
|
||||
hs_init();
|
||||
|
||||
MOCK(networkstatus_get_reasonably_live_consensus,
|
||||
mock_networkstatus_get_reasonably_live_consensus);
|
||||
MOCK(router_have_minimum_dir_info,
|
||||
mock_router_have_minimum_dir_info);
|
||||
MOCK(get_or_state,
|
||||
@ -877,9 +884,11 @@ static smartlist_t *service_responsible_hsdirs = NULL;
|
||||
static smartlist_t *client_responsible_hsdirs = NULL;
|
||||
|
||||
static networkstatus_t *
|
||||
mock_networkstatus_get_live_consensus_service(time_t now)
|
||||
mock_networkstatus_get_reasonably_live_consensus_service(time_t now,
|
||||
int flavor)
|
||||
{
|
||||
(void) now;
|
||||
(void) flavor;
|
||||
|
||||
if (mock_service_ns) {
|
||||
return mock_service_ns;
|
||||
@ -895,13 +904,14 @@ mock_networkstatus_get_live_consensus_service(time_t now)
|
||||
static networkstatus_t *
|
||||
mock_networkstatus_get_latest_consensus_service(void)
|
||||
{
|
||||
return mock_networkstatus_get_live_consensus_service(0);
|
||||
return mock_networkstatus_get_reasonably_live_consensus_service(0, 0);
|
||||
}
|
||||
|
||||
static networkstatus_t *
|
||||
mock_networkstatus_get_live_consensus_client(time_t now)
|
||||
mock_networkstatus_get_reasonably_live_consensus_client(time_t now, int flavor)
|
||||
{
|
||||
(void) now;
|
||||
(void) flavor;
|
||||
|
||||
if (mock_client_ns) {
|
||||
return mock_client_ns;
|
||||
@ -917,7 +927,7 @@ mock_networkstatus_get_live_consensus_client(time_t now)
|
||||
static networkstatus_t *
|
||||
mock_networkstatus_get_latest_consensus_client(void)
|
||||
{
|
||||
return mock_networkstatus_get_live_consensus_client(0);
|
||||
return mock_networkstatus_get_reasonably_live_consensus_client(0, 0);
|
||||
}
|
||||
|
||||
/* Mock function because we are not trying to test the close circuit that does
|
||||
@ -1377,8 +1387,8 @@ run_reachability_scenario(const reachability_cfg_t *cfg, int num_scenario)
|
||||
* === Client setup ===
|
||||
*/
|
||||
|
||||
MOCK(networkstatus_get_live_consensus,
|
||||
mock_networkstatus_get_live_consensus_client);
|
||||
MOCK(networkstatus_get_reasonably_live_consensus,
|
||||
mock_networkstatus_get_reasonably_live_consensus_client);
|
||||
MOCK(networkstatus_get_latest_consensus,
|
||||
mock_networkstatus_get_latest_consensus_client);
|
||||
|
||||
@ -1402,14 +1412,14 @@ run_reachability_scenario(const reachability_cfg_t *cfg, int num_scenario)
|
||||
tt_int_op(smartlist_len(client_responsible_hsdirs), OP_EQ, 6);
|
||||
|
||||
UNMOCK(networkstatus_get_latest_consensus);
|
||||
UNMOCK(networkstatus_get_live_consensus);
|
||||
UNMOCK(networkstatus_get_reasonably_live_consensus);
|
||||
|
||||
/*
|
||||
* === Service setup ===
|
||||
*/
|
||||
|
||||
MOCK(networkstatus_get_live_consensus,
|
||||
mock_networkstatus_get_live_consensus_service);
|
||||
MOCK(networkstatus_get_reasonably_live_consensus,
|
||||
mock_networkstatus_get_reasonably_live_consensus_service);
|
||||
MOCK(networkstatus_get_latest_consensus,
|
||||
mock_networkstatus_get_latest_consensus_service);
|
||||
|
||||
@ -1436,7 +1446,7 @@ run_reachability_scenario(const reachability_cfg_t *cfg, int num_scenario)
|
||||
tt_int_op(smartlist_len(service_responsible_hsdirs), OP_EQ, 8);
|
||||
|
||||
UNMOCK(networkstatus_get_latest_consensus);
|
||||
UNMOCK(networkstatus_get_live_consensus);
|
||||
UNMOCK(networkstatus_get_reasonably_live_consensus);
|
||||
|
||||
/* Some testing of the values we just got from the client and service. */
|
||||
tt_mem_op(&client_blinded_pk, OP_EQ, &service_blinded_pk,
|
||||
@ -1687,8 +1697,8 @@ test_client_service_hsdir_set_sync(void *arg)
|
||||
|
||||
MOCK(networkstatus_get_latest_consensus,
|
||||
mock_networkstatus_get_latest_consensus);
|
||||
MOCK(networkstatus_get_live_consensus,
|
||||
mock_networkstatus_get_live_consensus);
|
||||
MOCK(networkstatus_get_reasonably_live_consensus,
|
||||
mock_networkstatus_get_reasonably_live_consensus);
|
||||
MOCK(get_or_state,
|
||||
get_or_state_replacement);
|
||||
MOCK(hs_desc_encode_descriptor,
|
||||
|
@ -79,9 +79,10 @@
|
||||
static networkstatus_t mock_ns;
|
||||
|
||||
static networkstatus_t *
|
||||
mock_networkstatus_get_live_consensus(time_t now)
|
||||
mock_networkstatus_get_reasonably_live_consensus(time_t now, int flavor)
|
||||
{
|
||||
(void) now;
|
||||
(void) flavor;
|
||||
return &mock_ns;
|
||||
}
|
||||
|
||||
@ -1302,8 +1303,8 @@ test_rotate_descriptors(void *arg)
|
||||
hs_init();
|
||||
MOCK(get_or_state, get_or_state_replacement);
|
||||
MOCK(circuit_mark_for_close_, mock_circuit_mark_for_close);
|
||||
MOCK(networkstatus_get_live_consensus,
|
||||
mock_networkstatus_get_live_consensus);
|
||||
MOCK(networkstatus_get_reasonably_live_consensus,
|
||||
mock_networkstatus_get_reasonably_live_consensus);
|
||||
|
||||
/* Descriptor rotation happens with a consensus with a new SRV. */
|
||||
|
||||
@ -1387,7 +1388,7 @@ test_rotate_descriptors(void *arg)
|
||||
hs_free_all();
|
||||
UNMOCK(get_or_state);
|
||||
UNMOCK(circuit_mark_for_close_);
|
||||
UNMOCK(networkstatus_get_live_consensus);
|
||||
UNMOCK(networkstatus_get_reasonably_live_consensus);
|
||||
}
|
||||
|
||||
/** Test building descriptors: picking intro points, setting up their link
|
||||
@ -1408,8 +1409,8 @@ test_build_update_descriptors(void *arg)
|
||||
|
||||
MOCK(get_or_state,
|
||||
get_or_state_replacement);
|
||||
MOCK(networkstatus_get_live_consensus,
|
||||
mock_networkstatus_get_live_consensus);
|
||||
MOCK(networkstatus_get_reasonably_live_consensus,
|
||||
mock_networkstatus_get_reasonably_live_consensus);
|
||||
|
||||
dummy_state = tor_malloc_zero(sizeof(or_state_t));
|
||||
|
||||
@ -1633,8 +1634,8 @@ test_build_descriptors(void *arg)
|
||||
|
||||
MOCK(get_or_state,
|
||||
get_or_state_replacement);
|
||||
MOCK(networkstatus_get_live_consensus,
|
||||
mock_networkstatus_get_live_consensus);
|
||||
MOCK(networkstatus_get_reasonably_live_consensus,
|
||||
mock_networkstatus_get_reasonably_live_consensus);
|
||||
|
||||
dummy_state = tor_malloc_zero(sizeof(or_state_t));
|
||||
|
||||
@ -1714,8 +1715,8 @@ test_upload_descriptors(void *arg)
|
||||
hs_init();
|
||||
MOCK(get_or_state,
|
||||
get_or_state_replacement);
|
||||
MOCK(networkstatus_get_live_consensus,
|
||||
mock_networkstatus_get_live_consensus);
|
||||
MOCK(networkstatus_get_reasonably_live_consensus,
|
||||
mock_networkstatus_get_reasonably_live_consensus);
|
||||
|
||||
dummy_state = tor_malloc_zero(sizeof(or_state_t));
|
||||
|
||||
|
@ -164,6 +164,15 @@ mock_networkstatus_get_live_consensus(time_t now)
|
||||
return &mock_consensus;
|
||||
}
|
||||
|
||||
/* Mock function to immediately return our local 'mock_consensus'. */
|
||||
static networkstatus_t *
|
||||
mock_networkstatus_get_reasonably_live_consensus(time_t now, int flavor)
|
||||
{
|
||||
(void) now;
|
||||
(void) flavor;
|
||||
return &mock_consensus;
|
||||
}
|
||||
|
||||
static void
|
||||
test_get_state_valid_until_time(void *arg)
|
||||
{
|
||||
@ -176,6 +185,8 @@ test_get_state_valid_until_time(void *arg)
|
||||
|
||||
MOCK(networkstatus_get_live_consensus,
|
||||
mock_networkstatus_get_live_consensus);
|
||||
MOCK(networkstatus_get_reasonably_live_consensus,
|
||||
mock_networkstatus_get_reasonably_live_consensus);
|
||||
|
||||
retval = parse_rfc1123_time("Mon, 20 Apr 2015 01:00:00 UTC",
|
||||
&mock_consensus.fresh_until);
|
||||
@ -232,7 +243,7 @@ test_get_state_valid_until_time(void *arg)
|
||||
}
|
||||
|
||||
done:
|
||||
UNMOCK(networkstatus_get_live_consensus);
|
||||
UNMOCK(networkstatus_get_reasonably_live_consensus);
|
||||
}
|
||||
|
||||
/** Test the function that calculates the start time of the current SRV
|
||||
@ -248,6 +259,8 @@ test_get_start_time_of_current_run(void *arg)
|
||||
|
||||
MOCK(networkstatus_get_live_consensus,
|
||||
mock_networkstatus_get_live_consensus);
|
||||
MOCK(networkstatus_get_reasonably_live_consensus,
|
||||
mock_networkstatus_get_reasonably_live_consensus);
|
||||
|
||||
retval = parse_rfc1123_time("Mon, 20 Apr 2015 01:00:00 UTC",
|
||||
&mock_consensus.fresh_until);
|
||||
@ -331,6 +344,7 @@ test_get_start_time_of_current_run(void *arg)
|
||||
/* Next test is testing it without a consensus to use the testing voting
|
||||
* interval . */
|
||||
UNMOCK(networkstatus_get_live_consensus);
|
||||
UNMOCK(networkstatus_get_reasonably_live_consensus);
|
||||
|
||||
/* Now let's alter the voting schedule and check the correctness of the
|
||||
* function. Voting interval of 10 seconds, means that an SRV protocol run
|
||||
@ -362,8 +376,8 @@ test_get_start_time_functions(void *arg)
|
||||
(void) arg;
|
||||
int retval;
|
||||
|
||||
MOCK(networkstatus_get_live_consensus,
|
||||
mock_networkstatus_get_live_consensus);
|
||||
MOCK(networkstatus_get_reasonably_live_consensus,
|
||||
mock_networkstatus_get_reasonably_live_consensus);
|
||||
|
||||
retval = parse_rfc1123_time("Mon, 20 Apr 2015 01:00:00 UTC",
|
||||
&mock_consensus.fresh_until);
|
||||
@ -384,7 +398,7 @@ test_get_start_time_functions(void *arg)
|
||||
start_time_of_protocol_run);
|
||||
|
||||
done:
|
||||
UNMOCK(networkstatus_get_live_consensus);
|
||||
UNMOCK(networkstatus_get_reasonably_live_consensus);
|
||||
}
|
||||
|
||||
static void
|
||||
|
Loading…
Reference in New Issue
Block a user