From: Roger Dingledine <arma@torproject.org>
Date: Sat, 28 Jun 2003 06:17:01 +0000 (+0000)
Subject: bugfix: a connection-level sendme cell would cause a connection to start
X-Git-Tag: tor-0.0.2pre8~108
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=517b418b5cfe046bcabd743ed0293452003c7bc3;p=thirdparty%2Ftor.git

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 dfe5d57036..5ae9a85a43 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);