ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #12399 from kivaisan/delete_context_if_activation_fails 

Cellular: Delete created context if activation fails
pull/12405/head
Martin Kojtal 2020-02-10 14:21:30 +00:00 committed by GitHub
parent 88438dfd6c 2b19fd8661
commit 94e191f57a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
features/cellular/framework/AT/AT_CellularContext.cpp
View File

@ -530,29 +530,26 @@ nsapi_error_t AT_CellularContext::find_and_activate_context()
} }
if (err != NSAPI_ERROR_OK) { if (err != NSAPI_ERROR_OK) {
_at.unlock();
tr_error("Failed to activate network context! (%d)", err); tr_error("Failed to activate network context! (%d)", err);
return err; } else if (!(_nonip_req && _cp_in_use) && !get_stack()) {
} // do check for stack to validate that we have support for stack
// do check for stack to validate that we have support for stack
if (!(_nonip_req && _cp_in_use) && !get_stack()) {
_at.unlock();
tr_error("No cellular stack!"); tr_error("No cellular stack!");
return NSAPI_ERROR_UNSUPPORTED; err = NSAPI_ERROR_UNSUPPORTED;
} }
_is_context_active = false; _is_context_active = false;
_is_context_activated = false; _is_context_activated = false;
_is_context_active = _nw->is_active_context(NULL, _cid); if (err == NSAPI_ERROR_OK) {
_is_context_active = _nw->is_active_context(NULL, _cid);
if (!_is_context_active) { if (!_is_context_active) {
activate_context(); activate_context();
}
err = (_at.get_last_error() == NSAPI_ERROR_OK) ? NSAPI_ERROR_OK : NSAPI_ERROR_NO_CONNECTION;
} }
err = (_at.get_last_error() == NSAPI_ERROR_OK) ? NSAPI_ERROR_OK : NSAPI_ERROR_NO_CONNECTION;
// If new PDP context was created and failed to activate, delete it // If new PDP context was created and failed to activate, delete it
if (err != NSAPI_ERROR_OK && _new_context_set) { if (err != NSAPI_ERROR_OK && _new_context_set) {
delete_current_context(); delete_current_context();