From: Martin Willi <martin@revosec.ch>
Date: Wed, 16 Nov 2011 13:45:19 +0000 (+0000)
Subject: Fix unaligned aliasing warning in raw socket
X-Git-Tag: 4.6.2~383
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fcacd283e0dceb6fc70b45dcafa0a7eddf26039;p=thirdparty%2Fstrongswan.git

Fix unaligned aliasing warning in raw socket
---

diff --git a/src/libcharon/plugins/socket_raw/socket_raw_socket.c b/src/libcharon/plugins/socket_raw/socket_raw_socket.c
index f371ed5023..ae37d8f2bf 100644
--- a/src/libcharon/plugins/socket_raw/socket_raw_socket.c
+++ b/src/libcharon/plugins/socket_raw/socket_raw_socket.c
@@ -442,23 +442,22 @@ static int open_send_socket(private_socket_raw_socket_t *this,
 	int skt;
 
 	memset(&addr, 0, sizeof(addr));
+	addr.ss_family = family;
 	/* precalculate constants depending on address family */
 	switch (family)
 	{
 		case AF_INET:
 		{
 			struct sockaddr_in *sin = (struct sockaddr_in *)&addr;
-			sin->sin_family = AF_INET;
-			sin->sin_addr.s_addr = INADDR_ANY;
-			sin->sin_port = htons(port);
+			htoun32(&sin->sin_addr.s_addr, INADDR_ANY);
+			htoun16(&sin->sin_port, port);
 			break;
 		}
 		case AF_INET6:
 		{
 			struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&addr;
-			sin6->sin6_family = AF_INET6;
 			memcpy(&sin6->sin6_addr, &in6addr_any, sizeof(in6addr_any));
-			sin6->sin6_port = htons(port);
+			htoun16(&sin6->sin6_port, port);
 			break;
 		}
 		default: