Skip to content

Commit

Permalink
Merge #588
Browse files Browse the repository at this point in the history
588: Propagate phy::RawSocket send error to caller r=Dirbaio a=witchof0x20

For #587

Co-authored-by: Jade <jade@witchof.space>
  • Loading branch information
bors[bot] and witchof0x20 committed Feb 9, 2022
2 parents 61639d5 + 32974f8 commit cb9b467
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
7 changes: 5 additions & 2 deletions src/phy/raw_socket.rs
Expand Up @@ -111,7 +111,10 @@ impl phy::TxToken for TxToken {
let mut lower = self.lower.borrow_mut();
let mut buffer = vec![0; len];
let result = f(&mut buffer);
lower.send(&buffer[..]).unwrap();
result
match lower.send(&buffer[..]) {
Ok(_) => result,
Err(err) if err.kind() == io::ErrorKind::WouldBlock => Err(crate::Error::Exhausted),
Err(err) => panic!("{}", err),
}
}
}
2 changes: 1 addition & 1 deletion src/phy/sys/raw_socket.rs
Expand Up @@ -104,7 +104,7 @@ impl RawSocketDesc {
0,
);
if len == -1 {
Err(io::Error::last_os_error()).unwrap()
return Err(io::Error::last_os_error());
}
Ok(len as usize)
}
Expand Down

0 comments on commit cb9b467

Please sign in to comment.