aboutsummaryrefslogtreecommitdiff
path: root/src/or/policies.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-10-31 13:10:17 -0400
committerNick Mathewson <nickm@torproject.org>2017-10-31 13:25:41 -0400
commit6e2f8de62d8e4ba440ae37e091651f075a0bf665 (patch)
treec91f9deec49872d2c63406503789b09143454e4a /src/or/policies.c
parent8126ffecb6546efd03ed3806fba41310498b1a63 (diff)
downloadtor-6e2f8de62d8e4ba440ae37e091651f075a0bf665.tar.gz
tor-6e2f8de62d8e4ba440ae37e091651f075a0bf665.zip
Fix: when BridgeRelay is set, you do not get any exit policy.
Diffstat (limited to 'src/or/policies.c')
-rw-r--r--src/or/policies.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/or/policies.c b/src/or/policies.c
index 3ff2b4aa3b..0dfbd92097 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -2118,12 +2118,11 @@ policies_parse_exit_policy_from_options(const or_options_t *or_options,
parser_cfg |= EXIT_POLICY_REJECT_PRIVATE;
}
- if (!or_options->BridgeRelay && !or_options->ReducedExitPolicy) {
- parser_cfg |= EXIT_POLICY_ADD_DEFAULT;
- }
-
- if (or_options->ReducedExitPolicy) {
- parser_cfg |= EXIT_POLICY_ADD_REDUCED;
+ if (!or_options->BridgeRelay) {
+ if (or_options->ReducedExitPolicy)
+ parser_cfg |= EXIT_POLICY_ADD_REDUCED;
+ else
+ parser_cfg |= EXIT_POLICY_ADD_DEFAULT;
}
if (or_options->ExitPolicyRejectLocalInterfaces) {