diff options
| author | Nick Mathewson <nickm@torproject.org> | 2006-10-23 03:48:42 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2006-10-23 03:48:42 +0000 |
| commit | 42bab1c6d32dc023482bfe9adef365652dd65497 (patch) | |
| tree | faf207e77ba50391470b5f6d1bd65b5dee60f45c /src/or/policies.c | |
| parent | 833f8245c43e330eff9218352ad7e1506f23d83a (diff) | |
| download | tor-42bab1c6d32dc023482bfe9adef365652dd65497.tar tor-42bab1c6d32dc023482bfe9adef365652dd65497.tar.gz | |
r9318@Kushana: nickm | 2006-10-22 15:22:57 -0400
Let directory authorities set the BadExit flag if they like. Also, refactor directory authority code so we can believe multiple things about a single router, and do fewer linear searches.
svn:r8794
Diffstat (limited to 'src/or/policies.c')
| -rw-r--r-- | src/or/policies.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/or/policies.c b/src/or/policies.c index 699eaf6b0..3c3c17d1a 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -18,6 +18,7 @@ static addr_policy_t *socks_policy = NULL; static addr_policy_t *dir_policy = NULL; static addr_policy_t *authdir_reject_policy = NULL; static addr_policy_t *authdir_invalid_policy = NULL; +static addr_policy_t *authdir_badexit_policy = NULL; /** Parsed addr_policy_t describing which addresses we believe we can start * circuits at. */ @@ -203,6 +204,15 @@ authdir_policy_valid_address(uint32_t addr, uint16_t port) return addr_policy_permits_address(addr, port, authdir_invalid_policy); } +/** Return 1 if <b>addr</b>:<b>port</b> should be marked as a bad exit, + * based on <b>authdir_badexit_policy</b>. Else return 0. + */ +int +authdir_policy_badexit_address(uint32_t addr, uint16_t port) +{ + return ! addr_policy_permits_address(addr, port, authdir_badexit_policy); +} + #define REJECT(arg) \ do { *msg = tor_strdup(arg); goto err; } while (0) int @@ -271,6 +281,8 @@ policies_parse_from_options(or_options_t *options) &authdir_reject_policy, ADDR_POLICY_REJECT); load_policy_from_option(options->AuthDirInvalid, &authdir_invalid_policy, ADDR_POLICY_REJECT); + load_policy_from_option(options->AuthDirBadExit, + &authdir_badexit_policy, ADDR_POLICY_REJECT); parse_reachable_addresses(); } |