Fix kMaxIfNameLength constant scoping after #10979 (#11051)

project-chip · Aug 30, 2023 · 9f5e728 · 9f5e728
1 parent ac8a4b3
commit 9f5e728
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/include/platform/ConnectivityManager.h b/src/include/platform/ConnectivityManager.h
@@ -55,7 +55,7 @@ constexpr size_t kMaxHardwareAddrSize = 8;
 
 struct NetworkInterface : public app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::Type
 {
-    char Name[Inet::InterfaceIterator::kMaxIfNameLength];
+    char Name[Inet::InterfaceId::kMaxIfNameLength];
     uint8_t MacAddress[kMaxHardwareAddrSize];
     NetworkInterface * Next; /* Pointer to the next structure.  */
 };

diff --git a/src/platform/Linux/ConnectivityManagerImpl.cpp b/src/platform/Linux/ConnectivityManagerImpl.cpp
@@ -1068,8 +1068,8 @@ CHIP_ERROR ConnectivityManagerImpl::_GetNetworkInterfaces(NetworkInterface ** ne
             {
                 NetworkInterface * ifp = new NetworkInterface();
 
-                strncpy(ifp->Name, ifa->ifa_name, Inet::InterfaceIterator::kMaxIfNameLength);
-                ifp->Name[Inet::InterfaceIterator::kMaxIfNameLength - 1] = '\0';
+                strncpy(ifp->Name, ifa->ifa_name, Inet::InterfaceId::kMaxIfNameLength);
+                ifp->Name[Inet::InterfaceId::kMaxIfNameLength - 1] = '\0';
 
                 ifp->name                            = CharSpan(ifp->Name, strlen(ifp->Name));
                 ifp->fabricConnected                 = ifa->ifa_flags & IFF_RUNNING;