Add _v4 suffix Socket::original_dst

As it only works on IPv4 sockets.

Author: Thomasdezeeuw

src/socket.rs

@@ -1681,8 +1681,8 @@ impl Socket {
             target_os = "windows",
         )
     ))]
-    pub fn original_dst(&self) -> io::Result<SockAddr> {
-        sys::original_dst(self.as_raw())
+    pub fn original_dst_v4(&self) -> io::Result<SockAddr> {
+        sys::original_dst_v4(self.as_raw())
     }
 }
 

src/sys/unix.rs

@@ -1380,7 +1380,7 @@ pub(crate) const fn to_mreqn(
     feature = "all",
     any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
-pub(crate) fn original_dst(fd: Socket) -> io::Result<SockAddr> {
+pub(crate) fn original_dst_v4(fd: Socket) -> io::Result<SockAddr> {
     // Safety: `getsockopt` initialises the `SockAddr` for us.
     unsafe {
         SockAddr::try_init(|storage, len| {
@@ -1401,7 +1401,7 @@ pub(crate) fn original_dst(fd: Socket) -> io::Result<SockAddr> {
 /// This value contains the original destination IPv6 address of the connection
 /// redirected using `ip6tables` `REDIRECT` or `TPROXY`.
 #[cfg(all(feature = "all", any(target_os = "android", target_os = "linux")))]
-pub(crate) fn original_dst_ipv6(fd: Socket) -> io::Result<SockAddr> {
+pub(crate) fn original_dst_v6(fd: Socket) -> io::Result<SockAddr> {
     // Safety: `getsockopt` initialises the `SockAddr` for us.
     unsafe {
         SockAddr::try_init(|storage, len| {

src/sys/windows.rs

@@ -883,7 +883,7 @@ pub(crate) fn to_mreqn(
 }
 
 #[cfg(feature = "all")]
-pub(crate) fn original_dst(socket: Socket) -> io::Result<SockAddr> {
+pub(crate) fn original_dst_v4(socket: Socket) -> io::Result<SockAddr> {
     unsafe {
         SockAddr::try_init(|storage, len| {
             syscall!(
@@ -903,7 +903,7 @@ pub(crate) fn original_dst(socket: Socket) -> io::Result<SockAddr> {
 }
 
 #[cfg(feature = "all")]
-pub(crate) fn original_dst_ipv6(socket: Socket) -> io::Result<SockAddr> {
+pub(crate) fn original_dst_v6(socket: Socket) -> io::Result<SockAddr> {
     unsafe {
         SockAddr::try_init(|storage, len| {
             syscall!(

tests/socket.rs

@@ -1654,21 +1654,21 @@ fn header_included_ipv6() {
         target_os = "windows"
     )
 ))]
-fn original_dst() {
+fn original_dst_v4() {
     let socket = Socket::new(Domain::IPV4, Type::STREAM, None).unwrap();
     #[cfg(not(target_os = "windows"))]
     let expected = Some(libc::ENOENT);
     #[cfg(target_os = "windows")]
     let expected = Some(windows_sys::Win32::Networking::WinSock::WSAEINVAL);
 
-    match socket.original_dst() {
-        Ok(_) => panic!("original_dst on non-redirected socket should fail"),
+    match socket.original_dst_v4() {
+        Ok(_) => panic!("original_dst_v4 on non-redirected socket should fail"),
         Err(err) => assert_eq!(err.raw_os_error(), expected),
     }
 
     let socket = Socket::new(Domain::IPV6, Type::STREAM, None).unwrap();
-    match socket.original_dst() {
-        Ok(_) => panic!("original_dst on non-redirected socket should fail"),
+    match socket.original_dst_v4() {
+        Ok(_) => panic!("original_dst_v4 on non-redirected socket should fail"),
         Err(err) => assert_eq!(err.raw_os_error(), expected),
     }
 }