Merge pull request #195 from stbuehler/refactor-base-types

Author: little-dude

.github/workflows/main.yml

@@ -61,7 +61,6 @@ jobs:
         run: |
           cd netlink-proto
           cargo test
-          cargo test --features workaround-audit-bug
 
       - name: test (rtnetlink)
         env:

audit/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "audit"
-version = "0.4.0"
+version = "0.5.0"  # TODO: drop this comment - already bumped version for trait changes
 authors = ["Corentin Henry <[email protected]>"]
 edition = "2018"
 
@@ -14,13 +14,13 @@ description = "linux audit via netlink"
 [dependencies]
 futures = "0.3.11"
 thiserror = "1"
-netlink-packet-audit = "0.2"
-netlink-proto = { default-features = false, version = "0.7" }
+netlink-packet-audit = "0.3"
+netlink-proto = { default-features = false, version = "0.8" }
 
 [features]
 default = ["tokio_socket"]
-tokio_socket = ["netlink-proto/tokio_socket", "netlink-proto/workaround-audit-bug"]
-smol_socket = ["netlink-proto/smol_socket", "netlink-proto/workaround-audit-bug"]
+tokio_socket = ["netlink-proto/tokio_socket"]
+smol_socket = ["netlink-proto/smol_socket"]
 
 [dev-dependencies]
 tokio = { version = "1.0.1", default-features = false, features = ["macros", "rt-multi-thread"] }

audit/src/lib.rs

@@ -15,14 +15,31 @@ use std::io;
 use futures::channel::mpsc::UnboundedReceiver;
 
 #[allow(clippy::type_complexity)]
+#[cfg(feature = "tokio_socket")]
 pub fn new_connection() -> io::Result<(
-    proto::Connection<packet::AuditMessage>,
+    proto::Connection<packet::AuditMessage, sys::TokioSocket, packet::NetlinkAuditCodec>,
     Handle,
     UnboundedReceiver<(
         packet::NetlinkMessage<packet::AuditMessage>,
         sys::SocketAddr,
     )>,
 )> {
-    let (conn, handle, messages) = netlink_proto::new_connection(sys::protocols::NETLINK_AUDIT)?;
+    new_connection_with_socket()
+}
+
+#[allow(clippy::type_complexity)]
+pub fn new_connection_with_socket<S>() -> io::Result<(
+    proto::Connection<packet::AuditMessage, S, packet::NetlinkAuditCodec>,
+    Handle,
+    UnboundedReceiver<(
+        packet::NetlinkMessage<packet::AuditMessage>,
+        sys::SocketAddr,
+    )>,
+)>
+where
+    S: sys::AsyncSocket,
+{
+    let (conn, handle, messages) =
+        netlink_proto::new_connection_with_codec(sys::protocols::NETLINK_AUDIT)?;
     Ok((conn, Handle::new(handle), messages))
 }

ethtool/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ethtool"
-version = "0.1.0"
+version = "0.2.0"  # TODO: drop this comment - already bumped version for trait changes
 authors = ["Gris Ge <[email protected]>"]
 license = "MIT"
 edition = "2018"
@@ -24,13 +24,13 @@ anyhow = "1.0.44"
 async-std = { version = "1.9.0", optional = true}
 byteorder = "1.4.3"
 futures = "0.3.17"
-genetlink = { default-features = false, version = "0.1.0"}
+genetlink = { default-features = false, version = "0.2.0"}
 log = "0.4.14"
-netlink-packet-core = "0.2.4"
-netlink-packet-generic = "0.1.0"
+netlink-packet-core = "0.3.0"
+netlink-packet-generic = "0.2.0"
 netlink-packet-utils = "0.4.1"
-netlink-proto = { default-features = false, version = "0.7.0" }
-netlink-sys = "0.7.0"
+netlink-proto = { default-features = false, version = "0.8.0" }
+netlink-sys = "0.8.0"
 thiserror = "1.0.29"
 tokio = { version = "1.0.1", features = ["rt"], optional = true}
 

ethtool/src/connection.rs

@@ -4,16 +4,29 @@ use futures::channel::mpsc::UnboundedReceiver;
 use genetlink::message::RawGenlMessage;
 use netlink_packet_core::NetlinkMessage;
 use netlink_proto::Connection;
-use netlink_sys::SocketAddr;
+use netlink_sys::{AsyncSocket, SocketAddr};
 
 use crate::EthtoolHandle;
 
+#[cfg(feature = "tokio_socket")]
 #[allow(clippy::type_complexity)]
 pub fn new_connection() -> io::Result<(
     Connection<RawGenlMessage>,
     EthtoolHandle,
     UnboundedReceiver<(NetlinkMessage<RawGenlMessage>, SocketAddr)>,
 )> {
-    let (conn, handle, messages) = genetlink::new_connection()?;
+    new_connection_with_socket()
+}
+
+#[allow(clippy::type_complexity)]
+pub fn new_connection_with_socket<S>() -> io::Result<(
+    Connection<RawGenlMessage, S>,
+    EthtoolHandle,
+    UnboundedReceiver<(NetlinkMessage<RawGenlMessage>, SocketAddr)>,
+)>
+where
+    S: AsyncSocket,
+{
+    let (conn, handle, messages) = genetlink::new_connection_with_socket()?;
     Ok((conn, EthtoolHandle::new(handle), messages))
 }

ethtool/src/lib.rs

@@ -11,7 +11,9 @@ mod pause;
 mod ring;
 
 pub use coalesce::{EthtoolCoalesceAttr, EthtoolCoalesceGetRequest, EthtoolCoalesceHandle};
+#[cfg(feature = "tokio_socket")]
 pub use connection::new_connection;
+pub use connection::new_connection_with_socket;
 pub use error::EthtoolError;
 pub use feature::{
     EthtoolFeatureAttr,

genetlink/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "genetlink"
-version = "0.1.0"
+version = "0.2.0"  # TODO: drop this comment - already bumped version for trait changes
 authors = ["Leo <[email protected]>"]
 edition = "2018"
 homepage = "https://github.com/little-dude/netlink"
@@ -12,17 +12,17 @@ description = "communicate with generic netlink"
 
 [features]
 default = ["tokio_socket"]
-tokio_socket = ["netlink-proto/tokio_socket","netlink-proto/workaround-audit-bug", "tokio"]
-smol_socket = ["netlink-proto/smol_socket","netlink-proto/workaround-audit-bug","async-std"]
+tokio_socket = ["netlink-proto/tokio_socket", "tokio"]
+smol_socket = ["netlink-proto/smol_socket","async-std"]
 
 [dependencies]
 futures = "0.3.16"
-netlink-packet-generic = "0.1.0"
-netlink-proto = { default-features = false, version = "0.7.0" }
+netlink-packet-generic = "0.2.0"
+netlink-proto = { default-features = false, version = "0.8.0" }
 tokio = { version = "1.9.0", features = ["rt"], optional = true }
 async-std = { version = "1.9.0", optional = true }
 netlink-packet-utils = "0.4.1"
-netlink-packet-core = "0.2.4"
+netlink-packet-core = "0.3.0"
 thiserror = "1.0.26"
 
 [dev-dependencies]

genetlink/src/connection.rs

@@ -3,7 +3,7 @@ use futures::channel::mpsc::UnboundedReceiver;
 use netlink_packet_core::NetlinkMessage;
 use netlink_proto::{
     self,
-    sys::{protocols::NETLINK_GENERIC, SocketAddr},
+    sys::{protocols::NETLINK_GENERIC, AsyncSocket, SocketAddr},
     Connection,
 };
 use std::io;
@@ -21,12 +21,26 @@ use std::io;
 ///
 /// The [`GenetlinkHandle`] can send and receive any type of generic netlink message.
 /// And it can automatic resolve the generic family id before sending.
+#[cfg(feature = "tokio_socket")]
 #[allow(clippy::type_complexity)]
 pub fn new_connection() -> io::Result<(
     Connection<RawGenlMessage>,
     GenetlinkHandle,
     UnboundedReceiver<(NetlinkMessage<RawGenlMessage>, SocketAddr)>,
 )> {
-    let (conn, handle, messages) = netlink_proto::new_connection(NETLINK_GENERIC)?;
+    new_connection_with_socket()
+}
+
+/// Variant of [`new_connection`] that allows specifying a socket type to use for async handling
+#[allow(clippy::type_complexity)]
+pub fn new_connection_with_socket<S>() -> io::Result<(
+    Connection<RawGenlMessage, S>,
+    GenetlinkHandle,
+    UnboundedReceiver<(NetlinkMessage<RawGenlMessage>, SocketAddr)>,
+)>
+where
+    S: AsyncSocket,
+{
+    let (conn, handle, messages) = netlink_proto::new_connection_with_socket(NETLINK_GENERIC)?;
     Ok((conn, GenetlinkHandle::new(handle), messages))
 }

genetlink/src/handle.rs

@@ -78,13 +78,7 @@ impl GenetlinkHandle {
         GenetlinkError,
     >
     where
-        F: GenlFamily
-            + Emitable
-            + ParseableParametrized<[u8], GenlHeader>
-            + Clone
-            + Debug
-            + PartialEq
-            + Eq,
+        F: GenlFamily + Emitable + ParseableParametrized<[u8], GenlHeader> + Debug,
     {
         self.resolve_message_family_id(&mut message).await?;
         self.send_request(message)
@@ -102,13 +96,7 @@ impl GenetlinkHandle {
         GenetlinkError,
     >
     where
-        F: GenlFamily
-            + Emitable
-            + ParseableParametrized<[u8], GenlHeader>
-            + Clone
-            + Debug
-            + PartialEq
-            + Eq,
+        F: GenlFamily + Emitable + ParseableParametrized<[u8], GenlHeader> + Debug,
     {
         let raw_msg = map_to_rawgenlmsg(message);
 
@@ -122,13 +110,7 @@ impl GenetlinkHandle {
         mut message: NetlinkMessage<GenlMessage<F>>,
     ) -> Result<(), GenetlinkError>
     where
-        F: GenlFamily
-            + Emitable
-            + ParseableParametrized<[u8], GenlHeader>
-            + Clone
-            + Debug
-            + PartialEq
-            + Eq,
+        F: GenlFamily + Emitable + ParseableParametrized<[u8], GenlHeader> + Debug,
     {
         self.resolve_message_family_id(&mut message).await?;
         self.send_notify(message)
@@ -140,13 +122,7 @@ impl GenetlinkHandle {
         message: NetlinkMessage<GenlMessage<F>>,
     ) -> Result<(), GenetlinkError>
     where
-        F: GenlFamily
-            + Emitable
-            + ParseableParametrized<[u8], GenlHeader>
-            + Clone
-            + Debug
-            + PartialEq
-            + Eq,
+        F: GenlFamily + Emitable + ParseableParametrized<[u8], GenlHeader> + Debug,
     {
         let raw_msg = map_to_rawgenlmsg(message);
 
@@ -159,7 +135,7 @@ impl GenetlinkHandle {
         message: &mut NetlinkMessage<GenlMessage<F>>,
     ) -> Result<(), GenetlinkError>
     where
-        F: GenlFamily + Clone + Debug + PartialEq + Eq,
+        F: GenlFamily + Debug,
     {
         if let NetlinkPayload::InnerMessage(genlmsg) = &mut message.payload {
             if genlmsg.family_id() == 0 {

genetlink/src/lib.rs

@@ -7,6 +7,8 @@ mod handle;
 pub mod message;
 mod resolver;
 
+#[cfg(feature = "tokio_socket")]
 pub use connection::new_connection;
+pub use connection::new_connection_with_socket;
 pub use error::GenetlinkError;
 pub use handle::GenetlinkHandle;