0.95.2 - Handle socketcan read timeout correctly

rnd-ash · Sep 13, 2023 · 44f10ad · 44f10ad
1 parent 965607c
commit 44f10ad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ecu_diagnostics"
-version = "0.95.1"
+version = "0.95.2"
 authors = ["Ashcon Mohseninia <[email protected]>"]
 edition = "2021"
 description = "A rust crate for ECU diagnostic servers and communication APIs"

diff --git a/src/hardware/socketcan.rs b/src/hardware/socketcan.rs
@@ -122,7 +122,7 @@ impl PacketChannel<CanFrame> for SocketCanCanChannel {
         }
         let channel = socketcan::CANSocket::open(&self.device.info.name)?;
         channel.filter_accept_all()?;
-        channel.set_nonblocking(true)?;
+        channel.set_nonblocking(false)?;
         self.channel = Some(channel);
         self.device.canbus_active.store(true, Ordering::Relaxed);
         Ok(())
@@ -153,6 +153,7 @@ impl PacketChannel<CanFrame> for SocketCanCanChannel {
         let timeout = std::cmp::max(1, timeout_ms) as u128;
         let mut result: Vec<CanFrame> = Vec::with_capacity(max);
         self.safe_with_iface(|iface| {
+            iface.set_read_timeout(std::time::Duration::from_millis(timeout_ms as u64))?;
             let start = Instant::now();
             let mut read: socketcan::CANFrame;
             while start.elapsed().as_millis() <= timeout {