eive/fsfw
eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

empty file transfer test done

Browse Source
This commit is contained in:
Robin Müller 2023-08-03 15:49:23 +02:00
parent dffce43e6b
commit 12e52a92f2
Signed by: muellerr
GPG Key ID: 407F9B00F858F270
3 changed files with 61 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/fsfw/cfdp/handler/SourceHandler.cpp
View File

@ -44,7 +44,6 @@ cfdp::SourceHandler::SourceHandler(SourceHandlerParams params, FsfwParams fsfwPa
cfdp::SourceHandler::FsmResult& cfdp::SourceHandler::fsmNacked() { cfdp::SourceHandler::FsmResult& cfdp::SourceHandler::fsmNacked() {
ReturnValue_t result; ReturnValue_t result;
if (step == TransactionStep::IDLE) { if (step == TransactionStep::IDLE) {
fsmResult.packetsSent = 0;
step = TransactionStep::TRANSACTION_START; step = TransactionStep::TRANSACTION_START;
} }
if (step == TransactionStep::TRANSACTION_START) { if (step == TransactionStep::TRANSACTION_START) {
@ -66,12 +65,15 @@ cfdp::SourceHandler::FsmResult& cfdp::SourceHandler::fsmNacked() {
return fsmResult; return fsmResult;
} }
if (step == TransactionStep::SENDING_FILE_DATA) { if (step == TransactionStep::SENDING_FILE_DATA) {
result = prepareAndSendNextFileDataPdu(); bool noFdPdu = false;
result = prepareAndSendNextFileDataPdu(noFdPdu);
if (result != OK) { if (result != OK) {
// TODO: Error handling // TODO: Error handling
} }
if (!noFdPdu) {
return fsmResult; return fsmResult;
} }
}
if (step == TransactionStep::SENDING_EOF) { if (step == TransactionStep::SENDING_EOF) {
result = prepareAndSendEofPdu(); result = prepareAndSendEofPdu();
if (result != OK) { if (result != OK) {
@ -99,6 +101,7 @@ cfdp::SourceHandler::FsmResult& cfdp::SourceHandler::fsmNacked() {
} }
cfdp::SourceHandler::FsmResult& cfdp::SourceHandler::stateMachine() { cfdp::SourceHandler::FsmResult& cfdp::SourceHandler::stateMachine() {
fsmResult.packetsSent = 0;
if (state == cfdp::CfdpState::IDLE) { if (state == cfdp::CfdpState::IDLE) {
return fsmResult; return fsmResult;
} }
@ -216,19 +219,20 @@ ReturnValue_t cfdp::SourceHandler::prepareAndSendMetadataPdu() {
if (result != OK) { if (result != OK) {
return result; return result;
} }
fsmResult.packetsSent += 1;
// Advance FSM if everything works // Advance FSM if everything works
step = TransactionStep::SENDING_FILE_DATA; step = TransactionStep::SENDING_FILE_DATA;
return OK; return OK;
} }
ReturnValue_t cfdp::SourceHandler::prepareAndSendNextFileDataPdu() { ReturnValue_t cfdp::SourceHandler::prepareAndSendNextFileDataPdu(bool& noFileDataPdu) {
cfdp::Fss offset(transactionParams.progress); cfdp::Fss offset(transactionParams.progress);
uint64_t readLen; uint64_t readLen;
uint64_t fileSize = transactionParams.fileSize.value(); uint64_t fileSize = transactionParams.fileSize.value();
noFileDataPdu = false;
if (fileSize == 0) { if (fileSize == 0) {
// We are done, no need to send file data PDUs for an empty file. // We are done, no need to send file data PDUs for an empty file.
step = TransactionStep::SENDING_EOF; step = TransactionStep::SENDING_EOF;
noFileDataPdu = true;
return OK; return OK;
} }
if (fileSize < transactionParams.remoteCfg.maxFileSegmentLen) { if (fileSize < transactionParams.remoteCfg.maxFileSegmentLen) {
@ -292,7 +296,7 @@ ReturnValue_t cfdp::SourceHandler::initialize() {
return OK; return OK;
} }
ReturnValue_t cfdp::SourceHandler::sendGenericPdu(const SerializeIF& pdu) const { ReturnValue_t cfdp::SourceHandler::sendGenericPdu(const SerializeIF& pdu) {
uint8_t* dataPtr; uint8_t* dataPtr;
store_address_t storeId; store_address_t storeId;
ReturnValue_t result = ReturnValue_t result =
@ -307,7 +311,12 @@ ReturnValue_t cfdp::SourceHandler::sendGenericPdu(const SerializeIF& pdu) const
return result; return result;
} }
TmTcMessage tmMsg(storeId); TmTcMessage tmMsg(storeId);
return fsfwParams.msgQueue->sendMessage(fsfwParams.packetDest.getReportReceptionQueue(), &tmMsg); result =
fsfwParams.msgQueue->sendMessage(fsfwParams.packetDest.getReportReceptionQueue(), &tmMsg);
if (result == OK) {
fsmResult.packetsSent += 1;
}
return result;
} }
ReturnValue_t cfdp::SourceHandler::noticeOfCompletion() { ReturnValue_t cfdp::SourceHandler::noticeOfCompletion() {

4
src/fsfw/cfdp/handler/SourceHandler.h
View File

@ -96,12 +96,12 @@ class SourceHandler {
FsmResult& fsmNacked(); FsmResult& fsmNacked();
ReturnValue_t checksumGeneration(); ReturnValue_t checksumGeneration();
ReturnValue_t prepareAndSendMetadataPdu(); ReturnValue_t prepareAndSendMetadataPdu();
ReturnValue_t prepareAndSendNextFileDataPdu(); ReturnValue_t prepareAndSendNextFileDataPdu(bool& noFileDataPdu);
ReturnValue_t prepareAndSendEofPdu(); ReturnValue_t prepareAndSendEofPdu();
ReturnValue_t noticeOfCompletion(); ReturnValue_t noticeOfCompletion();
ReturnValue_t reset(); ReturnValue_t reset();
[[nodiscard]] ReturnValue_t sendGenericPdu(const SerializeIF& pdu) const; [[nodiscard]] ReturnValue_t sendGenericPdu(const SerializeIF& pdu);
}; };
} // namespace cfdp } // namespace cfdp

33
unittests/cfdp/handler/testSourceHandler.cpp
View File

@ -2,15 +2,12 @@
#include <filesystem> #include <filesystem>
#include "fsfw/cfdp.h" #include "fsfw/cfdp.h"
#include "fsfw/cfdp/CfdpMessage.h"
#include "fsfw/cfdp/handler/PutRequest.h" #include "fsfw/cfdp/handler/PutRequest.h"
#include "fsfw/cfdp/handler/SourceHandler.h" #include "fsfw/cfdp/handler/SourceHandler.h"
#include "fsfw/cfdp/pdu/EofPduCreator.h" #include "fsfw/cfdp/pdu/EofPduCreator.h"
#include "fsfw/cfdp/pdu/FileDataCreator.h" #include "fsfw/cfdp/pdu/EofPduReader.h"
#include "fsfw/cfdp/pdu/MetadataPduCreator.h" #include "fsfw/cfdp/pdu/MetadataPduCreator.h"
#include "fsfw/cfdp/pdu/MetadataPduReader.h" #include "fsfw/cfdp/pdu/MetadataPduReader.h"
#include "fsfw/globalfunctions/arrayprinter.h"
#include "fsfw/storagemanager/StorageManagerIF.h"
#include "fsfw/tmtcservices/TmTcMessage.h" #include "fsfw/tmtcservices/TmTcMessage.h"
#include "fsfw/util/SeqCountProvider.h" #include "fsfw/util/SeqCountProvider.h"
#include "mocks/AcceptsTmMock.h" #include "mocks/AcceptsTmMock.h"
@ -68,14 +65,16 @@ TEST_CASE("CFDP Source Handler", "[cfdp]") {
CHECK(sourceHandler.transactionStart(putRequest, cfg) == OK); CHECK(sourceHandler.transactionStart(putRequest, cfg) == OK);
SourceHandler::FsmResult& fsmResult = sourceHandler.stateMachine(); SourceHandler::FsmResult& fsmResult = sourceHandler.stateMachine();
TmTcMessage tmtcMessage;
const uint8_t* pduPtr;
// Verify metadata PDU was sent. // Verify metadata PDU was sent.
{
CHECK(fsmResult.packetsSent == 1); CHECK(fsmResult.packetsSent == 1);
CHECK(mqMock.numberOfSentMessages() == 1); CHECK(mqMock.numberOfSentMessages() == 1);
TmTcMessage tmtcMessage;
REQUIRE(mqMock.getNextSentMessage(destQueueId, tmtcMessage) == OK); REQUIRE(mqMock.getNextSentMessage(destQueueId, tmtcMessage) == OK);
auto accessor = tmStore.getData(tmtcMessage.getStorageId()); auto accessor = tmStore.getData(tmtcMessage.getStorageId());
REQUIRE(accessor.first == OK); REQUIRE(accessor.first == OK);
const uint8_t* pduPtr = accessor.second.data(); pduPtr = accessor.second.data();
CHECK(accessor.second.size() == 55); CHECK(accessor.second.size() == 55);
MetadataGenericInfo metadataInfo; MetadataGenericInfo metadataInfo;
MetadataPduReader metadataReader(pduPtr, accessor.second.size(), metadataInfo, nullptr, 0); MetadataPduReader metadataReader(pduPtr, accessor.second.size(), metadataInfo, nullptr, 0);
@ -87,7 +86,29 @@ TEST_CASE("CFDP Source Handler", "[cfdp]") {
CHECK(metadataInfo.getChecksumType() == ChecksumType::NULL_CHECKSUM); CHECK(metadataInfo.getChecksumType() == ChecksumType::NULL_CHECKSUM);
CHECK(metadataInfo.getFileSize().value() == 0); CHECK(metadataInfo.getFileSize().value() == 0);
CHECK(!metadataInfo.isClosureRequested()); CHECK(!metadataInfo.isClosureRequested());
}
// Verify EOF PDU was sent. No file data PDU is sent for an empty file. // Verify EOF PDU was sent. No file data PDU is sent for an empty file.
{
mqMock.clearMessages();
fsmResult = sourceHandler.stateMachine();
CHECK(fsmResult.packetsSent == 1);
CHECK(mqMock.numberOfSentMessages() == 1);
REQUIRE(mqMock.getNextSentMessage(destQueueId, tmtcMessage) == OK);
auto accessor = tmStore.getData(tmtcMessage.getStorageId());
REQUIRE(accessor.first == OK);
pduPtr = accessor.second.data();
// 10 byte PDU header, 1 byte directive field, 1 byte condition code, 4 byte checksum,
// 4 byte FSS
CHECK(accessor.second.size() == 20);
EofInfo eofInfo;
EofPduReader eofReader(pduPtr, accessor.second.size(), eofInfo);
REQUIRE(eofReader.parseData() == OK);
CHECK(eofInfo.getChecksum() == 0);
CHECK(eofInfo.getConditionCode() == ConditionCode::NO_ERROR);
CHECK(eofInfo.getFileSize().value() == 0);
}
CHECK(sourceHandler.getStep() == SourceHandler::TransactionStep::IDLE);
CHECK(sourceHandler.getState() == CfdpState::IDLE);
} }
} }