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

metadata PDU seems to be correct

Browse Source
This commit is contained in:
Robin Müller
2023-08-03 15:30:38 +02:00
parent daf75547a4
commit dffce43e6b
7 changed files with 44 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,8 +156,8 @@ ReturnValue_t cfdp::SourceHandler::transactionStart(PutRequest& putRequest, Remo
if (putRequest.getDestName().getValueLen() == 0) {
return DEST_NAME_EMPTY;
}
const char* srcNamePtr = putRequest.getSourceName().getString(transactionParams.sourceNameSize);
const char* destNamePtr = putRequest.getDestName().getString(transactionParams.destNameSize);
const char* srcNamePtr = putRequest.getSourceName().getCString(transactionParams.sourceNameSize);
const char* destNamePtr = putRequest.getDestName().getCString(transactionParams.destNameSize);
std::strncpy(transactionParams.sourceName.data(), srcNamePtr, transactionParams.sourceNameSize);
std::strncpy(transactionParams.destName.data(), destNamePtr, transactionParams.destNameSize);
FilesystemParams params(transactionParams.sourceName.data());
@ -176,10 +176,15 @@ ReturnValue_t cfdp::SourceHandler::transactionStart(PutRequest& putRequest, Remo
transactionParams.closureRequested = cfg.closureRequested;
}
const EntityId& destId = putRequest.getDestId();
transactionParams.pduConf.destId = destId;
// Adapt source ID width to necessary width. The width of the source and destination ID must be
// the same.
transactionParams.pduConf.sourceId.setWidth(destId.getWidth());
// The width of the source and destination ID must be the same. Use the larger ID value to
// ensure the width is large enough for both IDs
if (destId.getWidth() > transactionParams.pduConf.sourceId.getWidth()) {
transactionParams.pduConf.destId = destId;
transactionParams.pduConf.sourceId.setWidth(destId.getWidth());
} else {
transactionParams.pduConf.destId.setValueAndWidth(transactionParams.pduConf.sourceId.getWidth(),
destId.getValue());
}
// Only used for PDU forwarding, file is sent to file receiver regularly here.
transactionParams.pduConf.direction = Direction::TOWARDS_RECEIVER;
transactionParams.id.seqNum.setValue(sourceParams.seqCountProvider.getAndIncrement());
@ -301,7 +306,6 @@ ReturnValue_t cfdp::SourceHandler::sendGenericPdu(const SerializeIF& pdu) const
if (result != OK) {
return result;
}
arrayprinter::print(dataPtr, serializedLen);
TmTcMessage tmMsg(storeId);
return fsfwParams.msgQueue->sendMessage(fsfwParams.packetDest.getReportReceptionQueue(), &tmMsg);
}

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

@ -76,7 +76,6 @@ class SourceHandler {
RemoteEntityCfg remoteCfg;
PduConfig pduConf;
cfdp::TransactionId id{};
// cfdp::WidthInBytes seqCountWidth{};
void reset() {
sourceNameSize = 0;

4
src/fsfw/cfdp/pdu/MetadataPduReader.h
View File

@ -11,8 +11,8 @@ class MetadataPduReader : public FileDirectiveReader {
ReturnValue_t parseData() override;
const cfdp::StringLv& getSourceFileName() const;
const cfdp::StringLv& getDestFileName() const;
[[nodiscard]] const cfdp::StringLv& getSourceFileName() const;
[[nodiscard]] const cfdp::StringLv& getDestFileName() const;
[[nodiscard]] size_t getNumberOfParsedOptions() const;

7
src/fsfw/cfdp/tlv/StringLv.cpp
View File

@ -8,6 +8,11 @@ cfdp::StringLv::StringLv(const char* filename, size_t len)
cfdp::StringLv::StringLv() : Lv() {}
const char* cfdp::StringLv::getString(size_t& fileSize) const {
const char* cfdp::StringLv::getCString(size_t& fileSize) const {
return reinterpret_cast<const char*>(getValue(&fileSize));
}
std::string cfdp::StringLv::getString() const {
size_t fileSize;
return {getCString(fileSize), fileSize};
}

3
src/fsfw/cfdp/tlv/StringLv.h
View File

@ -13,7 +13,8 @@ class StringLv : public Lv {
explicit StringLv(const std::string& fileName);
explicit StringLv(const char* filename, size_t len);
const char* getString(size_t& fileSize) const;
const char* getCString(size_t& fileSize) const;
std::string getString() const;
// Delete the move constructor to avoid passing in a temporary
StringLv(const std::string&&) = delete;
};