December 2017 - tor-commits - lists.torproject.org

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 06 Dec '17

06 Dec '17

commit 8c6aa9f348863a1748e488bed788c0d3a88bf1dd Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 6 20:16:16 2017 +0000 Update translations for torbirdy --- he/torbirdy.dtd | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/he/torbirdy.dtd b/he/torbirdy.dtd index b6e7be39c..841498afc 100644 --- a/he/torbirdy.dtd +++ b/he/torbirdy.dtd @@ -38,9 +38,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "אל תשים את זהויות המפתח של המקבלים בתוך הודעות מוצפנות [ברירת מחדל: שים]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> -<!ENTITY torbirdy.prefs.enigmail_protected.label "Disable encrypted email headers [default: enabled]"> -<!ENTITY torbirdy.prefs.enigmail_protected.key "d"> -<!ENTITY torbirdy.prefs.enigmail_protected.label "Disable encrypted email headers [default: enabled]"> +<!ENTITY torbirdy.prefs.enigmail_protected.label "השבת כותרות דוא"ל מוצפנות [ברירת מחדל: מאופשר]"> <!ENTITY torbirdy.prefs.enigmail_protected.key "d"> <!ENTITY torbirdy.prefs.confirmemail.label "אשר לפני שליחת דוא״ל אם Enigmail מאופשר [ברירת מחדל: אל תאשר]"> <!ENTITY torbirdy.prefs.confirmemail.key "c">

1 0

[tor/master] Merge remote-tracking branch 'teor/bug24488'
by nickm＠torproject.org 06 Dec '17

06 Dec '17

commit c470a6d278c6340c2e2d10cac0796e6041b88dee Merge: 1432cc842 f1a5000b9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 6 14:44:03 2017 -0500 Merge remote-tracking branch 'teor/bug24488' changes/bug24488 | 4 ++++ src/or/dirserv.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/master] Make set_routerstatus_from_routerinfo() set IPv6 unspecified addresses
by nickm＠torproject.org 06 Dec '17

06 Dec '17

commit f1a5000b98c4f0e5ee1618165bde533aaff0fd79 Author: teor <teor2345(a)gmail.com> Date: Sun Oct 15 14:36:06 2017 -0400 Make set_routerstatus_from_routerinfo() set IPv6 unspecified addresses When creating a routerstatus (vote) from a routerinfo (descriptor), set the IPv6 address to the unspecified IPv6 address, and explicitly initialise the port to zero. Also clarify the documentation for the function. Fixes bug 24488; bugfix on 0.2.4.1-alpha. --- changes/bug24488 | 4 ++++ src/or/dirserv.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug24488 b/changes/bug24488 new file mode 100644 index 000000000..b8094e29e --- /dev/null +++ b/changes/bug24488 @@ -0,0 +1,4 @@ + o Minor bugfixes (directory authorities, IPv6): + - When creating a routerstatus (vote) from a routerinfo (descriptor), + set the IPv6 address to the unspecified IPv6 address, and explicitly + initialise the port to zero. Fixes bug 24488; bugfix on 0.2.4.1-alpha. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 432fe6ae2..19d2541b0 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2219,7 +2219,8 @@ routers_make_ed_keys_unique(smartlist_t *routers) } /** Extract status information from ri and from other authority - * functions and store it in rs>. + * functions and store it in rs. rs is zeroed out before it is + * set. * * We assume that ri-\>is_running has already been set, e.g. by * dirserv_set_router_is_running(ri, now); @@ -2285,6 +2286,9 @@ set_routerstatus_from_routerinfo(routerstatus_t *rs, OR port and it's reachable so copy it to the routerstatus. */ tor_addr_copy(&rs->ipv6_addr, &ri->ipv6_addr); rs->ipv6_orport = ri->ipv6_orport; + } else { + tor_addr_make_null(&rs->ipv6_addr, AF_INET6); + rs->ipv6_orport = 0; } if (options->TestingTorNetwork) {

1 0

[tor/maint-0.3.2] test: Add a KIST test for a non opened channel
by nickm＠torproject.org 06 Dec '17

06 Dec '17

commit 1a55a5ff06f9022a115943248b0eeb9d3c67c6c8 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Dec 6 11:33:01 2017 -0500 test: Add a KIST test for a non opened channel This makes sure that a non opened channel is never put back in the channel pending list and that its state is consistent with what we expect that is IDLE. Test the fixes in #24502. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/test/test_scheduler.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/src/test/test_scheduler.c b/src/test/test_scheduler.c index d679d7cfe..63add2f38 100644 --- a/src/test/test_scheduler.c +++ b/src/test/test_scheduler.c @@ -807,6 +807,7 @@ test_scheduler_loop_kist(void *arg) #endif channel_t *ch1 = new_fake_channel(), *ch2 = new_fake_channel(); + channel_t *ch3 = new_fake_channel(); /* setup options so we're sure about what sched we are running */ MOCK(get_options, mock_get_options); @@ -857,14 +858,35 @@ test_scheduler_loop_kist(void *arg) the_scheduler->run(); channel_flush_some_cells_mock_free_all(); - tt_int_op(1,==,1); + + /* We'll try to run this closed channel threw the scheduler loop and make + * sure it ends up in the right state. */ + tt_assert(ch3); + ch3->magic = TLS_CHAN_MAGIC; + ch3->state = CHANNEL_STATE_OPEN; + ch3->cmux = circuitmux_alloc(); + channel_register(ch3); + tt_assert(ch3->registered); + + ch3->scheduler_state = SCHED_CHAN_WAITING_FOR_CELLS; + scheduler_channel_has_waiting_cells(ch3); + /* Should be in the pending list now waiting to be handled. */ + tt_int_op(ch3->scheduler_state, OP_EQ, SCHED_CHAN_PENDING); + tt_int_op(smartlist_len(get_channels_pending()), OP_EQ, 1); + /* By running the scheduler on a closed channel, it should end up in the + * IDLE state and not in the pending channel list. */ + ch3->state = CHANNEL_STATE_CLOSED; + the_scheduler->run(); + tt_int_op(ch3->scheduler_state, OP_EQ, SCHED_CHAN_IDLE); + tt_int_op(smartlist_len(get_channels_pending()), OP_EQ, 0); done: /* Prep the channel so the free() function doesn't explode. */ - ch1->state = ch2->state = CHANNEL_STATE_CLOSED; - ch1->registered = ch2->registered = 0; + ch1->state = ch2->state = ch3->state = CHANNEL_STATE_CLOSED; + ch1->registered = ch2->registered = ch3->registered = 0; channel_free(ch1); channel_free(ch2); + channel_free(ch3); UNMOCK(update_socket_info_impl); UNMOCK(channel_should_write_to_kernel); UNMOCK(channel_write_to_kernel);

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 06 Dec '17

06 Dec '17

commit 1432cc8429b55ea561c551941ed54e5871050fa0 Merge: 91f72bbb6 d4ca18573 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 6 14:38:06 2017 -0500 Merge branch 'maint-0.3.2'

1 0

[tor/release-0.3.2] sched: Set channel scheduler state to IDLE when not opened
by nickm＠torproject.org 06 Dec '17

06 Dec '17

commit 97702c69b03b19a8a6f867e56f716ce984550fa0 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Dec 4 14:48:15 2017 -0500 sched: Set channel scheduler state to IDLE when not opened In the KIST main loop, if the channel happens to be not opened, set its state to IDLE so we can release it properly later on. Prior to this fix, the channel was in PENDING state, removed from the channel pending list and then kept in that state because it is not opened. This bug was introduced in commit dcabf801e52a83e2c3cc23ccc1fa906582a927d6 for which we made the scheduler loop not consider unopened channel. This has no consequences on tor except for an annoying but harmless BUG() warning. Fixes #24502 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug24502 | 4 ++++ src/or/scheduler_kist.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug24502 b/changes/bug24502 new file mode 100644 index 000000000..3fa6fb58d --- /dev/null +++ b/changes/bug24502 @@ -0,0 +1,4 @@ + o Minor bugfixes (scheduler): + - Properly set the scheduler state of an unopened channel in the KIST + scheduler main loop. This prevents a harmless but annoying log warning. + Fixes bug 24502; bugfix on 0.3.2.4-alpha. diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index fea92705d..3d8f553ac 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -606,9 +606,12 @@ kist_scheduler_run(void) * fails leading to the channel to be closed which triggers a release * and free its entry in the socket table. And because of a engineering * design issue, the error is not propagated back so we don't get an - * error at this poin. So before we continue, make sure the channel is + * error at this point. So before we continue, make sure the channel is * open and if not just ignore it. See #23751. */ if (!CHANNEL_IS_OPEN(chan)) { + /* Channel isn't open so we put it back in IDLE mode. It is either + * renegotiating its TLS session or about to be released. */ + chan->scheduler_state = SCHED_CHAN_IDLE; continue; } /* flush_result has the # cells flushed */

1 0

[tor/maint-0.3.2] Merge remote-tracking branch 'dgoulet/bug24502_032_01' into maint-0.3.2
by nickm＠torproject.org 06 Dec '17

06 Dec '17

commit d4ca18573ccd0164f4d867e41a8f453119ce421f Merge: 779e4b9dc 1a55a5ff0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 6 14:37:53 2017 -0500 Merge remote-tracking branch 'dgoulet/bug24502_032_01' into maint-0.3.2 changes/bug24502 | 4 ++++ src/or/scheduler_kist.c | 5 ++++- src/test/test_scheduler.c | 28 +++++++++++++++++++++++++--- 3 files changed, 33 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.3.2] sched: Set channel scheduler state to IDLE when not opened
by nickm＠torproject.org 06 Dec '17

06 Dec '17

commit 97702c69b03b19a8a6f867e56f716ce984550fa0 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Dec 4 14:48:15 2017 -0500 sched: Set channel scheduler state to IDLE when not opened In the KIST main loop, if the channel happens to be not opened, set its state to IDLE so we can release it properly later on. Prior to this fix, the channel was in PENDING state, removed from the channel pending list and then kept in that state because it is not opened. This bug was introduced in commit dcabf801e52a83e2c3cc23ccc1fa906582a927d6 for which we made the scheduler loop not consider unopened channel. This has no consequences on tor except for an annoying but harmless BUG() warning. Fixes #24502 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug24502 | 4 ++++ src/or/scheduler_kist.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug24502 b/changes/bug24502 new file mode 100644 index 000000000..3fa6fb58d --- /dev/null +++ b/changes/bug24502 @@ -0,0 +1,4 @@ + o Minor bugfixes (scheduler): + - Properly set the scheduler state of an unopened channel in the KIST + scheduler main loop. This prevents a harmless but annoying log warning. + Fixes bug 24502; bugfix on 0.3.2.4-alpha. diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index fea92705d..3d8f553ac 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -606,9 +606,12 @@ kist_scheduler_run(void) * fails leading to the channel to be closed which triggers a release * and free its entry in the socket table. And because of a engineering * design issue, the error is not propagated back so we don't get an - * error at this poin. So before we continue, make sure the channel is + * error at this point. So before we continue, make sure the channel is * open and if not just ignore it. See #23751. */ if (!CHANNEL_IS_OPEN(chan)) { + /* Channel isn't open so we put it back in IDLE mode. It is either + * renegotiating its TLS session or about to be released. */ + chan->scheduler_state = SCHED_CHAN_IDLE; continue; } /* flush_result has the # cells flushed */

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug24502_032_01' into maint-0.3.2
by nickm＠torproject.org 06 Dec '17

06 Dec '17

commit d4ca18573ccd0164f4d867e41a8f453119ce421f Merge: 779e4b9dc 1a55a5ff0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 6 14:37:53 2017 -0500 Merge remote-tracking branch 'dgoulet/bug24502_032_01' into maint-0.3.2 changes/bug24502 | 4 ++++ src/or/scheduler_kist.c | 5 ++++- src/test/test_scheduler.c | 28 +++++++++++++++++++++++++--- 3 files changed, 33 insertions(+), 4 deletions(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 06 Dec '17

06 Dec '17

commit 0c7a540ba27f08de800f3fbd1f21332e7519ec53 Merge: 92d45086f d4ca18573 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 6 14:38:06 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24502 | 4 ++++ src/or/scheduler_kist.c | 5 ++++- src/test/test_scheduler.c | 28 +++++++++++++++++++++++++--- 3 files changed, 33 insertions(+), 4 deletions(-)

1 0