[or-cvs] r18417: {tor} decide that mikeperry's bug should be fixed in 0.2.1.x (but (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2009-02-08 21:50:19 -0500 (Sun, 08 Feb 2009)
New Revision: 18417

Modified:
   tor/trunk/src/or/connection_edge.c
Log:
decide that mikeperry's bug should be fixed in 0.2.1.x
(but not in 0.2.1.12-alpha, sorry)


Modified: tor/trunk/src/or/connection_edge.c
===================================================================
--- tor/trunk/src/or/connection_edge.c	2009-02-09 02:48:23 UTC (rev 18416)
+++ tor/trunk/src/or/connection_edge.c	2009-02-09 02:50:19 UTC (rev 18417)
@@ -409,8 +409,11 @@
       ? LOG_INFO : LOG_NOTICE;
     seconds_idle = (int)( now - conn->_base.timestamp_lastread );
 
-    /* XXX022 this clause may be redundant with the clause in
-     * connection_ap_handshake_attach_circuit(). Is it? -RD */
+    /* XXX021 this clause was originally thought redundant with the
+     * clause in connection_ap_handshake_attach_circuit(). But actually,
+     * we need it because controllers that put streams in controller_wait
+     * state never go to the other clause. we should fix so it compares
+     * seconds since timestamp_created, not since last read. -RD */
     if (AP_CONN_STATE_IS_UNATTACHED(conn->_base.state)) {
       if (seconds_idle >= options->SocksTimeout) {
         log_fn(severity, LD_APP,