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 +10 -4
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 805065a7b9 - Show all commits

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

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