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

[tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit 7dddef2a76ccfdb27293c7035b073e5c15135137 Merge: 441bfcd88 89b9951ec Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 11:15:50 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2

1 0

[tor/maint-0.3.0] Don't package cells onto marked circuits.
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit d256d4c0a6c6a258c4f6c6839dd53c7e304fa94f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 29 09:26:16 2017 -0400 Don't package cells onto marked circuits. This caused a BUG log when we noticed that the circuit had no channel. The likeliest culprit for exposing that behavior is d769cab3e5097980, where we made circuit_mark_for_close() NULL out the n_chan and p_chan fields of the circuit. Fixes bug 8185; bugfix on 0.2.5.4-alpha, I think. --- changes/bug8185_025 | 6 ++++++ src/or/relay.c | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/changes/bug8185_025 b/changes/bug8185_025 new file mode 100644 index 000000000..1bfc12b1e --- /dev/null +++ b/changes/bug8185_025 @@ -0,0 +1,6 @@ + o Minor bugfixes (logging, relay shutdown, annoyance): + - When a circuit is marked for close, do not attempt to package any cells + for channels on that circuit. Previously, we would detect this + condition lower in the call stack, when we noticed that the circuit had + no attached channel, and log an annoying message. Fixes bug 8185; + bugfix on 0.2.5.4-alpha. diff --git a/src/or/relay.c b/src/or/relay.c index daf354c34..48c823423 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -390,6 +390,11 @@ circuit_package_relay_cell(cell_t *cell, circuit_t *circ, { channel_t *chan; /* where to send the cell */ + if (circ->marked_for_close) { + /* Circuit is marked; send nothing. */ + return 0; + } + if (cell_direction == CELL_DIRECTION_OUT) { crypt_path_t *thishop; /* counter for repeated crypts */ chan = circ->n_chan; @@ -703,6 +708,12 @@ connection_edge_send_command(edge_connection_t *fromconn, return -1; } + if (circ->marked_for_close) { + /* The circuit has been marked, but not freed yet. When it's freed, it + * will mark this connection for close. */ + return -1; + } + return relay_send_command_from_edge(fromconn->stream_id, circ, relay_command, payload, payload_len, cpath_layer);

1 0

[tor/maint-0.3.0] Merge branch 'bug8185_025' into maint-0.2.9
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit 666653758db631200ce389a19d0899e28f8f1dd7 Merge: c928fb988 d256d4c0a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 11:15:47 2017 -0500 Merge branch 'bug8185_025' into maint-0.2.9 changes/bug8185_025 | 6 ++++++ src/or/relay.c | 11 +++++++++++ 2 files changed, 17 insertions(+)

1 0

[tor/maint-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit 9092e9019a111608b34dd6594d599d4ca464c36d Merge: ece63105d 666653758 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 11:15:50 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug8185_025 | 6 ++++++ src/or/relay.c | 11 +++++++++++ 2 files changed, 17 insertions(+)

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit 89b9951ecd5b12eefc796604bc7560ce4a5308d9 Merge: 0fc2b7f82 9092e9019 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 11:15:50 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit 9092e9019a111608b34dd6594d599d4ca464c36d Merge: ece63105d 666653758 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 11:15:50 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug8185_025 | 6 ++++++ src/or/relay.c | 11 +++++++++++ 2 files changed, 17 insertions(+)

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit 7dddef2a76ccfdb27293c7035b073e5c15135137 Merge: 441bfcd88 89b9951ec Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 11:15:50 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit 9092e9019a111608b34dd6594d599d4ca464c36d Merge: ece63105d 666653758 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 11:15:50 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug8185_025 | 6 ++++++ src/or/relay.c | 11 +++++++++++ 2 files changed, 17 insertions(+)

1 0

[tor/maint-0.3.1] Merge branch 'bug8185_025' into bug8185_031
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit 1a5746f8e1a392f0b67e36083019534bf97f1fa6 Merge: 82f109c2b d256d4c0a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 29 09:37:01 2017 -0400 Merge branch 'bug8185_025' into bug8185_031 changes/bug8185_025 | 6 ++++++ src/or/relay.c | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --cc src/or/relay.c index cb1a0692b,48c823423..81942af1e --- a/src/or/relay.c +++ b/src/or/relay.c @@@ -824,16 -708,12 +829,22 @@@ connection_edge_send_command(edge_conne return -1; } + if (circ->marked_for_close) { + /* The circuit has been marked, but not freed yet. When it's freed, it + * will mark this connection for close. */ + return -1; + } + +#ifdef MEASUREMENTS_21206 + /* Keep track of the number of RELAY_DATA cells sent for directory + * connections. */ + connection_t *linked_conn = TO_CONN(fromconn)->linked_conn; + + if (linked_conn && linked_conn->type == CONN_TYPE_DIR) { + ++(TO_DIR_CONN(linked_conn)->data_cells_sent); + } +#endif + return relay_send_command_from_edge(fromconn->stream_id, circ, relay_command, payload, payload_len, cpath_layer);

1 0

[tor/release-0.2.9] Merge branch 'bug8185_025' into maint-0.2.9
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit 666653758db631200ce389a19d0899e28f8f1dd7 Merge: c928fb988 d256d4c0a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 11:15:47 2017 -0500 Merge branch 'bug8185_025' into maint-0.2.9 changes/bug8185_025 | 6 ++++++ src/or/relay.c | 11 +++++++++++ 2 files changed, 17 insertions(+)

1 0