Remove reexports

Removed these reexports:
 * `netlink_packet_route::ErrorMessage`
 * `netlink_packet_route::NetlinkBuffer`
 * `netlink_packet_route::NetlinkHeader`
 * `netlink_packet_route::NetlinkMessage`
 * `netlink_packet_route::NetlinkPayload`
 * `netlink_packet_route::traits`
 * `netlink_packet_route::DecodeError`

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

Author: cathay4t

benches/link_message.rs

@@ -3,10 +3,9 @@
 use criterion::{criterion_group, criterion_main, Criterion};
 
 use netlink_packet_route::{
-    nlas::link::Nla,
-    traits::{Parseable, ParseableParametrized},
-    LinkHeader, LinkMessage, LinkMessageBuffer,
+    nlas::link::Nla, LinkHeader, LinkMessage, LinkMessageBuffer,
 };
+use netlink_packet_utils::traits::{Parseable, ParseableParametrized};
 
 const LINKMSG1: [u8; 96] = [
     0x00, // address family

benches/rtnetlink_dump.rs

@@ -5,7 +5,8 @@ use std::fs::File;
 use criterion::{criterion_group, criterion_main, Criterion};
 use pcap_file::PcapReader;
 
-use netlink_packet_route::{NetlinkMessage, RtnlMessage};
+use netlink_packet_core::NetlinkMessage;
+use netlink_packet_route::RtnlMessage;
 
 fn bench(c: &mut Criterion) {
     let pcap_reader =

examples/dump_neighbours.rs

@@ -2,9 +2,16 @@
 
 use std::{convert::TryFrom, net::IpAddr, string::ToString};
 
+use netlink_packet_core::{
+    NetlinkHeader, NetlinkMessage, NetlinkPayload, NLM_F_DUMP, NLM_F_REQUEST,
+};
 use netlink_packet_route::{
-    constants::*, nlas::neighbour::Nla, NeighbourMessage, NetlinkHeader,
-    NetlinkMessage, NetlinkPayload, RtnlMessage,
+    constants::{
+        NUD_DELAY, NUD_FAILED, NUD_INCOMPLETE, NUD_NOARP, NUD_NONE,
+        NUD_PERMANENT, NUD_PROBE, NUD_REACHABLE, NUD_STALE,
+    },
+    nlas::neighbour::Nla,
+    NeighbourMessage, RtnlMessage, AF_INET, AF_INET6,
 };
 use netlink_sys::{protocols::NETLINK_ROUTE, Socket, SocketAddr};
 

examples/dump_packet_link_bridge_vlan.rs

@@ -1,8 +1,10 @@
 // SPDX-License-Identifier: MIT
 
+use netlink_packet_core::{
+    NetlinkHeader, NetlinkMessage, NetlinkPayload, NLM_F_DUMP, NLM_F_REQUEST,
+};
 use netlink_packet_route::{
-    nlas::link::Nla, LinkMessage, NetlinkHeader, NetlinkMessage,
-    NetlinkPayload, RtnlMessage, AF_BRIDGE, NLM_F_DUMP, NLM_F_REQUEST,
+    nlas::link::Nla, LinkMessage, RtnlMessage, AF_BRIDGE,
     RTEXT_FILTER_BRVLAN_COMPRESSED,
 };
 use netlink_sys::{protocols::NETLINK_ROUTE, Socket, SocketAddr};

examples/dump_packet_links.rs

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 
-use netlink_packet_route::{
-    LinkMessage, NetlinkHeader, NetlinkMessage, NetlinkPayload, RtnlMessage,
-    NLM_F_DUMP, NLM_F_REQUEST,
+use netlink_packet_core::{
+    NetlinkHeader, NetlinkMessage, NetlinkPayload, NLM_F_DUMP, NLM_F_REQUEST,
 };
+use netlink_packet_route::{LinkMessage, RtnlMessage};
 use netlink_sys::{protocols::NETLINK_ROUTE, Socket, SocketAddr};
 
 fn main() {

examples/dump_rules.rs

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 
-use netlink_packet_route::{
-    constants::*, NetlinkHeader, NetlinkMessage, NetlinkPayload, RtnlMessage,
-    RuleMessage,
+use netlink_packet_core::{
+    NetlinkHeader, NetlinkMessage, NetlinkPayload, NLM_F_DUMP, NLM_F_REQUEST,
 };
+use netlink_packet_route::{RtnlMessage, RuleMessage};
 use netlink_sys::{protocols::NETLINK_ROUTE, Socket, SocketAddr};
 
 fn main() {

examples/new_rule.rs

@@ -1,8 +1,12 @@
 // SPDX-License-Identifier: MIT
 
-use netlink_packet_core::{NetlinkHeader, NetlinkMessage, NetlinkPayload};
+use netlink_packet_core::{
+    NetlinkHeader, NetlinkMessage, NetlinkPayload, NLM_F_ACK, NLM_F_CREATE,
+    NLM_F_EXCL, NLM_F_REQUEST,
+};
 use netlink_packet_route::{
-    constants::*, rule, RtnlMessage, RuleHeader, RuleMessage,
+    constants::{AF_INET, FR_ACT_TO_TBL, RT_TABLE_DEFAULT},
+    rule, RtnlMessage, RuleHeader, RuleMessage,
 };
 use netlink_sys::{protocols::NETLINK_ROUTE, Socket, SocketAddr};
 

src/lib.rs

@@ -2,17 +2,6 @@
 
 #[macro_use]
 extern crate bitflags;
-#[macro_use]
-pub(crate) extern crate netlink_packet_utils as utils;
-pub(crate) use self::utils::parsers;
-pub use self::utils::{traits, DecodeError};
-
-pub use netlink_packet_core::{
-    ErrorMessage, NetlinkBuffer, NetlinkHeader, NetlinkMessage, NetlinkPayload,
-};
-pub(crate) use netlink_packet_core::{
-    NetlinkDeserializable, NetlinkSerializable,
-};
 
 pub mod rtnl;
 pub use self::rtnl::*;
@@ -24,3 +13,6 @@ extern crate lazy_static;
 #[cfg(test)]
 #[macro_use]
 extern crate pretty_assertions;
+
+#[macro_use]
+extern crate netlink_packet_utils;

src/rtnl/address/buffer.rs

@@ -1,9 +1,8 @@
 // SPDX-License-Identifier: MIT
 
-use crate::{
-    nlas::{NlaBuffer, NlasIterator},
-    DecodeError,
-};
+use netlink_packet_utils::DecodeError;
+
+use netlink_packet_utils::nla::{NlaBuffer, NlasIterator};
 
 pub const ADDRESS_HEADER_LEN: usize = 8;
 

src/rtnl/address/message.rs

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: MIT
 
 use anyhow::Context;
-
-use crate::{
-    nlas::address::Nla,
+use netlink_packet_utils::{
     traits::{Emitable, Parseable},
-    AddressMessageBuffer, DecodeError, ADDRESS_HEADER_LEN,
+    DecodeError,
 };
 
+use crate::{nlas::address::Nla, AddressMessageBuffer, ADDRESS_HEADER_LEN};
+
 #[derive(Debug, PartialEq, Eq, Clone, Default)]
 #[non_exhaustive]
 pub struct AddressMessage {