Bump netlink-packet-utils and netlink-packet-core crates #156
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bump netlink-packet-utils, get rid of anyhow, and adjust the code accordingly. Signed-off-by: Quentin Monnet <[email protected]>
qmonnet
commented
Apr 3, 2025
Comment on lines
-135
to
+161
| .map(|nla| nla.and_then(|nla| InfoBondPort::parse(&nla))) | ||
| .map(|nla| { | ||
| nla.and_then(|nla| { | ||
| InfoBondPort::parse(&nla) | ||
| // Placeholder error, as we need to return a NlaError | ||
| .map_err(|_| NlaError::InvalidLength { nla_len: 0 }) | ||
| }) | ||
| }) | ||
| .collect::<Result<Vec<_>, _>>() | ||
| .map(InfoPortData::BondPort), | ||
| InfoPortKind::Bridge => NlasIterator::new(payload) | ||
| .map(|nla| nla.and_then(|nla| InfoBridgePort::parse(&nla))) | ||
| .map(|nla| { | ||
| nla.and_then(|nla| { | ||
| InfoBridgePort::parse(&nla) | ||
| // Placeholder error, as we need to return a NlaError | ||
| .map_err(|_| NlaError::InvalidLength { nla_len: 0 }) | ||
| }) | ||
| }) | ||
| .collect::<Result<Vec<_>, _>>() | ||
| .map(InfoPortData::BridgePort), | ||
| InfoPortKind::Vrf => NlasIterator::new(payload) | ||
| .map(|nla| nla.and_then(|nla| InfoVrfPort::parse(&nla))) | ||
| .map(|nla| { | ||
| nla.and_then(|nla| { | ||
| InfoVrfPort::parse(&nla) | ||
| // Placeholder error, as we need to return a NlaError | ||
| .map_err(|_| NlaError::InvalidLength { nla_len: 0 }) | ||
| }) | ||
| }) |
There was a problem hiding this comment.
This is one of the chunks that I don't believe are the right way to address the changes.
Comment on lines
-83
to
+85
| TCA_ACT_KIND => Some( | ||
| parse_string(nla.value()) | ||
| .context("failed to parse TCA_ACT_KIND"), | ||
| ), | ||
| TCA_ACT_KIND => { | ||
| Some(parse_string(nla.value()).map_err(|_| { | ||
| // Placeholder error, as we need to return a NlaError | ||
| NlaError::InvalidLength { nla_len: 0 } | ||
| })) | ||
| } |
Comment on lines
-730
to
+708
| match RouteNetlinkMessage::parse_with_param(&buf, header.message_type) { | ||
| Err(e) => Err(e), | ||
| Ok(message) => Ok(message), | ||
| } | ||
| RouteNetlinkMessage::parse_with_param(&buf, header.message_type) | ||
| .map_err(|_| NlaError::InvalidLength { nla_len: 0 }) |
There was a problem hiding this comment.
And this seems not correct either.
qmonnet
commented
Apr 3, 2025
| bitflags = "2" | ||
| byteorder = "1.3.2" | ||
| libc = "0.2.66" | ||
| log = { version = "0.4.20", features = ["std"] } | ||
| netlink-packet-core = { version = "0.7.0" } | ||
| netlink-packet-utils = { version = "0.5.2" } | ||
| netlink-packet-core = { git = "https://github.com/rust-netlink/netlink-packet-core.git", rev = "01e8dd1" } |
|
I note there are merge conflicts here. I'm happy to rebase the PR, but I'd welcome some feedback on the approach first. |
|
@qmonnet Losing context will complex the debug process. Maybe provide a function like Let me test my theory. |
|
Please do stuff like below in netlink-packet-core (I am also in a favor of merging netlink-packet-utils into netlink-packet-core). If you find it too complex, let me know, I can take over. // SPDX-License-Identifier: Apache-2.0
trait ErrorContext {
fn context(self, msg: &str) -> Self;
}
#[derive(Debug)]
struct DecodeError {
msg: String,
}
impl ErrorContext for DecodeError {
fn context(self, msg: &str) -> Self {
Self {
msg: format!("{} caused by {}", msg, self.msg),
}
}
}
impl<T> ErrorContext for Result<T, DecodeError>
where
T: Clone,
{
fn context(self, msg: &str) -> Result<T, DecodeError> {
match self {
Ok(t) => Ok(t),
Err(e) => Err(e.context(msg)),
}
}
}
impl std::fmt::Display for DecodeError {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "{}", self.msg)
}
}
impl std::error::Error for DecodeError {}
fn foo(value: bool) -> Result<String, DecodeError> {
if value {
Ok("foo".to_string())
} else {
Err(DecodeError {
msg: "foo_error".to_string(),
})
}
}
fn main() -> Result<(), DecodeError> {
foo(false).context("main func error")?;
Ok(())
} |
|
Thanks! I'll give it a try, when I can find a moment. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
“Bump netlink-packet-utils, get rid of anyhow, and adjust the code accordingly.”
In practice, the PR is not ready yet; but I could do with some feedback.
What's missing:
netlink-packet-core