summaryrefslogtreecommitdiff
path: root/src/feature/control
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-02-25 12:58:23 -0500
committerNick Mathewson <nickm@torproject.org>2020-02-25 12:58:23 -0500
commit11adf0f46f88bc07c0c080b3b8f1725b0ad382c6 (patch)
treed033ff3529317e18c7a1feb51fc4be5594fb5093 /src/feature/control
parentc9bd3579f7e77076eb3543cc5875ed8f9a0d689a (diff)
parent84f2e282049dfb892f4ba849fae4e0c19b7a4166 (diff)
downloadtor-11adf0f46f88bc07c0c080b3b8f1725b0ad382c6.tar.gz
tor-11adf0f46f88bc07c0c080b3b8f1725b0ad382c6.zip
Merge remote-tracking branch 'tor-github/pr/1750/head'
Diffstat (limited to 'src/feature/control')
-rw-r--r--src/feature/control/control_bootstrap.c6
-rw-r--r--src/feature/control/control_events.h1
2 files changed, 7 insertions, 0 deletions
diff --git a/src/feature/control/control_bootstrap.c b/src/feature/control/control_bootstrap.c
index 2e78fad690..fee7612ba2 100644
--- a/src/feature/control/control_bootstrap.c
+++ b/src/feature/control/control_bootstrap.c
@@ -171,6 +171,12 @@ control_event_bootstrap_core(int loglevel, bootstrap_status_t status,
control_event_client_status(LOG_NOTICE, "%s", buf);
}
+int
+control_get_bootstrap_percent(void)
+{
+ return bootstrap_percent;
+}
+
/** Called when Tor has made progress at bootstrapping its directory
* information and initial circuits.
*
diff --git a/src/feature/control/control_events.h b/src/feature/control/control_events.h
index 74bbc0047d..4f960b2443 100644
--- a/src/feature/control/control_events.h
+++ b/src/feature/control/control_events.h
@@ -164,6 +164,7 @@ int control_event_buildtimeout_set(buildtimeout_set_event_t type,
int control_event_signal(uintptr_t signal);
void control_event_bootstrap(bootstrap_status_t status, int progress);
+int control_get_bootstrap_percent(void);
MOCK_DECL(void, control_event_bootstrap_prob_or,(const char *warn,
int reason,
or_connection_t *or_conn));