aboutsummaryrefslogtreecommitdiff
path: root/src/or/directory.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2005-03-19 06:57:16 +0000
committerNick Mathewson <nickm@torproject.org>2005-03-19 06:57:16 +0000
commitb88c4ba11c4d889b0071c39b3d383e897610f9ab (patch)
tree8a66259a3f6c3ef17ad2bfce484957a261a9eecd /src/or/directory.c
parent07a7b6af64483e6d2f863159122b10fd9393601a (diff)
downloadtor-b88c4ba11c4d889b0071c39b3d383e897610f9ab.tar
tor-b88c4ba11c4d889b0071c39b3d383e897610f9ab.tar.gz
Turn addr_policy_compare from a tristate to a quadstate; this should help address our "Ah, you allow 1.2.3.4:80. You are a good choice for google.com" problem.
svn:r3786
Diffstat (limited to 'src/or/directory.c')
-rw-r--r--src/or/directory.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/or/directory.c b/src/or/directory.c
index fd9fc6371..2b5c84b15 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -100,11 +100,10 @@ int dir_policy_permits_address(uint32_t addr)
if (!dir_policy) /* 'no dir policy' means 'accept' */
return 1;
a = router_compare_addr_to_addr_policy(addr, 1, dir_policy);
- if (a==-1)
+ if (a==ADDR_POLICY_REJECTED)
return 0;
- else if (a==0)
+ else if (a==ADDR_POLICY_ACCEPTED)
return 1;
- tor_assert(a==1);
log_fn(LOG_WARN, "Bug: got unexpected 'maybe' answer from dir policy");
return 0;
}