Use of APN lookup decision logic fixed

Author: Mirela Chirica

features/cellular/easy_cellular/EasyCellularConnection.cpp

@@ -29,9 +29,9 @@
 #include "CellularLog.h"
 #include "mbed_wait_api.h"
 
-#if MBED_CONF_CELLULAR_USE_APN_LOOKUP || MBED_CONF_PPP_CELL_IFACE_APN_LOOKUP
+#if USE_APN_LOOKUP
 #include "APN_db.h"
-#endif //MBED_CONF_CELLULAR_USE_APN_LOOKUP || MBED_CONF_PPP_CELL_IFACE_APN_LOOKUP
+#endif //USE_APN_LOOKUP
 
 namespace mbed {
 
@@ -59,9 +59,9 @@ EasyCellularConnection::EasyCellularConnection(bool debug) :
                 NSAPI_ERROR_OK)
 {
     tr_info("EasyCellularConnection()");
-#if MBED_CONF_CELLULAR_USE_APN_LOOKUP || MBED_CONF_PPP_CELL_IFACE_APN_LOOKUP
+#if USE_APN_LOOKUP
     _credentials_set = false;
-#endif // #if MBED_CONF_CELLULAR_USE_APN_LOOKUP || MBED_CONF_PPP_CELL_IFACE_APN_LOOKUP
+#endif // #if USE_APN_LOOKUP
     modem_debug_on(debug);
 }
 
@@ -102,11 +102,11 @@ void EasyCellularConnection::set_credentials(const char *apn, const char *uname,
         CellularNetwork * network = _cellularConnectionFSM.get_network();
         if (network) {
             _credentials_err = network->set_credentials(apn, uname, pwd);
-#if MBED_CONF_CELLULAR_USE_APN_LOOKUP || MBED_CONF_PPP_CELL_IFACE_APN_LOOKUP
+#if USE_APN_LOOKUP
             if (_credentials_err == NSAPI_ERROR_OK) {
                 _credentials_set = true;
             }
-#endif // #if MBED_CONF_CELLULAR_USE_APN_LOOKUP || MBED_CONF_PPP_CELL_IFACE_APN_LOOKUP
+#endif // #if USE_APN_LOOKUP
         } else {
             tr_error("NO Network...");
         }
@@ -163,7 +163,7 @@ nsapi_error_t EasyCellularConnection::connect()
     if (err) {
         return err;
     }
-#if MBED_CONF_CELLULAR_USE_APN_LOOKUP || MBED_CONF_PPP_CELL_IFACE_APN_LOOKUP
+#if USE_APN_LOOKUP
     if (!_credentials_set) {
         _target_state = CellularConnectionFSM::STATE_SIM_PIN;
         err = _cellularConnectionFSM.continue_to_state(_target_state);
@@ -193,7 +193,7 @@ nsapi_error_t EasyCellularConnection::connect()
             return err;
         }
     }
-#endif // MBED_CONF_CELLULAR_USE_APN_LOOKUP || MBED_CONF_PPP_CELL_IFACE_APN_LOOKUP
+#endif // USE_APN_LOOKUP
 
     _target_state = CellularConnectionFSM::STATE_CONNECTED;
     err = _cellularConnectionFSM.continue_to_state(_target_state);
@@ -212,9 +212,9 @@ nsapi_error_t EasyCellularConnection::disconnect()
 {
     _credentials_err = NSAPI_ERROR_OK;
     _is_connected = false;
-#if MBED_CONF_CELLULAR_USE_APN_LOOKUP || MBED_CONF_PPP_CELL_IFACE_APN_LOOKUP
+#if USE_APN_LOOKUP
     _credentials_set = false;
-#endif // #if MBED_CONF_CELLULAR_USE_APN_LOOKUP || MBED_CONF_PPP_CELL_IFACE_APN_LOOKUP
+#endif // #if USE_APN_LOOKUP
     if (!_cellularConnectionFSM.get_network()) {
         return NSAPI_ERROR_NO_CONNECTION;
     }

features/cellular/easy_cellular/EasyCellularConnection.h

@@ -24,6 +24,8 @@
 
 #include "netsocket/CellularBase.h"
 
+#define USE_APN_LOOKUP (MBED_CONF_CELLULAR_USE_APN_LOOKUP || (NSAPI_PPP_AVAILABLE && MBED_CONF_PPP_CELL_IFACE_APN_LOOKUP))
+
 namespace mbed
 {
 
@@ -145,9 +147,9 @@ class EasyCellularConnection: public CellularBase
 
     bool _is_connected;
     bool _is_initialized;
-#if MBED_CONF_CELLULAR_USE_APN_LOOKUP || MBED_CONF_PPP_CELL_IFACE_APN_LOOKUP
+#if USE_APN_LOOKUP
     bool _credentials_set;
-#endif // #if MBED_CONF_CELLULAR_USE_APN_LOOKUP || MBED_CONF_PPP_CELL_IFACE_APN_LOOKUP
+#endif // #if USE_APN_LOOKUP
     CellularConnectionFSM::CellularState _target_state;
 
     UARTSerial _cellularSerial;

features/cellular/framework/AT/AT_CellularNetwork.cpp

@@ -133,6 +133,7 @@ nsapi_error_t AT_CellularNetwork::connect(const char *apn,
 
 nsapi_error_t AT_CellularNetwork::delete_current_context()
 {
+    tr_info("Delete context %d", _cid);
     _at.clear_error();
     _at.cmd_start("AT+CGDCONT=");
     _at.write_int(_cid);
@@ -236,12 +237,14 @@ nsapi_error_t AT_CellularNetwork::open_data_channel()
         int context_activation_state = _at.read_int();
         if (context_id == _cid && context_activation_state == 1) {
             is_context_active = true;
+            tr_debug("PDP context %d is active.", _cid);
+            break;
         }
     }
     _at.resp_stop();
 
     if (!is_context_active) {
-        tr_info("Activate PDP context");
+        tr_info("Activate PDP context %d", _cid);
         _at.cmd_start("AT+CGACT=1,");
         _at.write_int(_cid);
         _at.cmd_stop();
@@ -401,13 +404,20 @@ bool AT_CellularNetwork::set_new_context(int cid)
         _ip_stack_type = tmp_stack;
         _cid = cid;
         _new_context_set = true;
+        tr_info("New PDP context id %d was created", _cid);
     }
 
     return success;
 }
 
 bool AT_CellularNetwork::get_context()
 {
+    if (_apn) {
+        tr_debug("APN in use: %s", _apn);
+    } else {
+        tr_debug("NO APN");
+    }
+
     _at.cmd_start("AT+CGDCONT?");
     _at.cmd_stop();
     _at.resp_start("+CGDCONT:");
@@ -429,7 +439,7 @@ bool AT_CellularNetwork::get_context()
         if (pdp_type_len > 0) {
             apn_len = _at.read_string(apn, sizeof(apn) - 1);
             if (apn_len >= 0) {
-                if (_apn && strcmp(apn, _apn) != 0 ) {
+                if (_apn && (strcmp(apn, _apn) != 0) ) {
                     continue;
                 }
                 nsapi_ip_stack_t pdp_stack = string_to_stack_type(pdp_type_from_context);