[or-cvs] [tor/master] Clarify 'marking connection as too old' messages

[nickm at torproject.org]

Author: Nick Mathewson <nickm at torproject.org>
Date: Wed, 12 May 2010 14:15:39 -0400
Subject: Clarify 'marking connection as too old' messages
Commit: 03dc1c786a9b154f17f9fd64ddf712d1ac9f30b0

Back when we changed the idea of a connection being "too old" for new
circuits into the connection being "bad" for new circuits, we didn't
actually change the info messages.  This led to telling the user that
we were labelling connections as "too old" for being worse than
connections that were actually older than them.

Found by Scott on or-talk.
---
 src/or/connection_or.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 98525f1..cdb4646 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -608,7 +608,7 @@ connection_or_group_set_badness(or_connection_t *head)
       /* We have at least one open canonical connection to this router,
        * and this one is open but not canonical.  Mark it bad. */
       log_info(LD_OR,
-               "Marking OR conn to %s:%d as too old for new circuits: "
+               "Marking OR conn to %s:%d as unsuitable for new circuits: "
                "(fd %d, %d secs old).  It is not canonical, and we have "
                "another connection to that OR that is.",
                or_conn->_base.address, or_conn->_base.port, or_conn->_base.s,
@@ -648,7 +648,7 @@ connection_or_group_set_badness(or_connection_t *head)
          even when we're being forgiving. */
       if (best->is_canonical) {
         log_info(LD_OR,
-                 "Marking OR conn to %s:%d as too old for new circuits: "
+                 "Marking OR conn to %s:%d as unsuitable for new circuits: "
                  "(fd %d, %d secs old).  We have a better canonical one "
                  "(fd %d; %d secs old).",
                  or_conn->_base.address, or_conn->_base.port, or_conn->_base.s,
@@ -658,9 +658,9 @@ connection_or_group_set_badness(or_connection_t *head)
       } else if (!tor_addr_compare(&or_conn->real_addr,
                                    &best->real_addr, CMP_EXACT)) {
         log_info(LD_OR,
-                 "Marking OR conn to %s:%d as too old for new circuits: "
-                 "(fd %d, %d secs old).  We have a better one "
-                 "(fd %d; %d secs old).",
+                 "Marking OR conn to %s:%d as unsuitable for new circuits: "
+                 "(fd %d, %d secs old).  We have a better one with the "
+                 "same address (fd %d; %d secs old).",
                  or_conn->_base.address, or_conn->_base.port, or_conn->_base.s,
                  (int)(now - or_conn->_base.timestamp_created),
                  best->_base.s, (int)(now - best->_base.timestamp_created));
-- 
1.6.5