Merge branch 'main' into connection-immutable

Author: najaco

CHANGELOG

@@ -1,4 +1,15 @@
 # Changelog
+## [0.11.2] - 2023-07-29
+### Breaking changes
+ - N/A
+
+### New features
+ - N/A
+
+### Bug fixes
+ - Check for closed unsolicited messages channel. (2e14c59)
+ - Use latest netlink-packet-core 0.7.0. (55fb44f)
+
 ## [0.11.1] - 2023-01-28
 ### Breaking changes
  - N/A

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["Corentin Henry <[email protected]>"]
 name = "netlink-proto"
-version = "0.11.1"
+version = "0.11.2"
 edition = "2018"
 
 homepage = "https://github.com/rust-netlink/netlink-proto"
@@ -16,7 +16,7 @@ bytes = "1.0"
 log = "0.4.8"
 futures = "0.3"
 tokio = { version = "1.0", default-features = false, features = ["io-util","time"] }
-netlink-packet-core = "0.5.0"
+netlink-packet-core = "0.7.0"
 netlink-sys = { default-features = false, version = "0.8.4" }
 thiserror = "1.0.30"
 

src/connection.rs

@@ -250,8 +250,11 @@ where
                     // dropping the last instance of that sender,
                     // hence closing the channel and signaling the
                     // handle that no more messages are expected.
-                    Noop | Done | Ack(_) => {
-                        trace!("not forwarding Noop/Ack/Done message to the handle");
+                    Noop | Done(_) => {
+                        trace!(
+                            "not forwarding Noop/Ack/Done message to \
+                            the handle"
+                        );
                         continue;
                     }
                     // I'm not sure how we should handle overrun messages
@@ -260,7 +263,16 @@ where
                     // that are part of the netlink subprotocol,
                     // because only the user knows how they want to
                     // handle them.
-                    Error(_) | InnerMessage(_) => {}
+                    Error(err_msg) => {
+                        if err_msg.code.is_none() {
+                            trace!(
+                                "not forwarding Noop/Ack/Done message to \
+                                the handle"
+                            );
+                            continue;
+                        }
+                    }
+                    InnerMessage(_) => {}
                     _ => {}
                 }
             }