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.

svn:r6945

diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 47607931bc3ff7b2a24cb0d123346e3c43524327..7a8830afe63f81ca853776a6da79e741572aba87 100644 (file)
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -1013,9 +1013,11 @@ assert_circuit_ok(const circuit_t *c)
       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);

diff --git a/src/or/or.h b/src/or/or.h
index 02290eb59c658fbf0133c848ce76bcf4290acc16..7e3f96eaf89486e5c308a3e21d38445a57a07204 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1198,7 +1198,8 @@ typedef struct circuit_t {
 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.