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!

diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index 0bd23c0..c6b27c8 100644 (file)
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -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

diff --git a/src/lib/ecore_con/efl_net_dialer_udp.c b/src/lib/ecore_con/efl_net_dialer_udp.c
index b5fe8de..750cb53 100644 (file)
--- a/src/lib/ecore_con/efl_net_dialer_udp.c
+++ b/src/lib/ecore_con/efl_net_dialer_udp.c
@@ -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);