[or-cvs] bugfix: a connection-level sendme cell would cause a connec...

[arma@seul.org (Roger Dingledine)]

Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/src/or

Modified Files:
	connection_edge.c 
Log Message:
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.


Index: connection_edge.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection_edge.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- connection_edge.c	27 Jun 2003 00:57:04 -0000	1.13
+++ connection_edge.c	28 Jun 2003 06:17:01 -0000	1.14
@@ -248,8 +248,8 @@
       }
       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);