瀏覽代碼

Avoid a double-mark in connection_or_close_connection_cb

Nick Mathewson 14 年之前
父節點
當前提交
633071eb3b
共有 1 個文件被更改,包括 5 次插入3 次删除
  1. 5 3
      src/or/connection_or.c

+ 5 - 3
src/or/connection_or.c

@@ -1159,10 +1159,12 @@ connection_or_tls_renegotiated_cb(tor_tls_t *tls, void *_conn)
 static void
 static void
 connection_or_close_connection_cb(void *_conn)
 connection_or_close_connection_cb(void *_conn)
 {
 {
-  or_connection_t *conn = _conn;
+  or_connection_t *or_conn = _conn;
+  connection_t *conn = TO_CONN(or_conn);
 
 
-  connection_stop_reading(TO_CONN(conn));
-  connection_mark_for_close(TO_CONN(conn));
+  connection_stop_reading(conn);
+  if (!conn->marked_for_close)
+    connection_mark_for_close(conn);
 }
 }
 
 
 /** Move forward with the tls handshake. If it finishes, hand
 /** Move forward with the tls handshake. If it finishes, hand