Skip to content

Commit

Permalink
Log payloads for read/subscribe even if we reject them. (#26188)
Browse files Browse the repository at this point in the history
Right now we only log read/subscribe payloads when we are actaully handling the
read/subscribe.  But that means when they are rejected it's hard to tell what
might have caused them to get rejected.

This just moves the logging to much earlier in the processing.
  • Loading branch information
bzbarsky-apple authored and pull[bot] committed Aug 4, 2023
1 parent b543af1 commit 1630956
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 6 deletions.
7 changes: 7 additions & 0 deletions src/app/InteractionModelEngine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,10 @@ Protocols::InteractionModel::Status InteractionModelEngine::OnReadInitialRequest
SubscribeRequestMessage::Parser subscribeRequestParser;
VerifyOrReturnError(subscribeRequestParser.Init(reader) == CHIP_NO_ERROR, Status::InvalidAction);

#if CHIP_CONFIG_IM_PRETTY_PRINT
subscribeRequestParser.PrettyPrint();
#endif

VerifyOrReturnError(subscribeRequestParser.GetKeepSubscriptions(&keepExistingSubscriptions) == CHIP_NO_ERROR,
Status::InvalidAction);
if (!keepExistingSubscriptions)
Expand Down Expand Up @@ -538,6 +542,9 @@ Protocols::InteractionModel::Status InteractionModelEngine::OnReadInitialRequest
ReadRequestMessage::Parser readRequestParser;
VerifyOrReturnError(readRequestParser.Init(reader) == CHIP_NO_ERROR, Status::InvalidAction);

#if CHIP_CONFIG_IM_PRETTY_PRINT
readRequestParser.PrettyPrint();
#endif
{
size_t requestedAttributePathCount = 0;
size_t requestedEventPathCount = 0;
Expand Down
14 changes: 8 additions & 6 deletions src/app/ReadHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -394,9 +394,10 @@ CHIP_ERROR ReadHandler::ProcessReadRequest(System::PacketBufferHandle && aPayloa
reader.Init(std::move(aPayload));

ReturnErrorOnFailure(readRequestParser.Init(reader));
#if CHIP_CONFIG_IM_PRETTY_PRINT
readRequestParser.PrettyPrint();
#endif

// No need to pretty-print here. We pretty-print read requests in the read
// case of InteractionModelEngine::OnReadInitialRequest, so we do it even if
// we reject a read request.

err = readRequestParser.GetAttributeRequests(&attributePathListParser);
if (err == CHIP_END_OF_TLV)
Expand Down Expand Up @@ -647,9 +648,10 @@ CHIP_ERROR ReadHandler::ProcessSubscribeRequest(System::PacketBufferHandle && aP

SubscribeRequestMessage::Parser subscribeRequestParser;
ReturnErrorOnFailure(subscribeRequestParser.Init(reader));
#if CHIP_CONFIG_IM_PRETTY_PRINT
subscribeRequestParser.PrettyPrint();
#endif

// No need to pretty-print here. We pretty-print subscribe requests in the
// subscribe case of InteractionModelEngine::OnReadInitialRequest, so we do
// it even if we reject a subscribe request.

AttributePathIBs::Parser attributePathListParser;
CHIP_ERROR err = subscribeRequestParser.GetAttributeRequests(&attributePathListParser);
Expand Down

0 comments on commit 1630956

Please sign in to comment.