[or-cvs] r15369: If we close our OR connection because there's been a circuit (in tor/trunk: . doc src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2008-06-20 00:42:17 -0400 (Fri, 20 Jun 2008)
New Revision: 15369

Modified:
   tor/trunk/ChangeLog
   tor/trunk/doc/TODO
   tor/trunk/src/or/circuituse.c
   tor/trunk/src/or/connection.c
Log:
If we close our OR connection because there's been a circuit
pending on it for too long, we were telling our bootstrap status
events "REASON=NONE". Now tell them "REASON=TIMEOUT".


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-06-20 04:34:39 UTC (rev 15368)
+++ tor/trunk/ChangeLog	2008-06-20 04:42:17 UTC (rev 15369)
@@ -49,6 +49,9 @@
       as soon as you run out of working bridges, rather than waiting
       for ten failures -- which will never happen if you have less than
       ten bridges.
+    - If we close our OR connection because there's been a circuit
+      pending on it for too long, we were telling our bootstrap status
+      events "REASON=NONE". Now tell them "REASON=TIMEOUT".
 
 
 Changes in version 0.2.1.1-alpha - 2008-06-13

Modified: tor/trunk/doc/TODO
===================================================================
--- tor/trunk/doc/TODO	2008-06-20 04:34:39 UTC (rev 15368)
+++ tor/trunk/doc/TODO	2008-06-20 04:42:17 UTC (rev 15369)
@@ -350,8 +350,9 @@
     results of the getinfo.
 R - get matt to make vidalia do a getinfo status/bootstrap-phase to
     get caught up after it connects.
-R * in circuituse.c,
+  o in circuituse.c,
     /* XXX021 consider setting n_conn->socket_error to TIMEOUT */
+R d Setting DirPort when acting as bridge will give false Warnings
 
 For 0.2.1.x:
   - Proposals to do:

Modified: tor/trunk/src/or/circuituse.c
===================================================================
--- tor/trunk/src/or/circuituse.c	2008-06-20 04:34:39 UTC (rev 15368)
+++ tor/trunk/src/or/circuituse.c	2008-06-20 04:42:17 UTC (rev 15369)
@@ -752,7 +752,9 @@
                "(%s:%d). I'm going to try to rotate to a better connection.",
                n_conn->_base.address, n_conn->_base.port);
       n_conn->_base.or_is_obsolete = 1;
-      /* XXX021 consider setting n_conn->socket_error to TIMEOUT */
+      if (n_conn->_base.state < OR_CONN_STATE_TLS_HANDSHAKING &&
+          !n_conn->socket_error)
+        n_conn->socket_error = END_OR_CONN_REASON_TIMEOUT;
       entry_guard_register_connect_status(n_conn->identity_digest, 0,
                                           time(NULL));
     }

Modified: tor/trunk/src/or/connection.c
===================================================================
--- tor/trunk/src/or/connection.c	2008-06-20 04:34:39 UTC (rev 15368)
+++ tor/trunk/src/or/connection.c	2008-06-20 04:42:17 UTC (rev 15369)
@@ -2288,7 +2288,7 @@
   return 0;
 }
 
-/** Openssl TLS record size is 16383; this is close. The goal here is to
+/** OpenSSL TLS record size is 16383; this is close. The goal here is to
  * push data out as soon as we know there's enough for a TLS record, so
  * during periods of high load we won't read entire megabytes from
  * input before pushing any data out. It also has the feature of not