mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 21:23:58 +01:00
Merge branch 'maint-0.4.5' into maint-0.4.6
This commit is contained in:
commit
5260b4ef34
4
changes/ticket40623
Normal file
4
changes/ticket40623
Normal 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.
|
@ -660,11 +660,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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user