[or-cvs] backport the other half of the reachability bugfix.

[arma at seul.org]

Update of /home/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/tor-011x/tor/src/or

Modified Files:
      Tag: tor-0_1_1-patches
	circuitbuild.c 
Log Message:
backport the other half of the reachability bugfix.
("defense in depth")


Index: circuitbuild.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/circuitbuild.c,v
retrieving revision 1.230.2.7
retrieving revision 1.230.2.8
diff -u -p -d -r1.230.2.7 -r1.230.2.8
--- circuitbuild.c	18 Jun 2006 21:08:22 -0000	1.230.2.7
+++ circuitbuild.c	4 Jul 2006 17:10:12 -0000	1.230.2.8
@@ -420,16 +420,8 @@ circuit_n_conn_done(connection_t *or_con
       continue;
     tor_assert(circ->state == CIRCUIT_STATE_OR_WAIT);
     if (!circ->n_conn &&
-        circ->n_addr == or_conn->addr &&
-        circ->n_port == or_conn->port) {
-      if (memcmp(or_conn->identity_digest, circ->n_conn_id_digest,
-                 DIGEST_LEN)) {
-        log_fn(LOG_PROTOCOL_WARN, LD_CIRC,
-               "Pending circuit to %s:%d is intended for different digest!",
-               or_conn->address, or_conn->port);
-        circuit_mark_for_close(circ, END_CIRC_REASON_OR_IDENTITY);
-        continue;
-      }
+        !memcmp(or_conn->identity_digest, circ->n_conn_id_digest,
+                DIGEST_LEN)) {
       if (!status) { /* or_conn failed; close circ */
         log_info(LD_CIRC,"or_conn failed. Closing circ.");
         circuit_mark_for_close(circ, END_CIRC_REASON_OR_CONN_CLOSED);