diff options
author | Nick Mathewson <nickm@torproject.org> | 2011-07-15 12:31:09 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2011-07-15 12:31:09 -0400 |
commit | 3380dc9cc0a8cdaae0dbd3e8b7c11e4ccdab504d (patch) | |
tree | 7753260d960277ee842e6fc731f5bc581feddff3 /src/or | |
parent | 44cfa538731079ffd6eb5f80b2e3c19c4f8acf03 (diff) | |
download | tor-3380dc9cc0a8cdaae0dbd3e8b7c11e4ccdab504d.tar tor-3380dc9cc0a8cdaae0dbd3e8b7c11e4ccdab504d.tar.gz |
Remove compare_addr_to_addr_policy
Nothing used it but the unit tests; everything else knows to use
compare_tor_addr_to_addr_policy instead.
Diffstat (limited to 'src/or')
-rw-r--r-- | src/or/policies.c | 12 | ||||
-rw-r--r-- | src/or/policies.h | 2 |
2 files changed, 0 insertions, 14 deletions
diff --git a/src/or/policies.c b/src/or/policies.c index f80808dd6..5bd13b501 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -570,18 +570,6 @@ addr_policy_get_canonical_entry(addr_policy_t *e) return found->policy; } -/** As compare_tor_addr_to_addr_policy, but instead of a tor_addr_t, takes - * in host order. */ -addr_policy_result_t -compare_addr_to_addr_policy(uint32_t addr, uint16_t port, - const smartlist_t *policy) -{ - /*XXXX deprecate this function when possible. */ - tor_addr_t a; - tor_addr_from_ipv4h(&a, addr); - return compare_tor_addr_to_addr_policy(&a, port, policy); -} - /** Helper for compare_tor_addr_to_addr_policy. Implements the case where * addr and port are both known. */ static addr_policy_result_t diff --git a/src/or/policies.h b/src/or/policies.h index 6f3624aba..9859b008c 100644 --- a/src/or/policies.h +++ b/src/or/policies.h @@ -37,8 +37,6 @@ addr_policy_t *addr_policy_get_canonical_entry(addr_policy_t *ent); int cmp_addr_policies(smartlist_t *a, smartlist_t *b); 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_addr_to_addr_policy(uint32_t addr, - uint16_t port, const smartlist_t *policy); addr_policy_result_t compare_addr_to_node_policy(uint32_t addr, uint16_t port, const node_t *node); |