ESP32: Close active ble connection on PASE session failure. (#9845)

src/app/server/CommissioningWindowManager.cpp

@@ -95,6 +95,9 @@ void CommissioningWindowManager::OnSessionEstablishmentError(CHIP_ERROR err)
     mFailedCommissioningAttempts++;
     ChipLogError(AppServer, "Commissioning failed (attempt %d): %s", mFailedCommissioningAttempts, ErrorStr(err));
 
+#if CONFIG_NETWORK_LAYER_BLE
+    mServer->getBleLayerObject()->mBleEndPoint->ReleaseBleConnection();
+#endif
     if (mFailedCommissioningAttempts < kMaxFailedCommissioningAttempts)
     {
         // If the number of commissioning attempts have not exceeded maximum retries, let's reopen

src/app/server/Server.cpp

@@ -112,6 +112,9 @@ CHIP_ERROR Server::Init(AppDelegate * delegate, uint16_t secureServicePort, uint
 #endif
     );
 
+#if CONFIG_NETWORK_LAYER_BLE
+    mBleLayer = DeviceLayer::ConnectivityMgr().GetBleLayer();
+#endif
     SuccessOrExit(err);
 
     err = mSessions.Init(&DeviceLayer::SystemLayer(), &mTransports, &mFabrics, &mMessageCounterManager);

src/app/server/Server.h

@@ -71,6 +71,10 @@ class Server : public Messaging::ExchangeDelegate
 
     TransportMgrBase & GetTransportManager() { return mTransports; }
 
+#if CONFIG_NETWORK_LAYER_BLE
+    Ble::BleLayer * getBleLayerObject() { return mBleLayer; }
+#endif
+
     CommissioningWindowManager & GetCommissioningWindowManager() { return mCommissioningWindowManager; }
 
     void Shutdown();
@@ -113,6 +117,10 @@ class Server : public Messaging::ExchangeDelegate
 
     AppDelegate * mAppDelegate = nullptr;
 
+#if CONFIG_NETWORK_LAYER_BLE
+    Ble::BleLayer * mBleLayer = nullptr;
+#endif
+
     ServerTransportMgr mTransports;
     SessionManager mSessions;
     CASEServer mCASEServer;

src/ble/BLEEndPoint.h

@@ -107,6 +107,7 @@ class DLL_EXPORT BLEEndPoint
     bool ConnectionObjectIs(BLE_CONNECTION_OBJECT connObj) { return connObj == mConnObj; }
     void Close();
     void Abort();
+    void ReleaseBleConnection();
 
 private:
     BleLayer * mBle; ///< [READ-ONLY] Pointer to the BleLayer object that owns this object.
@@ -223,7 +224,6 @@ class DLL_EXPORT BLEEndPoint
     // Close functions:
     void DoCloseCallback(uint8_t state, uint8_t flags, CHIP_ERROR err);
     void FinalizeClose(uint8_t state, uint8_t flags, CHIP_ERROR err);
-    void ReleaseBleConnection();
     void Free();
     void FreeBtpEngine();
 

src/ble/BleLayer.cpp

@@ -288,6 +288,7 @@ CHIP_ERROR BleLayer::Init(BlePlatformDelegate * platformDelegate, BleConnectionD
 #if CHIP_ENABLE_CHIPOBLE_TEST
     mTestBleEndPoint = NULL;
 #endif
+    mBleEndPoint = NULL;
 
     return CHIP_NO_ERROR;
 }
@@ -425,6 +426,7 @@ CHIP_ERROR BleLayer::NewBleEndPoint(BLEEndPoint ** retEndPoint, BLE_CONNECTION_O
 #if CHIP_ENABLE_CHIPOBLE_TEST
     mTestBleEndPoint = *retEndPoint;
 #endif
+    mBleEndPoint = *retEndPoint;
 
     return CHIP_NO_ERROR;
 }

src/ble/BleLayer.h

@@ -320,6 +320,8 @@ class DLL_EXPORT BleLayer
     BLEEndPoint * mTestBleEndPoint;
 #endif
 
+    BLEEndPoint * mBleEndPoint;
+
 private:
     // Private data members:
 

src/transport/raw/BLE.h

@@ -91,6 +91,8 @@ class DLL_EXPORT BLEBase : public Base, public Ble::BleLayerDelegate
 
     CHIP_ERROR SetEndPoint(Ble::BLEEndPoint * endPoint) override;
 
+    Ble::BLEEndPoint * GetEndPoint() { return mBleEndPoint; }
+
 private:
     void ClearState();