diff options
| author | Roger Dingledine <arma@torproject.org> | 2012-10-23 17:26:07 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2012-10-23 17:26:07 -0400 |
| commit | 4c06a804d946de238e2d6a0b1a7dd655b0d82ccc (patch) | |
| tree | c1226efd3cf7a20dada89aa76f57b8f5fee4d4d5 /src/or | |
| parent | 0712d606c6c3111f939d07f48c9c361dd116f553 (diff) | |
| parent | 2ecee3fce2179c6fe9f9c748522e417b887ee021 (diff) | |
| download | tor-4c06a804d946de238e2d6a0b1a7dd655b0d82ccc.tar tor-4c06a804d946de238e2d6a0b1a7dd655b0d82ccc.tar.gz | |
Merge branch 'maint-0.2.3'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/policies.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/or/policies.c b/src/or/policies.c index 5c023447e..8485a7b13 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -1461,15 +1461,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) { |