[or-cvs] r13646: fix bug in r13469: Feb 21 01:07:02.132 [warn] connection_abo (tor/branches/tor-0_1_2-patches/src/or)

[arma at seul.org]

Author: arma
Date: 2008-02-21 01:45:04 -0500 (Thu, 21 Feb 2008)
New Revision: 13646

Modified:
   tor/branches/tor-0_1_2-patches/src/or/dirserv.c
Log:
fix bug in r13469:
Feb 21 01:07:02.132 [warn] connection_about_to_close_connection(): Harmless bug: Edge connection (marked at dirserv.c:2062) hasn't sent end yet?


Modified: tor/branches/tor-0_1_2-patches/src/or/dirserv.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/dirserv.c	2008-02-21 06:06:45 UTC (rev 13645)
+++ tor/branches/tor-0_1_2-patches/src/or/dirserv.c	2008-02-21 06:45:04 UTC (rev 13646)
@@ -2058,8 +2058,10 @@
   dir_conn->bridge_conn = NULL;
   if (edge_conn) {
     edge_conn->bridge_for_conn = NULL;
-    if (!edge_conn->_base.marked_for_close)
+    if (!edge_conn->_base.marked_for_close) {
+      TO_CONN(edge_conn)->edge_has_sent_end = 1;
       connection_mark_for_close(TO_CONN(edge_conn));
+    }
   }
   if (!dir_conn->_base.marked_for_close)
     connection_mark_for_close(TO_CONN(dir_conn));