From 6322a315662c81aa85a9bbcea1c4931bbd61a98a Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 17 Jul 2023 13:43:48 +0200 Subject: [PATCH] some fixes --- src/fsfw/cfdp/handler/DestHandler.cpp | 5 +++-- src/fsfw/cfdp/handler/SourceHandler.cpp | 4 +++- src/fsfw/cfdp/handler/SourceHandler.h | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/fsfw/cfdp/handler/DestHandler.cpp b/src/fsfw/cfdp/handler/DestHandler.cpp index fbd1785a..4018e7d6 100644 --- a/src/fsfw/cfdp/handler/DestHandler.cpp +++ b/src/fsfw/cfdp/handler/DestHandler.cpp @@ -336,7 +336,7 @@ ReturnValue_t cfdp::DestHandler::startTransaction(MetadataPduReader& reader, Met #if FSFW_CPP_OSTREAM_ENABLED == 1 sif::warning << "cfdp::DestHandler" << __func__ << ": No remote configuration found for destination ID " - << tp.pduConf.sourceId.getValue() << std::endl; + << transactionParams.pduConf.sourceId.getValue() << std::endl; #endif return FAILED; } @@ -463,7 +463,8 @@ ReturnValue_t cfdp::DestHandler::checksumVerification() { } else { // TODO: Proper error handling #if FSFW_CPP_OSTREAM_ENABLED == 1 - sif::warning << "CRC check for file " << tp.destName.data() << " failed" << std::endl; + sif::warning << "CRC check for file " << transactionParams.destName.data() << " failed" + << std::endl; #endif transactionParams.conditionCode = ConditionCode::FILE_CHECKSUM_FAILURE; } diff --git a/src/fsfw/cfdp/handler/SourceHandler.cpp b/src/fsfw/cfdp/handler/SourceHandler.cpp index bcc67039..05c4f315 100644 --- a/src/fsfw/cfdp/handler/SourceHandler.cpp +++ b/src/fsfw/cfdp/handler/SourceHandler.cpp @@ -82,4 +82,6 @@ ReturnValue_t cfdp::SourceHandler::checksumGeneration() { return OK; } -ReturnValue_t cfdp::SourceHandler::putRequest(PutRequestFull& putRequest) { return 0; } +ReturnValue_t cfdp::SourceHandler::putRequest(PutRequestFull& putRequest, RemoteEntityCfg& cfg) { + return 0; +} diff --git a/src/fsfw/cfdp/handler/SourceHandler.h b/src/fsfw/cfdp/handler/SourceHandler.h index f3009aeb..eced72be 100644 --- a/src/fsfw/cfdp/handler/SourceHandler.h +++ b/src/fsfw/cfdp/handler/SourceHandler.h @@ -31,7 +31,7 @@ class SourceHandler { * the state machine * @return */ - ReturnValue_t putRequest(PutRequestFull& putRequest); + ReturnValue_t putRequest(PutRequestFull& putRequest, RemoteEntityCfg& cfg); void stateMachine(); private: