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/circuituse.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/circuituse.c')
| -rw-r--r-- | src/or/circuituse.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 26bc45173e..9b9621890f 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1589,11 +1589,12 @@ link_apconn_to_circ(entry_connection_t *apconn, origin_circuit_t *circ, /* assert_connection_ok(conn, time(NULL)); */ circ->p_streams = ENTRY_TO_EDGE_CONN(apconn); - if (connection_edge_is_rendezvous_stream(apconn)) { + if (connection_edge_is_rendezvous_stream(ENTRY_TO_EDGE_CONN(apconn))) { /* We are attaching a stream to a rendezvous circuit. That means * that an attempt to connect to a hidden service just * succeeded. Tell rendclient.c. */ - rend_client_note_connection_attempt_ended(apconn->rend_data->onion_address); + rend_client_note_connection_attempt_ended( + ENTRY_TO_EDGE_CONN(apconn)->rend_data->onion_address); } if (cpath) { /* we were given one; use it */ |