Skip to content
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.

Sign up for GitHub

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

Jump to bottom

can-rs: explicitly check number of received can bytes #90

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

can-rs: explicitly check number of received can bytes #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 21 additions & 13 deletions can/src/stream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,23 +143,23 @@ impl<const N: usize> FrameStream<N> {
self.recv(&mut frame, flags).map(|_| frame)
}

pub fn recv(&self, frame: &mut Frame<N>, flags: c_int) -> io::Result<usize> {
pub fn recv(&self, frame: &mut Frame<N>, flags: c_int) -> io::Result<()> {
let mut raw = RawFrame::empty();
let size = imp::recv_from(self.as_raw_fd(), &mut raw, flags, Empty)?;
imp::recv_from(self.as_raw_fd(), &mut raw, flags, Empty)?;
let _ = std::mem::replace(frame, raw.into());
Ok(size)
Ok(())
}

pub fn recv_from(
&self,
frame: &mut Frame<N>,
flags: c_int,
src_addr: &mut CanAddr,
) -> io::Result<usize> {
) -> io::Result<()> {
let mut raw = RawFrame::empty();
let size = imp::recv_from(self.as_raw_fd(), &mut raw, flags, SetMut(src_addr))?;
imp::recv_from(self.as_raw_fd(), &mut raw, flags, SetMut(src_addr))?;
let _ = std::mem::replace(frame, raw.into());
Ok(size)
Ok(())
}

pub fn send(&self, frame: &Frame<N>, flags: c_int) -> io::Result<usize> {
Expand Down Expand Up @@ -354,7 +354,7 @@ mod imp {
}

impl<const N: usize> RawFrame<N> {
pub(crate) fn empty() -> Self {
pub(crate) const fn empty() -> Self {
Self {
id: 0,
len: 0,
Expand Down Expand Up @@ -416,21 +416,29 @@ mod imp {
frame: &mut RawFrame<N>,
flags: libc::c_int,
src_addr: T,
) -> io::Result<usize> {
) -> io::Result<()> {
let (addr, addrlen) = src_addr.to_recv_from_arguments();
let ret = unsafe {
let nbytes = unsafe {
libc::recvfrom(
fd.as_raw_fd(),
(frame as *mut RawFrame<N>) as *mut libc::c_void,
std::mem::size_of::<RawFrame<N>>(),
std::ptr::from_mut(frame).cast::<libc::c_void>(),
std::mem::size_of::<RawFrame<{ N }>>(),
flags,
addr,
addrlen,
)
};
if ret < 0 {
if nbytes < 0 {
return Err(io::Error::last_os_error());
} else if nbytes as usize != std::mem::size_of::<RawFrame<{ N }>>() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This does not hold up, as when N = 64 the acceptable values of nbytes are either size_of::<RawFrame<N=8>> OR size_of::<RawFrame<N=64>>

return Err(io::Error::new(
io::ErrorKind::UnexpectedEof,
format!(
"the number of bytes read was {nbytes}, but we expected {}",
std::mem::size_of::<RawFrame<{ N }>>()
),
));
}
Ok(ret as usize)
Ok(())
}
}
10 changes: 4 additions & 6 deletions can/tests/integration/frame_stream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ fn send_and_receive_check_identical_can_frame() -> Result<(), Error> {
.bind(can_address())?;

let mut frame = Frame::empty();
let size = stream.recv(&mut frame, 0)?;
stream.recv(&mut frame, 0)?;
tx.send((frame, size)).unwrap();
Ok(())
});
Expand All @@ -62,7 +62,7 @@ fn send_and_receive_check_identical_can_frame() -> Result<(), Error> {
};

let stream = FrameStream::<CAN_DATA_LEN>::build().bind(can_address())?;
let size = stream.send(&frame, 0)?;
stream.send(&frame, 0)?;

thread::sleep(std::time::Duration::from_millis(1));

Expand All @@ -71,7 +71,6 @@ fn send_and_receive_check_identical_can_frame() -> Result<(), Error> {
assert_eq!(frame, recv_frame);
assert_eq!(frame.len, CAN_DATA_LEN as u8);
assert_eq!(frame.id, Id::Standard(id));
assert_eq!(size, recv_size);

receiving_thread.join().unwrap()?;
Ok(())
Expand All @@ -91,7 +90,7 @@ fn send_and_receive_check_identical_canfd_frame() -> Result<(), Error> {
.bind(canfd_address())?;

let mut frame = Frame::empty();
let size = stream.recv(&mut frame, 0)?;
stream.recv(&mut frame, 0)?;
tx.send((frame, size)).unwrap();
Ok(())
});
Expand All @@ -106,7 +105,7 @@ fn send_and_receive_check_identical_canfd_frame() -> Result<(), Error> {
data: [16u8; CANFD_DATA_LEN],
};
let stream = FrameStream::<CANFD_DATA_LEN>::build().bind(canfd_address())?;
let size = stream.send(&frame, 0)?;
stream.send(&frame, 0)?;

thread::sleep(std::time::Duration::from_millis(1));

Expand All @@ -115,7 +114,6 @@ fn send_and_receive_check_identical_canfd_frame() -> Result<(), Error> {
assert_eq!(frame, recv_frame);
assert_eq!(frame.len, CANFD_DATA_LEN as u8);
assert_eq!(frame.id, Id::Standard(id));
assert_eq!(size, recv_size);

receiving_thread.join().unwrap()?;
Ok(())
Expand Down
Loading