Use correct argument types for inet_pton.

(I blame whoever decided that using a void* for a union was a good
idea.)
This commit is contained in:
Nick Mathewson 2014-11-04 00:45:14 -05:00
parent 51e2473618
commit 254ab5a8de

View File

@ -963,9 +963,9 @@ string_is_key_value(int severity, const char *string)
int int
string_is_valid_ipv4_address(const char *string) string_is_valid_ipv4_address(const char *string)
{ {
struct sockaddr_in sockaddr; struct in_addr addr;
return (tor_inet_pton(AF_INET,string,&sockaddr) == 1); return (tor_inet_pton(AF_INET,string,&addr) == 1);
} }
/** Return true if <b>string</b> represents a valid IPv6 address in /** Return true if <b>string</b> represents a valid IPv6 address in
@ -974,9 +974,9 @@ string_is_valid_ipv4_address(const char *string)
int int
string_is_valid_ipv6_address(const char *string) string_is_valid_ipv6_address(const char *string)
{ {
struct sockaddr_in sockaddr_dummy; struct in6_addr addr;
return (tor_inet_pton(AF_INET6,string,&sockaddr_dummy) == 1); return (tor_inet_pton(AF_INET6,string,&addr) == 1);
} }
/** Return true iff <b>string</b> matches a pattern of DNS names /** Return true iff <b>string</b> matches a pattern of DNS names