Use latest rust-netlink crates

cathay4t · cathay4t · commit 9373d773d952 · 2025-08-27T22:07:02.000+08:00
Signed-off-by: Gris Ge &lt;fge@redhat.com&gt;
diff --git a/.rustfmt.toml b/.rustfmt.toml
@@ -2,3 +2,5 @@ max_width = 80
 wrap_comments = true
 reorder_imports = true
 edition = "2021"
+group_imports = "StdExternalCrate"
+imports_granularity = "Crate"
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,10 +22,9 @@ futures = "0.3.11"
 log = "0.4.8"
 thiserror = "1"
 netlink-sys = { version = "0.8" }
-netlink-packet-utils = { version = "0.5" }
-netlink-packet-route = { version = "0.24" }
-netlink-packet-core = { version = "0.7" }
-netlink-proto = { default-features = false, version = "0.11.4" }
+netlink-packet-route = { version = "0.25" }
+netlink-packet-core = { version = "0.8" }
+netlink-proto = { default-features = false, version = "0.12.0" }
 nix = { version = "0.29.0", default-features = false, features = ["fs", "mount", "sched", "signal"] }
 tokio = { version = "1.0.1", features = ["rt"], optional = true}
 async-global-executor = { version = "2.0.2", optional = true }
diff --git a/examples/add_address.rs b/examples/add_address.rs
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 
-use futures::stream::TryStreamExt;
 use std::env;
 
+use futures::stream::TryStreamExt;
 use ipnetwork::IpNetwork;
 use rtnetlink::{new_connection, Error, Handle};
 
diff --git a/examples/add_neighbour.rs b/examples/add_neighbour.rs
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: MIT
 
+use std::{convert::TryFrom, env, net::IpAddr};
+
 use futures::stream::TryStreamExt;
 use rtnetlink::{new_connection, Error, Handle};
-use std::{convert::TryFrom, env, net::IpAddr};
 
 #[tokio::main]
 async fn main() -> Result<(), ()> {
diff --git a/examples/add_netns.rs b/examples/add_netns.rs
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: MIT
 
+use std::env;
+
 #[cfg(not(target_os = "freebsd"))]
 use rtnetlink::NetworkNamespace;
-use std::env;
 
 #[cfg(target_os = "freebsd")]
 fn main() -> () {}
diff --git a/examples/add_netns_async.rs b/examples/add_netns_async.rs
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: MIT
 
+use std::env;
+
 #[cfg(not(target_os = "freebsd"))]
 use rtnetlink::NetworkNamespace;
-use std::env;
 
 #[cfg(target_os = "freebsd")]
 fn main() -> () {}
diff --git a/examples/add_route_pref_src.rs b/examples/add_route_pref_src.rs
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 
-use futures::TryStreamExt;
 use std::{env, net::Ipv4Addr};
 
+use futures::TryStreamExt;
 use ipnetwork::Ipv4Network;
 use rtnetlink::{new_connection, Error, Handle, RouteMessageBuilder};
 
diff --git a/examples/create_vxlan.rs b/examples/create_vxlan.rs
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: MIT
 
+use std::env;
+
 use futures::stream::TryStreamExt;
 use rtnetlink::{new_connection, Error, Handle, LinkVxlan};
-use std::env;
 
 #[tokio::main]
 async fn main() -> Result<(), String> {
diff --git a/examples/del_address.rs b/examples/del_address.rs
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: MIT
 
-use futures::stream::TryStreamExt;
 use std::{
     env,
     net::{IpAddr, Ipv4Addr, Ipv6Addr},
 };
 
+use futures::stream::TryStreamExt;
 use ipnetwork::IpNetwork;
 use rtnetlink::{new_connection, AddressMessageBuilder, Error, Handle};
 
diff --git a/examples/del_link.rs b/examples/del_link.rs
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: MIT
 
+use std::env;
+
 use futures::stream::TryStreamExt;
 use rtnetlink::{new_connection, Error, Handle};
-use std::env;
 
 #[tokio::main]
 async fn main() -> Result<(), ()> {
diff --git a/examples/del_netns.rs b/examples/del_netns.rs
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: MIT
 
+use std::env;
+
 #[cfg(not(target_os = "freebsd"))]
 use rtnetlink::NetworkNamespace;
-use std::env;
 
 #[cfg(target_os = "freebsd")]
 fn main() -> () {}
diff --git a/examples/del_netns_async.rs b/examples/del_netns_async.rs
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: MIT
 
+use std::env;
+
 #[cfg(not(target_os = "freebsd"))]
 use rtnetlink::NetworkNamespace;
-use std::env;
 
 #[cfg(target_os = "freebsd")]
 fn main() -> () {}
diff --git a/examples/flush_addresses.rs b/examples/flush_addresses.rs
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: MIT
 
+use std::env;
+
 use futures::stream::TryStreamExt;
 use rtnetlink::{new_connection, Error, Handle};
-use std::env;
 
 #[tokio::main]
 async fn main() -> Result<(), ()> {
diff --git a/examples/get_bond_port_settings.rs b/examples/get_bond_port_settings.rs
@@ -1,10 +1,11 @@
 // SPDX-License-Identifier: MIT
 
+use std::env;
+
 use futures::stream::TryStreamExt;
 use rtnetlink::{
     new_connection, packet_route::link::LinkAttribute, Error, Handle,
 };
-use std::env;
 
 #[tokio::main]
 async fn main() -> Result<(), ()> {
diff --git a/examples/ip_monitor.rs b/examples/ip_monitor.rs
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 
 use futures::stream::StreamExt;
-
 use netlink_sys::{AsyncSocket, SocketAddr};
 use rtnetlink::new_connection;
 
diff --git a/examples/property_altname.rs b/examples/property_altname.rs
@@ -1,9 +1,10 @@
 // SPDX-License-Identifier: MIT
 
+use std::env;
+
 use futures::stream::TryStreamExt;
 use netlink_packet_route::link::{LinkAttribute, LinkMessage, Prop};
 use rtnetlink::{new_connection, Error, Handle};
-use std::env;
 
 #[tokio::main]
 async fn main() -> Result<(), ()> {
diff --git a/examples/set_link_down.rs b/examples/set_link_down.rs
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: MIT
 
+use std::env;
+
 use futures::stream::TryStreamExt;
 use rtnetlink::{new_connection, Error, Handle, LinkUnspec};
-use std::env;
 
 #[tokio::main]
 async fn main() -> Result<(), String> {
diff --git a/src/addr/add.rs b/src/addr/add.rs
@@ -1,13 +1,12 @@
 // SPDX-License-Identifier: MIT
 
-use futures::stream::StreamExt;
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
 
+use futures::stream::StreamExt;
 use netlink_packet_core::{
     NetlinkMessage, NLM_F_ACK, NLM_F_CREATE, NLM_F_EXCL, NLM_F_REPLACE,
     NLM_F_REQUEST,
 };
-
 use netlink_packet_route::{address::AddressMessage, RouteNetlinkMessage};
 
 use crate::{addr::AddressMessageBuilder, try_nl, Error, Handle};
diff --git a/src/addr/get.rs b/src/addr/get.rs
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: MIT
 
+use std::net::IpAddr;
+
 use futures::{
     future::{self, Either},
     stream::{Stream, StreamExt, TryStreamExt},
     FutureExt,
 };
-use std::net::IpAddr;
-
 use netlink_packet_core::{NetlinkMessage, NLM_F_DUMP, NLM_F_REQUEST};
 use netlink_packet_route::{
     address::{AddressAttribute, AddressMessage},
diff --git a/src/addr/handle.rs b/src/addr/handle.rs
@@ -2,11 +2,11 @@
 
 use std::net::IpAddr;
 
+use netlink_packet_route::address::AddressMessage;
+
 use super::{AddressAddRequest, AddressDelRequest, AddressGetRequest};
 use crate::Handle;
 
-use netlink_packet_route::address::AddressMessage;
-
 pub struct AddressHandle(Handle);
 
 impl AddressHandle {
diff --git a/src/addr/mod.rs b/src/addr/mod.rs
@@ -6,8 +6,7 @@ mod del;
 mod get;
 mod handle;
 
-pub use self::add::AddressAddRequest;
-pub use self::builder::AddressMessageBuilder;
-pub use self::del::AddressDelRequest;
-pub use self::get::AddressGetRequest;
-pub use self::handle::AddressHandle;
+pub use self::{
+    add::AddressAddRequest, builder::AddressMessageBuilder,
+    del::AddressDelRequest, get::AddressGetRequest, handle::AddressHandle,
+};
diff --git a/src/lib.rs b/src/lib.rs
@@ -7,7 +7,6 @@
 
 pub use netlink_packet_core as packet_core;
 pub use netlink_packet_route as packet_route;
-pub use netlink_packet_utils as packet_utils;
 pub use netlink_proto as proto;
 pub use netlink_sys as sys;
 
@@ -26,40 +25,39 @@ mod rule;
 #[cfg(not(target_os = "freebsd"))]
 mod traffic_control;
 
-pub use crate::addr::{
-    AddressAddRequest, AddressDelRequest, AddressGetRequest, AddressHandle,
-    AddressMessageBuilder,
-};
-pub use crate::connection::from_socket;
 #[cfg(feature = "tokio_socket")]
 pub use crate::connection::new_connection;
-pub use crate::connection::new_connection_with_socket;
-pub use crate::errors::Error;
-pub use crate::handle::Handle;
-pub use crate::link::{
-    LinkAddRequest, LinkBond, LinkBondPort, LinkBridge, LinkDelPropRequest,
-    LinkDelRequest, LinkDummy, LinkGetRequest, LinkHandle, LinkMacSec,
-    LinkMacVlan, LinkMacVtap, LinkMessageBuilder, LinkSetRequest, LinkUnspec,
-    LinkVeth, LinkVlan, LinkVrf, LinkVxlan, LinkWireguard, LinkXfrm,
-    QosMapping,
-};
-pub use crate::neighbour::{
-    NeighbourAddRequest, NeighbourDelRequest, NeighbourGetRequest,
-    NeighbourHandle,
-};
 #[cfg(not(target_os = "freebsd"))]
 pub use crate::ns::{NetworkNamespace, NETNS_PATH, NONE_FS, SELF_NS_PATH};
-pub use crate::route::{
-    IpVersion, RouteAddRequest, RouteDelRequest, RouteGetRequest, RouteHandle,
-    RouteMessageBuilder, RouteNextHopBuilder,
-};
-pub use crate::rule::{
-    RuleAddRequest, RuleDelRequest, RuleGetRequest, RuleHandle,
-};
 #[cfg(not(target_os = "freebsd"))]
 pub use crate::traffic_control::{
     QDiscDelRequest, QDiscGetRequest, QDiscHandle, QDiscNewRequest,
     TrafficChainGetRequest, TrafficChainHandle, TrafficClassGetRequest,
     TrafficClassHandle, TrafficFilterGetRequest, TrafficFilterHandle,
     TrafficFilterNewRequest,
 };
+pub use crate::{
+    addr::{
+        AddressAddRequest, AddressDelRequest, AddressGetRequest, AddressHandle,
+        AddressMessageBuilder,
+    },
+    connection::{from_socket, new_connection_with_socket},
+    errors::Error,
+    handle::Handle,
+    link::{
+        LinkAddRequest, LinkBond, LinkBondPort, LinkBridge, LinkDelPropRequest,
+        LinkDelRequest, LinkDummy, LinkGetRequest, LinkHandle, LinkMacSec,
+        LinkMacVlan, LinkMacVtap, LinkMessageBuilder, LinkSetRequest,
+        LinkUnspec, LinkVeth, LinkVlan, LinkVrf, LinkVxlan, LinkWireguard,
+        LinkXfrm, QosMapping,
+    },
+    neighbour::{
+        NeighbourAddRequest, NeighbourDelRequest, NeighbourGetRequest,
+        NeighbourHandle,
+    },
+    route::{
+        IpVersion, RouteAddRequest, RouteDelRequest, RouteGetRequest,
+        RouteHandle, RouteMessageBuilder, RouteNextHopBuilder,
+    },
+    rule::{RuleAddRequest, RuleDelRequest, RuleGetRequest, RuleHandle},
+};
diff --git a/src/link/add.rs b/src/link/add.rs
@@ -5,7 +5,6 @@ use netlink_packet_core::{
     NetlinkMessage, NLM_F_ACK, NLM_F_CREATE, NLM_F_EXCL, NLM_F_REPLACE,
     NLM_F_REQUEST,
 };
-
 use netlink_packet_route::{link::LinkMessage, RouteNetlinkMessage};
 
 use crate::{try_nl, Error, Handle};
diff --git a/src/link/builder.rs b/src/link/builder.rs
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-use std::marker::PhantomData;
-use std::os::fd::RawFd;
+use std::{marker::PhantomData, os::fd::RawFd};
 
 use crate::packet_route::link::{
     InfoData, InfoKind, InfoPortData, InfoPortKind, LinkAttribute, LinkFlags,
diff --git a/src/link/macsec.rs b/src/link/macsec.rs
@@ -1,10 +1,9 @@
 // SPDX-License-Identifier: MIT
 
-use netlink_packet_route::link::InfoMacSec;
-pub use netlink_packet_route::link::MacSecCipherId;
-pub use netlink_packet_route::link::MacSecOffload;
-pub use netlink_packet_route::link::MacSecValidate;
-pub use netlink_packet_utils::nla::DefaultNla;
+use netlink_packet_core::DefaultNla;
+use netlink_packet_route::link::{
+    InfoMacSec, MacSecCipherId, MacSecOffload, MacSecValidate,
+};
 
 use crate::{
     link::LinkMessageBuilder,
diff --git a/src/link/mod.rs b/src/link/mod.rs
@@ -22,27 +22,29 @@ mod vxlan;
 mod wireguard;
 mod xfrm;
 
-pub use self::add::LinkAddRequest;
-pub use self::bond::LinkBond;
-pub use self::bond_port::LinkBondPort;
-pub use self::bridge::LinkBridge;
-pub use self::builder::{LinkMessageBuilder, LinkUnspec};
-pub use self::del::LinkDelRequest;
-pub use self::dummy::LinkDummy;
-pub use self::get::LinkGetRequest;
-pub use self::handle::LinkHandle;
-pub use self::mac_vlan::LinkMacVlan;
-pub use self::mac_vtap::LinkMacVtap;
-pub use self::macsec::LinkMacSec;
-pub use self::property_add::LinkNewPropRequest;
-pub use self::property_del::LinkDelPropRequest;
-pub use self::set::LinkSetRequest;
-pub use self::veth::LinkVeth;
-pub use self::vlan::{LinkVlan, QosMapping};
-pub use self::vrf::LinkVrf;
-pub use self::vxlan::LinkVxlan;
-pub use self::wireguard::LinkWireguard;
-pub use self::xfrm::LinkXfrm;
+pub use self::{
+    add::LinkAddRequest,
+    bond::LinkBond,
+    bond_port::LinkBondPort,
+    bridge::LinkBridge,
+    builder::{LinkMessageBuilder, LinkUnspec},
+    del::LinkDelRequest,
+    dummy::LinkDummy,
+    get::LinkGetRequest,
+    handle::LinkHandle,
+    mac_vlan::LinkMacVlan,
+    mac_vtap::LinkMacVtap,
+    macsec::LinkMacSec,
+    property_add::LinkNewPropRequest,
+    property_del::LinkDelPropRequest,
+    set::LinkSetRequest,
+    veth::LinkVeth,
+    vlan::{LinkVlan, QosMapping},
+    vrf::LinkVrf,
+    vxlan::LinkVxlan,
+    wireguard::LinkWireguard,
+    xfrm::LinkXfrm,
+};
 
 #[cfg(test)]
 mod test;
diff --git a/src/neighbour/add.rs b/src/neighbour/add.rs
diff --git a/src/neighbour/handle.rs b/src/neighbour/handle.rs
diff --git a/src/neighbour/mod.rs b/src/neighbour/mod.rs
diff --git a/src/ns.rs b/src/ns.rs
diff --git a/src/route/add.rs b/src/route/add.rs
diff --git a/src/route/get.rs b/src/route/get.rs
diff --git a/src/route/handle.rs b/src/route/handle.rs
diff --git a/src/route/mod.rs b/src/route/mod.rs
diff --git a/src/rule/add.rs b/src/rule/add.rs
diff --git a/src/rule/handle.rs b/src/rule/handle.rs
diff --git a/src/rule/mod.rs b/src/rule/mod.rs
diff --git a/src/traffic_control/handle.rs b/src/traffic_control/handle.rs
diff --git a/src/traffic_control/mod.rs b/src/traffic_control/mod.rs
