3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-09 15:26:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1859 from soulik/master

Browse Source 
Fix usage of IPv6 addresses
This commit is contained in:
Luca Boccassi 2016-03-19 14:15:34 +00:00
commit d5aaaeb888
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/select.cpp
View File

@ -435,14 +435,16 @@ bool zmq::select_t::is_retired_fd (const fd_entry_t &entry)
#if defined ZMQ_HAVE_WINDOWS #if defined ZMQ_HAVE_WINDOWS
u_short zmq::select_t::get_fd_family (fd_t fd_) u_short zmq::select_t::get_fd_family (fd_t fd_)
{ {
sockaddr addr = { 0 }; // Use sockaddr_storage instead of sockaddr to accomodate differect structure sizes
int addr_size = sizeof addr; sockaddr_storage addr = { 0 };
int rc = getsockname (fd_, &addr, &addr_size); int addr_size = sizeof addr;
int rc = getsockname (fd_, (sockaddr *)&addr, &addr_size);
// AF_INET and AF_INET6 can be mixed in select // AF_INET and AF_INET6 can be mixed in select
// TODO: If proven otherwise, should simply return addr.sa_family // TODO: If proven otherwise, should simply return addr.sa_family
if (rc != SOCKET_ERROR) 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 else
return AF_UNSPEC; return AF_UNSPEC;
} }