summaryrefslogtreecommitdiff
path: root/src/or/router.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-10-31 15:05:56 -0400
committerNick Mathewson <nickm@torproject.org>2016-10-31 15:05:56 -0400
commitd73c671d6d9a60d9318814b7f95ede320e5d58b2 (patch)
tree02d7d57df2312221259e4fd0da3044a050496361 /src/or/router.c
parentbecc95783979cf1879e6390aad80781d0ce3ea66 (diff)
downloadtor-d73c671d6d9a60d9318814b7f95ede320e5d58b2.tar.gz
tor-d73c671d6d9a60d9318814b7f95ede320e5d58b2.zip
policy_is_reject_star():
ome policies are default-reject, some default-accept. But policy_is_reject_star() assumed they were all default_reject. Fix that! Also, document that policy_is_reject_star() treats a NULL policy as empty. This allows us to simplify the checks in parse_reachable_addresses() by quite a bit. Fxes bug 20306; bugfix on 0.2.8.2-alpha.
Diffstat (limited to 'src/or/router.c')
-rw-r--r--src/or/router.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/router.c b/src/or/router.c
index 10498e8ae1..b968072612 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -2158,8 +2158,8 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e)
&ri->exit_policy);
}
ri->policy_is_reject_star =
- policy_is_reject_star(ri->exit_policy, AF_INET) &&
- policy_is_reject_star(ri->exit_policy, AF_INET6);
+ policy_is_reject_star(ri->exit_policy, AF_INET, 1) &&
+ policy_is_reject_star(ri->exit_policy, AF_INET6, 1);
if (options->IPv6Exit) {
char *p_tmp = policy_summarize(ri->exit_policy, AF_INET6);