aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-07-23 11:52:10 +0200
committerNick Mathewson <nickm@torproject.org>2013-07-23 11:52:10 +0200
commit1d2e8020b7be5aff08cfde6f94c24b145625c1ad (patch)
tree3e1956790a3241af325c6101f0ca94f2b9dfb710 /src
parent0eca8737a1a35204be92eac12f2bf8748ac29004 (diff)
downloadtor-1d2e8020b7be5aff08cfde6f94c24b145625c1ad.tar
tor-1d2e8020b7be5aff08cfde6f94c24b145625c1ad.tar.gz
Fix bug9309, and n_noncanonical count/continue code
When we moved channel_matches_target_addr_for_extend() into a separate function, its sense was inverted from what one might expect, and we didn't have a ! in one place where we should have. Found by skruffy.
Diffstat (limited to 'src')
-rw-r--r--src/or/channel.c4
-rw-r--r--src/or/channeltls.c5
2 files changed, 4 insertions, 5 deletions
diff --git a/src/or/channel.c b/src/or/channel.c
index 4e9086f2e..602797d0d 100644
--- a/src/or/channel.c
+++ b/src/or/channel.c
@@ -3037,7 +3037,7 @@ channel_get_for_extend(const char *digest,
if (chan->state != CHANNEL_STATE_OPEN) {
/* If the address matches, don't launch a new connection for this
* circuit. */
- if (!channel_matches_target_addr_for_extend(chan, target_addr))
+ if (channel_matches_target_addr_for_extend(chan, target_addr))
++n_inprogress_goodaddr;
continue;
}
@@ -4053,7 +4053,7 @@ channel_matches_extend_info(channel_t *chan, extend_info_t *extend_info)
}
/**
- * Check if a channel matches a given target address
+ * Check if a channel matches a given target address; return true iff we do.
*
* This function calls into the lower layer and asks if this channel thinks
* it matches a given target address for circuit extension purposes.
diff --git a/src/or/channeltls.c b/src/or/channeltls.c
index 60693daeb..d758d22d8 100644
--- a/src/or/channeltls.c
+++ b/src/or/channeltls.c
@@ -546,7 +546,7 @@ channel_tls_matches_extend_info_method(channel_t *chan,
}
/**
- * Check if we match a target address
+ * Check if we match a target address; return true iff we do.
*
* This implements the matches_target method for channel_tls t_; the upper
* layer wants to know if this channel matches a target address when extending
@@ -563,8 +563,7 @@ channel_tls_matches_target_method(channel_t *chan,
tor_assert(target);
tor_assert(tlschan->conn);
- return tor_addr_compare(&(tlschan->conn->real_addr),
- target, CMP_EXACT);
+ return tor_addr_eq(&(tlschan->conn->real_addr), target);
}
/**