Addressed review comments

kkasperczyk-no · Feb 10, 2022 · 66b64b7 · 66b64b7
1 parent 5dcb457
commit 66b64b7
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp b/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp
@@ -214,21 +214,18 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
 
         // Assuming IPv6-only support
         Inet::InterfaceAddressIterator interfaceAddressIterator;
-        chip::Inet::IPAddress ipv6Addresses[kMaxIPv6AddrCount];
-        uint8_t ipv6AddressesCount;
-        for (ipv6AddressesCount = 0; interfaceAddressIterator.HasCurrent(); ipv6AddressesCount++)
+        uint8_t ipv6AddressesCount = 0;
+        while (interfaceAddressIterator.HasCurrent())
         {
             if (interfaceAddressIterator.GetInterfaceId() == interfaceIterator.GetInterfaceId())
             {
-                if (interfaceAddressIterator.GetAddress(ipv6Addresses[ipv6AddressesCount]) == CHIP_NO_ERROR)
+                chip::Inet::IPAddress ipv6Address;
+                if (interfaceAddressIterator.GetAddress(ipv6Address) == CHIP_NO_ERROR)
                 {
-                    memcpy(ifp->Ipv6AddressesBuffer[ipv6AddressesCount], ipv6Addresses[ipv6AddressesCount].Addr, kMaxIPv6AddrSize);
+                    memcpy(ifp->Ipv6AddressesBuffer[ipv6AddressesCount], ipv6Address.Addr, kMaxIPv6AddrSize);
                     ifp->Ipv6Addresses[ipv6AddressesCount] =
                         ByteSpan(ifp->Ipv6AddressesBuffer[ipv6AddressesCount], kMaxIPv6AddrSize);
-                }
-                else
-                {
-                    break;
+                    ipv6AddressesCount++;
                 }
             }
             interfaceAddressIterator.Next();