fsfw/fsfw-example-hosted
fsfw/fsfw-example-hosted
12
1
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

afmt

Browse Source
This commit is contained in:
Robin Müller 2022-09-08 12:09:52 +02:00
parent efe60b703b
commit 91711bd928
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bsp_hosted/core/CfdpHandler.cpp
View File

@ -1,7 +1,7 @@
#include "CfdpHandler.h" #include "CfdpHandler.h"
#include "fsfw/cfdp/pdu/PduHeaderReader.h"
#include "fsfw/cfdp/pdu/AckPduReader.h" #include "fsfw/cfdp/pdu/AckPduReader.h"
#include "fsfw/cfdp/pdu/PduHeaderReader.h"
#include "fsfw/ipc/QueueFactory.h" #include "fsfw/ipc/QueueFactory.h"
#include "fsfw/tmtcservices/TmTcMessage.h" #include "fsfw/tmtcservices/TmTcMessage.h"
@ -54,7 +54,7 @@ ReturnValue_t CfdpHandler::performOperation(uint8_t operationCode) {
} }
auto& fsmRes = destHandler.performStateMachine(); auto& fsmRes = destHandler.performStateMachine();
// TODO: Error handling? // TODO: Error handling?
while(fsmRes.callStatus == CallStatus::CALL_AGAIN) { while (fsmRes.callStatus == CallStatus::CALL_AGAIN) {
destHandler.performStateMachine(); destHandler.performStateMachine();
// TODO: Error handling? // TODO: Error handling?
} }
@ -102,7 +102,7 @@ ReturnValue_t CfdpHandler::handleCfdpPacket(TmTcMessage& msg) {
// PDU header only. Invalid supplied data. A directive packet should have a valid data field // PDU header only. Invalid supplied data. A directive packet should have a valid data field
// with at least one byte being the directive code // with at least one byte being the directive code
const uint8_t* pduDataField = reader.getPduDataField(); const uint8_t* pduDataField = reader.getPduDataField();
if(pduDataField == nullptr) { if (pduDataField == nullptr) {
return INVALID_PDU_FORMAT; return INVALID_PDU_FORMAT;
} }
if (not FileDirectiveReader::checkFileDirective(pduDataField[0])) { if (not FileDirectiveReader::checkFileDirective(pduDataField[0])) {
@ -118,16 +118,17 @@ ReturnValue_t CfdpHandler::handleCfdpPacket(TmTcMessage& msg) {
auto passToSourceHandler = [&]() { auto passToSourceHandler = [&]() {
}; };
if(directive == FileDirectives::METADATA or directive == FileDirectives::EOF_DIRECTIVE or if (directive == FileDirectives::METADATA or directive == FileDirectives::EOF_DIRECTIVE or
directive == FileDirectives::PROMPT) { directive == FileDirectives::PROMPT) {
// Section b) of 4.5.3: These PDUs should always be targeted towards the file receiver a.k.a. // Section b) of 4.5.3: These PDUs should always be targeted towards the file receiver a.k.a.
// the destination handler // the destination handler
passToDestHandler(); passToDestHandler();
} else if(directive == FileDirectives::FINISH or directive == FileDirectives::NAK or directive == FileDirectives::KEEP_ALIVE) { } else if (directive == FileDirectives::FINISH or directive == FileDirectives::NAK or
directive == FileDirectives::KEEP_ALIVE) {
// Section c) of 4.5.3: These PDUs should always be targeted towards the file sender a.k.a. // Section c) of 4.5.3: These PDUs should always be targeted towards the file sender a.k.a.
// the source handler // the source handler
passToSourceHandler(); passToSourceHandler();
} else if(directive == FileDirectives::ACK) { } else if (directive == FileDirectives::ACK) {
// Section a): Recipient depends of the type of PDU that is being acknowledged. We can simply // Section a): Recipient depends of the type of PDU that is being acknowledged. We can simply
// extract the PDU type from the raw stream. If it is an EOF PDU, this packet is passed to // extract the PDU type from the raw stream. If it is an EOF PDU, this packet is passed to
// the source handler, for a Finished PDU, it is passed to the destination handler. // the source handler, for a Finished PDU, it is passed to the destination handler.
@ -135,9 +136,9 @@ ReturnValue_t CfdpHandler::handleCfdpPacket(TmTcMessage& msg) {
if (not AckPduReader::checkAckedDirectiveField(pduDataField[1], ackedDirective)) { if (not AckPduReader::checkAckedDirectiveField(pduDataField[1], ackedDirective)) {
// TODO: appropriate error // TODO: appropriate error
} }
if(ackedDirective == FileDirectives::EOF_DIRECTIVE) { if (ackedDirective == FileDirectives::EOF_DIRECTIVE) {
passToSourceHandler(); passToSourceHandler();
} else if(ackedDirective == FileDirectives::FINISH) { } else if (ackedDirective == FileDirectives::FINISH) {
passToDestHandler(); passToDestHandler();
} }
} }