fix(qudp): windows unspecified ip send error (#304)

genmeta · Nov 11, 2024 · 519706b · 519706b
1 parent bff2994
commit 519706b
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 24 deletions.
diff --git a/h3-shim/examples/h3-client.rs b/h3-shim/examples/h3-client.rs
@@ -91,6 +91,7 @@ async fn run() -> Result<(), Box<dyn core::error::Error>> {
         .without_cert()
         .with_keylog(opt.key_log_file)
         .with_alpns([ALPN.into()])
+        .bind(&opt.bind[..])?
         .build();
     let conn = quic_client.connect(auth.host(), addr)?;
 

diff --git a/qudp/examples/receive.rs b/qudp/examples/receive.rs
@@ -4,7 +4,7 @@ use qudp::UdpSocketController;
 #[derive(Parser, Debug)]
 #[command(version, about, long_about = None)]
 struct Args {
-    #[arg(short,long, default_value_t = String::from("127.0.0.1:12345"))]
+    #[arg(short,long, default_value_t = String::from("[::1]:12345"))]
     bind: String,
 }
 

diff --git a/qudp/examples/send.rs b/qudp/examples/send.rs
@@ -6,10 +6,10 @@ use qudp::{PacketHeader, UdpSocketController};
 #[derive(Parser, Debug)]
 #[command(version, about, long_about = None)]
 struct Args {
-    #[arg(long, default_value_t = String::from("127.0.0.1:0"))]
+    #[arg(long, default_value_t = String::from("[::]:0"))]
     src: String,
 
-    #[arg(long, default_value_t = String::from("127.0.0.1:12345"))]
+    #[arg(long, default_value_t = String::from("[::1]:12345"))]
     dst: String,
 
     #[arg(long, default_value_t = 1200)]

diff --git a/qudp/src/windows.rs b/qudp/src/windows.rs
@@ -138,27 +138,30 @@ impl Io for UdpSocketController {
 
             let mut cmsghdr = unsafe { cmsghdr::CmsgHdr::new(&mut wsa_msg) };
 
-            let src = socket2::SockAddr::from(hdr.src);
-
-            match src.family() {
-                WinSock::AF_INET => {
-                    let src_ip = unsafe { ptr::read(src.as_ptr() as *const WinSock::SOCKADDR_IN) };
-                    let pktinfo = WinSock::IN_PKTINFO {
-                        ipi_addr: src_ip.sin_addr,
-                        ipi_ifindex: 0,
-                    };
-                    cmsghdr.append(WinSock::IPPROTO_IP, WinSock::IP_PKTINFO, pktinfo);
-                }
-                WinSock::AF_INET6 => {
-                    let src_ip = unsafe { ptr::read(src.as_ptr() as *const WinSock::SOCKADDR_IN6) };
-                    let pktinfo = WinSock::IN6_PKTINFO {
-                        ipi6_addr: src_ip.sin6_addr,
-                        ipi6_ifindex: unsafe { src_ip.Anonymous.sin6_scope_id },
-                    };
-                    cmsghdr.append(WinSock::IPPROTO_IPV6, WinSock::IPV6_PKTINFO, pktinfo);
-                }
-                _ => {
-                    return Err(io::Error::from(io::ErrorKind::InvalidInput));
+            if !hdr.src.ip().is_unspecified() {
+                let src = socket2::SockAddr::from(hdr.src);
+                match src.family() {
+                    WinSock::AF_INET => {
+                        let src_ip =
+                            unsafe { ptr::read(src.as_ptr() as *const WinSock::SOCKADDR_IN) };
+                        let pktinfo = WinSock::IN_PKTINFO {
+                            ipi_addr: src_ip.sin_addr,
+                            ipi_ifindex: 0,
+                        };
+                        cmsghdr.append(WinSock::IPPROTO_IP, WinSock::IP_PKTINFO, pktinfo);
+                    }
+                    WinSock::AF_INET6 => {
+                        let src_ip =
+                            unsafe { ptr::read(src.as_ptr() as *const WinSock::SOCKADDR_IN6) };
+                        let pktinfo = WinSock::IN6_PKTINFO {
+                            ipi6_addr: src_ip.sin6_addr,
+                            ipi6_ifindex: unsafe { src_ip.Anonymous.sin6_scope_id },
+                        };
+                        cmsghdr.append(WinSock::IPPROTO_IPV6, WinSock::IPV6_PKTINFO, pktinfo);
+                    }
+                    _ => {
+                        return Err(io::Error::from(io::ErrorKind::InvalidInput));
+                    }
                 }
             }