Review fix:

- set ppp_active false if close fails in ppp disconnect.
- unset sigio in ppp disconnect
- take ownership of filehandle in CellularNetwork::disconnect even in case of failure

Author: Teppo Järvelin

features/FEATURE_LWIP/lwip-interface/ppp_lwip.cpp

@@ -295,18 +295,16 @@ extern "C" err_t ppp_lwip_connect(void *pcb)
 
 extern "C" err_t ppp_lwip_disconnect(void *pcb)
 {
+    err_t ret = ERR_OK;
     if (ppp_active) {
-        err_t ret = ppp_close(my_ppp_pcb, 0);
-        if (ret != ERR_OK) {
-            return ret;
+        ret = ppp_close(my_ppp_pcb, 0);
+        if (ret == ERR_OK) {
+            /* close call made, now let's catch the response in the status callback */
+            sys_arch_sem_wait(&ppp_close_sem, 0);
         }
-
-        /* close call made, now let's catch the response in the status callback */
-        sys_arch_sem_wait(&ppp_close_sem, 0);
         ppp_active = false;
     }
-
-    return ERR_OK;
+    return ret;
 }
 
 extern "C" nsapi_error_t ppp_lwip_if_init(void *pcb, struct netif *netif, const nsapi_ip_stack_t stack)
@@ -384,6 +382,7 @@ nsapi_error_t nsapi_ppp_connect(FileHandle *stream, Callback<void(nsapi_event_t,
 
     if (retcode != NSAPI_ERROR_OK) {
         connection_status_cb = NULL;
+        my_stream->sigio(NULL);
         my_stream->set_blocking(true);
         my_stream = NULL;
     }

features/cellular/framework/AT/AT_CellularNetwork.cpp

@@ -374,11 +374,9 @@ nsapi_error_t AT_CellularNetwork::disconnect()
     nsapi_error_t err = nsapi_ppp_disconnect(_at.get_file_handle());
     // after ppp disconnect if we wan't to use same at handler we need to set filehandle again to athandler so it
     // will set the correct sigio and nonblocking
-    if (err == NSAPI_ERROR_OK) {
-        _at.lock();
-        _at.set_file_handle(_at.get_file_handle());
-        _at.unlock();
-    }
+    _at.lock();
+    _at.set_file_handle(_at.get_file_handle());
+    _at.unlock();
     return err;
 #else
     _at.lock();