nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Drop redundant exit policy entries, not just identical ones.

Browse Source 
svn:r5987
This commit is contained in:
Nick Mathewson 2006-02-12 22:59:38 +00:00
parent ee63348abf
commit 98ec124c6a
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/or/config.c
View File

@ -355,6 +355,7 @@ static void config_register_addressmaps(or_options_t *options);
static int parse_dir_server_line(const char *line, int validate_only); static int parse_dir_server_line(const char *line, int validate_only);
static int config_cmp_single_addr_policy(addr_policy_t *a, addr_policy_t *b); static int config_cmp_single_addr_policy(addr_policy_t *a, addr_policy_t *b);
static int config_addr_policy_covers(addr_policy_t *a, addr_policy_t *b);
static int parse_redirect_line(smartlist_t *result, static int parse_redirect_line(smartlist_t *result,
config_line_t *line); config_line_t *line);
static int parse_log_severity_range(const char *range, int *min_out, static int parse_log_severity_range(const char *range, int *min_out,
@ -3071,12 +3072,12 @@ config_exit_policy_remove_redundancies(addr_policy_t **dest)
} }
} }
/* Step two: for every entry, see if there's an exact duplicate /* Step two: for every entry, see if there's a redundant entry
* later on, and remove it. */ * later on, and remove it. */
for (ap=*dest; ap; ap=ap->next) { for (ap=*dest; ap; ap=ap->next) {
tmp=ap; tmp=ap;
while (tmp) { while (tmp) {
if (tmp->next && !config_cmp_single_addr_policy(ap, tmp->next)) { if (tmp->next && config_addr_policy_covers(ap, tmp->next)) {
victim = tmp->next; victim = tmp->next;
tmp->next = victim->next; tmp->next = victim->next;
victim->next = NULL; victim->next = NULL;
@ -3181,6 +3182,21 @@ config_cmp_single_addr_policy(addr_policy_t *a, addr_policy_t *b)
return 0; return 0;
} }
/** Return true iff the address policy <b>a</b> covers every case that would be
* covered by <b>b</b>, so that a,b is redundant. */
static int
config_addr_policy_covers(addr_policy_t *a, addr_policy_t *b)
{
/* We can ignore accept/reject, since "accept *:80, reject *:80" reduces to
* "accept *:80". */
if (a->msk & ~b->msk)
return 0; /* There's a wildcard bit in b->msk that's not a wildcard in a. */
if ((a->addr & a->msk) != (b->addr & a->msk))
return 0; /* There's a fixed bit in a that's set differently in b. */
return (a->prt_min <= b->prt_min && a->prt_max >= b->prt_max);
}
/** Like config_cmp_single_addr_policy() above, but looks at the /** Like config_cmp_single_addr_policy() above, but looks at the
* whole set of policies in each case. */ * whole set of policies in each case. */
int int