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".

svn:r15369

diff --git a/ChangeLog b/ChangeLog
index 7901f2c6a3f64aec9dc9a6da83cc28b9e4ead276..0c630b43f64f78bcb0cdea136d1be7f0b2974436 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,9 @@ Changes in version 0.2.1.2-alpha - 2008-06-??
       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

diff --git a/doc/TODO b/doc/TODO
index 2ea0afe37b4e70730ac10300c93521cd39caa259..2c4f738dabc6d943edddf92cb495cb3b97a3d042 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -350,8 +350,9 @@ R - if "no running bridges known", an application request should make
     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:

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 3ba548e6fb27837716c1e5abff111292a034f01c..781aa9800b61d843e565a92afcba20f082d80c4e 100644 (file)
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -752,7 +752,9 @@ circuit_build_failed(origin_circuit_t *circ)
                "(%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));
     }

diff --git a/src/or/connection.c b/src/or/connection.c
index 690cc027740559968f676e10853e893da67fa351..002d10a03e590284e3114b3b8979ed6872e870d4 100644 (file)
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -2288,7 +2288,7 @@ connection_handle_write(connection_t *conn, int force)
   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