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

Merge branch 'bugfix/pppos_report_unknown_line' into 'release/v4.4'

Browse Source 
esp_modem: Fix report unknown line (GitHub PR)

See merge request espressif/esp-idf!15621
This commit is contained in:
David Čermák
2021-11-02 12:14:49 +00:00
parent 2d3ec44011 14a652376f
commit 9303bc00b2
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
examples/protocols/pppos_client/components/modem/src/esp_modem.c
View File

@@ -60,26 +60,26 @@ typedef struct {
} esp_modem_dte_t;
/**
* @brief Returns true if the supplied string contains only CR or LF
* @brief Returns true if the supplied string contains only <CR> characters
*
* @param str string to check
* @param len length of string
*/
static inline bool is_only_cr_lf(const char *str, uint32_t len)
static inline bool is_only_cr(const char *str, uint32_t len)
{
for (int i=0; i<len; ++i) {
if (str[i] != '\r' && str[i] != '\n') {
if (str[i] != '\r') {
return false;
}
}
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 > 1 && !is_only_cr(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;
}