dany/luasocket
1
0
Fork 0
mirror of https://github.com/lunarmodules/luasocket.git synced 2024-12-26 12:28:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix getpeername to work with IPv6 addresses

Browse Source
This commit is contained in:
Florian Zeitz 2011-06-30 21:49:39 +02:00 committed by Sam Roberts
parent 594f826aa1
commit 8393c76180
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/inet.c
View File

@ -169,14 +169,27 @@ 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_in peer; struct sockaddr *peer;
socklen_t peer_len = sizeof(peer); socklen_t peer_len = sizeof(struct sockaddr_storage);
if (getpeername(*ps, (SA *) &peer, &peer_len) < 0) { char ipaddr[INET6_ADDRSTRLEN];
peer = (struct sockaddr *) malloc(peer_len);
if (!peer || (getpeername(*ps, (SA *) peer, &peer_len) < 0)) {
lua_pushnil(L); lua_pushnil(L);
lua_pushstring(L, "getpeername failed"); lua_pushstring(L, "getpeername failed");
} else { } else {
lua_pushstring(L, inet_ntoa(peer.sin_addr)); if (peer->sa_family == AF_INET)
lua_pushnumber(L, ntohs(peer.sin_port)); inet_ntop(AF_INET, &((struct sockaddr_in *)peer)->sin_addr,
ipaddr, sizeof(ipaddr));
else if (peer->sa_family == AF_INET6)
inet_ntop(AF_INET6, &((struct sockaddr_in6 *)peer)->sin6_addr,
ipaddr, sizeof(ipaddr));
lua_pushstring(L, ipaddr);
if (peer->sa_family == AF_INET)
lua_pushnumber(L, ntohs(((struct sockaddr_in *)peer)->sin_port));
else if (peer->sa_family == AF_INET6)
lua_pushnumber(L, ntohs(((struct sockaddr_in6 *)peer)->sin6_port));
free(peer);
} }
return 2; return 2;
} }