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

Send a bootstrap problem "warn" event on the first problem if the

Browse Source 
reason is NO_ROUTE (that is, our network is down).


svn:r15443
This commit is contained in:
Roger Dingledine 2008-06-24 08:00:30 +00:00
parent 470f89119a
commit aec928e0b6
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,4 +1,8 @@
Changes in version 0.2.1.3-alpha - 2008-06-xx Changes in version 0.2.1.3-alpha - 2008-06-xx
o Bootstrapping bugfixes (on 0.2.1.x-alpha):
- Send a bootstrap problem "warn" event on the first problem if the
reason is NO_ROUTE (that is, our network is down).
o Minor bugfixes: o Minor bugfixes:
- Change the contrib/tor.logrotate script so it makes the new - Change the contrib/tor.logrotate script so it makes the new
logs as "_tor:_tor" rather than the default, which is generally logs as "_tor:_tor" rather than the default, which is generally

7
src/or/control.c
View File

@ -3828,8 +3828,8 @@ control_event_bootstrap(bootstrap_status_t status, int progress)
if (status > bootstrap_percent || if (status > bootstrap_percent ||
(progress && progress > bootstrap_percent)) { (progress && progress > bootstrap_percent)) {
bootstrap_status_to_string(status, &tag, &summary); bootstrap_status_to_string(status, &tag, &summary);
log_notice(LD_CONTROL, "Bootstrapped %d%%: %s.", log(status ? LOG_NOTICE : LOG_INFO, LD_CONTROL,
progress ? progress : status, summary); "Bootstrapped %d%%: %s.", progress ? progress : status, summary);
tor_snprintf(buf, sizeof(buf), tor_snprintf(buf, sizeof(buf),
"BOOTSTRAP PROGRESS=%d TAG=%s SUMMARY=\"%s\"", "BOOTSTRAP PROGRESS=%d TAG=%s SUMMARY=\"%s\"",
progress ? progress : status, tag, summary); progress ? progress : status, tag, summary);
@ -3868,6 +3868,9 @@ control_event_bootstrap_problem(const char *warn, int reason)
if (bootstrap_problems >= BOOTSTRAP_PROBLEM_THRESHOLD) if (bootstrap_problems >= BOOTSTRAP_PROBLEM_THRESHOLD)
recommendation = "warn"; recommendation = "warn";
if (reason == END_OR_CONN_REASON_NO_ROUTE)
recommendation = "warn";
if (get_options()->UseBridges && if (get_options()->UseBridges &&
!any_bridge_descriptors_known() && !any_bridge_descriptors_known() &&
!any_pending_bridge_descriptor_fetches()) !any_pending_bridge_descriptor_fetches())

2
src/or/directory.c
View File

@ -588,7 +588,7 @@ connection_dir_download_routerdesc_failed(dir_connection_t *conn)
* it's not their fault. */ * it's not their fault. */
/* No need to relaunch descriptor downloads here: we already do it /* No need to relaunch descriptor downloads here: we already do it
* every 10 seconds (DESCRIPTOR_RETRY_INTERVAL) in main.c. */ * every 10 or 60 seconds (FOO_DESCRIPTOR_RETRY_INTERVAL) in main.c. */
tor_assert(conn->_base.purpose == DIR_PURPOSE_FETCH_SERVERDESC || tor_assert(conn->_base.purpose == DIR_PURPOSE_FETCH_SERVERDESC ||
conn->_base.purpose == DIR_PURPOSE_FETCH_EXTRAINFO); conn->_base.purpose == DIR_PURPOSE_FETCH_EXTRAINFO);