From: Russell Bryant <russell@russellbryant.com>
Date: Mon, 18 Oct 2010 19:50:04 +0000 (+0000)
Subject: Resolve some compiler errors in ast_sockaddr_is_any().
X-Git-Tag: 1.8.0-rc5~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f10b21bd2494029dd89044300fb8388749faa54d;p=thirdparty%2Fasterisk.git

Resolve some compiler errors in ast_sockaddr_is_any().

These errors came up once this function was used from within netsock2.c.
The errors were like the following:

netsock2.c:393: error: dereferencing pointer ‘({anonymous})’ does break strict-aliasing rules

The usage of a union here avoids this problem.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@292188 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/netsock2.c b/main/netsock2.c
index 80dc355eee..e575bcfa23 100644
--- a/main/netsock2.c
+++ b/main/netsock2.c
@@ -389,11 +389,16 @@ int ast_sockaddr_is_ipv6(const struct ast_sockaddr *addr)
 
 int ast_sockaddr_is_any(const struct ast_sockaddr *addr)
 {
-	return (ast_sockaddr_is_ipv4(addr) &&
-		((const struct sockaddr_in *)&addr->ss)->sin_addr.s_addr ==
-		INADDR_ANY) ||
-	    (ast_sockaddr_is_ipv6(addr) &&
-	     IN6_IS_ADDR_UNSPECIFIED(&((const struct sockaddr_in6 *)&addr->ss)->sin6_addr));
+	union {
+		struct sockaddr_storage ss;
+		struct sockaddr_in sin;
+		struct sockaddr_in6 sin6;
+	} tmp_addr = {
+		.ss = addr->ss,
+	};
+
+	return (ast_sockaddr_is_ipv4(addr) && (tmp_addr.sin.sin_addr.s_addr == INADDR_ANY)) ||
+	    (ast_sockaddr_is_ipv6(addr) && IN6_IS_ADDR_UNSPECIFIED(&tmp_addr.sin6.sin6_addr));
 }
 
 int ast_sockaddr_hash(const struct ast_sockaddr *addr)