espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-14 22:57:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[mle] use uint32_t for delay parameter in DelayedSender (#11708)

Browse Source 
This commit changes the `aDelay` parameter type in
`Mle::DelayedSender` methods from `uint16_t` to `uint32_t`.

This update supports specifying message transmission delays longer
than the previous 65-second limit and avoids potential implicit
integer downcasting.
This commit is contained in:
Abtin Keshavarzian
2025-07-14 10:17:40 -07:00
committed by GitHub
parent 296034c25e
commit 8c9dd22d2c
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/mle.cpp
+11 -11
View File
@@ -2682,7 +2682,7 @@ void Mle::HandleAdvertisement(RxInfo &aRxInfo)
Error error = kErrorNone;
uint16_t sourceAddress;
LeaderData leaderData;
uint16_t delay;
uint32_t delay;
VerifyOrExit(IsAttached());
@@ -2909,7 +2909,7 @@ exit:
if (dataRequest)
{
uint16_t delay;
uint32_t delay;
if (aRxInfo.mMessageInfo.GetSockAddr().IsMulticast())
{
@@ -4346,7 +4346,7 @@ void Mle::DelayedSender::Stop(void)
mSchedules.DequeueAndFreeAll();
}
void Mle::DelayedSender::ScheduleDataRequest(const Ip6::Address &aDestination, uint16_t aDelay)
void Mle::DelayedSender::ScheduleDataRequest(const Ip6::Address &aDestination, uint32_t aDelay)
{
VerifyOrExit(!HasMatchingSchedule(kTypeDataRequest, aDestination));
AddSchedule(kTypeDataRequest, aDestination, aDelay, nullptr, 0);
@@ -4355,7 +4355,7 @@ exit:
return;
}
void Mle::DelayedSender::ScheduleChildUpdateRequestToParent(uint16_t aDelay)
void Mle::DelayedSender::ScheduleChildUpdateRequestToParent(uint32_t aDelay)
{
Ip6::Address destination;
@@ -4377,7 +4377,7 @@ void Mle::DelayedSender::RemoveScheduledChildUpdateRequestToParent(void)
#if OPENTHREAD_FTD
void Mle::DelayedSender::ScheduleParentResponse(const ParentResponseInfo &aInfo, uint16_t aDelay)
void Mle::DelayedSender::ScheduleParentResponse(const ParentResponseInfo &aInfo, uint32_t aDelay)
{
Ip6::Address destination;
@@ -4387,7 +4387,7 @@ void Mle::DelayedSender::ScheduleParentResponse(const ParentResponseInfo &aInfo,
AddSchedule(kTypeParentResponse, destination, aDelay, &aInfo, sizeof(aInfo));
}
void Mle::DelayedSender::ScheduleAdvertisement(const Ip6::Address &aDestination, uint16_t aDelay)
void Mle::DelayedSender::ScheduleAdvertisement(const Ip6::Address &aDestination, uint32_t aDelay)
{
VerifyOrExit(!HasMatchingSchedule(kTypeAdvertisement, aDestination));
AddSchedule(kTypeAdvertisement, aDestination, aDelay, nullptr, 0);
@@ -4396,7 +4396,7 @@ exit:
return;
}
void Mle::DelayedSender::ScheduleMulticastDataResponse(uint16_t aDelay)
void Mle::DelayedSender::ScheduleMulticastDataResponse(uint32_t aDelay)
{
Ip6::Address destination;
@@ -4407,7 +4407,7 @@ void Mle::DelayedSender::ScheduleMulticastDataResponse(uint16_t aDelay)
AddSchedule(kTypeDataResponse, destination, aDelay, nullptr, 0);
}
void Mle::DelayedSender::ScheduleLinkRequest(const Router &aRouter, uint16_t aDelay)
void Mle::DelayedSender::ScheduleLinkRequest(const Router &aRouter, uint32_t aDelay)
{
Ip6::Address destination;
uint16_t routerRloc16;
@@ -4439,7 +4439,7 @@ bool Mle::DelayedSender::HasAnyScheduledLinkRequest(const Router &aRouter) const
return HasMatchingSchedule(kTypeLinkRequest, destination);
}
void Mle::DelayedSender::ScheduleLinkAccept(const LinkAcceptInfo &aInfo, uint16_t aDelay)
void Mle::DelayedSender::ScheduleLinkAccept(const LinkAcceptInfo &aInfo, uint32_t aDelay)
{
Ip6::Address destination;
@@ -4451,7 +4451,7 @@ void Mle::DelayedSender::ScheduleLinkAccept(const LinkAcceptInfo &aInfo, uint16_
void Mle::DelayedSender::ScheduleDiscoveryResponse(const Ip6::Address &aDestination,
const DiscoveryResponseInfo &aInfo,
uint16_t aDelay)
uint32_t aDelay)
{
AddSchedule(kTypeDiscoveryResponse, aDestination, aDelay, &aInfo, sizeof(aInfo));
}
@@ -4460,7 +4460,7 @@ void Mle::DelayedSender::ScheduleDiscoveryResponse(const Ip6::Address &
void Mle::DelayedSender::AddSchedule(MessageType aMessageType,
const Ip6::Address &aDestination,
uint16_t aDelay,
uint32_t aDelay,
const void *aInfo,
uint16_t aInfoSize)
{
src/core/thread/mle.hpp
+9 -9
View File
@@ -1619,19 +1619,19 @@ private:
void Stop(void);
void ScheduleDataRequest(const Ip6::Address &aDestination, uint16_t aDelay);
void ScheduleChildUpdateRequestToParent(uint16_t aDelay);
void ScheduleDataRequest(const Ip6::Address &aDestination, uint32_t aDelay);
void ScheduleChildUpdateRequestToParent(uint32_t aDelay);
#if OPENTHREAD_FTD
void ScheduleParentResponse(const ParentResponseInfo &aInfo, uint16_t aDelay);
void ScheduleAdvertisement(const Ip6::Address &aDestination, uint16_t aDelay);
void ScheduleMulticastDataResponse(uint16_t aDelay);
void ScheduleLinkRequest(const Router &aRouter, uint16_t aDelay);
void ScheduleParentResponse(const ParentResponseInfo &aInfo, uint32_t aDelay);
void ScheduleAdvertisement(const Ip6::Address &aDestination, uint32_t aDelay);
void ScheduleMulticastDataResponse(uint32_t aDelay);
void ScheduleLinkRequest(const Router &aRouter, uint32_t aDelay);
void RemoveScheduledLinkRequest(const Router &aRouter);
bool HasAnyScheduledLinkRequest(const Router &aRouter) const;
void ScheduleLinkAccept(const LinkAcceptInfo &aInfo, uint16_t aDelay);
void ScheduleLinkAccept(const LinkAcceptInfo &aInfo, uint32_t aDelay);
void ScheduleDiscoveryResponse(const Ip6::Address &aDestination,
const DiscoveryResponseInfo &aInfo,
uint16_t aDelay);
uint32_t aDelay);
#endif
void RemoveScheduledChildUpdateRequestToParent(void);
@@ -1652,7 +1652,7 @@ private:
void AddSchedule(MessageType aMessageType,
const Ip6::Address &aDestination,
uint16_t aDelay,
uint32_t aDelay,
const void *aInfo,
uint16_t aInfoSize);
void Execute(const Schedule &aSchedule);
src/core/thread/mle_ftd.cpp
+2 -2
View File
@@ -1396,7 +1396,7 @@ void Mle::HandleParentRequest(RxInfo &aRxInfo)
uint8_t scanMask;
Child *child;
DeviceMode mode;
uint16_t delay;
uint32_t delay;
ParentResponseInfo info;
Log(kMessageReceive, kTypeParentRequest, aRxInfo.mMessageInfo.GetPeerAddr());
@@ -2627,7 +2627,7 @@ exit:
void Mle::HandleNetworkDataUpdateRouter(void)
{
uint16_t delay;
uint32_t delay;
VerifyOrExit(IsRouterOrLeader());