udp: tolerate true IPv4 dest addrs when dual-stack

quinn-rs · Dec 31, 2023 · 1238562 · 1238562
1 parent fe75d8b
commit 1238562
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/quinn-udp/tests/tests.rs b/quinn-udp/tests/tests.rs
@@ -1,6 +1,6 @@
 use std::{
     io::IoSliceMut,
-    net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6, UdpSocket},
+    net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6, UdpSocket},
     slice,
 };
 
@@ -125,7 +125,9 @@ fn test_send_recv(send: &Socket, recv: &Socket, transmit: Transmit) {
     let dst = meta.dst_ip.unwrap();
     match (send_v6, recv_v6) {
         (_, false) => assert_eq!(dst, Ipv4Addr::LOCALHOST),
-        (false, true) => assert_eq!(dst, Ipv4Addr::LOCALHOST.to_ipv6_mapped()),
+        // Windows gives us real IPv4 addrs, whereas *nix use IPv6-mapped IPv4
+        // addrs. Canonicalize to IPv6-mapped for robustness.
+        (false, true) => assert_eq!(ip_to_v6_mapped(dst), Ipv4Addr::LOCALHOST.to_ipv6_mapped()),
         (true, true) => assert_eq!(dst, Ipv6Addr::LOCALHOST),
     }
 }
@@ -136,3 +138,10 @@ fn to_v6_mapped(x: SocketAddr) -> SocketAddr {
         SocketAddr::V6(_) => x,
     }
 }
+
+fn ip_to_v6_mapped(x: IpAddr) -> IpAddr {
+    match x {
+        IpAddr::V4(x) => IpAddr::V6(x.to_ipv6_mapped()),
+        IpAddr::V6(_) => x,
+    }
+}