Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 4, 2025
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions libraries/Zigbee/src/ZigbeeCore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
Loading