nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.6' into maint-0.4.7

Browse Source
This commit is contained in:
David Goulet 2022-07-26 16:16:04 -04:00
commit e98995bb08
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/ticket40623 Normal file
View File

@ -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.

10
src/core/or/command.c
View File

@ -664,11 +664,11 @@ command_process_destroy_cell(cell_t *cell, channel_t *chan)
if (CIRCUIT_IS_ORIGIN(circ)) { if (CIRCUIT_IS_ORIGIN(circ)) {
circuit_mark_for_close(circ, reason|END_CIRC_REASON_FLAG_REMOTE); circuit_mark_for_close(circ, reason|END_CIRC_REASON_FLAG_REMOTE);
} else { } else {
char payload[1]; /* Close the circuit so we stop queuing cells for it and propagate the
log_debug(LD_OR, "Delivering 'truncated' back."); * DESTROY cell down the circuit so relays can stop queuing in-flight
payload[0] = (char)reason; * cells for this circuit which helps with memory pressure. */
relay_send_command_from_edge(0, circ, RELAY_COMMAND_TRUNCATED, log_debug(LD_OR, "Received DESTROY cell from n_chan, closing circuit.");
payload, sizeof(payload), NULL); circuit_mark_for_close(circ, END_CIRC_REASON_TORPROTOCOL);
} }
} }
} }