Generate bootstrapping status messages for microdescs too

Fix for 9927.

diff --git a/changes/bug9927 b/changes/bug9927
new file mode 100644 (file)
index 0000000..e66280c
--- /dev/null
+++ b/changes/bug9927
@@ -0,0 +1,4 @@
+  o Minor features:
+    - Generate bootstrapping status update events correctly for fetching
+      microdescriptors. Fixes bug 9927.
+

diff --git a/src/or/directory.c b/src/or/directory.c
index b4381ac0de9fdc455d79e5b587f243393c59e8ef..3752367c448bbff7fdbf4dae941bc562fe729677 100644 (file)
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -2111,6 +2111,8 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
         /* Mark remaining ones as failed. */
         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_free(which);
       smartlist_free(mds);

diff --git a/src/or/relay.c b/src/or/relay.c
index 3138c5e8d11f6c31ef22b4bc45660c1e3a1abcaf..29dc36194aaf92edc09c8d93b393b3fd9b7ca51f 100644 (file)
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1103,6 +1103,7 @@ connection_edge_process_relay_cell_not_open(
           control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_STATUS, 0);
           break;
         case DIR_PURPOSE_FETCH_SERVERDESC:
+        case DIR_PURPOSE_FETCH_MICRODESC:
           control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS,
                                   count_loading_descriptors_progress());
           break;