From: Roger Dingledine <arma@torproject.org>
Date: Wed, 4 Feb 2009 08:27:36 +0000 (+0000)
Subject: make a note about a clause in connection_edge.c that is probably
X-Git-Tag: tor-0.2.1.12-alpha~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45aeabf8f724cd2aba5c5262f9f7e19b86cbaf3a;p=thirdparty%2Ftor.git

make a note about a clause in connection_edge.c that is probably
redundant, and is definitely confusing. we should take it out
in 0.2.2.x and see who squeaks.


svn:r18383
---

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 3cfac78c3b..a93cfb06b3 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -409,6 +409,8 @@ connection_ap_expire_beginning(void)
       ? 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 */
     if (AP_CONN_STATE_IS_UNATTACHED(conn->_base.state)) {
       if (seconds_idle >= options->SocksTimeout) {
         log_fn(severity, LD_APP,