[or-cvs] r9479: Update assert_connection_ok() to match the "block tunnelled (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-02-03 09:57:47 -0500 (Sat, 03 Feb 2007)
New Revision: 9479

Modified:
   tor/trunk/
   tor/trunk/src/or/connection.c
Log:
 r12129 at Kushana:  nickm | 2007-02-03 09:57:36 -0500
 Update assert_connection_ok() to match the "block tunnelled dir conn if the or conn is full" logic.  This may fix bug 385.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r12129] on c95137ef-5f19-0410-b913-86e773d04f59

Modified: tor/trunk/src/or/connection.c
===================================================================
--- tor/trunk/src/or/connection.c	2007-02-02 20:39:55 UTC (rev 9478)
+++ tor/trunk/src/or/connection.c	2007-02-03 14:57:47 UTC (rev 9479)
@@ -2377,7 +2377,9 @@
   }
 
   if (conn->outbuf_flushlen > 0) {
-    tor_assert(connection_is_writing(conn) || conn->wants_to_write);
+    tor_assert(connection_is_writing(conn) || conn->wants_to_write ||
+               (conn->type == CONN_TYPE_DIR &&
+                TO_DIR_CONN(conn)->is_blocked_on_or_conn));
   }
 
   if (conn->hold_open_until_flushed)