fix(zigbee): Add lock in scanNetworks to avoid race condition

P-R-O-C-H-Y · P-R-O-C-H-Y · commit 91ba3b587c87 · 2025-09-03T15:59:10.000+02:00
diff --git a/libraries/Zigbee/src/ZigbeeCore.cpp b/libraries/Zigbee/src/ZigbeeCore.cpp
@@ -515,8 +515,14 @@ void ZigbeeCore::scanNetworks(u_int32_t channel_mask, u_int8_t scan_duration) {
     log_e("Zigbee stack is not started, cannot scan networks");
     return;
   }
+  if (_scan_status == ZB_SCAN_RUNNING) {
+    log_w("Scan already in progress, ignoring new scan request");
+    return;
+  }
   log_v("Scanning Zigbee networks");
+  esp_zb_lock_acquire(portMAX_DELAY);
   esp_zb_zdo_active_scan_request(channel_mask, scan_duration, scanCompleteCallback);
+  esp_zb_lock_release();
   _scan_status = ZB_SCAN_RUNNING;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -515,8 +515,14 @@ void ZigbeeCore::scanNetworks(u_int32_t channel_mask, u_int8_t scan_duration) {`
`515`	`515`	`log_e("Zigbee stack is not started, cannot scan networks");`
`516`	`516`	`return;`
`517`	`517`	`}`
	`518`	`+ if (_scan_status == ZB_SCAN_RUNNING) {`
	`519`	`+ log_w("Scan already in progress, ignoring new scan request");`
	`520`	`+ return;`
	`521`	`+ }`
`518`	`522`	`log_v("Scanning Zigbee networks");`
	`523`	`+ esp_zb_lock_acquire(portMAX_DELAY);`
`519`	`524`	`esp_zb_zdo_active_scan_request(channel_mask, scan_duration, scanCompleteCallback);`
	`525`	`+ esp_zb_lock_release();`
`520`	`526`	`_scan_status = ZB_SCAN_RUNNING;`
`521`	`527`	`}`
`522`	`528`