mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 14:51:11 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'maint-0.2.3'

Browse source
This commit is contained in:
Roger Dingledine 2012-10-23 17:26:07 -04:00
commit 4c06a804d9
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
changes/bug7190 Normal file
View file

@ -0,0 +1,6 @@
o Minor bugfixes:
- Clients now consider the ClientRejectInternalAddresses config option
when using a microdescriptor consensus stanza to decide whether
an exit relay would allow exiting to an internal address. Fixes
bug 7190; bugfix on 0.2.3.1-alpha.

5
src/or/policies.c
View file

@ -1461,15 +1461,14 @@ compare_tor_addr_to_short_policy(const tor_addr_t *addr, uint16_t port,
int i; int i;
int found_match = 0; int found_match = 0;
int accept; int accept;
(void)addr;
tor_assert(port != 0); tor_assert(port != 0);
if (addr && tor_addr_is_null(addr)) if (addr && tor_addr_is_null(addr))
addr = NULL; /* Unspec means 'no address at all,' in this context. */ addr = NULL; /* Unspec means 'no address at all,' in this context. */
if (addr && (tor_addr_is_internal(addr, 0) || if (addr && get_options()->ClientRejectInternalAddresses &&
tor_addr_is_loopback(addr))) (tor_addr_is_internal(addr, 0) || tor_addr_is_loopback(addr)))
return ADDR_POLICY_REJECTED; return ADDR_POLICY_REJECTED;
for (i=0; i < policy->n_entries; ++i) { for (i=0; i < policy->n_entries; ++i) {