Remove separate member for accessing fabric index

project-chip · Oct 9, 2024 · 38e3bdb · 38e3bdb
1 parent fcdb555
commit 38e3bdb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/app/CommandHandlerImpl.cpp b/src/app/CommandHandlerImpl.cpp
@@ -395,7 +395,6 @@ Status CommandHandlerImpl::ProcessCommandDataIB(CommandDataIB::Parser & aCommand
 
         request.path                 = concretePath;
         request.subjectDescriptor    = GetSubjectDescriptor();
-        request.accessingFabricIndex = GetAccessingFabricIndex();
         request.invokeFlags.Set(DataModel::InvokeFlags::kTimed, IsTimedInvoke());
 
         Status preCheckStatus = mpCallback->ValidateCommandCanBeDispatched(request);
@@ -518,7 +517,6 @@ Status CommandHandlerImpl::ProcessGroupCommandDataIB(CommandDataIB::Parser & aCo
 
             request.path                 = concretePath;
             request.subjectDescriptor    = GetSubjectDescriptor();
-            request.accessingFabricIndex = GetAccessingFabricIndex();
             request.invokeFlags.Set(DataModel::InvokeFlags::kTimed, IsTimedInvoke());
 
             Status preCheckStatus = mpCallback->ValidateCommandCanBeDispatched(request);

diff --git a/src/app/InteractionModelEngine.cpp b/src/app/InteractionModelEngine.cpp
@@ -1763,7 +1763,7 @@ Protocols::InteractionModel::Status InteractionModelEngine::CheckCommandFlags(co
 
         // Fabric-scoped commands are not allowed before a specific accessing fabric is available.
         // This is mostly just during a PASE session before AddNOC.
-        if (aRequest.accessingFabricIndex == kUndefinedFabricIndex)
+        if (aRequest.GetAccessingFabricIndex() == kUndefinedFabricIndex)
         {
             return Status::UnsupportedAccess;
         }

diff --git a/src/app/data-model-provider/OperationTypes.h b/src/app/data-model-provider/OperationTypes.h
@@ -56,6 +56,14 @@ struct OperationRequest
     ///
     /// NOTE: once kInternal flag is removed, this will become non-optional
     std::optional<chip::Access::SubjectDescriptor> subjectDescriptor;
+
+    /// Accessing fabric index is the subjectDescriptor fabric index (if any).
+    /// This is a readability convenience function.
+    ///
+    /// Returns kUndefinedFabricIndex if no subject descriptor is available
+    FabricIndex GetAccessingFabricIndex() const {
+        return subjectDescriptor.has_value() ? subjectDescriptor->fabricIndex : kUndefinedFabricIndex;
+    }
 };
 
 enum class ReadFlags : uint32_t
@@ -100,7 +108,6 @@ struct InvokeRequest : OperationRequest
 {
     ConcreteCommandPath path;
     BitFlags<InvokeFlags> invokeFlags;
-    FabricIndex accessingFabricIndex = kUndefinedFabricIndex;
 };
 
 } // namespace DataModel