Add windows original dst

Signed-off-by: keithmattix <[email protected]>

Author: keithmattix

src/sys/windows.rs

@@ -955,11 +955,22 @@ impl crate::Socket {
     #[cfg(feature = "all")]
     #[cfg_attr(docsrs, doc(cfg(all(windows, feature = "all"))))]
     pub fn original_dst_ipv6(&self) -> io::Result<SockAddr> {
-        use windows_sys::Win32::Networking::WinSock::SOL_IPV6;
-
         unsafe {
-            getsockopt::<SockAddr>(self.as_raw(), SOL_IPV6 as i32, IP6T_SO_ORIGINAL_DST as i32)
+            SockAddr::try_init(|storage, len| {
+                syscall!(
+                    getsockopt(
+                        self.as_raw(),
+                        SOL_IP as i32,
+                        IP6T_SO_ORIGINAL_DST as i32,
+                        storage.cast(),
+                        len,
+                ),
+                PartialEq::eq,
+                SOCKET_ERROR
+            )
+            })
         }
+        .map(|(_, addr)| addr)
     }
 
     /// Returns the [`Protocol`] of this socket by checking the `SO_PROTOCOL_INFOW`

tests/socket.rs

@@ -42,6 +42,8 @@ use std::num::NonZeroUsize;
 use std::os::unix::io::AsRawFd;
 #[cfg(windows)]
 use std::os::windows::io::AsRawSocket;
+use windows_sys::Win32::Networking::WinSock::WSAEINVAL;
+
 #[cfg(unix)]
 use std::path::Path;
 use std::str;
@@ -1607,59 +1609,36 @@ fn original_dst() {
 }
 
 #[test]
-#[cfg(all(
-    feature = "all",
-    target_os = "windows"
-))]
+#[cfg(all(feature = "all", target_os = "windows"))]
 fn original_dst() {
-    use windows_sys::Win32::Networking::WinSock::SOMAXCONN;
-
-
-    let socket = Socket::new(Domain::IPV4, Type::STREAM, Some(Protocol::TCP)).unwrap();
-    let addr = SocketAddr::from(([127, 0, 0, 1], 8000));
-    match socket.bind(&SockAddr::from(addr)) {
-        Ok(_) => {}
-        Err(err) => panic!("failed to bind socket: {}", err),
-    };
-    match socket.listen(SOMAXCONN as i32) {
-        Ok(_) => {}
-        Err(err) => panic!("failed to listen on socket: {}", err),
-    };
-    // Socket must be in an accepting state for SOL_IP and SO_ORIGINAL_DST
-    match socket.accept() {
-        Ok((socket, _)) => {
-            match socket.original_dst() {
-                Ok(addr) => {
-                    println!("Original destination: {:?}", addr);
-                }
-                Err(err) => panic!("failed to get original destination: {}", err),
-            }
-        }
-        Err(err) => panic!("failed to accept connection: {}", err),
-
-    };
+    let socket = Socket::new(Domain::IPV6, Type::STREAM, None).unwrap();
+    match socket.original_dst() {
+        Ok(_) => panic!("original_dst on non-redirected socket should fail"),
+        Err(err) => assert_eq!(err.raw_os_error(), Some(WSAEINVAL)),
+    }
 
-    // let socket = Socket::new(Domain::IPV6, Type::STREAM, None).unwrap();
-    // match socket.original_dst() {
-    //     Ok(_) => panic!("original_dst on non-redirected socket should fail"),
-    //     Err(err) => assert_eq!(err.raw_os_error(), Some(SOCKET_ERROR)),
-    // }
+    // Not supported on IPv6 socket.
+    let socket = Socket::new(Domain::IPV6, Type::STREAM, None).unwrap();
+    match socket.original_dst_ipv6() {
+        Ok(_) => panic!("original_dst_ipv6 on non-redirected socket should fail"),
+        Err(err) => assert_eq!(err.raw_os_error(), Some(WSAEINVAL)),
+    }
 }
 
 #[test]
-#[cfg(all(feature = "all", any(target_os = "android", target_os = "linux")))]
+#[cfg(all(feature = "all", target_os = "windows"))]
 fn original_dst_ipv6() {
     let socket = Socket::new(Domain::IPV6, Type::STREAM, None).unwrap();
     match socket.original_dst_ipv6() {
         Ok(_) => panic!("original_dst_ipv6 on non-redirected socket should fail"),
-        Err(err) => assert_eq!(err.raw_os_error(), Some(libc::ENOENT)),
+        Err(err) => assert_eq!(err.raw_os_error(), Some(WSAEINVAL)),
     }
 
     // Not supported on IPv4 socket.
     let socket = Socket::new(Domain::IPV4, Type::STREAM, None).unwrap();
     match socket.original_dst_ipv6() {
         Ok(_) => panic!("original_dst_ipv6 on non-redirected socket should fail"),
-        Err(err) => assert_eq!(err.raw_os_error(), Some(libc::EOPNOTSUPP)),
+        Err(err) => assert_eq!(err.raw_os_error(), Some(WSAEINVAL)),
     }
 }