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

[tor/release-0.2.4] Merge remote-tracking branch 'public/bug8062' into maint-0.2.4
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 01407f9718a7b1eb4e43b46c2799a390551aad29 Merge: dbdc994 fca578d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 16:33:47 2013 -0400 Merge remote-tracking branch 'public/bug8062' into maint-0.2.4 changes/bug8062 | 5 +++++ src/or/or.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.4] Handle TRUNCATE correctly if our next channel isn't done yet.
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit bd9901bef245b3880c9a60034b9fdf6d4829eb65 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:55:55 2013 -0400 Handle TRUNCATE correctly if our next channel isn't done yet. Patch from 'cypherpunks'. Fixes bug #7947. Bugfix on 0.0.7.1. --- changes/bug7947 | 4 ++++ src/or/relay.c | 8 ++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/changes/bug7947 b/changes/bug7947 new file mode 100644 index 0000000..6200ba2 --- /dev/null +++ b/changes/bug7947 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix the handling of a TRUNCATE cell when it arrives while the circuit + extension is in progress. Fixes bug 7947; bugfix on 0.0.7.1. + diff --git a/src/or/relay.c b/src/or/relay.c index 9ff9e1e..8e80d14 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1398,6 +1398,14 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, "'truncate' unsupported at origin. Dropping."); return 0; } + if (circ->n_hop) { + if (circ->n_chan) + log_warn(LD_BUG, "n_chan and n_hop set on the same circuit!"); + extend_info_free(circ->n_hop); + circ->n_hop = NULL; + tor_free(circ->n_chan_create_cell); + circuit_set_state(circ, CIRCUIT_STATE_OPEN); + } if (circ->n_chan) { uint8_t trunc_reason = get_uint8(cell->payload + RELAY_HEADER_SIZE); circuit_clear_cell_queue(circ, circ->n_chan);

1 0

[tor/release-0.2.4] Merge branch 'bug7947' into maint-0.2.4
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit dbdc99483df6f0fdba9f7af8954719d47990a8b8 Merge: aa4fcc4 bd9901b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:56:55 2013 -0400 Merge branch 'bug7947' into maint-0.2.4 changes/bug7947 | 4 ++++ src/or/relay.c | 8 ++++++++ 2 files changed, 12 insertions(+), 0 deletions(-)

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'public/bug6174' into maint-0.2.4
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 597cd893c557f8e05be98b6cade1b312fc6f0f8d Merge: 01407f9 7bb51fd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 16:36:25 2013 -0400 Merge remote-tracking branch 'public/bug6174' into maint-0.2.4 changes/bug6174 | 6 ++++++ src/or/circuitbuild.c | 2 +- src/or/circuitlist.c | 12 +++++------- src/or/circuitlist.h | 2 +- src/or/circuituse.c | 36 +++++++++++++++++++++++++++++++++--- src/or/circuituse.h | 1 + src/or/config.c | 2 +- src/or/connection_edge.c | 18 ++++++------------ src/or/main.c | 4 ++-- src/or/or.h | 4 ++++ src/or/relay.c | 5 ++--- 11 files changed, 62 insertions(+), 30 deletions(-)

1 0

[tor/release-0.2.4] Free prepend_policy values in origin circuits
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 73a35dc3c0b4ab6cf79d88fc513c5c2762eff28a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 19 12:29:08 2013 -0400 Free prepend_policy values in origin circuits --- src/or/circuitlist.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 17e18c7..eab3ebf 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -24,6 +24,7 @@ #include "nodelist.h" #include "onion.h" #include "onion_fast.h" +#include "policies.h" #include "relay.h" #include "rendclient.h" #include "rendcommon.h" @@ -653,6 +654,7 @@ circuit_free(circuit_t *circ) memwipe(ocirc->socks_password, 0x06, ocirc->socks_password_len); tor_free(ocirc->socks_password); } + addr_policy_list_free(ocirc->prepend_policy); } else { or_circuit_t *ocirc = TO_OR_CIRCUIT(circ); /* Remember cell statistics for this circuit before deallocating. */

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'public/bug8002' into maint-0.2.4
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 8d29866bec821e188a411f78b8112d2097ed106c Merge: de7e99f 22804c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 19 14:26:45 2013 -0400 Merge remote-tracking branch 'public/bug8002' into maint-0.2.4 changes/bug8002 | 5 +++++ src/common/compat.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.4] Merge branch 'bug7582_v2' into maint-0.2.4
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 4eaca17f2f755cb1aca9a20216002a4ad652d7ef Merge: 597cd89 73a35dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 19 12:29:29 2013 -0400 Merge branch 'bug7582_v2' into maint-0.2.4 changes/bug7582 | 9 ++++++ src/or/circuitlist.c | 2 + src/or/circuituse.c | 13 +++++++-- src/or/nodelist.c | 18 +++++++++++++ src/or/nodelist.h | 1 + src/or/or.h | 4 +++ src/or/policies.c | 18 +++++++++++++ src/or/policies.h | 2 + src/or/relay.c | 68 +++++++++++++++++++++++++++++++++++++++---------- 9 files changed, 118 insertions(+), 17 deletions(-)

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'public/bug8031' into maint-0.2.4
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit de7e99f8bbc17bfaea260c6d8e2217678b5152af Merge: 4eaca17 1eebb56 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 19 14:18:07 2013 -0400 Merge remote-tracking branch 'public/bug8031' into maint-0.2.4 changes/bug8031 | 7 +++++ src/or/microdesc.c | 66 +++++++++++++++++++++++++++++++++------------------- 2 files changed, 49 insertions(+), 24 deletions(-) diff --cc src/or/microdesc.c index ac48930,bb9668d..f9dbcac --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@@ -228,11 -227,11 +228,11 @@@ microdescs_add_list_to_cache(microdesc_ } /* Okay, it's a new one. */ - if (f) { + if (fd >= 0) { size_t annotation_len; - size = dump_microdescriptor(f, md, &annotation_len); + size = dump_microdescriptor(fd, md, &annotation_len); if (size < 0) { - /* we already warned in dump_microdescriptor; */ + /* we already warned in dump_microdescriptor */ abort_writing_to_file(open_file); smartlist_clear(added); return added;

1 0

[tor/release-0.2.4] Make dirserv_cache_measured_bw() use a const measured_bw_line_t *
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 75eb79a6aa4ab46ddd6bd5f9c1d7567f80ace68c Author: Andrea Shepard <andrea(a)torproject.org> Date: Thu Mar 7 03:42:14 2013 -0800 Make dirserv_cache_measured_bw() use a const measured_bw_line_t * --- src/or/dirserv.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index b3a5177..1160f6b 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -85,7 +85,7 @@ static const signed_descriptor_t *get_signed_descriptor_by_fp( time_t publish_cutoff); static was_router_added_t dirserv_add_extrainfo(extrainfo_t *ei, const char **msg); -static void dirserv_cache_measured_bw(measured_bw_line_t *parsed_line, +static void dirserv_cache_measured_bw(const measured_bw_line_t *parsed_line, time_t as_of); static void dirserv_clear_measured_bw_cache(void); static void dirserv_expire_measured_bw_cache(time_t now); @@ -2067,7 +2067,8 @@ static digestmap_t *mbw_cache = NULL; /** Store a measured bandwidth cache entry when reading the measured * bandwidths file. */ static void -dirserv_cache_measured_bw(measured_bw_line_t *parsed_line, time_t as_of) +dirserv_cache_measured_bw(const measured_bw_line_t *parsed_line, + time_t as_of) { mbw_cache_entry_t *e = NULL;

1 0

[tor/release-0.2.4] Call dirserv_clear_measured_bw_cache() from dirserv_free_all()
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 0efe96cae81a078301ba8806d821175c830627b9 Author: Andrea Shepard <andrea(a)torproject.org> Date: Tue Mar 5 13:11:43 2013 -0800 Call dirserv_clear_measured_bw_cache() from dirserv_free_all() --- src/or/dirserv.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 1c78d2d..b3a5177 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -4098,5 +4098,7 @@ dirserv_free_all(void) cached_v2_networkstatus = NULL; strmap_free(cached_consensuses, free_cached_dir_); cached_consensuses = NULL; + + dirserv_clear_measured_bw_cache(); }

1 0