From 9efc1961fef9dd77cfeaadaef5e505d5c1984ed8 Mon Sep 17 00:00:00 2001 From: Santiago Gimeno Date: Thu, 21 Feb 2019 06:30:49 +0100 Subject: [PATCH] udp: drop IPV6_SSM_SUPPORT macro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All the supported platforms support specific source multicast. PR-URL: https://github.com/libuv/libuv/pull/2202 Reviewed-By: Saúl Ibarra Corretgé --- include/uv.h | 11 ----------- src/unix/udp.c | 4 ---- src/win/udp.c | 4 ---- 3 files changed, 19 deletions(-) diff --git a/include/uv.h b/include/uv.h index af74814cf7c..e6cc61bfc8c 100644 --- a/include/uv.h +++ b/include/uv.h @@ -364,17 +364,6 @@ typedef void (*uv_fs_poll_cb)(uv_fs_poll_t* handle, typedef void (*uv_signal_cb)(uv_signal_t* handle, int signum); -#if defined(MCAST_JOIN_SOURCE_GROUP) && defined(MCAST_LEAVE_SOURCE_GROUP) -# ifndef IPV6_SSM_SUPPORT -# define IPV6_SSM_SUPPORT -# endif -# ifndef IPV6_ADD_SOURCE_MEMBERSHIP -# define IPV6_ADD_SOURCE_MEMBERSHIP MCAST_JOIN_SOURCE_GROUP -# endif -# ifndef IPV6_DROP_SOURCE_MEMBERSHIP -# define IPV6_DROP_SOURCE_MEMBERSHIP MCAST_LEAVE_SOURCE_GROUP -# endif -#endif typedef enum { UV_LEAVE_GROUP = 0, diff --git a/src/unix/udp.c b/src/unix/udp.c index e0576cc43ae..f884e77abf8 100644 --- a/src/unix/udp.c +++ b/src/unix/udp.c @@ -709,7 +709,6 @@ static int uv__udp_set_source_membership6(uv_udp_t* handle, const char* interface_addr, const struct sockaddr_in6* source_addr, uv_membership membership) { -#ifdef IPV6_SSM_SUPPORT struct group_source_req mreq; struct sockaddr_in6 addr6; int optname; @@ -747,9 +746,6 @@ static int uv__udp_set_source_membership6(uv_udp_t* handle, } return 0; -#else - return UV_EPROTONOSUPPORT; -#endif /* IPV6_SSM_SUPPORT */ } diff --git a/src/win/udp.c b/src/win/udp.c index c49d68bcfcb..41967ac41a3 100644 --- a/src/win/udp.c +++ b/src/win/udp.c @@ -759,7 +759,6 @@ int uv__udp_set_source_membership6(uv_udp_t* handle, const char* interface_addr, const struct sockaddr_in6* source_addr, uv_membership membership) { -#ifdef IPV6_SSM_SUPPORT struct group_source_req mreq; struct sockaddr_in6 addr6; int optname; @@ -804,9 +803,6 @@ int uv__udp_set_source_membership6(uv_udp_t* handle, } return 0; -#else - return UV_EPROTONOSUPPORT; -#endif /* IPV6_SSM_SUPPORT */ }