diff --git a/src/genetlink/msg.rs b/src/genetlink/msg.rs index 094e7e6..760ca2e 100644 --- a/src/genetlink/msg.rs +++ b/src/genetlink/msg.rs @@ -26,7 +26,7 @@ impl GeNlMsgHeader { #[inline] pub fn write(&self, writer: &mut impl std::io::Write) -> Result { - crate::netlink::utils::transprose_write(self, writer) + crate::netlink::utils::transpose_write(self, writer) } #[inline] diff --git a/src/netlink/attr.rs b/src/netlink/attr.rs index 2e644ec..c76e079 100644 --- a/src/netlink/attr.rs +++ b/src/netlink/attr.rs @@ -13,7 +13,7 @@ impl NlAttribute { #[inline] pub fn write(&self, writer: &mut impl std::io::Write) -> Result { - super::utils::transprose_write(self, writer) + super::utils::transpose_write(self, writer) } #[inline] @@ -116,7 +116,7 @@ pub fn write_u8_attr( written_bytes += attr.write(writer)?; written_bytes += writer.write(&u8::to_le_bytes(value))?; - written_bytes = nl_attr_align_writer(writer, written_bytes)?; + written_bytes += nl_attr_align_writer(writer, written_bytes)?; Ok(written_bytes) } @@ -136,7 +136,7 @@ pub fn write_u16_attr( written_bytes += attr.write(writer)?; written_bytes += writer.write(&u16::to_le_bytes(value))?; - written_bytes = nl_attr_align_writer(writer, written_bytes)?; + written_bytes += nl_attr_align_writer(writer, written_bytes)?; Ok(written_bytes) } @@ -156,7 +156,7 @@ pub fn write_be_u16_attr( written_bytes += attr.write(writer)?; written_bytes += writer.write(&value.to_be_bytes())?; - written_bytes = nl_attr_align_writer(writer, written_bytes)?; + written_bytes += nl_attr_align_writer(writer, written_bytes)?; Ok(written_bytes) } @@ -176,7 +176,7 @@ pub fn write_u32_attr( written_bytes += attr.write(writer)?; written_bytes += writer.write(&u32::to_le_bytes(value))?; - written_bytes = nl_attr_align_writer(writer, written_bytes)?; + written_bytes += nl_attr_align_writer(writer, written_bytes)?; Ok(written_bytes) } @@ -188,15 +188,15 @@ pub fn write_u64_attr( value: u64, ) -> Result { let mut written_bytes = 0; - let attr = crate::netlink::attr::NlAttribute { - len: crate::netlink::attr::set_attr_length(8) as u16, + let attr = NlAttribute { + len: set_attr_length(8) as u16, r#type, }; written_bytes += attr.write(writer)?; written_bytes += writer.write(&u64::to_le_bytes(value))?; - written_bytes = crate::netlink::attr::nl_attr_align_writer(writer, written_bytes)?; + written_bytes += nl_attr_align_writer(writer, written_bytes)?; Ok(written_bytes) } @@ -208,15 +208,15 @@ pub fn write_u128_attr( value: u128, ) -> Result { let mut written_bytes = 0; - let attr = crate::netlink::attr::NlAttribute { - len: crate::netlink::attr::set_attr_length(16) as u16, + let attr = NlAttribute { + len: set_attr_length(16) as u16, r#type, }; written_bytes += attr.write(writer)?; written_bytes += writer.write(&u128::to_le_bytes(value))?; - written_bytes = crate::netlink::attr::nl_attr_align_writer(writer, written_bytes)?; + written_bytes += nl_attr_align_writer(writer, written_bytes)?; Ok(written_bytes) } @@ -236,7 +236,7 @@ pub fn write_i32_attr( written_bytes += attr.write(writer)?; written_bytes += writer.write(&i32::to_le_bytes(value))?; - written_bytes = nl_attr_align_writer(writer, written_bytes)?; + written_bytes += nl_attr_align_writer(writer, written_bytes)?; Ok(written_bytes) } @@ -256,7 +256,7 @@ pub fn write_array_attr( written_bytes += attr.write(writer)?; written_bytes += writer.write(&value)?; - written_bytes = nl_attr_align_writer(writer, written_bytes)?; + written_bytes += nl_attr_align_writer(writer, written_bytes)?; Ok(written_bytes) } @@ -276,7 +276,7 @@ pub fn write_slice_attr( written_bytes += attr.write(writer)?; written_bytes += writer.write(value)?; - written_bytes = nl_attr_align_writer(writer, written_bytes)?; + written_bytes += nl_attr_align_writer(writer, written_bytes)?; Ok(written_bytes) } @@ -297,7 +297,7 @@ pub fn write_string_attr( written_bytes += writer.write(str.as_bytes())?; written_bytes += writer.write(b"\0")?; - written_bytes = nl_attr_align_writer(writer, written_bytes)?; + written_bytes += nl_attr_align_writer(writer, written_bytes)?; Ok(written_bytes) } @@ -318,7 +318,7 @@ pub fn write_ip4_address_attr( written_bytes += attr.write(writer)?; written_bytes += writer.write(&ip_address.octets())?; - written_bytes = nl_attr_align_writer(writer, written_bytes)?; + written_bytes += nl_attr_align_writer(writer, written_bytes)?; Ok(written_bytes) } @@ -339,7 +339,7 @@ pub fn write_ip6_address_attr( written_bytes += attr.write(writer)?; written_bytes += writer.write(&ip_address.octets())?; - written_bytes = nl_attr_align_writer(writer, written_bytes)?; + written_bytes += nl_attr_align_writer(writer, written_bytes)?; Ok(written_bytes) } diff --git a/src/netlink/msg.rs b/src/netlink/msg.rs index 803c13f..5710428 100644 --- a/src/netlink/msg.rs +++ b/src/netlink/msg.rs @@ -77,7 +77,7 @@ impl NlMsgHeader { #[inline] pub fn write(&self, writer: &mut impl std::io::Write) -> Result { - super::utils::transprose_write(self, writer) + super::utils::transpose_write(self, writer) } #[inline] diff --git a/src/netlink/utils.rs b/src/netlink/utils.rs index 975b8e0..51b5352 100644 --- a/src/netlink/utils.rs +++ b/src/netlink/utils.rs @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT /// write a structure to a bytes writter #[inline] -pub fn transprose_write( +pub fn transpose_write( value: &T, writer: &mut impl std::io::Write, ) -> Result { diff --git a/src/netns.rs b/src/netns.rs index 3247d17..d946a1f 100644 --- a/src/netns.rs +++ b/src/netns.rs @@ -606,7 +606,7 @@ pub fn execute_into_netns( } Err(error) => { let inner_error: NetnsInnerExecutionError = error.into(); - _ = crate::netlink::utils::transprose_write( + _ = crate::netlink::utils::transpose_write( &inner_error, &mut core::slice::from_raw_parts_mut( shared, @@ -694,7 +694,7 @@ pub async fn async_execute_into_netns( } Err(error) => { let inner_error: NetnsInnerExecutionError = error.into(); - _ = crate::netlink::utils::transprose_write( + _ = crate::netlink::utils::transpose_write( &inner_error, &mut core::slice::from_raw_parts_mut( shared, diff --git a/src/rtnetlink/addr.rs b/src/rtnetlink/addr.rs index 5f61e2a..8e09450 100644 --- a/src/rtnetlink/addr.rs +++ b/src/rtnetlink/addr.rs @@ -92,7 +92,7 @@ impl IfAddrMsg { #[inline] pub fn write(&self, writer: &mut impl std::io::Write) -> Result { - crate::netlink::utils::transprose_write(self, writer) + crate::netlink::utils::transpose_write(self, writer) } #[inline] diff --git a/src/rtnetlink/link/mod.rs b/src/rtnetlink/link/mod.rs index 98117fe..81cc853 100644 --- a/src/rtnetlink/link/mod.rs +++ b/src/rtnetlink/link/mod.rs @@ -50,7 +50,7 @@ impl IfInfoMsg { #[inline] pub fn write(&self, writer: &mut impl std::io::Write) -> Result { - crate::netlink::utils::transprose_write(self, writer) + crate::netlink::utils::transpose_write(self, writer) } #[inline] diff --git a/src/rtnetlink/neigh.rs b/src/rtnetlink/neigh.rs index 35a0349..15eadf0 100644 --- a/src/rtnetlink/neigh.rs +++ b/src/rtnetlink/neigh.rs @@ -58,7 +58,7 @@ impl NdMsg { #[inline] pub fn write(&self, writer: &mut impl std::io::Write) -> Result { - crate::netlink::utils::transprose_write(self, writer) + crate::netlink::utils::transpose_write(self, writer) } #[inline] diff --git a/src/rtnetlink/route.rs b/src/rtnetlink/route.rs index ee10bb7..e20bce8 100644 --- a/src/rtnetlink/route.rs +++ b/src/rtnetlink/route.rs @@ -103,7 +103,7 @@ impl RtMsg { #[inline] pub fn write(&self, writer: &mut impl std::io::Write) -> Result { - crate::netlink::utils::transprose_write(self, writer) + crate::netlink::utils::transpose_write(self, writer) } #[inline] @@ -143,7 +143,7 @@ pub struct RtaCacheInfo { impl RtaCacheInfo { #[inline] pub fn write(&self, writer: &mut impl std::io::Write) -> Result { - crate::netlink::utils::transprose_write(self, writer) + crate::netlink::utils::transpose_write(self, writer) } #[inline] diff --git a/src/wireguard.rs b/src/wireguard.rs index 3059b86..8e2bc25 100644 --- a/src/wireguard.rs +++ b/src/wireguard.rs @@ -427,7 +427,7 @@ fn write_socket_address_attr( sin_addr: socket_addr_v4.ip().octets(), sin_zero: [0; 8], }; - written_bytes += crate::netlink::utils::transprose_write(&socket_address, writter)?; + written_bytes += crate::netlink::utils::transpose_write(&socket_address, writter)?; } core::net::SocketAddr::V6(socket_addr_v6) => { written_bytes += crate::netlink::attr::NlAttribute { @@ -444,7 +444,7 @@ fn write_socket_address_attr( sin6_addr: socket_addr_v6.ip().octets(), sin6_scope_id: 0, }; - written_bytes += crate::netlink::utils::transprose_write(&socket_address, writter)?; + written_bytes += crate::netlink::utils::transpose_write(&socket_address, writter)?; } };