espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-08 19:57:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[srp-server] use RetainPtr to share Description among services (#7195)

Browse Source 
This commit updates `Srp::Server` such that `Service` instances keep a
`RetainPtr` to a `Service::Description`. This allows a service and
all its sub-types to share the same `Description` instance and helps
simplify the management of the `Description` instances. When the last
`Service` that has a pointer to a shared `Description` is removed and
freed, the `Description` instance will be automatically freed as
well.
This commit is contained in:
Abtin Keshavarzian
2021-11-24 21:14:49 -08:00
committed by Jonathan Hui
parent 4acdf1d0fb
commit a4220690ee
2 changed files with 53 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/net/srp_server.cpp
+39 -53
View File
@@ -313,15 +313,15 @@ bool Server::HasNameConflictsWith(Host &aHost) const
ExitNow(hasConflicts = true);
}
for (const Service::Description &desc : aHost.mServiceDescriptions)
for (const Service &service : aHost.mServices)
{
// Check on all hosts for a matching service description with
// the same instance name and if found, verify that it has the
// same key.
// Check on all hosts for a matching service with the same
// instance name and if found, verify that it has the same
// key.
for (const Host &host : mHosts)
{
if (host.FindServiceDescription(desc.GetInstanceName()) != nullptr)
if (host.HasServiceInstance(service.GetInstanceName()))
{
VerifyOrExit(*aHost.GetKey() == *host.GetKey(), hasConflicts = true);
}
@@ -401,10 +401,10 @@ void Server::CommitSrpUpdate(Error aError,
aHost.SetLease(grantedLease);
aHost.SetKeyLease(grantedKeyLease);
for (Service::Description &desc : aHost.mServiceDescriptions)
for (Service &service : aHost.mServices)
{
desc.mLease = grantedLease;
desc.mKeyLease = grantedKeyLease;
service.mDescription->mLease = grantedLease;
service.mDescription->mKeyLease = grantedKeyLease;
}
existingHost = mHosts.FindMatching(aHost.GetFullName());
@@ -774,7 +774,7 @@ Error Server::ProcessHostDescriptionInstruction(Host & aHost,
// A "Delete All RRsets from a name" RR can only apply to a Service or Host Description.
if (aHost.FindServiceDescription(name) == nullptr)
if (!aHost.HasServiceInstance(name))
{
// If host name is already set to a different name, `SetFullName()`
// will return `kErrorFailed`.
@@ -904,9 +904,9 @@ Error Server::ProcessServiceDescriptionInstructions(Host & aHost,
for (uint16_t numRecords = aMetadata.mDnsHeader.GetUpdateRecordCount(); numRecords > 0; numRecords--)
{
Service::Description *desc;
char name[Dns::Name::kMaxNameSize];
Dns::ResourceRecord record;
RetainPtr<Service::Description> desc;
char name[Dns::Name::kMaxNameSize];
Dns::ResourceRecord record;
SuccessOrExit(error = Dns::Name::ReadName(aMessage, offset, name, sizeof(name)));
SuccessOrExit(error = aMessage.Read(offset, record));
@@ -973,15 +973,16 @@ Error Server::ProcessServiceDescriptionInstructions(Host & aHost,
// that `mUpdateTime` on a new `Service::Description` is set to
// `GetNow().GetDistantPast()`.
for (Service::Description &desc : aHost.mServiceDescriptions)
for (Service &service : aHost.mServices)
{
VerifyOrExit(desc.mUpdateTime == aMetadata.mRxTime, error = kErrorFailed);
VerifyOrExit(service.mDescription->mUpdateTime == aMetadata.mRxTime, error = kErrorFailed);
// Check that either both `mPort` and `mTxtData` are set
// (i.e., we saw both SRV and TXT record) or both are default
// (cleared) value (i.e., we saw neither of them).
VerifyOrExit((desc.mPort == 0) == desc.mTxtData.IsNull(), error = kErrorFailed);
VerifyOrExit((service.mDescription->mPort == 0) == service.mDescription->mTxtData.IsNull(),
error = kErrorFailed);
}
aMetadata.mOffset = offset;
@@ -1448,7 +1449,7 @@ const char *Server::AddressModeToString(AddressMode aMode)
Error Server::Service::Init(const char *aServiceName, Description &aDescription, bool aIsSubType, TimeMilli aUpdateTime)
{
mDescription = &aDescription;
mDescription.Reset(&aDescription);
mNext = nullptr;
mUpdateTime = aUpdateTime;
mIsDeleted = false;
@@ -1652,7 +1653,6 @@ Error Server::Host::Init(Instance &aInstance, TimeMilli aUpdateTime)
mKeyLease = 0;
mUpdateTime = aUpdateTime;
mServices.Clear();
mServiceDescriptions.Clear();
return kErrorNone;
}
@@ -1741,16 +1741,13 @@ Server::Service *Server::Host::AddNewService(const char *aServiceName,
bool aIsSubType,
TimeMilli aUpdateTime)
{
Service * service = nullptr;
Service::Description *desc;
desc = FindServiceDescription(aInstanceName);
Service * service = nullptr;
RetainPtr<Service::Description> desc(FindServiceDescription(aInstanceName));
if (desc == nullptr)
{
desc = Service::Description::New(aInstanceName, *this);
desc.Reset(Service::Description::New(aInstanceName, *this));
VerifyOrExit(desc != nullptr);
mServiceDescriptions.Push(*desc);
}
service = Service::New(aServiceName, *desc, aIsSubType, aUpdateTime);
@@ -1789,7 +1786,6 @@ void Server::Host::RemoveService(Service *aService, RetainName aRetainName, Noti
{
IgnoreError(mServices.Remove(*aService));
aService->Free();
FreeUnusedServiceDescriptions();
}
exit:
@@ -1804,32 +1800,6 @@ void Server::Host::FreeAllServices(void)
}
}
void Server::Host::FreeUnusedServiceDescriptions(void)
{
Service::Description *desc;
Service::Description *prev;
Service::Description *next;
for (prev = nullptr, desc = mServiceDescriptions.GetHead(); desc != nullptr; desc = next)
{
next = desc->GetNext();
if (FindNextService(/* aPrevService */ nullptr, kFlagsAnyService, /* aServiceName */ nullptr,
desc->GetInstanceName()) == nullptr)
{
mServiceDescriptions.PopAfter(prev);
desc->Free();
// When the `desc` is removed from the list
// we keep the `prev` pointer same as before.
}
else
{
prev = desc;
}
}
}
void Server::Host::ClearResources(void)
{
mAddresses.Clear();
@@ -1890,12 +1860,28 @@ exit:
return error;
}
const Server::Service::Description *Server::Host::FindServiceDescription(const char *aInstanceName) const
bool Server::Host::HasServiceInstance(const char *aInstanceName) const
{
return mServiceDescriptions.FindMatching(aInstanceName);
return (FindServiceDescription(aInstanceName) != nullptr);
}
Server::Service::Description *Server::Host::FindServiceDescription(const char *aInstanceName)
const RetainPtr<Server::Service::Description> Server::Host::FindServiceDescription(const char *aInstanceName) const
{
const Service::Description *desc = nullptr;
for (const Service &service : mServices)
{
if (service.mDescription->Matches(aInstanceName))
{
desc = service.mDescription.Get();
break;
}
}
return RetainPtr<Service::Description>(AsNonConst(desc));
}
RetainPtr<Server::Service::Description> Server::Host::FindServiceDescription(const char *aInstanceName)
{
return AsNonConst(AsConst(this)->FindServiceDescription(aInstanceName));
}
src/core/net/srp_server.hpp
+14 -13
View File
@@ -64,6 +64,7 @@
#include "common/locator.hpp"
#include "common/non_copyable.hpp"
#include "common/notifier.hpp"
#include "common/retain_ptr.hpp"
#include "common/timer.hpp"
#include "crypto/ecdsa.hpp"
#include "net/dns_types.hpp"
@@ -341,6 +342,7 @@ public:
private:
struct Description : public LinkedListEntry<Description>,
public Heap::Allocatable<Description>,
public RetainCountable,
private NonCopyable
{
Error Init(const char *aInstanceName, Host &aHost);
@@ -377,13 +379,13 @@ public:
const TimeMilli &GetUpdateTime(void) const { return mUpdateTime; }
void Log(Action aAction) const;
Heap::String mServiceName;
Description *mDescription;
Service * mNext;
TimeMilli mUpdateTime;
bool mIsDeleted : 1;
bool mIsSubType : 1;
bool mIsCommitted : 1;
Heap::String mServiceName;
RetainPtr<Description> mDescription;
Service * mNext;
TimeMilli mUpdateTime;
bool mIsDeleted : 1;
bool mIsSubType : 1;
bool mIsCommitted : 1;
};
/**
@@ -527,14 +529,14 @@ public:
TimeMilli aUpdateTime);
void RemoveService(Service *aService, RetainName aRetainName, NotifyMode aNotifyServiceHandler);
void FreeAllServices(void);
void FreeUnusedServiceDescriptions(void);
void ClearResources(void);
Error MergeServicesAndResourcesFrom(Host &aHost);
Error AddIp6Address(const Ip6::Address &aIp6Address);
Service::Description * FindServiceDescription(const char *aInstanceName);
const Service::Description *FindServiceDescription(const char *aInstanceName) const;
Service * FindService(const char *aServiceName, const char *aInstanceName);
const Service * FindService(const char *aServiceName, const char *aInstanceName) const;
bool HasServiceInstance(const char *aInstanceName) const;
RetainPtr<Service::Description> FindServiceDescription(const char *aInstanceName);
const RetainPtr<Service::Description> FindServiceDescription(const char *aInstanceName) const;
Service * FindService(const char *aServiceName, const char *aInstanceName);
const Service * FindService(const char *aServiceName, const char *aInstanceName) const;
Host * mNext;
Heap::String mFullName;
@@ -544,7 +546,6 @@ public:
uint32_t mKeyLease; // The KEY-LEASE time in seconds.
TimeMilli mUpdateTime;
LinkedList<Service> mServices;
LinkedList<Service::Description> mServiceDescriptions;
};
/**