[or-cvs] r16375: Fix a false assertion when extending a circuit to a relay to (in tor/trunk: . src/or)

[kloesing@xxxxxxxx]

Author: kloesing
Date: 2008-08-03 13:45:24 -0400 (Sun, 03 Aug 2008)
New Revision: 16375

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/circuitbuild.c
   tor/trunk/src/or/or.h
Log:
Fix a false assertion when extending a circuit to a relay to which a connection is already established. In that case the circuit should not need to memorize extend info for that relay. circuitbuild.c:389 contains a similar assertion.

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-08-03 15:34:28 UTC (rev 16374)
+++ tor/trunk/ChangeLog	2008-08-03 17:45:24 UTC (rev 16375)
@@ -33,7 +33,7 @@
     - Change the implementation of ExcludeNodes and ExcludeExitNodes to
       be more efficient. Formerly it was quadratic in the number of
       servers; now it should be linear. Fixes bug 509.
-    - Save 16-22 bytes per open circuit by moving the n_hop, n_port,
+    - Save 16-22 bytes per open circuit by moving the n_addr, n_port,
       and n_conn_id_digest fields into a separate structure that's
       only needed when the circuit has not yet attached to an n_conn.
 

Modified: tor/trunk/src/or/circuitbuild.c
===================================================================
--- tor/trunk/src/or/circuitbuild.c	2008-08-03 15:34:28 UTC (rev 16374)
+++ tor/trunk/src/or/circuitbuild.c	2008-08-03 17:45:24 UTC (rev 16375)
@@ -791,7 +791,7 @@
     return 0;
   }
 
-  tor_assert(circ->n_hop);
+  tor_assert(!circ->n_hop); /* Connection is already established. */
   circ->n_conn = n_conn;
   log_debug(LD_CIRC,"n_conn is %s:%u",
             n_conn->_base.address,n_conn->_base.port);

Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h	2008-08-03 15:34:28 UTC (rev 16374)
+++ tor/trunk/src/or/or.h	2008-08-03 17:45:24 UTC (rev 16375)
@@ -1784,7 +1784,7 @@
   circid_t n_circ_id;
 
   /** The hop to which we want to extend this ciruit.  Should be NULL if
-   * the */
+   * the circuit has attached to a connection. */
   extend_info_t *n_hop;
 
   /** True iff we are waiting for n_conn_cells to become less full before