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

[tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by arma＠torproject.org 08 Apr '11

08 Apr '11

commit 80466eb21531c2d47e0cb6d7163492c16cf608ef Merge: 39cc300 4cbbb92 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Apr 8 17:01:24 2011 -0400 Merge branch 'maint-0.2.2' into release-0.2.2 changes/osx_forgotten_compilefix | 4 ++++ changes/win_tmp_dir | 4 ++++ src/common/log.c | 11 ++++++++++- src/or/rephist.c | 19 ++++++++++++++++--- src/test/test.c | 14 ++++++++++---- 5 files changed, 44 insertions(+), 8 deletions(-)

1 0

[tor/release-0.2.2] Merge branch 'bug2373' into maint-0.2.2
by arma＠torproject.org 08 Apr '11

08 Apr '11

commit e247705afefaa0f32ccbc43185f98fc65f041af1 Merge: 70e0291 1be1221 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 8 13:35:26 2011 -0400 Merge branch 'bug2373' into maint-0.2.2 src/common/log.c | 11 ++++++++++- src/or/rephist.c | 19 ++++++++++++++++--- 2 files changed, 26 insertions(+), 4 deletions(-)

1 0

[tor/release-0.2.2] Free pending_cb_messages on exit
by arma＠torproject.org 08 Apr '11

08 Apr '11

commit 1be12213857e3c5068107f4df047cea03b6462e8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 7 15:25:33 2011 -0400 Free pending_cb_messages on exit --- src/common/log.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/src/common/log.c b/src/common/log.c index 28d0029..d14563c 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -363,7 +363,7 @@ logv(int severity, log_domain_mask_t domain, const char *funcname, continue; } else if (lf->callback) { if (domain & LD_NOCB) { - if (!callbacks_deferred) { + if (!callbacks_deferred && pending_cb_messages) { pending_cb_message_t *msg = tor_malloc(sizeof(pending_cb_message_t)); msg->severity = severity; msg->domain = domain; @@ -512,9 +512,12 @@ void logs_free_all(void) { logfile_t *victim, *next; + smartlist_t *messages; LOCK_LOGS(); next = logfiles; logfiles = NULL; + messages = pending_cb_messages; + pending_cb_messages = NULL; UNLOCK_LOGS(); while (next) { victim = next; @@ -524,6 +527,12 @@ logs_free_all(void) } tor_free(appname); + SMARTLIST_FOREACH(messages, pending_cb_message_t *, msg, { + tor_free(msg->msg); + tor_free(msg); + }); + smartlist_free(messages); + /* We _could_ destroy the log mutex here, but that would screw up any logs * that happened between here and the end of execution. */ }

1 0

[tor/release-0.2.2] Use GetTempDir instead of hardcoded path to c:\windows\tmp for unittests
by arma＠torproject.org 08 Apr '11

08 Apr '11

commit 70e02914682eb1959d8b385f76b5acf7486158cc Author: Gisle Vanem <gvanem(a)broadpark.no> Date: Thu Apr 7 18:34:11 2011 -0400 Use GetTempDir instead of hardcoded path to c:\windows\tmp for unittests --- changes/win_tmp_dir | 4 ++++ src/test/test.c | 14 ++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/changes/win_tmp_dir b/changes/win_tmp_dir new file mode 100644 index 0000000..13f6e7f --- /dev/null +++ b/changes/win_tmp_dir @@ -0,0 +1,4 @@ + o Unit tests: + - 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/src/test/test.c b/src/test/test.c index f5b6a22..9b24a99 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -84,10 +84,16 @@ setup_directory(void) if (is_setup) return; #ifdef MS_WINDOWS - // XXXX - tor_snprintf(temp_dir, sizeof(temp_dir), - "c:\\windows\\temp\\tor_test_%d", (int)getpid()); - r = mkdir(temp_dir); + { + char buf[MAX_PATH]; + const char *tmp = buf; + /* If this fails, we're probably screwed anyway */ + if (!GetTempPath(sizeof(buf),buf)) + tmp = "c:\\windows\\temp"; + tor_snprintf(temp_dir, sizeof(temp_dir), + "%s\\tor_test_%d", tmp, (int)getpid()); + r = mkdir(temp_dir); + } #else tor_snprintf(temp_dir, sizeof(temp_dir), "/tmp/tor_test_%d", (int) getpid()); r = mkdir(temp_dir, 0700);

1 0

[tor/release-0.2.2] Fix up some cell-queue stats issues in rephist.c
by arma＠torproject.org 08 Apr '11

08 Apr '11

commit 71fb2af62c0a60fee94f984b782531a5d492b055 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 7 14:56:50 2011 -0400 Fix up some cell-queue stats issues in rephist.c - Document the structure and variables. - Make circuits_for_buffer_stats into a static variable. - Don't die horribly if interval_length is 0. - Remove the unused local_circ_id field. - Reorder the fields of circ_buffer_stats_t for cleaner alignment layout. --- src/or/rephist.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/or/rephist.c b/src/or/rephist.c index e56ce9e..74e156f 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2330,14 +2330,19 @@ rep_hist_buffer_stats_init(time_t now) start_of_buffer_stats_interval = now; } +/** Statistics from a single circuit. Collected when the circuit closes, or + * when we flush statistics to disk. */ typedef struct circ_buffer_stats_t { - uint32_t processed_cells; + /** Average number of cells in the circuit's queue */ double mean_num_cells_in_queue; + /** Average time a cell waits in the queue. */ double mean_time_cells_in_queue; - uint32_t local_circ_id; + /** Total number of cells sent over this circuit */ + uint32_t processed_cells; } circ_buffer_stats_t; -smartlist_t *circuits_for_buffer_stats = NULL; +/** List of circ_buffer_stats_t. */ +static smartlist_t *circuits_for_buffer_stats = NULL; /** Remember cell statistics for circuit <b>circ</b> at time * <b>end_of_interval</b> and reset cell counters in case the circuit @@ -2361,6 +2366,8 @@ rep_hist_buffer_stats_add_circ(circuit_t *circ, time_t end_of_interval) circ->timestamp_created.tv_sec : start_of_buffer_stats_interval; interval_length = (int) (end_of_interval - start_of_interval); + if (interval_length <= 0) + return; stat = tor_malloc_zero(sizeof(circ_buffer_stats_t)); stat->processed_cells = orcirc->processed_cells; /* 1000.0 for s -> ms; 2.0 because of app-ward and exit-ward queues */

1 0

[tor/release-0.2.2] Free circuits_for_buffer_stats on shutdown
by arma＠torproject.org 08 Apr '11

08 Apr '11

commit 403b6cfdedee7ebc8fe0b5d1c187e8ae3611aec1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 7 14:59:28 2011 -0400 Free circuits_for_buffer_stats on shutdown --- src/or/rephist.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/or/rephist.c b/src/or/rephist.c index 74e156f..9b7eefe 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2545,5 +2545,11 @@ rep_hist_free_all(void) tor_free(exit_streams); built_last_stability_doc_at = 0; predicted_ports_free(); + if (circuits_for_buffer_stats) { + SMARTLIST_FOREACH(circuits_for_buffer_stats, circ_buffer_stats_t *, s, + tor_free(s)); + smartlist_free(circuits_for_buffer_stats); + circuits_for_buffer_stats = NULL; + } }

1 0

[tor/maint-0.2.2] Add a changes file for the osx 10.6 compile fix
by arma＠torproject.org 08 Apr '11

08 Apr '11

commit 4cbbb92e7fc7c9c4d374b35211c216a5419e3da2 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Apr 8 22:56:28 2011 +0200 Add a changes file for the osx 10.6 compile fix We forgot to put it into 0.2.2.24-alpha. --- changes/osx_forgotten_compilefix | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/osx_forgotten_compilefix b/changes/osx_forgotten_compilefix new file mode 100644 index 0000000..754e09c --- /dev/null +++ b/changes/osx_forgotten_compilefix @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Added a forgotten cast that caused a compile warning on OS X 10.6. Bugfix + on 0.2.2.24-alpha. +

1 0

[tor/release-0.2.2] fold in changes entries so far
by arma＠torproject.org 08 Apr '11

08 Apr '11

commit 39cc300303993628afa1e067538cbd7d319f46b0 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Apr 8 16:54:50 2011 -0400 fold in changes entries so far --- ChangeLog | 36 ++++++++++++++++++++++++++++++++++++ changes/bug539_removal | 6 ------ changes/connect_err_reporting | 6 ------ changes/count_overflow | 5 ----- changes/feature2711 | 4 ---- changes/full_ap_circuits | 6 ------ changes/kill_ftime | 7 ------- changes/noroute | 5 ----- 8 files changed, 36 insertions(+), 39 deletions(-) diff --git a/ChangeLog b/ChangeLog index 70afe71..ce68ccb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,39 @@ +Changes in version 0.2.2.25-alpha - 2011-04-?? + o Major features: + - Export GeoIP information on usage to bridge controller even if + we have not yet been running for 24 hours. + + o Minor bugfixes: + - Be more careful about reporting the correct error from a failed + connect() system call. Under some circumstances, it was possible to + look at an incorrect value for errno when sending the end reason. + Bugfix on 0.1.0.1-rc. + - Correctly handle an "impossible" overflow cases in connection + byte counting, where we write or read more than 4GB on an edge + connection in 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 Tor 0.0.6. + + o Minor features: + - 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. + + o Code simplification and refactoring: + - Removed workaround code to handle directory responses from + servers that had bug 539 (they would send HTTP status 503 + responses _and_ send a body too). Since only server versions before + 0.2.0.16-alpha/0.1.2.19 were affected, there is no longer reason + to keep the workaround in place. + - Remove the old 'fuzzy time' logic. It was supposed to be used + for handling calculations where we have a known amount of clock + skew and an allowed amount of unknown skew. But we only used it + 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. + + Changes in version 0.2.2.24-alpha - 2011-04-08 Tor 0.2.2.24-alpha fixes a variety of bugs, including a big bug that prevented Tor clients from effectively using "multihomed" bridges, diff --git a/changes/bug539_removal b/changes/bug539_removal deleted file mode 100644 index dbff43d..0000000 --- a/changes/bug539_removal +++ /dev/null @@ -1,6 +0,0 @@ - o Removed code - - Removed workaround code to handle directory responses from - servers that had bug 539 (they would send HTTP status 503 - responses _and_ send a body too). Since only server versions - before 0.2.0.16-alpha/0.1.2.19 were affected, there is no longer - reason to keep the workaround in place. diff --git a/changes/connect_err_reporting b/changes/connect_err_reporting deleted file mode 100644 index 61a46b6..0000000 --- a/changes/connect_err_reporting +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes: - - Be more careful about reporting the correct error from a failed - connect() operation. Under some circumstances, it was possible to - look at an incorrect value for errno when sending the end reason. - Bugfix on Tor-0.1.0.1-rc. - diff --git a/changes/count_overflow b/changes/count_overflow deleted file mode 100644 index f302ff2..0000000 --- a/changes/count_overflow +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Correctly handle an "impossible" overflow cases in connection - byte counting, where we write or read more than 4GB on an edge - connection in single second. Bugfix on 0.1.2.8-beta. - diff --git a/changes/feature2711 b/changes/feature2711 deleted file mode 100644 index 7cdcfbf..0000000 --- a/changes/feature2711 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features - - Export GeoIP information on usage to bridge controller even if we have - not yet been running for 24 hours. - diff --git a/changes/full_ap_circuits b/changes/full_ap_circuits deleted file mode 100644 index 379a1a1..0000000 --- a/changes/full_ap_circuits +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes - - 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 - Tor version 0.0.6. - diff --git a/changes/kill_ftime b/changes/kill_ftime deleted file mode 100644 index 47f4769..0000000 --- a/changes/kill_ftime +++ /dev/null @@ -1,7 +0,0 @@ - o Code simplification and refactoring - - Remove the old 'fuzzy time' logic. It was supposed to be used - for handling calculations where we have a known amount of clock - skew and an allowed amount of unknown skew. But we only used it - 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. diff --git a/changes/noroute b/changes/noroute deleted file mode 100644 index 644deec..0000000 --- a/changes/noroute +++ /dev/null @@ -1,5 +0,0 @@ - - Minor features - - 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. -

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'public/xxx_fixups' into maint-0.2.2
by arma＠torproject.org 08 Apr '11

08 Apr '11

commit ba0cd8094f8e6ae0113ad69958d9d0973bb1f2c3 Merge: 118d8ff fc64783 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 7 12:03:04 2011 -0400 Merge remote-tracking branch 'public/xxx_fixups' into maint-0.2.2 Conflicts: src/or/or.h changes/bug539_removal | 6 +++ changes/connect_err_reporting | 6 +++ changes/count_overflow | 5 +++ changes/full_ap_circuits | 6 +++ changes/kill_ftime | 7 ++++ changes/noroute | 5 +++ src/common/address.c | 20 ++++++----- src/common/compat_libevent.c | 17 +++------ src/common/memarea.c | 7 +++- src/common/util.c | 77 ----------------------------------------- src/common/util.h | 10 ----- src/or/buffers.c | 6 ++-- src/or/circuitbuild.c | 9 +++-- src/or/circuitlist.c | 3 ++ src/or/circuituse.c | 5 ++- src/or/config.c | 6 ++-- src/or/connection.c | 36 ++++++++++++------- src/or/connection_edge.c | 30 +++++++++++----- src/or/connection_or.c | 6 +++- src/or/directory.c | 37 ++++++++------------ src/or/dirserv.c | 11 ++++-- src/or/dns.c | 2 +- src/or/dnsserv.c | 2 +- src/or/eventdns.c | 2 +- src/or/geoip.c | 5 ++- src/or/networkstatus.c | 11 ++++-- src/or/or.h | 12 +++++-- src/or/reasons.c | 8 +---- src/or/relay.c | 2 + src/or/rendclient.c | 4 +- src/or/rendcommon.c | 2 +- src/or/rephist.c | 2 +- src/or/routerlist.c | 18 +++++----- src/or/routerparse.c | 2 +- 34 files changed, 184 insertions(+), 203 deletions(-) diff --cc src/or/or.h index 3cadd31,e44c626..1688a08 --- a/src/or/or.h +++ b/src/or/or.h @@@ -2126,9 -2126,16 +2126,15 @@@ typedef struct circuit_t * length ONIONSKIN_CHALLENGE_LEN. */ char *n_conn_onionskin; - time_t timestamp_created; /**< When was this circuit created? */ + struct timeval timestamp_created; /**< When was the circuit created? */ - time_t timestamp_dirty; /**< When the circuit was first used, or 0 if the - * circuit is clean. */ + /** When the circuit was first used, or 0 if the circuit is clean. + * + * XXXX023 Note that some code will artifically adjust this value backward + * in time in order to indicate that a circuit shouldn't be used for new + * streams, but that it can stay alive as long as it has streams on it. + * That's a kludge we should fix. + */ + time_t timestamp_dirty; - struct timeval highres_created; /**< When exactly was the circuit created? */ uint16_t marked_for_close; /**< Should we close this circuit at the end of * the main loop? (If true, holds the line number

1 0

[tor/release-0.2.2] Send END_STREAM_REASON_NOROUTE: clients that didn't grok it are now obsolete
by arma＠torproject.org 08 Apr '11

08 Apr '11

commit fc647832783cab352bebba63fe0210d7be395058 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 28 13:42:59 2011 -0400 Send END_STREAM_REASON_NOROUTE: clients that didn't grok it are now obsolete --- changes/noroute | 5 +++++ src/or/reasons.c | 8 +------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/changes/noroute b/changes/noroute new file mode 100644 index 0000000..644deec --- /dev/null +++ b/changes/noroute @@ -0,0 +1,5 @@ + - Minor features + - 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. + diff --git a/src/or/reasons.c b/src/or/reasons.c index 27c947e..319e6c0 100644 --- a/src/or/reasons.c +++ b/src/or/reasons.c @@ -174,13 +174,7 @@ errno_to_stream_end_reason(int e) S_CASE(ENETUNREACH): return END_STREAM_REASON_INTERNAL; S_CASE(EHOSTUNREACH): - /* XXXX023 - * The correct behavior is END_STREAM_REASON_NOROUTE, but older - * clients don't recognize it. So we're going to continue sending - * "MISC" until 0.2.1.27 or later is "well established". - */ - /* return END_STREAM_REASON_NOROUTE; */ - return END_STREAM_REASON_MISC; + return END_STREAM_REASON_NOROUTE; S_CASE(ECONNREFUSED): return END_STREAM_REASON_CONNECTREFUSED; S_CASE(ECONNRESET):

1 0