[tor] branch main updated (ed74c52158 -> 028f5fd6ea)
This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch main in repository tor. from ed74c52158 cmux: Remove a log bug that is actually an acceptable race new 8d8afc4efa relay: Send DESTROY cell instead of TRUNCATED cell new 5260b4ef34 Merge branch 'maint-0.4.5' into maint-0.4.6 new e98995bb08 Merge branch 'maint-0.4.6' into maint-0.4.7 new 028f5fd6ea Merge branch 'maint-0.4.7' The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: changes/ticket40623 | 4 ++++ src/core/or/command.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 changes/ticket40623 -- To stop receiving notification emails like this one, please contact the administrator of this repository.
This is an automated email from the git hooks/post-receive script. dgoulet pushed a commit to branch main in repository tor. commit 8d8afc4efa538682ef2b80f6664456b34b84e519 Author: David Goulet <dgoulet@torproject.org> AuthorDate: Fri Jul 22 13:53:52 2022 -0400 relay: Send DESTROY cell instead of TRUNCATED cell Note that with this commit, TRUNCATED cells won't be used anymore that is client and relays won't emit them. Fixes #40623 Signed-off-by: David Goulet <dgoulet@torproject.org> --- changes/ticket40623 | 4 ++++ src/core/or/command.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/changes/ticket40623 b/changes/ticket40623 new file mode 100644 index 0000000000..d2a0e7eaad --- /dev/null +++ b/changes/ticket40623 @@ -0,0 +1,4 @@ + o Major bugfixes (relay): + - Stop sending TRUNCATED cell and instead close the circuits which sends a + DESTROY cell so every relay in the circuit path can stop queuing cells. + Fixes bug 40623; bugfix on 0.1.0.2-rc. diff --git a/src/core/or/command.c b/src/core/or/command.c index 9226309ff7..6ddfc317d6 100644 --- a/src/core/or/command.c +++ b/src/core/or/command.c @@ -637,11 +637,11 @@ command_process_destroy_cell(cell_t *cell, channel_t *chan) if (CIRCUIT_IS_ORIGIN(circ)) { circuit_mark_for_close(circ, reason|END_CIRC_REASON_FLAG_REMOTE); } else { - char payload[1]; - log_debug(LD_OR, "Delivering 'truncated' back."); - payload[0] = (char)reason; - relay_send_command_from_edge(0, circ, RELAY_COMMAND_TRUNCATED, - payload, sizeof(payload), NULL); + /* Close the circuit so we stop queuing cells for it and propagate the + * DESTROY cell down the circuit so relays can stop queuing in-flight + * cells for this circuit which helps with memory pressure. */ + log_debug(LD_OR, "Received DESTROY cell from n_chan, closing circuit."); + circuit_mark_for_close(circ, END_CIRC_REASON_TORPROTOCOL); } } } -- To stop receiving notification emails like this one, please contact the administrator of this repository.
This is an automated email from the git hooks/post-receive script. dgoulet pushed a commit to branch main in repository tor. commit 5260b4ef34da7a70eef09df121519ec31d37d9e0 Merge: 4ba89c0ccc 8d8afc4efa Author: David Goulet <dgoulet@torproject.org> AuthorDate: Tue Jul 26 16:16:04 2022 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/ticket40623 | 4 ++++ src/core/or/command.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.
This is an automated email from the git hooks/post-receive script. dgoulet pushed a commit to branch main in repository tor. commit e98995bb0899c3af7d8fcd2da9a753a58ad5ec66 Merge: e234df6098 5260b4ef34 Author: David Goulet <dgoulet@torproject.org> AuthorDate: Tue Jul 26 16:16:04 2022 -0400 Merge branch 'maint-0.4.6' into maint-0.4.7 changes/ticket40623 | 4 ++++ src/core/or/command.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.
This is an automated email from the git hooks/post-receive script. dgoulet pushed a commit to branch main in repository tor. commit 028f5fd6ea432a7682680e7839d0ef619fc665d6 Merge: ed74c52158 e98995bb08 Author: David Goulet <dgoulet@torproject.org> AuthorDate: Tue Jul 26 16:16:04 2022 -0400 Merge branch 'maint-0.4.7' changes/ticket40623 | 4 ++++ src/core/or/command.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.
participants (1)
-
gitolite role