g3-socket: fix winsock usage

bytedance · Oct 23, 2024 · 83919ec · 83919ec
1 parent 85e4ed2
commit 83919ec
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/lib/g3-socket/src/bind.rs b/lib/g3-socket/src/bind.rs
@@ -67,15 +67,13 @@ impl BindAddr {
                 #[cfg(any(target_os = "linux", target_os = "android"))]
                 set_bind_address_no_port(socket, true)?;
                 #[cfg(windows)]
-                set_reuse_unicastport(socket, true)?;
+                let _ = set_reuse_unicastport(socket, true)?;
                 let addr: SockAddr = SocketAddr::new(*ip, 0).into();
                 socket.bind(&addr)
             }
             #[cfg(any(target_os = "linux", target_os = "android"))]
             BindAddr::Interface(name) => {
                 set_bind_address_no_port(socket, true)?;
-                #[cfg(windows)]
-                set_reuse_unicastport(socket, true)?;
                 socket.bind_device(Some(name.as_bytes()))
             }
         }

diff --git a/lib/g3-socket/src/raw/windows.rs b/lib/g3-socket/src/raw/windows.rs
@@ -16,7 +16,7 @@
 
 use std::io::{self, IoSlice};
 use std::net::SocketAddr;
-use std::os::windows::io::{AsRawSocket, FromRawSocket};
+use std::os::windows::io::{AsRawSocket, FromRawSocket, IntoRawSocket};
 
 use socket2::{MsgHdr, SockAddr, Socket};
 
@@ -37,7 +37,6 @@ impl RawSocket {
     }
 }
 
-#[cfg(unix)]
 impl Drop for RawSocket {
     fn drop(&mut self) {
         if let Some(s) = self.inner.take() {

diff --git a/lib/g3-socket/src/udp.rs b/lib/g3-socket/src/udp.rs
@@ -191,11 +191,15 @@ mod tests {
             Default::default(),
         )
         .unwrap();
-        let local_addr = socket.local_addr().unwrap();
-        assert_eq!(local_addr.port(), 0);
+        let local_addr1 = socket.local_addr().unwrap();
+        #[cfg(unix)]
+        assert_eq!(local_addr1.port(), 0);
+        #[cfg(windows)]
+        assert_ne!(local_addr1.port(), 0);
         socket.connect(peer_addr).unwrap();
-        let local_addr = socket.local_addr().unwrap();
-        assert_ne!(local_addr.port(), 0);
+        let local_addr2 = socket.local_addr().unwrap();
+        assert_ne!(local_addr2.port(), 0);
+        assert_ne!(local_addr1, local_addr2);
     }
 
     #[test]