[Python] call StopDiscovery after DiscoveryNodes

project-chip · Jan 26, 2024 · f349a72 · f349a72
1 parent 32da87c
commit f349a72
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/controller/python/ChipDeviceController-Discovery.cpp b/src/controller/python/ChipDeviceController-Discovery.cpp
@@ -89,6 +89,11 @@ PyChipError pychip_DeviceController_DiscoverCommissionableNodes(Controller::Devi
     return ToPyChipError(devCtrl->DiscoverCommissionableNodes(filter));
 }
 
+PyChipError pychip_DeviceController_StopCommissionableDiscovery(Controller::DeviceCommissioner * devCtrl)
+{
+    return ToPyChipError(devCtrl->StopCommissionableDiscovery());
+}
+
 void pychip_DeviceController_IterateDiscoveredCommissionableNodes(Controller::DeviceCommissioner * devCtrl,
                                                                   IterateDiscoveredCommissionableNodesFunct cb)
 {

diff --git a/src/controller/python/chip/ChipDeviceCtrl.py b/src/controller/python/chip/ChipDeviceCtrl.py
@@ -594,6 +594,9 @@ def DiscoverCommissionableNodes(self, filterType: discovery.FilterType = discove
             else:
                 time.sleep(timeoutSecond)
 
+        self._ChipStack.Call(
+            lambda: self._dmLib.pychip_DeviceController_StopCommissionableDiscovery(self.devCtrl)).raise_on_error()
+
         return self.GetDiscoveredDevices()
 
     def DiscoverCommissionableNodesLongDiscriminator(self, long_discriminator):
@@ -1567,6 +1570,10 @@ def _InitLib(self):
                 c_void_p, c_uint8, c_char_p]
             self._dmLib.pychip_DeviceController_DiscoverCommissionableNodes.restype = PyChipError
 
+            self._dmLib.pychip_DeviceController_StopCommissionableDiscovery.argtypes = [
+                c_void_p]
+            self._dmLib.pychip_DeviceController_StopCommissionableDiscovery.restype = PyChipError
+
             self._dmLib.pychip_DeviceController_DiscoverCommissionableNodesLongDiscriminator.argtypes = [
                 c_void_p, c_uint16]
             self._dmLib.pychip_DeviceController_DiscoverCommissionableNodesLongDiscriminator.restype = PyChipError