Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/authmode_degrade_fix_v4.0' into 'release/v4.0'

Browse source 
esp_wifi: Remove auth_changed event and fix wpa2_ent authmode threshold (backport 4.0)

See merge request espressif/esp-idf!8806
This commit is contained in:
Jiang Jiang Jian 2020-06-08 11:22:10 +08:00
commit a864e3dcfe
4 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
components/esp_wifi/include/esp_wifi_types.h
View file

@ -94,6 +94,7 @@ typedef enum {
WIFI_REASON_ASSOC_FAIL = 203, WIFI_REASON_ASSOC_FAIL = 203,
WIFI_REASON_HANDSHAKE_TIMEOUT = 204, WIFI_REASON_HANDSHAKE_TIMEOUT = 204,
WIFI_REASON_CONNECTION_FAIL = 205, WIFI_REASON_CONNECTION_FAIL = 205,
WIFI_REASON_AUTH_CHANGED = 206,
} wifi_err_reason_t; } wifi_err_reason_t;
typedef enum { typedef enum {

2
components/esp_wifi/lib_esp32

@ -1 +1 @@
Subproject commit acb1787e744b482ddb47e5c9745b1dc1c0ebb6f8 Subproject commit f95cd7c239868c09a023eb36cf7fde3940e0ca22

17
docs/en/api-guides/wifi.rst
View file

@ -182,10 +182,6 @@ Another thing deserves our attention is that the default behavior of LwIP is to
In above scenario, ideally, the application sockets and the network layer should not be affected, since the Wi-Fi connection only fails temporarily and recovers very quickly. The application can enable "Keep TCP connections when IP changed" via LwIP menuconfig. In above scenario, ideally, the application sockets and the network layer should not be affected, since the Wi-Fi connection only fails temporarily and recovers very quickly. The application can enable "Keep TCP connections when IP changed" via LwIP menuconfig.
WIFI_EVENT_STA_AUTHMODE_CHANGE
++++++++++++++++++++++++++++++++++++
This event arises when the AP to which the station is connected changes its authentication mode, e.g., from no auth to WPA. Upon receiving this event, the event task will do nothing. Generally, the application event callback does not need to handle this either.
IP_EVENT_STA_GOT_IP IP_EVENT_STA_GOT_IP
++++++++++++++++++++++++++++++++++++ ++++++++++++++++++++++++++++++++++++
This event arises when the DHCP client successfully gets the IPV4 address from the DHCP server, or when the IPV4 address is changed. The event means that everything is ready and the application can begin its tasks (e.g., creating sockets). This event arises when the DHCP client successfully gets the IPV4 address from the DHCP server, or when the IPV4 address is changed. The event means that everything is ready and the application can begin its tasks (e.g., creating sockets).
@ -1010,6 +1006,17 @@ The table below shows the reason-code defined in ESP32. The first column is the
| | | | WIFI_REASON_4WAY_HANDSHAKE_TIMEOUT. | | | | | WIFI_REASON_4WAY_HANDSHAKE_TIMEOUT. |
| | | | | | | | | |
+---------------------------+-------+---------+-------------------------------------------------------------+ +---------------------------+-------+---------+-------------------------------------------------------------+
| CONNECTION_FAIL | 205 |reserved | Espressif-specific Wi-Fi reason-code: the |
| | | | connection to the AP has failed. |
| | | | |
+---------------------------+-------+---------+-------------------------------------------------------------+
| AUTH_CHANGED | 206 |reserved | Espressif-specific Wi-Fi reason-code: the |
| | | | disconnection has happened since AP has changed the |
| | | | authmode. |
| | | | |
+---------------------------+-------+---------+-------------------------------------------------------------+
ESP32 Wi-Fi Station Connecting When Multiple APs Are Found ESP32 Wi-Fi Station Connecting When Multiple APs Are Found
--------------------------------------------------------------- ---------------------------------------------------------------
@ -1139,6 +1146,8 @@ API esp_wifi_set_config() can be used to configure the station. The table below
| | threshold is open. | | | threshold is open. |
+------------------+--------------------------------------------------------------+ +------------------+--------------------------------------------------------------+
.. attention::
WEP/WPA security modes are deprecated in IEEE802.11-2016 specifications and are recommended not to be used. These modes can be rejected using authmode threshold by setting threshold as WPA2 by threshold.authmode as WIFI_AUTH_WPA2_PSK.
AP Basic Configuration AP Basic Configuration
+++++++++++++++++++++++++++++++++++++ +++++++++++++++++++++++++++++++++++++

5
examples/wifi/getting_started/station/main/station_example_main.c
View file

@ -82,6 +82,11 @@ void wifi_init_sta()
.sta = { .sta = {
.ssid = EXAMPLE_ESP_WIFI_SSID, .ssid = EXAMPLE_ESP_WIFI_SSID,
.password = EXAMPLE_ESP_WIFI_PASS, .password = EXAMPLE_ESP_WIFI_PASS,
/* Setting a password implies station will connect to all security modes including WEP/WPA.
* However these modes are deprecated and not advisable to be used. Incase your Access point
* doesn't support WPA2, these mode can be enabled by commenting below line */
.threshold.authmode = WIFI_AUTH_WPA2_PSK,
.pmf_cfg = { .pmf_cfg = {
.capable = true, .capable = true,
.required = false .required = false