summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/or/config.c b/src/or/config.c
index a4c53d4ca0..7b76288306 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1729,9 +1729,10 @@ is_local_IP(uint32_t ip)
{
if (is_internal_IP(ip, 0))
return 1;
- /* Check whether ip is on the same /24 as we are.
- *
- * It's possible that this next check will hit before the first time
+ /* Check whether ip is on the same /24 as we are. */
+ if (get_options()->EnforceDistinctSubnets == 0)
+ return 0;
+ /* It's possible that this next check will hit before the first time
* resolve_my_address actually succeeds. (For clients, it is likely that
* resolve_my_address will never be called at all). In those cases,
* last_resolved_addr will be 0, and so checking to see whether ip is on the