[tor-commits] [tor/master] Fix two log messages that mistakenly log 0-based hop counts

[nickm at torproject.org]

commit 35217f0f61c633efe1f6e5ecab18d1700b9d570b
Author: teor (Tim Wilson-Brown) <teor2345 at gmail.com>
Date:   Sat May 7 21:03:31 2016 +1000

    Fix two log messages that mistakenly log 0-based hop counts
    
    (torspec says hop counts are 1-based.)
    
    Closes ticket 18982, bugfix on 0275b6876 in tor 0.2.6.2-alpha
    and 907db008a in tor 0.2.4.5-alpha.
    
    Credit to Xiaofan Li for reporting this issue.
---
 changes/bug18982      | 6 ++++++
 src/or/circuitbuild.c | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/changes/bug18982 b/changes/bug18982
new file mode 100644
index 000000000..bb0383d13
--- /dev/null
+++ b/changes/bug18982
@@ -0,0 +1,6 @@
+  o Minor bugfixes (circuit logging):
+    - torspec says hop counts are 1-based, so fix two log messages
+      that mistakenly logged 0-based hop counts.
+      Closes ticket 18982, bugfix on 0275b6876 in tor 0.2.6.2-alpha
+      and 907db008a in tor 0.2.4.5-alpha. Patch by teor.
+      Credit to Xiaofan Li for reporting this issue.
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index e6fe3f0c3..48e4b75ff 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -2112,7 +2112,7 @@ choose_good_middle_server(uint8_t purpose,
              purpose <= CIRCUIT_PURPOSE_MAX_);
 
   log_debug(LD_CIRC, "Contemplating intermediate hop %d: random choice.",
-            cur_len);
+            cur_len+1);
   excluded = smartlist_new();
   if ((r = build_state_get_exit_node(state))) {
     nodelist_add_node_and_family(excluded, r);
@@ -2263,7 +2263,7 @@ onion_extend_cpath(origin_circuit_t *circ)
 
   if (!info) {
     log_warn(LD_CIRC,"Failed to find node for hop %d of our path. Discarding "
-             "this circuit.", cur_len);
+             "this circuit.", cur_len+1);
     return -1;
   }