Fix construction of non-verbose args

Author: kruss

application/apps/indexer/Cargo.toml

@@ -26,7 +26,8 @@ thiserror = "2.0"
 lazy_static = "1.5"
 tokio = { version = "1", features = ["full"] }
 tokio-stream = "0.1"
-dlt-core = "0.20"
+#dlt-core = "0.20.2"
+dlt-core = { git = "https://github.com/kruss/dlt-core.git", branch = "fix_fibex_non_verbose_args" }
 crossbeam-channel = "0.5"
 futures = "0.3"
 tokio-util = "0.7"

application/apps/indexer/parsers/src/dlt/fmt.rs

@@ -492,7 +492,7 @@ impl FormattableMessage<'_> {
         Ok(())
     }
 
-    fn info_from_metadata<'b>(&'b self, id: u32, data: &[u8]) -> Option<NonVerboseInfo<'b>> {
+    fn info_from_metadata<'b>(&'b self, id: u32, mut data: &[u8]) -> Option<NonVerboseInfo<'b>> {
         let fibex = self.fibex_dlt_metadata?;
         let md = extract_metadata(fibex, id, self.message.extended_header.as_ref())?;
         let msg_type: Option<MessageType> = message_type(&self.message, md.message_info.as_deref());
@@ -525,10 +525,11 @@ impl FormattableMessage<'_> {
                 };
                 arguments.push(arg);
             } else {
-                if let Ok(mut new_args) =
+                if let Ok((rest, mut new_args)) =
                     construct_arguments(self.message.header.endianness, &pdu.signal_types, data)
                 {
                     arguments.append(&mut new_args);
+                    data = rest;
                 }
                 trace!("Constructed {} arguments", arguments.len());
             };

application/apps/rustcore/rs-bindings/Cargo.lock

@@ -259,7 +259,7 @@ impl FormattableMessage<'_> {
         }
     }
 
-    fn info_from_metadata<'b>(&'b self, id: u32, data: &[u8]) -> Option<NonVerboseInfo<'b>> {
+    fn info_from_metadata<'b>(&'b self, id: u32, mut data: &[u8]) -> Option<NonVerboseInfo<'b>> {
         let fibex = self.fibex_dlt_metadata?;
         let md = extract_metadata(fibex, id, self.message.extended_header.as_ref())?;
         let msg_type: Option<MessageType> = message_type(&self.message, md.message_info.as_deref());
@@ -292,10 +292,11 @@ impl FormattableMessage<'_> {
                 };
                 arguments.push(arg);
             } else {
-                if let Ok(mut new_args) =
+                if let Ok((rest, mut new_args)) =
                     construct_arguments(self.message.header.endianness, &pdu.signal_types, data)
                 {
                     arguments.append(&mut new_args);
+                    data = rest;
                 }
                 trace!("Constructed {} arguments", arguments.len());
             };