[OSX] ip_mreqn struct is not supported for IPv4 Multicast (#119354)

liveans · wfurt · web-flow · commit 0e3562e97c6d · 2025-09-09T09:28:12.000+03:00
* Fix IPv4 multicast on macOS by handling ip_mreqn struct compatibility

* Remove Active Issue for iOS

* Add support for IP_MULTICAST_IFINDEX

* Refactor IPv4 multicast option handling to directly use IP_MULTICAST_IFINDEX for interface index specification

* Accept 0 interface as valid

---------

Co-authored-by: Tomas Weinfurt &lt;tweinfurt@yahoo.com&gt;
diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs b/src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs
@@ -70,7 +70,6 @@ public void MulticastOption_CreateSocketSetGetOption_GroupAndInterfaceIndex_SetS
         }
 
         [ConditionalFact(nameof(CanRunMulticastTests))]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/113827", typeof(PlatformDetection), nameof(PlatformDetection.IsAppleMobile))]
         public async Task MulticastInterface_Set_AnyInterface_Succeeds()
         {
             // On all platforms, index 0 means "any interface"
diff --git a/src/native/libs/Common/pal_config.h.in b/src/native/libs/Common/pal_config.h.in
@@ -70,6 +70,7 @@
 #cmakedefine01 HAVE_SUPPORT_FOR_DUAL_MODE_IPV4_PACKET_INFO
 #cmakedefine01 HAVE_IN_PKTINFO
 #cmakedefine01 HAVE_IP_MREQN
+#cmakedefine01 HAVE_IP_MULTICAST_IFINDEX
 #cmakedefine01 HAVE_NETINET_TCP_VAR_H
 #cmakedefine01 HAVE_NETINET_UDP_VAR_H
 #cmakedefine01 HAVE_NETINET_IP_VAR_H
diff --git a/src/native/libs/System.Native/pal_networking.c b/src/native/libs/System.Native/pal_networking.c
@@ -1186,6 +1186,7 @@ int32_t SystemNative_GetIPv4MulticastOption(intptr_t socket, int32_t multicastOp
     return Error_SUCCESS;
 }
 
+
 int32_t SystemNative_SetIPv4MulticastOption(intptr_t socket, int32_t multicastOption, IPv4MulticastOption* option)
 {
     if (option == NULL)
@@ -1201,6 +1202,16 @@ int32_t SystemNative_SetIPv4MulticastOption(intptr_t socket, int32_t multicastOp
         return Error_EINVAL;
     }
 
+#if HAVE_IP_MULTICAST_IFINDEX
+    // Use IP_MULTICAST_IFINDEX when available for interface index specification
+    if (optionName == SocketOptionName_SO_IP_MULTICAST_IF)
+    {
+        uint32_t ifindex = (uint32_t)option->InterfaceIndex;
+        int err = setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IFINDEX, &ifindex, sizeof(ifindex));
+        return err == 0 ? Error_SUCCESS : SystemNative_ConvertErrorPlatformToPal(errno);
+    }
+#endif
+
 #if HAVE_IP_MREQN
     struct ip_mreqn opt;
     memset(&opt, 0, sizeof(struct ip_mreqn));
diff --git a/src/native/libs/configure.cmake b/src/native/libs/configure.cmake
@@ -82,6 +82,18 @@ check_c_source_compiles(
     "
     HAVE_IP_MREQN)
 
+check_c_source_compiles(
+    "
+    #include <sys/socket.h>
+    #include <${SOCKET_INCLUDES}>
+    int main(void)
+    {
+        int opt = IP_MULTICAST_IFINDEX;
+        return 0;
+    }
+    "
+    HAVE_IP_MULTICAST_IFINDEX)
+
 # /in_pktinfo
 
 check_c_source_compiles(

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,6 @@ public void MulticastOption_CreateSocketSetGetOption_GroupAndInterfaceIndex_SetS`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`[ConditionalFact(nameof(CanRunMulticastTests))]`
`73`		`- [ActiveIssue("https://github.com/dotnet/runtime/issues/113827", typeof(PlatformDetection), nameof(PlatformDetection.IsAppleMobile))]`
`74`	`73`	`public async Task MulticastInterface_Set_AnyInterface_Succeeds()`
`75`	`74`	`{`
`76`	`75`	`// On all platforms, index 0 means "any interface"`