Match the order of ScoreIpAddress with IpScore (#28934)

The #27981 PR was merged, but it didn't follow IpScore's comments. // IP addess "suitability" // - Larger value means "more suitable" // - Enum ordered ascending for easier read. Note however that order of // checks MUST match in ScoreIpAddress below. enum class IpScore : unsigned This change matches the order of ScoreIpAddress with the order of IpScore enum. Signed-off-by: Youngho Yoon <[email protected]>
project-chip · Aug 29, 2023 · ba6af3c · ba6af3c
1 parent c43d6f7
commit ba6af3c
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/src/lib/dnssd/IPAddressSorter.cpp b/src/lib/dnssd/IPAddressSorter.cpp
@@ -45,12 +45,10 @@ IpScore ScoreIpAddress(const Inet::IPAddress & ip, Inet::InterfaceId interfaceId
 {
     if (ip.IsIPv6())
     {
-#ifdef __APPLE__
         if (ip.IsIPv6LinkLocal())
         {
             return IpScore::kLinkLocal;
         }
-#endif // __APPLE__
 
         if (interfaceId.MatchLocalIPv6Subnet(ip))
         {
@@ -73,13 +71,6 @@ IpScore ScoreIpAddress(const Inet::IPAddress & ip, Inet::InterfaceId interfaceId
             return IpScore::kUniqueLocal;
         }
 
-#ifndef __APPLE__
-        if (ip.IsIPv6LinkLocal())
-        {
-            return IpScore::kLinkLocal;
-        }
-#endif // __APPLE__
-
         return IpScore::kOtherIpv6;
     }