nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 13:53:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix assert found by DreadWingKnight: now that rendezvous streams

Browse Source 
are attached to p_streams, the p_streams list can consist of both AP
and EXIT conns.


svn:r6945
This commit is contained in:
Roger Dingledine 2006-07-30 04:54:13 +00:00
parent bf76d3a189
commit 798b580695
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/or/circuitlist.c
View File

@ -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);

3
src/or/or.h
View File

@ -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.