add multicast support to win32 target (#13325)

crystal-lang · Apr 24, 2023 · 264daee · 264daee
1 parent 01c8f9f
commit 264daee
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 5 deletions.
diff --git a/spec/std/socket/udp_socket_spec.cr b/spec/std/socket/udp_socket_spec.cr
@@ -72,7 +72,6 @@ describe UDPSocket, tags: "network" do
       server.close
     end
 
-    {% unless flag?(:win32) %}
     if {{ flag?(:darwin) }} && family == Socket::Family::INET6
       # Darwin is failing to join IPv6 multicast groups on older versions.
       # However this is known to work on macOS Mojave with Darwin 18.2.0.
@@ -160,13 +159,13 @@ describe UDPSocket, tags: "network" do
           sleep 100.milliseconds
           udp.close
         end
-        expect_raises(IO::Error, "Closed stream") { udp.receive }
+        expect_raises(IO::Error) { udp.receive }
+        udp.closed?.should be_true
       end
     end
-    {% end %}
   end
 
-  {% if flag?(:linux) %}
+  {% if flag?(:linux) || flag?(:win32) %}
     it "sends broadcast message" do
       port = unused_local_port
 

diff --git a/src/lib_c/x86_64-windows-msvc/c/ws2def.cr b/src/lib_c/x86_64-windows-msvc/c/ws2def.cr
@@ -111,7 +111,28 @@ lib LibC
 
   SIO_GET_EXTENSION_FUNCTION_POINTER = IOC_INOUT | IOC_WS2 | 6
 
-  IPPROTO_IP = 0
+  IPPROTO_IP   =  0
+  IPPROTO_IPV6 = 41
+
+  IP_MULTICAST_IF   = 9
+  IPV6_MULTICAST_IF = 9
+
+  IP_MULTICAST_TTL    = 10
+  IPV6_MULTICAST_HOPS = 10
+
+  IP_MULTICAST_LOOP   = 11
+  IPV6_MULTICAST_LOOP = 11
+
+  IP_ADD_MEMBERSHIP  = 12
+  IP_DROP_MEMBERSHIP = 13
+
+  # JOIN and LEAVE are the same as ADD and DROP
+  # https://learn.microsoft.com/en-us/windows/win32/winsock/ipproto-ipv6-socket-options
+  IPV6_ADD_MEMBERSHIP = 12
+  IPV6_JOIN_GROUP     = 12
+
+  IPV6_DROP_MEMBERSHIP = 13
+  IPV6_LEAVE_GROUP     = 13
 
   enum IPPROTO
     IPPROTO_HOPOPTS  =   0 # IPv6 Hop-by-Hop options

diff --git a/src/lib_c/x86_64-windows-msvc/c/ws2ipdef.cr b/src/lib_c/x86_64-windows-msvc/c/ws2ipdef.cr
@@ -17,6 +17,18 @@ lib LibC
     sin_zero : StaticArray(CHAR, 8)
   end
 
+  # https://learn.microsoft.com/en-us/windows/win32/api/ws2ipdef/ns-ws2ipdef-ip_mreq
+  struct IpMreq
+    imr_multiaddr : InAddr
+    imr_interface : InAddr
+  end
+
+  # https://learn.microsoft.com/en-us/windows/win32/api/ws2ipdef/ns-ws2ipdef-ipv6_mreq
+  struct Ipv6Mreq
+    ipv6mr_multiaddr : In6Addr
+    ipv6mr_interface : ULong
+  end
+
   TCP_EXPEDITED_1122       = 0x0002
   TCP_KEEPALIVE            =      3
   TCP_MAXSEG               =      4