diff options
Diffstat (limited to 'src/or/or.h')
-rw-r--r-- | src/or/or.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/or/or.h b/src/or/or.h index c6949281e..d91cd1207 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -209,10 +209,12 @@ * circuits that are c_establish_rend are either on their way * to becoming open, or they are open and have sent the * establish_rendezvous cell but haven't received an ack. - * circuits that are c_rend_ready are open and have received an - * ack, but haven't heard from bob yet. if they have a + * circuits that are c_rend_ready are open and have received a + * rend ack, but haven't heard from bob yet. if they have a * buildstate->pending_final_cpath then they're expecting a * cell from bob, else they're not. + * circuits that are c_rend_ready_intro_acked are open, and + * some intro circ has sent its intro and received an ack. * circuits that are c_rend_joined are open, have heard from * bob, and are talking to him. */ @@ -222,14 +224,15 @@ #define CIRCUIT_PURPOSE_C_ESTABLISH_REND 8 /* at Alice, waiting for ack */ #define CIRCUIT_PURPOSE_C_REND_READY 9 /* at Alice, waiting for Bob */ -#define CIRCUIT_PURPOSE_C_REND_JOINED 10 /* at Alice, rendezvous established */ +#define CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED 10 /* at Alice, waiting for Bob */ +#define CIRCUIT_PURPOSE_C_REND_JOINED 11 /* at Alice, rendezvous established */ -#define CIRCUIT_PURPOSE_S_ESTABLISH_INTRO 11 /* at Bob, waiting for introductions */ -#define CIRCUIT_PURPOSE_S_INTRO 12 /* at Bob, successfully established intro */ -#define CIRCUIT_PURPOSE_S_CONNECT_REND 13 /* at Bob, connecting to rend point */ +#define CIRCUIT_PURPOSE_S_ESTABLISH_INTRO 12 /* at Bob, waiting for introductions */ +#define CIRCUIT_PURPOSE_S_INTRO 13 /* at Bob, successfully established intro */ +#define CIRCUIT_PURPOSE_S_CONNECT_REND 14 /* at Bob, connecting to rend point */ -#define CIRCUIT_PURPOSE_S_REND_JOINED 14 /* at Bob, rendezvous established.*/ -#define _CIRCUIT_PURPOSE_MAX 14 +#define CIRCUIT_PURPOSE_S_REND_JOINED 15 /* at Bob, rendezvous established.*/ +#define _CIRCUIT_PURPOSE_MAX 15 #define CIRCUIT_PURPOSE_IS_ORIGIN(p) ((p)>_CIRCUIT_PURPOSE_OR_MAX) #define CIRCUIT_IS_ORIGIN(c) (CIRCUIT_PURPOSE_IS_ORIGIN((c)->purpose)) @@ -685,6 +688,7 @@ circuit_t *circuit_get_by_circ_id_conn(uint16_t circ_id, connection_t *conn); circuit_t *circuit_get_by_conn(connection_t *conn); circuit_t *circuit_get_best(connection_t *conn, int must_be_open, uint8_t purpose); +circuit_t *circuit_get_by_rend_query_and_purpose(const char *rend_query, uint8_t purpose); circuit_t *circuit_get_next_by_pk_and_purpose(circuit_t *circuit, const char *servid, uint8_t purpose); circuit_t *circuit_get_rendezvous(const char *cookie); @@ -1038,7 +1042,7 @@ int rend_client_rendezvous_acked(circuit_t *circ, const char *request, int reque int rend_client_receive_rendezvous(circuit_t *circ, const char *request, int request_len); void rend_client_desc_fetched(char *query, int success); -int rend_cmp_service_ids(char *one, char *two); +int rend_cmp_service_ids(const char *one, const char *two); char *rend_client_get_random_intro(char *query); int rend_parse_rendezvous_address(char *address); |