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

Revise prop174 patch: make the circuit sendme calls unconditional.

Browse Source 
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:
Nick Mathewson 2011-03-14 18:08:27 -04:00
parent bd7721f66e
commit fe9de9231a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/or/relay.c
View File

@ -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 ? log_debug(domain,"circ deliver_window now %d.", layer_hint ?
layer_hint->deliver_window : circ->deliver_window); 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) { if (!conn) {
log_info(domain,"data cell dropped, unknown stream (streamid %d).", 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; stats_n_data_bytes_received += rh.length;
connection_write_to_buf((char*)(cell->payload + RELAY_HEADER_SIZE), connection_write_to_buf((char*)(cell->payload + RELAY_HEADER_SIZE),
rh.length, TO_CONN(conn)); rh.length, TO_CONN(conn));
if (!optimistic_data) { if (!optimistic_data) {
/* 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); connection_edge_consider_sending_sendme(conn);
} }
return 0; return 0;
case RELAY_COMMAND_END: case RELAY_COMMAND_END:
reason = rh.length > 0 ? reason = rh.length > 0 ?