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.

diff --git a/src/or/policies.c b/src/or/policies.c
index f80808dd6229d8e3cc64b9e017144de7f98f1ec3..5bd13b5014cd07e6f960ad233a39b296d158113c 100644 (file)
--- 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 6f3624aba11086db0d6d38f19142faba4712f253..9859b008cff8ccb8966264146b045b7212d8b320 100644 (file)
--- 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);

diff --git a/src/test/test.c b/src/test/test.c
index 74ada0ea81181637736482fbafdca130ea03c706..05f5922a5bada33020295555add3825a4df4e87f 100644 (file)
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -998,12 +998,15 @@ test_policies(void)
 
   smartlist_add(policy, p);
 
+  tor_addr_from_ipv4h(&tar, 0x01020304u);
   test_assert(ADDR_POLICY_ACCEPTED ==
-          compare_addr_to_addr_policy(0x01020304u, 2, policy));
+          compare_tor_addr_to_addr_policy(&tar, 2, policy));
+  tor_addr_make_unspec(&tar);
   test_assert(ADDR_POLICY_PROBABLY_ACCEPTED ==
-          compare_addr_to_addr_policy(0, 2, policy));
+          compare_tor_addr_to_addr_policy(&tar, 2, policy));
+  tor_addr_from_ipv4h(&tar, 0xc0a80102);
   test_assert(ADDR_POLICY_REJECTED ==
-          compare_addr_to_addr_policy(0xc0a80102, 2, policy));
+          compare_tor_addr_to_addr_policy(&tar, 2, policy));
 
   test_assert(0 == policies_parse_exit_policy(NULL, &policy2, 1, NULL, 1));
   test_assert(policy2);