Merge branch 'mueller/data-wrapper' into mueller/refactor-tmtc-stack

This commit is contained in:
Robin Müller 2022-08-30 13:46:03 +02:00
commit 8e6cee7761
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
1 changed files with 13 additions and 5 deletions

View File

@ -10,19 +10,19 @@
namespace util {
struct RawData {
const uint8_t* data;
size_t len;
const uint8_t* data = nullptr;
size_t len = 0;
};
enum DataTypes { RAW, SERIALIZABLE };
enum DataTypes { NONE, RAW, SERIALIZABLE };
union DataUnion {
RawData raw;
SerializeIF* serializable;
SerializeIF* serializable = nullptr;
};
struct DataWrapper {
DataTypes type;
DataTypes type = DataTypes::NONE;
DataUnion dataUnion;
using BufPairT = std::pair<const uint8_t*, size_t>;
@ -35,6 +35,14 @@ struct DataWrapper {
return 0;
}
[[nodiscard]] bool isNull() const {
if ((type == DataTypes::NONE) or (type == DataTypes::RAW and dataUnion.raw.data == nullptr) or
(type == DataTypes::SERIALIZABLE and dataUnion.serializable == nullptr)) {
return true;
}
return false;
}
void setRawData(BufPairT bufPair) {
type = DataTypes::RAW;
dataUnion.raw.data = bufPair.first;