|
@@ -408,7 +408,8 @@ hs_circuitmap_get_rend_circ_service_side(const uint8_t *cookie)
|
|
|
|
|
|
/* Public function: Return client-side rendezvous circuit with rendezvous
|
|
|
* <b>cookie</b>. It will first lookup for the CIRCUIT_PURPOSE_C_REND_READY
|
|
|
- * purpose and then try for CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED.
|
|
|
+ * purpose and then try for CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED and then
|
|
|
+ * finally tries for CIRCUIT_PURPOSE_C_ESTABLISH_REND.
|
|
|
*
|
|
|
* Return NULL if no such circuit is found in the circuitmap. */
|
|
|
origin_circuit_t *
|
|
@@ -426,6 +427,13 @@ hs_circuitmap_get_rend_circ_client_side(const uint8_t *cookie)
|
|
|
circ = hs_circuitmap_get_origin_circuit(HS_TOKEN_REND_CLIENT_SIDE,
|
|
|
REND_TOKEN_LEN, cookie,
|
|
|
CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED);
|
|
|
+ if (circ) {
|
|
|
+ return circ;
|
|
|
+ }
|
|
|
+
|
|
|
+ circ = hs_circuitmap_get_origin_circuit(HS_TOKEN_REND_CLIENT_SIDE,
|
|
|
+ REND_TOKEN_LEN, cookie,
|
|
|
+ CIRCUIT_PURPOSE_C_ESTABLISH_REND);
|
|
|
return circ;
|
|
|
}
|
|
|
|
|
@@ -472,8 +480,7 @@ hs_circuitmap_register_rend_circ_client_side(origin_circuit_t *or_circ,
|
|
|
{
|
|
|
circuit_t *circ = TO_CIRCUIT(or_circ);
|
|
|
{ /* Basic circ purpose sanity checking */
|
|
|
- tor_assert_nonfatal(circ->purpose == CIRCUIT_PURPOSE_C_REND_READY ||
|
|
|
- circ->purpose == CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED);
|
|
|
+ tor_assert_nonfatal(circ->purpose == CIRCUIT_PURPOSE_C_ESTABLISH_REND);
|
|
|
}
|
|
|
|
|
|
hs_circuitmap_register_circuit(circ, HS_TOKEN_REND_CLIENT_SIDE,
|