commit 5f13ae4b032d033ec51bb79fc69717e02faaefd1 Author: Roger Dingledine arma@torproject.org Date: Tue Oct 8 11:50:53 2013 -0400
don't lie about bootstrap progress when clients use bridges
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. --- changes/bug9922 | 3 +++ src/or/directory.c | 5 +++-- src/or/relay.c | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/changes/bug9922 b/changes/bug9922 new file mode 100644 index 0000000..1953800 --- /dev/null +++ b/changes/bug9922 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - When clients use bridges, [...] Fixes bug 9922; bugfix on [...] + diff --git a/src/or/directory.c b/src/or/directory.c index 45992e8..8c242d8 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1639,8 +1639,9 @@ load_downloaded_routers(const char *body, smartlist_t *which,
added = router_load_routers_from_string(body, NULL, SAVED_NOWHERE, which, descriptor_digests, buf); - control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS, - count_loading_descriptors_progress()); + if (general) + control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS, + count_loading_descriptors_progress()); return added; }
diff --git a/src/or/relay.c b/src/or/relay.c index 010dd1d..b2695ce 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1106,8 +1106,9 @@ connection_edge_process_relay_cell_not_open( control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_STATUS, 0); break; case DIR_PURPOSE_FETCH_SERVERDESC: - control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS, - count_loading_descriptors_progress()); + if (TO_DIR_CONN(dirconn)->router_purpose == ROUTER_PURPOSE_GENERAL) + control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS, + count_loading_descriptors_progress()); break; } }