eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

source transactions now working
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller
2023-09-04 11:03:32 +02:00
parent 7e9648eabf
commit c7b27c0092
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fsfw

Submodule fsfw updated: dfcfb035be...470f589bde

11
mission/cfdp/CfdpHandler.cpp
View File

@ -109,16 +109,19 @@ ReturnValue_t CfdpHandler::handlePduPacket(TmTcMessage& msg) {
auto passToDestHandler = [&]() { auto passToDestHandler = [&]() {
accessorPair.second.release(); accessorPair.second.release();
PacketInfo info(type, msg.getStorageId(), directive); PacketInfo info(type, msg.getStorageId(), directive);
result = destHandler.passPacket(info); return destHandler.passPacket(info);
}; };
auto passToSourceHandler = [&]() { auto passToSourceHandler = [&]() {
accessorPair.second.release();
PacketInfo info(type, msg.getStorageId(), directive);
// Implement this function.
// result = srcHandler.passPacket(info);
}; };
if (directive == FileDirective::METADATA or directive == FileDirective::EOF_DIRECTIVE or if (directive == FileDirective::METADATA or directive == FileDirective::EOF_DIRECTIVE or
directive == FileDirective::PROMPT) { directive == FileDirective::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(); return passToDestHandler();
} else if (directive == FileDirective::FINISH or directive == FileDirective::NAK or } else if (directive == FileDirective::FINISH or directive == FileDirective::NAK or
directive == FileDirective::KEEP_ALIVE) { directive == FileDirective::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.
@ -135,7 +138,7 @@ ReturnValue_t CfdpHandler::handlePduPacket(TmTcMessage& msg) {
if (ackedDirective == FileDirective::EOF_DIRECTIVE) { if (ackedDirective == FileDirective::EOF_DIRECTIVE) {
passToSourceHandler(); passToSourceHandler();
} else if (ackedDirective == FileDirective::FINISH) { } else if (ackedDirective == FileDirective::FINISH) {
passToDestHandler(); return passToDestHandler();
} }
} }
} }