Skip to content

Add structured error support #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/done.rs
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ impl Emitable for DoneMessage {
impl<'buffer, T: AsRef<[u8]> + 'buffer> Parseable<DoneBuffer<&'buffer T>>
for DoneMessage
{
type Error = DecodeError;
fn parse(buf: &DoneBuffer<&'buffer T>) -> Result<DoneMessage, DecodeError> {
Ok(DoneMessage {
code: buf.code(),
Expand Down
1 change: 1 addition & 0 deletions src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ impl Emitable for ErrorMessage {
impl<'buffer, T: AsRef<[u8]> + 'buffer> Parseable<ErrorBuffer<&'buffer T>>
for ErrorMessage
{
type Error = DecodeError;
fn parse(
buf: &ErrorBuffer<&'buffer T>,
) -> Result<ErrorMessage, DecodeError> {
Expand Down
1 change: 1 addition & 0 deletions src/header.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ impl Emitable for NetlinkHeader {
impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NetlinkBuffer<&'a T>>
for NetlinkHeader
{
type Error = DecodeError;
fn parse(buf: &NetlinkBuffer<&'a T>) -> Result<NetlinkHeader, DecodeError> {
Ok(NetlinkHeader {
length: buf.length(),
Expand Down
15 changes: 10 additions & 5 deletions src/message.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ impl<I> NetlinkMessage<I> {
impl<I> NetlinkMessage<I>
where
I: NetlinkDeserializable,
I::Error: Into<DecodeError>,
{
/// Parse the given buffer as a netlink message
pub fn deserialize(buffer: &[u8]) -> Result<Self, DecodeError> {
Expand Down Expand Up @@ -87,7 +88,9 @@ impl<'buffer, B, I> Parseable<NetlinkBuffer<&'buffer B>> for NetlinkMessage<I>
where
B: AsRef<[u8]> + 'buffer,
I: NetlinkDeserializable,
I::Error:Into<DecodeError>,
{
type Error = DecodeError;
fn parse(buf: &NetlinkBuffer<&'buffer B>) -> Result<Self, DecodeError> {
use self::NetlinkPayload::*;

Expand All @@ -100,21 +103,23 @@ where
NLMSG_ERROR => {
let msg = ErrorBuffer::new_checked(&bytes)
.and_then(|buf| ErrorMessage::parse(&buf))
.context("failed to parse NLMSG_ERROR")?;
.map_err(|err|DecodeError::FailedToParseNlMsgError(err.into()))?;
Error(msg)
}
NLMSG_NOOP => Noop,
NLMSG_DONE => {
let msg = DoneBuffer::new_checked(&bytes)
.and_then(|buf| DoneMessage::parse(&buf))
.context("failed to parse NLMSG_DONE")?;
.map_err(|err| DecodeError::FailedToParseNlMsgDone(err.into()))?;
Done(msg)
}
NLMSG_OVERRUN => Overrun(bytes.to_vec()),
message_type => {
let inner_msg = I::deserialize(&header, bytes).context(
format!("Failed to parse message with type {message_type}"),
)?;
let inner_msg = I::deserialize(&header, bytes)
.map_err(|err| DecodeError::FailedToParseMessageWithType {
message_type,
source: Box::new(err.into()),
})?;
InnerMessage(inner_msg)
}
};
Expand Down