mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 14:51:11 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'public/bug9927' into maint-0.2.4

Browse source
This commit is contained in:
Nick Mathewson 2013-10-08 13:37:13 -04:00
commit 50fc8fb5c5
3 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changes/bug9927 Normal file
View file

@ -0,0 +1,4 @@
o Minor features:
- Generate bootstrapping status update events correctly for fetching
microdescriptors. Fixes bug 9927.

2
src/or/directory.c
View file

@ -2111,6 +2111,8 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
/* Mark remaining ones as failed. */ /* Mark remaining ones as failed. */
dir_microdesc_download_failed(which, status_code); dir_microdesc_download_failed(which, status_code);
} }
control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS,
count_loading_descriptors_progress());
SMARTLIST_FOREACH(which, char *, cp, tor_free(cp)); SMARTLIST_FOREACH(which, char *, cp, tor_free(cp));
smartlist_free(which); smartlist_free(which);
smartlist_free(mds); smartlist_free(mds);

1
src/or/relay.c
View file

@ -1103,6 +1103,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:
case DIR_PURPOSE_FETCH_MICRODESC:
control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS, control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS,
count_loading_descriptors_progress()); count_loading_descriptors_progress());
break; break;