Use netlink-packet-core 0.5.0

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

Author: cathay4t

Cargo.toml

@@ -18,8 +18,8 @@ rich_nlas = []
 anyhow = "1.0.31"
 byteorder = "1.3.2"
 libc = "0.2.66"
-netlink-packet-core = { version = "0.4.2" }
-netlink-packet-utils = { version = "0.5.1" }
+netlink-packet-core = { version = "0.5.0" }
+netlink-packet-utils = { version = "0.5.2" }
 bitflags = "1.2.1"
 
 [[example]]
@@ -29,7 +29,7 @@ name = "dump_packet_links"
 criterion = "0.3.0"
 pcap-file = "1.1.1"
 lazy_static = "1.4.0"
-netlink-sys = { version = "0.8.3" }
+netlink-sys = { version = "0.8.4" }
 pretty_assertions = "0.7.2"
 
 [[bench]]

examples/dump_neighbours.rs

@@ -13,15 +13,15 @@ fn main() {
     let _port_number = socket.bind_auto().unwrap().port_number();
     socket.connect(&SocketAddr::new(0, 0)).unwrap();
 
-    let mut req = NetlinkMessage {
-        header: NetlinkHeader {
-            flags: NLM_F_DUMP | NLM_F_REQUEST,
-            ..Default::default()
-        },
-        payload: NetlinkPayload::from(RtnlMessage::GetNeighbour(
+    let mut nl_hdr = NetlinkHeader::default();
+    nl_hdr.flags = NLM_F_DUMP | NLM_F_REQUEST;
+
+    let mut req = NetlinkMessage::new(
+        nl_hdr,
+        NetlinkPayload::from(RtnlMessage::GetNeighbour(
             NeighbourMessage::default(),
         )),
-    };
+    );
     // IMPORTANT: call `finalize()` to automatically set the
     // `message_type` and `length` fields to the appropriate values in
     // the netlink header.

examples/dump_packet_link_bridge_vlan.rs

@@ -17,10 +17,10 @@ fn main() {
     message
         .nlas
         .push(Nla::ExtMask(RTEXT_FILTER_BRVLAN_COMPRESSED));
-    let mut packet = NetlinkMessage {
-        header: NetlinkHeader::default(),
-        payload: NetlinkPayload::from(RtnlMessage::GetLink(message)),
-    };
+    let mut packet = NetlinkMessage::new(
+        NetlinkHeader::default(),
+        NetlinkPayload::from(RtnlMessage::GetLink(message)),
+    );
     packet.header.flags = NLM_F_DUMP | NLM_F_REQUEST;
     packet.header.sequence_number = 1;
     packet.finalize();

examples/dump_packet_links.rs

@@ -11,12 +11,10 @@ fn main() {
     let _port_number = socket.bind_auto().unwrap().port_number();
     socket.connect(&SocketAddr::new(0, 0)).unwrap();
 
-    let mut packet = NetlinkMessage {
-        header: NetlinkHeader::default(),
-        payload: NetlinkPayload::from(RtnlMessage::GetLink(
-            LinkMessage::default(),
-        )),
-    };
+    let mut packet = NetlinkMessage::new(
+        NetlinkHeader::default(),
+        NetlinkPayload::from(RtnlMessage::GetLink(LinkMessage::default())),
+    );
     packet.header.flags = NLM_F_DUMP | NLM_F_REQUEST;
     packet.header.sequence_number = 1;
     packet.finalize();

examples/dump_rules.rs

@@ -11,15 +11,12 @@ fn main() {
     let _port_number = socket.bind_auto().unwrap().port_number();
     socket.connect(&SocketAddr::new(0, 0)).unwrap();
 
-    let mut packet = NetlinkMessage {
-        header: NetlinkHeader {
-            flags: NLM_F_REQUEST | NLM_F_DUMP,
-            ..Default::default()
-        },
-        payload: NetlinkPayload::from(RtnlMessage::GetRule(
-            RuleMessage::default(),
-        )),
-    };
+    let mut nl_hdr = NetlinkHeader::default();
+    nl_hdr.flags = NLM_F_REQUEST | NLM_F_DUMP;
+    let mut packet = NetlinkMessage::new(
+        nl_hdr,
+        NetlinkPayload::from(RtnlMessage::GetRule(RuleMessage::default())),
+    );
 
     packet.finalize();
 

examples/new_rule.rs

@@ -24,14 +24,13 @@ fn main() {
         rule::Nla::Priority(1000),
         rule::Nla::Protocol(2),
     ];
+    let mut nl_hdr = NetlinkHeader::default();
+    nl_hdr.flags = NLM_F_REQUEST | NLM_F_CREATE | NLM_F_EXCL | NLM_F_ACK;
 
-    let mut msg = NetlinkMessage {
-        header: NetlinkHeader {
-            flags: NLM_F_REQUEST | NLM_F_CREATE | NLM_F_EXCL | NLM_F_ACK,
-            ..Default::default()
-        },
-        payload: NetlinkPayload::from(RtnlMessage::NewRule(rule_msg)),
-    };
+    let mut msg = NetlinkMessage::new(
+        nl_hdr,
+        NetlinkPayload::from(RtnlMessage::NewRule(rule_msg)),
+    );
 
     msg.finalize();
     let mut buf = vec![0; 1024 * 8];