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

Minor fix in the warning messages when you're having problems

Browse Source 
bootstrapping; also, be more forgiving of bootstrap problems when
we're still making incremental progress on a given bootstrap phase.


svn:r17066
This commit is contained in:
Roger Dingledine 2008-10-13 03:34:29 +00:00
parent c9bddb24b2
commit d7cfa1f56c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -4,6 +4,11 @@ Changes in version 0.2.1.7-alpha - 2008-10-xx
identity fingerprints, so it's easier to paste them in. identity fingerprints, so it's easier to paste them in.
Suggested by Lucky Green. Suggested by Lucky Green.
o Minor bugfixes:
- Minor fix in the warning messages when you're having problems
bootstrapping; also, be more forgiving of bootstrap problems when
we're still making incremental progress on a given bootstrap phase.
Changes in version 0.2.1.6-alpha - 2008-09-30 Changes in version 0.2.1.6-alpha - 2008-09-30
Tor 0.2.1.6-alpha further improves performance and robustness of Tor 0.2.1.6-alpha further improves performance and robustness of

3
src/or/control.c
View File

@ -3866,8 +3866,8 @@ control_event_bootstrap(bootstrap_status_t status, int progress)
if (progress > bootstrap_percent) { if (progress > bootstrap_percent) {
/* incremental progress within a milestone */ /* incremental progress within a milestone */
bootstrap_percent = progress; bootstrap_percent = progress;
bootstrap_problems = 0; /* Progress! Reset our problem counter. */
} }
bootstrap_problems = 0; /* Progress! Reset our problem counter. */
} }
} }
@ -3901,6 +3901,7 @@ control_event_bootstrap_problem(const char *warn, int reason)
while (status>=0 && bootstrap_status_to_string(status, &tag, &summary) < 0) while (status>=0 && bootstrap_status_to_string(status, &tag, &summary) < 0)
status--; /* find a recognized status string based on current progress */ status--; /* find a recognized status string based on current progress */
status = bootstrap_percent; /* set status back to the actual number */
log_fn(!strcmp(recommendation, "warn") ? LOG_WARN : LOG_INFO, log_fn(!strcmp(recommendation, "warn") ? LOG_WARN : LOG_INFO,
LD_CONTROL, "Problem bootstrapping. Stuck at %d%%: %s. (%s; %s; " LD_CONTROL, "Problem bootstrapping. Stuck at %d%%: %s. (%s; %s; "