espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-10-03 14:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up state changed names. (#1887)

Browse Source
This commit is contained in:
Jonathan Hui
2017-06-08 08:50:00 -07:00
committed by GitHub
parent 6456cc3e13
commit 2304e4d5ac
16 changed files with 109 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/apps/windows/otAdapter.h
+12 -12
View File
@@ -519,62 +519,62 @@ private:
IInspectable* pInspectable = (IInspectable*)aContext; IInspectable* pInspectable = (IInspectable*)aContext;
otAdapter^ pThis = reinterpret_cast<otAdapter^>(pInspectable); otAdapter^ pThis = reinterpret_cast<otAdapter^>(pInspectable);
if (aFlags & OT_IP6_ADDRESS_ADDED) if (aFlags & OT_CHANGED_IP6_ADDRESS_ADDED)
{ {
pThis->IpAddressAdded(pThis); pThis->IpAddressAdded(pThis);
} }
if (aFlags & OT_IP6_ADDRESS_REMOVED) if (aFlags & OT_CHANGED_IP6_ADDRESS_REMOVED)
{ {
pThis->IpAddressRemoved(pThis); pThis->IpAddressRemoved(pThis);
} }
if (aFlags & OT_IP6_RLOC_ADDED) if (aFlags & OT_CHANGED_THREAD_RLOC_ADDED)
{ {
pThis->IpRlocAdded(pThis); pThis->IpRlocAdded(pThis);
} }
if (aFlags & OT_IP6_RLOC_REMOVED) if (aFlags & OT_CHANGED_THREAD_RLOC_REMOVED)
{ {
pThis->IpRlocRemoved(pThis); pThis->IpRlocRemoved(pThis);
} }
if (aFlags & OT_IP6_LL_ADDR_CHANGED) if (aFlags & OT_CHANGED_THREAD_LL_ADDR)
{ {
pThis->IpLinkLocalAddresChanged(pThis); pThis->IpLinkLocalAddresChanged(pThis);
} }
if (aFlags & OT_IP6_ML_ADDR_CHANGED) if (aFlags & OT_CHANGED_THREAD_ML_ADDR)
{ {
pThis->IpMeshLocalAddresChanged(pThis); pThis->IpMeshLocalAddresChanged(pThis);
} }
if (aFlags & OT_NET_ROLE) if (aFlags & OT_CHANGED_THREAD_ROLE)
{ {
pThis->NetRoleChanged(pThis); pThis->NetRoleChanged(pThis);
} }
if (aFlags & OT_NET_PARTITION_ID) if (aFlags & OT_CHANGED_THREAD_PARTITION_ID)
{ {
pThis->NetPartitionIdChanged(pThis); pThis->NetPartitionIdChanged(pThis);
} }
if (aFlags & OT_NET_KEY_SEQUENCE_COUNTER) if (aFlags & OT_CHANGED_THREAD_KEY_SEQUENCE_COUNTER)
{ {
pThis->NetKeySequenceCounterChanged(pThis); pThis->NetKeySequenceCounterChanged(pThis);
} }
if (aFlags & OT_THREAD_CHILD_ADDED) if (aFlags & OT_CHANGED_THREAD_CHILD_ADDED)
{ {
pThis->ThreadChildAdded(pThis); pThis->ThreadChildAdded(pThis);
} }
if (aFlags & OT_THREAD_CHILD_REMOVED) if (aFlags & OT_CHANGED_THREAD_CHILD_REMOVED)
{ {
pThis->ThreadChildRemoved(pThis); pThis->ThreadChildRemoved(pThis);
} }
if (aFlags & OT_THREAD_NETDATA_UPDATED) if (aFlags & OT_CHANGED_THREAD_NETDATA)
{ {
pThis->ThreadNetDataUpdated(pThis); pThis->ThreadNetDataUpdated(pThis);
} }
examples/drivers/windows/otLwf/address.c
+2 -2
View File
@@ -479,7 +479,7 @@ otLwfTunAddressesUpdated(
{ {
memcpy_s(&addr.mAddress, sizeof(addr.mAddress), pAddr, sizeof(IN6_ADDR)); memcpy_s(&addr.mAddress, sizeof(addr.mAddress), pAddr, sizeof(IN6_ADDR));
otLwfOnAddressAdded(pFilter, &addr, TRUE); otLwfOnAddressAdded(pFilter, &addr, TRUE);
*aNotifFlags |= OT_IP6_ADDRESS_ADDED; *aNotifFlags |= OT_CHANGED_IP6_ADDRESS_ADDED;
} }
else else
{ {
@@ -499,7 +499,7 @@ otLwfTunAddressesUpdated(
if ((FoundInOpenThread & (1 << i)) == 0) if ((FoundInOpenThread & (1 << i)) == 0)
{ {
otLwfOnAddressRemoved(pFilter, (ULONG)i, TRUE); otLwfOnAddressRemoved(pFilter, (ULONG)i, TRUE);
*aNotifFlags |= OT_IP6_ADDRESS_REMOVED; *aNotifFlags |= OT_CHANGED_IP6_ADDRESS_REMOVED;
} }
} }
examples/drivers/windows/otLwf/thread.c
+22 -22
View File
@@ -489,59 +489,59 @@ void otLwfStateChangedCallback(uint32_t aFlags, _In_ void *aContext)
// Process the notification internally // Process the notification internally
// //
if ((aFlags & OT_IP6_ADDRESS_ADDED) != 0) if ((aFlags & OT_CHANGED_IP6_ADDRESS_ADDED) != 0)
{ {
LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_IP6_ADDRESS_ADDED", pFilter); LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_CHANGED_IP6_ADDRESS_ADDED", pFilter);
otLwfRadioAddressesUpdated(pFilter); otLwfRadioAddressesUpdated(pFilter);
} }
if ((aFlags & OT_IP6_ADDRESS_REMOVED) != 0) if ((aFlags & OT_CHANGED_IP6_ADDRESS_REMOVED) != 0)
{ {
LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_IP6_ADDRESS_REMOVED", pFilter); LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_CHANGED_IP6_ADDRESS_REMOVED", pFilter);
otLwfRadioAddressesUpdated(pFilter); otLwfRadioAddressesUpdated(pFilter);
} }
if ((aFlags & OT_IP6_RLOC_ADDED) != 0) if ((aFlags & OT_CHANGED_THREAD_RLOC_ADDED) != 0)
{ {
LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_IP6_RLOC_ADDED", pFilter); LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_CHANGED_THREAD_RLOC_ADDED", pFilter);
otLwfRadioAddressesUpdated(pFilter); otLwfRadioAddressesUpdated(pFilter);
} }
if ((aFlags & OT_IP6_RLOC_REMOVED) != 0) if ((aFlags & OT_CHANGED_THREAD_RLOC_REMOVED) != 0)
{ {
LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_IP6_RLOC_REMOVED", pFilter); LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_CHANGED_THREAD_RLOC_REMOVED", pFilter);
otLwfRadioAddressesUpdated(pFilter); otLwfRadioAddressesUpdated(pFilter);
} }
if ((aFlags & OT_NET_ROLE) != 0) if ((aFlags & OT_CHANGED_THREAD_ROLE) != 0)
{ {
LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_NET_ROLE", pFilter); LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_CHANGED_THREAD_ROLE", pFilter);
otLwfProcessRoleStateChange(pFilter); otLwfProcessRoleStateChange(pFilter);
} }
if ((aFlags & OT_NET_PARTITION_ID) != 0) if ((aFlags & OT_CHANGED_THREAD_PARTITION_ID) != 0)
{ {
LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_NET_PARTITION_ID", pFilter); LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_CHANGED_THREAD_PARTITION_ID", pFilter);
} }
if ((aFlags & OT_NET_KEY_SEQUENCE_COUNTER) != 0) if ((aFlags & OT_CHANGED_THREAD_KEY_SEQUENCE_COUNTER) != 0)
{ {
LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_NET_KEY_SEQUENCE_COUNTER", pFilter); LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_CHANGED_THREAD_KEY_SEQUENCE_COUNTER", pFilter);
} }
if ((aFlags & OT_THREAD_CHILD_ADDED) != 0) if ((aFlags & OT_CHANGED_THREAD_CHILD_ADDED) != 0)
{ {
LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_THREAD_CHILD_ADDED", pFilter); LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_CHANGED_THREAD_CHILD_ADDED", pFilter);
} }
if ((aFlags & OT_THREAD_CHILD_REMOVED) != 0) if ((aFlags & OT_CHANGED_THREAD_CHILD_REMOVED) != 0)
{ {
LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_THREAD_CHILD_REMOVED", pFilter); LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_CHANGED_THREAD_CHILD_REMOVED", pFilter);
} }
if ((aFlags & OT_THREAD_NETDATA_UPDATED) != 0) if ((aFlags & OT_CHANGED_THREAD_NETDATA) != 0)
{ {
LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_THREAD_NETDATA_UPDATED", pFilter); LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_CHANGED_THREAD_NETDATA", pFilter);
otIp6SlaacUpdate(pFilter->otCtx, pFilter->otAutoAddresses, ARRAYSIZE(pFilter->otAutoAddresses), otIp6CreateRandomIid, NULL); otIp6SlaacUpdate(pFilter->otCtx, pFilter->otAutoAddresses, ARRAYSIZE(pFilter->otAutoAddresses), otIp6CreateRandomIid, NULL);
#if OPENTHREAD_ENABLE_DHCP6_SERVER #if OPENTHREAD_ENABLE_DHCP6_SERVER
@@ -553,9 +553,9 @@ void otLwfStateChangedCallback(uint32_t aFlags, _In_ void *aContext)
#endif // OPENTHREAD_ENABLE_DHCP6_CLIENT #endif // OPENTHREAD_ENABLE_DHCP6_CLIENT
} }
if ((aFlags & OT_IP6_ML_ADDR_CHANGED) != 0) if ((aFlags & OT_CHANGED_THREAD_ML_ADDR) != 0)
{ {
LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_IP6_ML_ADDR_CHANGED", pFilter); LogVerbose(DRIVER_DEFAULT, "Filter %p received OT_CHANGED_THREAD_ML_ADDR", pFilter);
} }
// //
examples/drivers/windows/otLwf/tunnel.c
+6 -6
View File
@@ -450,27 +450,27 @@ otLwfTunValueIs(
MediaConnectStateDisconnected); MediaConnectStateDisconnected);
// Set flag to indicate we should send a notification // Set flag to indicate we should send a notification
aNotifFlags = OT_NET_ROLE; aNotifFlags = OT_CHANGED_THREAD_ROLE;
} }
else if (key == SPINEL_PROP_IPV6_LL_ADDR) else if (key == SPINEL_PROP_IPV6_LL_ADDR)
{ {
// Set flag to indicate we should send a notification // Set flag to indicate we should send a notification
aNotifFlags = OT_IP6_LL_ADDR_CHANGED; aNotifFlags = OT_CHANGED_THREAD_LL_ADDR;
} }
else if (key == SPINEL_PROP_IPV6_ML_ADDR) else if (key == SPINEL_PROP_IPV6_ML_ADDR)
{ {
// Set flag to indicate we should send a notification // Set flag to indicate we should send a notification
aNotifFlags = OT_IP6_ML_ADDR_CHANGED; aNotifFlags = OT_CHANGED_THREAD_ML_ADDR;
} }
else if (key == SPINEL_PROP_NET_PARTITION_ID) else if (key == SPINEL_PROP_NET_PARTITION_ID)
{ {
// Set flag to indicate we should send a notification // Set flag to indicate we should send a notification
aNotifFlags = OT_NET_PARTITION_ID; aNotifFlags = OT_CHANGED_THREAD_PARTITION_ID;
} }
else if (key == SPINEL_PROP_NET_KEY_SEQUENCE_COUNTER) else if (key == SPINEL_PROP_NET_KEY_SEQUENCE_COUNTER)
{ {
// Set flag to indicate we should send a notification // Set flag to indicate we should send a notification
aNotifFlags = OT_NET_KEY_SEQUENCE_COUNTER; aNotifFlags = OT_CHANGED_THREAD_KEY_SEQUENCE_COUNTER;
} }
else if (key == SPINEL_PROP_IPV6_ADDRESS_TABLE) else if (key == SPINEL_PROP_IPV6_ADDRESS_TABLE)
{ {
@@ -486,7 +486,7 @@ otLwfTunValueIs(
// TODO - Slaac // TODO - Slaac
// Set flag to indicate we should send a notification // Set flag to indicate we should send a notification
aNotifFlags = OT_THREAD_NETDATA_UPDATED; aNotifFlags = OT_CHANGED_THREAD_NETDATA;
} }
else if ((key == SPINEL_PROP_STREAM_NET) || (key == SPINEL_PROP_STREAM_NET_INSECURE)) else if ((key == SPINEL_PROP_STREAM_NET) || (key == SPINEL_PROP_STREAM_NET_INSECURE))
{ {
examples/drivers/windows/otNodeApi/otNodeApi.cpp
+3 -3
View File
@@ -707,14 +707,14 @@ void OTCALL otNodeStateChangedCallback(uint32_t aFlags, void *aContext)
otLogFuncEntry(); otLogFuncEntry();
otNode* aNode = (otNode*)aContext; otNode* aNode = (otNode*)aContext;
if ((aFlags & OT_NET_ROLE) != 0) if ((aFlags & OT_CHANGED_THREAD_ROLE) != 0)
{ {
auto Role = otThreadGetDeviceRole(aNode->mInstance); auto Role = otThreadGetDeviceRole(aNode->mInstance);
printf("%d: new role: %s\r\n", aNode->mId, otDeviceRoleToString(Role)); printf("%d: new role: %s\r\n", aNode->mId, otDeviceRoleToString(Role));
} }
if ((aFlags & OT_IP6_ADDRESS_ADDED) != 0 || (aFlags & OT_IP6_ADDRESS_REMOVED) != 0 || if ((aFlags & OT_CHANGED_IP6_ADDRESS_ADDED) != 0 || (aFlags & OT_CHANGED_IP6_ADDRESS_REMOVED) != 0 ||
(aFlags & OT_IP6_RLOC_ADDED) != 0 || (aFlags & OT_IP6_RLOC_REMOVED) != 0) (aFlags & OT_CHANGED_THREAD_RLOC_ADDED) != 0 || (aFlags & OT_CHANGED_THREAD_RLOC_REMOVED) != 0)
{ {
HandleAddressChanges(aNode); HandleAddressChanges(aNode);
} }
include/openthread/types.h
+12 -16
View File
@@ -637,22 +637,18 @@ typedef struct otLinkModeConfig
*/ */
enum enum
{ {
OT_IP6_ADDRESS_ADDED = 1 << 0, ///< IPv6 address was added OT_CHANGED_IP6_ADDRESS_ADDED = 1 << 0, ///< IPv6 address was added
OT_IP6_ADDRESS_REMOVED = 1 << 1, ///< IPv6 address was removed OT_CHANGED_IP6_ADDRESS_REMOVED = 1 << 1, ///< IPv6 address was removed
OT_CHANGED_THREAD_ROLE = 1 << 2, ///< Role (disabled, detached, child, router, leader) changed
OT_NET_ROLE = 1 << 3, ///< Device role (disabled, detached, child, router, leader) changed OT_CHANGED_THREAD_LL_ADDR = 1 << 3, ///< The link-local address changed
OT_NET_PARTITION_ID = 1 << 4, ///< Partition ID changed OT_CHANGED_THREAD_ML_ADDR = 1 << 4, ///< The mesh-local address changed
OT_NET_KEY_SEQUENCE_COUNTER = 1 << 5, ///< Thread Key Sequence changed OT_CHANGED_THREAD_RLOC_ADDED = 1 << 5, ///< RLOC was added
OT_CHANGED_THREAD_RLOC_REMOVED = 1 << 6, ///< RLOC was removed
OT_THREAD_CHILD_ADDED = 1 << 6, ///< Child was added OT_CHANGED_THREAD_PARTITION_ID = 1 << 7, ///< Partition ID changed
OT_THREAD_CHILD_REMOVED = 1 << 7, ///< Child was removed OT_CHANGED_THREAD_KEY_SEQUENCE_COUNTER = 1 << 8, ///< Thread Key Sequence changed
OT_THREAD_NETDATA_UPDATED = 1 << 8, ///< Thread Network Data updated OT_CHANGED_THREAD_NETDATA = 1 << 9, ///< Thread Network Data changed
OT_CHANGED_THREAD_CHILD_ADDED = 1 << 10, ///< Child was added
OT_IP6_LL_ADDR_CHANGED = 1 << 9, ///< The link-local address has changed OT_CHANGED_THREAD_CHILD_REMOVED = 1 << 11, ///< Child was removed
OT_IP6_ML_ADDR_CHANGED = 1 << 10, ///< The mesh-local address has changed
OT_IP6_RLOC_ADDED = 1 << 11, ///< RLOC was added
OT_IP6_RLOC_REMOVED = 1 << 12, ///< RLOC was removed
}; };
/** /**
src/cli/cli.cpp
+1 -1
View File
@@ -3055,7 +3055,7 @@ void Interpreter::HandleNetifStateChanged(otInstance *mInstance, uint32_t aFlags
void Interpreter::HandleNetifStateChanged(uint32_t aFlags) void Interpreter::HandleNetifStateChanged(uint32_t aFlags)
#endif #endif
{ {
VerifyOrExit((aFlags & OT_THREAD_NETDATA_UPDATED) != 0); VerifyOrExit((aFlags & OT_CHANGED_THREAD_NETDATA) != 0);
#ifndef OTDLL #ifndef OTDLL
otIp6SlaacUpdate(mInstance, mSlaacAddresses, sizeof(mSlaacAddresses) / sizeof(mSlaacAddresses[0]), otIp6SlaacUpdate(mInstance, mSlaacAddresses, sizeof(mSlaacAddresses) / sizeof(mSlaacAddresses[0]),
src/core/meshcop/joiner_router.cpp
+2 -2
View File
@@ -88,7 +88,7 @@ void JoinerRouter::HandleNetifStateChanged(uint32_t aFlags, void *aContext)
void JoinerRouter::HandleNetifStateChanged(uint32_t aFlags) void JoinerRouter::HandleNetifStateChanged(uint32_t aFlags)
{ {
VerifyOrExit(mNetif.GetMle().GetDeviceMode() & Mle::ModeTlv::kModeFFD); VerifyOrExit(mNetif.GetMle().GetDeviceMode() & Mle::ModeTlv::kModeFFD);
VerifyOrExit(aFlags & OT_THREAD_NETDATA_UPDATED); VerifyOrExit(aFlags & OT_CHANGED_THREAD_NETDATA);
mNetif.GetIp6Filter().RemoveUnsecurePort(mSocket.GetSockName().mPort); mNetif.GetIp6Filter().RemoveUnsecurePort(mSocket.GetSockName().mPort);
@@ -149,7 +149,7 @@ otError JoinerRouter::SetJoinerUdpPort(uint16_t aJoinerUdpPort)
otLogFuncEntry(); otLogFuncEntry();
mJoinerUdpPort = aJoinerUdpPort; mJoinerUdpPort = aJoinerUdpPort;
mIsJoinerPortConfigured = true; mIsJoinerPortConfigured = true;
HandleNetifStateChanged(OT_THREAD_NETDATA_UPDATED); HandleNetifStateChanged(OT_CHANGED_THREAD_NETDATA);
otLogFuncExit(); otLogFuncExit();
return OT_ERROR_NONE; return OT_ERROR_NONE;
} }
src/core/net/netif.cpp
+4 -4
View File
@@ -290,7 +290,7 @@ otError Netif::AddUnicastAddress(NetifUnicastAddress &aAddress)
aAddress.mNext = mUnicastAddresses; aAddress.mNext = mUnicastAddresses;
mUnicastAddresses = &aAddress; mUnicastAddresses = &aAddress;
SetStateChangedFlags(aAddress.mRloc ? OT_IP6_RLOC_ADDED : OT_IP6_ADDRESS_ADDED); SetStateChangedFlags(aAddress.mRloc ? OT_CHANGED_THREAD_RLOC_ADDED : OT_CHANGED_IP6_ADDRESS_ADDED);
exit: exit:
return error; return error;
@@ -323,7 +323,7 @@ exit:
if (error != OT_ERROR_NOT_FOUND) if (error != OT_ERROR_NOT_FOUND)
{ {
SetStateChangedFlags(aAddress.mRloc ? OT_IP6_RLOC_REMOVED : OT_IP6_ADDRESS_REMOVED); SetStateChangedFlags(aAddress.mRloc ? OT_CHANGED_THREAD_RLOC_REMOVED : OT_CHANGED_IP6_ADDRESS_REMOVED);
} }
return error; return error;
@@ -366,7 +366,7 @@ otError Netif::AddExternalUnicastAddress(const NetifUnicastAddress &aAddress)
entry->mNext = mUnicastAddresses; entry->mNext = mUnicastAddresses;
mUnicastAddresses = entry; mUnicastAddresses = entry;
SetStateChangedFlags(OT_IP6_ADDRESS_ADDED); SetStateChangedFlags(OT_CHANGED_IP6_ADDRESS_ADDED);
exit: exit:
return error; return error;
@@ -406,7 +406,7 @@ otError Netif::RemoveExternalUnicastAddress(const Address &aAddress)
// To mark the address entry as unused/available, set the `mNext` pointer back to the entry itself. // To mark the address entry as unused/available, set the `mNext` pointer back to the entry itself.
entry->mNext = entry; entry->mNext = entry;
SetStateChangedFlags(OT_IP6_ADDRESS_REMOVED); SetStateChangedFlags(OT_CHANGED_IP6_ADDRESS_REMOVED);
exit: exit:
return error; return error;
src/core/thread/energy_scan_server.cpp
+1 -1
View File
@@ -242,7 +242,7 @@ void EnergyScanServer::HandleNetifStateChanged(uint32_t aFlags, void *aContext)
void EnergyScanServer::HandleNetifStateChanged(uint32_t aFlags) void EnergyScanServer::HandleNetifStateChanged(uint32_t aFlags)
{ {
if ((aFlags & OT_THREAD_NETDATA_UPDATED) != 0 && if ((aFlags & OT_CHANGED_THREAD_NETDATA) != 0 &&
!mActive && !mActive &&
mNetif.GetNetworkDataLeader().GetCommissioningData() == NULL) mNetif.GetNetworkDataLeader().GetCommissioningData() == NULL)
{ {
src/core/thread/key_manager.cpp
+2 -2
View File
@@ -136,7 +136,7 @@ otError KeyManager::SetMasterKey(const otMasterKey &aKey)
children[i].SetMleFrameCounter(0); children[i].SetMleFrameCounter(0);
} }
mNetif.SetStateChangedFlags(OT_NET_KEY_SEQUENCE_COUNTER); mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_KEY_SEQUENCE_COUNTER);
exit: exit:
return error; return error;
@@ -207,7 +207,7 @@ void KeyManager::SetCurrentKeySequence(uint32_t aKeySequence)
mKeyRotationTimer.Start(Timer::HoursToMsec(mKeyRotationTime)); mKeyRotationTimer.Start(Timer::HoursToMsec(mKeyRotationTime));
} }
mNetif.SetStateChangedFlags(OT_NET_KEY_SEQUENCE_COUNTER); mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_KEY_SEQUENCE_COUNTER);
exit: exit:
return; return;
src/core/thread/mle.cpp
+11 -11
View File
@@ -220,7 +220,7 @@ otError Mle::Start(bool aEnableReattach, bool aAnnounceAttach)
VerifyOrExit(mNetif.IsUp(), error = OT_ERROR_INVALID_STATE); VerifyOrExit(mNetif.IsUp(), error = OT_ERROR_INVALID_STATE);
mRole = OT_DEVICE_ROLE_DETACHED; mRole = OT_DEVICE_ROLE_DETACHED;
mNetif.SetStateChangedFlags(OT_NET_ROLE); mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_ROLE);
SetStateDetached(); SetStateDetached();
mNetif.GetKeyManager().Start(); mNetif.GetKeyManager().Start();
@@ -554,7 +554,7 @@ otError Mle::SetStateDetached(void)
{ {
if (mRole != OT_DEVICE_ROLE_DETACHED) if (mRole != OT_DEVICE_ROLE_DETACHED)
{ {
mNetif.SetStateChangedFlags(OT_NET_ROLE); mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_ROLE);
} }
if (mRole == OT_DEVICE_ROLE_LEADER) if (mRole == OT_DEVICE_ROLE_LEADER)
@@ -579,7 +579,7 @@ otError Mle::SetStateChild(uint16_t aRloc16)
{ {
if (mRole != OT_DEVICE_ROLE_CHILD) if (mRole != OT_DEVICE_ROLE_CHILD)
{ {
mNetif.SetStateChangedFlags(OT_NET_ROLE); mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_ROLE);
} }
if (mRole == OT_DEVICE_ROLE_LEADER) if (mRole == OT_DEVICE_ROLE_LEADER)
@@ -690,7 +690,7 @@ otError Mle::UpdateLinkLocalAddress(void)
mLinkLocal64.GetAddress().SetIid(*mNetif.GetMac().GetExtAddress()); mLinkLocal64.GetAddress().SetIid(*mNetif.GetMac().GetExtAddress());
mNetif.AddUnicastAddress(mLinkLocal64); mNetif.AddUnicastAddress(mLinkLocal64);
mNetif.SetStateChangedFlags(OT_IP6_LL_ADDR_CHANGED); mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_LL_ADDR);
return OT_ERROR_NONE; return OT_ERROR_NONE;
} }
@@ -736,7 +736,7 @@ otError Mle::SetMeshLocalPrefix(const uint8_t *aMeshLocalPrefix)
} }
// Changing the prefix also causes the mesh local address to be different. // Changing the prefix also causes the mesh local address to be different.
mNetif.SetStateChangedFlags(OT_IP6_ML_ADDR_CHANGED); mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_ML_ADDR);
exit: exit:
return OT_ERROR_NONE; return OT_ERROR_NONE;
@@ -783,7 +783,7 @@ void Mle::SetLeaderData(uint32_t aPartitionId, uint8_t aWeighting, uint8_t aLead
{ {
if (mLeaderData.GetPartitionId() != aPartitionId) if (mLeaderData.GetPartitionId() != aPartitionId)
{ {
mNetif.SetStateChangedFlags(OT_NET_PARTITION_ID); mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_PARTITION_ID);
} }
mLeaderData.SetPartitionId(aPartitionId); mLeaderData.SetPartitionId(aPartitionId);
@@ -1237,7 +1237,7 @@ void Mle::HandleNetifStateChanged(uint32_t aFlags)
{ {
VerifyOrExit(mRole != OT_DEVICE_ROLE_DISABLED); VerifyOrExit(mRole != OT_DEVICE_ROLE_DISABLED);
if ((aFlags & (OT_IP6_ADDRESS_ADDED | OT_IP6_ADDRESS_REMOVED)) != 0) if ((aFlags & (OT_CHANGED_IP6_ADDRESS_ADDED | OT_CHANGED_IP6_ADDRESS_REMOVED)) != 0)
{ {
if (!mNetif.IsUnicastAddress(mMeshLocal64.GetAddress())) if (!mNetif.IsUnicastAddress(mMeshLocal64.GetAddress()))
{ {
@@ -1248,7 +1248,7 @@ void Mle::HandleNetifStateChanged(uint32_t aFlags)
} }
mNetif.AddUnicastAddress(mMeshLocal64); mNetif.AddUnicastAddress(mMeshLocal64);
mNetif.SetStateChangedFlags(OT_IP6_ML_ADDR_CHANGED); mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_ML_ADDR);
} }
if (mRole == OT_DEVICE_ROLE_CHILD && (mDeviceMode & ModeTlv::kModeFFD) == 0) if (mRole == OT_DEVICE_ROLE_CHILD && (mDeviceMode & ModeTlv::kModeFFD) == 0)
@@ -1257,13 +1257,13 @@ void Mle::HandleNetifStateChanged(uint32_t aFlags)
} }
} }
if ((aFlags & OT_THREAD_NETDATA_UPDATED) != 0) if ((aFlags & OT_CHANGED_THREAD_NETDATA) != 0)
{ {
if (mDeviceMode & ModeTlv::kModeFFD) if (mDeviceMode & ModeTlv::kModeFFD)
{ {
mNetif.GetMle().HandleNetworkDataUpdateRouter(); mNetif.GetMle().HandleNetworkDataUpdateRouter();
} }
else if ((aFlags & OT_NET_ROLE) == 0) else if ((aFlags & OT_CHANGED_THREAD_ROLE) == 0)
{ {
mSendChildUpdateRequest.Post(); mSendChildUpdateRequest.Post();
} }
@@ -1273,7 +1273,7 @@ void Mle::HandleNetifStateChanged(uint32_t aFlags)
#endif #endif
} }
if (aFlags & (OT_NET_ROLE | OT_NET_KEY_SEQUENCE_COUNTER)) if (aFlags & (OT_CHANGED_THREAD_ROLE | OT_CHANGED_THREAD_KEY_SEQUENCE_COUNTER))
{ {
Store(); Store();
} }
src/core/thread/mle_router.cpp
+5 -5
View File
@@ -419,7 +419,7 @@ otError MleRouter::SetStateRouter(uint16_t aRloc16)
{ {
if (mRole != OT_DEVICE_ROLE_ROUTER) if (mRole != OT_DEVICE_ROLE_ROUTER)
{ {
mNetif.SetStateChangedFlags(OT_NET_ROLE); mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_ROLE);
} }
SetRloc16(aRloc16); SetRloc16(aRloc16);
@@ -454,7 +454,7 @@ otError MleRouter::SetStateLeader(uint16_t aRloc16)
{ {
if (mRole != OT_DEVICE_ROLE_LEADER) if (mRole != OT_DEVICE_ROLE_LEADER)
{ {
mNetif.SetStateChangedFlags(OT_NET_ROLE); mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_ROLE);
} }
SetRloc16(aRloc16); SetRloc16(aRloc16);
@@ -3117,7 +3117,7 @@ otError MleRouter::RemoveNeighbor(Neighbor &aNeighbor)
{ {
aNeighbor.SetState(Neighbor::kStateInvalid); aNeighbor.SetState(Neighbor::kStateInvalid);
mNetif.GetMeshForwarder().UpdateIndirectMessages(); mNetif.GetMeshForwarder().UpdateIndirectMessages();
mNetif.SetStateChangedFlags(OT_THREAD_CHILD_REMOVED); mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_CHILD_REMOVED);
mNetif.GetNetworkDataLeader().SendServerDataNotification(aNeighbor.GetRloc16()); mNetif.GetNetworkDataLeader().SendServerDataNotification(aNeighbor.GetRloc16());
RemoveStoredChild(aNeighbor.GetRloc16()); RemoveStoredChild(aNeighbor.GetRloc16());
} }
@@ -4579,7 +4579,7 @@ void MleRouter::SetChildStateToValid(Child *aChild)
VerifyOrExit(aChild->GetState() != Neighbor::kStateValid); VerifyOrExit(aChild->GetState() != Neighbor::kStateValid);
aChild->SetState(Neighbor::kStateValid); aChild->SetState(Neighbor::kStateValid);
mNetif.SetStateChangedFlags(OT_THREAD_CHILD_ADDED); mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_CHILD_ADDED);
StoreChild(aChild->GetRloc16()); StoreChild(aChild->GetRloc16());
exit: exit:
@@ -4610,7 +4610,7 @@ void MleRouter::RemoveChildren(void)
switch (mChildren[i].GetState()) switch (mChildren[i].GetState())
{ {
case Neighbor::kStateValid: case Neighbor::kStateValid:
mNetif.SetStateChangedFlags(OT_THREAD_CHILD_REMOVED); mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_CHILD_REMOVED);
// Fall-through to next case // Fall-through to next case
src/core/thread/network_data_leader.cpp
+3 -3
View File
@@ -73,7 +73,7 @@ void LeaderBase::Reset(void)
mVersion = static_cast<uint8_t>(otPlatRandomGet()); mVersion = static_cast<uint8_t>(otPlatRandomGet());
mStableVersion = static_cast<uint8_t>(otPlatRandomGet()); mStableVersion = static_cast<uint8_t>(otPlatRandomGet());
mLength = 0; mLength = 0;
mNetif.SetStateChangedFlags(OT_THREAD_NETDATA_UPDATED); mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_NETDATA);
} }
otError LeaderBase::GetContext(const Ip6::Address &aAddress, Lowpan::Context &aContext) otError LeaderBase::GetContext(const Ip6::Address &aAddress, Lowpan::Context &aContext)
@@ -423,7 +423,7 @@ void LeaderBase::SetNetworkData(uint8_t aVersion, uint8_t aStableVersion, bool a
otDumpDebgNetData(GetInstance(), "set network data", mTlvs, mLength); otDumpDebgNetData(GetInstance(), "set network data", mTlvs, mLength);
mNetif.SetStateChangedFlags(OT_THREAD_NETDATA_UPDATED); mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_NETDATA);
} }
otError LeaderBase::SetCommissioningData(const uint8_t *aValue, uint8_t aValueLength) otError LeaderBase::SetCommissioningData(const uint8_t *aValue, uint8_t aValueLength)
@@ -446,7 +446,7 @@ otError LeaderBase::SetCommissioningData(const uint8_t *aValue, uint8_t aValueLe
} }
mVersion++; mVersion++;
mNetif.SetStateChangedFlags(OT_THREAD_NETDATA_UPDATED); mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_NETDATA);
exit: exit:
return error; return error;
src/core/thread/network_data_leader_ftd.cpp
+4 -4
View File
@@ -103,7 +103,7 @@ void Leader::IncrementVersion(void)
if (mNetif.GetMle().GetRole() == OT_DEVICE_ROLE_LEADER) if (mNetif.GetMle().GetRole() == OT_DEVICE_ROLE_LEADER)
{ {
mVersion++; mVersion++;
mNetif.SetStateChangedFlags(OT_THREAD_NETDATA_UPDATED); mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_NETDATA);
} }
} }
@@ -142,7 +142,7 @@ void Leader::RemoveBorderRouter(uint16_t aRloc16)
mStableVersion++; mStableVersion++;
} }
mNetif.SetStateChangedFlags(OT_THREAD_NETDATA_UPDATED); mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_NETDATA);
exit: exit:
return; return;
@@ -590,7 +590,7 @@ otError Leader::RegisterNetworkData(uint16_t aRloc16, uint8_t *aTlvs, uint8_t aT
} }
} }
mNetif.SetStateChangedFlags(OT_THREAD_NETDATA_UPDATED); mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_NETDATA);
exit: exit:
return error; return error;
@@ -774,7 +774,7 @@ otError Leader::FreeContext(uint8_t aContextId)
mContextUsed &= ~(1 << aContextId); mContextUsed &= ~(1 << aContextId);
mVersion++; mVersion++;
mStableVersion++; mStableVersion++;
mNetif.SetStateChangedFlags(OT_THREAD_NETDATA_UPDATED); mNetif.SetStateChangedFlags(OT_CHANGED_THREAD_NETDATA);
return OT_ERROR_NONE; return OT_ERROR_NONE;
} }
src/ncp/ncp_base.cpp
+19 -19
View File
@@ -1140,7 +1140,7 @@ void NcpBase::UpdateChangedProps(void)
mChangedFlags &= ~static_cast<uint32_t>(NCP_PLAT_RESET_REASON); mChangedFlags &= ~static_cast<uint32_t>(NCP_PLAT_RESET_REASON);
} }
else if ((mChangedFlags & OT_IP6_LL_ADDR_CHANGED) != 0) else if ((mChangedFlags & OT_CHANGED_THREAD_LL_ADDR) != 0)
{ {
SuccessOrExit( SuccessOrExit(
HandleCommandPropertyGet( HandleCommandPropertyGet(
@@ -1148,9 +1148,9 @@ void NcpBase::UpdateChangedProps(void)
SPINEL_PROP_IPV6_LL_ADDR SPINEL_PROP_IPV6_LL_ADDR
)); ));
mChangedFlags &= ~static_cast<uint32_t>(OT_IP6_LL_ADDR_CHANGED); mChangedFlags &= ~static_cast<uint32_t>(OT_CHANGED_THREAD_LL_ADDR);
} }
else if ((mChangedFlags & OT_IP6_ML_ADDR_CHANGED) != 0) else if ((mChangedFlags & OT_CHANGED_THREAD_ML_ADDR) != 0)
{ {
SuccessOrExit( SuccessOrExit(
HandleCommandPropertyGet( HandleCommandPropertyGet(
@@ -1158,9 +1158,9 @@ void NcpBase::UpdateChangedProps(void)
SPINEL_PROP_IPV6_ML_ADDR SPINEL_PROP_IPV6_ML_ADDR
)); ));
mChangedFlags &= ~static_cast<uint32_t>(OT_IP6_ML_ADDR_CHANGED); mChangedFlags &= ~static_cast<uint32_t>(OT_CHANGED_THREAD_ML_ADDR);
} }
else if ((mChangedFlags & OT_NET_ROLE) != 0) else if ((mChangedFlags & OT_CHANGED_THREAD_ROLE) != 0)
{ {
if (mRequireJoinExistingNetwork) if (mRequireJoinExistingNetwork)
{ {
@@ -1182,7 +1182,7 @@ void NcpBase::UpdateChangedProps(void)
#endif #endif
) )
{ {
mChangedFlags &= ~static_cast<uint32_t>(OT_NET_PARTITION_ID); mChangedFlags &= ~static_cast<uint32_t>(OT_CHANGED_THREAD_PARTITION_ID);
otThreadSetEnabled(mInstance, false); otThreadSetEnabled(mInstance, false);
// TODO: It would be nice to be able to indicate // TODO: It would be nice to be able to indicate
@@ -1216,9 +1216,9 @@ void NcpBase::UpdateChangedProps(void)
SPINEL_PROP_NET_ROLE SPINEL_PROP_NET_ROLE
)); ));
mChangedFlags &= ~static_cast<uint32_t>(OT_NET_ROLE); mChangedFlags &= ~static_cast<uint32_t>(OT_CHANGED_THREAD_ROLE);
} }
else if ((mChangedFlags & OT_NET_PARTITION_ID) != 0) else if ((mChangedFlags & OT_CHANGED_THREAD_PARTITION_ID) != 0)
{ {
SuccessOrExit( SuccessOrExit(
HandleCommandPropertyGet( HandleCommandPropertyGet(
@@ -1226,9 +1226,9 @@ void NcpBase::UpdateChangedProps(void)
SPINEL_PROP_NET_PARTITION_ID SPINEL_PROP_NET_PARTITION_ID
)); ));
mChangedFlags &= ~static_cast<uint32_t>(OT_NET_PARTITION_ID); mChangedFlags &= ~static_cast<uint32_t>(OT_CHANGED_THREAD_PARTITION_ID);
} }
else if ((mChangedFlags & OT_NET_KEY_SEQUENCE_COUNTER) != 0) else if ((mChangedFlags & OT_CHANGED_THREAD_KEY_SEQUENCE_COUNTER) != 0)
{ {
SuccessOrExit( SuccessOrExit(
HandleCommandPropertyGet( HandleCommandPropertyGet(
@@ -1236,9 +1236,9 @@ void NcpBase::UpdateChangedProps(void)
SPINEL_PROP_NET_KEY_SEQUENCE_COUNTER SPINEL_PROP_NET_KEY_SEQUENCE_COUNTER
)); ));
mChangedFlags &= ~static_cast<uint32_t>(OT_NET_KEY_SEQUENCE_COUNTER); mChangedFlags &= ~static_cast<uint32_t>(OT_CHANGED_THREAD_KEY_SEQUENCE_COUNTER);
} }
else if ((mChangedFlags & (OT_IP6_ADDRESS_ADDED | OT_IP6_ADDRESS_REMOVED)) != 0) else if ((mChangedFlags & (OT_CHANGED_IP6_ADDRESS_ADDED | OT_CHANGED_IP6_ADDRESS_REMOVED)) != 0)
{ {
SuccessOrExit( SuccessOrExit(
HandleCommandPropertyGet( HandleCommandPropertyGet(
@@ -1246,9 +1246,9 @@ void NcpBase::UpdateChangedProps(void)
SPINEL_PROP_IPV6_ADDRESS_TABLE SPINEL_PROP_IPV6_ADDRESS_TABLE
)); ));
mChangedFlags &= ~static_cast<uint32_t>(OT_IP6_ADDRESS_ADDED | OT_IP6_ADDRESS_REMOVED); mChangedFlags &= ~static_cast<uint32_t>(OT_CHANGED_IP6_ADDRESS_ADDED | OT_CHANGED_IP6_ADDRESS_REMOVED);
} }
else if ((mChangedFlags & (OT_THREAD_CHILD_ADDED | OT_THREAD_CHILD_REMOVED)) != 0) else if ((mChangedFlags & (OT_CHANGED_THREAD_CHILD_ADDED | OT_CHANGED_THREAD_CHILD_REMOVED)) != 0)
{ {
SuccessOrExit( SuccessOrExit(
HandleCommandPropertyGet( HandleCommandPropertyGet(
@@ -1256,9 +1256,9 @@ void NcpBase::UpdateChangedProps(void)
SPINEL_PROP_THREAD_CHILD_TABLE SPINEL_PROP_THREAD_CHILD_TABLE
)); ));
mChangedFlags &= ~static_cast<uint32_t>(OT_THREAD_CHILD_ADDED | OT_THREAD_CHILD_REMOVED); mChangedFlags &= ~static_cast<uint32_t>(OT_CHANGED_THREAD_CHILD_ADDED | OT_CHANGED_THREAD_CHILD_REMOVED);
} }
else if ((mChangedFlags & OT_THREAD_NETDATA_UPDATED) != 0) else if ((mChangedFlags & OT_CHANGED_THREAD_NETDATA) != 0)
{ {
SuccessOrExit( SuccessOrExit(
HandleCommandPropertyGet( HandleCommandPropertyGet(
@@ -1266,7 +1266,7 @@ void NcpBase::UpdateChangedProps(void)
SPINEL_PROP_THREAD_LEADER_NETWORK_DATA SPINEL_PROP_THREAD_LEADER_NETWORK_DATA
)); ));
mChangedFlags &= ~static_cast<uint32_t>(OT_THREAD_NETDATA_UPDATED); mChangedFlags &= ~static_cast<uint32_t>(OT_CHANGED_THREAD_NETDATA);
// If the network data is updated, after successfully sending (or queuing) the // If the network data is updated, after successfully sending (or queuing) the
// network data spinel message, we add `NCP_ON_MESH_NETS_CHANGED_BIT_FLAG` to // network data spinel message, we add `NCP_ON_MESH_NETS_CHANGED_BIT_FLAG` to
@@ -1284,9 +1284,9 @@ void NcpBase::UpdateChangedProps(void)
mChangedFlags &= ~static_cast<uint32_t>(NCP_ON_MESH_NETS_CHANGED_BIT_FLAG); mChangedFlags &= ~static_cast<uint32_t>(NCP_ON_MESH_NETS_CHANGED_BIT_FLAG);
} }
else if ((mChangedFlags & (OT_IP6_RLOC_ADDED | OT_IP6_RLOC_REMOVED)) != 0) else if ((mChangedFlags & (OT_CHANGED_THREAD_RLOC_ADDED | OT_CHANGED_THREAD_RLOC_REMOVED)) != 0)
{ {
mChangedFlags &= ~static_cast<uint32_t>(OT_IP6_RLOC_ADDED | OT_IP6_RLOC_REMOVED); mChangedFlags &= ~static_cast<uint32_t>(OT_CHANGED_THREAD_RLOC_ADDED | OT_CHANGED_THREAD_RLOC_REMOVED);
} }
} }