From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 22 Dec 2008 16:22:04 +0000 (+0000)
Subject: Partially apply bug 891 parch from forest: check EXTEND cell address against real_add... 
X-Git-Tag: tor-0.2.1.9-alpha~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1e666bfcc105b6b650c072c10074d009dcdc50d3;p=thirdparty%2Ftor.git

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

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;