espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 19:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/wps_scan_resumption_v4.3' into 'release/v4.3'

Browse Source 
wpa_supplicant: Scan resumption in PBC mode(backport v4.3)

See merge request espressif/esp-idf!17063
This commit is contained in:
Jiang Jiang Jian
2022-02-14 13:05:28 +00:00
parent 9ff972046b b19424d67e
commit 8d5316ceb8
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
components/wpa_supplicant/src/esp_supplicant/esp_wps.c
View File

@@ -1,16 +1,8 @@
// Copyright 2019 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// You may obtain a copy of the License at */
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include <string.h> #include <string.h>
@@ -577,7 +569,7 @@ wps_parse_scan_result(struct wps_scan_ie *scan)
} }
if (!scan->rsn && !scan->wpa && (scan->capinfo & WIFI_CAPINFO_PRIVACY)) { if (!scan->rsn && !scan->wpa && (scan->capinfo & WIFI_CAPINFO_PRIVACY)) {
wpa_printf(MSG_ERROR, "WEP not suppported in WPS"); wpa_printf(MSG_INFO, "WEP not suppported in WPS");
return false; return false;
} }
@@ -1853,8 +1845,8 @@ wifi_wps_scan_done(void *arg, STATUS status)
esp_wifi_connect(); esp_wifi_connect();
ets_timer_disarm(&sm->wps_msg_timeout_timer); ets_timer_disarm(&sm->wps_msg_timeout_timer);
ets_timer_arm(&sm->wps_msg_timeout_timer, 2000, 0); ets_timer_arm(&sm->wps_msg_timeout_timer, 2000, 0);
} else if (wps_get_status() == WPS_STATUS_SCANNING && wps_get_type() == WPS_TYPE_PIN) { } else if (wps_get_status() == WPS_STATUS_SCANNING) {
if (sm->scan_cnt > WPS_IGNORE_SEL_REG_MAX_CNT) { if (wps_get_type() == WPS_TYPE_PIN && sm->scan_cnt > WPS_IGNORE_SEL_REG_MAX_CNT) {
sm->ignore_sel_reg = true; sm->ignore_sel_reg = true;
sm->wps_pin_war = false; sm->wps_pin_war = false;
} }