Revert "MinMDNS - do not ask for IP addresses for every SRV record th…

…at is seen (project-chip#33119)" This reverts commit 530dec2. Signed-off-by: Adrian Gielniewski <[email protected]>
maciejbaczmanski · Nov 28, 2024 · b059c10 · b059c10
1 parent 2cbb715
commit b059c10
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 56 deletions.
diff --git a/src/lib/dnssd/ActiveResolveAttempts.cpp b/src/lib/dnssd/ActiveResolveAttempts.cpp
@@ -19,6 +19,8 @@
 
 #include <lib/support/logging/CHIPLogging.h>
 
+#include <algorithm>
+
 using namespace chip;
 
 namespace mdns {
@@ -282,32 +284,6 @@ Optional<ActiveResolveAttempts::ScheduledAttempt> ActiveResolveAttempts::NextSch
     return Optional<ScheduledAttempt>::Missing();
 }
 
-bool ActiveResolveAttempts::ShouldResolveIpAddress(PeerId peerId) const
-{
-    for (auto & item : mRetryQueue)
-    {
-        if (item.attempt.IsEmpty())
-        {
-            continue;
-        }
-        if (item.attempt.IsBrowse())
-        {
-            return true;
-        }
-
-        if (item.attempt.IsResolve())
-        {
-            auto & data = item.attempt.ResolveData();
-            if (data.peerId == peerId)
-            {
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
 bool ActiveResolveAttempts::IsWaitingForIpResolutionFor(SerializedQNameIterator hostName) const
 {
     for (auto & entry : mRetryQueue)

diff --git a/src/lib/dnssd/ActiveResolveAttempts.h b/src/lib/dnssd/ActiveResolveAttempts.h
@@ -288,12 +288,6 @@ class ActiveResolveAttempts
     /// IP resolution.
     bool IsWaitingForIpResolutionFor(SerializedQNameIterator hostName) const;
 
-    /// Determines if address resolution for the given peer ID is required
-    ///
-    /// IP Addresses are required for active operational discovery of specific peers
-    /// or if an active browse is being performed.
-    bool ShouldResolveIpAddress(chip::PeerId peerId) const;
-
     /// Check if a browse operation is active for the given discovery type
     bool HasBrowseFor(chip::Dnssd::DiscoveryType type) const;
 

diff --git a/src/lib/dnssd/IncrementalResolve.h b/src/lib/dnssd/IncrementalResolve.h
@@ -17,7 +17,6 @@
 #pragma once
 
 #include <lib/dnssd/Resolver.h>
-#include <lib/dnssd/Types.h>
 #include <lib/dnssd/minimal_mdns/Parser.h>
 #include <lib/dnssd/minimal_mdns/RecordData.h>
 #include <lib/dnssd/minimal_mdns/core/QName.h>
@@ -105,12 +104,6 @@ class IncrementalResolver
 
     ServiceNameType GetCurrentType() const { return mServiceNameType; }
 
-    PeerId OperationalParsePeerId() const
-    {
-        VerifyOrReturnValue(IsActiveOperationalParse(), PeerId());
-        return mSpecificResolutionData.Get<OperationalNodeData>().peerId;
-    }
-
     /// Start parsing a new record. SRV records are the records we are mainly
     /// interested on, after which TXT and A/AAAA are looked for.
     ///

diff --git a/src/lib/dnssd/Resolver_ImplMinimalMdns.cpp b/src/lib/dnssd/Resolver_ImplMinimalMdns.cpp
@@ -17,6 +17,8 @@
 
 #include "Resolver.h"
 
+#include <limits>
+
 #include <lib/core/CHIPConfig.h>
 #include <lib/dnssd/ActiveResolveAttempts.h>
 #include <lib/dnssd/IncrementalResolve.h>
@@ -371,23 +373,7 @@ void MinMdnsResolver::AdvancePendingResolverStates()
 
         if (missing.Has(IncrementalResolver::RequiredInformationBitFlags::kIpAddress))
         {
-            if (resolver->IsActiveCommissionParse())
-            {
-                // Browse wants IP addresses
-                ScheduleIpAddressResolve(resolver->GetTargetHostName());
-            }
-            else if (mActiveResolves.ShouldResolveIpAddress(resolver->OperationalParsePeerId()))
-            {
-                // Keep searching for IP addresses if an active resolve needs these IP addresses
-                // otherwise ignore the data (received a SRV record without IP address, however we do not
-                // seem interested in it. Probably just a device that came online).
-                ScheduleIpAddressResolve(resolver->GetTargetHostName());
-            }
-            else
-            {
-                // This IP address is not interesting enough to run another discovery
-                resolver->ResetToInactive();
-            }
+            ScheduleIpAddressResolve(resolver->GetTargetHostName());
             continue;
         }