Lochnair-Labs/sqm-autorate-rust
2
0 Fork 0
Code Issues 5 Pull Requests Actions 14 Packages Projects Releases Wiki Activity

refactor(netlink): Migrate interface functions

Browse Source
This commit is contained in:
Nils Andreas Svee committed 2026-02-21 00:22:57 +07:00
1 parent ca1bc8f8b5
commit 121e8cda40
1 file changed
+34 -38
Download Patch File Download Diff File Expand all files Collapse all files
src/netlink.rs
+34 -38
View File
@@ -154,27 +154,29 @@ impl Netlink {
} }
pub fn get_interface_stats(ifname: &str) -> Result<RtnlLinkStats64, NetlinkError> { pub fn get_interface_stats(ifname: &str) -> Result<RtnlLinkStats64, NetlinkError> {
let mut socket = NlSocketHandle::connect(NlFamily::Route, None, &[])?; let (socket, _) = NlRouter::connect(NlFamily::Route, None, Groups::empty()).unwrap();
Self::nl_interface_get(&mut socket, ifname)?; let recv = Self::nl_interface_get(&socket, ifname)?;
for response in socket.iter(false) { for response in recv {
let header: Nlmsghdr<Rtm, Ifinfomsg> = response?; let header: Nlmsghdr<Rtm, Ifinfomsg> = response?;
if header.nl_type != Rtm::Newlink { if header.nl_type() != &Rtm::Newlink {
return Err(NetlinkError::WrongType { return Err(NetlinkError::WrongType {
expected: Rtm::Newlink, expected: Rtm::Newlink,
found: header.nl_type, found: *header.nl_type(),
}); });
} }
if let NlPayload::Payload(p) = header.nl_payload { if let NlPayload::Payload(p) = header.nl_payload() {
for attr in p.rtattrs.iter() { for attr in p.rtattrs().iter() {
if attr.rta_type == Ifla::Stats64 { if attr.rta_type() == &Ifla::Stats64 {
let buf = attr.rta_payload.as_ref(); let buf = attr.rta_payload().as_ref();
let stats: RtnlLinkStats64 = bincode::borrow_decode_from_slice(buf, bincode::config::standard()) let stats: RtnlLinkStats64 =
.map_err(|e| NetlinkError::Deserialization(Box::new(e)))?.0; bincode::borrow_decode_from_slice(buf, bincode::config::standard())
.map_err(|e| NetlinkError::Deserialization(Box::new(e)))?
.0;
return Ok(stats); return Ok(stats);
} }
@@ -186,46 +188,40 @@ impl Netlink {
} }
pub fn qdisc_from_ifindex(ifindex: i32) -> Result<Qdisc, NetlinkError> { pub fn qdisc_from_ifindex(ifindex: i32) -> Result<Qdisc, NetlinkError> {
let mut socket = NlSocketHandle::connect(NlFamily::Route, None, &[])?; let (socket, _) = NlRouter::connect(NlFamily::Route, None, Groups::empty()).unwrap();
let tc_msg = Tcmsg::new( let tc_msg = TcmsgBuilder::default()
u8::from(RtAddrFamily::Unspecified), .tcm_family(u8::from(RtAddrFamily::Unspecified))
0, .tcm_ifindex(ifindex)
0, .tcm_handle(0)
0, .tcm_parent(0)
0, .tcm_info(0)
RtBuffer::new(), .rtattrs(RtBuffer::new())
); .build()
.unwrap();
let nlhdr = Nlmsghdr::new( let recv = socket.send::<_, _, Rtm, Tcmsg>(
None,
Rtm::Getqdisc, Rtm::Getqdisc,
NlmFFlags::new(&[NlmF::Request, NlmF::Dump]), NlmF::REQUEST | NlmF::DUMP,
None,
None,
NlPayload::Payload(tc_msg), NlPayload::Payload(tc_msg),
); )?;
if let Err(e) = socket.send(nlhdr) { for response in recv {
return Err(NetlinkError::Serialization(e));
}
for response in socket.iter(false) {
let header: Nlmsghdr<Rtm, Tcmsg> = response?; let header: Nlmsghdr<Rtm, Tcmsg> = response?;
if let NlPayload::Payload(p) = header.nl_payload { if let NlPayload::Payload(p) = header.nl_payload() {
if header.nl_type != Rtm::Newqdisc { if header.nl_type() != &Rtm::Newqdisc {
return Err(NetlinkError::WrongType { return Err(NetlinkError::WrongType {
expected: Rtm::Newqdisc, expected: Rtm::Newqdisc,
found: header.nl_type, found: *header.nl_type(),
}); });
} }
if p.tcm_ifindex == ifindex { if *p.tcm_ifindex() == ifindex {
let mut _type = ""; let mut _type = "";
for attr in p.rtattrs.iter() { for attr in p.rtattrs().iter() {
if attr.rta_type == Tca::Kind { if attr.rta_type() == &Tca::Kind {
let buff = attr.rta_payload.as_ref(); let buff = attr.rta_payload().as_ref();
_type = std::str::from_utf8(buff)?.trim_end_matches('\0'); _type = std::str::from_utf8(buff)?.trim_end_matches('\0');
// Null terminator is valid UTF-8, but breaks comparison, so we remove it // Null terminator is valid UTF-8, but breaks comparison, so we remove it
} }