- tor-commits - lists.torproject.org

[tor/release-0.2.2] relays checkpoint their state file twice a day
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit 66de6f7eb8e2948f6c3849dbca20c7b31969b5b7 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Apr 28 21:06:25 2011 -0400 relays checkpoint their state file twice a day --- changes/bug3012 | 5 +++++ src/or/config.c | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/changes/bug3012 b/changes/bug3012 new file mode 100644 index 0000000..dfde5fa --- /dev/null +++ b/changes/bug3012 @@ -0,0 +1,5 @@ + o Minor features: + - Relays can go for weeks without writing out their state file. A + relay that crashes would lose its bandwidth history (including + capacity estimate), client country statistics, and so on. Now relays + checkpoint the file at least every 12 hours. Addresses bug 3012. diff --git a/src/or/config.c b/src/or/config.c index 9384b3a..dc24140 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5122,6 +5122,11 @@ or_state_load(void) /** If writing the state to disk fails, try again after this many seconds. */ #define STATE_WRITE_RETRY_INTERVAL 3600 +/** If we're a relay, how often should we checkpoint our state file even + * if nothing else dirties it? This will checkpoint ongoing stats like + * bandwidth used, per-country user stats, etc. */ +#define STATE_RELAY_CHECKPOINT_INTERVAL (12*60*60) + /** Write the persistent state to disk. Return 0 for success, <0 on failure. */ int or_state_save(time_t now) @@ -5172,7 +5177,11 @@ or_state_save(time_t now) tor_free(fname); tor_free(contents); - global_state->next_write = TIME_MAX; + if (server_mode(get_options())) + global_state->next_write = now + STATE_RELAY_CHECKPOINT_INTERVAL; + else + global_state->next_write = TIME_MAX; + return 0; }

1 0

[tor/release-0.2.2] Merge branch 'bug3000-022-part2-squashed' into maint-0.2.2
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit 30003e43180561eb92f4146d3bf2a5f74523cda6 Merge: 2dc9546 6dfc0d5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 28 18:13:17 2011 -0400 Merge branch 'bug3000-022-part2-squashed' into maint-0.2.2 changes/forget-rend-descs-on-newnym | 12 ++++ src/or/config.c | 4 ++ src/or/main.c | 7 +++ src/or/rendclient.c | 103 +++++++++++++++++++++-------------- src/or/router.c | 8 ++-- 5 files changed, 90 insertions(+), 44 deletions(-)

1 0

[tor/release-0.2.2] fix a function comment
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit 710227a77f3d47fec78497b0fabce13b4e3ce728 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Apr 28 19:19:04 2011 -0400 fix a function comment --- src/or/circuitbuild.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 90572d5..fe94264 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4584,8 +4584,7 @@ find_bridge_by_digest(const char *digest) return NULL; } -/** We need to ask bridge for its server descriptor. address - * is a helpful string describing this bridge. */ +/** We need to ask bridge for its server descriptor. */ static void launch_direct_bridge_descriptor_fetch(bridge_info_t *bridge) {

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'sebastian/bug3020' into maint-0.2.2
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit c12289792507c8dd51c2a947f7c910c70df4dd3d Merge: 710227a 525d270 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 28 20:03:57 2011 -0400 Merge remote-tracking branch 'sebastian/bug3020' into maint-0.2.2 changes/bug3020 | 7 +++++++ src/or/hibernate.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletions(-)

1 0

[tor/release-0.2.2] Clarify comment to say which version fixed 2722
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit 5693fedb60ee19048d45ed892edb07925b52678b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 28 20:38:15 2011 -0400 Clarify comment to say which version fixed 2722 --- src/or/dirserv.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 525524c..c8dda66 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1812,7 +1812,8 @@ dirserv_thinks_router_is_hs_dir(routerinfo_t *router, time_t now) * correctly, we can revert to only checking dir_port if router's * version is too old. */ /* XXX Unfortunately, we need to keep checking dir_port until all - * *clients* suffering from bug 2722 are obsolete. */ + * *clients* suffering from bug 2722 are obsolete. The first version + * to fix the bug was 0.2.2.25-alpha. */ return (router->wants_to_be_hs_dir && router->dir_port && uptime > get_options()->MinUptimeHidServDirectoryV2 && router->is_running);

1 0

[tor/release-0.2.2] stop putting wacky values into state->lastwritten
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit df3cf881d1d217b6ff3757bf95f8c2784584fec8 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Apr 28 20:40:15 2011 -0400 stop putting wacky values into state->lastwritten --- changes/bug3039 | 5 +++++ src/or/circuitbuild.c | 2 +- src/or/config.c | 20 +++++++++++++++++--- src/or/config.h | 1 + 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/changes/bug3039 b/changes/bug3039 new file mode 100644 index 0000000..7347ee3 --- /dev/null +++ b/changes/bug3039 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Write the current time into the LastWritten line in our state file, + rather than the time from the previous write attempt. Also, stop + trying to use a time of -1 in our log statements. Fixes bug 3039; + bugfix on 0.2.2.14-alpha. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index fe94264..85765e3 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -119,7 +119,7 @@ circuit_build_times_disabled(void) 0, 0, 1); int config_disabled = !get_options()->LearnCircuitBuildTimeout; int dirauth_disabled = get_options()->AuthoritativeDir; - int state_disabled = (get_or_state()->LastWritten == -1); + int state_disabled = did_last_state_file_write_fail() ? 1 : 0; if (consensus_disabled || config_disabled || dirauth_disabled || state_disabled) { diff --git a/src/or/config.c b/src/or/config.c index 9384b3a..7534cc7 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5119,6 +5119,18 @@ or_state_load(void) return r; } +/** Did the last time we tried to write the state file fail? If so, we + * should consider disabling such features as preemptive circuit generation + * to compute circuit-build-time. */ +static int last_state_file_write_failed = 0; + +/** Return whether the state file failed to write last time we tried. */ +int +did_last_state_file_write_fail(void) +{ + return last_state_file_write_failed; +} + /** If writing the state to disk fails, try again after this many seconds. */ #define STATE_WRITE_RETRY_INTERVAL 3600 @@ -5143,11 +5155,13 @@ or_state_save(time_t now) if (accounting_is_enabled(get_options())) accounting_run_housekeeping(now); + global_state->LastWritten = now; + tor_free(global_state->TorVersion); tor_asprintf(&global_state->TorVersion, "Tor %s", get_version()); state = config_dump(&state_format, global_state, 1, 0); - format_local_iso_time(tbuf, time(NULL)); + format_local_iso_time(tbuf, now); tor_asprintf(&contents, "# Tor state file last generated on %s local time\n" "# Other times below are in GMT\n" @@ -5158,7 +5172,7 @@ or_state_save(time_t now) if (write_str_to_file(fname, contents, 0)<0) { log_warn(LD_FS, "Unable to write state to file \"%s\"; " "will try again later", fname); - global_state->LastWritten = -1; + last_state_file_write_failed = 1; tor_free(fname); tor_free(contents); /* Try again after STATE_WRITE_RETRY_INTERVAL (or sooner, if the state @@ -5167,7 +5181,7 @@ or_state_save(time_t now) return -1; } - global_state->LastWritten = time(NULL); + last_state_file_write_failed = 0; log_info(LD_GENERAL, "Saved state to \"%s\"", fname); tor_free(fname); tor_free(contents); diff --git a/src/or/config.h b/src/or/config.h index defda35..78a67dd 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -58,6 +58,7 @@ char *options_get_datadir_fname2_suffix(or_options_t *options, get_datadir_fname2_suffix((sub1), NULL, (suffix)) or_state_t *get_or_state(void); +int did_last_state_file_write_fail(void); int or_state_save(time_t now); int options_need_geoip_info(or_options_t *options, const char **reason_out);

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'arma/bug3039' into maint-0.2.2
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit 4010427b519c3727351905bbe5a75e85a055dd58 Merge: 5693fed df3cf88 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 28 20:53:44 2011 -0400 Merge remote-tracking branch 'arma/bug3039' into maint-0.2.2 changes/bug3039 | 5 +++++ src/or/circuitbuild.c | 2 +- src/or/config.c | 20 +++++++++++++++++--- src/or/config.h | 1 + 4 files changed, 24 insertions(+), 4 deletions(-)

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'sebastian/bug2497' into maint-0.2.2
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit 3055acbdbe914c31ca4825ed60b4cce6676bd61e Merge: 2c0258b c1927d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 28 16:05:34 2011 -0400 Merge remote-tracking branch 'sebastian/bug2497' into maint-0.2.2 changes/ticket2497 | 4 ++++ src/or/rephist.c | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.2] Detect and handle NULL returns from (gm/local)time_r
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit 51e551d3837990b7c4491253a88bedd2513fe1de Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 7 14:37:50 2010 -0500 Detect and handle NULL returns from (gm/local)time_r These functions can return NULL for otherwise-valid values of time_t. Notably, the glibc gmtime manpage says it can return NULL if the year if greater than INT_MAX, and the windows MSDN gmtime page says it can return NULL for negative time_t values. Also, our formatting code is not guaranteed to correctly handle years after 9999 CE. This patch tries to correct this by detecting NULL values from gmtime/localtime_r, and trying to clip them to a reasonable end of the scale. If they are in the middle of the scale, we call it a downright error. Arguably, it's a bug to get out-of-bounds dates like this to begin with. But we've had bugs of this kind in the past, and warning when we see a bug is much kinder than doing a NULL-pointer dereference. Boboper found this one too. --- changes/gmtime_null | 6 +++ src/common/compat.c | 104 +++++++++++++++++++++++++++++++++++++++++++++------ src/common/compat.h | 9 ---- 3 files changed, 98 insertions(+), 21 deletions(-) diff --git a/changes/gmtime_null b/changes/gmtime_null new file mode 100644 index 0000000..16a2540 --- /dev/null +++ b/changes/gmtime_null @@ -0,0 +1,6 @@ + o Minor bugfixes + - On some platforms, gmtime and localtime can return NULL under + certain circumstances even for well-defined values of time_t. + Try to detect and make up for this deficiency. Possible fix for + bug 2077. Bugfix on all versions of Tor. Found by boboper. + diff --git a/src/common/compat.c b/src/common/compat.c index 27489e5..9b7c0b7 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1996,14 +1996,88 @@ tor_gettimeofday(struct timeval *timeval) #define TIME_FNS_NEED_LOCKS #endif +static struct tm * +correct_tm(int islocal, const time_t *timep, struct tm *resultbuf, + struct tm *r) +{ + const char *outcome; + + if (PREDICT_LIKELY(r)) { + if (r->tm_year > 8099) { /* We can't strftime dates after 9999 CE. */ + r->tm_year = 8099; + r->tm_mon = 11; + r->tm_mday = 31; + r->tm_yday = 365; + r->tm_hour = 23; + r->tm_min = 59; + r->tm_sec = 59; + } + return r; + } + + /* If we get here, gmtime or localtime returned NULL. It might have done + * this because of overrun or underrun, or it might have done it because of + * some other weird issue. */ + if (timep) { + if (*timep < 0) { + r = resultbuf; + r->tm_year = 70; /* 1970 CE */ + r->tm_mon = 0; + r->tm_mday = 1; + r->tm_yday = 1; + r->tm_hour = 0; + r->tm_min = 0 ; + r->tm_sec = 0; + outcome = "Rounding up to 1970"; + goto done; + } else if (*timep >= INT32_MAX) { + /* Rounding down to INT32_MAX isn't so great, but keep in mind that we + * only do it if gmtime/localtime tells us NULL. */ + r = resultbuf; + r->tm_year = 137; /* 2037 CE */ + r->tm_mon = 11; + r->tm_mday = 31; + r->tm_yday = 365; + r->tm_hour = 23; + r->tm_min = 59; + r->tm_sec = 59; + outcome = "Rounding down to 2037"; + goto done; + } + } + + /* If we get here, then gmtime/localtime failed without getting an extreme + * value for *timep */ + + tor_fragile_assert(); + r = resultbuf; + memset(resultbuf, 0, sizeof(struct tm)); + outcome="can't recover"; + done: + log_warn(LD_BUG, "%s("I64_FORMAT") failed with error %s: %s", + islocal?"localtime":"gmtime", + timep?I64_PRINTF_ARG(*timep):0, + strerror(errno), + outcome); + return r; +} + + /** @{ */ /** As localtime_r, but defined for platforms that don't have it: * * Convert *timep to a struct tm in local time, and store the value in * *result. Return the result on success, or NULL on failure. */ -#ifndef HAVE_LOCALTIME_R -#ifdef TIME_FNS_NEED_LOCKS +#ifdef HAVE_LOCALTIME_R +struct tm * +tor_localtime_r(const time_t *timep, struct tm *result) +{ + struct tm *r; + r = localtime_r(timep, result); + return correct_tm(1, timep, result, r); +} +#elif defined(TIME_FNS_NEED_LOCKS) struct tm * tor_localtime_r(const time_t *timep, struct tm *result) { @@ -2013,9 +2087,10 @@ tor_localtime_r(const time_t *timep, struct tm *result) tor_assert(result); tor_mutex_acquire(m); r = localtime(timep); - memcpy(result, r, sizeof(struct tm)); + if (r) + memcpy(result, r, sizeof(struct tm)); tor_mutex_release(m); - return result; + return correct_tm(1, timep, result, r); } #else struct tm * @@ -2024,11 +2099,11 @@ tor_localtime_r(const time_t *timep, struct tm *result) struct tm *r; tor_assert(result); r = localtime(timep); - memcpy(result, r, sizeof(struct tm)); - return result; + if (r) + memcpy(result, r, sizeof(struct tm)); + return correct_tm(1, timep, result, r); } #endif -#endif /** @} */ /** @{ */ @@ -2038,7 +2113,14 @@ tor_localtime_r(const time_t *timep, struct tm *result) * *result. Return the result on success, or NULL on failure. */ #ifndef HAVE_GMTIME_R -#ifdef TIME_FNS_NEED_LOCKS +struct tm * +tor_gmtime_r(const time_t *timep, struct tm *result) +{ + struct tm *r; + r = gmtime_r(timep, result); + return correct_tm(0, timep, result, r); +} +#elif defined(TIME_FNS_NEED_LOCKS) struct tm * tor_gmtime_r(const time_t *timep, struct tm *result) { @@ -2050,7 +2132,7 @@ tor_gmtime_r(const time_t *timep, struct tm *result) r = gmtime(timep); memcpy(result, r, sizeof(struct tm)); tor_mutex_release(m); - return result; + return correct_tm(0, timep, result, r); } #else struct tm * @@ -2060,11 +2142,9 @@ tor_gmtime_r(const time_t *timep, struct tm *result) tor_assert(result); r = gmtime(timep); memcpy(result, r, sizeof(struct tm)); - return result; + return correct_tm(0, timep, result, r); } #endif -#endif -/** @} */ #if defined(USE_WIN32_THREADS) void diff --git a/src/common/compat.h b/src/common/compat.h index 550c08b..af795ff 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -321,17 +321,8 @@ struct timeval { void tor_gettimeofday(struct timeval *timeval); -#ifdef HAVE_LOCALTIME_R -#define tor_localtime_r localtime_r -#else struct tm *tor_localtime_r(const time_t *timep, struct tm *result); -#endif - -#ifdef HAVE_GMTIME_R -#define tor_gmtime_r gmtime_r -#else struct tm *tor_gmtime_r(const time_t *timep, struct tm *result); -#endif #ifndef timeradd /** Replacement for timeradd on platforms that do not have it: sets tvout to

1 0

[tor/release-0.2.2] Clean up merge of bug3k_021
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit 2c0258b69a232a7b11ecc999bee74dac1c1b1495 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Apr 28 10:37:35 2011 -0700 Clean up merge of bug3k_021 --- src/or/rendclient.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 97345bf..8803875 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -94,7 +94,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc, log_info(LD_REND, "query %s didn't have valid rend desc in cache. " "Refetching descriptor.", - safe_str(introcirc->rend_data->onion_address)); + safe_str_client(introcirc->rend_data->onion_address)); rend_client_refetch_v2_renddesc(introcirc->rend_data); { connection_t *conn; @@ -120,8 +120,9 @@ rend_client_send_introduction(origin_circuit_t *introcirc, } }); if (!intro_key) { - log_info(LD_REND, "Internal error: could not find intro key; we " - "only have a v2 rend desc with %d intro points.", + log_info(LD_REND, "Our introduction point knowledge changed in " + "mid-connect! Could not find intro key; we only have a " + "v2 rend desc with %d intro points. Giving up.", smartlist_len(entry->parsed->intro_nodes)); goto perm_err; }

1 0