Add an accessing fabric index to AttributeAccessInterface writes.

We will need this for bindings.
project-chip · Nov 19, 2021 · a74de4b · a74de4b
1 parent ebadd33
commit a74de4b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/src/app/AttributeAccessInterface.h b/src/app/AttributeAccessInterface.h
@@ -105,7 +105,9 @@ class AttributeValueEncoder : protected TagBoundEncoder
 class AttributeValueDecoder
 {
 public:
-    AttributeValueDecoder(TLV::TLVReader & aReader) : mReader(aReader) {}
+    AttributeValueDecoder(TLV::TLVReader & aReader, FabricIndex aAccessingFabricIndex) :
+        mReader(aReader), mAccessingFabricIndex(aAccessingFabricIndex)
+    {}
 
     template <typename T>
     CHIP_ERROR Decode(T & aArg)
@@ -116,9 +118,15 @@ class AttributeValueDecoder
 
     bool TriedDecode() const { return mTriedDecode; }
 
+    /**
+     * The accessing fabric index for this write interaction.
+     */
+    FabricIndex AccessingFabricIndex() const { return mAccessingFabricIndex; }
+
 private:
     TLV::TLVReader & mReader;
     bool mTriedDecode = false;
+    const FabricIndex mAccessingFabricIndex;
 };
 
 class AttributeAccessInterface

diff --git a/src/app/WriteHandler.cpp b/src/app/WriteHandler.cpp
@@ -21,6 +21,7 @@
 #include <app/MessageDef/EventPathIB.h>
 #include <app/WriteHandler.h>
 #include <app/reporting/Engine.h>
+#include <app/server/Server.h>
 #include <app/util/MatterCallbacks.h>
 #include <lib/support/TypeTraits.h>
 
@@ -252,6 +253,11 @@ CHIP_ERROR WriteHandler::AddStatus(const AttributePathParams & aAttributePathPar
     return err;
 }
 
+FabricIndex WriteHandler::GetAccessingFabricIndex() const
+{
+    return mpExchangeCtx->GetSessionHandle().GetFabricIndex();
+}
+
 const char * WriteHandler::GetStateStr() const
 {
 #if CHIP_DETAIL_LOGGING

diff --git a/src/app/WriteHandler.h b/src/app/WriteHandler.h
@@ -20,6 +20,7 @@
 #include <app/AttributePathParams.h>
 #include <app/InteractionModelDelegate.h>
 #include <app/MessageDef/WriteResponseMessage.h>
+#include <credentials/FabricTable.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/core/CHIPTLVDebug.hpp>
 #include <lib/support/CodeUtils.h>
@@ -84,6 +85,8 @@ class WriteHandler
         return CHIP_ERROR_NOT_IMPLEMENTED;
     }
 
+    FabricIndex GetAccessingFabricIndex() const;
+
 private:
     enum class State
     {

diff --git a/src/app/util/ember-compatibility-functions.cpp b/src/app/util/ember-compatibility-functions.cpp
@@ -592,7 +592,7 @@ CHIP_ERROR WriteSingleClusterData(ClusterInfo & aClusterInfo, TLV::TLVReader & a
     AttributeAccessInterface * attrOverride = findAttributeAccessOverride(aClusterInfo.mEndpointId, aClusterInfo.mClusterId);
     if (attrOverride != nullptr)
     {
-        AttributeValueDecoder valueDecoder(aReader);
+        AttributeValueDecoder valueDecoder(aReader, apWriteHandler->GetAccessingFabricIndex());
         ReturnErrorOnFailure(attrOverride->Write(aPath, valueDecoder));
 
         if (valueDecoder.TriedDecode())