Remove all reexport

Removed these reexport:
 * `rtnetlink::packet`
 * `rtnetlink::proto`
 * `rtnetlink::sys`

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

Author: cathay4t

Cargo.toml

@@ -21,8 +21,11 @@ smol_socket = ["netlink-proto/smol_socket", "async-global-executor"]
 futures = "0.3.11"
 log = "0.4.8"
 thiserror = "1"
-netlink-packet-route = { version = "0.13.0" }
-netlink-proto = { default-features = false, version = "0.10" }
+netlink-sys = { version = "0.8" }
+netlink-packet-utils = { version = "0.5" }
+netlink-packet-route = { version = "0.15" }
+netlink-packet-core = { version = "0.5" }
+netlink-proto = { default-features = false, version = "0.11" }
 nix = { version = "0.26.1", 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 }

examples/get_links.rs

@@ -1,14 +1,11 @@
 // SPDX-License-Identifier: MIT
 
 use futures::stream::TryStreamExt;
-use rtnetlink::{
-    new_connection,
-    packet::rtnl::{
-        constants::{AF_BRIDGE, RTEXT_FILTER_BRVLAN},
-        link::nlas::Nla,
-    },
-    Error, Handle,
+use netlink_packet_route::{
+    constants::{AF_BRIDGE, RTEXT_FILTER_BRVLAN},
+    link::nlas::Nla,
 };
+use rtnetlink::{new_connection, Error, Handle};
 
 #[tokio::main]
 async fn main() -> Result<(), ()> {

examples/get_links_async.rs

@@ -1,14 +1,11 @@
 // SPDX-License-Identifier: MIT
 
 use futures::stream::TryStreamExt;
-use rtnetlink::{
-    new_connection,
-    packet::rtnl::{
-        constants::{AF_BRIDGE, RTEXT_FILTER_BRVLAN},
-        link::nlas::Nla,
-    },
-    Error, Handle,
+use netlink_packet_route::{
+    constants::{AF_BRIDGE, RTEXT_FILTER_BRVLAN},
+    link::nlas::Nla,
 };
+use rtnetlink::{new_connection, Error, Handle};
 
 #[async_std::main]
 async fn main() -> Result<(), ()> {

examples/get_links_thread_builder.rs

@@ -1,15 +1,8 @@
 // SPDX-License-Identifier: MIT
 
 use futures::stream::TryStreamExt;
-
-use rtnetlink::{
-    new_connection,
-    packet::rtnl::{
-        constants::{AF_BRIDGE, RTEXT_FILTER_BRVLAN},
-        link::nlas::Nla,
-    },
-    Error, Handle,
-};
+use netlink_packet_route::{link::nlas::Nla, AF_BRIDGE, RTEXT_FILTER_BRVLAN};
+use rtnetlink::{new_connection, Error, Handle};
 
 async fn do_it(rt: &tokio::runtime::Runtime) -> Result<(), ()> {
     env_logger::init();

examples/ip_monitor.rs

@@ -3,10 +3,8 @@
 use futures::stream::StreamExt;
 
 use netlink_packet_route::constants::*;
-use rtnetlink::{
-    new_connection,
-    sys::{AsyncSocket, SocketAddr},
-};
+use netlink_sys::{AsyncSocket, SocketAddr};
+use rtnetlink::new_connection;
 
 const fn nl_mgrp(group: u32) -> u32 {
     if group > 31 {

examples/listen.rs

@@ -4,11 +4,10 @@
 //! changes, listens for said changes and prints the received messages.
 
 use futures::stream::StreamExt;
-
+use netlink_sys::{AsyncSocket, SocketAddr};
 use rtnetlink::{
     constants::{RTMGRP_IPV4_ROUTE, RTMGRP_IPV6_ROUTE},
     new_connection,
-    sys::{AsyncSocket, SocketAddr},
 };
 
 #[tokio::main]

examples/property_altname.rs

@@ -1,14 +1,11 @@
 // SPDX-License-Identifier: MIT
 
 use futures::stream::TryStreamExt;
-use rtnetlink::{
-    new_connection,
-    packet::{
-        rtnl::link::nlas::{Nla, Prop},
-        LinkMessage,
-    },
-    Error, Handle,
+use netlink_packet_route::{
+    link::nlas::{Nla, Prop},
+    LinkMessage,
 };
+use rtnetlink::{new_connection, Error, Handle};
 use std::env;
 
 #[tokio::main]

src/addr/add.rs

@@ -3,12 +3,16 @@
 use futures::stream::StreamExt;
 use std::net::{IpAddr, Ipv4Addr};
 
-use netlink_packet_route::{
-    nlas::address::Nla, AddressMessage, NetlinkMessage, RtnlMessage, AF_INET,
-    AF_INET6, NLM_F_ACK, NLM_F_CREATE, NLM_F_EXCL, NLM_F_REPLACE,
+use netlink_packet_core::{
+    NetlinkMessage, NLM_F_ACK, NLM_F_CREATE, NLM_F_EXCL, NLM_F_REPLACE,
     NLM_F_REQUEST,
 };
 
+use netlink_packet_route::{
+    nlas::address::Nla, AddressMessage, RtnlMessage, AF_INET,
+    AF_INET6,
+};
+
 use crate::{try_nl, Error, Handle};
 
 /// A request to create a new address. This is equivalent to the `ip address

src/addr/del.rs

@@ -1,13 +1,10 @@
 // SPDX-License-Identifier: MIT
 
 use futures::stream::StreamExt;
+use netlink_packet_core::{NetlinkMessage, NLM_F_ACK, NLM_F_REQUEST};
+use netlink_packet_route::{AddressMessage, RtnlMessage};
 
-use crate::{
-    packet::{
-        AddressMessage, NetlinkMessage, RtnlMessage, NLM_F_ACK, NLM_F_REQUEST,
-    },
-    try_nl, Error, Handle,
-};
+use crate::{try_nl, Error, Handle};
 
 pub struct AddressDelRequest {
     handle: Handle,

src/addr/get.rs

@@ -7,10 +7,8 @@ use futures::{
 };
 use std::net::IpAddr;
 
-use netlink_packet_route::{
-    nlas::address::Nla, AddressMessage, NetlinkMessage, RtnlMessage,
-    NLM_F_DUMP, NLM_F_REQUEST,
-};
+use netlink_packet_core::{NetlinkMessage, NLM_F_DUMP, NLM_F_REQUEST};
+use netlink_packet_route::{nlas::address::Nla, AddressMessage, RtnlMessage};
 
 use crate::{try_rtnl, Error, Handle};