dandri/proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2026-09-27 17:58:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enhance bwm_wifi_forward_down for better disable confirmation

Browse Source 
Refactor bwm_wifi_forward_down to confirm WiFi disable success by polling connect status.

Signed-off-by: Niel Nielsen <nieldk@gmail.com>
This commit is contained in:
Niel Nielsen
2026-09-02 15:26:03 +02:00
committed by GitHub
parent 89c0682990
commit cac3f6dc0a
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
armsrc/bwm_wifi.c
+22 -3
View File
@@ -256,7 +256,26 @@ int bwm_wifi_forward_status(uint8_t *state, uint32_t *ip_out) {
}
int bwm_wifi_forward_down(void) {
// Single command: the BWM deinits the TCP server + disconnects the STA and
// returns to BLE-only. It persists the disable mode to NVS.
return step(BWM_CMD_SET_TO_WIFI_DISABLE_MODE, NULL, 0, NULL, NULL, 2000, "wifi disable");
// The ESP tears down the STA + TCP server and persists to NVS BEFORE it acks,
// and its command task blocks during the teardown - so that ack can outlast
// any timeout or be dropped. A plain ack-wait therefore reports failure on a
// disable that actually worked. Instead: fire the disable, then CONFIRM by
// polling the connect status. Once WiFi is gone the status query returns a
// non-timeout error (the subsystem is down) - that is our proof of success.
(void)bwm_cmd(BWM_CMD_SET_TO_WIFI_DISABLE_MODE, NULL, 0, NULL, NULL, 3000);
uint32_t t0 = GetTickCount();
while (GetTickCountDelta(t0) < 12000) { // overall cap
uint8_t st = 0;
uint16_t sl = sizeof(st);
int q = bwm_cmd(BWM_CMD_GET_WIFI_CONNECT_STATUS, NULL, 0, &st, &sl, 500);
// ETIMEOUT while the ESP is busy tearing down -> keep waiting.
// SUCCESS with a state -> still up mid-teardown -> keep waiting.
// any other (EFAILED etc.) -> BWM answered but WiFi is gone -> disabled.
if (q != PM3_SUCCESS && q != PM3_ETIMEOUT) {
return PM3_SUCCESS;
}
SpinDelay(300);
}
return PM3_ETIMEOUT;
}