April 2011 - tor-commits - lists.torproject.org

[tor/release-0.2.2] Edit the changelog a little more
by nickm＠torproject.org 28 Apr '11

28 Apr '11

commit d760e91d1d8ef9f50ec09d53d05c4e2d4d36f3c7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 28 23:02:39 2011 -0400 Edit the changelog a little more --- ChangeLog | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4571fc5..fe2c7e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,15 +21,15 @@ Changes in version 0.2.2.25-alpha - 2011-04-28 if it is followed in the blob we're parsing by an unparsable microdescriptor. Fixes an issue reported in a comment on bug 2954. Bugfix on 0.2.2.6-alpha; fix by "cypherpunks". - - If the Nickname configuration option isn't given, Tor would pick - a nickname based on the local hostname as the nickname for a relay. + - If the Nickname configuration option isn't given, Tor would pick a + nickname based on the local hostname as the nickname for a relay. Because nicknames are not very important in today's Tor and the "Unnamed" nickname has been implemented, this is now problematic - behavior: It leaks information about the hostname without being - useful at all. Bugfix on 0.1.2.2-alpha, which introduced the - Unnamed nickname. Fixes bug 2979, reported by tagnaq. + behavior: It leaks information about the hostname without being useful + at all. Fixes bug 2979; bugfix on 0.1.2.2-alpha, which introduced the + Unnamed nickname. Reported by tagnaq. - Fix an uncommon assertion failure when running with DNSPort under - heavy load. Fixes bug 2933; bugfix on 2.0.1-alpha. + heavy load. Fixes bug 2933; bugfix on 0.2.0.1-alpha. - Avoid linkability based on cached hidden service descriptors: forget all hidden service descriptors cached as a client when processing a SIGNAL NEWNYM command. Fixes bug 3000; bugfix on 0.0.6. @@ -41,7 +41,7 @@ Changes in version 0.2.2.25-alpha - 2011-04-28 contributions to the network. o Major features and bugfixes (node selection): - - Revise and unify the meaning of the ExitNodes, EntryNodes, + - Revise and reconcile the meaning of the ExitNodes, EntryNodes, ExcludeEntryNodes, ExcludeExitNodes, ExcludeNodes, and StrictNodes options. Previously, we had been ambiguous in describing what counted as an "exit" node, and what operations exactly "StrictNodes

1 0

[tor/release-0.2.2] Merge changes files into 0.2.2.25 changelog
by nickm＠torproject.org 28 Apr '11

28 Apr '11

commit 540c6f12cdbad84667e0def720d985f1cd8680ec Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 28 22:53:43 2011 -0400 Merge changes files into 0.2.2.25 changelog --- ChangeLog | 46 ++++++++++++++++++++++++++++++++-- changes/bug2475 | 5 ---- changes/bug2722 | 11 -------- changes/bug3012 | 5 ---- changes/bug3020 | 7 ----- changes/bug3039 | 5 ---- changes/clear_trackexithost | 5 ---- changes/forget-rend-descs-on-newnym | 21 ---------------- changes/gmtime_null | 6 ---- changes/ticket2497 | 4 --- 10 files changed, 43 insertions(+), 72 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f73d3b..4571fc5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,17 @@ Changes in version 0.2.2.25-alpha - 2011-04-28 file, don't wrongly inflate that value by a factor of 10 anymore. Also, resume reading bandwidth history from the state file correctly. Fixes bug 2704; bugfix on tor-0.2.2.23-alpha. + - When we find that we have extended a hidden service's introduction + circuit to a relay not listed as an introduction point in the HS + descriptor we currently have, retry an introduction point from the + current descriptor. Previously we would just give up. Fixes bugs + 1024 and 1930; bugfix on 0.2.0.10-alpha. + - Clients now stop trying to use an exit node associated with a given + destination by TrackHostExits if they fail to reach that exit node. + Fixes bug 2999. Bugfix on 0.2.0.20-rc. + - Fix crash bug on platforms where gmtime and localtime can return + NULL. Fixes part of bug 2077. Bugfix on all versions of Tor. Found + by boboper. o Security and stability fixes: - Don't double-free a parsable, but invalid, microdescriptor, even @@ -19,6 +30,9 @@ Changes in version 0.2.2.25-alpha - 2011-04-28 Unnamed nickname. Fixes bug 2979, reported by tagnaq. - Fix an uncommon assertion failure when running with DNSPort under heavy load. Fixes bug 2933; bugfix on 2.0.1-alpha. + - Avoid linkability based on cached hidden service descriptors: forget + all hidden service descriptors cached as a client when processing a + SIGNAL NEWNYM command. Fixes bug 3000; bugfix on 0.0.6. o Major features: - Export GeoIP information on bridge usage to controller even if @@ -87,6 +101,12 @@ Changes in version 0.2.2.25-alpha - 2011-04-28 - Improve log messages related to excluded nodes. o Minor bugfixes: + - Fix a spurious warning when moving from a short month to a long month + on relays with month-based BandwidthAccounting. Bugfix on + 0.2.2.17-alpha; fixes bug 3020. + - When a client finds that an origin circuit has run out of 16-bit + stream IDs, we now mark it as unusable for new streams. Previously, + we would try to close the entire circuit. Bugfix on 0.0.6. - Added a forgotten cast that caused a compile warning on OS X 10.6. Bugfix on 0.2.2.24-alpha. - Be more careful about reporting the correct error from a failed @@ -96,12 +116,14 @@ Changes in version 0.2.2.25-alpha - 2011-04-28 - Correctly handle an "impossible" overflow cases in connection byte counting, where we write or read more than 4GB on an edge connection in a single second. Bugfix on 0.1.2.8-beta. - - When a client finds that an origin circuit has run out of 16-bit - stream IDs, we now mark it as unusable for new streams. Previously, - we would try to close the entire circuit. Bugfix on 0.0.6. - Correct the warning displayed when a rendezvous descriptor exceeds the maximum size. Fixes bug 2750; bugfix on 0.2.1.5-alpha. Found by John Brooks. + - Clients and hidden services now use HSDir-flagged relays for hidden + service descriptor downloads and uploads even if the relays have no + DirPort set and the client has disabled TunnelDirConns. This will + eventually allow us to give the HSDir flag to relays with no + DirPort. Fixes bug 2722; bugfix on 0.2.1.6-alpha. - Downgrade "no current certificates known for authority" message from Notice to Info. Fixes bug 2899; bugfix on 0.2.0.10-alpha. - Make the SIGNAL DUMP control-port command work on FreeBSD. Fixes @@ -110,15 +132,29 @@ Changes in version 0.2.2.25-alpha - 2011-04-28 multiple HS descriptors are published to an HSDir relay in a single POST operation. Fixes bug 2948; bugfix on 0.2.1.5-alpha. Found by hsdir. + - 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. - Be more consistent in our treatment of file system paths. "~" should get expanded to the user's home directory in the Log config option. Fixes bug 2971; bugfix on 0.2.0.1-alpha, which introduced the feature for the -f and --DataDirectory options. o Minor features: + - Make sure every relay writes a state file at least every 12 hours. + Previously, a relay could go for weeks without writing its state + file, and on a crash could lose its bandwidth history, capacity + estimates, client country statistics, and so on. Addresses bug 3012. - Send END_STREAM_REASON_NOROUTE in response to EHOSTUNREACH errors. Clients before 0.2.1.27 didn't handle NOROUTE correctly, but such clients are already deprecated because of security bugs. + - Don't allow v0 hidden service authorities to act as clients. + Required by fix for bug 3000. + - Ignore SIGNAL NEWNYM commands on relay-only Tor instances. + Required by fix for bug 3000. + - Ensure that no empty [dirreq-](read|write)-history lines are added + to an extrainfo document. Implements ticket 2497. o Code simplification and refactoring: - Removed workaround code to handle directory responses from @@ -132,6 +168,10 @@ Changes in version 0.2.2.25-alpha - 2011-04-28 in three places, and we never adjusted the known/unknown skew values. This is still something we might want to do someday, but if we do, we'll want to do it differently. + - Avoid signed/unsigned comparisons by making SIZE_T_CEILING unsigned. + (None of the cases where we did this before were wrong, but by making + this change we avoid warnings.) Fixes bug 2475; bugfix on + 0.2.1.28. - Use GetTempDir to find the proper temporary directory location on Windows when generating temporary files for the unit tests. Patch by Gisle Vanem. diff --git a/changes/bug2475 b/changes/bug2475 deleted file mode 100644 index d6f0595..0000000 --- a/changes/bug2475 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Avoid signed/unsigned comparisons by making SIZE_T_CEILING unsigned. - (None of the cases where we did this before were wrong, but by making - this change we can avoid warnings.) Fixes bug2475; bugfix on - Tor 0.2.1.28. diff --git a/changes/bug2722 b/changes/bug2722 deleted file mode 100644 index ed132fc..0000000 --- a/changes/bug2722 +++ /dev/null @@ -1,11 +0,0 @@ - o Minor bugfixes - - Ignore the TunnelDirConns option when determining which HSDir - relays are responsible for a hidden service descriptor ID. - Currently, clients and hidden services with TunnelDirConns off - will skip over HSDir relays which do not advertise a DirPort - when making a list of HSDirs responsible for a descriptor ID, - even though they would never try to use a HSDir's DirPort to - upload or fetch a hidden service descriptor. Fixes bug 2722; - bugfix on 0.2.1.6-alpha. - - diff --git a/changes/bug3012 b/changes/bug3012 deleted file mode 100644 index dfde5fa..0000000 --- a/changes/bug3012 +++ /dev/null @@ -1,5 +0,0 @@ - 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/changes/bug3020 b/changes/bug3020 deleted file mode 100644 index b987161..0000000 --- a/changes/bug3020 +++ /dev/null @@ -1,7 +0,0 @@ - o Minor bugfixes: - - When checking whether a hibernation period has fully elapsed, use - the amount of seconds we expect for that period instead of using - the new period that just started. This would cause an issue because - February is a really short month. Bugfix on 0.2.2.17-alpha; - fixes bug 3020. - diff --git a/changes/bug3039 b/changes/bug3039 deleted file mode 100644 index 7347ee3..0000000 --- a/changes/bug3039 +++ /dev/null @@ -1,5 +0,0 @@ - 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/changes/clear_trackexithost b/changes/clear_trackexithost deleted file mode 100644 index b9ac6fe..0000000 --- a/changes/clear_trackexithost +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Fix a bug in the code where we could keep trying to use a - TrackHostExits-based mapping after we failed to reach the intended - destination node. Fixes bug 2999. Bugfix on 0.2.0.20-rc. - diff --git a/changes/forget-rend-descs-on-newnym b/changes/forget-rend-descs-on-newnym deleted file mode 100644 index da7afbe..0000000 --- a/changes/forget-rend-descs-on-newnym +++ /dev/null @@ -1,21 +0,0 @@ - o Security fixes: - - Forget all hidden service descriptors cached as a client when - processing a SIGNAL NEWNYM command. Fixes bug 3000. Bugfix on - 0.0.6. - o Major bugfixes: - - When we find that we have extended a hidden service's introduction - circuit to a relay which isn't listed as an introduction point in - the HS descriptor we currently have for the service, we now retry - one of the introduction points in the current HS descriptor. - Previously we would just give up. Bugfix on 0.2.0.10-alpha; fixes - bugs 1024 and 1930. - o Minor bugfixes: - - Don't allow v0 hidden service authorities to act as clients. - Required by fix for bug 3000. - - Ignore SIGNAL NEWNYM commands on relay-only Tor instances. - Required by fix for bug 3000. - o Code simplifications and refactoring: - - Allow rend_client_send_introduction to fail without closing the - AP connection permanently. - - diff --git a/changes/gmtime_null b/changes/gmtime_null deleted file mode 100644 index 16a2540..0000000 --- a/changes/gmtime_null +++ /dev/null @@ -1,6 +0,0 @@ - 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/changes/ticket2497 b/changes/ticket2497 deleted file mode 100644 index 5117141..0000000 --- a/changes/ticket2497 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features: - - Ensure that no empty [dirreq-](read|write)-history lines are added - to an extrainfo document. Implements ticket 2497. -

1 0

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

28 Apr '11

1 0

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

28 Apr '11

commit f0d9e2d6507adcc069b38cd9e0aaf6702f576314 Merge: 4010427 66de6f7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 28 21:15:14 2011 -0400 Merge remote-tracking branch 'arma/bug3012' into maint-0.2.2 changes/bug3012 | 5 +++++ src/or/config.c | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletions(-)

1 0

[tor/release-0.2.2] Avoid false positives from proxy_mode()
by nickm＠torproject.org 28 Apr '11

28 Apr '11

commit 6dfc0d530113e055d91b68969c81595ddc749f07 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 28 17:45:41 2011 -0400 Avoid false positives from proxy_mode() Previously it would erroneously return true if ListenAddr was set for a client port, even if that port itself was 0. This would give false positives, which were not previously harmful... but which were about to become. --- src/or/router.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 0ef4728..65afd49 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1107,10 +1107,10 @@ set_server_advertised(int s) int proxy_mode(or_options_t *options) { - return (options->SocksPort != 0 || options->SocksListenAddress || - options->TransPort != 0 || options->TransListenAddress || - options->NATDPort != 0 || options->NATDListenAddress || - options->DNSPort != 0 || options->DNSListenAddress); + return (options->SocksPort != 0 || + options->TransPort != 0 || + options->NATDPort != 0 || + options->DNSPort != 0); } /** Decide if we're a publishable server. We are a publishable server if:

1 0

[tor/release-0.2.2] Fix bug 1930
by nickm＠torproject.org 28 Apr '11

28 Apr '11

commit b8708b5bd30f5ef6dd34f7199a5588627486bcd2 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Apr 26 02:21:25 2011 -0700 Fix bug 1930 --- changes/forget-rend-descs-on-newnym | 7 +++ src/or/rendclient.c | 103 +++++++++++++++++++++-------------- 2 files changed, 70 insertions(+), 40 deletions(-) diff --git a/changes/forget-rend-descs-on-newnym b/changes/forget-rend-descs-on-newnym index 0ea09e0..da7afbe 100644 --- a/changes/forget-rend-descs-on-newnym +++ b/changes/forget-rend-descs-on-newnym @@ -2,6 +2,13 @@ - Forget all hidden service descriptors cached as a client when processing a SIGNAL NEWNYM command. Fixes bug 3000. Bugfix on 0.0.6. + o Major bugfixes: + - When we find that we have extended a hidden service's introduction + circuit to a relay which isn't listed as an introduction point in + the HS descriptor we currently have for the service, we now retry + one of the introduction points in the current HS descriptor. + Previously we would just give up. Bugfix on 0.2.0.10-alpha; fixes + bugs 1024 and 1930. o Minor bugfixes: - Don't allow v0 hidden service authorities to act as clients. Required by fix for bug 3000. diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 8803875..8d024d8 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -66,6 +66,50 @@ rend_client_send_establish_rendezvous(origin_circuit_t *circ) return 0; } +/** Extend the introduction circuit circ to another valid + * introduction point for the hidden service it is trying to connect + * to, or mark it and launch a new circuit if we can't extend it. + * Return 0 on success. Return -1 and mark the introduction + * circuit on failure. + * + * On failure, the caller is responsible for marking the associated + * rendezvous circuit for close. */ +static int +rend_client_reextend_intro_circuit(origin_circuit_t *circ) +{ + extend_info_t *extend_info; + int result; + extend_info = rend_client_get_random_intro(circ->rend_data); + if (!extend_info) { + log_warn(LD_REND, + "No usable introduction points left for %s. Closing.", + safe_str_client(circ->rend_data->onion_address)); + circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_INTERNAL); + return -1; + } + if (circ->remaining_relay_early_cells) { + log_info(LD_REND, + "Re-extending circ %d, this time to %s.", + circ->_base.n_circ_id, extend_info->nickname); + result = circuit_extend_to_new_exit(circ, extend_info); + } else { + log_info(LD_REND, + "Building a new introduction circuit, this time to %s.", + extend_info->nickname); + circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_FINISHED); + if (!circuit_launch_by_extend_info(CIRCUIT_PURPOSE_C_INTRODUCING, + extend_info, + CIRCLAUNCH_IS_INTERNAL)) { + log_warn(LD_REND, "Building introduction circuit failed."); + result = -1; + } else { + result = 0; + } + } + extend_info_free(extend_info); + return result; +} + /** Called when we're trying to connect an ap conn; sends an INTRODUCE1 cell * down introcirc if possible. */ @@ -120,11 +164,18 @@ rend_client_send_introduction(origin_circuit_t *introcirc, } }); if (!intro_key) { - 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.", + log_info(LD_REND, "Could not find intro key for %s at %s; we " + "have a v2 rend desc with %d intro points. " + "Trying a different intro point...", + safe_str_client(introcirc->rend_data->onion_address), + introcirc->build_state->chosen_exit->nickname, smartlist_len(entry->parsed->intro_nodes)); - goto perm_err; + + if (rend_client_reextend_intro_circuit(introcirc)) { + goto perm_err; + } else { + return -1; + } } if (crypto_pk_get_digest(intro_key, payload)<0) { log_warn(LD_BUG, "Internal error: couldn't hash public key."); @@ -227,7 +278,8 @@ rend_client_send_introduction(origin_circuit_t *introcirc, return 0; perm_err: - circuit_mark_for_close(TO_CIRCUIT(introcirc), END_CIRC_REASON_INTERNAL); + if (!introcirc->_base.marked_for_close) + circuit_mark_for_close(TO_CIRCUIT(introcirc), END_CIRC_REASON_INTERNAL); circuit_mark_for_close(TO_CIRCUIT(rendcirc), END_CIRC_REASON_INTERNAL); return -2; } @@ -290,45 +342,16 @@ rend_client_introduction_acked(origin_circuit_t *circ, * points. If any remain, extend to a new one and try again. * If none remain, refetch the service descriptor. */ + log_info(LD_REND, "Got nack for %s from %s...", + safe_str_client(circ->rend_data->onion_address), + circ->build_state->chosen_exit->nickname); if (rend_client_remove_intro_point(circ->build_state->chosen_exit, circ->rend_data) > 0) { /* There are introduction points left. Re-extend the circuit to * another intro point and try again. */ - extend_info_t *extend_info; - int result; - extend_info = rend_client_get_random_intro(circ->rend_data); - if (!extend_info) { - log_warn(LD_REND, "No introduction points left for %s. Closing.", - escaped_safe_str_client(circ->rend_data->onion_address)); - circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_INTERNAL); - return -1; - } - if (circ->remaining_relay_early_cells) { - log_info(LD_REND, - "Got nack for %s from %s. Re-extending circ %d, " - "this time to %s.", - escaped_safe_str_client(circ->rend_data->onion_address), - circ->build_state->chosen_exit->nickname, - circ->_base.n_circ_id, extend_info->nickname); - result = circuit_extend_to_new_exit(circ, extend_info); - } else { - log_info(LD_REND, - "Got nack for %s from %s. Building a new introduction " - "circuit, this time to %s.", - escaped_safe_str_client(circ->rend_data->onion_address), - circ->build_state->chosen_exit->nickname, - extend_info->nickname); - circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_FINISHED); - if (!circuit_launch_by_extend_info(CIRCUIT_PURPOSE_C_INTRODUCING, - extend_info, - CIRCLAUNCH_IS_INTERNAL)) { - log_warn(LD_REND, "Building introduction circuit failed."); - result = -1; - } else { - result = 0; - } - } - extend_info_free(extend_info); + int result = rend_client_reextend_intro_circuit(circ); + /* XXXX If that call failed, should we close the rend circuit, + * too? */ return result; } }

1 0

[tor/release-0.2.2] Ignore SIGNAL NEWNYM on relay-only Tor instances
by nickm＠torproject.org 28 Apr '11

28 Apr '11

commit ddd1b7be2dce0845e6c08dcb5404ae65940b9edb Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Apr 20 17:01:41 2011 -0700 Ignore SIGNAL NEWNYM on relay-only Tor instances --- changes/forget-rend-descs-on-newnym | 2 ++ src/or/main.c | 7 +++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/changes/forget-rend-descs-on-newnym b/changes/forget-rend-descs-on-newnym index f8758c2..0ea09e0 100644 --- a/changes/forget-rend-descs-on-newnym +++ b/changes/forget-rend-descs-on-newnym @@ -5,6 +5,8 @@ o Minor bugfixes: - Don't allow v0 hidden service authorities to act as clients. Required by fix for bug 3000. + - Ignore SIGNAL NEWNYM commands on relay-only Tor instances. + Required by fix for bug 3000. o Code simplifications and refactoring: - Allow rend_client_send_introduction to fail without closing the AP connection permanently. diff --git a/src/or/main.c b/src/or/main.c index 3bf2169..a26be39 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -842,6 +842,13 @@ run_connection_housekeeping(int i, time_t now) static void signewnym_impl(time_t now) { + or_options_t *options = get_options(); + if (!proxy_mode(options)) { + log_info(LD_CONTROL, "Ignoring SIGNAL NEWNYM because client functionality " + "is disabled."); + return; + } + circuit_expire_all_dirty_circs(); addressmap_clear_transient(); rend_cache_purge();

1 0

[tor/release-0.2.2] Correctly check elapsed time in last hibernation period
by nickm＠torproject.org 28 Apr '11

28 Apr '11

commit 525d2700dd8b6c794a69ea0be63864baeff27617 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Apr 29 01:18:32 2011 +0200 Correctly check elapsed time in last hibernation period Fix bug 3020. --- changes/bug3020 | 7 +++++++ src/or/hibernate.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/changes/bug3020 b/changes/bug3020 new file mode 100644 index 0000000..b987161 --- /dev/null +++ b/changes/bug3020 @@ -0,0 +1,7 @@ + o Minor bugfixes: + - When checking whether a hibernation period has fully elapsed, use + the amount of seconds we expect for that period instead of using + the new period that just started. This would cause an issue because + February is a really short month. Bugfix on 0.2.2.17-alpha; + fixes bug 3020. + diff --git a/src/or/hibernate.c b/src/or/hibernate.c index 1878d5d..aebce4c 100644 --- a/src/or/hibernate.c +++ b/src/or/hibernate.c @@ -378,7 +378,8 @@ configure_accounting(time_t now) /* We are in the interval we thought we were in. Do nothing.*/ interval_end_time = start_of_accounting_period_after(interval_start_time); } else { - long duration = length_of_accounting_period_containing(now); + long duration = + length_of_accounting_period_containing(interval_start_time); double delta = ((double)(s_now - interval_start_time)) / duration; if (-0.50 <= delta && delta <= 0.50) { /* The start of the period is now a little later or earlier than we

1 0

[tor/release-0.2.2] Merge remote-tracking branches 'rransom/bug2722' and 'rransom/bug2722b' into maint-0.2.2
by nickm＠torproject.org 28 Apr '11

28 Apr '11

commit 6b9aadd557de171f0de7b700ba427a9a37a545fa Merge: c122897 eb50e3d 134da2f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 28 20:36:38 2011 -0400 Merge remote-tracking branches 'rransom/bug2722' and 'rransom/bug2722b' into maint-0.2.2 changes/bug2722 | 11 +++++++++++ src/or/dirserv.c | 2 ++ src/or/routerlist.c | 10 ++-------- 3 files changed, 15 insertions(+), 8 deletions(-) diff --cc src/or/routerlist.c index d9f099b,5e9c82a,4deff53..f567ccd --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@@@ -506,36 -463,37 -506,36 +506,36 @@@@ authority_certs_fetch_missing(networkst !digestmap_get(pending, voter->identity_digest)) { log_notice(LD_DIR, "We're missing a certificate from authority " "with signing key %s: launching request.", - hex_str(voter->signing_key_digest, DIGEST_LEN)); - smartlist_add(missing_digests, voter->identity_digest); + hex_str(sig->signing_key_digest, DIGEST_LEN)); + smartlist_add(missing_digests, sig->identity_digest); } - }); + } SMARTLIST_FOREACH_END(sig); + } SMARTLIST_FOREACH_END(voter); } - SMARTLIST_FOREACH(trusted_dir_servers, trusted_dir_server_t *, ds, - { - int found = 0; - if (!(ds->type & V3_AUTHORITY)) - continue; - if (smartlist_digest_isin(missing_digests, ds->v3_identity_digest)) - continue; - cl = get_cert_list(ds->v3_identity_digest); - SMARTLIST_FOREACH(cl->certs, authority_cert_t *, cert, - { - if (!ftime_definitely_after(now, cert->expires)) { - /* It's not expired, and we weren't looking for something to - * verify a consensus with. Call it done. */ - download_status_reset(&cl->dl_status); - found = 1; - break; - } - }); - if (!found && - download_status_is_ready(&cl->dl_status, now,MAX_CERT_DL_FAILURES) && - !digestmap_get(pending, ds->v3_identity_digest)) { - log_notice(LD_DIR, "No current certificate known for authority %s; " - "launching request.", ds->nickname); - smartlist_add(missing_digests, ds->v3_identity_digest); + SMARTLIST_FOREACH_BEGIN(trusted_dir_servers, trusted_dir_server_t *, ds) { + int found = 0; + if (!(ds->type & V3_AUTHORITY)) + continue; + if (smartlist_digest_isin(missing_digests, ds->v3_identity_digest)) + continue; + cl = get_cert_list(ds->v3_identity_digest); + SMARTLIST_FOREACH(cl->certs, authority_cert_t *, cert, { + if (now < cert->expires) { + /* It's not expired, and we weren't looking for something to + * verify a consensus with. Call it done. */ + download_status_reset(&cl->dl_status); + found = 1; + break; } }); + if (!found && + download_status_is_ready(&cl->dl_status, now,MAX_CERT_DL_FAILURES) && + !digestmap_get(pending, ds->v3_identity_digest)) { - log_notice(LD_DIR, "No current certificate known for authority %s; " - "launching request.", ds->nickname); ++ log_info(LD_DIR, "No current certificate known for authority %s; " ++ "launching request.", ds->nickname); + smartlist_add(missing_digests, ds->v3_identity_digest); + } + } SMARTLIST_FOREACH_END(ds); if (!smartlist_len(missing_digests)) { goto done; @@@@ -5594,14 -5192,9 -5550,13 +5594,14 @@@@ routerset_get_all_routers(smartlist_t * } } - /** Add to target every routerinfo_t from source that is in - * include, but not excluded in a more specific fashion by - * exclude. If running_only, only include running routers. ++#if 0 + /** Add to target every routerinfo_t from source except: + * + * 1) Don't add it if include is non-empty and the relay isn't in + * include; and + * 2) Don't add it if exclude is non-empty and the relay is + * excluded in a more specific fashion by exclude. + * 3) If running_only, don't add non-running routers. */ void routersets_get_disjunction(smartlist_t *target,

1 0

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

28 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