[or-cvs] r18298: {tor} Fix bug 893: check AP connections for markedness before expi (in tor/branches/tor-0_2_0-patches: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2009-01-28 11:29:58 -0500 (Wed, 28 Jan 2009)
New Revision: 18298

Modified:
   tor/branches/tor-0_2_0-patches/ChangeLog
   tor/branches/tor-0_2_0-patches/src/or/connection_edge.c
Log:
Fix bug 893: check AP connections for markedness before expiring them.

Modified: tor/branches/tor-0_2_0-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_2_0-patches/ChangeLog	2009-01-28 16:06:46 UTC (rev 18297)
+++ tor/branches/tor-0_2_0-patches/ChangeLog	2009-01-28 16:29:58 UTC (rev 18298)
@@ -1,7 +1,9 @@
 Changes in version 0.2.0.34 - 2009-??-??
   o Minor bugfixes:
-    - Fix compilation on systems where time-t is a 64-bit integer.
+    - Fix compilation on systems where time_t is a 64-bit integer.
       Patch from Matthias Drochner.
+    - Don't consider consider expiring already-closed client connections.
+      Fixes bug 893.  Bugfix on 0.0.2pre20.
 
 
 Changes in version 0.2.0.33 - 2009-01-21

Modified: tor/branches/tor-0_2_0-patches/src/or/connection_edge.c
===================================================================
--- tor/branches/tor-0_2_0-patches/src/or/connection_edge.c	2009-01-28 16:06:46 UTC (rev 18297)
+++ tor/branches/tor-0_2_0-patches/src/or/connection_edge.c	2009-01-28 16:29:58 UTC (rev 18298)
@@ -361,7 +361,7 @@
 
   SMARTLIST_FOREACH(conns, connection_t *, c,
   {
-    if (c->type != CONN_TYPE_AP)
+    if (c->type != CONN_TYPE_AP || c->marked_for_close)
       continue;
     conn = TO_EDGE_CONN(c);
     /* if it's an internal linked connection, don't yell its status. */