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

[tor/master] add changes file for 11507
by nickm＠torproject.org 15 Apr '14

15 Apr '14

commit 1e9053974b5958fae3fdc6f73cae4ae11d71a348 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 15 15:03:49 2014 -0400 add changes file for 11507 --- changes/11507 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/changes/11507 b/changes/11507 new file mode 100644 index 0000000..f656d90 --- /dev/null +++ b/changes/11507 @@ -0,0 +1,7 @@ + o Testing support: + - New macros in test.h to simplify writting mock-functions for unit + tests. Part of ticket 11507. Patch from Dana Koch. + + o Testing: + - Complete tests for the status.c module. Resolves ticket 11507. + Patch from Dana Koch.

1 0

[tor/master] Don't send uninitialized stack to the controller and say it's a date.
by nickm＠torproject.org 15 Apr '14

15 Apr '14

commit b2106956e0adc0382f033e1a6cd0896a24122d05 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 14 21:51:30 2014 -0400 Don't send uninitialized stack to the controller and say it's a date. Fixes bug 11519, apparently bugfix on 0.2.3.11-alpha. --- changes/bug11519 | 3 +++ src/or/circuituse.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug11519 b/changes/bug11519 new file mode 100644 index 0000000..5c1e6af --- /dev/null +++ b/changes/bug11519 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Avoid sending an garbage value to the controller when a circuit is + cannibalized. Fixes bug 11519; bugfix on 0.2.3.11-alpha. diff --git a/src/or/circuituse.c b/src/or/circuituse.c index ade4224..7218ecc 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1310,7 +1310,7 @@ circuit_launch_by_extend_info(uint8_t purpose, circ = circuit_find_to_cannibalize(purpose, extend_info, flags); if (circ) { uint8_t old_purpose = circ->_base.purpose; - struct timeval old_timestamp_created; + struct timeval old_timestamp_created = circ->_base.timestamp_created; log_info(LD_CIRC,"Cannibalizing circ '%s' for purpose %d (%s)", build_state_get_exit_nickname(circ->build_state), purpose,

1 0

[tor/master] Merge remote-tracking branch 'public/bug11519_023' into maint-0.2.3
by nickm＠torproject.org 15 Apr '14

15 Apr '14

commit b0e1ddbd98038e3c7326970887c74f169701cf35 Merge: 75b4975 b210695 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 15 14:48:00 2014 -0400 Merge remote-tracking branch 'public/bug11519_023' into maint-0.2.3 changes/bug11519 | 3 +++ src/or/circuituse.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 15 Apr '14

15 Apr '14

commit f3c20a28ab50386064043cc31edb3b1b543d6fc6 Merge: 1499315 b0e1ddb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 15 14:51:19 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 Conflicts: src/or/circuituse.c changes/bug11519 | 3 +++ src/or/circuituse.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --cc src/or/circuituse.c index 5984691,7218ecc..c2d2b2e --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@@ -1517,8 -1309,8 +1517,8 @@@ circuit_launch_by_extend_info(uint8_t p * internal circs rather than exit circs? -RD */ circ = circuit_find_to_cannibalize(purpose, extend_info, flags); if (circ) { - uint8_t old_purpose = circ->_base.purpose; - struct timeval old_timestamp_created = circ->_base.timestamp_created; + uint8_t old_purpose = circ->base_.purpose; - struct timeval old_timestamp_began; ++ struct timeval old_timestamp_began = circ->base_.timestamp_began; log_info(LD_CIRC,"Cannibalizing circ '%s' for purpose %d (%s)", build_state_get_exit_nickname(circ->build_state), purpose,

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 15 Apr '14

15 Apr '14

commit 9556668f5fe33faec2a2de049d10061150ac6608 Merge: bc4c966 f3c20a2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 15 14:52:12 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug11519 | 3 +++ src/or/circuituse.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'public/bug11519_023' into maint-0.2.3
by nickm＠torproject.org 15 Apr '14

15 Apr '14

commit b0e1ddbd98038e3c7326970887c74f169701cf35 Merge: 75b4975 b210695 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 15 14:48:00 2014 -0400 Merge remote-tracking branch 'public/bug11519_023' into maint-0.2.3 changes/bug11519 | 3 +++ src/or/circuituse.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.4] Don't send uninitialized stack to the controller and say it's a date.
by nickm＠torproject.org 15 Apr '14

15 Apr '14

commit b2106956e0adc0382f033e1a6cd0896a24122d05 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 14 21:51:30 2014 -0400 Don't send uninitialized stack to the controller and say it's a date. Fixes bug 11519, apparently bugfix on 0.2.3.11-alpha. --- changes/bug11519 | 3 +++ src/or/circuituse.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug11519 b/changes/bug11519 new file mode 100644 index 0000000..5c1e6af --- /dev/null +++ b/changes/bug11519 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Avoid sending an garbage value to the controller when a circuit is + cannibalized. Fixes bug 11519; bugfix on 0.2.3.11-alpha. diff --git a/src/or/circuituse.c b/src/or/circuituse.c index ade4224..7218ecc 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1310,7 +1310,7 @@ circuit_launch_by_extend_info(uint8_t purpose, circ = circuit_find_to_cannibalize(purpose, extend_info, flags); if (circ) { uint8_t old_purpose = circ->_base.purpose; - struct timeval old_timestamp_created; + struct timeval old_timestamp_created = circ->_base.timestamp_created; log_info(LD_CIRC,"Cannibalizing circ '%s' for purpose %d (%s)", build_state_get_exit_nickname(circ->build_state), purpose,

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 15 Apr '14

15 Apr '14

commit f3c20a28ab50386064043cc31edb3b1b543d6fc6 Merge: 1499315 b0e1ddb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 15 14:51:19 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 Conflicts: src/or/circuituse.c changes/bug11519 | 3 +++ src/or/circuituse.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --cc src/or/circuituse.c index 5984691,7218ecc..c2d2b2e --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@@ -1517,8 -1309,8 +1517,8 @@@ circuit_launch_by_extend_info(uint8_t p * internal circs rather than exit circs? -RD */ circ = circuit_find_to_cannibalize(purpose, extend_info, flags); if (circ) { - uint8_t old_purpose = circ->_base.purpose; - struct timeval old_timestamp_created = circ->_base.timestamp_created; + uint8_t old_purpose = circ->base_.purpose; - struct timeval old_timestamp_began; ++ struct timeval old_timestamp_began = circ->base_.timestamp_began; log_info(LD_CIRC,"Cannibalizing circ '%s' for purpose %d (%s)", build_state_get_exit_nickname(circ->build_state), purpose,

1 0

[tor/maint-0.2.3] Merge remote-tracking branch 'public/bug11519_023' into maint-0.2.3
by nickm＠torproject.org 15 Apr '14

15 Apr '14

commit b0e1ddbd98038e3c7326970887c74f169701cf35 Merge: 75b4975 b210695 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 15 14:48:00 2014 -0400 Merge remote-tracking branch 'public/bug11519_023' into maint-0.2.3 changes/bug11519 | 3 +++ src/or/circuituse.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.3] Don't send uninitialized stack to the controller and say it's a date.
by nickm＠torproject.org 15 Apr '14

15 Apr '14

commit b2106956e0adc0382f033e1a6cd0896a24122d05 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 14 21:51:30 2014 -0400 Don't send uninitialized stack to the controller and say it's a date. Fixes bug 11519, apparently bugfix on 0.2.3.11-alpha. --- changes/bug11519 | 3 +++ src/or/circuituse.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug11519 b/changes/bug11519 new file mode 100644 index 0000000..5c1e6af --- /dev/null +++ b/changes/bug11519 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Avoid sending an garbage value to the controller when a circuit is + cannibalized. Fixes bug 11519; bugfix on 0.2.3.11-alpha. diff --git a/src/or/circuituse.c b/src/or/circuituse.c index ade4224..7218ecc 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1310,7 +1310,7 @@ circuit_launch_by_extend_info(uint8_t purpose, circ = circuit_find_to_cannibalize(purpose, extend_info, flags); if (circ) { uint8_t old_purpose = circ->_base.purpose; - struct timeval old_timestamp_created; + struct timeval old_timestamp_created = circ->_base.timestamp_created; log_info(LD_CIRC,"Cannibalizing circ '%s' for purpose %d (%s)", build_state_get_exit_nickname(circ->build_state), purpose,

1 0