nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-12 13:43:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Block circuit canibalization when Tor2webRendezvousPoints is active.

Browse Source
This commit is contained in:
George Kadianakis 2014-09-15 15:27:27 +03:00
parent e02138eb65
commit 3e7c5e9f44
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/or/circuituse.c
View File

@ -1646,6 +1646,7 @@ circuit_launch_by_extend_info(uint8_t purpose,
{ {
origin_circuit_t *circ; origin_circuit_t *circ;
int onehop_tunnel = (flags & CIRCLAUNCH_ONEHOP_TUNNEL) != 0; int onehop_tunnel = (flags & CIRCLAUNCH_ONEHOP_TUNNEL) != 0;
int need_specific_rp = 0;
if (!onehop_tunnel && !router_have_minimum_dir_info()) { if (!onehop_tunnel && !router_have_minimum_dir_info()) {
log_debug(LD_CIRC,"Haven't fetched enough directory info yet; canceling " log_debug(LD_CIRC,"Haven't fetched enough directory info yet; canceling "
@ -1653,8 +1654,17 @@ circuit_launch_by_extend_info(uint8_t purpose,
return NULL; return NULL;
} }
/* If Tor2webRendezvousPoints is enabled and we are dealing with an
RP circuit, we want a specific RP node so we shouldn't canibalize
an already existing circuit. */
if (get_options()->Tor2webRendezvousPoints &&
purpose == CIRCUIT_PURPOSE_C_ESTABLISH_REND) {
need_specific_rp = 1;
}
if ((extend_info || purpose != CIRCUIT_PURPOSE_C_GENERAL) && if ((extend_info || purpose != CIRCUIT_PURPOSE_C_GENERAL) &&
purpose != CIRCUIT_PURPOSE_TESTING && !onehop_tunnel) { purpose != CIRCUIT_PURPOSE_TESTING &&
!onehop_tunnel && !need_specific_rp) {
/* see if there are appropriate circs available to cannibalize. */ /* see if there are appropriate circs available to cannibalize. */
/* XXX if we're planning to add a hop, perhaps we want to look for /* XXX if we're planning to add a hop, perhaps we want to look for
* internal circs rather than exit circs? -RD */ * internal circs rather than exit circs? -RD */