Commit 3a6edd0

authored

Merge pull request espressif#11792 from espressif/fix/zigbee-network-scan

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

2 parents 256936e + 91ba3b5 commit 3a6edd0Copy full SHA for 3a6edd0

File tree

-0

lines changed

-0

lines changed

Lines changed: 6 additions & 0 deletions

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`

Comments

(0)