Use latest rust-netlink crates

 * Drop the need of netlink-packet-utils
 * Upgrade to netlink-packet-core 0.8.1
 * Drop the need of byteorder

Signed-off-by: Gris Ge <[email protected]>

Author: cathay4t

.rustfmt.toml

@@ -1,4 +1,7 @@
 max_width = 80
 wrap_comments = true
 reorder_imports = true
+format_strings = true
+group_imports = "StdExternalCrate"
+imports_granularity = "Crate"
 edition = "2021"

Cargo.toml

@@ -2,7 +2,7 @@
 name = "netlink-packet-xfrm"
 version = "0.3.1"
 authors = ["Scott Zuk <[email protected]>"]
-edition = "2018"
+edition = "2021"
 homepage = "https://github.com/rust-netlink/netlink-packet-xfrm"
 repository = "https://github.com/rust-netlink/netlink-packet-xfrm"
 keywords = ["netlink", "linux", "ipsec", "xfrm"]
@@ -11,13 +11,10 @@ readme = "README.md"
 description = "netlink xfrm packet types for IPsec"
 
 [dependencies]
-anyhow = "1.0.39"
-byteorder = "1.4.2"
-libc= "0.2.86"
-netlink-packet-core = { version = "0.7.0" }
-netlink-packet-utils = { version = "0.5.2" }
+libc= "0.2.177"
+netlink-packet-core = { version = "0.8.1" }
 
 [dev-dependencies]
-lazy_static = "1.4.0"
-netlink-proto = { version = "0.11.2" }
-netlink-sys = { version = "0.8.4" }
+lazy_static = "1.5.0"
+netlink-proto = { version = "0.12" }
+netlink-sys = { version = "0.8.7" }

src/address.rs

@@ -2,7 +2,7 @@
 
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
 
-use netlink_packet_utils::{buffer, traits::*, DecodeError};
+use netlink_packet_core::{DecodeError, Emitable, Parseable};
 
 pub const XFRM_ADDRESS_LEN: usize = 16;
 

src/async_event_id.rs

@@ -1,16 +1,14 @@
 // SPDX-License-Identifier: MIT
 
-use anyhow::Context;
-
 use core::ops::Range;
 
+use netlink_packet_core::{DecodeError, Emitable, ErrorContext, Parseable};
+
 use crate::{
     Address, AddressBuffer, UserSaId, UserSaIdBuffer, XFRM_ADDRESS_LEN,
     XFRM_USER_SA_ID_LEN,
 };
 
-use netlink_packet_utils::{buffer, traits::*, DecodeError};
-
 #[derive(Debug, Clone, Copy, Eq, PartialEq, Default)]
 pub struct AsyncEventId {
     pub sa_id: UserSaId,

src/buffer.rs

@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: MIT
 
-use anyhow::Context;
+use netlink_packet_core::{
+    DecodeError, ErrorContext, Parseable, ParseableParametrized,
+};
 
 use crate::{
     constants::*,
@@ -35,8 +37,6 @@ use crate::{
     XfrmMessage,
 };
 
-use netlink_packet_utils::{traits::*, DecodeError};
-
 pub struct XfrmBuffer<T> {
     buffer: T,
 }
@@ -61,7 +61,7 @@ impl<'a, T: AsRef<[u8]> + ?Sized> XfrmBuffer<&'a T> {
     }
 }
 
-impl<'a, T: AsRef<[u8]> + AsMut<[u8]> + ?Sized> XfrmBuffer<&'a mut T> {
+impl<T: AsRef<[u8]> + AsMut<[u8]> + ?Sized> XfrmBuffer<&mut T> {
     pub fn inner_mut(&mut self) -> &mut [u8] {
         self.buffer.as_mut()
     }

src/id.rs

@@ -1,11 +1,9 @@
 // SPDX-License-Identifier: MIT
 
-use anyhow::Context;
+use netlink_packet_core::{DecodeError, Emitable, ErrorContext, Parseable};
 
 use crate::{Address, AddressBuffer, XFRM_ADDRESS_LEN};
 
-use netlink_packet_utils::{buffer, traits::*, DecodeError};
-
 #[derive(Debug, Clone, Copy, Eq, PartialEq, Default)]
 pub struct Id {
     pub daddr: Address,

src/lib.rs

@@ -73,6 +73,9 @@ pub use user_sa_info::*;
 pub mod user_spi_info;
 pub use user_spi_info::*;
 
+#[macro_use]
+extern crate netlink_packet_core;
+
 #[cfg(test)]
 mod tests;
 #[cfg(test)]

src/lifetime.rs

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 
-use crate::XFRM_INF;
+use netlink_packet_core::{DecodeError, Emitable, Parseable};
 
-use netlink_packet_utils::{buffer, traits::*, DecodeError};
+use crate::XFRM_INF;
 
 // Lifetime config
 

src/message.rs

@@ -1,5 +1,10 @@
 // SPDX-License-Identifier: MIT
 
+use netlink_packet_core::{
+    DecodeError, Emitable, NetlinkDeserializable, NetlinkHeader,
+    NetlinkPayload, NetlinkSerializable, ParseableParametrized,
+};
+
 use crate::{
     constants::*,
     monitor::{
@@ -20,11 +25,6 @@ use crate::{
     XfrmBuffer,
 };
 
-use netlink_packet_core::{
-    NetlinkDeserializable, NetlinkHeader, NetlinkPayload, NetlinkSerializable,
-};
-use netlink_packet_utils::{traits::*, DecodeError};
-
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub enum XfrmMessage {
     AddPolicy(PolicyModifyMessage),

src/monitor/acquire/buffer.rs

@@ -1,12 +1,8 @@
 // SPDX-License-Identifier: MIT
 
-use crate::XFRM_USER_ACQUIRE_LEN;
+use netlink_packet_core::{DecodeError, NlaBuffer, NlasIterator};
 
-use netlink_packet_utils::{
-    buffer,
-    nla::{NlaBuffer, NlasIterator},
-    DecodeError,
-};
+use crate::XFRM_USER_ACQUIRE_LEN;
 
 pub const MONITOR_ACQUIRE_HEADER_LEN: usize = XFRM_USER_ACQUIRE_LEN;