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

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index dfe5d570365ead57a8eb07b63fe29f55774a079f..5ae9a85a43a2cbbcecdbeb920e7497a760599cfd 100644 (file)
--- 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);