mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-11 13:43:47 +01:00
Revise prop174 patch: make the circuit sendme calls unconditional.
The circuit_consider_sending_sendme call should be unconditional, since the circuit windows can move independent of the state of streams.
This commit is contained in:
parent
bd7721f66e
commit
fe9de9231a
@ -1116,9 +1116,7 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ,
|
||||
log_debug(domain,"circ deliver_window now %d.", layer_hint ?
|
||||
layer_hint->deliver_window : circ->deliver_window);
|
||||
|
||||
if (!optimistic_data) {
|
||||
circuit_consider_sending_sendme(circ, layer_hint);
|
||||
}
|
||||
circuit_consider_sending_sendme(circ, layer_hint);
|
||||
|
||||
if (!conn) {
|
||||
log_info(domain,"data cell dropped, unknown stream (streamid %d).",
|
||||
@ -1135,9 +1133,14 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ,
|
||||
stats_n_data_bytes_received += rh.length;
|
||||
connection_write_to_buf((char*)(cell->payload + RELAY_HEADER_SIZE),
|
||||
rh.length, TO_CONN(conn));
|
||||
|
||||
if (!optimistic_data) {
|
||||
connection_edge_consider_sending_sendme(conn);
|
||||
/* Only send a SENDME if we're not getting optimistic data; otherwise
|
||||
* a SENDME could arrive before the CONNECTED.
|
||||
*/
|
||||
connection_edge_consider_sending_sendme(conn);
|
||||
}
|
||||
|
||||
return 0;
|
||||
case RELAY_COMMAND_END:
|
||||
reason = rh.length > 0 ?
|
||||
|
Loading…
Reference in New Issue
Block a user