diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-10-03 15:13:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-10-03 15:13:38 -0400 |
| commit | 05f672c8c21ceb4c47731fb3d8f777bf95583b3b (patch) | |
| tree | e7145149cba031dc18afcbf03c4c9f24b44afa91 /src/or/connection_edge.c | |
| parent | 4aa4bce474e6fb3e52c0aecb48f3e5024576e693 (diff) | |
| download | tor-05f672c8c21ceb4c47731fb3d8f777bf95583b3b.tar.gz tor-05f672c8c21ceb4c47731fb3d8f777bf95583b3b.zip | |
Fix compilation of 3335 and 3825 fixes
In master, they ran into problems with the edge_conn/entry_conn split.
Diffstat (limited to 'src/or/connection_edge.c')
| -rw-r--r-- | src/or/connection_edge.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 3393104686..40426a9b21 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -68,6 +68,7 @@ _connection_mark_unattached_ap(entry_connection_t *conn, int endreason, int line, const char *file) { connection_t *base_conn = ENTRY_TO_CONN(conn); + edge_connection_t *edge_conn = ENTRY_TO_EDGE_CONN(conn); tor_assert(base_conn->type == CONN_TYPE_AP); ENTRY_TO_EDGE_CONN(conn)->edge_has_sent_end = 1; /* no circ yet */ @@ -78,9 +79,10 @@ _connection_mark_unattached_ap(entry_connection_t *conn, int endreason, * XXX023 This condition doesn't limit to only streams failing * without ever being attached. That sloppiness should be harmless, * but we should fix it someday anyway. */ - if ((conn->on_circuit != NULL || conn->edge_has_sent_end) && - connection_edge_is_rendezvous_stream(conn)) { - rend_client_note_connection_attempt_ended(conn->rend_data->onion_address); + if ((edge_conn->on_circuit != NULL || edge_conn->edge_has_sent_end) && + connection_edge_is_rendezvous_stream(edge_conn)) { + rend_client_note_connection_attempt_ended( + edge_conn->rend_data->onion_address); } if (base_conn->marked_for_close) { |