Use latest rust-netlink crates

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

Author: cathay4t

Cargo.toml

@@ -13,8 +13,9 @@ description = "linux audit via netlink"
 [dependencies]
 futures = "0.3.11"
 thiserror = "1"
-netlink-packet-audit = { version = "0.4.1" }
-netlink-proto = { default-features = false, version = "0.10.0" }
+netlink-packet-audit = { version = "0.5.0" }
+netlink-packet-core = { version = "0.5.0" }
+netlink-proto = { default-features = false, version = "0.11.1" }
 
 [features]
 default = ["tokio_socket"]

examples/add_rules.rs

@@ -23,32 +23,31 @@ async fn main() -> Result<(), String> {
 }
 
 async fn add_rules(mut handle: Handle) -> Result<(), Error> {
-    let etc_passwd_rule = RuleMessage {
-        flags: RuleFlags::FilterExit,
-        action: RuleAction::Always,
-        fields: vec![
-            (
-                RuleField::Watch("/etc/passwd".into()),
-                RuleFieldFlags::Equal,
-            ),
-            (RuleField::Perm(15), RuleFieldFlags::Equal),
-            (RuleField::Filterkey("my_key".into()), RuleFieldFlags::Equal),
-        ],
-        syscalls: RuleSyscalls::new_maxed(),
-    };
+    let mut etc_passwd_rule = RuleMessage::default();
+    etc_passwd_rule.flags = RuleFlags::FilterExit;
+    etc_passwd_rule.action = RuleAction::Always;
+    etc_passwd_rule.fields = vec![
+        (
+            RuleField::Watch("/etc/passwd".into()),
+            RuleFieldFlags::Equal,
+        ),
+        (RuleField::Perm(15), RuleFieldFlags::Equal),
+        (RuleField::Filterkey("my_key".into()), RuleFieldFlags::Equal),
+    ];
+    etc_passwd_rule.syscalls = RuleSyscalls::new_maxed();
     handle.add_rule(etc_passwd_rule).await?;
 
     let mut syscalls = RuleSyscalls::new_zeroed();
     syscalls.set(135);
-    let personality_syscall_rule = RuleMessage {
-        flags: RuleFlags::FilterExit,
-        action: RuleAction::Always,
-        fields: vec![
-            (RuleField::Arch(AUDIT_ARCH_X86_64), RuleFieldFlags::Equal),
-            (RuleField::Filterkey("bypass".into()), RuleFieldFlags::Equal),
-        ],
-        syscalls,
-    };
+    let mut personality_syscall_rule = RuleMessage::default();
+    personality_syscall_rule.flags = RuleFlags::FilterExit;
+    personality_syscall_rule.action = RuleAction::Always;
+    personality_syscall_rule.fields = vec![
+        (RuleField::Arch(AUDIT_ARCH_X86_64), RuleFieldFlags::Equal),
+        (RuleField::Filterkey("bypass".into()), RuleFieldFlags::Equal),
+    ];
+    personality_syscall_rule.syscalls = syscalls;
+
     handle.add_rule(personality_syscall_rule).await?;
     Ok(())
 }

src/errors.rs

@@ -2,7 +2,8 @@
 
 use thiserror::Error;
 
-use crate::packet::{AuditMessage, ErrorMessage, NetlinkMessage};
+use crate::packet::AuditMessage;
+use netlink_packet_core::{ErrorMessage, NetlinkMessage};
 
 #[derive(Clone, Eq, PartialEq, Debug, Error)]
 pub enum Error {

src/handle.rs

@@ -7,12 +7,13 @@ use futures::{
     stream::{Stream, StreamExt, TryStream},
     FutureExt,
 };
+use netlink_packet_core::{
+    NetlinkMessage, NetlinkPayload, NLM_F_ACK, NLM_F_CREATE, NLM_F_DUMP, NLM_F_EXCL, NLM_F_NONREC,
+    NLM_F_REQUEST,
+};
 use netlink_proto::{sys::SocketAddr, ConnectionHandle};
 
-use crate::packet::{
-    rules::RuleMessage, AuditMessage, NetlinkMessage, NetlinkPayload, StatusMessage, NLM_F_ACK,
-    NLM_F_CREATE, NLM_F_DUMP, NLM_F_EXCL, NLM_F_NONREC, NLM_F_REQUEST,
-};
+use crate::packet::{rules::RuleMessage, AuditMessage, StatusMessage};
 
 // ==========================================
 // mask values

src/lib.rs

@@ -7,6 +7,7 @@ mod errors;
 pub use crate::errors::*;
 
 pub use netlink_packet_audit as packet;
+use netlink_packet_core::NetlinkMessage;
 pub mod proto {
     pub use netlink_proto::{Connection, ConnectionHandle, Error};
 }
@@ -21,10 +22,7 @@ use futures::channel::mpsc::UnboundedReceiver;
 pub fn new_connection() -> io::Result<(
     proto::Connection<packet::AuditMessage, sys::TokioSocket, packet::NetlinkAuditCodec>,
     Handle,
-    UnboundedReceiver<(
-        packet::NetlinkMessage<packet::AuditMessage>,
-        sys::SocketAddr,
-    )>,
+    UnboundedReceiver<(NetlinkMessage<packet::AuditMessage>, sys::SocketAddr)>,
 )> {
     new_connection_with_socket()
 }
@@ -33,10 +31,7 @@ pub fn new_connection() -> io::Result<(
 pub fn new_connection_with_socket<S>() -> io::Result<(
     proto::Connection<packet::AuditMessage, S, packet::NetlinkAuditCodec>,
     Handle,
-    UnboundedReceiver<(
-        packet::NetlinkMessage<packet::AuditMessage>,
-        sys::SocketAddr,
-    )>,
+    UnboundedReceiver<(NetlinkMessage<packet::AuditMessage>, sys::SocketAddr)>,
 )>
 where
     S: sys::AsyncSocket,