Revert "Enable DNSSD on ipv4 if broadcast is available"

This reverts commit c4d3f6c.
project-chip · Mar 18, 2022 · 7d12029 · 7d12029
1 parent 08d1bba
commit 7d12029
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 34 deletions.
diff --git a/examples/minimal-mdns/AllInterfaceListener.h b/examples/minimal-mdns/AllInterfaceListener.h
@@ -88,24 +88,14 @@ class AllInterfaces : public mdns::Minimal::ListenIterator
         }
     }
 
-    template <typename T>
-    inline bool MulticastOk(T & iterator)
-    {
-        return iterator.SupportsMulticast()
-#if INET_CONFIG_ENABLE_IPV4
-            || iterator.HasBroadcastAddress()
-#endif
-            ;
-    }
-
     bool SkipCurrentInterface()
     {
         if (!mIterator.HasCurrent())
         {
             return false; // nothing to try.
         }
 
-        if (!mIterator.IsUp() || !MulticastOk(mIterator))
+        if (!mIterator.IsUp() || !mIterator.SupportsMulticast())
         {
             return true; // not a usable interface
         }

diff --git a/src/lib/dnssd/AllInterfacesListenIterator.h b/src/lib/dnssd/AllInterfacesListenIterator.h
@@ -24,22 +24,12 @@
 namespace chip {
 namespace Dnssd {
 
-template <typename T>
-inline bool MulticastOk(T & iterator)
-{
-    return iterator.SupportsMulticast()
-#if INET_CONFIG_ENABLE_IPV4
-        || iterator.HasBroadcastAddress()
-#endif
-        ;
-}
-
 /// Checks if the current interface is powered on
 /// and not local loopback.
 template <typename T>
 bool IsCurrentInterfaceUsable(T & iterator)
 {
-    if (!iterator.IsUp() || !MulticastOk(iterator))
+    if (!iterator.IsUp() || !iterator.SupportsMulticast())
     {
         return false; // not a usable interface
     }

diff --git a/src/lib/dnssd/MinimalMdnsServer.h b/src/lib/dnssd/MinimalMdnsServer.h
@@ -23,23 +23,12 @@ namespace chip {
 namespace Dnssd {
 
 namespace Internal {
-
-template <typename T>
-inline bool MulticastOk(T & iterator)
-{
-    return iterator.SupportsMulticast()
-#if INET_CONFIG_ENABLE_IPV4
-        || iterator.HasBroadcastAddress()
-#endif
-        ;
-}
-
 /// Checks if the current interface is powered on
 /// and not local loopback.
 template <typename T>
 bool IsCurrentInterfaceUsable(T & iterator)
 {
-    if (!iterator.IsUp() || !MulticastOk(iterator))
+    if (!iterator.IsUp() || !iterator.SupportsMulticast())
     {
         return false; // not a usable interface
     }