feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'mesh/cs_root_conflict' into 'master'

Browse Source 
detect and fix root conflicts when router BSSID is not set

See merge request idf/esp-idf!3869
This commit is contained in:
Jiang Jiang Jian
2019-01-16 21:16:56 +08:00
parent a62cbfec9a e1ac7ed922
commit 83447cae90
5 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/esp32/include/esp_mesh.h
View File

@@ -1044,9 +1044,10 @@ esp_err_t esp_mesh_set_vote_percentage(float percentage);
float esp_mesh_get_vote_percentage(void); float esp_mesh_get_vote_percentage(void);
/** /**
* @brief Set mesh softAP associate expired time * @brief Set mesh softAP associate expired time (default:10 seconds)
* - If mesh softAP hasn't received any data from an associated child within this time, * - If mesh softAP hasn't received any data from an associated child within this time,
* mesh softAP will take this child inactive and disassociate it. * mesh softAP will take this child inactive and disassociate it.
* - If mesh softAP is encrypted, this value should be set a greater value, such as 30 seconds.
* *
* @param[in] seconds the expired time * @param[in] seconds the expired time
* *
@@ -1227,7 +1228,7 @@ esp_err_t esp_mesh_get_group_list(mesh_addr_t *addr, int num);
bool esp_mesh_is_my_group(const mesh_addr_t *addr); bool esp_mesh_is_my_group(const mesh_addr_t *addr);
/** /**
* @brief Set mesh network capacity * @brief Set mesh network capacity (max:1000, default:300)
* *
* @attention This API shall be called before mesh is started. * @attention This API shall be called before mesh is started.
* *

2
components/esp32/lib

Submodule components/esp32/lib updated: 4123071ff5...630ff8281b

1
components/esp32/wifi_init.c
View File

@@ -34,6 +34,7 @@ static void __attribute__((constructor)) s_set_default_wifi_log_level()
the user to set the level again before esp_wifi_init() is called. the user to set the level again before esp_wifi_init() is called.
*/ */
esp_log_level_set("wifi", CONFIG_LOG_DEFAULT_LEVEL); esp_log_level_set("wifi", CONFIG_LOG_DEFAULT_LEVEL);
esp_log_level_set("mesh", CONFIG_LOG_DEFAULT_LEVEL);
} }
static void esp_wifi_set_debug_log() static void esp_wifi_set_debug_log()

17
components/idf_test/integration_test/TC_IT_WIFI_CONN.yml
View File

@@ -789,25 +789,20 @@ test cases:
- - R SSC1 C +JAP:CONNECTED - - R SSC1 C +JAP:CONNECTED
- - SSC SSC1 sta -D - - SSC SSC1 sta -D
- - R SSC1 RE JAP:DISCONNECTED,\d+,8 - - R SSC1 RE JAP:DISCONNECTED,\d+,8
- - SSC SSC1 sta -C -s <ap_ssid> -p <random_string>
- - R SSC1 RE JAP:DISCONNECTED,\d+,15
- - SSC SSC1 sta -C -s <random_string> -p <ap_password> - - SSC SSC1 sta -C -s <random_string> -p <ap_password>
- - R SSC1 RE JAP:DISCONNECTED,\d+,201 - - R SSC1 RE JAP:DISCONNECTED,\d+,201
execution time: 0.0 execution time: 0.0
expected result: |- expected result: |-
1. disconnect event reason REASON_ASSOC_LEAVE 1. disconnect event reason REASON_ASSOC_LEAVE
2. disconnect event reason REASON_4WAY_HANDSHAKE_TIMEOUT 2. disconnect event reason REASON_NO_AP_FOUND
3. disconnect event reason REASON_NO_AP_FOUND
initial condition: STAM1 initial condition: STAM1
level: Integration level: Integration
module: WIFI MAC module: WIFI MAC
steps: |- steps: |-
1. sta connect to AP, and disconnect 1. sta connect to AP, and disconnect
2. connect to AP with wrong password 2. connect to AP not exist
3. connect to AP not exist
sub module: WIFI Connect sub module: WIFI Connect
summary: test wifi disconnect reason REASON_ASSOC_LEAVE, REASON_4WAY_HANDSHAKE_TIMEOUT, summary: test wifi disconnect reason REASON_ASSOC_LEAVE, REASON_NO_AP_FOUND
REASON_NO_AP_FOUND
test environment: SSC_T1_1 test environment: SSC_T1_1
test point 1: basic function test point 1: basic function
test point 2: wifi disconnect reason test test point 2: wifi disconnect reason test
@@ -886,7 +881,7 @@ test cases:
- - SSC SSC1 ap -S -s <random_string> -p <random_string> -t 3 -m 1 - - SSC SSC1 ap -S -s <random_string> -p <random_string> -t 3 -m 1
- - R SSC1 C +SAP:OK - - R SSC1 C +SAP:OK
- - SSC SSC2 sta -C -s <random_string> -p 1234567890 - - SSC SSC2 sta -C -s <random_string> -p 1234567890
- - R SSC2 RE JAP:DISCONNECTED,\d+,204 - - R SSC2 RE JAP:DISCONNECTED,\d+,15
- - SSC SSC2 sta -D - - SSC SSC2 sta -D
- - R SSC2 C +QAP:OK - - R SSC2 C +QAP:OK
- - WIFI <pc_wifi_nic> CONN <random_string> <random_string> <pc_ip_wifi> - - WIFI <pc_wifi_nic> CONN <random_string> <random_string> <pc_ip_wifi>
@@ -896,7 +891,7 @@ test cases:
execution time: 0.0 execution time: 0.0
expected result: |- expected result: |-
1. succeed 1. succeed
2. disconnect event REASON_HANDSHAKE_TIMEOUT 2. disconnect event REASON_4WAY_HANDSHAKE_TIMEOUT
3. succeed 3. succeed
4. succeed 4. succeed
5. disconnect event REASON_ASSOC_TOOMANY 5. disconnect event REASON_ASSOC_TOOMANY
@@ -910,7 +905,7 @@ test cases:
4. PC WIFI NIC connect to target1 4. PC WIFI NIC connect to target1
5. target2 connect to target1 with correct password 5. target2 connect to target1 with correct password
sub module: WIFI Connect sub module: WIFI Connect
summary: test wifi disconnect reason REASON_ASSOC_TOOMANY, REASON_HANDSHAKE_TIMEOUT summary: test wifi disconnect reason REASON_ASSOC_TOOMANY, REASON_4WAY_HANDSHAKE_TIMEOUT
test environment: SSC_T2_2 test environment: SSC_T2_2
test point 1: basic function test point 1: basic function
test point 2: wifi disconnect reason test test point 2: wifi disconnect reason test

2
examples/mesh/internal_communication/main/Kconfig.projbuild
View File

@@ -59,7 +59,7 @@ config MESH_AP_CONNECTIONS
config MESH_MAX_LAYER config MESH_MAX_LAYER
int "Mesh Max Layer" int "Mesh Max Layer"
range 1 15 range 1 25
default 6 default 6
help help
Max layer allowed in mesh network. Max layer allowed in mesh network.