From 98fb9dfaf4de3f843ba5d5253b4b2d6a5cfa3540 Mon Sep 17 00:00:00 2001 From: Jonathan Hui Date: Wed, 9 Oct 2019 15:01:32 -0700 Subject: [PATCH] [instance] fix typo in OT_CHANGED_IP6_MULTICAST_* (#4230) --- include/openthread/instance.h | 4 ++-- src/core/common/notifier.cpp | 4 ++-- src/core/net/netif.cpp | 16 ++++++++-------- src/core/thread/mle.cpp | 2 +- src/ncp/ncp_base_mtd.cpp | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/openthread/instance.h b/include/openthread/instance.h index 0ae79ee6a..1657bf7eb 100644 --- a/include/openthread/instance.h +++ b/include/openthread/instance.h @@ -134,8 +134,8 @@ enum OT_CHANGED_THREAD_NETDATA = 1 << 9, ///< Thread Network Data changed OT_CHANGED_THREAD_CHILD_ADDED = 1 << 10, ///< Child was added OT_CHANGED_THREAD_CHILD_REMOVED = 1 << 11, ///< Child was removed - OT_CHANGED_IP6_MULTICAST_SUBSRCRIBED = 1 << 12, ///< Subscribed to a IPv6 multicast address - OT_CHANGED_IP6_MULTICAST_UNSUBSRCRIBED = 1 << 13, ///< Unsubscribed from a IPv6 multicast address + OT_CHANGED_IP6_MULTICAST_SUBSCRIBED = 1 << 12, ///< Subscribed to a IPv6 multicast address + OT_CHANGED_IP6_MULTICAST_UNSUBSCRIBED = 1 << 13, ///< Unsubscribed from a IPv6 multicast address OT_CHANGED_THREAD_CHANNEL = 1 << 14, ///< Thread network channel changed OT_CHANGED_THREAD_PANID = 1 << 15, ///< Thread network PAN Id changed OT_CHANGED_THREAD_NETWORK_NAME = 1 << 16, ///< Thread network name changed diff --git a/src/core/common/notifier.cpp b/src/core/common/notifier.cpp index a4cfc889f..aa7190456 100644 --- a/src/core/common/notifier.cpp +++ b/src/core/common/notifier.cpp @@ -265,11 +265,11 @@ const char *Notifier::FlagToString(otChangedFlags aFlag) const retval = "Child-"; break; - case OT_CHANGED_IP6_MULTICAST_SUBSRCRIBED: + case OT_CHANGED_IP6_MULTICAST_SUBSCRIBED: retval = "Ip6Mult+"; break; - case OT_CHANGED_IP6_MULTICAST_UNSUBSRCRIBED: + case OT_CHANGED_IP6_MULTICAST_UNSUBSCRIBED: retval = "Ip6Mult-"; break; diff --git a/src/core/net/netif.cpp b/src/core/net/netif.cpp index 41d53bf5f..fcbb115dd 100644 --- a/src/core/net/netif.cpp +++ b/src/core/net/netif.cpp @@ -134,7 +134,7 @@ void Netif::SubscribeAllNodesMulticast(void) } } - Get().Signal(OT_CHANGED_IP6_MULTICAST_SUBSRCRIBED); + Get().Signal(OT_CHANGED_IP6_MULTICAST_SUBSCRIBED); } void Netif::UnsubscribeAllNodesMulticast(void) @@ -152,7 +152,7 @@ void Netif::UnsubscribeAllNodesMulticast(void) } } - Get().Signal(OT_CHANGED_IP6_MULTICAST_UNSUBSRCRIBED); + Get().Signal(OT_CHANGED_IP6_MULTICAST_UNSUBSCRIBED); } otError Netif::SubscribeAllRoutersMulticast(void) @@ -190,7 +190,7 @@ otError Netif::SubscribeAllRoutersMulticast(void) } } - Get().Signal(OT_CHANGED_IP6_MULTICAST_SUBSRCRIBED); + Get().Signal(OT_CHANGED_IP6_MULTICAST_SUBSCRIBED); exit: return error; @@ -231,7 +231,7 @@ exit: } } - Get().Signal(OT_CHANGED_IP6_MULTICAST_UNSUBSRCRIBED); + Get().Signal(OT_CHANGED_IP6_MULTICAST_UNSUBSCRIBED); } return error; @@ -257,7 +257,7 @@ otError Netif::SubscribeMulticast(NetifMulticastAddress &aAddress) mAddressCallback(&aAddress.mAddress, kMulticastPrefixLength, true, mAddressCallbackContext); } - Get().Signal(OT_CHANGED_IP6_MULTICAST_SUBSRCRIBED); + Get().Signal(OT_CHANGED_IP6_MULTICAST_SUBSCRIBED); exit: return error; @@ -295,7 +295,7 @@ exit: mAddressCallback(&aAddress.mAddress, kMulticastPrefixLength, false, mAddressCallbackContext); } - Get().Signal(OT_CHANGED_IP6_MULTICAST_UNSUBSRCRIBED); + Get().Signal(OT_CHANGED_IP6_MULTICAST_UNSUBSCRIBED); } return error; @@ -355,7 +355,7 @@ otError Netif::SubscribeExternalMulticast(const Address &aAddress) entry->mAddress = aAddress; entry->mNext = mMulticastAddresses; mMulticastAddresses = entry; - Get().Signal(OT_CHANGED_IP6_MULTICAST_SUBSRCRIBED); + Get().Signal(OT_CHANGED_IP6_MULTICAST_SUBSCRIBED); exit: return error; @@ -395,7 +395,7 @@ otError Netif::UnsubscribeExternalMulticast(const Address &aAddress) // To mark the address entry as unused/available, set the `mNext` pointer back to the entry itself. entry->mNext = entry; - Get().Signal(OT_CHANGED_IP6_MULTICAST_UNSUBSRCRIBED); + Get().Signal(OT_CHANGED_IP6_MULTICAST_UNSUBSCRIBED); exit: return error; diff --git a/src/core/thread/mle.cpp b/src/core/thread/mle.cpp index b4d89257a..8761cb0a1 100644 --- a/src/core/thread/mle.cpp +++ b/src/core/thread/mle.cpp @@ -1526,7 +1526,7 @@ void Mle::HandleStateChanged(otChangedFlags aFlags) } } - if ((aFlags & (OT_CHANGED_IP6_MULTICAST_SUBSRCRIBED | OT_CHANGED_IP6_MULTICAST_UNSUBSRCRIBED)) != 0) + if ((aFlags & (OT_CHANGED_IP6_MULTICAST_SUBSCRIBED | OT_CHANGED_IP6_MULTICAST_UNSUBSCRIBED)) != 0) { if (mRole == OT_DEVICE_ROLE_CHILD && !IsFullThreadDevice() && !IsRxOnWhenIdle()) { diff --git a/src/ncp/ncp_base_mtd.cpp b/src/ncp/ncp_base_mtd.cpp index c838fe7ff..cfdd9b92c 100644 --- a/src/ncp/ncp_base_mtd.cpp +++ b/src/ncp/ncp_base_mtd.cpp @@ -3613,8 +3613,8 @@ void NcpBase::ProcessThreadChangedFlags(void) {OT_CHANGED_THREAD_NETDATA, SPINEL_PROP_THREAD_LEADER_NETWORK_DATA}, {OT_CHANGED_THREAD_CHILD_ADDED, SPINEL_PROP_THREAD_CHILD_TABLE}, {OT_CHANGED_THREAD_CHILD_REMOVED, SPINEL_PROP_THREAD_CHILD_TABLE}, - {OT_CHANGED_IP6_MULTICAST_SUBSRCRIBED, SPINEL_PROP_IPV6_MULTICAST_ADDRESS_TABLE}, - {OT_CHANGED_IP6_MULTICAST_UNSUBSRCRIBED, SPINEL_PROP_IPV6_MULTICAST_ADDRESS_TABLE}, + {OT_CHANGED_IP6_MULTICAST_SUBSCRIBED, SPINEL_PROP_IPV6_MULTICAST_ADDRESS_TABLE}, + {OT_CHANGED_IP6_MULTICAST_UNSUBSCRIBED, SPINEL_PROP_IPV6_MULTICAST_ADDRESS_TABLE}, {OT_CHANGED_THREAD_CHANNEL, SPINEL_PROP_PHY_CHAN}, {OT_CHANGED_THREAD_PANID, SPINEL_PROP_MAC_15_4_PANID}, {OT_CHANGED_THREAD_NETWORK_NAME, SPINEL_PROP_NET_NETWORK_NAME},