Commit 3380dc9c authored by Nick Mathewson's avatar Nick Mathewson 🐘
Browse files

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.
parent 44cfa538

src/or/policies.c

+0 −12
Changes for src/or/policies.c: 0 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -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

src/or/policies.h

+0 −2
Changes for src/or/policies.h: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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);

src/test/test.c

+6 −3
Changes for src/test/test.c: 6 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -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);