Skip to content

Commit

Permalink
improved defaultNTP implementation and storage usage
Browse files Browse the repository at this point in the history 
cleaned up return usage
  • Loading branch information
@fessehaeve
fessehaeve committed May 2, 2023
1 parent 0a08324 commit ce8679c
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 53 deletions.
2 changes: 1 addition & 1 deletion src/app/clusters/time-synchronization-server/TimeSyncDataProvider.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ CHIP_ERROR TimeSyncDataProvider::ClearTrustedTimeSource()
return mPersistentStorage->SyncDeleteKeyValue(DefaultStorageKeyAllocator::TSTrustedTimeSource().KeyName());
}

CHIP_ERROR TimeSyncDataProvider::StoreDefaultNtp(const MutableByteSpan & defaultNtp)
CHIP_ERROR TimeSyncDataProvider::StoreDefaultNtp(const CharSpan & defaultNtp)
{
return mPersistentStorage->SyncSetKeyValue(DefaultStorageKeyAllocator::TSDefaultNTP().KeyName(), defaultNtp.data(),
static_cast<uint16_t>(defaultNtp.size()));
Expand Down
2 changes: 1 addition & 1 deletion src/app/clusters/time-synchronization-server/TimeSyncDataProvider.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class TimeSyncDataProvider
CHIP_ERROR LoadTrustedTimeSource(TrustedTimeSource & timeSource);
CHIP_ERROR ClearTrustedTimeSource();

CHIP_ERROR StoreDefaultNtp(const MutableByteSpan & defaultNtp);
CHIP_ERROR StoreDefaultNtp(const CharSpan & defaultNtp);
CHIP_ERROR LoadDefaultNtp(MutableByteSpan & defaultNtp);
CHIP_ERROR ClearDefaultNtp();

Expand Down
72 changes: 25 additions & 47 deletions src/app/clusters/time-synchronization-server/time-synchronization-server.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,19 +93,15 @@ TimeSynchronizationServer & TimeSynchronizationServer::Instance(void)

void TimeSynchronizationServer::Init()
{
TimeSynchronization::Structs::TrustedTimeSourceStruct::Type tts;
chip::MutableByteSpan mutableDntp(mDefaultNtpBuf);

mTimeSyncDataProvider.Init(Server::GetInstance().GetPersistentStorage());

TimeSynchronization::Structs::TrustedTimeSourceStruct::Type tts;
(CHIP_NO_ERROR == mTimeSyncDataProvider.LoadTrustedTimeSource(tts)) ? (void) mTrustedTimeSource.SetNonNull(tts)
: mTrustedTimeSource.SetNull();
(CHIP_NO_ERROR == mTimeSyncDataProvider.LoadDefaultNtp(mutableDntp)) ? (void) mDefaultNtp.SetNonNull(mutableDntp)
: mDefaultNtp.SetNull();

auto tz = mTimeZoneList.begin();
for (size_t i = 0; i < mTimeZoneList.size(); i++)
{
memset(mNames[i].name, 0, sizeof(mNames[i].name));
const char * buf = reinterpret_cast<const char *>(mNames[i].name);
tz[i].name.SetValue(chip::CharSpan(buf, sizeof(mNames[i].name)));
}
Expand All @@ -123,30 +119,24 @@ CHIP_ERROR TimeSynchronizationServer::SetTrustedTimeSource(
mTrustedTimeSource = tts;
if (!mTrustedTimeSource.IsNull())
{
mTimeSyncDataProvider.StoreTrustedTimeSource(mTrustedTimeSource.Value());
return mTimeSyncDataProvider.StoreTrustedTimeSource(mTrustedTimeSource.Value());
}
else
{
mTimeSyncDataProvider.ClearTrustedTimeSource();
return mTimeSyncDataProvider.ClearTrustedTimeSource();
}

return CHIP_NO_ERROR;
}

CHIP_ERROR TimeSynchronizationServer::SetDefaultNtp(DataModel::Nullable<chip::MutableByteSpan> dntp)
CHIP_ERROR TimeSynchronizationServer::SetDefaultNtp(DataModel::Nullable<chip::CharSpan> & dntp)
{
if (!dntp.IsNull())
{
memcpy(mDefaultNtpBuf, dntp.Value().data(), dntp.Value().size());
mDefaultNtp.SetNonNull(MutableByteSpan(mDefaultNtpBuf, dntp.Value().size()));
return mTimeSyncDataProvider.StoreDefaultNtp(mDefaultNtp.Value());
return mTimeSyncDataProvider.StoreDefaultNtp(dntp.Value());
}
else
{
mDefaultNtp.SetNull();
return mTimeSyncDataProvider.ClearDefaultNtp();
}
return CHIP_NO_ERROR;
}

CHIP_ERROR TimeSynchronizationServer::SetTimeZone(DataModel::DecodableList<TimeSynchronization::Structs::TimeZoneStruct::Type> tz)
Expand Down Expand Up @@ -205,15 +195,18 @@ TimeSynchronizationServer::GetTrustedTimeSource(void)
{
return mTrustedTimeSource;
}
DataModel::Nullable<chip::MutableByteSpan> & TimeSynchronizationServer::GetDefaultNtp(void)

CHIP_ERROR TimeSynchronizationServer::GetDefaultNtp(MutableByteSpan & dntp)
{
return mDefaultNtp;
return mTimeSyncDataProvider.LoadDefaultNtp(dntp);
}

DataModel::List<TimeSynchronization::Structs::TimeZoneStruct::Type> & TimeSynchronizationServer::GetTimeZone(void)
{
mTimeZoneList = DataModel::List<TimeSynchronization::Structs::TimeZoneStruct::Type>(mTz, mTimeZoneListSize);
return mTimeZoneList;
}

DataModel::List<TimeSynchronization::Structs::DSTOffsetStruct::Type> & TimeSynchronizationServer::GetDSTOffset(void)
{
mDstOffsetList = DataModel::List<TimeSynchronization::Structs::DSTOffsetStruct::Type>(mDst, mDstOffsetListSize);
Expand Down Expand Up @@ -267,28 +260,23 @@ TimeSynchronizationAttrAccess gAttrAccess;

CHIP_ERROR TimeSynchronizationAttrAccess::ReadTrustedTimeSource(EndpointId endpoint, AttributeValueEncoder & aEncoder)
{
CHIP_ERROR err = CHIP_NO_ERROR;
auto tts = TimeSynchronizationServer::Instance().GetTrustedTimeSource();
err = aEncoder.Encode(tts);

return err;
return aEncoder.Encode(tts);
}

CHIP_ERROR TimeSynchronizationAttrAccess::ReadDefaultNtp(EndpointId endpoint, AttributeValueEncoder & aEncoder)
{
CHIP_ERROR err = CHIP_NO_ERROR;
auto dntp = TimeSynchronizationServer::Instance().GetDefaultNtp();
if (!dntp.IsNull())
uint8_t buffer[DefaultNTP::TypeInfo::MaxLength()];
MutableByteSpan dntp(buffer);
if (TimeSynchronizationServer::Instance().GetDefaultNtp(dntp) == CHIP_NO_ERROR && dntp.size() != 0)
{
const char * buf = reinterpret_cast<const char *>(dntp.Value().data());
err = aEncoder.Encode(chip::CharSpan(buf, strnlen(buf, dntp.Value().size())));
const char * charBuf = reinterpret_cast<const char *>(buffer);
return aEncoder.Encode(chip::CharSpan(charBuf, dntp.size()));
}
else
{
err = aEncoder.EncodeNull();
return aEncoder.EncodeNull();
}

return err;
}

CHIP_ERROR TimeSynchronizationAttrAccess::ReadTimeZone(EndpointId endpoint, AttributeValueEncoder & aEncoder)
Expand Down Expand Up @@ -363,7 +351,6 @@ CHIP_ERROR TimeSynchronizationAttrAccess::Read(const ConcreteReadAttributePath &
case LocalTime::Id: {
uint64_t localTime = 0;
VerifyOrReturnError(computeLocalTime(aPath.mEndpointId, localTime), aEncoder.EncodeNull());

return aEncoder.Encode(localTime);
}
default: {
Expand Down Expand Up @@ -648,17 +635,16 @@ bool emberAfTimeSynchronizationClusterSetDefaultNTPCallback(
const chip::app::Clusters::TimeSynchronization::Commands::SetDefaultNTP::DecodableType & commandData)
{
Status status = Status::Success;
auto dntpChar = commandData.defaultNTP;
DataModel::Nullable<chip::MutableByteSpan> dntpByte;
auto dNtpChar = commandData.defaultNTP;

if (!dntpChar.IsNull())
if (!dNtpChar.IsNull())
{
if (!GetDelegate()->isNTPAddressValid(dntpChar.Value()))
if (!GetDelegate()->isNTPAddressValid(dNtpChar.Value()))
{
commandObj->AddStatus(commandPath, Status::InvalidCommand);
return true;
}
if (GetDelegate()->isNTPAddressDomain(dntpChar.Value()))
if (GetDelegate()->isNTPAddressDomain(dNtpChar.Value()))
{
bool dnsResolve;
SupportsDNSResolve::Get(commandPath.mEndpointId, &dnsResolve);
Expand All @@ -669,25 +655,17 @@ bool emberAfTimeSynchronizationClusterSetDefaultNTPCallback(
}
}

uint8_t buffer[DefaultNTP::TypeInfo::MaxLength()];
chip::MutableByteSpan dntp(buffer);
size_t len = dntpChar.Value().size();
size_t len = dNtpChar.Value().size();

if (len > DefaultNTP::TypeInfo::MaxLength())
{
commandObj->AddStatus(commandPath, Status::ConstraintError);
return true;
}
memcpy(buffer, dntpChar.Value().data(), len);
dntp = MutableByteSpan(dntp.data(), len);
dntpByte.SetNonNull(dntp);
}
else
{
dntpByte.SetNull();
}

status =
(CHIP_NO_ERROR == TimeSynchronizationServer::Instance().SetDefaultNtp(dntpByte)) ? Status::Success : Status::InvalidCommand;
(CHIP_NO_ERROR == TimeSynchronizationServer::Instance().SetDefaultNtp(dNtpChar)) ? Status::Success : Status::InvalidCommand;

commandObj->AddStatus(commandPath, status);
return true;
Expand Down
6 changes: 2 additions & 4 deletions src/app/clusters/time-synchronization-server/time-synchronization-server.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class TimeSynchronizationServer
TimeSyncDataProvider GetDataProvider(void) { return mTimeSyncDataProvider; }

CHIP_ERROR SetTrustedTimeSource(DataModel::Nullable<TimeSynchronization::Structs::TrustedTimeSourceStruct::Type> tts);
CHIP_ERROR SetDefaultNtp(DataModel::Nullable<chip::MutableByteSpan> dntp);
CHIP_ERROR SetDefaultNtp(DataModel::Nullable<chip::CharSpan> & dntp);
/**
* @brief Sets TimeZone Attribute. Assumes the size of the list is already validated.
*
Expand All @@ -75,15 +75,14 @@ class TimeSynchronizationServer
CHIP_ERROR SetDSTOffset(DataModel::DecodableList<TimeSynchronization::Structs::DSTOffsetStruct::Type> dst);
CHIP_ERROR ClearDSTOffset(void);
DataModel::Nullable<TimeSynchronization::Structs::TrustedTimeSourceStruct::Type> & GetTrustedTimeSource(void);
DataModel::Nullable<chip::MutableByteSpan> & GetDefaultNtp(void);
CHIP_ERROR GetDefaultNtp(MutableByteSpan & dntp);
DataModel::List<TimeSynchronization::Structs::TimeZoneStruct::Type> & GetTimeZone(void);
DataModel::List<TimeSynchronization::Structs::DSTOffsetStruct::Type> & GetDSTOffset(void);

void ScheduleDelayedAction(System::Clock::Seconds32 delay, System::TimerCompleteCallback action, void * aAppState);

private:
DataModel::Nullable<TimeSynchronization::Structs::TrustedTimeSourceStruct::Type> mTrustedTimeSource;
DataModel::Nullable<chip::MutableByteSpan> mDefaultNtp;
DataModel::List<TimeSynchronization::Structs::TimeZoneStruct::Type> mTimeZoneList =
DataModel::List<TimeSynchronization::Structs::TimeZoneStruct::Type>(mTz);
DataModel::List<TimeSynchronization::Structs::DSTOffsetStruct::Type> mDstOffsetList =
Expand All @@ -95,7 +94,6 @@ class TimeSynchronizationServer
TimeSynchronization::Structs::TimeZoneStruct::Type mTz[CHIP_CONFIG_TIME_ZONE_LIST_MAX_SIZE];
struct timeZoneName mNames[CHIP_CONFIG_TIME_ZONE_LIST_MAX_SIZE];
TimeSynchronization::Structs::DSTOffsetStruct::Type mDst[CHIP_CONFIG_DST_OFFSET_LIST_MAX_SIZE];
uint8_t mDefaultNtpBuf[DefaultNTP::TypeInfo::MaxLength()];

TimeSyncDataProvider mTimeSyncDataProvider;
static TimeSynchronizationServer mTimeSyncInstance;
Expand Down

0 comments on commit ce8679c

Please sign in to comment.