diff options
| author | teor (Tim Wilson-Brown) <teor2345@gmail.com> | 2015-11-16 20:40:17 +1100 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-11-20 10:48:19 -0500 |
| commit | 10a6390deb3c9ff9fbd8078fc812abf6c77ad67f (patch) | |
| tree | 91a338ddd92bbe9a8fe90643e928499e6a20ce29 /src/or/policies.h | |
| parent | 6913bdfcc568e880873e92331a3182536c3e653e (diff) | |
| download | tor-10a6390deb3c9ff9fbd8078fc812abf6c77ad67f.tar.gz tor-10a6390deb3c9ff9fbd8078fc812abf6c77ad67f.zip | |
Add controller getinfo exit-policy/reject-private
exit-policy/reject-private lists the reject rules added by
ExitPolicyRejectPrivate. This makes it easier for stem to
display exit policies.
Add unit tests for getinfo exit-policy/*.
Completes ticket #17183. Patch by "teor".
Diffstat (limited to 'src/or/policies.h')
| -rw-r--r-- | src/or/policies.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/or/policies.h b/src/or/policies.h index d7cc5a30ba..72e62c7de0 100644 --- a/src/or/policies.h +++ b/src/or/policies.h @@ -44,7 +44,6 @@ addr_policy_t *addr_policy_get_canonical_entry(addr_policy_t *ent); int cmp_addr_policies(smartlist_t *a, smartlist_t *b); MOCK_DECL(addr_policy_result_t, compare_tor_addr_to_addr_policy, (const tor_addr_t *addr, uint16_t port, const smartlist_t *policy)); - addr_policy_result_t compare_tor_addr_to_node_policy(const tor_addr_t *addr, uint16_t port, const node_t *node); @@ -55,17 +54,11 @@ int policies_parse_exit_policy_from_options( smartlist_t **result); int policies_parse_exit_policy(config_line_t *cfg, smartlist_t **dest, exit_policy_parser_cfg_t options, - uint32_t local_address, - const tor_addr_t *ipv6_local_address, - const tor_addr_t *ipv4_outbound_address, - const tor_addr_t *ipv6_outbound_address); + const smartlist_t *configured_addresses); void policies_parse_exit_policy_reject_private( smartlist_t **dest, int ipv6_exit, - uint32_t local_address, - const tor_addr_t *ipv6_local_address, - const tor_addr_t *ipv4_outbound_address, - const tor_addr_t *ipv6_outbound_address, + const smartlist_t *configured_addresses, int reject_interface_addresses, int reject_configured_port_addresses); void policies_exit_policy_append_reject_star(smartlist_t **dest); @@ -99,5 +92,9 @@ addr_policy_result_t compare_tor_addr_to_short_policy( const tor_addr_t *addr, uint16_t port, const short_policy_t *policy); +#ifdef POLICIES_PRIVATE +void append_exit_policy_string(smartlist_t **policy, const char *more); +#endif + #endif |