tor-commits April 2015

tor-commits@lists.torproject.org

19 participants
1110 discussions

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 17 Apr '15

17 Apr '15

commit 13418b0a8a29aacbfb8fe1b72583087afbbdb03e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 17 18:15:35 2015 +0000 Update translations for tails-misc --- ro.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ro.po b/ro.po index f4211a7..9b445cf 100644 --- a/ro.po +++ b/ro.po @@ -5,6 +5,7 @@ # Translators: # Andrei Draga, 2013 # axel_89 <axel_rap(a)yahoo.com>, 2015 +# devod <ipawnyou(a)icloud.com>, 2015 # Draga Bianca - Madalina <dragabianca(a)yahoo.com>, 2014 # Nicola Radu <estonyte(a)yahoo.com>, 2014 # Paul Ionut Anton, 2014 @@ -16,8 +17,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-03-30 16:51+0200\n" -"PO-Revision-Date: 2015-04-05 22:41+0000\n" -"Last-Translator: axel_89 <axel_rap(a)yahoo.com>\n" +"PO-Revision-Date: 2015-04-17 17:59+0000\n" +"Last-Translator: devod <ipawnyou(a)icloud.com>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/torproject/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -373,7 +374,7 @@ msgid "" "<a " "href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>Learn" " more...</a>" -msgstr "" +msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'> Află mai multe...</a>" #: config/chroot_local-includes/usr/local/bin/tor-browser:18 msgid "Tor is not ready"

1 0

[tor-launcher/master] Bug 11879: Stop bootstrap if Cancel or Open Settings is clicked.
by mikeperry＠torproject.org 17 Apr '15

17 Apr '15

commit 81fd61c79e77e8dcbcfa42559a727ac384583f03 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Apr 16 11:49:00 2015 -0400 Bug 11879: Stop bootstrap if Cancel or Open Settings is clicked. Fix a related problem where the progress dialog immediately closed itself if an error had previously been reported. Send SETCONF DisableNetwork=0 instead of SETCONF DisableNetwork (this makes it easier to interpret debug logs). --- src/chrome/content/progress.js | 29 ++++++++++++++++++++++++++++- src/components/tl-process.js | 1 + src/components/tl-protocol.js | 4 +++- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/progress.js b/src/chrome/content/progress.js index 8208398..b44dca5 100644 --- a/src/chrome/content/progress.js +++ b/src/chrome/content/progress.js @@ -15,6 +15,9 @@ const kTorLogHasWarnOrErrTopic = "TorLogHasWarnOrErr"; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherUtil", "resource://torlauncher/modules/tl-util.jsm"); +XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger", + "resource://torlauncher/modules/tl-logger.jsm"); + var gObsSvc; var gOpenerCallbackFunc; // Set when opened from network settings. @@ -110,7 +113,7 @@ function onCancel() if (gOpenerCallbackFunc) { - // TODO: stop the bootstrapping process? + stopTorBootstrap(); gOpenerCallbackFunc(false); } else try @@ -126,11 +129,35 @@ function onCancel() function onOpenSettings() { + stopTorBootstrap(); cleanup(); window.close(); } +function stopTorBootstrap() +{ + // Tell tor to disable use of the network; this should stop the bootstrap + // process. + const kErrorPrefix = "Setting DisableNetwork=1 failed: "; + try + { + var svc = Cc["@torproject.org/torlauncher-protocol-service;1"] + .getService(Ci.nsISupports); + svc = svc.wrappedJSObject; + var settings = {}; + settings["DisableNetwork"] = true; + var errObj = {}; + if (!svc.TorSetConfWithReply(settings, errObj)) + TorLauncherLogger.log(5, kErrorPrefix + errObj.details); + } + catch(e) + { + TorLauncherLogger.log(5, kErrorPrefix + e); + } +} + + var gObserver = { // nsIObserver implementation. observe: function(aSubject, aTopic, aParam) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index ef2b12c..80cd7ea 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -275,6 +275,7 @@ TorProcessService.prototype = TorClearBootstrapError: function() { + this.mBootstrapErrorOccurred = false; this.mLastTorWarningPhase = null; this.mLastTorWarningReason = null; }, diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index 559bb37..fdc2394 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -206,6 +206,8 @@ TorProtocolService.prototype = // aSettingsObj should be a JavaScript object with keys (property values) // that correspond to tor config. keys. The value associated with each // key should be a simple string, a string array, or a Boolean value. + // If an associated value is undefined or null, a key with no value is + // passed in the SETCONF command. // If a fatal error occurs, null is returned. Otherwise, a reply object is // returned. TorSetConf: function(aSettingsObj) @@ -221,7 +223,7 @@ TorProtocolService.prototype = else cmdArgs += ' ' + key; var val = aSettingsObj[key]; - if (val) + if ((val !== undefined) && (val !== null)) { var valType = (typeof val); if ("boolean" == valType)

1 0

[tor-launcher/master] Merge remote-tracking branch 'brade/bug11879-02'
by mikeperry＠torproject.org 17 Apr '15

17 Apr '15

commit 2d7e66fa39cf3e9da4242e17171ff02cf14bcf9a Merge: fd61cb0 81fd61c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Apr 16 18:57:54 2015 -0700 Merge remote-tracking branch 'brade/bug11879-02' src/chrome/content/progress.js | 29 ++++++++++++++++++++++++++++- src/components/tl-process.js | 1 + src/components/tl-protocol.js | 4 +++- 3 files changed, 32 insertions(+), 2 deletions(-)

1 0

[tor-launcher/master] Bug 15704: Do not enable network if wizard is opened.
by mikeperry＠torproject.org 17 Apr '15

17 Apr '15

commit fd61cb0e01d9dfb8904be00019d0546330a91b06 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Apr 16 12:24:27 2015 -0400 Bug 15704: Do not enable network if wizard is opened. If default bridges were configured and the network settings wizard was opened during a subsequent launch of Tor Browser (e.g., after a failed bootstrap), Tor Launcher was incorrectly setting DisableNetwork=0. --- src/components/tl-process.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index ef2b12c..9265052 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -559,12 +559,17 @@ TorProcessService.prototype = var errObj = {}; var didSucceed = this.mProtocolSvc.TorSetConfWithReply(settings, errObj); - settings = {}; - settings["DisableNetwork"] = false; - if (!this.mProtocolSvc.TorSetConfWithReply(settings, - (didSucceed) ? errObj : null)) + // If the network settings wizard was not opened at startup, enable the + // network so that bootstrapping will proceed with the default bridges. + if (!TorLauncherUtil.shouldShowNetworkSettings) { - didSucceed = false; + settings = {}; + settings["DisableNetwork"] = false; + if (!this.mProtocolSvc.TorSetConfWithReply(settings, + (didSucceed) ? errObj : null)) + { + didSucceed = false; + } } if (didSucceed)

1 0

[webwml/master] Switch press contact number away from main office number.
by nickm＠torproject.org 16 Apr '15

16 Apr '15

commit 82fadec1d01ce9a1157ea226cc25f9936baa7711 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 16 12:47:24 2015 -0400 Switch press contact number away from main office number. --- about/en/contact.wml | 4 +++- press/en/info.wmi | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/about/en/contact.wml b/about/en/contact.wml index a853ea1..787cfed 100644 --- a/about/en/contact.wml +++ b/about/en/contact.wml @@ -94,10 +94,12 @@ <h3><a class="anchor" href="#phone">Telephone</a></h3> <p>The Tor office is reachable at +1-781-948-1982. Please be aware that your phone company and ours (and everyone in between) could listen to - the call. Please do not call for technical support, rather email + the call. Please do not call for technical support. Instead, email <em>help(a)rt.torproject.org</em>. Technical support phone calls are not returned.</p> + <p>For press inquiries, please call +1-617-902-0208.</p> + <a id="mail"></a> <h3><a class="anchor" href="#mail">Mailing Address</a></h3> <p>Should you need to reach us via old reliable mail, our mailing diff --git a/press/en/info.wmi b/press/en/info.wmi index a1ee00e..9c9e307 100644 --- a/press/en/info.wmi +++ b/press/en/info.wmi @@ -8,7 +8,7 @@ <p> <b>Tor Press Team</b><br> press(a)torproject.org<br> - +1-781-948-1982<br> + +1-617-902-0208 </p> </div>

1 0

[tor/master] Recover better when our clock jumps back many hours
by nickm＠torproject.org 16 Apr '15

16 Apr '15

commit 56061976dbe148dc615c8072c962ddfc0d719585 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Feb 9 01:05:31 2015 -0500 Recover better when our clock jumps back many hours like might happen for Tails or Whonix users who start with a very wrong hardware clock, use Tor to discover a more accurate time, and then fix their clock. Resolves part of ticket 8766. (There are still some timers in various places that aren't addressed yet.) --- changes/ticket8766 | 7 +++++++ src/or/circuitbuild.c | 4 ++++ src/or/main.c | 11 +++++++++-- src/or/main.h | 1 + 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/changes/ticket8766 b/changes/ticket8766 new file mode 100644 index 0000000..33bfc33 --- /dev/null +++ b/changes/ticket8766 @@ -0,0 +1,7 @@ + o Minor features: + - Recover better when our clock jumps back many hours, like might + happen for Tails or Whonix users who start with a very wrong + hardware clock, use Tor to discover a more accurate time, and then + fix their clock. Resolves part of ticket 8766. + [I'd call this a major feature if it actually fixed all of the issues.] + diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index fa5a2f5..fa9ac56 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1049,6 +1049,10 @@ circuit_note_clock_jumped(int seconds_elapsed) "CLOCK_JUMPED"); circuit_mark_all_unused_circs(); circuit_mark_all_dirty_circs_as_unusable(); + if (seconds_elapsed < 0) { + /* Restart all the timers in case we jumped a long way into the past. */ + reset_all_main_loop_timers(); + } } /** Take the 'extend' <b>cell</b>, pull out addr/port plus the onion diff --git a/src/or/main.c b/src/or/main.c index d3ecf36..a299f98 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1227,6 +1227,15 @@ typedef struct { static time_to_t time_to = { 0 }; +/** Reset all the time_to's so we'll do all our actions again as if we + * just started up. + * Useful if our clock just moved back a long time from the future, + * so we don't wait until that future arrives again before acting. + */ +void reset_all_main_loop_timers(void) { + memset(&time_to, 0, sizeof(time_to_t)); +} + /** * Update our schedule so that we'll check whether we need to update our * descriptor immediately, rather than after up to CHECK_DESCRIPTOR_INTERVAL @@ -1768,8 +1777,6 @@ second_elapsed_callback(periodic_timer_t *timer, void *arg) if (seconds_elapsed < -NUM_JUMPED_SECONDS_BEFORE_WARN || seconds_elapsed >= NUM_JUMPED_SECONDS_BEFORE_WARN) { circuit_note_clock_jumped(seconds_elapsed); - /* XXX if the time jumps *back* many months, do our events in - * run_scheduled_events() recover? I don't think they do. -RD */ } else if (seconds_elapsed > 0) stats_n_seconds_working += seconds_elapsed; diff --git a/src/or/main.h b/src/or/main.h index f77b471..542eab6 100644 --- a/src/or/main.h +++ b/src/or/main.h @@ -52,6 +52,7 @@ void directory_info_has_arrived(time_t now, int from_cache); void ip_address_changed(int at_interface); void dns_servers_relaunch_checks(void); +void reset_all_main_loop_timers(void); void reschedule_descriptor_update_check(void); MOCK_DECL(long,get_uptime,(void));

1 0

[tor/master] code style fixes
by nickm＠torproject.org 16 Apr '15

16 Apr '15

commit 06939551f4c081c46a09864465a4989ca8bb2e42 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 16 11:17:16 2015 -0400 code style fixes --- src/or/main.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 1bc17a0..39c0f5c 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1234,8 +1234,10 @@ static time_to_t time_to = { * Useful if our clock just moved back a long time from the future, * so we don't wait until that future arrives again before acting. */ -void reset_all_main_loop_timers(void) { - memset(&time_to, 0, sizeof(time_to_t)); +void +reset_all_main_loop_timers(void) +{ + memset(&time_to, 0, sizeof(time_to)); } /** @@ -1318,7 +1320,8 @@ run_scheduled_events(time_t now) * TLS context. */ if (!time_to.last_rotated_x509_certificate) time_to.last_rotated_x509_certificate = now; - if (time_to.last_rotated_x509_certificate+MAX_SSL_KEY_LIFETIME_INTERNAL < now) { + if (time_to.last_rotated_x509_certificate + + MAX_SSL_KEY_LIFETIME_INTERNAL < now) { log_info(LD_GENERAL,"Rotating tls context."); if (router_initialize_tls_context() < 0) { log_warn(LD_BUG, "Error reinitializing TLS context");

1 0

[tor/master] Merge remote-tracking branch 'arma/ticket8766'
by nickm＠torproject.org 16 Apr '15

16 Apr '15

commit f152081de174fbd0e097e97d7d76d6b401dcd194 Merge: cc10f13 5606197 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 16 11:15:29 2015 -0400 Merge remote-tracking branch 'arma/ticket8766' changes/ticket8766 | 7 ++ src/or/circuitbuild.c | 4 ++ src/or/main.c | 188 ++++++++++++++++++++++++++----------------------- src/or/main.h | 1 + 4 files changed, 112 insertions(+), 88 deletions(-) diff --cc src/or/main.c index 07d5ba8,a299f98..d0ed529 --- a/src/or/main.c +++ b/src/or/main.c @@@ -1202,7 -1199,43 +1200,42 @@@ get_signewnym_epoch(void return newnym_epoch; } - static time_t time_to_check_descriptor = 0; + typedef struct { + time_t last_rotated_x509_certificate; + time_t check_v3_certificate; + time_t check_listeners; + time_t download_networkstatus; - time_t shrink_memory; + time_t try_getting_descriptors; + time_t reset_descriptor_failures; + time_t add_entropy; + time_t write_bridge_status_file; + time_t downrate_stability; + time_t save_stability; + time_t clean_caches; + time_t recheck_bandwidth; + time_t check_for_expired_networkstatus; + time_t write_stats_files; + time_t write_bridge_stats; + time_t check_port_forwarding; + time_t launch_reachability_tests; + time_t retry_dns_init; + time_t next_heartbeat; + time_t check_descriptor; + /** When do we next launch DNS wildcarding checks? */ + time_t check_for_correct_dns; + } time_to_t; + + static time_to_t time_to = { 0 }; + + /** Reset all the time_to's so we'll do all our actions again as if we + * just started up. + * Useful if our clock just moved back a long time from the future, + * so we don't wait until that future arrives again before acting. + */ + void reset_all_main_loop_timers(void) { + memset(&time_to, 0, sizeof(time_to_t)); + } + /** * Update our schedule so that we'll check whether we need to update our * descriptor immediately, rather than after up to CHECK_DESCRIPTOR_INTERVAL

1 0

[tor/master] shift all the static times into a struct
by nickm＠torproject.org 16 Apr '15

16 Apr '15

commit 1cb9064d7d0f1b08d9595a42b80867118a26646a Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Feb 9 00:07:15 2015 -0500 shift all the static times into a struct no actual behavior changes yet --- src/or/main.c | 183 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 94 insertions(+), 89 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 136043c..d3ecf36 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -130,8 +130,6 @@ static uint64_t stats_n_bytes_written = 0; time_t time_of_process_start = 0; /** How many seconds have we been running? */ long stats_n_seconds_working = 0; -/** When do we next launch DNS wildcarding checks? */ -static time_t time_to_check_for_correct_dns = 0; /** How often will we honor SIGNEWNYM requests? */ #define MAX_SIGNEWNYM_RATE 10 @@ -1201,7 +1199,34 @@ get_signewnym_epoch(void) return newnym_epoch; } -static time_t time_to_check_descriptor = 0; +typedef struct { + time_t last_rotated_x509_certificate; + time_t check_v3_certificate; + time_t check_listeners; + time_t download_networkstatus; + time_t shrink_memory; + time_t try_getting_descriptors; + time_t reset_descriptor_failures; + time_t add_entropy; + time_t write_bridge_status_file; + time_t downrate_stability; + time_t save_stability; + time_t clean_caches; + time_t recheck_bandwidth; + time_t check_for_expired_networkstatus; + time_t write_stats_files; + time_t write_bridge_stats; + time_t check_port_forwarding; + time_t launch_reachability_tests; + time_t retry_dns_init; + time_t next_heartbeat; + time_t check_descriptor; + /** When do we next launch DNS wildcarding checks? */ + time_t check_for_correct_dns; +} time_to_t; + +static time_to_t time_to = { 0 }; + /** * Update our schedule so that we'll check whether we need to update our * descriptor immediately, rather than after up to CHECK_DESCRIPTOR_INTERVAL @@ -1210,7 +1235,7 @@ static time_t time_to_check_descriptor = 0; void reschedule_descriptor_update_check(void) { - time_to_check_descriptor = 0; + time_to.check_descriptor = 0; } /** Perform regular maintenance tasks. This function gets run once per @@ -1219,27 +1244,7 @@ reschedule_descriptor_update_check(void) static void run_scheduled_events(time_t now) { - static time_t last_rotated_x509_certificate = 0; - static time_t time_to_check_v3_certificate = 0; - static time_t time_to_check_listeners = 0; - static time_t time_to_download_networkstatus = 0; - static time_t time_to_shrink_memory = 0; - static time_t time_to_try_getting_descriptors = 0; - static time_t time_to_reset_descriptor_failures = 0; - static time_t time_to_add_entropy = 0; - static time_t time_to_write_bridge_status_file = 0; - static time_t time_to_downrate_stability = 0; - static time_t time_to_save_stability = 0; - static time_t time_to_clean_caches = 0; - static time_t time_to_recheck_bandwidth = 0; - static time_t time_to_check_for_expired_networkstatus = 0; - static time_t time_to_write_stats_files = 0; - static time_t time_to_write_bridge_stats = 0; - static time_t time_to_check_port_forwarding = 0; - static time_t time_to_launch_reachability_tests = 0; static int should_init_bridge_stats = 1; - static time_t time_to_retry_dns_init = 0; - static time_t time_to_next_heartbeat = 0; const or_options_t *options = get_options(); int is_server = server_mode(options); @@ -1280,18 +1285,18 @@ run_scheduled_events(time_t now) } if (!should_delay_dir_fetches(options, NULL) && - time_to_try_getting_descriptors < now) { + time_to.try_getting_descriptors < now) { update_all_descriptor_downloads(now); update_extrainfo_downloads(now); if (router_have_minimum_dir_info()) - time_to_try_getting_descriptors = now + LAZY_DESCRIPTOR_RETRY_INTERVAL; + time_to.try_getting_descriptors = now + LAZY_DESCRIPTOR_RETRY_INTERVAL; else - time_to_try_getting_descriptors = now + GREEDY_DESCRIPTOR_RETRY_INTERVAL; + time_to.try_getting_descriptors = now + GREEDY_DESCRIPTOR_RETRY_INTERVAL; } - if (time_to_reset_descriptor_failures < now) { + if (time_to.reset_descriptor_failures < now) { router_reset_descriptor_download_failures(); - time_to_reset_descriptor_failures = + time_to.reset_descriptor_failures = now + DESCRIPTOR_FAILURE_RESET_INTERVAL; } @@ -1300,28 +1305,28 @@ run_scheduled_events(time_t now) /* 1b. Every MAX_SSL_KEY_LIFETIME_INTERNAL seconds, we change our * TLS context. */ - if (!last_rotated_x509_certificate) - last_rotated_x509_certificate = now; - if (last_rotated_x509_certificate+MAX_SSL_KEY_LIFETIME_INTERNAL < now) { + if (!time_to.last_rotated_x509_certificate) + time_to.last_rotated_x509_certificate = now; + if (time_to.last_rotated_x509_certificate+MAX_SSL_KEY_LIFETIME_INTERNAL < now) { log_info(LD_GENERAL,"Rotating tls context."); if (router_initialize_tls_context() < 0) { log_warn(LD_BUG, "Error reinitializing TLS context"); /* XXX is it a bug here, that we just keep going? -RD */ } - last_rotated_x509_certificate = now; + time_to.last_rotated_x509_certificate = now; /* We also make sure to rotate the TLS connections themselves if they've * been up for too long -- but that's done via is_bad_for_new_circs in * connection_run_housekeeping() above. */ } - if (time_to_add_entropy < now) { - if (time_to_add_entropy) { + if (time_to.add_entropy < now) { + if (time_to.add_entropy) { /* We already seeded once, so don't die on failure. */ crypto_seed_rng(0); } /** How often do we add more entropy to OpenSSL's RNG pool? */ #define ENTROPY_INTERVAL (60*60) - time_to_add_entropy = now + ENTROPY_INTERVAL; + time_to.add_entropy = now + ENTROPY_INTERVAL; } /* 1c. If we have to change the accounting interval or record @@ -1329,10 +1334,10 @@ run_scheduled_events(time_t now) if (accounting_is_enabled(options)) accounting_run_housekeeping(now); - if (time_to_launch_reachability_tests < now && + if (time_to.launch_reachability_tests < now && (authdir_mode_tests_reachability(options)) && !net_is_disabled()) { - time_to_launch_reachability_tests = now + REACHABILITY_TEST_INTERVAL; + time_to.launch_reachability_tests = now + REACHABILITY_TEST_INTERVAL; /* try to determine reachability of the other Tor relays */ dirserv_test_reachability(now); } @@ -1340,29 +1345,29 @@ run_scheduled_events(time_t now) /* 1d. Periodically, we discount older stability information so that new * stability info counts more, and save the stability information to disk as * appropriate. */ - if (time_to_downrate_stability < now) - time_to_downrate_stability = rep_hist_downrate_old_runs(now); + if (time_to.downrate_stability < now) + time_to.downrate_stability = rep_hist_downrate_old_runs(now); if (authdir_mode_tests_reachability(options)) { - if (time_to_save_stability < now) { - if (time_to_save_stability && rep_hist_record_mtbf_data(now, 1)<0) { + if (time_to.save_stability < now) { + if (time_to.save_stability && rep_hist_record_mtbf_data(now, 1)<0) { log_warn(LD_GENERAL, "Couldn't store mtbf data."); } #define SAVE_STABILITY_INTERVAL (30*60) - time_to_save_stability = now + SAVE_STABILITY_INTERVAL; + time_to.save_stability = now + SAVE_STABILITY_INTERVAL; } } /* 1e. Periodically, if we're a v3 authority, we check whether our cert is * close to expiring and warn the admin if it is. */ - if (time_to_check_v3_certificate < now) { + if (time_to.check_v3_certificate < now) { v3_authority_check_key_expiry(); #define CHECK_V3_CERTIFICATE_INTERVAL (5*60) - time_to_check_v3_certificate = now + CHECK_V3_CERTIFICATE_INTERVAL; + time_to.check_v3_certificate = now + CHECK_V3_CERTIFICATE_INTERVAL; } /* 1f. Check whether our networkstatus has expired. */ - if (time_to_check_for_expired_networkstatus < now) { + if (time_to.check_for_expired_networkstatus < now) { networkstatus_t *ns = networkstatus_get_latest_consensus(); /*XXXX RD: This value needs to be the same as REASONABLY_LIVE_TIME in * networkstatus_get_reasonably_live_consensus(), but that value is way @@ -1373,68 +1378,68 @@ run_scheduled_events(time_t now) router_dir_info_changed(); } #define CHECK_EXPIRED_NS_INTERVAL (2*60) - time_to_check_for_expired_networkstatus = now + CHECK_EXPIRED_NS_INTERVAL; + time_to.check_for_expired_networkstatus = now + CHECK_EXPIRED_NS_INTERVAL; } /* 1g. Check whether we should write statistics to disk. */ - if (time_to_write_stats_files < now) { + if (time_to.write_stats_files < now) { #define CHECK_WRITE_STATS_INTERVAL (60*60) - time_t next_time_to_write_stats_files = (time_to_write_stats_files > 0 ? - time_to_write_stats_files : now) + CHECK_WRITE_STATS_INTERVAL; + time_t next_time_to_write_stats_files = (time_to.write_stats_files > 0 ? + time_to.write_stats_files : now) + CHECK_WRITE_STATS_INTERVAL; if (options->CellStatistics) { time_t next_write = - rep_hist_buffer_stats_write(time_to_write_stats_files); + rep_hist_buffer_stats_write(time_to.write_stats_files); if (next_write && next_write < next_time_to_write_stats_files) next_time_to_write_stats_files = next_write; } if (options->DirReqStatistics) { - time_t next_write = geoip_dirreq_stats_write(time_to_write_stats_files); + time_t next_write = geoip_dirreq_stats_write(time_to.write_stats_files); if (next_write && next_write < next_time_to_write_stats_files) next_time_to_write_stats_files = next_write; } if (options->EntryStatistics) { - time_t next_write = geoip_entry_stats_write(time_to_write_stats_files); + time_t next_write = geoip_entry_stats_write(time_to.write_stats_files); if (next_write && next_write < next_time_to_write_stats_files) next_time_to_write_stats_files = next_write; } if (options->HiddenServiceStatistics) { - time_t next_write = rep_hist_hs_stats_write(time_to_write_stats_files); + time_t next_write = rep_hist_hs_stats_write(time_to.write_stats_files); if (next_write && next_write < next_time_to_write_stats_files) next_time_to_write_stats_files = next_write; } if (options->ExitPortStatistics) { - time_t next_write = rep_hist_exit_stats_write(time_to_write_stats_files); + time_t next_write = rep_hist_exit_stats_write(time_to.write_stats_files); if (next_write && next_write < next_time_to_write_stats_files) next_time_to_write_stats_files = next_write; } if (options->ConnDirectionStatistics) { - time_t next_write = rep_hist_conn_stats_write(time_to_write_stats_files); + time_t next_write = rep_hist_conn_stats_write(time_to.write_stats_files); if (next_write && next_write < next_time_to_write_stats_files) next_time_to_write_stats_files = next_write; } if (options->BridgeAuthoritativeDir) { - time_t next_write = rep_hist_desc_stats_write(time_to_write_stats_files); + time_t next_write = rep_hist_desc_stats_write(time_to.write_stats_files); if (next_write && next_write < next_time_to_write_stats_files) next_time_to_write_stats_files = next_write; } - time_to_write_stats_files = next_time_to_write_stats_files; + time_to.write_stats_files = next_time_to_write_stats_files; } /* 1h. Check whether we should write bridge statistics to disk. */ if (should_record_bridge_info(options)) { - if (time_to_write_bridge_stats < now) { + if (time_to.write_bridge_stats < now) { if (should_init_bridge_stats) { /* (Re-)initialize bridge statistics. */ geoip_bridge_stats_init(now); - time_to_write_bridge_stats = now + WRITE_STATS_INTERVAL; + time_to.write_bridge_stats = now + WRITE_STATS_INTERVAL; should_init_bridge_stats = 0; } else { /* Possibly write bridge statistics to disk and ask when to write * them next time. */ - time_to_write_bridge_stats = geoip_bridge_stats_write( - time_to_write_bridge_stats); + time_to.write_bridge_stats = geoip_bridge_stats_write( + time_to.write_bridge_stats); } } } else if (!should_init_bridge_stats) { @@ -1444,19 +1449,19 @@ run_scheduled_events(time_t now) } /* Remove old information from rephist and the rend cache. */ - if (time_to_clean_caches < now) { + if (time_to.clean_caches < now) { rep_history_clean(now - options->RephistTrackTime); rend_cache_clean(now); rend_cache_clean_v2_descs_as_dir(now, 0); microdesc_cache_rebuild(NULL, 0); #define CLEAN_CACHES_INTERVAL (30*60) - time_to_clean_caches = now + CLEAN_CACHES_INTERVAL; + time_to.clean_caches = now + CLEAN_CACHES_INTERVAL; } #define RETRY_DNS_INTERVAL (10*60) /* If we're a server and initializing dns failed, retry periodically. */ - if (time_to_retry_dns_init < now) { - time_to_retry_dns_init = now + RETRY_DNS_INTERVAL; + if (time_to.retry_dns_init < now) { + time_to.retry_dns_init = now + RETRY_DNS_INTERVAL; if (is_server && has_dns_init_failed()) dns_init(); } @@ -1471,9 +1476,9 @@ run_scheduled_events(time_t now) /* 2b. Once per minute, regenerate and upload the descriptor if the old * one is inaccurate. */ - if (time_to_check_descriptor < now && !options->DisableNetwork) { + if (time_to.check_descriptor < now && !options->DisableNetwork) { static int dirport_reachability_count = 0; - time_to_check_descriptor = now + CHECK_DESCRIPTOR_INTERVAL; + time_to.check_descriptor = now + CHECK_DESCRIPTOR_INTERVAL; check_descriptor_bandwidth_changed(now); check_descriptor_ipaddress_changed(now); mark_my_descriptor_dirty_if_too_old(now); @@ -1487,18 +1492,18 @@ run_scheduled_events(time_t now) consider_testing_reachability(1, dirport_reachability_count==0); if (++dirport_reachability_count > 5) dirport_reachability_count = 0; - } else if (time_to_recheck_bandwidth < now) { + } else if (time_to.recheck_bandwidth < now) { /* If we haven't checked for 12 hours and our bandwidth estimate is * low, do another bandwidth test. This is especially important for * bridges, since they might go long periods without much use. */ const routerinfo_t *me = router_get_my_routerinfo(); - if (time_to_recheck_bandwidth && me && + if (time_to.recheck_bandwidth && me && me->bandwidthcapacity < me->bandwidthrate && me->bandwidthcapacity < 51200) { reset_bandwidth_test(); } #define BANDWIDTH_RECHECK_INTERVAL (12*60*60) - time_to_recheck_bandwidth = now + BANDWIDTH_RECHECK_INTERVAL; + time_to.recheck_bandwidth = now + BANDWIDTH_RECHECK_INTERVAL; } } @@ -1516,8 +1521,8 @@ run_scheduled_events(time_t now) #define networkstatus_dl_check_interval(o) ((o)->TestingTorNetwork ? 1 : 60) if (!should_delay_dir_fetches(options, NULL) && - time_to_download_networkstatus < now) { - time_to_download_networkstatus = + time_to.download_networkstatus < now) { + time_to.download_networkstatus = now + networkstatus_dl_check_interval(options); update_networkstatus_downloads(now); } @@ -1547,9 +1552,9 @@ run_scheduled_events(time_t now) connection_expire_held_open(); /* 3d. And every 60 seconds, we relaunch listeners if any died. */ - if (!net_is_disabled() && time_to_check_listeners < now) { + if (!net_is_disabled() && time_to.check_listeners < now) { retry_all_listeners(NULL, NULL, 0); - time_to_check_listeners = now+60; + time_to.check_listeners = now+60; } /* 4. Every second, we try a new circuit if there are no valid @@ -1573,7 +1578,7 @@ run_scheduled_events(time_t now) for (i=0;i<smartlist_len(connection_array);i++) { run_connection_housekeeping(i, now); } - if (time_to_shrink_memory < now) { + if (time_to.shrink_memory < now) { SMARTLIST_FOREACH(connection_array, connection_t *, conn, { if (conn->outbuf) buf_shrink(conn->outbuf); @@ -1587,7 +1592,7 @@ run_scheduled_events(time_t now) /** How often do we check buffers and pools for empty space that can be * deallocated? */ #define MEM_SHRINK_INTERVAL (60) - time_to_shrink_memory = now + MEM_SHRINK_INTERVAL; + time_to.shrink_memory = now + MEM_SHRINK_INTERVAL; } /* 6. And remove any marked circuits... */ @@ -1617,28 +1622,28 @@ run_scheduled_events(time_t now) * to us. */ if (!net_is_disabled() && public_server_mode(options) && - time_to_check_for_correct_dns < now && + time_to.check_for_correct_dns < now && ! router_my_exit_policy_is_reject_star()) { - if (!time_to_check_for_correct_dns) { - time_to_check_for_correct_dns = now + 60 + crypto_rand_int(120); + if (!time_to.check_for_correct_dns) { + time_to.check_for_correct_dns = now + 60 + crypto_rand_int(120); } else { dns_launch_correctness_checks(); - time_to_check_for_correct_dns = now + 12*3600 + + time_to.check_for_correct_dns = now + 12*3600 + crypto_rand_int(12*3600); } } /* 10. write bridge networkstatus file to disk */ if (options->BridgeAuthoritativeDir && - time_to_write_bridge_status_file < now) { + time_to.write_bridge_status_file < now) { networkstatus_dump_bridge_status_to_file(now); #define BRIDGE_STATUSFILE_INTERVAL (30*60) - time_to_write_bridge_status_file = now+BRIDGE_STATUSFILE_INTERVAL; + time_to.write_bridge_status_file = now+BRIDGE_STATUSFILE_INTERVAL; } /* 11. check the port forwarding app */ if (!net_is_disabled() && - time_to_check_port_forwarding < now && + time_to.check_port_forwarding < now && options->PortForwarding && is_server) { #define PORT_FORWARDING_CHECK_INTERVAL 5 @@ -1651,7 +1656,7 @@ run_scheduled_events(time_t now) SMARTLIST_FOREACH(ports_to_forward, char *, cp, tor_free(cp)); smartlist_free(ports_to_forward); } - time_to_check_port_forwarding = now+PORT_FORWARDING_CHECK_INTERVAL; + time_to.check_port_forwarding = now+PORT_FORWARDING_CHECK_INTERVAL; } /* 11b. check pending unconfigured managed proxies */ @@ -1660,10 +1665,10 @@ run_scheduled_events(time_t now) /* 12. write the heartbeat message */ if (options->HeartbeatPeriod && - time_to_next_heartbeat <= now) { - if (time_to_next_heartbeat) /* don't log the first heartbeat */ + time_to.next_heartbeat <= now) { + if (time_to.next_heartbeat) /* don't log the first heartbeat */ log_heartbeat(now); - time_to_next_heartbeat = now+options->HeartbeatPeriod; + time_to.next_heartbeat = now+options->HeartbeatPeriod; } } @@ -1888,7 +1893,7 @@ dns_servers_relaunch_checks(void) { if (server_mode(get_options())) { dns_reset_correctness_checks(); - time_to_check_for_correct_dns = 0; + time_to.check_for_correct_dns = 0; } }

1 0

[tor/master] Fix missing-initializer warning
by nickm＠torproject.org 16 Apr '15

16 Apr '15

commit fabfa28c48cb50979ec4ee170af2b948f7676ae8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 16 11:16:20 2015 -0400 Fix missing-initializer warning --- src/or/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/or/main.c b/src/or/main.c index d0ed529..1bc17a0 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1225,7 +1225,9 @@ typedef struct { time_t check_for_correct_dns; } time_to_t; -static time_to_t time_to = { 0 }; +static time_to_t time_to = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +}; /** Reset all the time_to's so we'll do all our actions again as if we * just started up.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2015