diff --git a/src/core/coap/coap.cpp b/src/core/coap/coap.cpp index 6cfa63966..05f838667 100644 --- a/src/core/coap/coap.cpp +++ b/src/core/coap/coap.cpp @@ -254,9 +254,8 @@ otError CoapBase::SendAck(const Message &aRequest, const Ip6::MessageInfo &aMess otError CoapBase::SendEmptyAck(const Message &aRequest, const Ip6::MessageInfo &aMessageInfo) { - return (aRequest.GetType() == OT_COAP_TYPE_CONFIRMABLE - ? SendHeaderResponse(OT_COAP_CODE_CHANGED, aRequest, aMessageInfo) - : OT_ERROR_INVALID_ARGS); + return (aRequest.IsConfirmable() ? SendHeaderResponse(OT_COAP_CODE_CHANGED, aRequest, aMessageInfo) + : OT_ERROR_INVALID_ARGS); } otError CoapBase::SendNotFound(const Message &aRequest, const Ip6::MessageInfo &aMessageInfo) @@ -269,7 +268,7 @@ otError CoapBase::SendEmptyMessage(Message::Type aType, const Message &aRequest, otError error = OT_ERROR_NONE; Message *message = NULL; - VerifyOrExit(aRequest.GetType() == OT_COAP_TYPE_CONFIRMABLE, error = OT_ERROR_INVALID_ARGS); + VerifyOrExit(aRequest.IsConfirmable(), error = OT_ERROR_INVALID_ARGS); VerifyOrExit((message = NewMessage()) != NULL, error = OT_ERROR_NO_BUFS); diff --git a/src/core/meshcop/border_agent.cpp b/src/core/meshcop/border_agent.cpp index e7a5e9004..baf79dc7a 100644 --- a/src/core/meshcop/border_agent.cpp +++ b/src/core/meshcop/border_agent.cpp @@ -193,7 +193,7 @@ static void SendErrorMessage(Coap::CoapSecure & aCoapSecure, VerifyOrExit((message = NewMeshCoPMessage(aCoapSecure)) != NULL, error = OT_ERROR_NO_BUFS); - if (aRequest.GetType() == OT_COAP_TYPE_NON_CONFIRMABLE || aSeparate) + if (aRequest.IsNonConfirmable() || aSeparate) { message->Init(OT_COAP_TYPE_NON_CONFIRMABLE, CoapCodeFromError(aError)); } @@ -453,8 +453,7 @@ void BorderAgent::HandleRelayReceive(const Coap::Message &aMessage) Coap::Message *message = NULL; otError error; - VerifyOrExit(aMessage.GetType() == OT_COAP_TYPE_NON_CONFIRMABLE && aMessage.GetCode() == OT_COAP_CODE_POST, - error = OT_ERROR_DROP); + VerifyOrExit(aMessage.IsNonConfirmable() && aMessage.GetCode() == OT_COAP_CODE_POST, error = OT_ERROR_DROP); VerifyOrExit((message = NewMeshCoPMessage(Get())) != NULL, error = OT_ERROR_NO_BUFS); message->Init(OT_COAP_TYPE_NON_CONFIRMABLE, OT_COAP_CODE_POST); @@ -518,7 +517,7 @@ void BorderAgent::HandleRelayTransmit(const Coap::Message &aMessage) Ip6::MessageInfo messageInfo; uint16_t offset = 0; - VerifyOrExit(aMessage.GetType() == OT_COAP_TYPE_NON_CONFIRMABLE && aMessage.GetCode() == OT_COAP_CODE_POST); + VerifyOrExit(aMessage.IsNonConfirmable() && aMessage.GetCode() == OT_COAP_CODE_POST); SuccessOrExit(error = Tlv::ReadUint16Tlv(aMessage, Tlv::kJoinerRouterLocator, joinerRouterRloc)); diff --git a/src/core/meshcop/commissioner.cpp b/src/core/meshcop/commissioner.cpp index 5f5011471..997be3a48 100644 --- a/src/core/meshcop/commissioner.cpp +++ b/src/core/meshcop/commissioner.cpp @@ -825,7 +825,7 @@ void Commissioner::HandleRelayReceive(Coap::Message &aMessage, const Ip6::Messag VerifyOrExit(mState == OT_COMMISSIONER_STATE_ACTIVE, error = OT_ERROR_INVALID_STATE); - VerifyOrExit(aMessage.GetType() == OT_COAP_TYPE_NON_CONFIRMABLE && aMessage.GetCode() == OT_COAP_CODE_POST); + VerifyOrExit(aMessage.IsNonConfirmable() && aMessage.GetCode() == OT_COAP_CODE_POST); SuccessOrExit(error = Tlv::ReadUint16Tlv(aMessage, Tlv::kJoinerUdpPort, joinerPort)); SuccessOrExit(error = Tlv::ReadTlv(aMessage, Tlv::kJoinerIid, joinerIid, sizeof(joinerIid))); @@ -900,7 +900,7 @@ void Commissioner::HandleDatasetChanged(void *aContext, otMessage *aMessage, con void Commissioner::HandleDatasetChanged(Coap::Message &aMessage, const Ip6::MessageInfo &aMessageInfo) { - VerifyOrExit(aMessage.GetType() == OT_COAP_TYPE_CONFIRMABLE && aMessage.GetCode() == OT_COAP_CODE_POST); + VerifyOrExit(aMessage.IsConfirmable() && aMessage.GetCode() == OT_COAP_CODE_POST); otLogInfoMeshCoP("received dataset changed"); diff --git a/src/core/meshcop/energy_scan_client.cpp b/src/core/meshcop/energy_scan_client.cpp index 907d2c850..fc467cd3b 100644 --- a/src/core/meshcop/energy_scan_client.cpp +++ b/src/core/meshcop/energy_scan_client.cpp @@ -127,7 +127,7 @@ void EnergyScanClient::HandleReport(Coap::Message &aMessage, const Ip6::MessageI uint8_t list[OPENTHREAD_CONFIG_TMF_ENERGY_SCAN_MAX_RESULTS]; } OT_TOOL_PACKED_END energyList; - VerifyOrExit(aMessage.GetType() == OT_COAP_TYPE_CONFIRMABLE && aMessage.GetCode() == OT_COAP_CODE_POST); + VerifyOrExit(aMessage.IsConfirmable() && aMessage.GetCode() == OT_COAP_CODE_POST); otLogInfoMeshCoP("received energy scan report"); diff --git a/src/core/meshcop/joiner.cpp b/src/core/meshcop/joiner.cpp index 02026c74a..2d5263031 100644 --- a/src/core/meshcop/joiner.cpp +++ b/src/core/meshcop/joiner.cpp @@ -490,8 +490,8 @@ void Joiner::HandleJoinerFinalizeResponse(Coap::Message & aMessage, uint8_t state; - VerifyOrExit(mState == OT_JOINER_STATE_CONNECTED && aResult == OT_ERROR_NONE && - aMessage.GetType() == OT_COAP_TYPE_ACKNOWLEDGMENT && aMessage.GetCode() == OT_COAP_CODE_CHANGED); + VerifyOrExit(mState == OT_JOINER_STATE_CONNECTED && aResult == OT_ERROR_NONE && aMessage.IsAck() && + aMessage.GetCode() == OT_COAP_CODE_CHANGED); SuccessOrExit(Tlv::ReadUint8Tlv(aMessage, Tlv::kState, state)); @@ -520,7 +520,7 @@ void Joiner::HandleJoinerEntrust(Coap::Message &aMessage, const Ip6::MessageInfo otError error; otOperationalDataset dataset; - VerifyOrExit(mState == OT_JOINER_STATE_ENTRUST && aMessage.GetType() == OT_COAP_TYPE_CONFIRMABLE && + VerifyOrExit(mState == OT_JOINER_STATE_ENTRUST && aMessage.IsConfirmable() && aMessage.GetCode() == OT_COAP_CODE_POST, error = OT_ERROR_DROP); diff --git a/src/core/meshcop/joiner_router.cpp b/src/core/meshcop/joiner_router.cpp index ea9807c72..2c938ba4e 100644 --- a/src/core/meshcop/joiner_router.cpp +++ b/src/core/meshcop/joiner_router.cpp @@ -197,8 +197,7 @@ void JoinerRouter::HandleRelayTransmit(Coap::Message &aMessage, const Ip6::Messa otMessageSettings settings = {false, static_cast(kMeshCoPMessagePriority)}; Ip6::MessageInfo messageInfo; - VerifyOrExit(aMessage.GetType() == OT_COAP_TYPE_NON_CONFIRMABLE && aMessage.GetCode() == OT_COAP_CODE_POST, - error = OT_ERROR_DROP); + VerifyOrExit(aMessage.IsNonConfirmable() && aMessage.GetCode() == OT_COAP_CODE_POST, error = OT_ERROR_DROP); otLogInfoMeshCoP("Received relay transmit"); diff --git a/src/core/meshcop/panid_query_client.cpp b/src/core/meshcop/panid_query_client.cpp index 30dfc274a..d768dea05 100644 --- a/src/core/meshcop/panid_query_client.cpp +++ b/src/core/meshcop/panid_query_client.cpp @@ -117,7 +117,7 @@ void PanIdQueryClient::HandleConflict(Coap::Message &aMessage, const Ip6::Messag Ip6::MessageInfo responseInfo(aMessageInfo); uint32_t mask; - VerifyOrExit(aMessage.GetType() == OT_COAP_TYPE_CONFIRMABLE && aMessage.GetCode() == OT_COAP_CODE_POST); + VerifyOrExit(aMessage.IsConfirmable() && aMessage.GetCode() == OT_COAP_CODE_POST); otLogInfoMeshCoP("received panid conflict"); diff --git a/src/core/thread/address_resolver.cpp b/src/core/thread/address_resolver.cpp index a7b39ab24..60f1a09e6 100644 --- a/src/core/thread/address_resolver.cpp +++ b/src/core/thread/address_resolver.cpp @@ -488,7 +488,7 @@ void AddressResolver::HandleAddressNotification(Coap::Message &aMessage, const I uint16_t rloc16; uint32_t lastTransactionTime; - VerifyOrExit(aMessage.GetType() == OT_COAP_TYPE_CONFIRMABLE && aMessage.GetCode() == OT_COAP_CODE_POST); + VerifyOrExit(aMessage.IsConfirmable() && aMessage.GetCode() == OT_COAP_CODE_POST); SuccessOrExit(Tlv::ReadTlv(aMessage, ThreadTlv::kTarget, &target, sizeof(target))); SuccessOrExit(Tlv::ReadTlv(aMessage, ThreadTlv::kMeshLocalEid, meshLocalIid, sizeof(meshLocalIid))); @@ -698,7 +698,7 @@ void AddressResolver::HandleAddressQuery(Coap::Message &aMessage, const Ip6::Mes Ip6::Address target; uint32_t lastTransactionTime; - VerifyOrExit(aMessage.GetType() == OT_COAP_TYPE_NON_CONFIRMABLE && aMessage.GetCode() == OT_COAP_CODE_POST); + VerifyOrExit(aMessage.IsNonConfirmable() && aMessage.GetCode() == OT_COAP_CODE_POST); SuccessOrExit(Tlv::ReadTlv(aMessage, ThreadTlv::kTarget, &target, sizeof(target))); diff --git a/src/core/thread/mle_router.cpp b/src/core/thread/mle_router.cpp index d6729b2eb..287f4b395 100644 --- a/src/core/thread/mle_router.cpp +++ b/src/core/thread/mle_router.cpp @@ -4084,8 +4084,7 @@ void MleRouter::HandleAddressSolicit(Coap::Message &aMessage, const Ip6::Message uint16_t xtalAccuracy; #endif - VerifyOrExit(aMessage.GetType() == OT_COAP_TYPE_CONFIRMABLE && aMessage.GetCode() == OT_COAP_CODE_POST, - error = OT_ERROR_PARSE); + VerifyOrExit(aMessage.IsConfirmable() && aMessage.GetCode() == OT_COAP_CODE_POST, error = OT_ERROR_PARSE); LogMleMessage("Receive Address Solicit", aMessageInfo.GetPeerAddr()); @@ -4222,7 +4221,7 @@ void MleRouter::HandleAddressRelease(Coap::Message &aMessage, const Ip6::Message uint8_t routerId; Router * router; - VerifyOrExit(aMessage.GetType() == OT_COAP_TYPE_CONFIRMABLE && aMessage.GetCode() == OT_COAP_CODE_POST); + VerifyOrExit(aMessage.IsConfirmable() && aMessage.GetCode() == OT_COAP_CODE_POST); LogMleMessage("Receive Address Release", aMessageInfo.GetPeerAddr()); diff --git a/src/core/thread/network_diagnostic.cpp b/src/core/thread/network_diagnostic.cpp index fbd1422b6..f44a6380f 100644 --- a/src/core/thread/network_diagnostic.cpp +++ b/src/core/thread/network_diagnostic.cpp @@ -177,7 +177,7 @@ void NetworkDiagnostic::HandleDiagnosticGetAnswer(void * aContext, void NetworkDiagnostic::HandleDiagnosticGetAnswer(Coap::Message &aMessage, const Ip6::MessageInfo &aMessageInfo) { - VerifyOrExit(aMessage.GetType() == OT_COAP_TYPE_CONFIRMABLE && aMessage.GetCode() == OT_COAP_CODE_POST); + VerifyOrExit(aMessage.IsConfirmable() && aMessage.GetCode() == OT_COAP_CODE_POST); otLogInfoNetDiag("Diagnostic get answer received"); @@ -513,7 +513,7 @@ void NetworkDiagnostic::HandleDiagnosticGetQuery(Coap::Message &aMessage, const VerifyOrExit(networkDiagnosticTlv.GetType() == NetworkDiagnosticTlv::kTypeList, error = OT_ERROR_PARSE); // DIAG_GET.qry may be sent as a confirmable message. - if (aMessage.GetType() == OT_COAP_TYPE_CONFIRMABLE) + if (aMessage.IsConfirmable()) { if (Get().SendEmptyAck(aMessage, aMessageInfo) == OT_ERROR_NONE) { @@ -578,8 +578,7 @@ void NetworkDiagnostic::HandleDiagnosticGetRequest(Coap::Message &aMessage, cons NetworkDiagnosticTlv networkDiagnosticTlv; Ip6::MessageInfo messageInfo(aMessageInfo); - VerifyOrExit(aMessage.GetType() == OT_COAP_TYPE_CONFIRMABLE && aMessage.GetCode() == OT_COAP_CODE_POST, - error = OT_ERROR_DROP); + VerifyOrExit(aMessage.IsConfirmable() && aMessage.GetCode() == OT_COAP_CODE_POST, error = OT_ERROR_DROP); otLogInfoNetDiag("Received diagnostic get request"); @@ -681,7 +680,7 @@ void NetworkDiagnostic::HandleDiagnosticReset(Coap::Message &aMessage, const Ip6 otLogInfoNetDiag("Received diagnostic reset request"); - VerifyOrExit(aMessage.GetType() == OT_COAP_TYPE_CONFIRMABLE && aMessage.GetCode() == OT_COAP_CODE_POST); + VerifyOrExit(aMessage.IsConfirmable() && aMessage.GetCode() == OT_COAP_CODE_POST); VerifyOrExit((aMessage.Read(aMessage.GetOffset(), sizeof(NetworkDiagnosticTlv), &networkDiagnosticTlv) == sizeof(NetworkDiagnosticTlv)));