CFDP SOURCE handler #157

Merged
muellerr merged 107 commits from cfdp-source-handler into develop 2023-10-19 10:59:55 +02:00
5 changed files with 78 additions and 8 deletions
Showing only changes of commit a6cc5171da - Show all commits

View File

@ -432,7 +432,6 @@ void cfdp::DestHandler::finish() {
ReturnValue_t cfdp::DestHandler::checksumVerification() { ReturnValue_t cfdp::DestHandler::checksumVerification() {
std::array<uint8_t, 1024> buf{}; std::array<uint8_t, 1024> buf{};
// TODO: Checksum verification and notice of completion
etl::crc32 crcCalc; etl::crc32 crcCalc;
uint64_t currentOffset = 0; uint64_t currentOffset = 0;
FileOpParams params(transactionParams.destName.data(), transactionParams.fileSize.value()); FileOpParams params(transactionParams.destName.data(), transactionParams.fileSize.value());

View File

@ -1,8 +1,17 @@
#include "SourceHandler.h" #include "SourceHandler.h"
SourceHandler::SourceHandler(SourceHandlerParams params, FsfwSourceParams fsfwParams) {} #include <etl/crc32.h>
void SourceHandler::fsmNacked() { #include <array>
#include "fsfw/filesystem/HasFileSystemIF.h"
using namespace returnvalue;
cfdp::SourceHandler::SourceHandler(SourceHandlerParams params, FsfwSourceParams fsfwParams)
: transactionParams(params.maxFilePathSize), sourceParams(std::move(params)) {}
void cfdp::SourceHandler::fsmNacked() {
if (step == TransactionStep::IDLE) { if (step == TransactionStep::IDLE) {
step = TransactionStep::TRANSACTION_START; step = TransactionStep::TRANSACTION_START;
} }
@ -11,7 +20,10 @@ void SourceHandler::fsmNacked() {
step = TransactionStep::CRC_PROCEDURE; step = TransactionStep::CRC_PROCEDURE;
} }
if (step == TransactionStep::CRC_PROCEDURE) { if (step == TransactionStep::CRC_PROCEDURE) {
// TODO: Perform CRC procedure: Generate the CRC32 from the file. ReturnValue_t result = checksumGeneration();
if (result != OK) {
// TODO: Some error handling
}
} }
if (step == TransactionStep::SENDING_METADATA) { if (step == TransactionStep::SENDING_METADATA) {
// TODO: Prepare and send metadata PDU // TODO: Prepare and send metadata PDU
@ -29,7 +41,7 @@ void SourceHandler::fsmNacked() {
// TODO: Notice of completion // TODO: Notice of completion
} }
} }
void SourceHandler::stateMachine() { void cfdp::SourceHandler::stateMachine() {
if (state == cfdp::CfdpState::IDLE) { if (state == cfdp::CfdpState::IDLE) {
return; return;
} }
@ -37,3 +49,33 @@ void SourceHandler::stateMachine() {
return fsmNacked(); return fsmNacked();
} }
} }
ReturnValue_t cfdp::SourceHandler::checksumGeneration() {
std::array<uint8_t, 1024> buf{};
etl::crc32 crcCalc;
uint64_t currentOffset = 0;
FileOpParams params(transactionParams.destName.data(), transactionParams.fileSize.value());
while (currentOffset < transactionParams.fileSize.value()) {
uint64_t readLen;
if (currentOffset + buf.size() > transactionParams.fileSize.value()) {
readLen = transactionParams.fileSize.value() - currentOffset;
} else {
readLen = buf.size();
}
if (readLen > 0) {
params.offset = currentOffset;
params.size = readLen;
auto result = sourceParams.user.vfs.readFromFile(params, buf.data(), buf.size());
if (result != OK) {
// TODO: I think this is a case for a filestore rejection, but it might sense to print
// a warning or trigger an event because this should generally not happen
return FAILED;
}
crcCalc.add(buf.begin(), buf.begin() + readLen);
}
currentOffset += readLen;
}
transactionParams.crc = crcCalc.value();
return OK;
}

View File

@ -2,12 +2,24 @@
#define FSFW_CFDP_CFDPSOURCEHANDLER_H #define FSFW_CFDP_CFDPSOURCEHANDLER_H
#include <cstdint> #include <cstdint>
#include <vector>
#include "UserBase.h"
#include "defs.h" #include "defs.h"
#include "fsfw/cfdp/FileSize.h"
#include "fsfw/cfdp/handler/mib.h"
#include "fsfw/events/EventReportingProxyIF.h" #include "fsfw/events/EventReportingProxyIF.h"
#include "fsfw/storagemanager/StorageManagerIF.h" #include "fsfw/storagemanager/StorageManagerIF.h"
struct SourceHandlerParams {}; namespace cfdp {
struct SourceHandlerParams {
SourceHandlerParams(LocalEntityCfg cfg, UserBase& user) : cfg(std::move(cfg)), user(user) {}
LocalEntityCfg cfg;
UserBase& user;
size_t maxFilePathSize = 256;
};
struct FsfwSourceParams { struct FsfwSourceParams {
FsfwSourceParams(EventReportingProxyIF* eventReporter, StorageManagerIF& tcStore) FsfwSourceParams(EventReportingProxyIF* eventReporter, StorageManagerIF& tcStore)
@ -35,10 +47,24 @@ class SourceHandler {
WAIT_FOR_FINISH = 7, WAIT_FOR_FINISH = 7,
NOTICE_OF_COMPLETION = 8 NOTICE_OF_COMPLETION = 8
}; };
cfdp::CfdpState state; struct TransactionParams {
TransactionStep step; // Initialize char vectors with length + 1 for 0 termination
explicit TransactionParams(size_t maxFileNameLen)
: sourceName(maxFileNameLen + 1), destName(maxFileNameLen + 1) {}
uint32_t crc{};
std::vector<char> sourceName;
std::vector<char> destName;
cfdp::FileSize fileSize;
} transactionParams;
cfdp::CfdpState state = cfdp::CfdpState::IDLE;
TransactionStep step = TransactionStep::IDLE;
SourceHandlerParams sourceParams;
void fsmNacked(); void fsmNacked();
ReturnValue_t checksumGeneration();
}; };
} // namespace cfdp
#endif // FSFW_CFDP_CFDPSOURCEHANDLER_H #endif // FSFW_CFDP_CFDPSOURCEHANDLER_H

View File

@ -65,6 +65,7 @@ struct FileSegmentRecvdParams {
*/ */
class UserBase { class UserBase {
friend class DestHandler; friend class DestHandler;
friend class SourceHandler;
public: public:
explicit UserBase(HasFileSystemIF& vfs); explicit UserBase(HasFileSystemIF& vfs);

View File

@ -1,6 +1,8 @@
#ifndef FSFW_CFDP_HANDLER_DEFS_H #ifndef FSFW_CFDP_HANDLER_DEFS_H
#define FSFW_CFDP_HANDLER_DEFS_H #define FSFW_CFDP_HANDLER_DEFS_H
#include <etl/list.h>
#include "fsfw/storagemanager/storeAddress.h" #include "fsfw/storagemanager/storeAddress.h"
namespace cfdp { namespace cfdp {