[or-cvs] prevent circuit_resume_edge_reading_helper() from trying

[Roger Dingledine]

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

Modified Files:
      Tag: tor-0_0_9-patches
	relay.c 
Log Message:
prevent circuit_resume_edge_reading_helper() from trying
to package inbufs for marked-for-close streams.


Index: relay.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/relay.c,v
retrieving revision 1.32.2.3
retrieving revision 1.32.2.4
diff -u -d -r1.32.2.3 -r1.32.2.4
--- relay.c	23 Mar 2005 19:52:33 -0000	1.32.2.3
+++ relay.c	24 Mar 2005 21:30:33 -0000	1.32.2.4
@@ -999,6 +999,8 @@
                                    crypt_path_t *layer_hint) {
 
   for ( ; conn; conn=conn->next_stream) {
+    if (conn->marked_for_close)
+      continue;
     if ((!layer_hint && conn->package_window > 0) ||
         (layer_hint && conn->package_window > 0 && conn->cpath_layer == layer_hint)) {
       connection_start_reading(conn);