diff --git a/src/app/MessageDef/AttributeDataIB.cpp b/src/app/MessageDef/AttributeDataIB.cpp index 31610bdee8bb70..072b5671ad5059 100644 --- a/src/app/MessageDef/AttributeDataIB.cpp +++ b/src/app/MessageDef/AttributeDataIB.cpp @@ -198,7 +198,10 @@ CHIP_ERROR AttributeDataIB::Parser::CheckSchemaValidity() const while (CHIP_NO_ERROR == (err = reader.Next())) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } uint32_t tagNum = TLV::TagNumFromTag(reader.GetTag()); switch (tagNum) { diff --git a/src/app/MessageDef/AttributePathIB.cpp b/src/app/MessageDef/AttributePathIB.cpp index 63e5b907639c14..c8fbb03e67a7a2 100644 --- a/src/app/MessageDef/AttributePathIB.cpp +++ b/src/app/MessageDef/AttributePathIB.cpp @@ -44,7 +44,10 @@ CHIP_ERROR AttributePathIB::Parser::CheckSchemaValidity() const while (CHIP_NO_ERROR == (err = reader.Next())) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } uint32_t tagNum = TLV::TagNumFromTag(reader.GetTag()); switch (tagNum) { diff --git a/src/app/MessageDef/AttributeReportIB.cpp b/src/app/MessageDef/AttributeReportIB.cpp index 502a9816613de7..40add8b660cdea 100644 --- a/src/app/MessageDef/AttributeReportIB.cpp +++ b/src/app/MessageDef/AttributeReportIB.cpp @@ -43,7 +43,10 @@ CHIP_ERROR AttributeReportIB::Parser::CheckSchemaValidity() const while (CHIP_NO_ERROR == (err = reader.Next())) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } uint32_t tagNum = TLV::TagNumFromTag(reader.GetTag()); switch (tagNum) { diff --git a/src/app/MessageDef/AttributeStatusIB.cpp b/src/app/MessageDef/AttributeStatusIB.cpp index c6124ed3c2669e..9a3bf1ee980dc0 100644 --- a/src/app/MessageDef/AttributeStatusIB.cpp +++ b/src/app/MessageDef/AttributeStatusIB.cpp @@ -42,7 +42,10 @@ CHIP_ERROR AttributeStatusIB::Parser::CheckSchemaValidity() const while (CHIP_NO_ERROR == (err = reader.Next())) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } uint32_t tagNum = TLV::TagNumFromTag(reader.GetTag()); switch (tagNum) { diff --git a/src/app/MessageDef/ClusterPathIB.cpp b/src/app/MessageDef/ClusterPathIB.cpp index 8147f0151f6149..a7105263dc5e9b 100644 --- a/src/app/MessageDef/ClusterPathIB.cpp +++ b/src/app/MessageDef/ClusterPathIB.cpp @@ -40,7 +40,10 @@ CHIP_ERROR ClusterPathIB::Parser::CheckSchemaValidity() const while (CHIP_NO_ERROR == (err = reader.Next())) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } uint32_t tagNum = TLV::TagNumFromTag(reader.GetTag()); switch (tagNum) { diff --git a/src/app/MessageDef/CommandDataIB.cpp b/src/app/MessageDef/CommandDataIB.cpp index cd75c24ce35fa9..5f24d1c828da2a 100644 --- a/src/app/MessageDef/CommandDataIB.cpp +++ b/src/app/MessageDef/CommandDataIB.cpp @@ -214,7 +214,10 @@ CHIP_ERROR CommandDataIB::Parser::CheckSchemaValidity() const while (CHIP_NO_ERROR == (err = reader.Next())) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } uint32_t tagNum = TLV::TagNumFromTag(reader.GetTag()); switch (tagNum) diff --git a/src/app/MessageDef/CommandPathIB.cpp b/src/app/MessageDef/CommandPathIB.cpp index 56004aab0efcd5..f947b221083812 100644 --- a/src/app/MessageDef/CommandPathIB.cpp +++ b/src/app/MessageDef/CommandPathIB.cpp @@ -45,7 +45,10 @@ CHIP_ERROR CommandPathIB::Parser::CheckSchemaValidity() const while (CHIP_NO_ERROR == (err = reader.Next())) { - VerifyOrExit(chip::TLV::IsContextTag(reader.GetTag()), err = CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (chip::TLV::TagNumFromTag(reader.GetTag())) { case kCsTag_EndpointId: diff --git a/src/app/MessageDef/CommandStatusIB.cpp b/src/app/MessageDef/CommandStatusIB.cpp index 463b495e44538c..8be31797735ef6 100644 --- a/src/app/MessageDef/CommandStatusIB.cpp +++ b/src/app/MessageDef/CommandStatusIB.cpp @@ -42,7 +42,10 @@ CHIP_ERROR CommandStatusIB::Parser::CheckSchemaValidity() const while (CHIP_NO_ERROR == (err = reader.Next())) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } uint32_t tagNum = TLV::TagNumFromTag(reader.GetTag()); switch (tagNum) { diff --git a/src/app/MessageDef/DataVersionFilterIB.cpp b/src/app/MessageDef/DataVersionFilterIB.cpp index f7826c7d52f73c..c68db041297d8e 100644 --- a/src/app/MessageDef/DataVersionFilterIB.cpp +++ b/src/app/MessageDef/DataVersionFilterIB.cpp @@ -46,7 +46,10 @@ CHIP_ERROR DataVersionFilterIB::Parser::CheckSchemaValidity() const while (CHIP_NO_ERROR == (err = reader.Next())) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } uint32_t tagNum = TLV::TagNumFromTag(reader.GetTag()); switch (tagNum) { diff --git a/src/app/MessageDef/EventDataIB.cpp b/src/app/MessageDef/EventDataIB.cpp index b1343f4357d795..5e8a076b69b4e0 100644 --- a/src/app/MessageDef/EventDataIB.cpp +++ b/src/app/MessageDef/EventDataIB.cpp @@ -193,7 +193,10 @@ CHIP_ERROR EventDataIB::Parser::CheckSchemaValidity() const while (CHIP_NO_ERROR == (err = reader.Next())) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } uint32_t tagNum = TLV::TagNumFromTag(reader.GetTag()); switch (tagNum) { diff --git a/src/app/MessageDef/EventFilterIB.cpp b/src/app/MessageDef/EventFilterIB.cpp index 8eab8ffa92d69b..5fc1824d7a7d07 100644 --- a/src/app/MessageDef/EventFilterIB.cpp +++ b/src/app/MessageDef/EventFilterIB.cpp @@ -46,7 +46,10 @@ CHIP_ERROR EventFilterIB::Parser::CheckSchemaValidity() const while (CHIP_NO_ERROR == (err = reader.Next())) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } uint32_t tagNum = TLV::TagNumFromTag(reader.GetTag()); switch (tagNum) { diff --git a/src/app/MessageDef/EventPathIB.cpp b/src/app/MessageDef/EventPathIB.cpp index a2e4f789012c40..3a2e13b1d84eda 100644 --- a/src/app/MessageDef/EventPathIB.cpp +++ b/src/app/MessageDef/EventPathIB.cpp @@ -43,7 +43,10 @@ CHIP_ERROR EventPathIB::Parser::CheckSchemaValidity() const while (CHIP_NO_ERROR == (err = reader.Next())) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } uint32_t tagNum = TLV::TagNumFromTag(reader.GetTag()); switch (tagNum) { diff --git a/src/app/MessageDef/EventReportIB.cpp b/src/app/MessageDef/EventReportIB.cpp index 8dac9c789db944..b9ac47d75da332 100644 --- a/src/app/MessageDef/EventReportIB.cpp +++ b/src/app/MessageDef/EventReportIB.cpp @@ -43,7 +43,10 @@ CHIP_ERROR EventReportIB::Parser::CheckSchemaValidity() const while (CHIP_NO_ERROR == (err = reader.Next())) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } uint32_t tagNum = TLV::TagNumFromTag(reader.GetTag()); switch (tagNum) { diff --git a/src/app/MessageDef/EventStatusIB.cpp b/src/app/MessageDef/EventStatusIB.cpp index 536f28b703f8b5..84188a16370f9d 100644 --- a/src/app/MessageDef/EventStatusIB.cpp +++ b/src/app/MessageDef/EventStatusIB.cpp @@ -42,7 +42,10 @@ CHIP_ERROR EventStatusIB::Parser::CheckSchemaValidity() const while (CHIP_NO_ERROR == (err = reader.Next())) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } uint32_t tagNum = TLV::TagNumFromTag(reader.GetTag()); switch (tagNum) { diff --git a/src/app/MessageDef/InvokeRequestMessage.cpp b/src/app/MessageDef/InvokeRequestMessage.cpp index 54bd6670a4cbd2..2610a4d4e7ca5a 100644 --- a/src/app/MessageDef/InvokeRequestMessage.cpp +++ b/src/app/MessageDef/InvokeRequestMessage.cpp @@ -40,7 +40,10 @@ CHIP_ERROR InvokeRequestMessage::Parser::CheckSchemaValidity() const while (CHIP_NO_ERROR == (err = reader.Next())) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } uint32_t tagNum = TLV::TagNumFromTag(reader.GetTag()); switch (tagNum) { diff --git a/src/app/MessageDef/InvokeResponseIB.cpp b/src/app/MessageDef/InvokeResponseIB.cpp index 5ce38453e5e66a..d28dc49ccad6e3 100644 --- a/src/app/MessageDef/InvokeResponseIB.cpp +++ b/src/app/MessageDef/InvokeResponseIB.cpp @@ -40,7 +40,10 @@ CHIP_ERROR InvokeResponseIB::Parser::CheckSchemaValidity() const while (CHIP_NO_ERROR == (err = reader.Next())) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } uint32_t tagNum = TLV::TagNumFromTag(reader.GetTag()); switch (tagNum) { diff --git a/src/app/MessageDef/InvokeResponseMessage.cpp b/src/app/MessageDef/InvokeResponseMessage.cpp index c36e76abfdefc3..80c22a960a5f91 100644 --- a/src/app/MessageDef/InvokeResponseMessage.cpp +++ b/src/app/MessageDef/InvokeResponseMessage.cpp @@ -40,7 +40,10 @@ CHIP_ERROR InvokeResponseMessage::Parser::CheckSchemaValidity() const while (CHIP_NO_ERROR == (err = reader.Next())) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } uint32_t tagNum = TLV::TagNumFromTag(reader.GetTag()); switch (tagNum) { diff --git a/src/app/MessageDef/ReadRequestMessage.cpp b/src/app/MessageDef/ReadRequestMessage.cpp index 97d2a2abb88105..0f25328584e7f6 100644 --- a/src/app/MessageDef/ReadRequestMessage.cpp +++ b/src/app/MessageDef/ReadRequestMessage.cpp @@ -40,7 +40,10 @@ CHIP_ERROR ReadRequestMessage::Parser::CheckSchemaValidity() const while (CHIP_NO_ERROR == (err = reader.Next())) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } uint32_t tagNum = TLV::TagNumFromTag(reader.GetTag()); switch (tagNum) { diff --git a/src/app/MessageDef/ReportDataMessage.cpp b/src/app/MessageDef/ReportDataMessage.cpp index 51d6b678a3fe00..6a244896ce454b 100644 --- a/src/app/MessageDef/ReportDataMessage.cpp +++ b/src/app/MessageDef/ReportDataMessage.cpp @@ -52,7 +52,10 @@ CHIP_ERROR ReportDataMessage::Parser::CheckSchemaValidity() const while (CHIP_NO_ERROR == (err = reader.Next())) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } uint32_t tagNum = TLV::TagNumFromTag(reader.GetTag()); switch (tagNum) { diff --git a/src/app/MessageDef/StatusIB.cpp b/src/app/MessageDef/StatusIB.cpp index 37fbca49cab78b..7707011dfb017e 100644 --- a/src/app/MessageDef/StatusIB.cpp +++ b/src/app/MessageDef/StatusIB.cpp @@ -45,7 +45,10 @@ CHIP_ERROR StatusIB::Parser::DecodeStatusIB(StatusIB & aStatusIB) const reader.Init(mReader); while (CHIP_NO_ERROR == reader.Next()) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Tag::kStatus): @@ -75,7 +78,10 @@ CHIP_ERROR StatusIB::Parser::CheckSchemaValidity() const reader.Init(mReader); while (CHIP_NO_ERROR == (err = reader.Next())) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } if (!(TagPresenceMask & (1 << to_underlying(Tag::kStatus)))) { TagPresenceMask |= (1 << to_underlying(Tag::kStatus)); diff --git a/src/app/MessageDef/StatusResponseMessage.cpp b/src/app/MessageDef/StatusResponseMessage.cpp index d0a605e1c47d98..0b09592f015bb6 100644 --- a/src/app/MessageDef/StatusResponseMessage.cpp +++ b/src/app/MessageDef/StatusResponseMessage.cpp @@ -36,7 +36,10 @@ CHIP_ERROR StatusResponseMessage::Parser::CheckSchemaValidity() const while (CHIP_NO_ERROR == (err = reader.Next())) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Tag::kStatus): diff --git a/src/app/MessageDef/StructParser.cpp b/src/app/MessageDef/StructParser.cpp index c1886939ce5993..b6150b677efe25 100644 --- a/src/app/MessageDef/StructParser.cpp +++ b/src/app/MessageDef/StructParser.cpp @@ -36,7 +36,11 @@ CHIP_ERROR StructParser::CheckSchemaOrdering() const bool first = true; while (CHIP_NO_ERROR == (err = reader.Next())) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + // Just skip over non-context tags, for forward compat. + continue; + } uint32_t tagNum = TLV::TagNumFromTag(reader.GetTag()); if (first || (preTagNum < tagNum)) { diff --git a/src/app/MessageDef/SubscribeRequestMessage.cpp b/src/app/MessageDef/SubscribeRequestMessage.cpp index f0098b53fd8248..a30f577a3ad61b 100644 --- a/src/app/MessageDef/SubscribeRequestMessage.cpp +++ b/src/app/MessageDef/SubscribeRequestMessage.cpp @@ -34,7 +34,10 @@ CHIP_ERROR SubscribeRequestMessage::Parser::CheckSchemaValidity() const while (CHIP_NO_ERROR == (err = reader.Next())) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } uint32_t tagNum = TLV::TagNumFromTag(reader.GetTag()); switch (tagNum) { diff --git a/src/app/MessageDef/SubscribeResponseMessage.cpp b/src/app/MessageDef/SubscribeResponseMessage.cpp index 99a18e734b6166..f422395f8e5aef 100644 --- a/src/app/MessageDef/SubscribeResponseMessage.cpp +++ b/src/app/MessageDef/SubscribeResponseMessage.cpp @@ -33,7 +33,10 @@ CHIP_ERROR SubscribeResponseMessage::Parser::CheckSchemaValidity() const while (CHIP_NO_ERROR == (err = reader.Next())) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } uint32_t tagNum = TLV::TagNumFromTag(reader.GetTag()); switch (tagNum) { diff --git a/src/app/MessageDef/TimedRequestMessage.cpp b/src/app/MessageDef/TimedRequestMessage.cpp index 0b3041a44d6923..957cd5e4d6c905 100644 --- a/src/app/MessageDef/TimedRequestMessage.cpp +++ b/src/app/MessageDef/TimedRequestMessage.cpp @@ -33,7 +33,10 @@ CHIP_ERROR TimedRequestMessage::Parser::CheckSchemaValidity() const while (CHIP_NO_ERROR == (err = reader.Next())) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } uint32_t tagNum = TLV::TagNumFromTag(reader.GetTag()); switch (tagNum) { diff --git a/src/app/MessageDef/WriteRequestMessage.cpp b/src/app/MessageDef/WriteRequestMessage.cpp index df586e55077b32..b367530711d097 100644 --- a/src/app/MessageDef/WriteRequestMessage.cpp +++ b/src/app/MessageDef/WriteRequestMessage.cpp @@ -45,7 +45,10 @@ CHIP_ERROR WriteRequestMessage::Parser::CheckSchemaValidity() const while (CHIP_NO_ERROR == (err = reader.Next())) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } uint32_t tagNum = TLV::TagNumFromTag(reader.GetTag()); switch (tagNum) { diff --git a/src/app/MessageDef/WriteResponseMessage.cpp b/src/app/MessageDef/WriteResponseMessage.cpp index d0b70644037d6a..5beaed04e87a11 100644 --- a/src/app/MessageDef/WriteResponseMessage.cpp +++ b/src/app/MessageDef/WriteResponseMessage.cpp @@ -40,7 +40,10 @@ CHIP_ERROR WriteResponseMessage::Parser::CheckSchemaValidity() const while (CHIP_NO_ERROR == (err = reader.Next())) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), err = CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } uint32_t tagNum = TLV::TagNumFromTag(reader.GetTag()); switch (tagNum) { diff --git a/src/app/zap-templates/partials/cluster-objects-struct.zapt b/src/app/zap-templates/partials/cluster-objects-struct.zapt index 67f6e5732c8e7e..2939e4c375a664 100644 --- a/src/app/zap-templates/partials/cluster-objects-struct.zapt +++ b/src/app/zap-templates/partials/cluster-objects-struct.zapt @@ -119,7 +119,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader &reader) { err = reader.EnterContainer(outer); ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { {{#zcl_struct_items}} diff --git a/src/app/zap-templates/templates/app/cluster-objects-src.zapt b/src/app/zap-templates/templates/app/cluster-objects-src.zapt index be048a3e15d1fc..1d1c070e9e2652 100644 --- a/src/app/zap-templates/templates/app/cluster-objects-src.zapt +++ b/src/app/zap-templates/templates/app/cluster-objects-src.zapt @@ -50,7 +50,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader &reader) { VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { {{#zcl_command_arguments}} @@ -111,7 +114,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader &reader) { VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { {{#zcl_event_fields}} diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index bfe5c28aa688f2..4602c3c8be6bfa 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -46,7 +46,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kLabel): @@ -363,7 +366,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kIdentifyTime): @@ -397,7 +403,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kTimeout): @@ -430,7 +439,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -462,7 +474,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kEffectIdentifier): @@ -543,7 +558,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kGroupId): @@ -581,7 +599,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStatus): @@ -618,7 +639,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kGroupId): @@ -654,7 +678,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStatus): @@ -694,7 +721,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kGroupList): @@ -729,7 +759,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kCapacity): @@ -766,7 +799,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kGroupId): @@ -801,7 +837,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStatus): @@ -837,7 +876,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -869,7 +911,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kGroupId): @@ -948,7 +993,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kClusterId): @@ -998,7 +1046,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kGroupId): @@ -1046,7 +1097,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStatus): @@ -1087,7 +1141,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kGroupId): @@ -1130,7 +1187,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStatus): @@ -1180,7 +1240,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kGroupId): @@ -1219,7 +1282,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStatus): @@ -1259,7 +1325,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kGroupId): @@ -1294,7 +1363,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStatus): @@ -1332,7 +1404,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kGroupId): @@ -1371,7 +1446,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStatus): @@ -1413,7 +1491,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kGroupId): @@ -1453,7 +1534,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kGroupId): @@ -1491,7 +1575,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStatus): @@ -1542,7 +1629,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kGroupId): @@ -1590,7 +1680,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStatus): @@ -1631,7 +1724,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kGroupId): @@ -1674,7 +1770,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStatus): @@ -1727,7 +1826,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kMode): @@ -1775,7 +1877,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStatus): @@ -1869,7 +1974,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -1899,7 +2007,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -1929,7 +2040,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -1961,7 +2075,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kEffectId): @@ -1997,7 +2114,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -2030,7 +2150,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kOnOffControl): @@ -2168,7 +2291,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kLevel): @@ -2214,7 +2340,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kMoveMode): @@ -2261,7 +2390,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStepMode): @@ -2308,7 +2440,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kOptionMask): @@ -2346,7 +2481,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kLevel): @@ -2384,7 +2522,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kMoveMode): @@ -2423,7 +2564,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStepMode): @@ -2462,7 +2606,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -2573,7 +2720,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kAlarmCode): @@ -2611,7 +2761,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kAlarmCode): @@ -2647,7 +2800,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -2681,7 +2837,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStatus): @@ -2723,7 +2882,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -2753,7 +2915,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -2959,7 +3124,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kPowerProfileId): @@ -3006,7 +3174,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kEnergyPhaseId): @@ -3052,7 +3223,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kEnergyPhaseId): @@ -3106,7 +3280,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kPowerProfileId): @@ -3144,7 +3321,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kTotalProfileNum): @@ -3186,7 +3366,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -3221,7 +3404,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kTotalProfileNum): @@ -3268,7 +3454,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kPowerProfileId): @@ -3313,7 +3502,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kPowerProfileCount): @@ -3353,7 +3545,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kCurrency): @@ -3393,7 +3588,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kPowerProfileId): @@ -3430,7 +3628,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kPowerProfileId): @@ -3472,7 +3673,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kPowerProfileCount): @@ -3512,7 +3716,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kPowerProfileId): @@ -3551,7 +3758,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -3582,7 +3792,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kPowerProfileId): @@ -3616,7 +3829,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kPowerProfileId): @@ -3650,7 +3866,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kPowerProfileId): @@ -3687,7 +3906,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kPowerProfileId): @@ -3731,7 +3953,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kPowerProfileId): @@ -3777,7 +4002,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kPowerProfileId): @@ -3819,7 +4047,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kPowerProfileId): @@ -3861,7 +4092,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kPowerProfileId): @@ -3904,7 +4138,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kOptions): @@ -3996,7 +4233,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kCommandId): @@ -4033,7 +4273,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kApplianceStatus): @@ -4072,7 +4315,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -4106,7 +4352,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kApplianceStatus): @@ -4148,7 +4397,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kFunctionId): @@ -4187,7 +4439,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -4217,7 +4472,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -4248,7 +4506,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kWarningEvent): @@ -4366,7 +4627,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kType): @@ -4474,7 +4738,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kNode): @@ -4567,7 +4834,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kCluster): @@ -4640,7 +4910,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kPrivilege): @@ -4707,7 +4980,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kData): @@ -4800,7 +5076,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kAdminNodeID): @@ -4851,7 +5130,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kAdminNodeID): @@ -4902,7 +5184,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -4934,7 +5219,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStartFastPolling): @@ -4970,7 +5258,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -5002,7 +5293,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kNewLongPollInterval): @@ -5037,7 +5331,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kNewShortPollInterval): @@ -5134,7 +5431,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kActionID): @@ -5189,7 +5489,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kEndpointListID): @@ -5238,7 +5541,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kActionID): @@ -5277,7 +5583,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kActionID): @@ -5318,7 +5627,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kActionID): @@ -5357,7 +5669,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kActionID): @@ -5398,7 +5713,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kActionID): @@ -5436,7 +5754,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kActionID): @@ -5475,7 +5796,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kActionID): @@ -5516,7 +5840,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kActionID): @@ -5554,7 +5881,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kActionID): @@ -5593,7 +5923,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kActionID): @@ -5634,7 +5967,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kActionID): @@ -5673,7 +6009,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kActionID): @@ -5755,7 +6094,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kActionID): @@ -5798,7 +6140,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kActionID): @@ -5850,7 +6195,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kCaseSessionsPerFabric): @@ -5891,7 +6239,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -6013,7 +6364,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kSoftwareVersion): @@ -6046,7 +6400,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -6076,7 +6433,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -6107,7 +6467,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kReachableNewValue): @@ -6157,7 +6520,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kVendorId): @@ -6221,7 +6587,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStatus): @@ -6277,7 +6646,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kUpdateToken): @@ -6315,7 +6687,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kAction): @@ -6353,7 +6728,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kUpdateToken): @@ -6442,7 +6820,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kProviderNodeID): @@ -6492,7 +6873,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kProviderNodeId): @@ -6585,7 +6969,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kPreviousState): @@ -6629,7 +7016,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kSoftwareVersion): @@ -6669,7 +7059,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kSoftwareVersion): @@ -6888,7 +7281,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kCurrent): @@ -6929,7 +7325,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kCurrent): @@ -6970,7 +7369,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kCurrent): @@ -7143,7 +7545,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kFailSafeExpiryLengthSeconds): @@ -7184,7 +7589,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kExpiryLengthSeconds): @@ -7222,7 +7630,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kErrorCode): @@ -7262,7 +7673,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kNewRegulatoryConfig): @@ -7303,7 +7717,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kErrorCode): @@ -7339,7 +7756,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -7371,7 +7791,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kErrorCode): @@ -7461,7 +7884,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kNetworkID): @@ -7508,7 +7934,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kPanId): @@ -7571,7 +8000,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kSecurity): @@ -7626,7 +8058,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kSsid): @@ -7666,7 +8101,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kNetworkingStatus): @@ -7711,7 +8149,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kSsid): @@ -7753,7 +8194,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kOperationalDataset): @@ -7791,7 +8235,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kNetworkID): @@ -7830,7 +8277,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kNetworkingStatus): @@ -7871,7 +8321,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kNetworkID): @@ -7910,7 +8363,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kNetworkingStatus): @@ -7952,7 +8408,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kNetworkID): @@ -8056,7 +8515,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kIntent): @@ -8099,7 +8561,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStatus): @@ -8188,7 +8653,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kName): @@ -8304,7 +8772,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kCurrent): @@ -8342,7 +8813,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kCurrent): @@ -8380,7 +8854,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kCurrent): @@ -8417,7 +8894,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kBootReason): @@ -8459,7 +8939,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kId): @@ -8506,7 +8989,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kId): @@ -8556,7 +9042,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -8630,7 +9119,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kSoftwareFault): @@ -8683,7 +9175,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kExtAddress): @@ -8777,7 +9272,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kActiveTimestampPresent): @@ -8856,7 +9354,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kExtAddress): @@ -8921,7 +9422,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kRotationTime): @@ -8962,7 +9466,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -9213,7 +9720,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kConnectionStatus): @@ -9252,7 +9762,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -9353,7 +9866,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kReasonCode): @@ -9389,7 +9905,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kAssociationFailure): @@ -9426,7 +9945,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kConnectionStatus): @@ -9465,7 +9987,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -9673,7 +10198,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kSoftwareVersion): @@ -9706,7 +10234,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -9736,7 +10267,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -9767,7 +10301,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kReachableNewValue): @@ -9847,7 +10384,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kNewPosition): @@ -9881,7 +10421,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kNewPosition): @@ -9915,7 +10458,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kNewPosition): @@ -9949,7 +10495,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kPreviousPosition): @@ -9983,7 +10532,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kPreviousPosition): @@ -10019,7 +10571,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kNewPosition): @@ -10058,7 +10613,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kNewPosition): @@ -10106,7 +10664,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kCommissioningTimeout): @@ -10153,7 +10714,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kCommissioningTimeout): @@ -10186,7 +10750,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -10281,7 +10848,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kRootPublicKey): @@ -10355,7 +10925,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kNoc): @@ -10400,7 +10973,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kAttestationNonce): @@ -10436,7 +11012,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kAttestationElements): @@ -10473,7 +11052,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kCertificateType): @@ -10507,7 +11089,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kCertificate): @@ -10541,7 +11126,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kCSRNonce): @@ -10577,7 +11165,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kNOCSRElements): @@ -10618,7 +11209,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kNOCValue): @@ -10665,7 +11259,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kNOCValue): @@ -10704,7 +11301,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStatusCode): @@ -10744,7 +11344,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kLabel): @@ -10778,7 +11381,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kFabricIndex): @@ -10812,7 +11418,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kRootCertificate): @@ -10847,7 +11456,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kTrustedRootIdentifier): @@ -10952,7 +11564,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kGroupId): @@ -11013,7 +11628,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kGroupId): @@ -11064,7 +11682,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kGroupKeySetID): @@ -11124,7 +11745,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kGroupKeySet): @@ -11158,7 +11782,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kGroupKeySetID): @@ -11192,7 +11819,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kGroupKeySet): @@ -11226,7 +11856,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kGroupKeySetID): @@ -11260,7 +11893,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kGroupKeySetIDs): @@ -11294,7 +11930,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kGroupKeySetIDs): @@ -11606,7 +12245,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStateValue): @@ -11648,7 +12290,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kLabel): @@ -11692,7 +12337,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kMfgCode): @@ -11734,7 +12382,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kNewMode): @@ -11876,7 +12527,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kCredentialType): @@ -11918,7 +12572,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kPinCode): @@ -11952,7 +12609,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kPinCode): @@ -11987,7 +12647,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kTimeout): @@ -12024,7 +12687,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kLogIndex): @@ -12065,7 +12731,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kLogEntryId): @@ -12120,7 +12789,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kUserId): @@ -12163,7 +12835,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kUserId): @@ -12200,7 +12875,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kUserId): @@ -12243,7 +12921,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kPinSlotIndex): @@ -12276,7 +12957,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -12308,7 +12992,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kUserId): @@ -12345,7 +13032,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kUserId): @@ -12380,7 +13070,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kUserId): @@ -12423,7 +13116,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kWeekDayIndex): @@ -12476,7 +13172,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kWeekDayIndex): @@ -12520,7 +13219,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kWeekDayIndex): @@ -12576,7 +13278,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kWeekDayIndex): @@ -12616,7 +13321,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kYearDayIndex): @@ -12660,7 +13368,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kYearDayIndex): @@ -12701,7 +13412,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kYearDayIndex): @@ -12748,7 +13462,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kYearDayIndex): @@ -12788,7 +13505,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kHolidayIndex): @@ -12831,7 +13551,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kHolidayIndex): @@ -12869,7 +13592,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kHolidayIndex): @@ -12915,7 +13641,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kHolidayIndex): @@ -12950,7 +13679,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kUserId): @@ -12987,7 +13719,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kUserId): @@ -13022,7 +13757,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kUserId): @@ -13062,7 +13800,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kUserId): @@ -13105,7 +13846,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kUserId): @@ -13142,7 +13886,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kUserId): @@ -13185,7 +13932,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kRfidSlotIndex): @@ -13218,7 +13968,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -13255,7 +14008,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kOperationType): @@ -13307,7 +14063,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kUserIndex): @@ -13352,7 +14111,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kUserIndex): @@ -13413,7 +14175,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kUserIndex): @@ -13454,7 +14219,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kOperationEventSource): @@ -13511,7 +14279,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kProgramEventSource): @@ -13571,7 +14342,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kOperationType): @@ -13623,7 +14397,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStatus): @@ -13663,7 +14440,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kCredential): @@ -13700,7 +14480,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kCredentialExists): @@ -13740,7 +14523,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kCredential): @@ -13940,7 +14726,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kAlarmCode): @@ -13974,7 +14763,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kDoorState): @@ -14013,7 +14805,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kLockOperationType): @@ -14068,7 +14863,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kLockOperationType): @@ -14126,7 +14924,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kLockDataType): @@ -14183,7 +14984,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -14213,7 +15017,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -14243,7 +15050,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -14274,7 +15084,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kLiftValue): @@ -14311,7 +15124,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kLiftPercentageValue): @@ -14348,7 +15164,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kTiltValue): @@ -14385,7 +15204,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kTiltPercentageValue): @@ -14525,7 +15347,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kPercentOpen): @@ -14558,7 +15383,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -14758,7 +15586,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -14788,7 +15619,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -14818,7 +15652,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -14848,7 +15685,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -14878,7 +15718,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -14908,7 +15751,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -14938,7 +15784,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -14968,7 +15817,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -14998,7 +15850,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -15028,7 +15883,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -15058,7 +15916,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -15088,7 +15949,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -15118,7 +15982,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -15148,7 +16015,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -15178,7 +16048,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -15208,7 +16081,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -15238,7 +16114,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -15276,7 +16155,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kMode): @@ -15318,7 +16200,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kNumberOfTransitionsForSequence): @@ -15366,7 +16251,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kNumberOfTransitionsForSequence): @@ -15415,7 +16303,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kTimeOfDay): @@ -15465,7 +16356,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kDaysToReturn): @@ -15501,7 +16395,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -15531,7 +16428,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -15909,7 +16809,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kHue): @@ -15958,7 +16861,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kMoveMode): @@ -16005,7 +16911,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStepMode): @@ -16054,7 +16963,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kSaturation): @@ -16100,7 +17012,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kMoveMode): @@ -16147,7 +17062,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStepMode): @@ -16197,7 +17115,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kHue): @@ -16247,7 +17168,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kColorX): @@ -16296,7 +17220,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kRateX): @@ -16343,7 +17270,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStepX): @@ -16392,7 +17322,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kColorTemperature): @@ -16439,7 +17372,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kEnhancedHue): @@ -16488,7 +17424,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kMoveMode): @@ -16535,7 +17474,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStepMode): @@ -16585,7 +17527,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kEnhancedHue): @@ -16637,7 +17582,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kUpdateFlags): @@ -16690,7 +17638,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kOptionsMask): @@ -16734,7 +17685,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kMoveMode): @@ -16791,7 +17745,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStepMode): @@ -18929,7 +19886,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kEnrollResponseCode): @@ -18969,7 +19929,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kZoneStatus): @@ -19011,7 +19974,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -19043,7 +20009,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kZoneType): @@ -19082,7 +20051,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kTestModeDuration): @@ -19118,7 +20090,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -19148,7 +20123,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -19238,7 +20216,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kZoneId): @@ -19282,7 +20263,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kArmMode): @@ -19322,7 +20306,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kArmNotification): @@ -19358,7 +20345,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kNumberOfZones): @@ -19413,7 +20403,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kSection0): @@ -19491,7 +20484,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -19525,7 +20521,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kZoneId): @@ -19567,7 +20566,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -19602,7 +20604,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kZoneId): @@ -19644,7 +20649,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -19679,7 +20687,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kPanelStatus): @@ -19721,7 +20732,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -19756,7 +20770,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kPanelStatus): @@ -19799,7 +20816,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kZoneId): @@ -19834,7 +20854,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kNumberOfZones): @@ -19870,7 +20893,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -19902,7 +20928,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kNumberOfZones): @@ -19938,7 +20967,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -19972,7 +21004,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kZoneStatusComplete): @@ -20017,7 +21052,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStartingZoneId): @@ -20100,7 +21138,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kWarningInfo): @@ -20143,7 +21184,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kSquawkInfo): @@ -20261,7 +21305,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kMajorNumber): @@ -20313,7 +21360,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kOperatorName): @@ -20361,7 +21411,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kMatch): @@ -20396,7 +21449,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStatus): @@ -20434,7 +21490,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kMajorNumber): @@ -20471,7 +21530,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kCount): @@ -20552,7 +21614,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kIdentifier): @@ -20595,7 +21660,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kTarget): @@ -20633,7 +21701,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStatus): @@ -20714,7 +21785,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kUpdatedAt): @@ -20755,7 +21829,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -20785,7 +21862,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -20815,7 +21895,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -20845,7 +21928,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -20875,7 +21961,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -20905,7 +21994,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -20935,7 +22027,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -20965,7 +22060,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -20997,7 +22095,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kDeltaPositionMilliseconds): @@ -21032,7 +22133,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kDeltaPositionMilliseconds): @@ -21067,7 +22171,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStatus): @@ -21104,7 +22211,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kPosition): @@ -21199,7 +22309,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kIndex): @@ -21247,7 +22360,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kIndex): @@ -21280,7 +22396,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -21310,7 +22429,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -21342,7 +22464,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kIndex): @@ -21421,7 +22546,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -21489,7 +22617,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kKeyCode): @@ -21523,7 +22654,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStatus): @@ -21596,7 +22730,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kWidth): @@ -21640,7 +22777,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kName): @@ -21682,7 +22822,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kType): @@ -21725,7 +22868,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kParameterList): @@ -21764,7 +22910,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kImageUrl): @@ -21812,7 +22961,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kProviderName): @@ -21868,7 +23020,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kSearch): @@ -21911,7 +23066,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kContentURL): @@ -21952,7 +23110,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStatus): @@ -22034,7 +23195,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kIndex): @@ -22079,7 +23243,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kIndex): @@ -22114,7 +23281,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kIndex): @@ -22195,7 +23365,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kCatalogVendorId): @@ -22236,7 +23409,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kApplication): @@ -22279,7 +23455,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kApplication): @@ -22316,7 +23495,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kApplication): @@ -22350,7 +23532,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kApplication): @@ -22385,7 +23570,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStatus): @@ -22466,7 +23654,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kCatalogVendorId): @@ -22570,7 +23761,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kTempAccountIdentifier): @@ -22604,7 +23798,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kSetupPIN): @@ -22640,7 +23837,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kTempAccountIdentifier): @@ -22676,7 +23876,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -22751,7 +23954,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kA): @@ -22859,7 +24065,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kFabricSensitiveInt8u): @@ -22932,7 +24141,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kNullableInt): @@ -23004,7 +24216,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kA): @@ -23053,7 +24268,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kA): @@ -23108,7 +24326,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kA): @@ -23146,7 +24367,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kFabricIndex): @@ -23187,7 +24411,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -23218,7 +24445,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kReturnValue): @@ -23251,7 +24481,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -23282,7 +24515,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kReturnValue): @@ -23315,7 +24551,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -23346,7 +24585,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kReturnValue): @@ -23379,7 +24621,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -23415,7 +24660,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kArg1): @@ -23465,7 +24713,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kArg1): @@ -23502,7 +24753,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kArg1): @@ -23536,7 +24790,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kArg1): @@ -23571,7 +24828,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kArg1): @@ -23613,7 +24873,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kArg1): @@ -23665,7 +24928,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kWasPresent): @@ -23708,7 +24974,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kArg1): @@ -23793,7 +25062,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kNullableIntWasNull): @@ -23908,7 +25180,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kArg1): @@ -23942,7 +25217,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kValue): @@ -23976,7 +25254,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kArg1): @@ -24010,7 +25291,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kArg1): @@ -24044,7 +25328,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kArg1): @@ -24078,7 +25365,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kValue): @@ -24112,7 +25402,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kArg1): @@ -24146,7 +25439,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kValue): @@ -24180,7 +25476,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kArg1): @@ -24214,7 +25513,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kArg1): @@ -24249,7 +25551,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kArg1): @@ -24286,7 +25591,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kArg1): @@ -24335,7 +25643,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kNullableInt): @@ -24402,7 +25713,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kArg1): @@ -24435,7 +25749,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -24466,7 +25783,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kArg1): @@ -24502,7 +25822,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kArg1): @@ -24542,7 +25865,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kArg1): @@ -24855,7 +26181,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kArg1): @@ -24904,7 +26233,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kArg1): @@ -24950,7 +26282,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kMessageId): @@ -24998,7 +26333,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -25030,7 +26368,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kMessageId): @@ -25071,7 +26412,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kMessageId): @@ -25120,7 +26464,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kMessageId): @@ -25170,7 +26517,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kEarliestImplementationTime): @@ -25205,7 +26555,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kImplementationDateTime): @@ -25421,7 +26774,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -25453,7 +26809,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kAlertsCount): @@ -25491,7 +26850,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kAlertsCount): @@ -25529,7 +26891,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kEventHeader): @@ -25606,7 +26971,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kTimeStamp): @@ -25649,7 +27017,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kLogId): @@ -25686,7 +27057,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kTimeStamp): @@ -25728,7 +27102,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -25760,7 +27137,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kLogQueueSize): @@ -25798,7 +27178,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kLogQueueSize): @@ -25883,7 +27266,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kProfileCount): @@ -25925,7 +27311,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { default: @@ -25963,7 +27352,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kStartTime): @@ -26014,7 +27406,10 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.EnterContainer(outer)); while ((err = reader.Next()) == CHIP_NO_ERROR) { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } switch (TLV::TagNumFromTag(reader.GetTag())) { case to_underlying(Fields::kAttributeId):