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

Merge branch 'bugfix/fix_iperf_example_crash_issue_v3.3' into 'release/v3.3'

Browse Source 
Bugfix/fix iperf example crash issue v3.3 (backport v3.3)

See merge request espressif/esp-idf!12018
This commit is contained in:
Jiang Jiang Jian
2021-01-18 19:18:53 +08:00
parent 854ccb743d 3590a6816f
commit 808f456442
16 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/bluetooth/blufi/main/blufi_example_main.c
View File

@ -350,7 +350,7 @@ static void example_event_callback(esp_blufi_cb_event_t event, esp_blufi_cb_para
.channel = 0, .channel = 0,
.show_hidden = false .show_hidden = false
}; };
ESP_ERROR_CHECK(esp_wifi_scan_start(&scanConf, true)); esp_wifi_scan_start(&scanConf, true);
break; break;
} }
case ESP_BLUFI_EVENT_RECV_CUSTOM_DATA: case ESP_BLUFI_EVENT_RECV_CUSTOM_DATA:

4
examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/components/iperf/cmd_wifi.c
View File

@ -148,7 +148,7 @@ static bool wifi_cmd_sta_join(const char *ssid, const char *pass)
esp_wifi_disconnect(); esp_wifi_disconnect();
//ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) ); //by snake //ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) ); //by snake
ESP_ERROR_CHECK( esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config) ); ESP_ERROR_CHECK( esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config) );
ESP_ERROR_CHECK( esp_wifi_connect() ); esp_wifi_connect();
xEventGroupWaitBits(wifi_event_group, CONNECTED_BIT, 0, 1, 5000 / portTICK_RATE_MS); xEventGroupWaitBits(wifi_event_group, CONNECTED_BIT, 0, 1, 5000 / portTICK_RATE_MS);
@ -175,7 +175,7 @@ static bool wifi_cmd_sta_scan(const char *ssid)
scan_config.ssid = (uint8_t *) ssid; scan_config.ssid = (uint8_t *) ssid;
ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) ); ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) );
ESP_ERROR_CHECK( esp_wifi_scan_start(&scan_config, false) ); esp_wifi_scan_start(&scan_config, false);
return true; return true;
} }

6
examples/mesh/manual_networking/main/mesh_main.c
View File

@ -152,7 +152,7 @@ void mesh_scan_done_handler(int num)
esp_wifi_scan_stop(); esp_wifi_scan_stop();
scan_config.show_hidden = 1; scan_config.show_hidden = 1;
scan_config.scan_type = WIFI_SCAN_TYPE_PASSIVE; scan_config.scan_type = WIFI_SCAN_TYPE_PASSIVE;
ESP_ERROR_CHECK(esp_wifi_scan_start(&scan_config, 0)); esp_wifi_scan_start(&scan_config, 0);
} }
} }
@ -173,7 +173,7 @@ void mesh_event_handler(mesh_event_t event)
/* mesh softAP is hidden */ /* mesh softAP is hidden */
scan_config.show_hidden = 1; scan_config.show_hidden = 1;
scan_config.scan_type = WIFI_SCAN_TYPE_PASSIVE; scan_config.scan_type = WIFI_SCAN_TYPE_PASSIVE;
ESP_ERROR_CHECK(esp_wifi_scan_start(&scan_config, 0)); esp_wifi_scan_start(&scan_config, 0);
break; break;
case MESH_EVENT_STOPPED: case MESH_EVENT_STOPPED:
ESP_LOGI(MESH_TAG, "<MESH_EVENT_STOPPED>"); ESP_LOGI(MESH_TAG, "<MESH_EVENT_STOPPED>");
@ -229,7 +229,7 @@ void mesh_event_handler(mesh_event_t event)
esp_wifi_scan_stop(); esp_wifi_scan_stop();
scan_config.show_hidden = 1; scan_config.show_hidden = 1;
scan_config.scan_type = WIFI_SCAN_TYPE_PASSIVE; scan_config.scan_type = WIFI_SCAN_TYPE_PASSIVE;
ESP_ERROR_CHECK(esp_wifi_scan_start(&scan_config, 0)); esp_wifi_scan_start(&scan_config, 0);
} }
break; break;
case MESH_EVENT_LAYER_CHANGE: case MESH_EVENT_LAYER_CHANGE:

4
examples/protocols/http2_request/main/http2_request_example_main.c
View File

@ -153,7 +153,7 @@ static esp_err_t event_handler(void *ctx, system_event_t *event)
switch (event->event_id) { switch (event->event_id) {
case SYSTEM_EVENT_STA_START: case SYSTEM_EVENT_STA_START:
ESP_LOGI(TAG, "SYSTEM_EVENT_STA_START"); ESP_LOGI(TAG, "SYSTEM_EVENT_STA_START");
ESP_ERROR_CHECK(esp_wifi_connect()); esp_wifi_connect();
break; break;
case SYSTEM_EVENT_STA_GOT_IP: case SYSTEM_EVENT_STA_GOT_IP:
ESP_LOGI(TAG, "SYSTEM_EVENT_STA_GOT_IP"); ESP_LOGI(TAG, "SYSTEM_EVENT_STA_GOT_IP");
@ -162,7 +162,7 @@ static esp_err_t event_handler(void *ctx, system_event_t *event)
break; break;
case SYSTEM_EVENT_STA_DISCONNECTED: case SYSTEM_EVENT_STA_DISCONNECTED:
ESP_LOGI(TAG, "SYSTEM_EVENT_STA_DISCONNECTED"); ESP_LOGI(TAG, "SYSTEM_EVENT_STA_DISCONNECTED");
ESP_ERROR_CHECK(esp_wifi_connect()); esp_wifi_connect();
xEventGroupClearBits(wifi_event_group, CONNECTED_BIT); xEventGroupClearBits(wifi_event_group, CONNECTED_BIT);
break; break;
default: default:

4
examples/protocols/http_server/advanced_tests/main/main.c
View File

@ -24,7 +24,7 @@ static esp_err_t event_handler(void *ctx, system_event_t *event)
switch(event->event_id) { switch(event->event_id) {
case SYSTEM_EVENT_STA_START: case SYSTEM_EVENT_STA_START:
ESP_LOGI(TAG, "SYSTEM_EVENT_STA_START"); ESP_LOGI(TAG, "SYSTEM_EVENT_STA_START");
ESP_ERROR_CHECK(esp_wifi_connect()); esp_wifi_connect();
break; break;
case SYSTEM_EVENT_STA_GOT_IP: case SYSTEM_EVENT_STA_GOT_IP:
ESP_LOGI(TAG, "SYSTEM_EVENT_STA_GOT_IP"); ESP_LOGI(TAG, "SYSTEM_EVENT_STA_GOT_IP");
@ -39,7 +39,7 @@ static esp_err_t event_handler(void *ctx, system_event_t *event)
break; break;
case SYSTEM_EVENT_STA_DISCONNECTED: case SYSTEM_EVENT_STA_DISCONNECTED:
ESP_LOGI(TAG, "SYSTEM_EVENT_STA_DISCONNECTED"); ESP_LOGI(TAG, "SYSTEM_EVENT_STA_DISCONNECTED");
ESP_ERROR_CHECK(esp_wifi_connect()); esp_wifi_connect();
// Stop webserver tests // Stop webserver tests
if (*hd) { if (*hd) {

4
examples/protocols/http_server/file_serving/main/main.c
View File

@ -37,7 +37,7 @@ static esp_err_t event_handler(void *ctx, system_event_t *event)
switch(event->event_id) { switch(event->event_id) {
case SYSTEM_EVENT_STA_START: case SYSTEM_EVENT_STA_START:
ESP_LOGI(TAG, "SYSTEM_EVENT_STA_START"); ESP_LOGI(TAG, "SYSTEM_EVENT_STA_START");
ESP_ERROR_CHECK(esp_wifi_connect()); esp_wifi_connect();
break; break;
case SYSTEM_EVENT_STA_GOT_IP: case SYSTEM_EVENT_STA_GOT_IP:
ESP_LOGI(TAG, "SYSTEM_EVENT_STA_GOT_IP"); ESP_LOGI(TAG, "SYSTEM_EVENT_STA_GOT_IP");
@ -46,7 +46,7 @@ static esp_err_t event_handler(void *ctx, system_event_t *event)
break; break;
case SYSTEM_EVENT_STA_DISCONNECTED: case SYSTEM_EVENT_STA_DISCONNECTED:
ESP_LOGI(TAG, "SYSTEM_EVENT_STA_DISCONNECTED"); ESP_LOGI(TAG, "SYSTEM_EVENT_STA_DISCONNECTED");
ESP_ERROR_CHECK(esp_wifi_connect()); esp_wifi_connect();
break; break;
default: default:
break; break;

4
examples/protocols/http_server/persistent_sockets/main/main.c
View File

@ -197,7 +197,7 @@ static esp_err_t event_handler(void *ctx, system_event_t *event)
switch(event->event_id) { switch(event->event_id) {
case SYSTEM_EVENT_STA_START: case SYSTEM_EVENT_STA_START:
ESP_LOGI(TAG, "SYSTEM_EVENT_STA_START"); ESP_LOGI(TAG, "SYSTEM_EVENT_STA_START");
ESP_ERROR_CHECK(esp_wifi_connect()); esp_wifi_connect();
break; break;
case SYSTEM_EVENT_STA_GOT_IP: case SYSTEM_EVENT_STA_GOT_IP:
ESP_LOGI(TAG, "SYSTEM_EVENT_STA_GOT_IP"); ESP_LOGI(TAG, "SYSTEM_EVENT_STA_GOT_IP");
@ -211,7 +211,7 @@ static esp_err_t event_handler(void *ctx, system_event_t *event)
break; break;
case SYSTEM_EVENT_STA_DISCONNECTED: case SYSTEM_EVENT_STA_DISCONNECTED:
ESP_LOGI(TAG, "SYSTEM_EVENT_STA_DISCONNECTED"); ESP_LOGI(TAG, "SYSTEM_EVENT_STA_DISCONNECTED");
ESP_ERROR_CHECK(esp_wifi_connect()); esp_wifi_connect();
/* Stop the webserver */ /* Stop the webserver */
if (*server) { if (*server) {

4
examples/protocols/http_server/simple/main/main.c
View File

@ -255,7 +255,7 @@ static esp_err_t event_handler(void *ctx, system_event_t *event)
switch(event->event_id) { switch(event->event_id) {
case SYSTEM_EVENT_STA_START: case SYSTEM_EVENT_STA_START:
ESP_LOGI(TAG, "SYSTEM_EVENT_STA_START"); ESP_LOGI(TAG, "SYSTEM_EVENT_STA_START");
ESP_ERROR_CHECK(esp_wifi_connect()); esp_wifi_connect();
break; break;
case SYSTEM_EVENT_STA_GOT_IP: case SYSTEM_EVENT_STA_GOT_IP:
ESP_LOGI(TAG, "SYSTEM_EVENT_STA_GOT_IP"); ESP_LOGI(TAG, "SYSTEM_EVENT_STA_GOT_IP");
@ -269,7 +269,7 @@ static esp_err_t event_handler(void *ctx, system_event_t *event)
break; break;
case SYSTEM_EVENT_STA_DISCONNECTED: case SYSTEM_EVENT_STA_DISCONNECTED:
ESP_LOGI(TAG, "SYSTEM_EVENT_STA_DISCONNECTED"); ESP_LOGI(TAG, "SYSTEM_EVENT_STA_DISCONNECTED");
ESP_ERROR_CHECK(esp_wifi_connect()); esp_wifi_connect();
/* Stop the web server */ /* Stop the web server */
if (*server) { if (*server) {

4
examples/protocols/https_server/main/main.c
View File

@ -95,7 +95,7 @@ static esp_err_t event_handler(void *ctx, system_event_t *event)
switch(event->event_id) { switch(event->event_id) {
case SYSTEM_EVENT_STA_START: case SYSTEM_EVENT_STA_START:
ESP_LOGI(TAG, "SYSTEM_EVENT_STA_START"); ESP_LOGI(TAG, "SYSTEM_EVENT_STA_START");
ESP_ERROR_CHECK(esp_wifi_connect()); esp_wifi_connect();
break; break;
case SYSTEM_EVENT_STA_GOT_IP: case SYSTEM_EVENT_STA_GOT_IP:
ESP_LOGI(TAG, "SYSTEM_EVENT_STA_GOT_IP"); ESP_LOGI(TAG, "SYSTEM_EVENT_STA_GOT_IP");
@ -109,7 +109,7 @@ static esp_err_t event_handler(void *ctx, system_event_t *event)
break; break;
case SYSTEM_EVENT_STA_DISCONNECTED: case SYSTEM_EVENT_STA_DISCONNECTED:
ESP_LOGI(TAG, "SYSTEM_EVENT_STA_DISCONNECTED"); ESP_LOGI(TAG, "SYSTEM_EVENT_STA_DISCONNECTED");
ESP_ERROR_CHECK(esp_wifi_connect()); esp_wifi_connect();
/* Stop the web server */ /* Stop the web server */
if (*server) { if (*server) {

2
examples/system/console/main/cmd_wifi.c
View File

@ -70,7 +70,7 @@ static bool wifi_join(const char *ssid, const char *pass, int timeout_ms)
ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) ); ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) );
ESP_ERROR_CHECK( esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config) ); ESP_ERROR_CHECK( esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config) );
ESP_ERROR_CHECK( esp_wifi_connect() ); esp_wifi_connect();
int bits = xEventGroupWaitBits(wifi_event_group, CONNECTED_BIT, int bits = xEventGroupWaitBits(wifi_event_group, CONNECTED_BIT,
pdFALSE, pdTRUE, timeout_ms / portTICK_PERIOD_MS); pdFALSE, pdTRUE, timeout_ms / portTICK_PERIOD_MS);

4
examples/wifi/fast_scan/main/fast_scan.c
View File

@ -73,7 +73,7 @@ static esp_err_t event_handler(void *ctx, system_event_t *event)
switch (event->event_id) { switch (event->event_id) {
case SYSTEM_EVENT_STA_START: case SYSTEM_EVENT_STA_START:
ESP_LOGI(TAG, "SYSTEM_EVENT_STA_START"); ESP_LOGI(TAG, "SYSTEM_EVENT_STA_START");
ESP_ERROR_CHECK(esp_wifi_connect()); esp_wifi_connect();
break; break;
case SYSTEM_EVENT_STA_GOT_IP: case SYSTEM_EVENT_STA_GOT_IP:
ESP_LOGI(TAG, "SYSTEM_EVENT_STA_GOT_IP"); ESP_LOGI(TAG, "SYSTEM_EVENT_STA_GOT_IP");
@ -82,7 +82,7 @@ static esp_err_t event_handler(void *ctx, system_event_t *event)
break; break;
case SYSTEM_EVENT_STA_DISCONNECTED: case SYSTEM_EVENT_STA_DISCONNECTED:
ESP_LOGI(TAG, "SYSTEM_EVENT_STA_DISCONNECTED"); ESP_LOGI(TAG, "SYSTEM_EVENT_STA_DISCONNECTED");
ESP_ERROR_CHECK(esp_wifi_connect()); esp_wifi_connect();
break; break;
default: default:
break; break;

4
examples/wifi/iperf/main/cmd_wifi.c
View File

@ -142,7 +142,7 @@ static bool wifi_cmd_sta_join(const char* ssid, const char* pass)
reconnect = true; reconnect = true;
ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) ); ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) );
ESP_ERROR_CHECK( esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config) ); ESP_ERROR_CHECK( esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config) );
ESP_ERROR_CHECK( esp_wifi_connect() ); esp_wifi_connect();
xEventGroupWaitBits(wifi_event_group, CONNECTED_BIT, 0, 1, 5000/portTICK_RATE_MS); xEventGroupWaitBits(wifi_event_group, CONNECTED_BIT, 0, 1, 5000/portTICK_RATE_MS);
@ -169,7 +169,7 @@ static bool wifi_cmd_sta_scan(const char* ssid)
scan_config.ssid = (uint8_t *) ssid; scan_config.ssid = (uint8_t *) ssid;
ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) ); ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) );
ESP_ERROR_CHECK( esp_wifi_scan_start(&scan_config, false) ); esp_wifi_scan_start(&scan_config, false);
return true; return true;
} }

4
examples/wifi/power_save/main/power_save.c
View File

@ -45,7 +45,7 @@ static esp_err_t event_handler(void *ctx, system_event_t *event)
switch(event->event_id) { switch(event->event_id) {
case SYSTEM_EVENT_STA_START: case SYSTEM_EVENT_STA_START:
ESP_LOGI(TAG, "SYSTEM_EVENT_STA_START"); ESP_LOGI(TAG, "SYSTEM_EVENT_STA_START");
ESP_ERROR_CHECK(esp_wifi_connect()); esp_wifi_connect();
break; break;
case SYSTEM_EVENT_STA_GOT_IP: case SYSTEM_EVENT_STA_GOT_IP:
ESP_LOGI(TAG, "SYSTEM_EVENT_STA_GOT_IP"); ESP_LOGI(TAG, "SYSTEM_EVENT_STA_GOT_IP");
@ -54,7 +54,7 @@ static esp_err_t event_handler(void *ctx, system_event_t *event)
break; break;
case SYSTEM_EVENT_STA_DISCONNECTED: case SYSTEM_EVENT_STA_DISCONNECTED:
ESP_LOGI(TAG, "SYSTEM_EVENT_STA_DISCONNECTED"); ESP_LOGI(TAG, "SYSTEM_EVENT_STA_DISCONNECTED");
ESP_ERROR_CHECK(esp_wifi_connect()); esp_wifi_connect();
break; break;
default: default:
break; break;

2
examples/wifi/scan/main/scan.c
View File

@ -147,7 +147,7 @@ static void init_wifi(void)
ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA)); ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA));
ESP_ERROR_CHECK(esp_wifi_start()); ESP_ERROR_CHECK(esp_wifi_start());
ESP_ERROR_CHECK(esp_wifi_scan_start(NULL, true)); esp_wifi_scan_start(NULL, true);
while (1) { while (1) {
if (got_scan_done_event == true) { if (got_scan_done_event == true) {

2
examples/wifi/smart_config/main/smartconfig_main.c
View File

@ -84,7 +84,7 @@ static void sc_callback(smartconfig_status_t status, void *pdata)
ESP_LOGI(TAG, "PASSWORD:%s", wifi_config->sta.password); ESP_LOGI(TAG, "PASSWORD:%s", wifi_config->sta.password);
ESP_ERROR_CHECK( esp_wifi_disconnect() ); ESP_ERROR_CHECK( esp_wifi_disconnect() );
ESP_ERROR_CHECK( esp_wifi_set_config(ESP_IF_WIFI_STA, wifi_config) ); ESP_ERROR_CHECK( esp_wifi_set_config(ESP_IF_WIFI_STA, wifi_config) );
ESP_ERROR_CHECK( esp_wifi_connect() ); esp_wifi_connect();
break; break;
case SC_STATUS_LINK_OVER: case SC_STATUS_LINK_OVER:
ESP_LOGI(TAG, "SC_STATUS_LINK_OVER"); ESP_LOGI(TAG, "SC_STATUS_LINK_OVER");

4
examples/wifi/wps/main/wps.c
View File

@ -55,7 +55,7 @@ static esp_err_t event_handler(void *ctx, system_event_t *event)
break; break;
case SYSTEM_EVENT_STA_DISCONNECTED: case SYSTEM_EVENT_STA_DISCONNECTED:
ESP_LOGI(TAG, "SYSTEM_EVENT_STA_DISCONNECTED"); ESP_LOGI(TAG, "SYSTEM_EVENT_STA_DISCONNECTED");
ESP_ERROR_CHECK(esp_wifi_connect()); esp_wifi_connect();
break; break;
case SYSTEM_EVENT_STA_WPS_ER_SUCCESS: case SYSTEM_EVENT_STA_WPS_ER_SUCCESS:
/*point: the function esp_wifi_wps_start() only get ssid & password /*point: the function esp_wifi_wps_start() only get ssid & password
@ -63,7 +63,7 @@ static esp_err_t event_handler(void *ctx, system_event_t *event)
* */ * */
ESP_LOGI(TAG, "SYSTEM_EVENT_STA_WPS_ER_SUCCESS"); ESP_LOGI(TAG, "SYSTEM_EVENT_STA_WPS_ER_SUCCESS");
ESP_ERROR_CHECK(esp_wifi_wps_disable()); ESP_ERROR_CHECK(esp_wifi_wps_disable());
ESP_ERROR_CHECK(esp_wifi_connect()); esp_wifi_connect();
break; break;
case SYSTEM_EVENT_STA_WPS_ER_FAILED: case SYSTEM_EVENT_STA_WPS_ER_FAILED:
ESP_LOGI(TAG, "SYSTEM_EVENT_STA_WPS_ER_FAILED"); ESP_LOGI(TAG, "SYSTEM_EVENT_STA_WPS_ER_FAILED");