rust/sat-rs
rust/sat-rs
5
1
Fork 0
Code Issues 9 Pull Requests Projects Releases 22 Wiki Activity

first test for check limit handling
Some checks failed
Rust/sat-rs/pipeline/pr-main There was a failure building this commit
Details

Browse Source
This commit is contained in:
Robin Müller 2023-12-15 16:08:39 +01:00
parent 9605dbb13a
commit 2f07fdfe83
Signed by: muellerr
GPG Key ID: A649FB78196E3849
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
satrs-core/src/cfdp/dest.rs
View File

@ -355,7 +355,10 @@ impl DestinationHandler {
} }
pub fn handle_file_data(&mut self, raw_packet: &[u8]) -> Result<(), DestError> { pub fn handle_file_data(&mut self, raw_packet: &[u8]) -> Result<(), DestError> {
if self.state == State::Idle || self.step != TransactionStep::ReceivingFileDataPdus { if self.state == State::Idle
|| (self.step != TransactionStep::ReceivingFileDataPdus
&& self.step != TransactionStep::ReceivingFileDataPdusWithCheckLimitHandling)
{
return Err(DestError::WrongStateForFileDataAndEof); return Err(DestError::WrongStateForFileDataAndEof);
} }
let fd_pdu = FileDataPdu::from_bytes(raw_packet)?; let fd_pdu = FileDataPdu::from_bytes(raw_packet)?;
@ -506,12 +509,12 @@ impl DestinationHandler {
if self.step == TransactionStep::TransactionStart { if self.step == TransactionStep::TransactionStart {
self.transaction_start(cfdp_user)?; self.transaction_start(cfdp_user)?;
} }
if self.step == TransactionStep::TransferCompletion {
self.transfer_completion(cfdp_user)?;
}
if self.step == TransactionStep::ReceivingFileDataPdusWithCheckLimitHandling { if self.step == TransactionStep::ReceivingFileDataPdusWithCheckLimitHandling {
self.check_limit_handling(); self.check_limit_handling();
} }
if self.step == TransactionStep::TransferCompletion {
self.transfer_completion(cfdp_user)?;
}
if self.step == TransactionStep::SendingAckPdu { if self.step == TransactionStep::SendingAckPdu {
todo!("no support for acknowledged mode yet"); todo!("no support for acknowledged mode yet");
} }
@ -853,11 +856,6 @@ mod tests {
expired: expired_flag, expired: expired_flag,
} }
} }
fn set_expired(&mut self) {
self.expired
.store(true, core::sync::atomic::Ordering::Relaxed);
}
} }
struct TestCheckTimerCreator { struct TestCheckTimerCreator {
@ -1164,7 +1162,7 @@ mod tests {
test_obj.state_check(State::Busy, TransactionStep::ReceivingFileDataPdus); test_obj.state_check(State::Busy, TransactionStep::ReceivingFileDataPdus);
test_obj test_obj
.generic_file_data_insert(&mut test_user, 0, &random_data[0..segment_len]) .generic_file_data_insert(&mut test_user, 0, &random_data[0..segment_len])
.expect("file data insertion failed"); .expect("file data insertion 0 failed");
test_obj test_obj
.generic_eof_no_error(&mut test_user, random_data.to_vec()) .generic_eof_no_error(&mut test_user, random_data.to_vec())
.expect("EOF no error insertion failed"); .expect("EOF no error insertion failed");
@ -1172,5 +1170,17 @@ mod tests {
State::Busy, State::Busy,
TransactionStep::ReceivingFileDataPdusWithCheckLimitHandling, TransactionStep::ReceivingFileDataPdusWithCheckLimitHandling,
); );
test_obj
.generic_file_data_insert(
&mut test_user,
segment_len as u64,
&random_data[segment_len..],
)
.expect("file data insertion 1 failed");
test_obj.set_check_timer_expired();
test_obj
.handler
.state_machine(&mut test_user, None)
.expect("fsm failure");
} }
} }