From: Daniel P. Berrange <berrange@redhat.com>
Date: Fri, 28 Jun 2013 11:43:39 +0000 (+0100)
Subject: Replace use of 'in_addr_t' with 'struct in_addr'
X-Git-Tag: CVE-2013-2218~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a3eaa80a48d2a9350c515375047c7a6ff60985e;p=thirdparty%2Flibvirt.git

Replace use of 'in_addr_t' with 'struct in_addr'

The 'in_addr_t' typedef is not present in Mingw64 headers.
Instead we can use the more portable 'struct in_addr' and
then access its 's_addr' field.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c
index 2666574419..80b5c0bcd5 100644
--- a/src/util/virsocketaddr.c
+++ b/src/util/virsocketaddr.c
@@ -235,10 +235,10 @@ virSocketAddrIsPrivate(const virSocketAddrPtr addr)
 bool
 virSocketAddrIsWildcard(const virSocketAddrPtr addr)
 {
-    in_addr_t tmp = INADDR_ANY;
+    struct in_addr tmp = { .s_addr = INADDR_ANY };
     switch (addr->data.stor.ss_family) {
     case AF_INET:
-        return memcmp(&addr->data.inet4.sin_addr.s_addr, &tmp,
+        return memcmp(&addr->data.inet4.sin_addr.s_addr, &tmp.s_addr,
                       sizeof(addr->data.inet4.sin_addr.s_addr)) == 0;
     case AF_INET6:
         return IN6_IS_ADDR_UNSPECIFIED(&addr->data.inet6.sin6_addr);