diff options
Diffstat (limited to 'src/or/circuit.c')
| -rw-r--r-- | src/or/circuit.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/or/circuit.c b/src/or/circuit.c index f3f1c6f58..9c7b1a825 100644 --- a/src/or/circuit.c +++ b/src/or/circuit.c @@ -298,7 +298,7 @@ circuit_t *circuit_get_newest(connection_t *conn, continue; } } else { /* not general */ - if(rend_cmp_service_ids(conn->socks_request->address, circ->rend_service)) { + if(rend_cmp_service_ids(conn->socks_request->address, circ->rend_query)) { /* this circ is not for this conn */ continue; } @@ -1046,21 +1046,18 @@ static void circuit_is_ready(circuit_t *circ) { switch(circ->purpose) { case CIRCUIT_PURPOSE_C_GENERAL: /* Tell any AP connections that have been waiting for a new - * circuit that one is ready. */ + * circuit that one is ready. */ + case CIRCUIT_PURPOSE_C_INTRODUCING: + /* at Alice, connecting to intro point */ + case CIRCUIT_PURPOSE_C_ESTABLISH_REND: + /* at Alice, waiting for Bob */ + connection_ap_attach_pending(); break; case CIRCUIT_PURPOSE_S_ESTABLISH_INTRO: /* at Bob, waiting for introductions */ rend_service_intro_is_ready(circ); break; - case CIRCUIT_PURPOSE_C_INTRODUCING: - /* at Alice, connecting to intro point */ - rend_client_intro_is_ready(circ); - break; - case CIRCUIT_PURPOSE_C_ESTABLISH_REND: - /* at Alice, waiting for Bob */ - rend_client_rendezvous_is_ready(circ); - break; case CIRCUIT_PURPOSE_S_CONNECT_REND: /* at Bob, connecting to rend point */ rend_service_rendezvous_is_ready(circ); |