summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-12-22 16:22:04 +0000
committerNick Mathewson <nickm@torproject.org>2008-12-22 16:22:04 +0000
commit1e666bfcc105b6b650c072c10074d009dcdc50d3 (patch)
tree107b5f2ed99818ab16b1a35ea7207f4547ce3db2
parent1725c0c8a50cb4de34157aee720af6753821f80c (diff)
downloadtor-1e666bfcc105b6b650c072c10074d009dcdc50d3.tar.gz
tor-1e666bfcc105b6b650c072c10074d009dcdc50d3.zip
Partially apply bug 891 parch from forest: check EXTEND cell address against real_addr, not addr. I have questions about the rest of the patch: see the flyspray entry.
svn:r17730
-rw-r--r--src/or/circuitbuild.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 8129437554..d55829fcae 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -362,8 +362,8 @@ connection_good_enough_for_extend(const or_connection_t *n_conn,
*state_out = "too old. Launching a new one.";
*launch_out = 1;
return 0;
- } else if (tor_addr_compare(&n_conn->_base.addr, target_addr, CMP_EXACT) &&
- ! n_conn->is_canonical) {
+ } else if (tor_addr_compare(&n_conn->real_addr, target_addr, CMP_EXACT)
+ && ! n_conn->is_canonical) {
*state_out = "is not from a canonical address. Launching a new one.";
*launch_out = 1;
return 0;