[or-cvs] r17730: {tor} Partially apply bug 891 parch from forest: check EXTEND cell (tor/trunk/src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-12-22 11:22:04 -0500 (Mon, 22 Dec 2008)
New Revision: 17730

Modified:
   tor/trunk/src/or/circuitbuild.c
Log:
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.

Modified: tor/trunk/src/or/circuitbuild.c
===================================================================
--- tor/trunk/src/or/circuitbuild.c	2008-12-22 14:56:28 UTC (rev 17729)
+++ tor/trunk/src/or/circuitbuild.c	2008-12-22 16:22:04 UTC (rev 17730)
@@ -362,8 +362,8 @@
     *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;