Reset backoff on successful subscription in MTRDevice. (#37503)

ReadClient does this, but we are not using its backoff logic.
project-chip · Feb 11, 2025 · 9b62718 · 9b62718
1 parent 8b73e8a
commit 9b62718
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/darwin/Framework/CHIP/MTRBaseSubscriptionCallback.h b/src/darwin/Framework/CHIP/MTRBaseSubscriptionCallback.h
@@ -139,8 +139,6 @@ class MTRBaseSubscriptionCallback : public chip::app::ClusterStateCache::Callbac
 
     void OnDeallocatePaths(chip::app::ReadPrepareParams && aReadPrepareParams) override;
 
-    void OnSubscriptionEstablished(chip::SubscriptionId aSubscriptionId) override;
-
     CHIP_ERROR OnResubscriptionNeeded(chip::app::ReadClient * apReadClient, CHIP_ERROR aTerminationCause) override;
 
     void OnUnsolicitedMessageFromPublisher(chip::app::ReadClient * apReadClient) override;
@@ -153,6 +151,8 @@ class MTRBaseSubscriptionCallback : public chip::app::ClusterStateCache::Callbac
 
     void CallResubscriptionScheduledHandler(NSError * error, NSNumber * resubscriptionDelay);
 
+    void OnSubscriptionEstablished(chip::SubscriptionId aSubscriptionId) override;
+
 private:
     DataReportCallback _Nullable mAttributeReportCallback = nil;
     DataReportCallback _Nullable mEventReportCallback = nil;

diff --git a/src/darwin/Framework/CHIP/MTRDevice_Concrete.mm b/src/darwin/Framework/CHIP/MTRDevice_Concrete.mm
@@ -118,6 +118,8 @@ - (void)_deviceInternalStateChanged:(MTRDevice *)device;
     void ResetResubscriptionBackoff() { mResubscriptionNumRetries = 0; }
 
 private:
+    void OnSubscriptionEstablished(chip::SubscriptionId aSubscriptionId) override;
+
     void OnEventData(const EventHeader & aEventHeader, TLV::TLVReader * apData, const StatusIB * apStatus) override;
 
     void OnAttributeData(const ConcreteDataAttributePath & aPath, TLV::TLVReader * apData, const StatusIB & aStatus) override;
@@ -4770,6 +4772,14 @@ + (MTRDevice *)deviceWithNodeID:(uint64_t)nodeID deviceController:(MTRDeviceCont
 
 #pragma mark - SubscriptionCallback
 namespace {
+void SubscriptionCallback::OnSubscriptionEstablished(SubscriptionId aSubscriptionId)
+{
+    // The next time we need to do a resubscribe, we should start a new backoff
+    // sequence.
+    ResetResubscriptionBackoff();
+    MTRBaseSubscriptionCallback::OnSubscriptionEstablished(aSubscriptionId);
+}
+
 void SubscriptionCallback::OnEventData(const EventHeader & aEventHeader, TLV::TLVReader * apData, const StatusIB * apStatus)
 {
     if (mEventReports == nil) {