generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-11-04 12:17:39 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #380 from jlopex/master

Browse Source 
current libzmq not compiling with android NDK
This commit is contained in:
Pieter Hintjens
2012-06-14 12:17:51 -07:00
parent 67ab3390ec eb6c668c2a
commit c8d0d68471
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/tcp_address.cpp
View File

@@ -126,7 +126,7 @@ int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv4only_)
int sd = open_socket (AF_INET, SOCK_DGRAM, 0); int sd = open_socket (AF_INET, SOCK_DGRAM, 0);
errno_assert (sd != -1); errno_assert (sd != -1);
struct ifreq ifr; struct ifreq ifr;
// Copy interface name for ioctl get. // Copy interface name for ioctl get.
strncpy (ifr.ifr_name, nic_, sizeof (ifr.ifr_name)); strncpy (ifr.ifr_name, nic_, sizeof (ifr.ifr_name));
@@ -371,10 +371,10 @@ zmq::tcp_address_t::tcp_address_t (const sockaddr *sa, socklen_t sa_len)
zmq_assert(sa && sa_len > 0); zmq_assert(sa && sa_len > 0);
memset (&address, 0, sizeof (address)); memset (&address, 0, sizeof (address));
if (sa->sa_family == AF_INET && sa_len >= sizeof (address.ipv4)) { if (sa->sa_family == AF_INET && sa_len >= (socklen_t) sizeof (address.ipv4)) {
memcpy(&address.ipv4, sa, sizeof (address.ipv4)); memcpy(&address.ipv4, sa, sizeof (address.ipv4));
} }
else if (sa->sa_family == AF_INET6 && sa_len >= sizeof (address.ipv6)) { else if (sa->sa_family == AF_INET6 && sa_len >= (socklen_t) sizeof (address.ipv6)) {
memcpy(&address.ipv6, sa, sizeof (address.ipv6)); memcpy(&address.ipv6, sa, sizeof (address.ipv6));
} }
} }
@@ -577,7 +577,7 @@ int zmq::tcp_address_mask_t::to_string (std::string &addr_)
const bool zmq::tcp_address_mask_t::match_address (const struct sockaddr *ss, const socklen_t ss_len) const const bool zmq::tcp_address_mask_t::match_address (const struct sockaddr *ss, const socklen_t ss_len) const
{ {
zmq_assert (address_mask != -1 && ss != NULL && ss_len >= sizeof(struct sockaddr)); zmq_assert (address_mask != -1 && ss != NULL && ss_len >= (socklen_t) sizeof (struct sockaddr));
if (ss->sa_family != address.generic.sa_family) if (ss->sa_family != address.generic.sa_family)
return false; return false;