diff options
| author | David Goulet <dgoulet@torproject.org> | 2020-07-13 14:07:37 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2020-07-14 10:36:08 -0400 |
| commit | 15860c8846a8ebbdecd51e920f983afc49c30c8f (patch) | |
| tree | 882c2f2435720e358a2ea08ca1aafc99fe5f0966 /src/core/or/policies.h | |
| parent | 8ebbf629404a97b6110c1916d554009dc8f42c5a (diff) | |
| download | tor-15860c8846a8ebbdecd51e920f983afc49c30c8f.tar.gz tor-15860c8846a8ebbdecd51e920f983afc49c30c8f.zip | |
addr: Use tor_addr_t instead of uint32_t for IPv4
This changes a LOT of code but in the end, behavior is the same.
Unfortunately, many functions had to be changed to accomodate but in majority
of cases, to become simpler.
Functions are also removed specifically those that were there to convert an
IPv4 as a host format to a tor_addr_t. Those are not needed anymore.
The IPv4 address field has been standardized to "ipv4_addr", the ORPort to
"ipv4_orport" (currently IPv6 uses ipv6_orport) and DirPort to "ipv4_dirport".
This is related to Sponsor 55 work that adds IPv6 support for relays and this
work is needed in order to have a common interface between IPv4 and IPv6.
Closes #40043.
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/core/or/policies.h')
| -rw-r--r-- | src/core/or/policies.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/or/policies.h b/src/core/or/policies.h index 72a37d62b0..1ac6f87dcf 100644 --- a/src/core/or/policies.h +++ b/src/core/or/policies.h @@ -102,9 +102,9 @@ void fascist_firewall_choose_address_dir_server(const dir_server_t *ds, int dir_policy_permits_address(const tor_addr_t *addr); int socks_policy_permits_address(const tor_addr_t *addr); -int authdir_policy_permits_address(uint32_t addr, uint16_t port); -int authdir_policy_valid_address(uint32_t addr, uint16_t port); -int authdir_policy_badexit_address(uint32_t addr, uint16_t port); +int authdir_policy_permits_address(const tor_addr_t *addr, uint16_t port); +int authdir_policy_valid_address(const tor_addr_t *addr, uint16_t port); +int authdir_policy_badexit_address(const tor_addr_t *addr, uint16_t port); int validate_addr_policies(const or_options_t *options, char **msg); void policy_expand_private(smartlist_t **policy); @@ -120,7 +120,7 @@ addr_policy_result_t compare_tor_addr_to_node_policy(const tor_addr_t *addr, int policies_parse_exit_policy_from_options( const or_options_t *or_options, - uint32_t local_address, + const tor_addr_t *ipv4_local_address, const tor_addr_t *ipv6_local_address, smartlist_t **result); struct config_line_t; |