Use latest rust-netlink and drop reexport

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

Author: cathay4t

Diff for: Cargo.toml

@@ -14,9 +14,9 @@ description = "netlink packet types for the netfilter subprotocol"
 [dependencies]
 anyhow = "1.0.32"
 byteorder = "1.3.4"
-netlink-packet-core = { version = "0.4.2" }
+netlink-packet-core = { version = "0.7.0" }
 netlink-packet-utils = { version = "0.5.1" }
-bitflags = "1.2.1"
+bitflags = "2.3"
 libc = "0.2.77"
 derive_more = "0.99.16"
 

Diff for: README.md

@@ -0,0 +1 @@
+# Rust netlink packet types for the netfilter subprotocol

Diff for: examples/nflog.rs

@@ -2,15 +2,14 @@
 
 // To run this example:
 //   1) create a iptables/nft rules that send packet with group 1, for example:
-//          sudo iptables -A INPUT -j NFLOG --nflog-group 1
-//   2) build the example:
-//          cargo build --example nflog
-//   3) run it as root:
-//          sudo ../target/debug/examples/nflog
+//      sudo iptables -A INPUT -j NFLOG --nflog-group 1
+//   2) build the example: cargo build --example nflog
+//   3) run it as root: sudo ../target/debug/examples/nflog
 
 use std::{net::Ipv4Addr, time::Duration};
 
 use byteorder::{ByteOrder, NetworkEndian};
+use netlink_packet_core::{NetlinkMessage, NetlinkPayload};
 use netlink_packet_netfilter::{
     constants::*,
     nflog::{
@@ -21,7 +20,6 @@ use netlink_packet_netfilter::{
         },
         NfLogMessage,
     },
-    nl::{NetlinkMessage, NetlinkPayload},
     NetfilterMessage, NetfilterMessageInner,
 };
 use netlink_sys::{constants::NETLINK_NETFILTER, Socket};
@@ -58,7 +56,10 @@ fn main() {
     let rx_packet =
         <NetlinkMessage<NetfilterMessage>>::deserialize(bytes).unwrap();
     println!("<<< {:?}", rx_packet);
-    assert!(matches!(rx_packet.payload, NetlinkPayload::Ack(_)));
+    assert!(matches!(rx_packet.payload, NetlinkPayload::Error(_)));
+    if let NetlinkPayload::Error(e) = rx_packet.payload {
+        assert_eq!(e.code, None);
+    }
 
     // After that we issue a Bind command, to start receiving packets. We can
     // also set various parameters at the same time
@@ -83,7 +84,10 @@ fn main() {
     let rx_packet =
         <NetlinkMessage<NetfilterMessage>>::deserialize(bytes).unwrap();
     println!("<<< {:?}", rx_packet);
-    assert!(matches!(rx_packet.payload, NetlinkPayload::Ack(_)));
+    assert!(matches!(rx_packet.payload, NetlinkPayload::Error(_)));
+    if let NetlinkPayload::Error(e) = rx_packet.payload {
+        assert_eq!(e.code, None);
+    }
 
     // And now we can receive the packets
     loop {

Diff for: src/buffer.rs

@@ -6,13 +6,12 @@ use crate::{
         NETFILTER_HEADER_LEN,
     },
     nflog::NfLogMessage,
-    traits::{Parseable, ParseableParametrized},
-    DecodeError,
 };
 use anyhow::Context;
 use netlink_packet_utils::{
     buffer,
     nla::{DefaultNla, NlaBuffer, NlasIterator},
+    DecodeError, Parseable, ParseableParametrized,
 };
 
 buffer!(NetfilterBuffer(NETFILTER_HEADER_LEN) {

Diff for: src/lib.rs

@@ -1,10 +1,5 @@
 // SPDX-License-Identifier: MIT
 
-pub extern crate netlink_packet_core as nl;
-pub(crate) extern crate netlink_packet_utils as utils;
-
-pub use self::utils::{nla, traits, DecodeError};
-
 pub(crate) mod buffer;
 pub mod constants;
 mod message;

Diff for: src/message.rs

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: MIT
 
 use netlink_packet_core::{
-    DecodeError, NetlinkDeserializable, NetlinkHeader, NetlinkPayload,
-    NetlinkSerializable,
+    NetlinkDeserializable, NetlinkHeader, NetlinkPayload, NetlinkSerializable,
 };
 use netlink_packet_utils::{
-    buffer, nla::DefaultNla, Emitable, Parseable, ParseableParametrized,
+    buffer, nla::DefaultNla, DecodeError, Emitable, Parseable,
+    ParseableParametrized,
 };
 
 use crate::{buffer::NetfilterBuffer, nflog::NfLogMessage};

Diff for: src/nflog/message.rs

@@ -1,12 +1,13 @@
 // SPDX-License-Identifier: MIT
 
+use netlink_packet_utils::{
+    nla::DefaultNla, DecodeError, Emitable, Parseable, ParseableParametrized,
+};
+
 use crate::{
     buffer::NetfilterBuffer,
     constants::{NFNL_SUBSYS_ULOG, NFULNL_MSG_CONFIG, NFULNL_MSG_PACKET},
     nflog::nlas::{config::ConfigNla, packet::PacketNla},
-    nla::DefaultNla,
-    traits::{Emitable, Parseable, ParseableParametrized},
-    DecodeError,
 };
 
 #[derive(Debug, PartialEq, Eq, Clone)]

Diff for: src/nflog/mod.rs

@@ -4,30 +4,29 @@ mod message;
 pub use message::NfLogMessage;
 pub mod nlas;
 
+use netlink_packet_core::{
+    NetlinkHeader, NetlinkMessage, NetlinkPayload, NLM_F_ACK, NLM_F_REQUEST,
+};
+
 use crate::{
-    constants::NFNETLINK_V0,
-    nflog::nlas::config::ConfigNla,
-    nl::{
-        NetlinkHeader, NetlinkMessage, NetlinkPayload, NLM_F_ACK, NLM_F_REQUEST,
-    },
-    NetfilterHeader, NetfilterMessage,
+    constants::NFNETLINK_V0, nflog::nlas::config::ConfigNla, NetfilterHeader,
+    NetfilterMessage,
 };
 
 pub fn config_request(
     family: u8,
     group_num: u16,
     nlas: Vec<ConfigNla>,
 ) -> NetlinkMessage<NetfilterMessage> {
-    let mut message = NetlinkMessage {
-        header: NetlinkHeader {
-            flags: NLM_F_REQUEST | NLM_F_ACK,
-            ..Default::default()
-        },
-        payload: NetlinkPayload::from(NetfilterMessage::new(
+    let mut hdr = NetlinkHeader::default();
+    hdr.flags = NLM_F_REQUEST | NLM_F_ACK;
+    let mut message = NetlinkMessage::new(
+        hdr,
+        NetlinkPayload::from(NetfilterMessage::new(
             NetfilterHeader::new(family, NFNETLINK_V0, group_num),
             NfLogMessage::Config(nlas),
         )),
-    };
+    );
     message.finalize();
     message
 }

Diff for: src/nflog/nlas/config/config_flags.rs

@@ -9,6 +9,7 @@ use netlink_packet_utils::nla::Nla;
 const NFULA_CFG_FLAGS: u16 = libc::NFULA_CFG_FLAGS as u16;
 
 bitflags! {
+    #[derive(Clone, Debug, Copy, PartialEq, Eq)]
     pub struct ConfigFlags: u16 {
         const SEQ = libc:: NFULNL_CFG_F_SEQ as u16;
         const SEQ_GLOBAL = libc:: NFULNL_CFG_F_SEQ_GLOBAL as u16;
@@ -19,7 +20,7 @@ bitflags! {
 // see https://github.com/bitflags/bitflags/issues/263
 impl ConfigFlags {
     pub fn from_bits_preserve(bits: u16) -> Self {
-        ConfigFlags { bits }
+        ConfigFlags::from_bits_truncate(bits)
     }
 }
 
@@ -33,6 +34,6 @@ impl Nla for ConfigFlags {
     }
 
     fn emit_value(&self, buffer: &mut [u8]) {
-        BigEndian::write_u16(buffer, self.bits);
+        BigEndian::write_u16(buffer, self.bits());
     }
 }

Diff for: src/nflog/nlas/config/nla.rs

@@ -3,6 +3,11 @@
 use anyhow::Context;
 use byteorder::{BigEndian, ByteOrder};
 use derive_more::{From, IsVariant};
+use netlink_packet_utils::{
+    nla::{DefaultNla, Nla, NlaBuffer},
+    parsers::{parse_u16_be, parse_u32_be, parse_u8},
+    DecodeError, Parseable,
+};
 
 use crate::{
     constants::{
@@ -13,10 +18,6 @@ use crate::{
         config_mode::ConfigModeBuffer, ConfigCmd, ConfigFlags, ConfigMode,
         Timeout,
     },
-    nl::DecodeError,
-    nla::{DefaultNla, Nla, NlaBuffer},
-    traits::Parseable,
-    utils::parsers::{parse_u16_be, parse_u32_be, parse_u8},
 };
 
 #[derive(Clone, Debug, PartialEq, Eq, From, IsVariant)]

Diff for: src/nflog/nlas/packet/hw_addr.rs

@@ -1,9 +1,8 @@
 // SPDX-License-Identifier: MIT
 
-use crate::{
-    constants::NFULA_HWADDR, nla::Nla, traits::Parseable, utils::buffer,
-    DecodeError,
-};
+use netlink_packet_utils::{buffer, nla::Nla, DecodeError, Parseable};
+
+use crate::constants::NFULA_HWADDR;
 
 const HW_ADDR_LEN: usize = 12;
 

Diff for: src/nflog/nlas/packet/nla.rs

@@ -6,6 +6,12 @@ use anyhow::Context;
 use byteorder::{BigEndian, ByteOrder};
 use derive_more::{From, IsVariant};
 
+use netlink_packet_utils::{
+    nla::{DefaultNla, Nla, NlaBuffer},
+    parsers::{parse_u16_be, parse_u32_be},
+    DecodeError, Parseable,
+};
+
 use crate::{
     constants::{
         NFULA_GID, NFULA_HWADDR, NFULA_HWHEADER, NFULA_HWLEN, NFULA_HWTYPE,
@@ -18,10 +24,6 @@ use crate::{
         packet_hdr::{PacketHdr, PacketHdrBuffer},
         timestamp::{TimeStamp, TimeStampBuffer},
     },
-    nla::{DefaultNla, Nla, NlaBuffer},
-    traits::Parseable,
-    utils::parsers::{parse_u16_be, parse_u32_be},
-    DecodeError,
 };
 
 #[derive(Clone, Debug, PartialEq, Eq, From, IsVariant)]

Diff for: src/nflog/nlas/packet/packet_hdr.rs

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-use netlink_packet_core::DecodeError;
-use netlink_packet_utils::{buffer, nla::Nla, Parseable};
+use netlink_packet_utils::{buffer, nla::Nla, DecodeError, Parseable};
 
 const PACKET_HDR_LEN: usize = 4;
 pub const NFULA_PACKET_HDR: u16 = libc::NFULA_PACKET_HDR as u16;

Diff for: src/nflog/nlas/packet/timestamp.rs

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-use netlink_packet_core::DecodeError;
-use netlink_packet_utils::{buffer, nla::Nla, Parseable};
+use netlink_packet_utils::{buffer, nla::Nla, DecodeError, Parseable};
 
 use crate::constants::NFULA_TIMESTAMP;