[or-cvs] r6945: fix assert found by DreadWingKnight: now that rendezvous str (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2006-07-30 00:54:13 -0400 (Sun, 30 Jul 2006)
New Revision: 6945

Modified:
   tor/trunk/src/or/circuitlist.c
   tor/trunk/src/or/or.h
Log:
fix assert found by DreadWingKnight: now that rendezvous streams
are attached to p_streams, the p_streams list can consist of both AP
and EXIT conns.


Modified: tor/trunk/src/or/circuitlist.c
===================================================================
--- tor/trunk/src/or/circuitlist.c	2006-07-30 04:45:59 UTC (rev 6944)
+++ tor/trunk/src/or/circuitlist.c	2006-07-30 04:54:13 UTC (rev 6945)
@@ -1013,9 +1013,11 @@
       tor_assert(c == circuit_get_by_circid_orconn(or_circ->p_circ_id,
                                                    or_circ->p_conn));
   }
+#if 0 /* false now that rendezvous exits are attached to p_streams */
   if (origin_circ)
     for (conn = origin_circ->p_streams; conn; conn = conn->next_stream)
       tor_assert(conn->_base.type == CONN_TYPE_AP);
+#endif
   if (or_circ)
     for (conn = or_circ->n_streams; conn; conn = conn->next_stream)
       tor_assert(conn->_base.type == CONN_TYPE_EXIT);

Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h	2006-07-30 04:45:59 UTC (rev 6944)
+++ tor/trunk/src/or/or.h	2006-07-30 04:54:13 UTC (rev 6945)
@@ -1198,7 +1198,8 @@
 typedef struct origin_circuit_t {
   circuit_t _base;
 
-  /** Linked list of AP streams associated with this circuit. */
+  /** Linked list of AP streams (or EXIT streams if hidden service)
+   * associated with this circuit. */
   edge_connection_t *p_streams;
   /** Build state for this circuit. It includes the intended path
    * length, the chosen exit router, rendezvous information, etc.