3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-08 22:46:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use sockaddr_storage instead of sockaddr to support IPv6 addresses

Browse Source
This commit is contained in:
Mário Kašuba 2016-03-19 14:37:10 +01:00
parent 3777309b67
commit e38166cc1b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/select.cpp
View File

@ -435,14 +435,15 @@ bool zmq::select_t::is_retired_fd (const fd_entry_t &entry)
#if defined ZMQ_HAVE_WINDOWS
u_short zmq::select_t::get_fd_family (fd_t fd_)
{
sockaddr addr = { 0 };
int addr_size = sizeof addr;
int rc = getsockname (fd_, &addr, &addr_size);
sockaddr_storage addr = { 0 };
int addr_size = sizeof addr;
int rc = getsockname (fd_, (sockaddr *)&addr, &addr_size);
// AF_INET and AF_INET6 can be mixed in select
// TODO: If proven otherwise, should simply return addr.sa_family
if (rc != SOCKET_ERROR)
return addr.sa_family == AF_INET6 ? AF_INET : addr.sa_family;
return addr.ss_family == AF_INET6 ? AF_INET : addr.ss_family;
else
return AF_UNSPEC;
}