rust/spacepackets
5
1
Fork 0
Code Issues Pull Requests Projects Releases 27 Wiki Activity

PDU improvements and additions #24

Merged
muellerr merged 7 commits from pdu-additions into main 2023-08-28 16:52:26 +02:00
Conversation 0 Commits 7 Files Changed 5 +6 -8
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f208a9b0f0 - Show all commits

14
src/cfdp/pdu/mod.rs
View File

@ -83,10 +83,7 @@ impl Display for PduError {
"cfdp version missmatch, found {raw}, expected {CFDP_VERSION_2}"
)
}
PduError::SourceDestIdLenMissmatch {
src_id_len,
dest_id_len,
} => {
PduError::SourceDestIdLenMissmatch { src_id_len, dest_id_len }=> {
write!(
f,
"missmatch of PDU source length {src_id_len} and destination length {dest_id_len}"
@ -98,7 +95,7 @@ impl Display for PduError {
PduError::FileSizeTooLarge(value) => {
write!(f, "file size value {value} exceeds allowed 32 bit width")
}
PduError::WrongDirectiveType { found, expected } => {
PduError::WrongDirectiveType { found, expected }=> {
write!(f, "found directive type {found:?}, expected {expected:?}")
}
PduError::InvalidConditionCode(raw_code) => {
@ -225,6 +222,7 @@ impl CommonPduConfig {
return Err(PduError::SourceDestIdLenMissmatch {
src_id_len: source_id.size(),
dest_id_len: dest_id.size(),
});
}
if source_id.size() != 1
@ -931,9 +929,9 @@ mod tests {
CommonPduConfig::new_with_byte_fields(src_id, dest_id, transaction_seq_id);
assert!(pdu_conf_res.is_err());
let error = pdu_conf_res.unwrap_err();
if let PduError::SourceDestIdLenMissmatch((src_len, dest_len)) = error {
assert_eq!(src_len, 1);
assert_eq!(dest_len, 2);
if let PduError::SourceDestIdLenMissmatch { src_id_len, dest_id_len }= error {
assert_eq!(src_id_len, 1);
assert_eq!(dest_id_len, 2);
}
}