From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 4 Nov 2014 05:45:14 +0000 (-0500)
Subject: Use correct argument types for inet_pton.
X-Git-Tag: tor-0.2.6.2-alpha~114^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=254ab5a8deb9ed5fb571016f402ffd7243208d73;p=thirdparty%2Ftor.git

Use correct argument types for inet_pton.

(I blame whoever decided that using a void* for a union was a good
idea.)
---

diff --git a/src/common/util.c b/src/common/util.c
index c292c798cc..83002997ef 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -963,9 +963,9 @@ string_is_key_value(int severity, const char *string)
 int
 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
@@ -974,9 +974,9 @@ string_is_valid_ipv4_address(const char *string)
 int
 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