diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-07-23 11:52:10 +0200 |
|---|---|---|
| committer | Andrea Shepard <andrea@torproject.org> | 2013-07-23 05:16:56 -0700 |
| commit | 5d4b5018be5d85162d96cc3781acbf892f33bc21 (patch) | |
| tree | cdac1c31e46962cc02a953fd6ca8980c28865ee6 /src/or/channel.c | |
| parent | 2920d670debaaa7a306bedd5fd7ce9c3e72124e6 (diff) | |
| download | tor-5d4b5018be5d85162d96cc3781acbf892f33bc21.tar.gz tor-5d4b5018be5d85162d96cc3781acbf892f33bc21.zip | |
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/or/channel.c')
| -rw-r--r-- | src/or/channel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/channel.c b/src/or/channel.c index 98c23d91ea..05f269b8fa 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -3090,7 +3090,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; } @@ -4106,7 +4106,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. |