Commit 19408cf8 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

reintroduce the logic to exit_policy_is_general_exit() to count

how many ports are allowd. require two ports open, not just one.


svn:r6609
parent cce8ae11
......@@ -603,11 +603,12 @@ policies_parse_exit_policy(config_line_t *cfg, addr_policy_t **dest,
/** Return true iff <b>ri</b> is "useful as an exit node", meaning
* it allows exit to at least one /8 address space for at least
* one of ports 80, 443, and 6667. */
* two of ports 80, 443, and 6667. */
int
exit_policy_is_general_exit(addr_policy_t *policy)
{
static const int ports[] = { 80, 443, 6667 };
int n_allowed = 0;
int i;
for (i = 0; i < 3; ++i) {
struct addr_policy_t *p = policy;
......@@ -620,10 +621,10 @@ exit_policy_is_general_exit(addr_policy_t *policy)
continue; /* 127.x */
/* We have a match that is at least a /8. */
if (p->policy_type == ADDR_POLICY_ACCEPT)
return 1;
++n_allowed;
}
}
return 0;
return n_allowed >= 2;
}
/** Release all storage held by <b>p</b> */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment