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.

diff --git a/changes/bug9309 b/changes/bug9309
new file mode 100644 (file)
index 0000000..38c462b
--- /dev/null
+++ b/changes/bug9309
@@ -0,0 +1,6 @@
+  o Minor bugfixes:
+    - When evaluating whether to use a connection that we haven't
+      decided is canonical using a recent link protocol version,
+      decide that it's canonical only if it used address _does_
+      match the desired address. Fixes bug 9309; bugfix on
+      0.2.4.4-alpha. Reported by skruffy.

diff --git a/src/or/channel.c b/src/or/channel.c
index 4e9086f2e648aaa69078551462ae4ddf4d35ab00..602797d0dc2bb449f87aab499fa529dd9f7af57b 100644 (file)
--- 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 60693daeb228bf205f052c4ce81dabf54c7aedee..d758d22d820322c948ef1d5ad91a6644a81ed9e5 100644 (file)
--- 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);
 }
 
 /**