espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-21 09:59:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[srp-server] simplify RemoveHost() method (#9295)

Browse Source 
This commit simplifies the `Sever::RemoveHost()` method by removing
the input parameter `aNotifyServiceHandler`. This is because, unlike
the `RemoveService()` method, the `RemoveHost()` method always needs
to notify the service handler.
This commit is contained in:
Abtin Keshavarzian
2023-07-19 10:35:18 -07:00
committed by GitHub
parent 7f4c7fca2e
commit a0f7253017
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/net/srp_server.cpp
+5 -5
View File
@@ -308,7 +308,7 @@ const Server::Host *Server::GetNextHost(const Server::Host *aHost)
return (aHost == nullptr) ? mHosts.GetHead() : aHost->GetNext();
}
void Server::RemoveHost(Host *aHost, RetainName aRetainName, NotifyMode aNotifyServiceHandler)
void Server::RemoveHost(Host *aHost, RetainName aRetainName)
{
VerifyOrExit(aHost != nullptr);
@@ -326,7 +326,7 @@ void Server::RemoveHost(Host *aHost, RetainName aRetainName, NotifyMode aNotifyS
LogInfo("Fully remove host %s", aHost->GetFullName());
}
if (aNotifyServiceHandler && mServiceUpdateHandler.IsSet())
if (mServiceUpdateHandler.IsSet())
{
uint32_t updateId = AllocateId();
@@ -674,7 +674,7 @@ void Server::Stop(void)
while (!mHosts.IsEmpty())
{
RemoveHost(mHosts.GetHead(), kDeleteName, kNotifyServiceHandler);
RemoveHost(mHosts.GetHead(), kDeleteName);
}
// TODO: We should cancel any outstanding service updates, but current
@@ -1554,7 +1554,7 @@ void Server::HandleLeaseTimer(void)
LogInfo("KEY LEASE of host %s expired", host->GetFullName());
// Removes the whole host and all services if the KEY RR expired.
RemoveHost(host, kDeleteName, kNotifyServiceHandler);
RemoveHost(host, kDeleteName);
}
else if (host->IsDeleted())
{
@@ -1593,7 +1593,7 @@ void Server::HandleLeaseTimer(void)
host->RemoveService(&service, kRetainName, kDoNotNotifyServiceHandler);
}
RemoveHost(host, kRetainName, kNotifyServiceHandler);
RemoveHost(host, kRetainName);
earliestExpireTime = Min(earliestExpireTime, host->GetKeyExpireTime());
}
src/core/net/srp_server.hpp
+1 -1
View File
@@ -985,7 +985,7 @@ private:
static bool IsValidDeleteAllRecord(const Dns::ResourceRecord &aRecord);
void HandleUpdate(Host &aHost, const MessageMetadata &aMetadata);
void RemoveHost(Host *aHost, RetainName aRetainName, NotifyMode aNotifyServiceHandler);
void RemoveHost(Host *aHost, RetainName aRetainName);
bool HasNameConflictsWith(Host &aHost) const;
void SendResponse(const Dns::UpdateHeader &aHeader,
Dns::UpdateHeader::Response aResponseCode,