espressif/esp-protocols
1
0
Fork 1
mirror of https://github.com/espressif/esp-protocols.git synced 2025-06-27 10:21:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(modem): Fix CMUX enter to ignore URC before transition

Browse Source 
Closes https://github.com/espressif/esp-protocols/issues/669
This commit is contained in:
David Cermak
2024-11-29 17:32:29 +01:00
parent c5b49de2db
commit 1284f66d58
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/esp_modem/src/esp_modem_cmux.cpp
View File

@ -123,7 +123,12 @@ bool CMux::data_available(uint8_t *data, size_t len)
{ {
if (data && (type & FT_UIH) == FT_UIH && len > 0 && dlci > 0) { // valid payload on a virtual term if (data && (type & FT_UIH) == FT_UIH && len > 0 && dlci > 0) { // valid payload on a virtual term
int virtual_term = dlci - 1; int virtual_term = dlci - 1;
if (virtual_term < MAX_TERMINALS_NUM && read_cb[virtual_term]) { if (virtual_term < MAX_TERMINALS_NUM) {
if (read_cb[virtual_term] == nullptr) {
// ignore all virtual terminal's data before we completely establish CMUX
ESP_LOG_BUFFER_HEXDUMP("CMUX Rx before init", data, len, ESP_LOG_DEBUG);
return true;
}
// Post partial data (or defragment to post on CMUX footer) // Post partial data (or defragment to post on CMUX footer)
#ifdef DEFRAGMENT_CMUX_PAYLOAD #ifdef DEFRAGMENT_CMUX_PAYLOAD
if (payload_start == nullptr) { if (payload_start == nullptr) {
@ -142,7 +147,11 @@ bool CMux::data_available(uint8_t *data, size_t len)
sabm_ack = dlci; sabm_ack = dlci;
} else if (data == nullptr && dlci > 0) { } else if (data == nullptr && dlci > 0) {
int virtual_term = dlci - 1; int virtual_term = dlci - 1;
if (virtual_term < MAX_TERMINALS_NUM && read_cb[virtual_term]) { if (virtual_term < MAX_TERMINALS_NUM) {
if (read_cb[virtual_term] == nullptr) {
// silently ignore this CMUX frame (not finished entering CMUX, yet)
return true;
}
#ifdef DEFRAGMENT_CMUX_PAYLOAD #ifdef DEFRAGMENT_CMUX_PAYLOAD
read_cb[virtual_term](payload_start, total_payload_size); read_cb[virtual_term](payload_start, total_payload_size);
#endif #endif