alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_mesh_ie_issue_from_leaf_to_root_v5.1' into 'release/v5.1'

Browse Source 
fix(wifi/mesh): clear the rootless state in mesh ie when changing from leaf to root (v5.1)

See merge request espressif/esp-idf!32988
This commit is contained in:
Jiang Jiang Jian 2024-08-23 13:49:05 +08:00
commit 0670fbbe3d
4 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_wifi/lib

@ -1 +1 @@
Subproject commit 6020d3b9b22eeb4fa94a95a15555d0da699fbdf3
Subproject commit 5f399b643a5f7b30c1055cb645362fa570b605de

6
examples/mesh/ip_internal_network/main/Kconfig.projbuild
View File

@ -64,6 +64,12 @@ menu "Example Configuration"
help
The number of non-mesh stations allowed to connect in.
config MESH_IE_ENCRYPTED
bool "Mesh IE encrypted"
default y
help
The mesh IE is encrypted by default.
config MESH_MAX_LAYER
int "Mesh Max Layer"
range 1 25

5
examples/mesh/ip_internal_network/main/mesh_main.c
View File

@ -405,7 +405,12 @@ void app_main(void)
ESP_ERROR_CHECK(esp_mesh_set_max_layer(CONFIG_MESH_MAX_LAYER));
ESP_ERROR_CHECK(esp_mesh_set_vote_percentage(1));
ESP_ERROR_CHECK(esp_mesh_set_ap_assoc_expire(10));
/* set blocking time of esp_mesh_send() to 30s, to prevent the esp_mesh_send() from permanently for some reason */
ESP_ERROR_CHECK(esp_mesh_send_block_time(30000));
mesh_cfg_t cfg = MESH_INIT_CONFIG_DEFAULT();
#if !MESH_IE_ENCRYPTED
cfg.crypto_funcs = NULL;
#endif
/* mesh ID */
memcpy((uint8_t *) &cfg.mesh_id, MESH_ID, 6);
/* router */

37
examples/mesh/ip_internal_network/main/mesh_netif.c
View File

@ -66,7 +66,6 @@ static esp_err_t set_dhcps_dns(esp_netif_t *netif, uint32_t addr)
dns.ip.u_addr.ip4.addr = addr;
dns.ip.type = IPADDR_TYPE_V4;
dhcps_offer_t dhcps_dns_value = OFFER_DNS;
ESP_ERROR_CHECK_WITHOUT_ABORT(esp_netif_dhcps_stop(netif));
ESP_ERROR_CHECK(esp_netif_dhcps_option(netif, ESP_NETIF_OP_SET, ESP_NETIF_DOMAIN_NAME_SERVER, &dhcps_dns_value, sizeof(dhcps_dns_value)));
ESP_ERROR_CHECK(esp_netif_set_dns_info(netif, ESP_NETIF_DNS_MAIN, &dns));
ESP_ERROR_CHECK_WITHOUT_ABORT(esp_netif_dhcps_start(netif));
@ -350,6 +349,20 @@ static esp_netif_t* create_mesh_link_ap(void)
return netif;
}
/**
* @brief Destroy esp-netif for AP interface over mesh
*/
static void destory_mesh_link_ap(void)
{
if (netif_ap) {
ESP_ERROR_CHECK_WITHOUT_ABORT(esp_netif_dhcps_stop(netif_ap));
esp_netif_action_disconnected(netif_ap, NULL, 0, NULL);
mesh_delete_if_driver(esp_netif_get_io_driver(netif_ap));
esp_netif_destroy(netif_ap);
netif_ap = NULL;
}
}
/**
* @brief Creates esp-netif for station interface over mesh
*
@ -376,12 +389,7 @@ static esp_netif_t* create_mesh_link_sta(void)
esp_err_t mesh_netif_start_root_ap(bool is_root, uint32_t addr)
{
if (is_root) {
if (netif_ap) {
esp_netif_action_disconnected(netif_ap, NULL, 0, NULL);
mesh_delete_if_driver(esp_netif_get_io_driver(netif_ap));
esp_netif_destroy(netif_ap);
netif_ap = NULL;
}
destory_mesh_link_ap();
netif_ap = create_mesh_link_ap();
mesh_netif_driver_t driver = mesh_create_if_driver(true, true);
if (driver == NULL) {
@ -445,13 +453,7 @@ esp_err_t mesh_netifs_start(bool is_root)
esp_netif_attach(netif_sta, driver);
start_mesh_link_sta();
// If we have a AP on NODE -> stop and remove it!
if (netif_ap) {
esp_netif_action_disconnected(netif_ap, NULL, 0, NULL);
mesh_delete_if_driver(esp_netif_get_io_driver(netif_ap));
esp_netif_destroy(netif_ap);
netif_ap = NULL;
}
destory_mesh_link_ap();
}
return ESP_OK;
}
@ -475,12 +477,7 @@ esp_err_t mesh_netifs_stop(void)
netif_sta = NULL;
}
if (netif_ap) {
esp_netif_action_disconnected(netif_ap, NULL, 0, NULL);
mesh_delete_if_driver(esp_netif_get_io_driver(netif_ap));
esp_netif_destroy(netif_ap);
netif_ap = NULL;
}
destory_mesh_link_ap();
// reserve the default (STA gets ready to become root)
mesh_netif_init_station();
start_wifi_link_sta();