[Binding] Improve binding validation and disable connection on init

src/app/clusters/bindings/BindingManager.cpp

@@ -83,13 +83,16 @@ CHIP_ERROR BindingManager::Init(const BindingManagerInitParams & params)
     }
     else
     {
-        for (const EmberBindingTableEntry & entry : BindingTable::GetInstance())
+        if (params.establishConnectionOnInit)
         {
-            if (entry.type == EMBER_UNICAST_BINDING)
+            for (const EmberBindingTableEntry & entry : BindingTable::GetInstance())
             {
-                // The CASE connection can also fail if the unicast peer is offline.
-                // There is recovery mechanism to retry connection on-demand so ignore error.
-                (void) UnicastBindingCreated(entry.fabricIndex, entry.nodeId);
+                if (entry.type == EMBER_UNICAST_BINDING)
+                {
+                    // The CASE connection can also fail if the unicast peer is offline.
+                    // There is recovery mechanism to retry connection on-demand so ignore error.
+                    (void) UnicastBindingCreated(entry.fabricIndex, entry.nodeId);
+                }
             }
         }
     }
@@ -201,4 +204,39 @@ CHIP_ERROR BindingManager::NotifyBoundClusterChanged(EndpointId endpoint, Cluste
     return error;
 }
 
+CHIP_ERROR BindingManager::NotifyBoundClusterAtIndexChanged(EndpointId endpoint, ClusterId cluster, uint8_t bindingIndex, 
+                                                            void * context)
+{
+    VerifyOrReturnError(mInitParams.mFabricTable != nullptr, CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(mBoundDeviceChangedHandler, CHIP_NO_ERROR);
+
+    CHIP_ERROR error      = CHIP_NO_ERROR;
+    auto * bindingContext = mPendingNotificationMap.NewPendingNotificationContext(context);
+    VerifyOrReturnError(bindingContext != nullptr, CHIP_ERROR_NO_MEMORY);
+
+    bindingContext->IncrementConsumersNumber();
+
+    EmberBindingTableEntry entry = BindingTable::GetInstance().GetAt(bindingIndex);
+
+    if (entry.local == endpoint && (!entry.clusterId.HasValue() || entry.clusterId.Value() == cluster))
+    {
+        if (entry.type == EMBER_UNICAST_BINDING)
+        {
+            error = mPendingNotificationMap.AddPendingNotification(bindingIndex, bindingContext);
+            SuccessOrExit(error);
+            error = EstablishConnection(ScopedNodeId(entry.nodeId, entry.fabricIndex));
+            SuccessOrExit(error);
+        }
+        else if (entry.type == EMBER_MULTICAST_BINDING)
+        {
+            mBoundDeviceChangedHandler(entry, nullptr, bindingContext->GetContext());
+        }
+    }
+
+exit:
+    bindingContext->DecrementConsumersNumber();
+
+    return error;
+}
+
 } // namespace chip

src/app/clusters/bindings/BindingManager.h

@@ -53,6 +53,7 @@ struct BindingManagerInitParams
     FabricTable * mFabricTable               = nullptr;
     CASESessionManager * mCASESessionManager = nullptr;
     PersistentStorageDelegate * mStorage     = nullptr;
+    bool establishConnectionOnInit           = true;
 };
 
 /**
@@ -118,6 +119,18 @@ class BindingManager
      */
     CHIP_ERROR NotifyBoundClusterChanged(EndpointId endpoint, ClusterId cluster, void * context);
 
+    /*
+     * Notify a cluster change to a specific bound device associated with the (endpoint, cluster) tuple.
+     *
+     * For a unicast bindings with an active session and multicast bindings, the BoundDeviceChangedHandler
+     * will be called before the function returns.
+     *
+     * For unicast bindings without an active session, the notification will be queued and a new session will
+     * be initiated. The BoundDeviceChangedHandler will be called once the session is established.
+     *
+     */
+    CHIP_ERROR NotifyBoundClusterAtIndexChanged(EndpointId endpoint, ClusterId cluster, uint8_t bindingIndex, void * context);
+
     static BindingManager & GetInstance() { return sBindingManager; }
 
 private: