aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2008-02-21 06:45:04 +0000
committerRoger Dingledine <arma@torproject.org>2008-02-21 06:45:04 +0000
commit2d7f7a645695c6d8978373f38b1cf8bfe3b0835b (patch)
treeb177ddc3ae20034e59ebbaea6db5ff6e1cad5dfb
parentc047d647e3b89c932d097775469f3015f89b9277 (diff)
downloadtor-2d7f7a645695c6d8978373f38b1cf8bfe3b0835b.tar.gz
tor-2d7f7a645695c6d8978373f38b1cf8bfe3b0835b.zip
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? svn:r13646
-rw-r--r--src/or/dirserv.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index f61b9feb03..fb3d5e7cf3 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -2058,8 +2058,10 @@ connection_dirserv_unlink_from_bridge(dir_connection_t *dir_conn)
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));