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

Merge branch 'bugfix/esp_netif_ppp_event_data' into 'master'

Browse Source 
esp-netif: Fix PPP netif event posting to include esp_netif data

Closes IDFGH-4147

See merge request espressif/esp-idf!10958
This commit is contained in:
David Čermák
2020-10-27 05:27:24 +08:00
parent 25530d2247 8d6e03a529
commit 97ac37378f
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp_netif/lwip/esp_netif_lwip_ppp.c
View File

@@ -168,7 +168,7 @@ static void on_ppp_status_changed(ppp_pcb *pcb, int err_code, void *ctx)
break; break;
} }
if (obj->ppp_error_event_enabled) { if (obj->ppp_error_event_enabled) {
err = esp_event_post(NETIF_PPP_STATUS, err_code, netif, sizeof(netif), 0); err = esp_event_post(NETIF_PPP_STATUS, err_code, &netif, sizeof(netif), 0);
if (err != ESP_OK) { if (err != ESP_OK) {
ESP_LOGE(TAG, "esp_event_post failed with code %d", err); ESP_LOGE(TAG, "esp_event_post failed with code %d", err);
} }
@@ -219,7 +219,7 @@ static void on_ppp_notify_phase(ppp_pcb *pcb, u8_t phase, void *ctx)
lwip_peer2peer_ctx_t *obj = (lwip_peer2peer_ctx_t *)netif->related_data; lwip_peer2peer_ctx_t *obj = (lwip_peer2peer_ctx_t *)netif->related_data;
assert(obj->base.netif_type == PPP_LWIP_NETIF); assert(obj->base.netif_type == PPP_LWIP_NETIF);
if (obj && obj->ppp_phase_event_enabled) { if (obj && obj->ppp_phase_event_enabled) {
esp_err_t err = esp_event_post(NETIF_PPP_STATUS, NETIF_PP_PHASE_OFFSET + phase, netif, sizeof(netif), 0); esp_err_t err = esp_event_post(NETIF_PPP_STATUS, NETIF_PP_PHASE_OFFSET + phase, &netif, sizeof(netif), 0);
if (err != ESP_OK) { if (err != ESP_OK) {
ESP_LOGE(TAG, "esp_event_post failed with code %d", err); ESP_LOGE(TAG, "esp_event_post failed with code %d", err);
} }

2
examples/protocols/pppos_client/main/pppos_client_main.c
View File

@@ -173,7 +173,7 @@ static void on_ppp_changed(void *arg, esp_event_base_t event_base,
ESP_LOGI(TAG, "PPP state changed event %d", event_id); ESP_LOGI(TAG, "PPP state changed event %d", event_id);
if (event_id == NETIF_PPP_ERRORUSER) { if (event_id == NETIF_PPP_ERRORUSER) {
/* User interrupted event from esp-netif */ /* User interrupted event from esp-netif */
esp_netif_t *netif = event_data; esp_netif_t *netif = *(esp_netif_t**)event_data;
ESP_LOGI(TAG, "User interrupted event from netif:%p", netif); ESP_LOGI(TAG, "User interrupted event from netif:%p", netif);
} }
} }

2
tools/ci/config/target-test.yml
View File

@@ -596,7 +596,7 @@ UT_034:
UT_035: UT_035:
extends: .unit_test_s2_template extends: .unit_test_s2_template
parallel: 42 parallel: 43
tags: tags:
- ESP32S2_IDF - ESP32S2_IDF
- UT_T1_1 - UT_T1_1