March 2019 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'tor-github/pr/771' into maint-0.3.4
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit 5606cfae472a4e49d07bb14f4dfa336a8ded3930 Merge: 155b0f552 e91b999cf Author: teor <teor(a)torproject.org> Date: Thu Mar 14 06:41:14 2019 +1000 Merge remote-tracking branch 'tor-github/pr/771' into maint-0.3.4 changes/bug23512 | 6 +++ src/or/channeltls.h | 2 + src/or/circuitlist.c | 59 +++++++++++++++++++++++++ src/or/circuitlist.h | 2 + src/or/or.h | 12 +++++ src/or/relay.c | 1 + src/or/rephist.c | 25 ++++++----- src/or/rephist.h | 10 +++-- src/or/scheduler_kist.c | 2 - src/test/test_relay.c | 113 +++++++++++++++++++++++++++++++++++++++++++++--- 10 files changed, 210 insertions(+), 22 deletions(-) diff --cc src/or/rephist.h index 3e64a3de4,37a91fd9b..9ef49d19c --- a/src/or/rephist.h +++ b/src/or/rephist.h @@@ -19,10 -19,10 +19,10 @@@ void rep_hist_note_bytes_written(uint64 void rep_hist_make_router_pessimal(const char *id, time_t when); - void rep_hist_note_dir_bytes_read(size_t num_bytes, time_t when); - void rep_hist_note_dir_bytes_written(size_t num_bytes, time_t when); + void rep_hist_note_dir_bytes_read(uint64_t num_bytes, time_t when); + void rep_hist_note_dir_bytes_written(uint64_t num_bytes, time_t when); -int rep_hist_bandwidth_assess(void); +MOCK_DECL(int, rep_hist_bandwidth_assess, (void)); char *rep_hist_get_bandwidth_lines(void); void rep_hist_update_state(or_state_t *state); int rep_hist_load_state(or_state_t *state, char **err);

1 0

[tor/master] Merge branch 'bug28096-029-squashed' into bug28096-034-squashed
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit 66f944f79b9ae0d7383f9bf55c8d8cd4bdacf216 Merge: 155b0f552 2fbc58cf0 Author: teor <teor(a)torproject.org> Date: Thu Mar 14 06:53:17 2019 +1000 Merge branch 'bug28096-029-squashed' into bug28096-034-squashed Merge the new code, and preserve the #else macro comment from 0.3.4. changes/bug28096 | 13 ++++++++ src/common/compat.c | 95 ++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 77 insertions(+), 31 deletions(-) diff --cc src/common/compat.c index 6fdd6ecf0,975875112..f8c4bdb4d --- a/src/common/compat.c +++ b/src/common/compat.c @@@ -2755,13 -2761,26 +2775,26 @@@ get_uname,(void) "Unrecognized version of Windows [major=%d,minor=%d]", (int)info.dwMajorVersion,(int)info.dwMinorVersion); } - #ifdef VER_NT_SERVER - if (info.wProductType == VER_NT_SERVER || - info.wProductType == VER_NT_DOMAIN_CONTROLLER) { - strlcat(uname_result, " [server]", sizeof(uname_result)); - } - #endif /* defined(VER_NT_SERVER) */ + /* Now append extra information to the name. + * + * Microsoft's API documentation says that on Windows 8.1 and later, + * GetVersionEx returns Windows 8 (6.2) for applications without an + * app compatibility manifest (including tor's default build). + * + * But in our testing, we have seen the actual Windows version on + * Windows Server 2012 R2, even without a manifest. */ + if (info.dwMajorVersion > 6 || + (info.dwMajorVersion == 6 && info.dwMinorVersion >= 2)) { + /* When GetVersionEx() returns Windows 8, the actual OS may be any + * later version. */ + strlcat(uname_result, " [or later]", sizeof(uname_result)); + } + /* When we don't know if the OS is a client or server version, we use + * the client version, and this qualifier. */ + if (!is_server && !is_client) { + strlcat(uname_result, " [client or server]", sizeof(uname_result)); + } -#else +#else /* !(defined(_WIN32)) */ /* LCOV_EXCL_START -- can't provoke uname failure */ strlcpy(uname_result, "Unknown platform", sizeof(uname_result)); /* LCOV_EXCL_STOP */

1 0

[tor/master] Merge remote-tracking branch 'nickm/bug27073_029' into bug27073_034
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit 2840580cf2753ac900b84f604989f9156708cdb3 Merge: 155b0f552 7a0ff5beb Author: teor <teor(a)torproject.org> Date: Thu Mar 14 06:47:32 2019 +1000 Merge remote-tracking branch 'nickm/bug27073_029' into bug27073_034 Replace == with OP_EQ in test macros. changes/bug27073 | 4 ++++ src/test/test_threads.c | 30 +++++++++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --cc src/test/test_threads.c index ed6d8f04a,448ab2034..4f37a40cc --- a/src/test/test_threads.c +++ b/src/test/test_threads.c @@@ -275,14 -283,15 +283,15 @@@ test_threads_conditionvar(void *arg SPIN(); tor_mutex_release(ti->mutex); - tt_int_op(ti->value, ==, 1337); + tt_int_op(ti->value, OP_EQ, 1337); if (!timeout) { - tt_int_op(ti->n_shutdown, ==, 4); + tt_int_op(ti->n_shutdown, OP_EQ, 4); } else { - tor_sleep_msec(200); - tor_mutex_acquire(ti->mutex); + const int GIVE_UP_AFTER_SEC = 30; + SPIN_UNTIL((ti->n_timeouts == 2 || + time(NULL) >= started_at + GIVE_UP_AFTER_SEC), 10); - tt_int_op(ti->n_shutdown, ==, 2); - tt_int_op(ti->n_timeouts, ==, 2); + tt_int_op(ti->n_shutdown, OP_EQ, 2); + tt_int_op(ti->n_timeouts, OP_EQ, 2); tor_mutex_release(ti->mutex); }

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/794' into maint-0.3.4
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit c03b1b3f08b0588c9ba36b2097d372cb62cfdc22 Merge: 5606cfae4 2840580cf Author: teor <teor(a)torproject.org> Date: Thu Mar 14 06:55:57 2019 +1000 Merge remote-tracking branch 'tor-github/pr/794' into maint-0.3.4 changes/bug27073 | 4 ++++ src/test/test_threads.c | 30 +++++++++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/795' into maint-0.3.4
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit f3b17a6b261e1feef05dafac247b96b3ea90a521 Merge: c03b1b3f0 66f944f79 Author: teor <teor(a)torproject.org> Date: Thu Mar 14 06:56:09 2019 +1000 Merge remote-tracking branch 'tor-github/pr/795' into maint-0.3.4 changes/bug28096 | 13 ++++++++ src/common/compat.c | 95 ++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 77 insertions(+), 31 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit 5d41e2223f64517300aad168b2f2479ba00ac10b Merge: ffd720702 e021f89f3 Author: teor <teor(a)torproject.org> Date: Thu Mar 14 06:59:09 2019 +1000 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" merge to ignore the changes to src/common/compat.c, they have already been merged to 0.3.5 in the correct file.

1 0

[tor/release-0.2.9] circuit: Don't timeout opened C_INTRODUCING circuit
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit 981bb60575953fbf0e6ca03ccf0a8a476e6644e0 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Nov 14 09:01:21 2017 -0500 circuit: Don't timeout opened C_INTRODUCING circuit A circuit with purpose C_INTRODUCING means that its state is opened but the INTRODUCE1 cell hasn't been sent yet. We shouldn't consider that circuit when looking for timing out "building circuit". We have to wait on the rendezvous circuit to be opened before sending that cell so the intro circuit needs to be kept alive for at least that period of time. This patch makes that the purpose C_INTRODUCING is ignored in the circuit_expire_building() which means that we let the circuit idle timeout take care of it if we end up never using it. Fixes #23681 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug23681 | 5 +++++ src/or/circuituse.c | 18 ++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/changes/bug23681 b/changes/bug23681 new file mode 100644 index 000000000..e317f36d5 --- /dev/null +++ b/changes/bug23681 @@ -0,0 +1,5 @@ + o Minor bugfixes (hidden service client): + - The introduction circuit was being timed out too quickly while waiting + for the rendezvous circuit to complete. Keep the intro circuit around + longer instead of timing out and reopening new ones constantly. Fixes + bug 23681; bugfix on 0.2.4.8-alpha. diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 84574cd5b..311142a70 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -494,8 +494,7 @@ circuit_expire_building(void) cutoff = begindir_cutoff; else if (victim->purpose == CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT) cutoff = close_cutoff; - else if (victim->purpose == CIRCUIT_PURPOSE_C_INTRODUCING || - victim->purpose == CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT) + else if (victim->purpose == CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT) cutoff = c_intro_cutoff; else if (victim->purpose == CIRCUIT_PURPOSE_S_ESTABLISH_INTRO) cutoff = s_intro_cutoff; @@ -614,12 +613,13 @@ circuit_expire_building(void) TO_ORIGIN_CIRCUIT(victim)->path_state = PATH_STATE_USE_FAILED; break; case CIRCUIT_PURPOSE_C_INTRODUCING: - /* We keep old introducing circuits around for - * a while in parallel, and they can end up "opened". - * We decide below if we're going to mark them timed - * out and eventually close them. - */ - break; + /* That purpose means that the intro point circuit has been opened + * succesfully but the INTRODUCE1 cell hasn't been sent yet because + * the client is waiting for the rendezvous point circuit to open. + * Keep this circuit open while waiting for the rendezvous circuit. + * We let the circuit idle timeout take care of cleaning this + * circuit if it never used. */ + continue; case CIRCUIT_PURPOSE_C_ESTABLISH_REND: case CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED: case CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT: @@ -713,8 +713,6 @@ circuit_expire_building(void) NULL) break; /* fallthrough! */ - case CIRCUIT_PURPOSE_C_INTRODUCING: - /* connection_ap_handshake_attach_circuit() will relaunch for us */ case CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT: case CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED: /* If we have reached this line, we want to spare the circ for now. */

1 0

[tor/release-0.2.9] In conditionvar_timeout test, wait for threads to timeout
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit 7a0ff5beb21e6485bda44c0545036bb2883f643d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 13 20:47:41 2018 -0400 In conditionvar_timeout test, wait for threads to timeout Previously we just waited 200msec, which was not enough on slow/busy systems. Fixes bug 27073; bugfix on 0.2.6.3-alpha when the test was introduced. --- changes/bug27073 | 4 ++++ src/test/test_threads.c | 30 +++++++++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/changes/bug27073 b/changes/bug27073 new file mode 100644 index 000000000..851e7f0df --- /dev/null +++ b/changes/bug27073 @@ -0,0 +1,4 @@ + o Minor bugfixes (testing): + - Revise the "conditionvar_timeout" test so that it succeeds even + on heavily loaded systems where the test threads are not scheduled + within 200 msec. Fixes bug 27073; bugfix on 0.2.6.3-alpha. diff --git a/src/test/test_threads.c b/src/test/test_threads.c index ebbc95c7c..448ab2034 100644 --- a/src/test/test_threads.c +++ b/src/test/test_threads.c @@ -234,25 +234,33 @@ test_threads_conditionvar(void *arg) if (timeout) { ti->tv = &msec100; } + +#define SPIN_UNTIL(condition,sleep_msec) \ + while (1) { \ + tor_mutex_acquire(ti->mutex); \ + if (condition) { \ + break; \ + } \ + tor_mutex_release(ti->mutex); \ + tor_sleep_msec(sleep_msec); \ + } + spawn_func(cv_test_thr_fn_, ti); spawn_func(cv_test_thr_fn_, ti); spawn_func(cv_test_thr_fn_, ti); spawn_func(cv_test_thr_fn_, ti); - tor_mutex_acquire(ti->mutex); + SPIN_UNTIL(ti->n_threads == 4, 10); + + time_t started_at = time(NULL); + ti->addend = 7; ti->shutdown = 1; tor_cond_signal_one(ti->cond); tor_mutex_release(ti->mutex); #define SPIN() \ - while (1) { \ - tor_mutex_acquire(ti->mutex); \ - if (ti->addend == 0) { \ - break; \ - } \ - tor_mutex_release(ti->mutex); \ - } + SPIN_UNTIL(ti->addend == 0, 0) SPIN(); @@ -279,8 +287,9 @@ test_threads_conditionvar(void *arg) if (!timeout) { tt_int_op(ti->n_shutdown, ==, 4); } else { - tor_sleep_msec(200); - tor_mutex_acquire(ti->mutex); + const int GIVE_UP_AFTER_SEC = 30; + SPIN_UNTIL((ti->n_timeouts == 2 || + time(NULL) >= started_at + GIVE_UP_AFTER_SEC), 10); tt_int_op(ti->n_shutdown, ==, 2); tt_int_op(ti->n_timeouts, ==, 2); tor_mutex_release(ti->mutex); @@ -301,4 +310,3 @@ struct testcase_t thread_tests[] = { &passthrough_setup, (void*)"tv" }, END_OF_TESTCASES }; -

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit feb7253df316ee1ec9c2ec3e33aac312da4d1f02 Merge: ec2a2a6b7 5d41e2223 Author: teor <teor(a)torproject.org> Date: Thu Mar 14 07:00:43 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0

1 0

[tor/release-0.2.9] Promote rep_hist bw functions to uint64_t.
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit 7dc435e6bc4361ab52eac834eac5d30351f4f7b7 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Sep 14 18:35:44 2018 +0000 Promote rep_hist bw functions to uint64_t. The rest of rephist uses uint64_t internally. Let's make these take it too, so we don't have to worry about overflowing size_t on 32 bit systems. --- src/or/rephist.c | 8 ++++---- src/or/rephist.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/or/rephist.c b/src/or/rephist.c index f0bac5789..7223c3759 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1363,7 +1363,7 @@ bw_arrays_init(void) * earlier than the latest when you've heard of. */ void -rep_hist_note_bytes_written(size_t num_bytes, time_t when) +rep_hist_note_bytes_written(uint64_t num_bytes, time_t when) { /* Maybe a circular array for recent seconds, and step to a new point * every time a new second shows up. Or simpler is to just to have @@ -1380,7 +1380,7 @@ rep_hist_note_bytes_written(size_t num_bytes, time_t when) * (like rep_hist_note_bytes_written() above) */ void -rep_hist_note_bytes_read(size_t num_bytes, time_t when) +rep_hist_note_bytes_read(uint64_t num_bytes, time_t when) { /* if we're smart, we can make this func and the one above share code */ add_obs(read_array, when, num_bytes); @@ -1390,7 +1390,7 @@ rep_hist_note_bytes_read(size_t num_bytes, time_t when) * when. (like rep_hist_note_bytes_written() above) */ void -rep_hist_note_dir_bytes_written(size_t num_bytes, time_t when) +rep_hist_note_dir_bytes_written(uint64_t num_bytes, time_t when) { add_obs(dir_write_array, when, num_bytes); } @@ -1399,7 +1399,7 @@ rep_hist_note_dir_bytes_written(size_t num_bytes, time_t when) * when. (like rep_hist_note_bytes_written() above) */ void -rep_hist_note_dir_bytes_read(size_t num_bytes, time_t when) +rep_hist_note_dir_bytes_read(uint64_t num_bytes, time_t when) { add_obs(dir_read_array, when, num_bytes); } diff --git a/src/or/rephist.h b/src/or/rephist.h index ff4810a56..c1fc7ef1a 100644 --- a/src/or/rephist.h +++ b/src/or/rephist.h @@ -21,13 +21,13 @@ void rep_hist_note_extend_succeeded(const char *from_name, const char *to_name); void rep_hist_note_extend_failed(const char *from_name, const char *to_name); void rep_hist_dump_stats(time_t now, int severity); -void rep_hist_note_bytes_read(size_t num_bytes, time_t when); -void rep_hist_note_bytes_written(size_t num_bytes, time_t when); +void rep_hist_note_bytes_read(uint64_t num_bytes, time_t when); +void rep_hist_note_bytes_written(uint64_t num_bytes, time_t when); void rep_hist_make_router_pessimal(const char *id, time_t when); -void rep_hist_note_dir_bytes_read(size_t num_bytes, time_t when); -void rep_hist_note_dir_bytes_written(size_t num_bytes, time_t when); +void rep_hist_note_dir_bytes_read(uint64_t num_bytes, time_t when); +void rep_hist_note_dir_bytes_written(uint64_t num_bytes, time_t when); int rep_hist_bandwidth_assess(void); char *rep_hist_get_bandwidth_lines(void);

1 0