diff options
| author | Peter Palfrader <peter@palfrader.org> | 2006-02-01 02:52:55 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2006-02-01 02:52:55 +0000 |
| commit | bf514e5dc5955811cbfd02df2312063f5654ce15 (patch) | |
| tree | 90b886061ece611a233f7ad34e0505fa21b4060b /src | |
| parent | 61ea27620a075c5218579357fa1e566e02f49288 (diff) | |
| download | tor-bf514e5dc5955811cbfd02df2312063f5654ce15.tar.gz tor-bf514e5dc5955811cbfd02df2312063f5654ce15.zip | |
Try to fix policy_includes_addr_mask_implicitly()
svn:r5886
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/routerlist.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 902bb93dc6..575301e70b 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2494,7 +2494,8 @@ policy_includes_addr_mask_implicitly(addr_policy_t *policy, uint32_t p_addr = policy->addr & policy->msk; if (p_addr == (addr & policy->msk) && p_addr == (addr2 & policy->msk) && - (policy->prt_min <= 1 && policy->prt_max == 65535)) { + (policy->prt_min <= 1 && policy->prt_max == 65535) && + policy->policy_type == ADDR_POLICY_REJECT) { return 0; } /* Does this policy cover some of the address range we're looking at? */ @@ -2538,7 +2539,7 @@ exit_policy_implicitly_allows_local_networks(addr_policy_t *policy, }; for (i=0; private_networks[i].mask; ++i) { p = NULL; - /* log_fn(LOG_INFO,"Checking network %s", private_networks[i].network); */ + /* info(LD_CONFIG,"Checking network %s", private_networks[i].network); */ if (policy_includes_addr_mask_implicitly( policy, private_networks[i].addr, private_networks[i].mask, &p)) { if (should_warn) |