Skip to content

Commit

Permalink
Merge pull request #7 from vwout/bugfix/addrinfo_get_ip_port_represen…
Browse files Browse the repository at this point in the history
…tation

Fix for addrinfo member functions
  • Loading branch information
CapsAdmin committed Sep 1, 2022
2 parents 43bb098 + 37f9cb7 commit acb3bc3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions ljsocket.lua
Expand Up @@ -855,7 +855,7 @@ local function addrinfo_get_ip(self)
return nil
end
local str = ffi.new("char[256]")
local addr = assert(socket.inet_ntop(AF.lookup[self.family], self.addrinfo.ai_addr.sa_data, str, ffi.sizeof(str)))
local addr = assert(socket.inet_ntop(AF.lookup[self.family], ffi.cast("struct sockaddr_in*", self.addrinfo.ai_addr).sin_addr, str, ffi.sizeof(str)))
return ffi.string(addr)
end

Expand All @@ -864,9 +864,9 @@ local function addrinfo_get_port(self)
return nil
end
if self.family == "inet" then
return ffi.cast("struct sockaddr_in*", self.addrinfo.ai_addr).sin_port
return socket.ntohs(ffi.cast("struct sockaddr_in*", self.addrinfo.ai_addr).sin_port)
elseif self.family == "inet6" then
return ffi.cast("struct sockaddr_in6*", self.addrinfo.ai_addr).sin6_port
return socket.ntohs(ffi.cast("struct sockaddr_in6*", self.addrinfo.ai_addr).sin6_port)
end

return nil, "unknown family " .. tostring(self.family)
Expand Down

0 comments on commit acb3bc3

Please sign in to comment.