Add direct conversion from SockAddrIn(6) to SocketAddr (#2474)

nix-rust · Aug 23, 2024 · 43b7a74 · 43b7a74
1 parent 62ad90a
commit 43b7a74
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/changelog/2474.added.md b/changelog/2474.added.md
@@ -0,0 +1 @@
+Add `From` trait implementation between `SocketAddr` and `Sockaddr`, `Sockaddr6`
diff --git a/src/sys/socket/addr.rs b/src/sys/socket/addr.rs
@@ -919,6 +919,13 @@ impl From<SockaddrIn> for net::SocketAddrV4 {
     }
 }
 
+#[cfg(feature = "net")]
+impl From<SockaddrIn> for net::SocketAddr {
+    fn from(addr: SockaddrIn) -> Self {
+        net::SocketAddr::from(net::SocketAddrV4::from(addr))
+    }
+}
+
 #[cfg(feature = "net")]
 impl From<SockaddrIn> for libc::sockaddr_in {
     fn from(sin: SockaddrIn) -> libc::sockaddr_in {
@@ -1075,6 +1082,13 @@ impl From<SockaddrIn6> for net::SocketAddrV6 {
     }
 }
 
+#[cfg(feature = "net")]
+impl From<SockaddrIn6> for net::SocketAddr {
+    fn from(addr: SockaddrIn6) -> Self {
+        net::SocketAddr::from(net::SocketAddrV6::from(addr))
+    }
+}
+
 #[cfg(feature = "net")]
 impl std::str::FromStr for SockaddrIn6 {
     type Err = net::AddrParseError;