ISO-TP fix single frame escape sequence for extended addr

I-CAN-hack · Sep 2, 2024 · c72d3b5 · c72d3b5
1 parent c8fae87
commit c72d3b5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/isotp/mod.rs b/src/isotp/mod.rs
@@ -210,8 +210,8 @@ impl<'a> IsoTPAdapter<'a> {
     pub async fn send_single_frame(&self, data: &[u8]) -> Result<()> {
         let mut buf;
 
-        if data.len() < 0x8 {
-            // Len fits in single nibble
+        if data.len() < self.can_max_dlen() {
+            // Len fits in classic CAN message
             buf = vec![FrameType::Single as u8 | data.len() as u8];
         } else {
             // Use escape sequence for length, length is in the next byte

diff --git a/tests/isotp_tests.rs b/tests/isotp_tests.rs
@@ -164,6 +164,8 @@ async fn isotp_test_fd() {
     };
 
     // Single frame with some padding to reach next DLC
+    isotp_test_echo(6, config).await;
+    isotp_test_echo(7, config).await;
     isotp_test_echo(8, config).await;
 
     // Single frame escape
@@ -231,6 +233,11 @@ async fn isotp_test_fd_extended() {
         ..Default::default()
     };
 
+    // Single frame with some padding to reach next DLC
+    isotp_test_echo(6, config).await;
+    isotp_test_echo(7, config).await;
+    isotp_test_echo(8, config).await;
+
     // Single frame escape
     isotp_test_echo(62, config).await;