aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection_edge.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2003-06-28 06:17:01 +0000
committerRoger Dingledine <arma@torproject.org>2003-06-28 06:17:01 +0000
commit517b418b5cfe046bcabd743ed0293452003c7bc3 (patch)
treec4a0a33dda88514219181db6ad16b934bfcb8fda /src/or/connection_edge.c
parentf8203505e1d84f3d71e6c7e8ebbb5b9500196681 (diff)
downloadtor-517b418b5cfe046bcabd743ed0293452003c7bc3.tar
tor-517b418b5cfe046bcabd743ed0293452003c7bc3.tar.gz
bugfix: a connection-level sendme cell would cause a connection to start
packaging from its buffer, even if the circuit-level package-window was still 0. svn:r360
Diffstat (limited to 'src/or/connection_edge.c')
-rw-r--r--src/or/connection_edge.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index dfe5d5703..5ae9a85a4 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -248,8 +248,8 @@ int connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, connection
}
conn->package_window += STREAMWINDOW_INCREMENT;
connection_start_reading(conn);
- connection_package_raw_inbuf(conn); /* handle whatever might still be on the inbuf */
- circuit_consider_stop_edge_reading(circ, edge_type, layer_hint);
+ if(!circuit_consider_stop_edge_reading(circ, edge_type, layer_hint))
+ connection_package_raw_inbuf(conn); /* handle whatever might still be on the inbuf */
break;
default:
log_fn(LOG_DEBUG,"unknown relay command %d.",relay_command);