Use memcpy to avoid strict C aliasing. In this case,

	the Posix spec that (struct sockaddr_storage *) can be cast
	to (struct sockaddr_in *) violates the ISO C requirements
	on aliasing.

diff --git a/src/lib/packet.c b/src/lib/packet.c
index 13e723c..29c3235 100644 (file)
--- a/src/lib/packet.c
+++ b/src/lib/packet.c
@@ -175,6 +175,7 @@ void fr_request_from_reply(RADIUS_PACKET *request,
 int fr_socket(fr_ipaddr_t *ipaddr, int port)
 {
        int sockfd;
+       uint16_t sport;
        struct sockaddr_storage salocal;
        socklen_t       salen;
 
@@ -185,6 +186,7 @@ int fr_socket(fr_ipaddr_t *ipaddr, int port)
 
        sockfd = socket(ipaddr->af, SOCK_DGRAM, 0);
        if (sockfd < 0) {
+               librad_log("cannot open socket: %s", strerror(errno));
                return sockfd;
        }
 
@@ -194,29 +196,34 @@ int fr_socket(fr_ipaddr_t *ipaddr, int port)
         */
        if (udpfromto_init(sockfd) != 0) {
                close(sockfd);
+               librad_log("cannot initialize udpfromto: %s", strerror(errno));
                return -1;
        }
 #endif
 
+       sport = port;
+       sport = htons(sport);
        memset(&salocal, 0, sizeof(salocal));
        if (ipaddr->af == AF_INET) {
-               struct sockaddr_in *sa;
+               struct sockaddr_in s4;
 
-               sa = (struct sockaddr_in *) &salocal;
-               sa->sin_family = AF_INET;
-               sa->sin_addr = ipaddr->ipaddr.ip4addr;
-               sa->sin_port = htons((uint16_t) port);
-               salen = sizeof(*sa);
+               s4.sin_family = AF_INET;
+               s4.sin_addr = ipaddr->ipaddr.ip4addr;
+               s4.sin_port = sport;
+               salen = sizeof(s4);
+               memset(&salocal, 0, sizeof(salocal));
+               memcpy(&salocal, &s4, salen);
 
 #ifdef HAVE_STRUCT_SOCKADDR_IN6
        } else if (ipaddr->af == AF_INET6) {
-               struct sockaddr_in6 *sa;
+               struct sockaddr_in6 s6;
 
-               sa = (struct sockaddr_in6 *) &salocal;
-               sa->sin6_family = AF_INET6;
-               sa->sin6_addr = ipaddr->ipaddr.ip6addr;
-               sa->sin6_port = htons((uint16_t) port);
-               salen = sizeof(*sa);
+               s6.sin6_family = AF_INET6;
+               s6.sin6_addr = ipaddr->ipaddr.ip6addr;
+               s6.sin6_port = sport;
+               salen = sizeof(s6);
+               memset(&salocal, 0, sizeof(salocal));
+               memcpy(&salocal, &s6, salen);
 
 #if 1
                /*
@@ -242,6 +249,7 @@ int fr_socket(fr_ipaddr_t *ipaddr, int port)
 
        if (bind(sockfd, (struct sockaddr *) &salocal, salen) < 0) {
                close(sockfd);
+               librad_log("cannot bind socket: %s", strerror(errno));
                return -1;
        }
 
@@ -377,11 +385,11 @@ int fr_packet_list_socket_add(fr_packet_list_t *pl, int sockfd)
         */
        ps->ipaddr.af = src.ss_family;
        if (src.ss_family == AF_INET) {
-               struct sockaddr_in      *s4;
+               struct sockaddr_in      s4;
 
-               s4 = (struct sockaddr_in *)&src;
-               ps->ipaddr.ipaddr.ip4addr = s4->sin_addr;
-               ps->port = ntohs(s4->sin_port);
+               memcpy(&s4, &src, sizeof(s4));
+               ps->ipaddr.ipaddr.ip4addr = s4.sin_addr;
+               ps->port = ntohs(s4.sin_port);
 
                if (ps->ipaddr.ipaddr.ip4addr.s_addr == INADDR_ANY) {
                        ps->inaddr_any = 1;
@@ -389,11 +397,11 @@ int fr_packet_list_socket_add(fr_packet_list_t *pl, int sockfd)
 
 #ifdef HAVE_STRUCT_SOCKADDR_IN6
        } else if (src.ss_family == AF_INET6) {
-               struct sockaddr_in6     *s6;
+               struct sockaddr_in6     s6;
 
-               s6 = (struct sockaddr_in6 *)&src;
-               ps->ipaddr.ipaddr.ip6addr = s6->sin6_addr;
-               ps->port = ntohs(s6->sin6_port);
+               memcpy(&s6, &src, sizeof(s6));
+               ps->ipaddr.ipaddr.ip6addr = s6.sin6_addr;
+               ps->port = ntohs(s6.sin6_port);
 
                if (IN6_IS_ADDR_UNSPECIFIED(&ps->ipaddr.ipaddr.ip6addr)) {
                        ps->inaddr_any = 1;

diff --git a/src/lib/radius.c b/src/lib/radius.c
index a6f9da7..cdf9af1 100644 (file)
--- a/src/lib/radius.c
+++ b/src/lib/radius.c
@@ -165,22 +165,24 @@ static int rad_sendto(int sockfd, void *data, size_t data_len, int flags,
         *      IPv4 is supported.
         */
        if (dst_ipaddr->af == AF_INET) {
-               struct sockaddr_in      *s4;
+               struct sockaddr_in      s4;
 
-               s4 = (struct sockaddr_in *)&dst;
-               sizeof_dst = sizeof(struct sockaddr_in);
+               sizeof_dst = sizeof(s4);
 
-               s4->sin_family = AF_INET;
-               s4->sin_addr = dst_ipaddr->ipaddr.ip4addr;
-               s4->sin_port = htons(dst_port);
+               s4.sin_family = AF_INET;
+               s4.sin_addr = dst_ipaddr->ipaddr.ip4addr;
+               s4.sin_port = htons(dst_port);
+               memset(&dst, 0, sizeof(dst));
+               memcpy(&dst, &s4, sizeof_dst);
 
 #ifdef WITH_UDPFROMTO
-               s4 = (struct sockaddr_in *)&src;
-               sizeof_src = sizeof(struct sockaddr_in);
+               sizeof_src = sizeof(s4);
 
-               s4->sin_family = AF_INET;
-               s4->sin_addr = src_ipaddr->ipaddr.ip4addr;
-               s4->sin_port = htons(src_port);
+               s4.sin_family = AF_INET;
+               s4.sin_addr = src_ipaddr->ipaddr.ip4addr;
+               s4.sin_port = htons(src_port);
+               memset(&src, 0, sizeof(src));
+               memcpy(&src, &s4, sizeof_src);
 #else
                src_port = src_port; /* -Wunused */
 #endif
@@ -190,23 +192,25 @@ static int rad_sendto(int sockfd, void *data, size_t data_len, int flags,
         */
 #ifdef HAVE_STRUCT_SOCKADDR_IN6
        } else if (dst_ipaddr->af == AF_INET6) {
-               struct sockaddr_in6     *s6;
+               struct sockaddr_in6     s6;
 
-               s6 = (struct sockaddr_in6 *)&dst;
-               sizeof_dst = sizeof(struct sockaddr_in6);
+               sizeof_dst = sizeof(s6);
 
-               s6->sin6_family = AF_INET6;
-               s6->sin6_addr = dst_ipaddr->ipaddr.ip6addr;
-               s6->sin6_port = htons(dst_port);
+               s6.sin6_family = AF_INET6;
+               s6.sin6_addr = dst_ipaddr->ipaddr.ip6addr;
+               s6.sin6_port = htons(dst_port);
+               memset(&dst, 0, sizeof(dst));
+               memcpy(&dst, &s6, sizeof_dst);
 
 #ifdef WITH_UDPFROMTO
                return -1;      /* UDPFROMTO && IPv6 are not supported */
 #if 0
-               s6 = (struct sockaddr_in6 *)&src;
-               sizeof_src = sizeof(struct sockaddr_in6);
+               sizeof_src = sizeof(s6);
 
-               s6->sin6_family = AF_INET6;
-               s6->sin6_addr = src_ipaddr->ipaddr.ip6addr;
+               s6.sin6_family = AF_INET6;
+               s6.sin6_addr = src_ipaddr->ipaddr.ip6addr;
+               memset(&src, 0, sizeof(src));
+               memcpy(&src, &s6, sizeof_src);
 #endif /* #if 0 */
 #endif /* WITH_UDPFROMTO */
 #endif /* HAVE_STRUCT_SOCKADDR_IN6 */
@@ -233,7 +237,7 @@ static int rad_sendto(int sockfd, void *data, size_t data_len, int flags,
         *      No udpfromto, OR an IPv6 socket, fail gracefully.
         */
        return sendto(sockfd, data, data_len, flags,
-                     (struct sockaddr *)&dst, sizeof_dst);
+                     (struct sockaddr *) &dst, sizeof_dst);
 }
 
 
@@ -298,21 +302,21 @@ ssize_t rad_recv_header(int sockfd, fr_ipaddr_t *src_ipaddr, int *src_port,
        }
 
        if (src.ss_family == AF_INET) {
-               struct sockaddr_in      *s4;
+               struct sockaddr_in      s4;
 
-               s4 = (struct sockaddr_in *)&src;
+               memcpy(&s4, &src, sizeof(s4));
                src_ipaddr->af = AF_INET;
-               src_ipaddr->ipaddr.ip4addr = s4->sin_addr;
-               *src_port = ntohs(s4->sin_port);
+               src_ipaddr->ipaddr.ip4addr = s4.sin_addr;
+               *src_port = ntohs(s4.sin_port);
 
 #ifdef HAVE_STRUCT_SOCKADDR_IN6
        } else if (src.ss_family == AF_INET6) {
-               struct sockaddr_in6     *s6;
+               struct sockaddr_in6     s6;
 
-               s6 = (struct sockaddr_in6 *)&src;
+               memcpy(&s6, &src, sizeof(s6));
                src_ipaddr->af = AF_INET6;
-               src_ipaddr->ipaddr.ip6addr = s6->sin6_addr;
-               *src_port = ntohs(s6->sin6_port);
+               src_ipaddr->ipaddr.ip6addr = s6.sin6_addr;
+               *src_port = ntohs(s6.sin6_port);
 
 #endif
        } else {
@@ -435,31 +439,31 @@ static ssize_t rad_recvfrom(int sockfd, uint8_t **pbuf, int flags,
         *      Check address families, and update src/dst ports, etc.
         */
        if (src.ss_family == AF_INET) {
-               struct sockaddr_in      *s4;
+               struct sockaddr_in      s4;
 
-               s4 = (struct sockaddr_in *)&src;
+               memcpy(&s4, &src, sizeof(s4));
                src_ipaddr->af = AF_INET;
-               src_ipaddr->ipaddr.ip4addr = s4->sin_addr;
-               *src_port = ntohs(s4->sin_port);
+               src_ipaddr->ipaddr.ip4addr = s4.sin_addr;
+               *src_port = ntohs(s4.sin_port);
 
-               s4 = (struct sockaddr_in *)&dst;
+               memcpy(&s4, &dst, sizeof(s4));
                dst_ipaddr->af = AF_INET;
-               dst_ipaddr->ipaddr.ip4addr = s4->sin_addr;
-               *dst_port = ntohs(s4->sin_port);
+               dst_ipaddr->ipaddr.ip4addr = s4.sin_addr;
+               *dst_port = ntohs(s4.sin_port);
 
 #ifdef HAVE_STRUCT_SOCKADDR_IN6
        } else if (src.ss_family == AF_INET6) {
-               struct sockaddr_in6     *s6;
+               struct sockaddr_in6     s6;
 
-               s6 = (struct sockaddr_in6 *)&src;
+               memcpy(&s6, &src, sizeof(s6));
                src_ipaddr->af = AF_INET6;
-               src_ipaddr->ipaddr.ip6addr = s6->sin6_addr;
-               *src_port = ntohs(s6->sin6_port);
+               src_ipaddr->ipaddr.ip6addr = s6.sin6_addr;
+               *src_port = ntohs(s6.sin6_port);
 
-               s6 = (struct sockaddr_in6 *)&dst;
+               memcpy(&s6, &dst, sizeof(s6));
                dst_ipaddr->af = AF_INET6;
-               dst_ipaddr->ipaddr.ip6addr = s6->sin6_addr;
-               *dst_port = ntohs(s6->sin6_port);
+               dst_ipaddr->ipaddr.ip6addr = s6.sin6_addr;
+               *dst_port = ntohs(s6.sin6_port);
 #endif
        } else {
                free(buf);
@@ -1108,7 +1112,7 @@ int rad_encode(RADIUS_PACKET *packet, const RADIUS_PACKET *original,
                return -1;
        }
 
-       memcpy(packet->data, data, packet->data_len);
+       memcpy(packet->data, hdr, packet->data_len);
        hdr = (radius_packet_t *) packet->data;
 
        total_length = htons(total_length);

diff --git a/src/main/listen.c b/src/main/listen.c
index d990b0a..166901c 100644 (file)
--- a/src/main/listen.c
+++ b/src/main/listen.c
@@ -899,19 +899,19 @@ static int listen_bind(rad_listen_t *this)
                }
 
                if (src.ss_family == AF_INET) {
-                       struct sockaddr_in      *s4;
+                       struct sockaddr_in      s4;
                        
-                       s4 = (struct sockaddr_in *)&src;
-                       sock->ipaddr.ipaddr.ip4addr = s4->sin_addr;
-                       sock->port = ntohs(s4->sin_port);
+                       memcpy(&s4, &src, sizeof(s4));
+                       sock->ipaddr.ipaddr.ip4addr = s4.sin_addr;
+                       sock->port = ntohs(s4.sin_port);
                        
 #ifdef HAVE_STRUCT_SOCKADDR_IN6
                } else if (src.ss_family == AF_INET6) {
-                       struct sockaddr_in6     *s6;
+                       struct sockaddr_in6     s6;
                        
-                       s6 = (struct sockaddr_in6 *)&src;
-                       sock->ipaddr.ipaddr.ip6addr = s6->sin6_addr;
-                       sock->port = ntohs(s6->sin6_port);
+                       memcpy(&s6, &src, sizeof(s6));
+                       sock->ipaddr.ipaddr.ip6addr = s6.sin6_addr;
+                       sock->port = ntohs(s6.sin6_port);
 #endif
                } else {
                        radlog(L_ERR, "Socket has unsupported address family");