torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Stop checking cached bridge descriptors for usable bridges

Browse Source 
Stop checking for bridge descriptors when we actually want to know if
any bridges are usable. This avoids potential bootstrapping issues.
Fixes bug 24367; bugfix on 0.2.0.3-alpha.

Stop stalling when bridges are changed at runtime. Stop stalling when
old bridge descriptors are cached, but they are not in use.
Fixes bug 24367; bugfix on 23347 in 0.3.2.1-alpha.
This commit is contained in:
teor
2017-11-22 01:50:46 +11:00
parent da82e0b579
commit 690f646bf8
9 changed files with 27 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test_dir.c
+10 -9
View File
@@ -5875,11 +5875,11 @@ mock_networkstatus_consensus_can_use_extra_fallbacks(
return mock_networkstatus_consensus_can_use_extra_fallbacks_value;
}
static int mock_any_bridge_descriptors_known_value = 0;
static int mock_num_bridges_usable_value = 0;
static int
mock_any_bridge_descriptors_known(void)
mock_num_bridges_usable(void)
{
return mock_any_bridge_descriptors_known_value;
return mock_num_bridges_usable_value;
}
/* data is a 3 character nul-terminated string.
@@ -5908,17 +5908,18 @@ test_dir_find_dl_schedule(void* data)
}
if (str[2] == 'r') {
mock_any_bridge_descriptors_known_value = 1;
/* Any positive, non-zero value should work */
mock_num_bridges_usable_value = 2;
} else {
mock_any_bridge_descriptors_known_value = 0;
mock_num_bridges_usable_value = 0;
}
MOCK(networkstatus_consensus_is_bootstrapping,
mock_networkstatus_consensus_is_bootstrapping);
MOCK(networkstatus_consensus_can_use_extra_fallbacks,
mock_networkstatus_consensus_can_use_extra_fallbacks);
MOCK(any_bridge_descriptors_known,
mock_any_bridge_descriptors_known);
MOCK(num_bridges_usable,
mock_num_bridges_usable);
download_status_t dls;
smartlist_t server, client, server_cons, client_cons;
@@ -6030,7 +6031,7 @@ test_dir_find_dl_schedule(void* data)
/* client */
mock_options->ClientOnly = 1;
mock_options->UseBridges = 1;
if (any_bridge_descriptors_known()) {
if (num_bridges_usable() > 0) {
tt_ptr_op(find_dl_schedule(&dls, mock_options), OP_EQ, &bridge);
} else {
tt_ptr_op(find_dl_schedule(&dls, mock_options), OP_EQ, &bridge_bootstrap);
@@ -6039,7 +6040,7 @@ test_dir_find_dl_schedule(void* data)
done:
UNMOCK(networkstatus_consensus_is_bootstrapping);
UNMOCK(networkstatus_consensus_can_use_extra_fallbacks);
UNMOCK(any_bridge_descriptors_known);
UNMOCK(num_bridges_usable);
UNMOCK(get_options);
tor_free(mock_options);
mock_options = NULL;