Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only use kMaxIfNameLength instead of IFNAMSIZ #37859

Merged
merged 3 commits into from
Mar 5, 2025
Merged

Only use kMaxIfNameLength instead of IFNAMSIZ #37859

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2e00c9
Only use kMaxIfNameLength instead of IFNAMSIZ
bukepo Mar 4, 2025
b4d6ddd
Restyled by clang-format
restyled-commits Mar 4, 2025
f8c3c9b
Merge branch 'master' into netif-name-size
andy31415 Mar 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/platform/Darwin/DnssdHostNameRegistrar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ void LogDetails(InetInterfacesVector inetInterfaces, Inet6InterfacesVector inet6

for (auto interfaceId : interfaceIds)
{
char interfaceName[IFNAMSIZ] = {};
char interfaceName[chip::Inet::InterfaceId::kMaxIfNameLength] = {};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove the redundant chip:: prefixes a least in the Darwin code, if not throughout.

if_indextoname(interfaceId, interfaceName);
ChipLogProgress(Discovery, "\t%s (%u)", interfaceName, interfaceId);
LogDetails(interfaceId, inetInterfaces, inet6Interfaces);
Expand Down
2 changes: 1 addition & 1 deletion src/platform/Darwin/NetworkCommissioningDriver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class DarwinNetworkIterator : public NetworkIterator

protected:
size_t mInterfaceCount = 0;
char mInterfaceName[IFNAMSIZ] = {};
char mInterfaceName[chip::Inet::InterfaceId::kMaxIfNameLength] = {};
bool mInterfaceStatus = false;
};

Expand Down
2 changes: 1 addition & 1 deletion src/platform/Darwin/WiFi/ConnectivityManagerImplWiFi.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
bool status = false;

if (_GetWiFiStationMode() == kWiFiStationMode_Enabled) {
char interfaceName[IFNAMSIZ];
char interfaceName[chip::Inet::InterfaceId::kMaxIfNameLength];
VerifyOrReturnError(CHIP_NO_ERROR == GetWiFiInterfaceName(interfaceName, sizeof(interfaceName)), false);
VerifyOrReturnError(CHIP_NO_ERROR == GetInterfaceStatus(interfaceName, &status), false);
}
Expand Down
4 changes: 2 additions & 2 deletions src/platform/Linux/ConfigurationManagerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,13 @@ CHIP_ERROR ConfigurationManagerImpl::GetPrimaryWiFiMACAddress(uint8_t * buf)
{
if ((addr->ifa_addr) && (addr->ifa_addr->sa_family == AF_PACKET))
{
if (strncmp(addr->ifa_name, CHIP_DEVICE_CONFIG_WIFI_STATION_IF_NAME, IFNAMSIZ) == 0)
if (strncmp(addr->ifa_name, CHIP_DEVICE_CONFIG_WIFI_STATION_IF_NAME, chip::Inet::InterfaceId::kMaxIfNameLength) == 0)
{
mac = (struct sockaddr_ll *) addr->ifa_addr;
break;
}

if (strncmp(addr->ifa_name, "lo", IFNAMSIZ) != 0 && !mac)
if (strncmp(addr->ifa_name, "lo", chip::Inet::InterfaceId::kMaxIfNameLength) != 0 && !mac)
{
mac = (struct sockaddr_ll *) addr->ifa_addr;
}
Expand Down
4 changes: 2 additions & 2 deletions src/platform/Linux/ConnectivityManagerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ CHIP_ERROR ConnectivityManagerImpl::_Init()
mpConnectCallback = nullptr;
mpScanCallback = nullptr;

if (ConnectivityUtils::GetEthInterfaceName(mEthIfName, IFNAMSIZ) == CHIP_NO_ERROR)
if (ConnectivityUtils::GetEthInterfaceName(mEthIfName, chip::Inet::InterfaceId::kMaxIfNameLength) == CHIP_NO_ERROR)
{
ChipLogProgress(DeviceLayer, "Got Ethernet interface: %s", mEthIfName);
}
Expand All @@ -131,7 +131,7 @@ CHIP_ERROR ConnectivityManagerImpl::_Init()
#endif

#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
if (ConnectivityUtils::GetWiFiInterfaceName(sWiFiIfName, IFNAMSIZ) == CHIP_NO_ERROR)
if (ConnectivityUtils::GetWiFiInterfaceName(sWiFiIfName, chip::Inet::InterfaceId::kMaxIfNameLength) == CHIP_NO_ERROR)
{
ChipLogProgress(DeviceLayer, "Got WiFi interface: %s", sWiFiIfName);
}
Expand Down
4 changes: 2 additions & 2 deletions src/platform/Linux/ConnectivityManagerImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ class ConnectivityManagerImpl final : public ConnectivityManager,

// ===== Private members reserved for use by this class only.

char mEthIfName[IFNAMSIZ];
char mEthIfName[chip::Inet::InterfaceId::kMaxIfNameLength];

#if CHIP_DEVICE_CONFIG_ENABLE_WPA
ConnectivityManager::WiFiStationMode mWiFiStationMode;
Expand All @@ -301,7 +301,7 @@ class ConnectivityManagerImpl final : public ConnectivityManager,
#endif

#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
char sWiFiIfName[IFNAMSIZ];
char sWiFiIfName[chip::Inet::InterfaceId::kMaxIfNameLength];
#endif

#if CHIP_DEVICE_CONFIG_ENABLE_WPA
Expand Down
2 changes: 1 addition & 1 deletion src/platform/Linux/PlatformManagerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ gboolean WiFiIPChangeListener(GIOChannel * ch, GIOCondition /* condition */, voi
{
if (routeInfo->rta_type == IFA_LOCAL)
{
char name[IFNAMSIZ];
char name[chip::Inet::InterfaceId::kMaxIfNameLength];
if (if_indextoname(addressMessage->ifa_index, name) == nullptr)
{
ChipLogError(DeviceLayer, "Error %d when getting the interface name at index: %d", errno,
Expand Down
4 changes: 2 additions & 2 deletions src/platform/NuttX/ConfigurationManagerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,13 @@ CHIP_ERROR ConfigurationManagerImpl::GetPrimaryWiFiMACAddress(uint8_t * buf)
{
if ((addr->ifa_addr) && (addr->ifa_addr->sa_family == AF_PACKET))
{
if (strncmp(addr->ifa_name, CHIP_DEVICE_CONFIG_WIFI_STATION_IF_NAME, IFNAMSIZ) == 0)
if (strncmp(addr->ifa_name, CHIP_DEVICE_CONFIG_WIFI_STATION_IF_NAME, chip::Inet::InterfaceId::kMaxIfNameLength) == 0)
{
mac = (struct sockaddr_ll *) addr->ifa_addr;
break;
}

if (strncmp(addr->ifa_name, "lo", IFNAMSIZ) != 0 && !mac)
if (strncmp(addr->ifa_name, "lo", chip::Inet::InterfaceId::kMaxIfNameLength) != 0 && !mac)
{
mac = (struct sockaddr_ll *) addr->ifa_addr;
}
Expand Down
4 changes: 2 additions & 2 deletions src/platform/NuttX/ConnectivityManagerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ CHIP_ERROR ConnectivityManagerImpl::_Init()
mpConnectCallback = nullptr;
mpScanCallback = nullptr;

if (ConnectivityUtils::GetEthInterfaceName(mEthIfName, IFNAMSIZ) == CHIP_NO_ERROR)
if (ConnectivityUtils::GetEthInterfaceName(mEthIfName, chip::Inet::InterfaceId::kMaxIfNameLength) == CHIP_NO_ERROR)
{
ChipLogProgress(DeviceLayer, "Got Ethernet interface: %s", mEthIfName);
}
Expand All @@ -128,7 +128,7 @@ CHIP_ERROR ConnectivityManagerImpl::_Init()
#endif

#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
if (ConnectivityUtils::GetWiFiInterfaceName(sWiFiIfName, IFNAMSIZ) == CHIP_NO_ERROR)
if (ConnectivityUtils::GetWiFiInterfaceName(sWiFiIfName, chip::Inet::InterfaceId::kMaxIfNameLength) == CHIP_NO_ERROR)
{
ChipLogProgress(DeviceLayer, "Got WiFi interface: %s", sWiFiIfName);
}
Expand Down
4 changes: 2 additions & 2 deletions src/platform/NuttX/ConnectivityManagerImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ class ConnectivityManagerImpl final : public ConnectivityManager,

// ===== Private members reserved for use by this class only.

char mEthIfName[IFNAMSIZ];
char mEthIfName[chip::Inet::InterfaceId::kMaxIfNameLength];

#if CHIP_DEVICE_CONFIG_ENABLE_WPA
ConnectivityManager::WiFiStationMode mWiFiStationMode;
Expand All @@ -260,7 +260,7 @@ class ConnectivityManagerImpl final : public ConnectivityManager,
#endif

#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
char sWiFiIfName[IFNAMSIZ];
char sWiFiIfName[chip::Inet::InterfaceId::kMaxIfNameLength];
#endif

#if CHIP_DEVICE_CONFIG_ENABLE_WPA
Expand Down
2 changes: 1 addition & 1 deletion src/platform/NuttX/PlatformManagerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ gboolean WiFiIPChangeListener(GIOChannel * ch, GIOCondition /* condition */, voi
{
if (routeInfo->rta_type == IFA_LOCAL)
{
char name[IFNAMSIZ];
char name[chip::Inet::InterfaceId::kMaxIfNameLength];
if (if_indextoname(addressMessage->ifa_index, name) == nullptr)
{
ChipLogError(DeviceLayer, "Error %d when getting the interface name at index: %d", errno,
Expand Down
4 changes: 2 additions & 2 deletions src/platform/Tizen/ConnectivityManagerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ CHIP_ERROR ConnectivityManagerImpl::_Init()
{
CHIP_ERROR err = CHIP_NO_ERROR;

if (ConnectivityUtils::GetEthInterfaceName(mEthIfName, IFNAMSIZ) == CHIP_NO_ERROR)
if (ConnectivityUtils::GetEthInterfaceName(mEthIfName, chip::Inet::InterfaceId::kMaxIfNameLength) == CHIP_NO_ERROR)
{
ChipLogProgress(DeviceLayer, "Got Ethernet interface: %s", mEthIfName);
}
Expand All @@ -92,7 +92,7 @@ CHIP_ERROR ConnectivityManagerImpl::_Init()

Internal::WiFiMgr().Init();

if (ConnectivityUtils::GetWiFiInterfaceName(sWiFiIfName, IFNAMSIZ) == CHIP_NO_ERROR)
if (ConnectivityUtils::GetWiFiInterfaceName(sWiFiIfName, chip::Inet::InterfaceId::kMaxIfNameLength) == CHIP_NO_ERROR)
{
ChipLogProgress(DeviceLayer, "Got WiFi interface: %s", sWiFiIfName);
}
Expand Down
4 changes: 2 additions & 2 deletions src/platform/Tizen/ConnectivityManagerImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class ConnectivityManagerImpl final : public ConnectivityManager,

// ===== Private members reserved for use by this class only.

char mEthIfName[IFNAMSIZ];
char mEthIfName[chip::Inet::InterfaceId::kMaxIfNameLength];

#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
ConnectivityManager::WiFiStationMode mWiFiStationMode;
Expand All @@ -143,7 +143,7 @@ class ConnectivityManagerImpl final : public ConnectivityManager,
System::Clock::Timestamp mLastAPDemandTime;
System::Clock::Timeout mWiFiStationReconnectInterval;
System::Clock::Timeout mWiFiAPIdleTimeout;
static char sWiFiIfName[IFNAMSIZ];
static char sWiFiIfName[chip::Inet::InterfaceId::kMaxIfNameLength];
#endif
};

Expand Down
2 changes: 1 addition & 1 deletion src/platform/webos/ConfigurationManagerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ CHIP_ERROR ConfigurationManagerImpl::GetPrimaryWiFiMACAddress(uint8_t * buf)
VerifyOrExit(getifaddrs(&addresses) == 0, error = CHIP_ERROR_INTERNAL);
for (auto addr = addresses; addr != nullptr; addr = addr->ifa_next)
{
if ((addr->ifa_addr) && (addr->ifa_addr->sa_family == AF_PACKET) && strncmp(addr->ifa_name, "lo", IFNAMSIZ) != 0)
if ((addr->ifa_addr) && (addr->ifa_addr->sa_family == AF_PACKET) && strncmp(addr->ifa_name, "lo", chip::Inet::InterfaceId::kMaxIfNameLength) != 0)
{
struct sockaddr_ll * mac = (struct sockaddr_ll *) addr->ifa_addr;
memcpy(buf, mac->sll_addr, mac->sll_halen);
Expand Down
4 changes: 2 additions & 2 deletions src/platform/webos/ConnectivityManagerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ CHIP_ERROR ConnectivityManagerImpl::_Init()
mpConnectCallback = nullptr;
mpScanCallback = nullptr;

if (ConnectivityUtils::GetEthInterfaceName(mEthIfName, IFNAMSIZ) == CHIP_NO_ERROR)
if (ConnectivityUtils::GetEthInterfaceName(mEthIfName, chip::Inet::InterfaceId::kMaxIfNameLength) == CHIP_NO_ERROR)
{
ChipLogProgress(DeviceLayer, "Got Ethernet interface: %s", mEthIfName);
}
Expand All @@ -114,7 +114,7 @@ CHIP_ERROR ConnectivityManagerImpl::_Init()
#endif

#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
if (ConnectivityUtils::GetWiFiInterfaceName(sWiFiIfName, IFNAMSIZ) == CHIP_NO_ERROR)
if (ConnectivityUtils::GetWiFiInterfaceName(sWiFiIfName, chip::Inet::InterfaceId::kMaxIfNameLength) == CHIP_NO_ERROR)
{
ChipLogProgress(DeviceLayer, "Got WiFi interface: %s", sWiFiIfName);
}
Expand Down
4 changes: 2 additions & 2 deletions src/platform/webos/ConnectivityManagerImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ class ConnectivityManagerImpl final : public ConnectivityManager,

// ===== Private members reserved for use by this class only.

char mEthIfName[IFNAMSIZ];
char mEthIfName[chip::Inet::InterfaceId::kMaxIfNameLength];

#if CHIP_DEVICE_CONFIG_ENABLE_WPA
ConnectivityManager::WiFiStationMode mWiFiStationMode;
Expand All @@ -243,7 +243,7 @@ class ConnectivityManagerImpl final : public ConnectivityManager,
#endif

#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
static char sWiFiIfName[IFNAMSIZ];
static char sWiFiIfName[chip::Inet::InterfaceId::kMaxIfNameLength];
#endif

static NetworkCommissioning::WiFiDriver::ScanCallback * mpScanCallback;
Expand Down
2 changes: 1 addition & 1 deletion src/platform/webos/PlatformManagerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ void PlatformManagerImpl::WiFiIPChangeListener()
{
if (routeInfo->rta_type == IFA_LOCAL)
{
char name[IFNAMSIZ];
char name[chip::Inet::InterfaceId::kMaxIfNameLength];
if (if_indextoname(addressMessage->ifa_index, name) == nullptr)
{
ChipLogError(DeviceLayer, "Error %d when getting the interface name at index: %d", errno,
Expand Down
Loading