Merge pull request #10579 from kevinong0108/fix_cellular_quectel_bg96

adbridge · web-flow · commit 6344b9db2c25 · 2019-05-16T10:58:32.000+01:00
Cellular: fix Quectel BG96 missing unlock at socket_connect
diff --git a/features/cellular/framework/targets/QUECTEL/BG96/QUECTEL_BG96_CellularStack.cpp b/features/cellular/framework/targets/QUECTEL/BG96/QUECTEL_BG96_CellularStack.cpp
@@ -70,6 +70,7 @@ nsapi_error_t QUECTEL_BG96_CellularStack::socket_connect(nsapi_socket_t handle,
         if ((_at.get_last_error() == NSAPI_ERROR_OK) && err) {
             if (err == BG96_SOCKET_BIND_FAIL) {
                 socket->created = false;
+                _at.unlock();
                 return NSAPI_ERROR_PARAMETER;
             }
             _at.cmd_start("AT+QICLOSE=");
@@ -177,6 +178,7 @@ void QUECTEL_BG96_CellularStack::handle_open_socket_response(int &modem_connect_
     modem_connect_id = _at.read_int();
     err = _at.read_int();
 }
+
 nsapi_error_t QUECTEL_BG96_CellularStack::create_socket_impl(CellularSocket *socket)
 {
     int modem_connect_id = -1;

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ nsapi_error_t QUECTEL_BG96_CellularStack::socket_connect(nsapi_socket_t handle,`
`70`	`70`	`if ((_at.get_last_error() == NSAPI_ERROR_OK) && err) {`
`71`	`71`	`if (err == BG96_SOCKET_BIND_FAIL) {`
`72`	`72`	`socket->created = false;`
	`73`	`+ _at.unlock();`
`73`	`74`	`return NSAPI_ERROR_PARAMETER;`
`74`	`75`	`}`
`75`	`76`	`_at.cmd_start("AT+QICLOSE=");`
`@@ -177,6 +178,7 @@ void QUECTEL_BG96_CellularStack::handle_open_socket_response(int &modem_connect_`
`177`	`178`	`modem_connect_id = _at.read_int();`
`178`	`179`	`err = _at.read_int();`
`179`	`180`	`}`
	`181`	`+`
`180`	`182`	`nsapi_error_t QUECTEL_BG96_CellularStack::create_socket_impl(CellularSocket *socket)`
`181`	`183`	`{`
`182`	`184`	`int modem_connect_id = -1;`