[or-cvs] r10611: bugfix on r10609: don't fail asserts when closing circuits t (tor/trunk/src/or)

arma at seul.org arma at seul.org
Fri Jun 15 16:21:40 UTC 2007


Author: arma
Date: 2007-06-15 12:21:40 -0400 (Fri, 15 Jun 2007)
New Revision: 10611

Modified:
   tor/trunk/src/or/circuitbuild.c
Log:
bugfix on r10609: don't fail asserts when closing circuits
that were connected to an unkeyed connection.


Modified: tor/trunk/src/or/circuitbuild.c
===================================================================
--- tor/trunk/src/or/circuitbuild.c	2007-06-15 07:59:46 UTC (rev 10610)
+++ tor/trunk/src/or/circuitbuild.c	2007-06-15 16:21:40 UTC (rev 10611)
@@ -424,6 +424,8 @@
         if (circ->n_addr != or_conn->_base.addr ||
             circ->n_port != or_conn->_base.port)
           continue;
+        /* now teach circ the right identity_digest */
+        memcpy(circ->n_conn_id_digest, or_conn->identity_digest, DIGEST_LEN);
       } else {
         /* We expected a key. See if it's the right one. */
         if (memcmp(or_conn->identity_digest,



More information about the tor-commits mailing list