mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

esp_modem: Fix report unknown line 

In esp_dte_handle_line(), it tokenize the data to call handlers separately
for each *line*. So it needs to post the tokenized data when report unknown
line instead of the first token (which could be a '\r' in my test).

Fixes: 336de29413 ("Examples/pppos_client: Fix manual parsing to accept unexpected lines")
Signed-off-by: Axel Lin <axel.lin@gmail.com>
pull/7719/head
Axel Lin 2021-10-18 09:28:11 +08:00
rodzic b86fe0c66c
commit 0a15cc5e5a
1 zmienionych plików z 7 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
examples/protocols/pppos_client/components/modem/src/esp_modem.c
Wyświetl plik

@ -75,11 +75,11 @@ static inline bool is_only_cr_lf(const char *str, uint32_t len)
return true;
}
static inline void report_unknown_line(esp_modem_dte_t *esp_dte, char *line)
static inline void report_unknown_line(esp_modem_dte_t *esp_dte, char *line, int line_len)
{
/* Send ESP_MODEM_EVENT_UNKNOWN signal to event loop */
esp_event_post_to(esp_dte->event_loop_hdl, ESP_MODEM_EVENT, ESP_MODEM_EVENT_UNKNOWN,
(void *)line, strlen(line) + 1, pdMS_TO_TICKS(100));
(void *)line, line_len + 1, pdMS_TO_TICKS(100));
}
esp_err_t esp_modem_set_rx_cb(modem_dte_t *dte, esp_modem_on_receive receive_cb, void *receive_cb_ctx)
@ -112,24 +112,25 @@ static esp_err_t esp_dte_handle_line(esp_modem_dte_t *esp_dte, char * line, size
char *str_ptr = NULL;
char *p = strtok_r(line, "\n", &str_ptr);
while (p) {
if (len > 2 && !is_only_cr_lf(p, strlen(p))) {
int plen = strlen(p);
if (plen > 2 && !is_only_cr_lf(p, plen)) {
ESP_LOGD(MODEM_TAG, "Handling line: >>%s\n<<", p);
if (dce->handle_line == NULL) {
/* Received an asynchronous line, but no handler waiting this this */
ESP_LOGD(MODEM_TAG, "No handler for line: %s", p);
report_unknown_line(esp_dte, line);
report_unknown_line(esp_dte, p, plen);
return ESP_OK; /* Not an error, just propagate the line to user handler */
}
if (dce->handle_line(dce, p) != ESP_OK) {
ESP_LOGE(MODEM_TAG, "handle line failed");
report_unknown_line(esp_dte, line);
report_unknown_line(esp_dte, p, plen);
}
}
p = strtok_r(NULL, "\n", &str_ptr);
}
return ESP_OK;
post_event_unknown:
report_unknown_line(esp_dte, line);
report_unknown_line(esp_dte, line, strlen(line));
err:
return err;
}