From 246fecb585cef56af5a0c4bf08365d2d040c3c73 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Tue, 3 Oct 2006 05:45:58 +0000 Subject: the other half of the is_local_IP patch svn:r8581 --- src/or/config.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/or/config.c') 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 -- cgit v1.2.3-54-g00ecf