espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-04 01:47:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[core] fix implicit integer conversion warnings (#11709)

Browse Source 
This commit enables the `-Wimplicit-int-conversion` compiler flag for
`ftd`, `mtd`, and `radio` to improve code quality by detecting
potential data loss from implicit type conversions. This is enabled
when clang toolchain is used.

All resulting warnings have been addressed by either:
- Changing variable, parameter, or return types to ensure consistency
  and prevent overflows.
- Adding explicit `static_cast` where the type conversion is intended
  and safe.
This commit is contained in:
Abtin Keshavarzian
2025-07-14 13:06:27 -07:00
committed by GitHub
parent 02e73a0586
commit 26f23ad635
22 changed files with 51 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/border_router/dhcp6_pd_client.cpp
+1 -1
View File
@@ -696,7 +696,7 @@ void Dhcp6PdClient::SaveServerDuidAndAddress(const Message &aMessage)
Ip6::Address serverAddress;
SuccessOrAssert(ServerIdOption::ReadDuid(aMessage, serverDuidOffsetRange));
mServerDuid.SetLength(serverDuidOffsetRange.GetLength());
mServerDuid.SetLength(static_cast<uint8_t>(serverDuidOffsetRange.GetLength()));
aMessage.ReadBytes(serverDuidOffsetRange, mServerDuid.GetArrayBuffer());
ProcessServerUnicastOption(aMessage, serverAddress);
src/core/border_router/routing_manager.cpp
+2 -2
View File
@@ -1078,7 +1078,7 @@ void RoutingManager::RoutePrefix::CopyInfoTo(PrefixTableEntry &aEntry, TimeMilli
//---------------------------------------------------------------------------------------------------------------------
// RdnssAddress
void RoutingManager::RdnssAddress::SetFrom(const RecursiveDnsServerOption &aRdnss, uint8_t aAddressIndex)
void RoutingManager::RdnssAddress::SetFrom(const RecursiveDnsServerOption &aRdnss, uint16_t aAddressIndex)
{
mAddress = aRdnss.GetAddressAt(aAddressIndex);
mLifetime = aRdnss.GetLifetime();
@@ -1564,7 +1564,7 @@ void RoutingManager::RxRaTracker::ProcessRecursiveDnsServerOption(const Recursiv
lifetime = aRdnss.GetLifetime();
for (uint8_t index = 0; index < aRdnss.GetNumAddresses(); index++)
for (uint16_t index = 0; index < aRdnss.GetNumAddresses(); index++)
{
const Ip6::Address &address = aRdnss.GetAddressAt(index);
src/core/border_router/routing_manager.hpp
+1 -1
View File
@@ -893,7 +893,7 @@ private:
class RdnssAddress
{
public:
void SetFrom(const RecursiveDnsServerOption &aRdnss, uint8_t aAddressIndex);
void SetFrom(const RecursiveDnsServerOption &aRdnss, uint16_t aAddressIndex);
const Ip6::Address &GetAddress(void) const { return mAddress; }
const TimeMilli &GetLastUpdateTime(void) const { return mLastUpdateTime; }
uint32_t GetLifetime(void) const { return mLifetime; }
src/core/common/num_utils.hpp
+1 -1
View File
@@ -272,7 +272,7 @@ template <typename UintType> void SetBit(UintType &aBits, uint8_t aBitOffset)
{
static_assert(TypeTraits::IsUint<UintType>::kValue, "UintType must be an unsigned int (8, 16, 32, or 64 bit len)");
aBits = aBits | (static_cast<UintType>(1) << aBitOffset);
aBits = aBits | static_cast<UintType>(static_cast<UintType>(1) << aBitOffset);
}
/**
src/core/diags/factory_diags.cpp
+6 -6
View File
@@ -394,7 +394,7 @@ Error Diags::ProcessRepeat(uint8_t aArgsLength, char *aArgs[])
else
{
uint32_t txPeriod;
uint8_t txLength;
uint16_t txLength;
VerifyOrExit(aArgsLength >= 1, error = kErrorInvalidArgs);
VerifyOrExit(mCurTxCmd == kTxCmdNone, error = kErrorInvalidState);
@@ -404,7 +404,7 @@ Error Diags::ProcessRepeat(uint8_t aArgsLength, char *aArgs[])
if (aArgsLength >= 2)
{
SuccessOrExit(error = Utils::CmdLineParser::ParseAsUint8(aArgs[1], txLength));
SuccessOrExit(error = Utils::CmdLineParser::ParseAsUint16(aArgs[1], txLength));
mIsTxPacketSet = false;
}
else if (mIsTxPacketSet)
@@ -431,7 +431,7 @@ Error Diags::ProcessSend(uint8_t aArgsLength, char *aArgs[])
{
Error error = kErrorNone;
uint32_t txPackets;
uint8_t txLength;
uint16_t txLength;
VerifyOrExit(aArgsLength >= 1, error = kErrorInvalidArgs);
VerifyOrExit(mCurTxCmd == kTxCmdNone, error = kErrorInvalidState);
@@ -453,7 +453,7 @@ Error Diags::ProcessSend(uint8_t aArgsLength, char *aArgs[])
if (aArgsLength >= 2)
{
SuccessOrExit(error = Utils::CmdLineParser::ParseAsUint8(aArgs[1], txLength));
SuccessOrExit(error = Utils::CmdLineParser::ParseAsUint16(aArgs[1], txLength));
mIsTxPacketSet = false;
}
else if (mIsTxPacketSet)
@@ -612,9 +612,9 @@ Error Diags::TransmitPacket(void)
ResetTxPacket();
mTxPacket->mLength = mTxLen;
for (uint8_t i = 0; i < mTxLen; i++)
for (uint16_t i = 0; i < mTxLen; i++)
{
mTxPacket->mPsdu[i] = i;
mTxPacket->mPsdu[i] = static_cast<uint8_t>(i & 0xff);
}
}
src/core/diags/factory_diags.hpp
+1 -1
View File
@@ -264,7 +264,7 @@ private:
uint32_t mTxPackets;
uint8_t mChannel;
int8_t mTxPower;
uint8_t mTxLen;
uint16_t mTxLen;
TxCmd mCurTxCmd;
bool mIsHeaderUpdated : 1;
bool mIsSecurityProcessed : 1;
src/core/ftd.cmake
+4
View File
@@ -39,6 +39,10 @@ target_compile_options(openthread-ftd PRIVATE
-Wundef
)
if("${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang")
target_compile_options(openthread-ftd PRIVATE -Wimplicit-int-conversion)
endif()
target_include_directories(openthread-ftd PUBLIC ${OT_PUBLIC_INCLUDES} PRIVATE ${COMMON_INCLUDES})
target_sources(openthread-ftd PRIVATE ${COMMON_SOURCES})
src/core/meshcop/meshcop_tlvs.hpp
+4 -1
View File
@@ -851,7 +851,10 @@ public:
*
* @returns The Revision value.
*/
uint8_t GetRevision(void) const { return ReadBitsBigEndian<uint16_t, kRevMask>(mBuildRevision); }
uint8_t GetRevision(void) const
{
return static_cast<uint8_t>(ReadBitsBigEndian<uint16_t, kRevMask>(mBuildRevision));
}
/**
* Sets the Revision value.
src/core/mtd.cmake
+4
View File
@@ -39,6 +39,10 @@ target_compile_options(openthread-mtd PRIVATE
-Wundef
)
if("${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang")
target_compile_options(openthread-mtd PRIVATE -Wimplicit-int-conversion)
endif()
target_include_directories(openthread-mtd PUBLIC ${OT_PUBLIC_INCLUDES} PRIVATE ${COMMON_INCLUDES})
target_sources(openthread-mtd PRIVATE ${COMMON_SOURCES})
src/core/net/dhcp6_types.hpp
+3 -3
View File
@@ -725,14 +725,14 @@ public:
*
* @returns The preference value. Higher value is preferred.
*/
uint16_t GetPreference(void) const { return mPreference; }
uint8_t GetPreference(void) const { return mPreference; }
/**
* Sets the preference.
*
* @param[in] aPreference The preference value.
*/
void SetPreference(uint16_t aPreference) { mPreference = aPreference; }
void SetPreference(uint8_t aPreference) { mPreference = aPreference; }
private:
uint8_t mPreference;
@@ -1069,7 +1069,7 @@ public:
*
* @returns The SOL_MAX_RT value (in seconds).
*/
uint16_t GetSolMaxRt(void) const { return BigEndian::HostSwap32(mSolMaxRt); }
uint32_t GetSolMaxRt(void) const { return BigEndian::HostSwap32(mSolMaxRt); }
/**
* Sets the SOL_MAX_RT.
src/core/net/dns_client.cpp
+1 -1
View File
@@ -1271,7 +1271,7 @@ uint16_t Client::DetermineQuestionRecordType(const QueryInfo &aInfo) const
// Determine the first record type to include in Question
// section based on the `mQueryType`.
uint8_t recordType = 0;
uint16_t recordType = 0;
switch (aInfo.mQueryType)
{
src/core/net/dns_types.cpp
+2 -2
View File
@@ -1390,7 +1390,7 @@ exit:
return error;
}
Error TxtDataEncoder::AppendBytesEntry(const char *aKey, const void *aBuffer, uint16_t aLength)
Error TxtDataEncoder::AppendBytesEntry(const char *aKey, const void *aBuffer, uint8_t aLength)
{
return TxtEntry(aKey, reinterpret_cast<const uint8_t *>(aBuffer), aLength).AppendTo(mAppender);
}
@@ -1402,7 +1402,7 @@ Error TxtDataEncoder::AppendStringEntry(const char *aKey, const char *aStringVal
VerifyOrExit(length <= kMaxStringEntryLength, error = kErrorInvalidArgs);
error = AppendBytesEntry(aKey, aStringValue, length);
error = AppendBytesEntry(aKey, aStringValue, static_cast<uint8_t>(length));
exit:
return error;
src/core/net/dns_types.hpp
+1 -1
View File
@@ -1304,7 +1304,7 @@ public:
* @retval kErrorNone Successfully appended the TXT entry.
* @retval kErrorNoBufs Insufficient available buffers to append the entry.
*/
Error AppendBytesEntry(const char *aKey, const void *aBuffer, uint16_t aLength);
Error AppendBytesEntry(const char *aKey, const void *aBuffer, uint8_t aLength);
/**
* Appends a TXT entry for a given key and a given object as the entry's value.
src/core/net/ip4_types.hpp
+1 -1
View File
@@ -705,7 +705,7 @@ public:
*
* @returns The IPv4 header Total length value.
*/
uint8_t GetIpLength(void) const { return mIp4Header.GetTotalLength(); }
uint16_t GetIpLength(void) const { return mIp4Header.GetTotalLength(); }
/**
* Returns the IPv4 TTL value.
src/core/net/ip6.hpp
+1 -1
View File
@@ -487,7 +487,7 @@ public:
*
* @returns The IPv6 Payload Length value.
*/
uint8_t GetIpLength(void) const { return mIp6Header.GetPayloadLength(); }
uint16_t GetIpLength(void) const { return mIp6Header.GetPayloadLength(); }
/**
* Returns the IPv6 Hop Limit value.
src/core/net/mdns.cpp
+1 -1
View File
@@ -4140,7 +4140,7 @@ Core::RxMessage::ProcessOutcome Core::RxMessage::ProcessQuery(bool aShouldProces
if (shouldDelay)
{
delay = Random::NonCrypto::GetUint32InRange(kMinResponseDelay, kMaxResponseDelay);
delay = Random::NonCrypto::GetUint16InRange(kMinResponseDelay, kMaxResponseDelay);
}
for (const Question &question : mQuestions)
src/core/net/mdns.hpp
+5 -5
View File
@@ -865,8 +865,8 @@ private:
static constexpr uint32_t kMaxInitialQueryDelay = 120; // msec
static constexpr uint32_t kRandomDelayReuseInterval = 2; // msec
static constexpr uint32_t kMinResponseDelay = 20; // msec
static constexpr uint32_t kMaxResponseDelay = 120; // msec
static constexpr uint16_t kMinResponseDelay = 20; // msec
static constexpr uint16_t kMaxResponseDelay = 120; // msec
static constexpr uint32_t kResponseAggregationMaxDelay = 500; // msec
static constexpr uint32_t kUnspecifiedTtl = 0;
@@ -980,7 +980,7 @@ private:
TimeMilli GetAnswerTime(void) const { return (mQueryRxTime + mAnswerDelay); }
uint16_t mQuestionRrType;
uint16_t mAnswerDelay;
uint32_t mAnswerDelay;
TimeMilli mQueryRxTime;
bool mIsProbe;
bool mUnicastResponse;
@@ -1085,7 +1085,7 @@ private:
uint8_t mAnnounceCounter;
AppendState mAppendState;
Section mAppendSection;
uint16_t mAnswerDelay;
uint32_t mAnswerDelay;
uint32_t mTtl;
TimeMilli mAnnounceTime;
TimeMilli mQueryRxTime;
@@ -1179,7 +1179,7 @@ private:
bool mUnicastNsecPending : 1;
bool mAppendedNsec : 1;
bool mBypassCallbackStateCheck : 1;
uint16_t mNsecAnswerDelay;
uint32_t mNsecAnswerDelay;
TimeMilli mNsecQueryRxTime;
Heap::Data mKeyData;
Callback mCallback;
src/core/net/nd6.hpp
+2 -2
View File
@@ -534,7 +534,7 @@ public:
*
* @returns Number of IPv6 addresses.
*/
uint8_t GetNumAddresses(void) const { return IsValid() ? (GetLength() - 1) / 2 : 0; }
uint16_t GetNumAddresses(void) const { return IsValid() ? (GetLength() - 1) / 2 : 0; }
/**
* Returns a pointer to array of IPv6 addresses of DNS server.
@@ -563,7 +563,7 @@ public:
*
* @returns The IPv6 address at @p aIndex.
*/
const Address &GetAddressAt(uint8_t aIndex) const { return GetAddresses()[aIndex]; }
const Address &GetAddressAt(uint16_t aIndex) const { return GetAddresses()[aIndex]; }
/**
* Calculates the option length for a given number of IPv6 addresses.
src/core/radio.cmake
+4
View File
@@ -40,6 +40,10 @@ target_compile_options(openthread-radio PRIVATE
-Wundef
)
if("${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang")
target_compile_options(openthread-radio PRIVATE -Wimplicit-int-conversion)
endif()
target_include_directories(openthread-radio PUBLIC ${OT_PUBLIC_INCLUDES} PRIVATE ${COMMON_INCLUDES})
target_sources(openthread-radio PRIVATE
src/core/radio/trel_interface.cpp
+1 -1
View File
@@ -123,7 +123,7 @@ Error Interface::Send(Packet &aPacket, bool aIsDiscovery)
case Header::kTypeBroadcast:
for (const Peer &peer : Get<PeerTable>())
{
uint16_t originalPacketNumber = aPacket.GetHeader().GetPacketNumber();
uint32_t originalPacketNumber = aPacket.GetHeader().GetPacketNumber();
Header::AckMode originalAckMode = aPacket.GetHeader().GetAckMode();
Neighbor *neighbor;
src/core/thread/network_diagnostic_tlvs.hpp
+4 -1
View File
@@ -495,7 +495,10 @@ public:
*
* @returns The Timeout value.
*/
uint8_t GetTimeout(void) const { return ReadBits<uint16_t, kTimeoutMask>(GetTimeoutChildId()); }
uint8_t GetTimeout(void) const
{
return static_cast<uint8_t>(ReadBits<uint16_t, kTimeoutMask>(GetTimeoutChildId()));
}
/**
* Sets the Timeout value.
tests/unit/test_routing_manager.cpp
+1 -1
View File
@@ -619,7 +619,7 @@ void LogRouterAdvert(const Icmp6Packet &aPacket)
VerifyOrQuit(rdnss.IsValid());
for (uint8_t index = 0; index < rdnss.GetNumAddresses(); index++)
for (uint16_t index = 0; index < rdnss.GetNumAddresses(); index++)
{
Log(" RDNSS - %s, lifetime:%u", rdnss.GetAddressAt(index).ToString().AsCString(),
rdnss.GetLifetime());