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

Merge pull request #343 from victorrar/dev/IDFGH-10845

Browse Source 
Fix LoadProhibited after failed CMUX initialization
This commit is contained in:
david-cermak
2023-08-28 09:14:45 +02:00
committed by GitHub
parent 27303d28b2 60c87ddf26
commit 86f7a8bbe3
3 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.pre-commit-config.yaml
View File

@ -43,7 +43,7 @@ repos:
hooks: hooks:
- id: eradicate - id: eradicate
- repo: https://github.com/espressif/check-copyright/ - repo: https://github.com/espressif/check-copyright/
rev: v1.0.1 rev: v1.0.3
hooks: hooks:
- id: check-copyright - id: check-copyright
args: ['--ignore', 'ci/check_copyright_ignore.txt', '--config', 'ci/check_copyright_config.yaml'] args: ['--ignore', 'ci/check_copyright_ignore.txt', '--config', 'ci/check_copyright_config.yaml']

3
components/esp_modem/include/cxx_include/esp_modem_dte.hpp
View File

@ -125,7 +125,8 @@ private:
static const size_t GOT_LINE = SignalGroup::bit0; /*!< Bit indicating response available */ static const size_t GOT_LINE = SignalGroup::bit0; /*!< Bit indicating response available */
[[nodiscard]] bool setup_cmux(); /*!< Internal setup of CMUX mode */ [[nodiscard]] bool setup_cmux(); /*!< Internal setup of CMUX mode */
[[nodiscard]] bool exit_cmux(); /*!< Exit of CMUX mode */ [[nodiscard]] bool exit_cmux(); /*!< Exit of CMUX mode and cleanup */
void exit_cmux_internal(); /*!< Cleanup CMUX */
Lock internal_lock{}; /*!< Locks DTE operations */ Lock internal_lock{}; /*!< Locks DTE operations */
unique_buffer buffer; /*!< DTE buffer */ unique_buffer buffer; /*!< DTE buffer */

26
components/esp_modem/src/esp_modem_dte.cpp
View File

@ -76,12 +76,21 @@ bool DTE::exit_cmux()
if (!cmux_term->deinit()) { if (!cmux_term->deinit()) {
return false; return false;
} }
exit_cmux_internal();
return true;
}
void DTE::exit_cmux_internal()
{
if (!cmux_term) {
return;
}
auto ejected = cmux_term->detach(); auto ejected = cmux_term->detach();
// return the ejected terminal and buffer back to this DTE // return the ejected terminal and buffer back to this DTE
primary_term = std::move(ejected.first); primary_term = std::move(ejected.first);
buffer = std::move(ejected.second); buffer = std::move(ejected.second);
secondary_term = primary_term; secondary_term = primary_term;
return true;
} }
bool DTE::setup_cmux() bool DTE::setup_cmux()
@ -90,14 +99,21 @@ bool DTE::setup_cmux()
if (cmux_term == nullptr) { if (cmux_term == nullptr) {
return false; return false;
} }
if (!cmux_term->init()) { if (!cmux_term->init()) {
exit_cmux_internal();
cmux_term = nullptr;
return false; return false;
} }
primary_term = std::make_unique<CMuxInstance>(cmux_term, 0);
if (primary_term == nullptr) { primary_term = std::make_unique<CMuxInstance>(cmux_term, 0);
return false;
}
secondary_term = std::make_unique<CMuxInstance>(cmux_term, 1); secondary_term = std::make_unique<CMuxInstance>(cmux_term, 1);
if (primary_term == nullptr || secondary_term == nullptr) {
exit_cmux_internal();
cmux_term = nullptr;
return false;
}
return true; return true;
} }