diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-07-24 13:44:04 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-07-24 13:44:04 +0000 |
| commit | 3ce6e2fba290eb5d3a4d0a3ca2f61658245b52b6 (patch) | |
| tree | 08c562380df129cb4c8c896eecba0f3d8013d262 /src/common/util.h | |
| parent | ed781e69716248111ef1a2ddc1b9add671bd8d16 (diff) | |
| download | tor-3ce6e2fba290eb5d3a4d0a3ca2f61658245b52b6.tar.gz tor-3ce6e2fba290eb5d3a4d0a3ca2f61658245b52b6.zip | |
r17346@aud-055: nickm | 2008-07-24 15:37:19 +0200
Make generic address manipulation functions work better. Switch address policy code to use tor_addr_t, so it can handle IPv6. That is a good place to start.
svn:r16178
Diffstat (limited to 'src/common/util.h')
| -rw-r--r-- | src/common/util.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/common/util.h b/src/common/util.h index f6d547cd29..c2e1604cbe 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -276,23 +276,27 @@ int parse_addr_and_port_range(const char *s, uint32_t *addr_out, int addr_mask_get_bits(uint32_t mask); int addr_mask_cmp_bits(uint32_t a1, uint32_t a2, maskbits_t bits); int tor_inet_ntoa(const struct in_addr *in, char *buf, size_t buf_len); -char *tor_dup_addr(uint32_t addr) ATTR_MALLOC; +char *tor_dup_addr(const tor_addr_t *addr) ATTR_MALLOC; +char *tor_dup_ip(uint32_t addr) ATTR_MALLOC; int get_interface_address(int severity, uint32_t *addr); int get_interface_address6(int severity, sa_family_t family, tor_addr_t *addr); int tor_addr_compare(const tor_addr_t *addr1, const tor_addr_t *addr2); int tor_addr_compare_masked(const tor_addr_t *addr1, const tor_addr_t *addr2, maskbits_t mask); +unsigned int tor_addr_hash(const tor_addr_t *addr); int tor_addr_is_v4(const tor_addr_t *addr); int tor_addr_is_internal(const tor_addr_t *ip, int for_listening) ATTR_PURE; int tor_addr_parse_mask_ports(const char *s, tor_addr_t *addr_out, maskbits_t *mask_out, uint16_t *port_min_out, uint16_t *port_max_out); -const char * tor_addr_to_str(char *dest, const tor_addr_t *addr, int len); +const char * tor_addr_to_str(char *dest, const tor_addr_t *addr, int len, + int decorate); int tor_addr_from_str(tor_addr_t *addr, const char *src); void tor_addr_copy(tor_addr_t *dest, const tor_addr_t *src); -void tor_addr_from_ipv4(tor_addr_t *dest, uint32_t v4addr); +void tor_addr_from_ipv4h(tor_addr_t *dest, uint32_t v4addr); int tor_addr_is_null(const tor_addr_t *addr); +int tor_addr_is_loopback(const tor_addr_t *addr); /* Process helpers */ void start_daemon(void); |