use more standard IPV6_JOIN_GROUP and IPV6_LEAVE_GROUP.

The IPV6_ADD_MEMBERSHIP and IPV6_DROP_MEMBERSHIP are deprecated alias,
use the correct defines so it compiles everywhere.

Fixes T4764

Thanks netstar!
This commit is contained in:
Gustavo Sverzut Barbieri 2016-10-25 19:32:07 -02:00
parent 09378052e7
commit 9a62932d07
2 changed files with 3 additions and 3 deletions

View File

@ -4998,7 +4998,7 @@ efl_net_multicast_join(SOCKET fd, int family, const char *address)
if (err)
return err;
if (setsockopt(fd, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) == 0)
if (setsockopt(fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mreq, sizeof(mreq)) == 0)
return 0;
}
else
@ -5034,7 +5034,7 @@ efl_net_multicast_leave(SOCKET fd, int family, const char *address)
if (err)
return err;
if (setsockopt(fd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP, &mreq, sizeof(mreq)) == 0)
if (setsockopt(fd, IPPROTO_IPV6, IPV6_LEAVE_GROUP, &mreq, sizeof(mreq)) == 0)
return 0;
}
else

View File

@ -145,7 +145,7 @@ _efl_net_dialer_udp_resolved_bind(Eo *o, Efl_Net_Dialer_Udp_Data *pd EINA_UNUSED
struct ipv6_mreq mreq = {
.ipv6mr_multiaddr = a->sin6_addr,
};
if (setsockopt(fd, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) == 0)
if (setsockopt(fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mreq, sizeof(mreq)) == 0)
{
efl_net_ip_port_fmt(buf, sizeof(buf), addr->ai_addr);
DBG("joined multicast group %s socket=%d", buf, fd);