removing unnecessary bookkeepting for TCP support

hnnajh · Nov 10, 2023 · 281523a · 281523a
1 parent 656a9be
commit 281523a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/src/app/OperationalSessionSetup.cpp b/src/app/OperationalSessionSetup.cpp
@@ -178,7 +178,7 @@ void OperationalSessionSetup::Connect(Callback::Callback<OnDeviceConnected> * on
     }
 }
 
-void OperationalSessionSetup::UpdateDeviceData(const Transport::PeerAddress & addr, const ReliableMessageProtocolConfig & config, bool supportsTcp)
+void OperationalSessionSetup::UpdateDeviceData(const Transport::PeerAddress & addr, const ReliableMessageProtocolConfig & config)
 {
     if (mState == State::Uninitialized)
     {
@@ -531,7 +531,7 @@ void OperationalSessionSetup::PerformAddressUpdate()
 
 void OperationalSessionSetup::OnNodeAddressResolved(const PeerId & peerId, const ResolveResult & result)
 {
-    UpdateDeviceData(result.address, result.mrpRemoteConfig, result.supportsTcp);
+    UpdateDeviceData(result.address, result.mrpRemoteConfig);
 }
 
 void OperationalSessionSetup::OnNodeAddressResolutionFailed(const PeerId & peerId, CHIP_ERROR reason)

diff --git a/src/app/OperationalSessionSetup.h b/src/app/OperationalSessionSetup.h
@@ -340,7 +340,7 @@ class DLL_EXPORT OperationalSessionSetup : public SessionEstablishmentDelegate,
     /**
      * This function will set new IP address, port and MRP retransmission intervals of the device.
      */
-    void UpdateDeviceData(const Transport::PeerAddress & addr, const ReliableMessageProtocolConfig & config, bool supportsTcp = false);
+    void UpdateDeviceData(const Transport::PeerAddress & addr, const ReliableMessageProtocolConfig & config);
 
 #if CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES
     /**

diff --git a/src/controller/CommissioneeDeviceProxy.cpp b/src/controller/CommissioneeDeviceProxy.cpp
@@ -67,8 +67,7 @@ void CommissioneeDeviceProxy::CloseSession()
 }
 
 CHIP_ERROR CommissioneeDeviceProxy::UpdateDeviceData(const Transport::PeerAddress & addr,
-                                                     const ReliableMessageProtocolConfig & config,
-                                                     bool supportsTcp)
+                                                     const ReliableMessageProtocolConfig & config)
 {
     mDeviceAddress = addr;
 
@@ -87,7 +86,6 @@ CHIP_ERROR CommissioneeDeviceProxy::UpdateDeviceData(const Transport::PeerAddres
 
     Transport::SecureSession * secureSession = mSecureSession.Get().Value()->AsSecureSession();
     secureSession->SetPeerAddress(addr);
-    secureSession->SetSupportsTcp(supportsTcp);
 
     return CHIP_NO_ERROR;
 }

diff --git a/src/controller/CommissioneeDeviceProxy.h b/src/controller/CommissioneeDeviceProxy.h
@@ -115,11 +115,10 @@ class CommissioneeDeviceProxy : public DeviceProxy, public SessionDelegate
      *
      * @param[in] addr   Address of the device to be set.
      * @param[in] config MRP parameters
-     * @param[in] supportsTcp indicates whether the remote peer supports TCP
      *
      * @return CHIP_NO_ERROR if the data has been updated, an error code otherwise.
      */
-    CHIP_ERROR UpdateDeviceData(const Transport::PeerAddress & addr, const ReliableMessageProtocolConfig & config, bool supportsTcp = false);
+    CHIP_ERROR UpdateDeviceData(const Transport::PeerAddress & addr, const ReliableMessageProtocolConfig & config);
 
     /**
      * @brief