nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor control_event_bootstrap() somewhat

Browse Source 
Move the mostly-invariant part of control_event_boostrap() into a
helper control_event_bootstrap_core().  The helper doesn't modify any
state beyond doing logging and control port notifications.
This commit is contained in:
Taylor Yu 2018-08-28 14:31:51 -05:00
parent e2988e044d
commit 15c24d669f
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/feature/control/control.c
View File

@ -7095,6 +7095,29 @@ static int bootstrap_problems = 0;
*/
#define BOOTSTRAP_PCT_INCREMENT 5
/** Do the actual logging and notifications for
* control_event_bootstrap(). Doesn't change any state beyond that.
*/
static void
control_event_bootstrap_core(int loglevel, bootstrap_status_t status,
int progress)
{
char buf[BOOTSTRAP_MSG_LEN];
const char *tag, *summary;
bootstrap_status_to_string(status, &tag, &summary);
tor_log(loglevel, LD_CONTROL,
"Bootstrapped %d%%: %s", progress ? progress : status, summary);
tor_snprintf(buf, sizeof(buf),
"BOOTSTRAP PROGRESS=%d TAG=%s SUMMARY=\"%s\"",
progress ? progress : status, tag, summary);
tor_snprintf(last_sent_bootstrap_message,
sizeof(last_sent_bootstrap_message),
"NOTICE %s", buf);
control_event_client_status(LOG_NOTICE, "%s", buf);
}
/** Called when Tor has made progress at bootstrapping its directory
* information and initial circuits.
*
@ -7105,8 +7128,6 @@ static int bootstrap_problems = 0;
void
control_event_bootstrap(bootstrap_status_t status, int progress)
{
const char *tag, *summary;
char buf[BOOTSTRAP_MSG_LEN];
int loglevel = LOG_NOTICE;
if (bootstrap_percent == BOOTSTRAP_STATUS_DONE)
@ -7131,15 +7152,8 @@ control_event_bootstrap(bootstrap_status_t status, int progress)
loglevel = LOG_INFO;
}
tor_log(loglevel, LD_CONTROL,
"Bootstrapped %d%%: %s", progress ? progress : status, summary);
tor_snprintf(buf, sizeof(buf),
"BOOTSTRAP PROGRESS=%d TAG=%s SUMMARY=\"%s\"",
progress ? progress : status, tag, summary);
tor_snprintf(last_sent_bootstrap_message,
sizeof(last_sent_bootstrap_message),
"NOTICE %s", buf);
control_event_client_status(LOG_NOTICE, "%s", buf);
control_event_bootstrap_core(loglevel, status, progress);
if (status > bootstrap_percent) {
bootstrap_percent = status; /* new milestone reached */
}