dany/luasocket
1
0
Fork 0
mirror of https://github.com/lunarmodules/luasocket.git synced 2024-06-29 09:59:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

inet: Honor the strict aliasing rule

Browse Source
This commit is contained in:
Florian Zeitz 2011-12-17 19:05:45 +01:00 committed by Sam Roberts
parent e81a6ff623
commit f399ab25fc
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/inet.c
View File

@ -169,11 +169,15 @@ static int inet_global_gethostname(lua_State *L)
\*-------------------------------------------------------------------------*/ \*-------------------------------------------------------------------------*/
int inet_meth_getpeername(lua_State *L, p_socket ps) int inet_meth_getpeername(lua_State *L, p_socket ps)
{ {
struct sockaddr_storage peer; union {
struct sockaddr *p = (struct sockaddr *)&peer; struct sockaddr_storage sas;
socklen_t peer_len = sizeof(struct sockaddr_storage); struct sockaddr sa;
struct sockaddr_in sa4;
struct sockaddr_in6 sa6;
} peer;
socklen_t peer_len = sizeof(peer);
if (getpeername(*ps, p, &peer_len) < 0) { if (getpeername(*ps, &peer.sa, &peer_len) < 0) {
lua_pushnil(L); lua_pushnil(L);
lua_pushfstring(L, "getpeername failed (%d): %s", errno, lua_pushfstring(L, "getpeername failed (%d): %s", errno,
strerror(errno)); strerror(errno));
@ -181,20 +185,18 @@ int inet_meth_getpeername(lua_State *L, p_socket ps)
char ipaddr[INET6_ADDRSTRLEN] = ""; char ipaddr[INET6_ADDRSTRLEN] = "";
unsigned short port = 0; unsigned short port = 0;
switch (p->sa_family) { switch (peer.sa.sa_family) {
case AF_INET: case AF_INET:
inet_ntop(AF_INET, &((struct sockaddr_in *)&peer)->sin_addr, inet_ntop(AF_INET, &peer.sa4.sin_addr, ipaddr, sizeof(ipaddr));
ipaddr, sizeof(ipaddr)); port = ntohs(peer.sa4.sin_port);
port = ntohs(((struct sockaddr_in *)&peer)->sin_port);
break; break;
case AF_INET6: case AF_INET6:
inet_ntop(AF_INET6, &((struct sockaddr_in6 *)&peer)->sin6_addr, inet_ntop(AF_INET6, &peer.sa6.sin6_addr, ipaddr, sizeof(ipaddr));
ipaddr, sizeof(ipaddr)); port = ntohs(peer.sa6.sin6_port);
port = ntohs(((struct sockaddr_in6 *)&peer)->sin6_port);
break; break;
default: default:
lua_pushnil(L); lua_pushnil(L);
lua_pushfstring(L, "Unknown address family %d", p->sa_family); lua_pushfstring(L, "Unknown address family %d", peer.sa.sa_family);
return 2; return 2;
break; break;
} }