3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-18 17:36:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #93 from GreatFruitOmsk/master

Browse Source 
Backport zeromq/libzmq#1723
This commit is contained in:
Pieter Hintjens 2016-01-21 18:03:03 +01:00
commit 9bdfb94999
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/tcp_address.cpp
View File

@ -122,11 +122,17 @@ int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv6_, bool is_
int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv6_, bool is_src_) int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv6_, bool is_src_)
{ {
// TODO: Unused parameter, IPv6 support not implemented for AIX or HP/UX. #if defined ZMQ_HAVE_AIX || defined ZMQ_HAVE_HPUX
(void) ipv6_; // IPv6 support not implemented for AIX or HP/UX.
if (ipv6_)
{
errno = ENODEV;
return -1;
}
#endif
// Create a socket. // Create a socket.
const int sd = open_socket (AF_INET, SOCK_DGRAM, 0); const int sd = open_socket (ipv6_ ? AF_INET6 : AF_INET, SOCK_DGRAM, 0);
errno_assert (sd != -1); errno_assert (sd != -1);
struct ifreq ifr; struct ifreq ifr;
@ -144,12 +150,25 @@ int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv6_, bool is_
errno = ENODEV; errno = ENODEV;
return -1; return -1;
} }
if (is_src_)
memcpy (&source_address.ipv4.sin_addr, const int family = ifr.ifr_addr.sa_family;
&((sockaddr_in*) &ifr.ifr_addr)->sin_addr, sizeof (struct in_addr)); if ((family == AF_INET || (ipv6_ && family == AF_INET6))
&& !strcmp (nic_, ifr.ifr_name))
{
if (is_src_)
memcpy (&source_address, &ifr.ifr_addr,
(family == AF_INET) ? sizeof (struct sockaddr_in)
: sizeof (struct sockaddr_in6));
else
memcpy (&address, &ifr.ifr_addr,
(family == AF_INET) ? sizeof (struct sockaddr_in)
: sizeof (struct sockaddr_in6));
}
else else
memcpy (&address.ipv4.sin_addr, {
&((sockaddr_in*) &ifr.ifr_addr)->sin_addr, sizeof (struct in_addr)); errno = ENODEV;
return -1;
}
return 0; return 0;
} }