From 2a4555fedd80ad64ee71169cf9922f1f2cb53887 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 13 Feb 2006 07:16:32 +0000 Subject: Style on config_addr_policy_intersectes, which looks ok to me. svn:r5998 --- src/or/config.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/or/config.c b/src/or/config.c index 77836c2a4a..37d99f754c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3237,19 +3237,17 @@ config_addr_policy_covers(addr_policy_t *a, addr_policy_t *b) /** Return true iff the address policies a and b intersect, that * is, there exists an address/port that is covered by a that is also * covered by b. - * - * XXX: somebody needs to doublecheck the IP logic. -- PP - * */ + */ static int config_addr_policy_intersects(addr_policy_t *a, addr_policy_t *b) { /* All the bits we care about are those that are set in both * netmasks. If they are equal in a and b's networkaddresses * then the networks intersect. If there is a difference, - * then they do not' */ - if (!( ((a->addr ^ b->addr) & a->msk & b->msk) == 0 )) + * then they do not. */ + if (((a->addr ^ b->addr) & a->msk & b->msk) != 0) return 0; - if (a->prt_max < b->prt_min || b->prt_max < a->prt_min) + if (a->prt_max < b->prt_min || b->prt_max < a->prt_min) return 0; return 1; } -- cgit v1.2.3-54-g00ecf