mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 10:12:15 +01:00
Code Issues Projects Releases Wiki Activity

don't lie about bootstrap progress when clients use bridges

Browse Source 
we were listing 50% as soon as we got a bridge's relay descriptor,
even if we didn't have any consensus, certificates, etc yet.
This commit is contained in:
Roger Dingledine 2013-10-08 11:50:53 -04:00
parent 245ecfff36
commit 5f13ae4b03
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug9922 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes:
- When clients use bridges, [...] Fixes bug 9922; bugfix on [...]

1
src/or/directory.c
View File

@ -1639,6 +1639,7 @@ load_downloaded_routers(const char *body, smartlist_t *which,
added = router_load_routers_from_string(body, NULL, SAVED_NOWHERE, which, added = router_load_routers_from_string(body, NULL, SAVED_NOWHERE, which,
descriptor_digests, buf); descriptor_digests, buf);
if (general)
control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS, control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS,
count_loading_descriptors_progress()); count_loading_descriptors_progress());
return added; return added;

1
src/or/relay.c
View File

@ -1106,6 +1106,7 @@ connection_edge_process_relay_cell_not_open(
control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_STATUS, 0); control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_STATUS, 0);
break; break;
case DIR_PURPOSE_FETCH_SERVERDESC: case DIR_PURPOSE_FETCH_SERVERDESC:
if (TO_DIR_CONN(dirconn)->router_purpose == ROUTER_PURPOSE_GENERAL)
control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS, control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS,
count_loading_descriptors_progress()); count_loading_descriptors_progress());
break; break;