torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

resolve too-long-lines

Browse Source 
svn:r6001
This commit is contained in:
Roger Dingledine
2006-02-13 08:22:57 +00:00
parent 6ce36ead42
commit 7d80921afa
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/config.c
+11 -6
View File
@@ -318,8 +318,9 @@ typedef struct {
config_var_t *vars;
validate_fn_t validate_fn;
config_var_description_t *descriptions;
config_var_t *extra; /**< If present, a LINELIST variable for unrecognized
* lines. Otherwise, unrecognized lines are an error. */
/** If present, extra is a LINELIST variable for unrecognized
* lines. Otherwise, unrecognized lines are an error. */
config_var_t *extra;
} config_format_t;
#define CHECK(fmt, cfg) do { \
@@ -3227,10 +3228,14 @@ 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. */
if (a->msk & ~b->msk) {
/* There's a wildcard bit in b->msk that's not a wildcard in a. */
return 0;
}
if ((a->addr & a->msk) != (b->addr & a->msk)) {
/* There's a fixed bit in a that's set differently in b. */
return 0;
}
return (a->prt_min <= b->prt_min && a->prt_max >= b->prt_max);
}