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

Additional paranoia: do not even build tor2web stuff if not using.

Browse Source 
(That is, don't build it unless we're building for tor2web, or we
are building for tests.)
This commit is contained in:
Nick Mathewson 2015-02-11 14:54:16 -05:00
parent d9968dd0ab
commit 0899f51bc6
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/or/circuitbuild.c
View File

@ -1735,6 +1735,7 @@ choose_good_exit_server_general(int need_uptime, int need_capacity)
return NULL; return NULL;
} }
#if defined(ENABLE_TOR2WEB_MODE) || defined(TOR_UNIT_TESTS)
/* The config option Tor2webRendezvousPoints has been set and we need /* The config option Tor2webRendezvousPoints has been set and we need
* to pick an RP out of that set. Make sure that the RP we choose is * to pick an RP out of that set. Make sure that the RP we choose is
* alive, and return it. Return NULL if no usable RP could be found in * alive, and return it. Return NULL if no usable RP could be found in
@ -1786,6 +1787,7 @@ pick_tor2web_rendezvous_node(router_crn_flags_t flags,
return rp_node; return rp_node;
} }
#endif
/* Pick a Rendezvous Point for our HS circuits according to <b>flags</b>. */ /* Pick a Rendezvous Point for our HS circuits according to <b>flags</b>. */
static const node_t * static const node_t *
@ -1796,6 +1798,7 @@ pick_rendezvous_node(router_crn_flags_t flags)
if (options->AllowInvalid_ & ALLOW_INVALID_RENDEZVOUS) if (options->AllowInvalid_ & ALLOW_INVALID_RENDEZVOUS)
flags |= CRN_ALLOW_INVALID; flags |= CRN_ALLOW_INVALID;
#ifdef ENABLE_TOR2WEB_MODE
/* The user wants us to pick specific RPs. */ /* The user wants us to pick specific RPs. */
if (options->Tor2webRendezvousPoints) { if (options->Tor2webRendezvousPoints) {
const node_t *tor2web_rp = pick_tor2web_rendezvous_node(flags, options); const node_t *tor2web_rp = pick_tor2web_rendezvous_node(flags, options);
@ -1804,6 +1807,7 @@ pick_rendezvous_node(router_crn_flags_t flags)
} }
/* Else, if no tor2web RP was found, fall back to choosing a random node */ /* Else, if no tor2web RP was found, fall back to choosing a random node */
} }
#endif
return router_choose_random_node(NULL, options->ExcludeNodes, flags); return router_choose_random_node(NULL, options->ExcludeNodes, flags);
} }