aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2022-07-22 13:53:52 -0400
committerDavid Goulet <dgoulet@torproject.org>2022-07-26 14:01:21 -0400
commit8d8afc4efa538682ef2b80f6664456b34b84e519 (patch)
treeae0e30856181c3ea42ddb8338a89b852c73497ac /src
parentc213c1b0d1616dc074779a26c8fc7b777697fe34 (diff)
downloadtor-8d8afc4efa538682ef2b80f6664456b34b84e519.tar.gz
tor-8d8afc4efa538682ef2b80f6664456b34b84e519.zip
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>
Diffstat (limited to 'src')
-rw-r--r--src/core/or/command.c10
1 files changed, 5 insertions, 5 deletions
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);
}
}
}