diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-11-15 14:45:15 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-11-15 14:45:15 -0500 |
| commit | ca0c71551e519a1d27cec5db9c9e6722a382d19d (patch) | |
| tree | 710e1a961319a806b39eaf48d21b7a78b493c489 /src/common/address.h | |
| parent | 2cb82c33bcb59ce65c9738ff8ff4977f39fa3d9f (diff) | |
| parent | 1e46952f36c5fb83d0f3e60e90951bb9e8ea8d77 (diff) | |
| download | tor-ca0c71551e519a1d27cec5db9c9e6722a382d19d.tar.gz tor-ca0c71551e519a1d27cec5db9c9e6722a382d19d.zip | |
Merge branch 'ipv6_exits'
Diffstat (limited to 'src/common/address.h')
| -rw-r--r-- | src/common/address.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/common/address.h b/src/common/address.h index 067b7a0ca6..9c0df6c24f 100644 --- a/src/common/address.h +++ b/src/common/address.h @@ -55,6 +55,7 @@ socklen_t tor_addr_to_sockaddr(const tor_addr_t *a, uint16_t port, int tor_addr_from_sockaddr(tor_addr_t *a, const struct sockaddr *sa, uint16_t *port_out); void tor_addr_make_unspec(tor_addr_t *a); +void tor_addr_make_null(tor_addr_t *a, sa_family_t family); char *tor_sockaddr_to_str(const struct sockaddr *sa); /** Return an in6_addr* equivalent to <b>a</b>, or NULL if <b>a</b> is not @@ -183,7 +184,8 @@ int tor_addr_parse_PTR_name(tor_addr_t *result, const char *address, int tor_addr_port_lookup(const char *s, tor_addr_t *addr_out, uint16_t *port_out); -int tor_addr_parse_mask_ports(const char *s, +#define TAPMP_EXTENDED_STAR 1 +int tor_addr_parse_mask_ports(const char *s, unsigned flags, 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, size_t len, |