Skip to content

Commit

Permalink
Do not stop minmdns browse after the first result found
Browse files Browse the repository at this point in the history
  • Loading branch information
andy31415 committed Jun 7, 2024
1 parent 4239c88 commit 916ebd2
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 28 deletions.
24 changes: 0 additions & 24 deletions src/lib/dnssd/ActiveResolveAttempts.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,30 +53,6 @@ void ActiveResolveAttempts::Complete(const PeerId & peerId)
#endif
}

void ActiveResolveAttempts::CompleteCommissioner(const chip::Dnssd::DiscoveredNodeData & data)
{
for (auto & item : mRetryQueue)
{
if (item.attempt.Matches(data, chip::Dnssd::DiscoveryType::kCommissionerNode))
{
item.attempt.Clear();
return;
}
}
}

void ActiveResolveAttempts::CompleteCommissionable(const chip::Dnssd::DiscoveredNodeData & data)
{
for (auto & item : mRetryQueue)
{
if (item.attempt.Matches(data, chip::Dnssd::DiscoveryType::kCommissionableNode))
{
item.attempt.Clear();
return;
}
}
}

bool ActiveResolveAttempts::HasBrowseFor(chip::Dnssd::DiscoveryType type) const
{
for (auto & item : mRetryQueue)
Expand Down
2 changes: 0 additions & 2 deletions src/lib/dnssd/ActiveResolveAttempts.h
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,6 @@ class ActiveResolveAttempts

/// Mark a resolution as a success, removing it from the internal list
void Complete(const chip::PeerId & peerId);
void CompleteCommissioner(const chip::Dnssd::DiscoveredNodeData & data);
void CompleteCommissionable(const chip::Dnssd::DiscoveredNodeData & data);
void CompleteIpResolution(SerializedQNameIterator targetHostName);

/// Mark all browse-type scheduled attemptes as a success, removing them
Expand Down
2 changes: 0 additions & 2 deletions src/lib/dnssd/Resolver_ImplMinimalMdns.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -424,11 +424,9 @@ void MinMdnsResolver::AdvancePendingResolverStates()
{
case IncrementalResolver::ServiceNameType::kCommissioner:
discoveredNodeIsRelevant = mActiveResolves.HasBrowseFor(chip::Dnssd::DiscoveryType::kCommissionerNode);
mActiveResolves.CompleteCommissioner(nodeData);
break;
case IncrementalResolver::ServiceNameType::kCommissionable:
discoveredNodeIsRelevant = mActiveResolves.HasBrowseFor(chip::Dnssd::DiscoveryType::kCommissionableNode);
mActiveResolves.CompleteCommissionable(nodeData);
break;
default:
ChipLogError(Discovery, "Unexpected type for browse data parsing");
Expand Down

0 comments on commit 916ebd2

Please sign in to comment.