Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename ReadHandler::GetFabricIndex to GetAccessingFabricIndex. #12043

Merged
merged 1 commit into from
Nov 22, 2021
Merged

Rename ReadHandler::GetFabricIndex to GetAccessingFabricIndex. #12043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/InteractionModelEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ CHIP_ERROR InteractionModelEngine::OnReadInitialRequest(Messaging::ExchangeConte
{
if (!readHandler.IsFree() && readHandler.IsSubscriptionType() &&
readHandler.GetInitiatorNodeId() == apExchangeContext->GetSessionHandle().GetPeerNodeId() &&
readHandler.GetFabricIndex() == apExchangeContext->GetSessionHandle().GetFabricIndex())
readHandler.GetAccessingFabricIndex() == apExchangeContext->GetSessionHandle().GetFabricIndex())
{
bool keepSubscriptions = true;
System::PacketBufferTLVReader reader;
Expand Down
2 changes: 1 addition & 1 deletion src/app/ReadHandler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ class ReadHandler : public Messaging::ExchangeDelegate
void ClearDirty() { mDirty = false; }
bool IsDirty() { return mDirty; }
NodeId GetInitiatorNodeId() const { return mInitiatorNodeId; }
FabricIndex GetFabricIndex() const { return mFabricIndex; }
FabricIndex GetAccessingFabricIndex() const { return mFabricIndex; }
bzbarsky-apple marked this conversation as resolved.
Show resolved Hide resolved

private:
friend class TestReadInteraction;
Expand Down
2 changes: 1 addition & 1 deletion src/app/reporting/Engine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ CHIP_ERROR Engine::BuildSingleReportDataAttributeReportIBs(ReportDataMessage::Bu

TLV::TLVWriter attributeBackup;
attributeReportIBs.Checkpoint(attributeBackup);
err = RetrieveClusterData(apReadHandler->GetFabricIndex(), attributeReportIBs, readPath);
err = RetrieveClusterData(apReadHandler->GetAccessingFabricIndex(), attributeReportIBs, readPath);
if (err != CHIP_NO_ERROR)
{
// We met a error during writing reports, one common case is we are running out of buffer, rollback the
Expand Down