aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2006-02-11 23:47:24 +0000
committerRoger Dingledine <arma@torproject.org>2006-02-11 23:47:24 +0000
commit6c093a17a9b73c3bbcf2c53c4bcc4e06c56dcef8 (patch)
tree4bdd83735b9b971c78822580312fe4826ccc7695 /src/or
parentfdf18fbbdb177f826a0d9f84b388223ad8dac4bd (diff)
downloadtor-6c093a17a9b73c3bbcf2c53c4bcc4e06c56dcef8.tar
tor-6c093a17a9b73c3bbcf2c53c4bcc4e06c56dcef8.tar.gz
bugfix in config_cmp_addr_policies() -- we were treating a pair
of exit policies if they were equal even if one said accept and the other said reject. svn:r5970
Diffstat (limited to 'src/or')
-rw-r--r--src/or/config.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index d97d8c4b7..a62ce5f1f 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3111,6 +3111,8 @@ config_cmp_addr_policies(addr_policy_t *a, addr_policy_t *b)
{
int r;
while (a && b) {
+ if ((r=((int)a->policy_type - (int)b->policy_type)))
+ return r;
if ((r=((int)a->addr - (int)b->addr)))
return r;
if ((r=((int)a->msk - (int)b->msk)))