espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-13 22:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[dataset] move Read() overload implementations to DatasetManager (#10258)

Browse Source 
This commit simplifies `DatasetLocal` by moving the different overload
implementations of `Read()` to `DatasetManager`. This aligns the code
so that overloads are provided by `DatasetManager` and `DatasetLocal`
provides one version of `Save()` or `Read()`. Unused/undefined
methods in `DatasetLocal` are also removed.
This commit is contained in:
Abtin Keshavarzian
2024-05-17 09:33:23 -07:00
committed by GitHub
parent 213aede48e
commit 63442f7302
4 changed files with 30 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/meshcop/dataset_local.cpp
-28
View File
@@ -118,34 +118,6 @@ exit:
return error;
}
Error DatasetLocal::Read(Dataset::Info &aDatasetInfo) const
{
Dataset dataset;
Error error;
aDatasetInfo.Clear();
SuccessOrExit(error = Read(dataset));
dataset.ConvertTo(aDatasetInfo);
exit:
return error;
}
Error DatasetLocal::Read(Dataset::Tlvs &aDatasetTlvs) const
{
Dataset dataset;
Error error;
ClearAllBytes(aDatasetTlvs);
SuccessOrExit(error = Read(dataset));
dataset.ConvertTo(aDatasetTlvs);
exit:
return error;
}
void DatasetLocal::Save(const Dataset &aDataset)
{
#if OPENTHREAD_CONFIG_PLATFORM_KEY_REFERENCES_ENABLE
src/core/meshcop/dataset_local.hpp
-25
View File
@@ -120,28 +120,6 @@ public:
*/
Error Read(Dataset &aDataset) const;
/**
* Retrieves the dataset from non-volatile memory.
*
* @param[out] aDatasetInfo Where to place the dataset as `Dataset::Info`.
*
* @retval kErrorNone Successfully retrieved the dataset.
* @retval kErrorNotFound There is no corresponding dataset stored in non-volatile memory.
*
*/
Error Read(Dataset::Info &aDatasetInfo) const;
/**
* Retrieves the dataset from non-volatile memory.
*
* @param[out] aDatasetTlvs Where to place the dataset.
*
* @retval kErrorNone Successfully retrieved the dataset.
* @retval kErrorNotFound There is no corresponding dataset stored in non-volatile memory.
*
*/
Error Read(Dataset::Tlvs &aDatasetTlvs) const;
/**
* Returns the local time this dataset was last updated or restored.
*
@@ -179,9 +157,6 @@ private:
void EmplaceSecurelyStoredKeys(Dataset &aDataset) const;
#endif
bool IsActive(void) const { return (mType == Dataset::kActive); }
void SetTimestamp(const Dataset &aDataset);
Timestamp mTimestamp; ///< Active or Pending Timestamp
TimeMilli mUpdateTime; ///< Local time last updated
Dataset::Type mType; ///< Active or Pending
src/core/meshcop/dataset_manager.cpp
+28
View File
@@ -92,6 +92,34 @@ exit:
return error;
}
Error DatasetManager::Read(Dataset::Info &aDatasetInfo) const
{
Dataset dataset;
Error error;
aDatasetInfo.Clear();
SuccessOrExit(error = Read(dataset));
dataset.ConvertTo(aDatasetInfo);
exit:
return error;
}
Error DatasetManager::Read(Dataset::Tlvs &aDatasetTlvs) const
{
Dataset dataset;
Error error;
ClearAllBytes(aDatasetTlvs);
SuccessOrExit(error = Read(dataset));
dataset.ConvertTo(aDatasetTlvs);
exit:
return error;
}
Error DatasetManager::ApplyConfiguration(void) const
{
Error error;
src/core/meshcop/dataset_manager.hpp
+2 -2
View File
@@ -101,7 +101,7 @@ public:
* @retval kErrorNotFound There is no corresponding dataset stored in non-volatile memory.
*
*/
Error Read(Dataset::Info &aDatasetInfo) const { return mLocal.Read(aDatasetInfo); }
Error Read(Dataset::Info &aDatasetInfo) const;
/**
* Retrieves the dataset from non-volatile memory.
@@ -112,7 +112,7 @@ public:
* @retval kErrorNotFound There is no corresponding dataset stored in non-volatile memory.
*
*/
Error Read(Dataset::Tlvs &aDatasetTlvs) const { return mLocal.Read(aDatasetTlvs); }
Error Read(Dataset::Tlvs &aDatasetTlvs) const;
/**
* Saves the Operational Dataset in non-volatile memory.