Skip to content

fix write helpers #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hcaumeil merged 1 commit into from
Jun 5, 2026
Merged

fix write helpers #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/genetlink/msg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ impl GeNlMsgHeader {

#[inline]
pub fn write(&self, writer: &mut impl std::io::Write) -> Result<usize, std::io::Error> {
crate::netlink::utils::transprose_write(self, writer)
crate::netlink::utils::transpose_write(self, writer)
}

#[inline]
Expand Down
34 changes: 17 additions & 17 deletions src/netlink/attr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ impl NlAttribute {

#[inline]
pub fn write(&self, writer: &mut impl std::io::Write) -> Result<usize, std::io::Error> {
super::utils::transprose_write(self, writer)
super::utils::transpose_write(self, writer)
}

#[inline]
Expand Down Expand Up @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -188,15 +188,15 @@ pub fn write_u64_attr(
value: u64,
) -> Result<usize, std::io::Error> {
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)
}
Expand All @@ -208,15 +208,15 @@ pub fn write_u128_attr(
value: u128,
) -> Result<usize, std::io::Error> {
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)
}
Expand All @@ -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)
}
Expand All @@ -256,7 +256,7 @@ pub fn write_array_attr<const N: usize>(
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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion src/netlink/msg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ impl NlMsgHeader {

#[inline]
pub fn write(&self, writer: &mut impl std::io::Write) -> Result<usize, std::io::Error> {
super::utils::transprose_write(self, writer)
super::utils::transpose_write(self, writer)
}

#[inline]
Expand Down
2 changes: 1 addition & 1 deletion src/netlink/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT
/// write a structure to a bytes writter
#[inline]
pub fn transprose_write<T: Sized>(
pub fn transpose_write<T: Sized>(
value: &T,
writer: &mut impl std::io::Write,
) -> Result<usize, std::io::Error> {
Expand Down
4 changes: 2 additions & 2 deletions src/netns.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@ pub fn execute_into_netns<I, P>(
}
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,
Expand Down Expand Up @@ -694,7 +694,7 @@ pub async fn async_execute_into_netns<I, P>(
}
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,
Expand Down
2 changes: 1 addition & 1 deletion src/rtnetlink/addr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ impl IfAddrMsg {

#[inline]
pub fn write(&self, writer: &mut impl std::io::Write) -> Result<usize, std::io::Error> {
crate::netlink::utils::transprose_write(self, writer)
crate::netlink::utils::transpose_write(self, writer)
}

#[inline]
Expand Down
2 changes: 1 addition & 1 deletion src/rtnetlink/link/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ impl IfInfoMsg {

#[inline]
pub fn write(&self, writer: &mut impl std::io::Write) -> Result<usize, std::io::Error> {
crate::netlink::utils::transprose_write(self, writer)
crate::netlink::utils::transpose_write(self, writer)
}

#[inline]
Expand Down
2 changes: 1 addition & 1 deletion src/rtnetlink/neigh.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ impl NdMsg {

#[inline]
pub fn write(&self, writer: &mut impl std::io::Write) -> Result<usize, std::io::Error> {
crate::netlink::utils::transprose_write(self, writer)
crate::netlink::utils::transpose_write(self, writer)
}

#[inline]
Expand Down
4 changes: 2 additions & 2 deletions src/rtnetlink/route.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ impl RtMsg {

#[inline]
pub fn write(&self, writer: &mut impl std::io::Write) -> Result<usize, std::io::Error> {
crate::netlink::utils::transprose_write(self, writer)
crate::netlink::utils::transpose_write(self, writer)
}

#[inline]
Expand Down Expand Up @@ -143,7 +143,7 @@ pub struct RtaCacheInfo {
impl RtaCacheInfo {
#[inline]
pub fn write(&self, writer: &mut impl std::io::Write) -> Result<usize, std::io::Error> {
crate::netlink::utils::transprose_write(self, writer)
crate::netlink::utils::transpose_write(self, writer)
}

#[inline]
Expand Down
4 changes: 2 additions & 2 deletions src/wireguard.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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)?;
}
};

Expand Down