diff options
author | Nick Mathewson <nickm@torproject.org> | 2014-11-04 00:48:25 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2014-11-04 00:48:25 -0500 |
commit | 60c86a3b79d542543f191a78f5c7ea2c77c0d3f0 (patch) | |
tree | f24602f15430925d2449054d2f5fae025936d41c /src/common/util.h | |
parent | 593909ea70db9c00d3ae6d3448fb096464e0853d (diff) | |
parent | 74cbd8d55953969c15c60f025889b1e07a185a79 (diff) | |
download | tor-60c86a3b79d542543f191a78f5c7ea2c77c0d3f0.tar.gz tor-60c86a3b79d542543f191a78f5c7ea2c77c0d3f0.zip |
Merge branch 'bug13315_squashed'
Conflicts:
src/or/buffers.c
Diffstat (limited to 'src/common/util.h')
-rw-r--r-- | src/common/util.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/common/util.h b/src/common/util.h index d7feb6e925..9886b2db6a 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -227,6 +227,9 @@ const char *find_str_at_start_of_line(const char *haystack, const char *needle); int string_is_C_identifier(const char *string); int string_is_key_value(int severity, const char *string); +int string_is_valid_hostname(const char *string); +int string_is_valid_ipv4_address(const char *string); +int string_is_valid_ipv6_address(const char *string); int tor_mem_is_zero(const char *mem, size_t len); int tor_digest_is_zero(const char *digest); |