nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 09:58:01 +00:00
Code Issues Projects Releases Wiki Activity

Fix strict-aliasing warnings in sk_tcp_peer_info.

Browse Source 
GCC 6 emits strict-aliasing warnings here, so use the existing
sockaddr_union arrangements to avoid those.  As a prerequisite for being
able to express sk_tcp_peer_info in terms of sockaddr_union, I fixed up
the union elements to be a bit less odd in the NO_IPV6 case.

(cherry picked from commit c026b48c53)
This commit is contained in:
Colin Watson 2016-01-28 21:22:07 +00:00 committed by Simon Tatham
parent e71ec6bf9f
commit eb74369b24
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
unix/uxnet.c
View File

@ -37,14 +37,12 @@
* Access to sockaddr types without breaking C strict aliasing rules. * Access to sockaddr types without breaking C strict aliasing rules.
*/ */
union sockaddr_union { union sockaddr_union {
#ifdef NO_IPV6
struct sockaddr_in storage;
#else
struct sockaddr_storage storage; struct sockaddr_storage storage;
struct sockaddr_in6 sin6;
#endif
struct sockaddr sa; struct sockaddr sa;
struct sockaddr_in sin; struct sockaddr_in sin;
#ifndef NO_IPV6
struct sockaddr_in6 sin6;
#endif
struct sockaddr_un su; struct sockaddr_un su;
}; };
@ -1426,26 +1424,27 @@ static void sk_tcp_set_frozen(Socket sock, int is_frozen)
static char *sk_tcp_peer_info(Socket sock) static char *sk_tcp_peer_info(Socket sock)
{ {
Actual_Socket s = (Actual_Socket) sock; Actual_Socket s = (Actual_Socket) sock;
struct sockaddr_storage addr; union sockaddr_union addr;
socklen_t addrlen = sizeof(addr); socklen_t addrlen = sizeof(addr);
#ifndef NO_IPV6
char buf[INET6_ADDRSTRLEN]; char buf[INET6_ADDRSTRLEN];
#endif
if (getpeername(s->s, (struct sockaddr *)&addr, &addrlen) < 0) if (getpeername(s->s, &addr.sa, &addrlen) < 0)
return NULL; return NULL;
if (addr.ss_family == AF_INET) { if (addr.storage.ss_family == AF_INET) {
return dupprintf return dupprintf
("%s:%d", ("%s:%d",
inet_ntoa(((struct sockaddr_in *)&addr)->sin_addr), inet_ntoa(addr.sin.sin_addr),
(int)ntohs(((struct sockaddr_in *)&addr)->sin_port)); (int)ntohs(addr.sin.sin_port));
#ifndef NO_IPV6 #ifndef NO_IPV6
} else if (addr.ss_family == AF_INET6) { } else if (addr.storage.ss_family == AF_INET6) {
return dupprintf return dupprintf
("[%s]:%d", ("[%s]:%d",
inet_ntop(AF_INET6, &((struct sockaddr_in6 *)&addr)->sin6_addr, inet_ntop(AF_INET6, &addr.sin6.sin6_addr, buf, sizeof(buf)),
buf, sizeof(buf)), (int)ntohs(addr.sin6.sin6_port));
(int)ntohs(((struct sockaddr_in6 *)&addr)->sin6_port));
#endif #endif
} else if (addr.ss_family == AF_UNIX) { } else if (addr.storage.ss_family == AF_UNIX) {
/* /*
* For Unix sockets, the source address is unlikely to be * For Unix sockets, the source address is unlikely to be
* helpful. Instead, we try SO_PEERCRED and try to get the * helpful. Instead, we try SO_PEERCRED and try to get the