backport r15366, bump to 0.2.0.28-rc-dev

svn:r15435

4 files changed, 36 insertions, 13 deletions

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index b403fc2ed9..bb302836f7 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -412,8 +412,9 @@ circuit_n_conn_done(or_connection_t *or_conn, int status)
   smartlist_t *pending_circs;
   int err_reason = 0;
 
-  log_debug(LD_CIRC,"or_conn to %s, status=%d",
-            or_conn->nickname ? or_conn->nickname : "NULL", status);
+  log_debug(LD_CIRC,"or_conn to %s/%s, status=%d",
+            or_conn->nickname ? or_conn->nickname : "NULL",
+            or_conn->_base.address, status);
 
   pending_circs = smartlist_create();
   circuit_get_all_pending_on_or_conn(pending_circs, or_conn);
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index e37b4153a6..d8ac174309 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -95,10 +95,19 @@ circuit_is_acceptable(circuit_t *circ, edge_connection_t *conn,
       tor_assert(conn->chosen_exit_name);
       if (build_state->chosen_exit) {
         char digest[DIGEST_LEN];
-        if (hexdigest_to_digest(conn->chosen_exit_name, digest) < 0 ||
-            memcmp(digest, build_state->chosen_exit->identity_digest,
-                   DIGEST_LEN))
+        if (hexdigest_to_digest(conn->chosen_exit_name, digest) < 0)
+          return 0; /* broken digest, we don't want it */
+        if (memcmp(digest, build_state->chosen_exit->identity_digest,
+                          DIGEST_LEN))
           return 0; /* this is a circuit to somewhere else */
+        if (tor_digest_is_zero(digest)) {
+          /* we don't know the digest; have to compare addr:port */
+          struct in_addr in;
+          if (!tor_inet_aton(conn->socks_request->address, &in) ||
+              build_state->chosen_exit->addr != ntohl(in.s_addr) ||
+              build_state->chosen_exit->port != conn->socks_request->port)
+            return 0;
+        }
       }
     } else {
       if (conn->want_onehop) {
@@ -748,7 +757,7 @@ circuit_build_failed(origin_circuit_t *circ)
     }
     /* if there are any one-hop streams waiting on this circuit, fail
      * them now so they can retry elsewhere. */
-    connection_ap_fail_onehop(circ->_base.n_conn_id_digest);
+    connection_ap_fail_onehop(circ->_base.n_conn_id_digest, circ->build_state);
   }
 
   switch (circ->_base.purpose) {
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 3987cafffa..a9b930b42f 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -460,7 +460,8 @@ connection_ap_attach_pending(void)
 /** Tell any AP streams that are waiting for a onehop tunnel to
  * <b>failed_digest</b> that they are going to fail. */
 void
-connection_ap_fail_onehop(const char *failed_digest)
+connection_ap_fail_onehop(const char *failed_digest,
+                          cpath_build_state_t *build_state)
 {
   edge_connection_t *edge_conn;
   char digest[DIGEST_LEN];
@@ -474,12 +475,23 @@ connection_ap_fail_onehop(const char *failed_digest)
     edge_conn = TO_EDGE_CONN(conn);
     if (!edge_conn->want_onehop)
       continue;
-    if (!hexdigest_to_digest(edge_conn->chosen_exit_name, digest) &&
-        !memcmp(digest, failed_digest, DIGEST_LEN)) {
-      log_info(LD_APP, "Closing onehop stream to '%s' because the OR conn "
-                       "just failed.", edge_conn->chosen_exit_name);
-      connection_mark_unattached_ap(edge_conn, END_STREAM_REASON_TIMEOUT);
+    if (hexdigest_to_digest(edge_conn->chosen_exit_name, digest) < 0 ||
+        memcmp(digest, failed_digest, DIGEST_LEN))
+      continue;
+    if (tor_digest_is_zero(digest)) {
+      /* we don't know the digest; have to compare addr:port */
+      struct in_addr in;
+      if (!build_state || !build_state->chosen_exit ||
+          !edge_conn->socks_request || !edge_conn->socks_request->address ||
+          !tor_inet_aton(edge_conn->socks_request->address, &in) ||
+          build_state->chosen_exit->addr != ntohl(in.s_addr) ||
+          build_state->chosen_exit->port != edge_conn->socks_request->port)
+        continue;
     }
+    log_info(LD_APP, "Closing onehop stream to '%s/%s' because the OR conn "
+                     "just failed.", edge_conn->chosen_exit_name,
+                     edge_conn->socks_request->address);
+    connection_mark_unattached_ap(edge_conn, END_STREAM_REASON_TIMEOUT);
   });
 }
 
diff --git a/src/or/or.h b/src/or/or.h
index 6e7654ca15..e1a2fe6d9e 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2812,7 +2812,8 @@ int connection_edge_is_rendezvous_stream(edge_connection_t *conn);
 int connection_ap_can_use_exit(edge_connection_t *conn, routerinfo_t *exit);
 void connection_ap_expire_beginning(void);
 void connection_ap_attach_pending(void);
-void connection_ap_fail_onehop(const char *failed_digest);
+void connection_ap_fail_onehop(const char *failed_digest,
+                               cpath_build_state_t *build_state);
 void circuit_discard_optional_exit_enclaves(extend_info_t *info);
 int connection_ap_detach_retriable(edge_connection_t *conn,
                                    origin_circuit_t *circ,