nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix two log messages that mistakenly log 0-based hop counts

Browse Source 
(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.
This commit is contained in:
teor (Tim Wilson-Brown) 2016-05-07 21:03:31 +10:00
parent 2da2718609
commit 35217f0f61
No known key found for this signature in database
GPG Key ID: 450CBA7F968F094B
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug18982 Normal file
View File

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

4
src/or/circuitbuild.c
View File

@ -2112,7 +2112,7 @@ choose_good_middle_server(uint8_t purpose,
purpose <= CIRCUIT_PURPOSE_MAX_); purpose <= CIRCUIT_PURPOSE_MAX_);
log_debug(LD_CIRC, "Contemplating intermediate hop %d: random choice.", log_debug(LD_CIRC, "Contemplating intermediate hop %d: random choice.",
cur_len); cur_len+1);
excluded = smartlist_new(); excluded = smartlist_new();
if ((r = build_state_get_exit_node(state))) { if ((r = build_state_get_exit_node(state))) {
nodelist_add_node_and_family(excluded, r); nodelist_add_node_and_family(excluded, r);
@ -2263,7 +2263,7 @@ onion_extend_cpath(origin_circuit_t *circ)
if (!info) { if (!info) {
log_warn(LD_CIRC,"Failed to find node for hop %d of our path. Discarding " 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; return -1;
} }