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

Initial implementation of control messages. #22

Merged
merged 5 commits into from
Apr 22, 2024
Merged

Initial implementation of control messages. #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
96416e9
Initial implementation of control messages.
Apr 8, 2024
8ae6b51
Implemented review comments.
Apr 10, 2024
3a07813
Added cfg for std features.
Apr 17, 2024
e885e94
Added std cfg
Apr 22, 2024
5a3a75e
Implemented review comments
Apr 22, 2024
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
40 changes: 30 additions & 10 deletions examples/print_dlt_file.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
use std::{fs::File, io::BufReader, path::PathBuf};

use dlt_parse::{error::ReadError, storage::DltStorageReader};
use dlt_parse::{
error::ReadError, storage::DltStorageReader, ControlNvPayload, LogNvPayload, LogVPayload,
};
use structopt::StructOpt;

/// Expected command line arguments
Expand Down Expand Up @@ -36,27 +38,45 @@ fn main() -> Result<(), ReadError> {
if let Some(typed_payload) = msg.packet.typed_payload() {
use dlt_parse::DltTypedPayload::*;
match typed_payload {
Verbose { info, iter } => {
LogV(LogVPayload { iter, log_level }) => {
println!(
"verbose message of type {:?} with values:",
info.into_message_type()
"verbose log message with log level {:?} and values:",
log_level
);
for value in iter {
println!(" {:?}", value);
}
}
NonVerbose {
info,
LogNv(LogNvPayload {
log_level,
msg_id,
payload,
} => {
}) => {
println!(
"non verbose message 0x{:x} of type {:?} and {} bytes of payload",
"non verbose log message 0x{:x} with log level {:?} and {} bytes of payload.",
msg_id,
info.map(|v| v.into_message_type()),
payload.len()
log_level,
payload.len(),
);
}
ControlNv(ControlNvPayload {
msg_type,
service_id,
payload,
}) => {
println!(
"non verbose control message {:?} with service id: {} and {} bytes of payload.",
msg_type,
service_id,
payload.len(),
);
}
GenericNv(_) => println!("generic non verbose message received"),
TraceV(_) => println!("verbose trace message received"),
TraceNv(_) => println!("non verbose trace message received"),
NetworkV(_) => println!("verbose network message received"),
NetworkNv(_) => println!("non verbose network message received"),
ControlV(_) => println!("verbose control message received"),
}
} else {
println!("non verbose message with incomplete message id");
Expand Down
36 changes: 27 additions & 9 deletions examples/print_pcap_dlt_msgs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,27 +94,45 @@ fn read(arguments: CommandLineArguments) -> Result<(), Error> {
if let Some(typed_payload) = dlt_slice.typed_payload() {
use dlt_parse::DltTypedPayload::*;
match typed_payload {
Verbose { info, iter } => {
LogV(LogVPayload { iter, log_level }) => {
println!(
"verbose message of type {:?} with values:",
info.into_message_type()
"verbose log message with log level {:?} and values:",
log_level
);
for value in iter {
println!(" {:?}", value);
}
}
NonVerbose {
info,
LogNv(LogNvPayload {
log_level,
msg_id,
payload,
} => {
}) => {
println!(
"non verbose message 0x{:x} of type {:?} and {} bytes of payload",
"non verbose log message 0x{:x} with log level {:?} and {} bytes of payload.",
msg_id,
info.map(|v| v.into_message_type()),
payload.len()
log_level,
payload.len(),
);
}
ControlNv(ControlNvPayload {
msg_type,
service_id,
payload,
}) => {
println!(
"non verbose control message {:?} with service id: {} and {} bytes of payload.",
msg_type,
service_id,
payload.len(),
);
}
GenericNv(_) => println!("generic non verbose message received"),
TraceV(_) => println!("verbose trace message received"),
TraceNv(_) => println!("non verbose trace message received"),
NetworkV(_) => println!("verbose network message received"),
NetworkNv(_) => println!("non verbose network message received"),
ControlV(_) => println!("verbose control message received"),
}
} else {
println!("non verbose message with incomplete message id");
Expand Down
21 changes: 11 additions & 10 deletions examples/print_verbose_manual.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use dlt_parse::{
error::{ReadError, VerboseDecodeError},
storage::DltStorageReader,
verbose::VerboseIter,
LogVPayload,
};
use structopt::StructOpt;

Expand Down Expand Up @@ -40,21 +41,21 @@ fn main() -> Result<(), ReadError> {
if let Some(typed_payload) = msg.packet.typed_payload() {
use dlt_parse::DltTypedPayload::*;
match typed_payload {
Verbose { info, iter } => {
println!(
"verbose message of type {:?} with values:",
info.into_message_type()
);
LogV(LogVPayload { log_level, iter }) => {
println!("verbose message of type {:?} with values:", log_level);
let field_print_result = print_fields(iter, 1);
if let Err(err) = field_print_result {
println!(" ERROR decoding value: {}", err);
}
}
NonVerbose {
info: _,
msg_id: _,
payload: _,
} => {}
GenericNv(_) => println!("generic non verbose message received"),
TraceV(_) => println!("verbose trace message received"),
TraceNv(_) => println!("non verbose trace message received"),
NetworkV(_) => println!("verbose network message received"),
NetworkNv(_) => println!("non verbose network message received"),
ControlV(_) => println!("verbose control message received"),
LogNv(_) => println!("non verbose log message received"),
ControlNv(_) => println!("non verbose control message received"),
}
} else {
println!("non verbose message with incomplete message id");
Expand Down
Loading
Loading