Use netlink-packet-core 0.8.0

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

Author: cathay4t

.rustfmt.toml

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

Cargo.toml

@@ -15,13 +15,10 @@ description = "netlink packet types"
 rich_nlas = []
 
 [dependencies]
-anyhow = "1.0.31"
 bitflags = "2"
-byteorder = "1.3.2"
 libc = "0.2.66"
 log = { version = "0.4.20", features = ["std"] }
-netlink-packet-core = { version = "0.7.0" }
-netlink-packet-utils = { version = "0.5.2" }
+netlink-packet-core = { version = "0.8.0" }
 
 [[example]]
 name = "dump_packet_links"

src/address/attribute.rs

@@ -1,14 +1,13 @@
 // SPDX-License-Identifier: MIT
 
-use std::mem::size_of;
-use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
+use std::{
+    mem::size_of,
+    net::{IpAddr, Ipv4Addr, Ipv6Addr},
+};
 
-use anyhow::Context;
-use byteorder::{ByteOrder, NativeEndian};
-use netlink_packet_utils::{
-    nla::{DefaultNla, Nla, NlaBuffer},
-    parsers::{parse_string, parse_u32},
-    DecodeError, Emitable, Parseable,
+use netlink_packet_core::{
+    emit_u32, parse_string, parse_u32, DecodeError, DefaultNla, Emitable,
+    ErrorContext, Nla, NlaBuffer, Parseable,
 };
 
 use crate::address::{AddressFlags, CacheInfo, CacheInfoBuffer};
@@ -84,9 +83,7 @@ impl Nla for AddressAttribute {
                 buffer[..string.len()].copy_from_slice(string.as_bytes());
                 buffer[string.len()] = 0;
             }
-            Self::Flags(ref value) => {
-                NativeEndian::write_u32(buffer, value.bits())
-            }
+            Self::Flags(ref value) => emit_u32(buffer, value.bits()).unwrap(),
             Self::CacheInfo(ref attr) => attr.emit(buffer),
             Self::Other(ref attr) => attr.emit_value(buffer),
         }

src/address/cache_info.rs

@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-use netlink_packet_utils::{
-    traits::{Emitable, Parseable},
-    DecodeError,
-};
+use netlink_packet_core::{DecodeError, Emitable, Parseable};
 
 #[derive(Debug, Clone, Copy, Eq, PartialEq, Default)]
 #[non_exhaustive]

src/address/message.rs

@@ -1,10 +1,7 @@
 // SPDX-License-Identifier: MIT
 
-use anyhow::Context;
-use netlink_packet_utils::{
-    nla::{NlaBuffer, NlasIterator},
-    traits::{Emitable, Parseable},
-    DecodeError,
+use netlink_packet_core::{
+    DecodeError, Emitable, ErrorContext, NlaBuffer, NlasIterator, Parseable,
 };
 
 use crate::{

src/address/mod.rs

@@ -9,8 +9,10 @@ mod message;
 #[cfg(test)]
 mod tests;
 
-pub use self::addr_flags::{AddressFlags, AddressHeaderFlags};
-pub use self::addr_scope::AddressScope;
-pub use self::attribute::AddressAttribute;
-pub use self::cache_info::{CacheInfo, CacheInfoBuffer};
-pub use self::message::{AddressHeader, AddressMessage, AddressMessageBuffer};
+pub use self::{
+    addr_flags::{AddressFlags, AddressHeaderFlags},
+    addr_scope::AddressScope,
+    attribute::AddressAttribute,
+    cache_info::{CacheInfo, CacheInfoBuffer},
+    message::{AddressHeader, AddressMessage, AddressMessageBuffer},
+};

src/address/tests/ipv4.rs

@@ -2,13 +2,15 @@
 
 use std::net::{IpAddr, Ipv4Addr};
 
-use netlink_packet_utils::{Emitable, Parseable};
-
-use crate::address::{
-    AddressAttribute, AddressFlags, AddressHeader, AddressHeaderFlags,
-    AddressMessage, AddressMessageBuffer, AddressScope, CacheInfo,
+use netlink_packet_core::{Emitable, Parseable};
+
+use crate::{
+    address::{
+        AddressAttribute, AddressFlags, AddressHeader, AddressHeaderFlags,
+        AddressMessage, AddressMessageBuffer, AddressScope, CacheInfo,
+    },
+    AddressFamily,
 };
-use crate::AddressFamily;
 
 // TODO(Gris Ge): Need test for `AddressAttribute::Broadcast`
 

src/address/tests/ipv6.rs

@@ -2,13 +2,15 @@
 
 use std::net::{IpAddr, Ipv6Addr};
 
-use netlink_packet_utils::{nla::NlaBuffer, Emitable, Parseable};
+use netlink_packet_core::{Emitable, NlaBuffer, Parseable};
 
-use crate::address::{
-    AddressAttribute, AddressFlags, AddressHeader, AddressHeaderFlags,
-    AddressMessage, AddressMessageBuffer, AddressScope, CacheInfo,
+use crate::{
+    address::{
+        AddressAttribute, AddressFlags, AddressHeader, AddressHeaderFlags,
+        AddressMessage, AddressMessageBuffer, AddressScope, CacheInfo,
+    },
+    AddressFamily,
 };
-use crate::AddressFamily;
 
 // TODO(Gris Ge): Need test for `AddressAttribute::Anycast` and `Multicast`.
 

src/ip.rs

@@ -2,7 +2,7 @@
 
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
 
-use netlink_packet_utils::DecodeError;
+use netlink_packet_core::DecodeError;
 
 pub(crate) const IPV4_ADDR_LEN: usize = 4;
 pub(crate) const IPV6_ADDR_LEN: usize = 16;

src/lib.rs

@@ -66,12 +66,13 @@ mod address_family_fallback;
     target_os = "android",
 )))]
 pub use self::address_family_fallback::AddressFamily;
-
-pub use self::ip::IpProtocol;
-pub use self::message::{RouteNetlinkMessage, RouteNetlinkMessageBuffer};
+pub use self::{
+    ip::IpProtocol,
+    message::{RouteNetlinkMessage, RouteNetlinkMessageBuffer},
+};
 
 #[macro_use]
-extern crate netlink_packet_utils;
+extern crate netlink_packet_core;
 
 #[cfg(test)]
 #[macro_use]