- tor-commits - lists.torproject.org

[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 @@… [View More]

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; … [View More]

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/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/… [View More]

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 … [View More] | 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. - [View Less]

1 0

[tor/release-0.2.2] Fix handling of StreamID exhaustion.
by arma＠torproject.org 08 Apr '11

08 Apr '11

commit 432734279d3688fafb466a23f43585ff509ff693 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 25 17:57:15 2011 -0400 Fix handling of StreamID exhaustion. Since svn r1475/git 5b6099e8 in tor-0.0.6, we have responded to an exhaustion of all 65535 stream IDs on a circuit by marking that circuit for close. That's not the right response. Instead, we should mark the circuit as "too dirty for new circuits". Of course in reality this isn't … [View More]really right either. If somebody has managed to cram 65535 streams onto a circuit, the circuit is probably not going to work well for any of those streams, so maybe we should be limiting the number of streams on an origin circuit concurrently. Also, closing the stream in this case is probably the wrong thing to do as well, but fixing that can also wait. --- changes/full_ap_circuits | 6 ++++++ src/or/connection_edge.c | 18 ++++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/changes/full_ap_circuits b/changes/full_ap_circuits new file mode 100644 index 0000000..379a1a1 --- /dev/null +++ b/changes/full_ap_circuits @@ -0,0 +1,6 @@ + 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/src/or/connection_edge.c b/src/or/connection_edge.c index af0cfbe..72e2c8a 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2164,9 +2164,14 @@ connection_ap_handshake_send_begin(edge_connection_t *ap_conn) ap_conn->stream_id = get_unique_stream_id_by_circ(circ); if (ap_conn->stream_id==0) { + /* XXXX023 Instead of closing this stream, we should make it get + * retried on another circuit. */ connection_mark_unattached_ap(ap_conn, END_STREAM_REASON_INTERNAL); - /*XXXX022 _close_ the circuit because it's full? That sounds dumb. */ - circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_RESOURCELIMIT); + + /* Mark this circuit "unusable for new streams". */ + /* XXXX023 this is a kludgy way to do this. */ + tor_assert(circ->_base.timestamp_dirty); + circ->_base.timestamp_dirty -= get_options()->MaxCircuitDirtiness; return -1; } @@ -2224,9 +2229,14 @@ connection_ap_handshake_send_resolve(edge_connection_t *ap_conn) ap_conn->stream_id = get_unique_stream_id_by_circ(circ); if (ap_conn->stream_id==0) { + /* XXXX023 Instead of closing this stream, we should make it get + * retried on another circuit. */ connection_mark_unattached_ap(ap_conn, END_STREAM_REASON_INTERNAL); - /*XXXX022 _close_ the circuit because it's full? That sounds dumb. */ - circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_RESOURCELIMIT); + + /* Mark this circuit "unusable for new streams". */ + /* XXXX023 this is a kludgy way to do this. */ + tor_assert(circ->_base.timestamp_dirty); + circ->_base.timestamp_dirty -= get_options()->MaxCircuitDirtiness; return -1; } [View Less]

1 0

[tor/release-0.2.2] Fix a compile warning on OS X 10.6
by arma＠torproject.org 08 Apr '11

08 Apr '11

commit 286d44402e829488abe802efd1607eabbc98f1d1 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Apr 7 05:30:49 2011 +0200 Fix a compile warning on OS X 10.6 --- src/or/circuituse.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 447ec84..3d5db98 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -291,7 +291,7 @@ circuit_expire_building(void) long ms = tor_lround(msec); … [View More]

1 0

[tor/release-0.2.2] Add a missing cast to silence the compiler
by arma＠torproject.org 08 Apr '11

08 Apr '11

commit 8d81831d715adf9cb374100e23cc2b118efe3101 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Mar 28 18:20:50 2011 +0200 Add a missing cast to silence the compiler --- src/or/connection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 084237d..6e7bbd5 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2790,7 +2790,7 @@ connection_handle_write_impl(connection_t *conn, int force) … [View More]

1 0

[tor/release-0.2.2] Merge maint-0.2.1 for bug2402_again fixes . Use "-s ours" so we don't actually take the patch.
by arma＠torproject.org 08 Apr '11

08 Apr '11

commit de1c36ff6062ee4b45e1e1f637a7f168e104d7b1 Merge: 9d2b384 32341ac Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 6 16:15:48 2011 -0400 Merge maint-0.2.1 for bug2402_again fixes . Use "-s ours" so we don't actually take the patch.

1 0

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

08 Apr '11

commit 32341ac467d5fe51fa674eed4ca20db61ff5486b Merge: 0cdd262 02d93ca Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 6 16:13:22 2011 -0400 Merge remote-tracking branch 'public/bug2402_again' into maint-0.2.1 changes/bug2402 | 4 --- changes/bug2402_redux | 6 +++++ src/or/Makefile.am | 60 ++++++++++-------------------------------------- src/or/config.c | 11 ++++++++- src/or/router.c | 2 - 5 files changed, 29 insertions(+), 54 deletions(-)

1 0