commit 2ecee3fce2179c6fe9f9c748522e417b887ee021 Author: Roger Dingledine arma@torproject.org Date: Mon Oct 22 15:45:39 2012 -0400

Let 0.2.3 clients exit to internal addresses if they want

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. --- changes/bug7190 | 6 ++++++ src/or/policies.c | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/changes/bug7190 b/changes/bug7190 new file mode 100644 index 0000000..1607f79 --- /dev/null +++ b/changes/bug7190 @@ -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. + diff --git a/src/or/policies.c b/src/or/policies.c index bbd6816..81e4809 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -1462,15 +1462,14 @@ compare_tor_addr_to_short_policy(const tor_addr_t *addr, uint16_t port, int i; int found_match = 0; int accept; - (void)addr;

tor_assert(port != 0);

if (addr && tor_addr_is_null(addr)) addr = NULL; /* Unspec means 'no address at all,' in this context. */

- if (addr && (tor_addr_is_internal(addr, 0) || - tor_addr_is_loopback(addr))) + if (addr && get_options()->ClientRejectInternalAddresses && + (tor_addr_is_internal(addr, 0) || tor_addr_is_loopback(addr))) return ADDR_POLICY_REJECTED;

for (i=0; i < policy->n_entries; ++i) {