Fix some svace
[platform/core/api/connection.git] / src / libnetwork.c
index 2d61e3e..212963c 100755 (executable)
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
- * limitations under the License. 
+ * limitations under the License.
  */
 
+#include <glib.h>
 #include <stdio.h>
+#include <stdarg.h>
 #include <string.h>
-#include <glib.h>
 #include <vconf/vconf.h>
+#include <system_info.h>
 #include <arpa/inet.h>
 
 #include "net_connection_private.h"
 
-static GSList *prof_handle_list = NULL;
-static GHashTable *profile_cb_table = NULL;
+static __thread GSList *prof_handle_list = NULL;
+static __thread GHashTable *profile_cb_table = NULL;
 
 struct _profile_cb_s {
        connection_profile_state_changed_cb callback;
@@ -47,33 +49,38 @@ struct _libnet_s {
        void *closed_user_data;
        void *set_default_user_data;
        void *reset_profile_user_data;
-       bool registered;
        bool is_created;
 };
 
+struct _state_notify {
+       connection_profile_state_changed_cb callback;
+       connection_profile_state_e state;
+       void *user_data;
+};
+
 struct managed_idle_data {
        GSourceFunc func;
        gpointer user_data;
        guint id;
 };
 
-struct feature_type {
-       bool telephony;
-       bool wifi;
-       bool tethering_bluetooth;
-};
-
-static struct _profile_list_s profile_iterator = {0, 0, NULL};
-static struct _libnet_s libnet = {NULL, NULL, NULL, NULL, NULL, NULL, false};
+static __thread struct _profile_list_s profile_iterator = {0, 0, NULL};
+static __thread struct _libnet_s libnet = {NULL, NULL, NULL, NULL, NULL, NULL, false};
 static __thread GSList *managed_idler_list = NULL;
-static __thread bool is_check_enable_feature = false;
-static __thread struct feature_type enable_feature = {false, false, false};
+static __thread bool connection_is_feature_checked[CONNECTION_SUPPORTED_FEATURE_MAX] = {0, };
+static __thread bool connection_feature_supported[CONNECTION_SUPPORTED_FEATURE_MAX] = {0, };
 
 bool _connection_is_created(void)
 {
        return libnet.is_created;
 }
 
+static void __connection_set_created(bool tag)
+{
+       libnet.is_created = tag;
+}
+
+//LCOV_EXCL_START
 static connection_error_e __libnet_convert_to_cp_error_type(net_err_t err_type)
 {
        switch (err_type) {
@@ -168,14 +175,6 @@ static void __libnet_set_reset_profile_cb(connection_opened_cb user_cb, void *us
        }
 }
 
-static void __libnet_set_opened_cb(connection_opened_cb user_cb, void *user_data)
-{
-       if (user_cb) {
-               libnet.opened_cb = user_cb;
-               libnet.opened_user_data = user_data;
-       }
-}
-
 static gboolean __libnet_reset_profile_cb_idle(gpointer data)
 {
        connection_error_e result = (connection_error_e)data;
@@ -201,47 +200,103 @@ static void __libnet_reset_profile_cb(connection_error_e result)
                _connection_callback_add(__libnet_reset_profile_cb_idle, (gpointer)result);
 }
 
-static void __libnet_opened_cb(connection_error_e result)
+static void __libnet_set_opened_cb(connection_opened_cb user_cb, void *user_data)
+{
+       if (user_cb != NULL) {
+               libnet.opened_cb = user_cb;
+               libnet.opened_user_data = user_data;
+       }
+}
+
+static gboolean __libnet_opened_cb_idle(gpointer data)
 {
-       if (libnet.opened_cb)
+       connection_error_e result = (connection_error_e)data;
+
+       if (libnet.opened_cb != NULL)
                libnet.opened_cb(result, libnet.opened_user_data);
 
        libnet.opened_cb = NULL;
        libnet.opened_user_data = NULL;
+
+       return FALSE;
+}
+
+static void __libnet_opened_cb(connection_error_e result)
+{
+       if (_connection_is_created() != true) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Application is not registered"
+                               "If multi-threaded, thread integrity be broken.");
+               return;
+       }
+
+       if (libnet.opened_cb != NULL)
+               _connection_callback_add(__libnet_opened_cb_idle, (gpointer)result);
 }
 
 static void __libnet_set_closed_cb(connection_closed_cb user_cb, void *user_data)
 {
-       if (user_cb) {
+       if (user_cb != NULL) {
                libnet.closed_cb = user_cb;
                libnet.closed_user_data = user_data;
        }
 }
 
-static void __libnet_closed_cb(connection_error_e result)
+static gboolean __libnet_closed_cb_idle(gpointer data)
 {
-       if (libnet.closed_cb)
+       connection_error_e result = (connection_error_e)data;
+
+       if (libnet.closed_cb != NULL)
                libnet.closed_cb(result, libnet.closed_user_data);
 
        libnet.closed_cb = NULL;
        libnet.closed_user_data = NULL;
+
+       return FALSE;
+}
+
+static void __libnet_closed_cb(connection_error_e result)
+{
+       if (_connection_is_created() != true) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Application is not registered"
+                               "If multi-threaded, thread integrity be broken.");
+               return;
+       }
+
+       if (libnet.closed_cb != NULL)
+               _connection_callback_add(__libnet_closed_cb_idle, (gpointer)result);
 }
 
 static void __libnet_set_default_cb(connection_set_default_cb user_cb, void *user_data)
 {
-       if (user_cb) {
+       if (user_cb != NULL) {
                libnet.set_default_cb = user_cb;
                libnet.set_default_user_data = user_data;
        }
 }
 
-static void __libnet_default_cb(connection_error_e result)
+static gboolean __libnet_default_cb_idle(gpointer data)
 {
-       if (libnet.set_default_cb)
+       connection_error_e result = (connection_error_e)data;
+
+       if (libnet.set_default_cb != NULL)
                libnet.set_default_cb(result, libnet.set_default_user_data);
 
        libnet.set_default_cb = NULL;
        libnet.set_default_user_data = NULL;
+
+       return FALSE;
+}
+
+static void __libnet_default_cb(connection_error_e result)
+{
+       if (_connection_is_created() != true) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Application is not registered"
+                               "If multi-threaded, thread integrity be broken.");
+               return;
+       }
+
+       if (libnet.set_default_cb != NULL)
+               _connection_callback_add(__libnet_default_cb_idle, (gpointer)result);
 }
 
 static void __libnet_set_ethernet_cable_state_changed_cb(
@@ -257,14 +312,37 @@ static void __libnet_ethernet_cable_state_changed_cb(
                libnet.ethernet_cable_state_changed_cb(state);
 }
 
+static gboolean __libnet_state_changed_cb_idle(gpointer data)
+{
+       struct _state_notify *notify = (struct _state_notify *)data;
+
+       if (notify == NULL)
+               return FALSE;
+
+       if (notify->callback != NULL)
+               notify->callback(notify->state, notify->user_data);
+
+       g_free(notify);
+
+       return FALSE;
+}
+
 static void __libnet_state_changed_cb(char *profile_name, connection_profile_state_e state)
 {
+       guint id;
+       struct _state_notify *notify;
+       struct _profile_cb_s *cb_info;
+
+       if (_connection_is_created() != true) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Application is not registered"
+                               "If multi-threaded, thread integrity be broken.");
+               return;
+       }
+
        if (profile_name == NULL)
                return;
 
-       struct _profile_cb_s *cb_info;
        cb_info = g_hash_table_lookup(profile_cb_table, profile_name);
-
        if (cb_info == NULL)
                return;
 
@@ -273,8 +351,21 @@ static void __libnet_state_changed_cb(char *profile_name, connection_profile_sta
 
        cb_info->state = state;
 
-       if (state >= 0 && cb_info->callback)
-               cb_info->callback(state, cb_info->user_data);
+       if (state < 0 || cb_info->callback == NULL)
+               return;
+
+       notify = g_try_new0(struct _state_notify, 1);
+       if (notify == NULL)
+               return;
+
+       notify->callback = cb_info->callback;
+       notify->state = state;
+       notify->user_data = cb_info->user_data;
+
+       id = _connection_callback_add(__libnet_state_changed_cb_idle,
+                       (gpointer)notify);
+       if (!id)
+               g_free(notify);
 }
 
 static void __libnet_clear_profile_list(struct _profile_list_s *profile_list)
@@ -287,7 +378,7 @@ static void __libnet_clear_profile_list(struct _profile_list_s *profile_list)
        profile_list->profiles = NULL;
 }
 
-static void __libnet_evt_cb(net_event_info_t*  event_cb, void* user_data)
+static void __libnet_evt_cb(net_event_info_t *event_cb, void *user_data)
 {
        bool is_requested = false;
        connection_error_e result = CONNECTION_ERROR_NONE;
@@ -298,8 +389,8 @@ static void __libnet_evt_cb(net_event_info_t*  event_cb, void* user_data)
                /* fall through */
        case NET_EVENT_OPEN_IND:
                result = __libnet_convert_to_cp_error_type(event_cb->Error);
-               CONNECTION_LOG(CONNECTION_INFO, "Got connection open %s : %s\n",
-                                       (is_requested) ? "RSP":"IND",
+               CONNECTION_LOG(CONNECTION_INFO, "Connection opened %s[%s]",
+                                       (is_requested) ? "RSP" : "IND",
                                        __libnet_convert_cp_error_type_to_string(result));
 
                if (is_requested)
@@ -308,12 +399,12 @@ static void __libnet_evt_cb(net_event_info_t*  event_cb, void* user_data)
                switch (event_cb->Error) {
                case NET_ERR_NONE:
                case NET_ERR_ACTIVE_CONNECTION_EXISTS:
-                       CONNECTION_LOG(CONNECTION_INFO, "'Open connection' succeeded\n");
+                       CONNECTION_LOG(CONNECTION_INFO, "Successfully open connection");
 
                        __libnet_state_changed_cb(event_cb->ProfileName, CONNECTION_PROFILE_STATE_CONNECTED);
                        return;
                default:
-                       CONNECTION_LOG(CONNECTION_ERROR, "'Open connection' failed!! [%s]\n",
+                       CONNECTION_LOG(CONNECTION_ERROR, "Failed to open connection[%s]",
                                                __libnet_convert_cp_error_type_to_string(result));
                }
 
@@ -325,8 +416,8 @@ static void __libnet_evt_cb(net_event_info_t*  event_cb, void* user_data)
                /* fall through */
        case NET_EVENT_CLOSE_IND:
                result = __libnet_convert_to_cp_error_type(event_cb->Error);
-               CONNECTION_LOG(CONNECTION_INFO, "Got connection close %s : %s\n",
-                                       (is_requested) ? "RSP":"IND",
+               CONNECTION_LOG(CONNECTION_INFO, "Connection closed %s[%s]",
+                                       (is_requested) ? "RSP" : "IND",
                                        __libnet_convert_cp_error_type_to_string(result));
 
                if (is_requested)
@@ -334,54 +425,42 @@ static void __libnet_evt_cb(net_event_info_t*  event_cb, void* user_data)
 
                switch (event_cb->Error) {
                case NET_ERR_NONE:
-                       CONNECTION_LOG(CONNECTION_INFO, "'Close connection' succeeded!\n");
+                       CONNECTION_LOG(CONNECTION_INFO, "Successfully closed connection");
 
                        __libnet_state_changed_cb(event_cb->ProfileName, CONNECTION_PROFILE_STATE_DISCONNECTED);
                        return;
                default:
-                       CONNECTION_LOG(CONNECTION_ERROR, "'Close connection' failed!! [%s]\n",
-                                               __libnet_convert_cp_error_type_to_string(result));
+                       CONNECTION_LOG(CONNECTION_ERROR, "Failed to close connection[%s]",
+                                                       __libnet_convert_cp_error_type_to_string(result));
                }
 
                break;
        case NET_EVENT_NET_STATE_IND:
-               CONNECTION_LOG(CONNECTION_INFO, "Got State changed IND\n");
+               CONNECTION_LOG(CONNECTION_INFO, "State changed IND");
 
                if (event_cb->Datalength != sizeof(net_state_type_t))
                        return;
 
-               net_state_type_t *profile_state = (net_state_type_t*)event_cb->Data;
+               net_state_type_t *profile_state = (net_state_type_t *)event_cb->Data;
                connection_profile_state_e cp_state = _profile_convert_to_cp_state(*profile_state);
 
-               CONNECTION_LOG(CONNECTION_INFO,
-                               "Profile State : %s, profile name : %s\n",
-                               __libnet_convert_cp_state_to_string(cp_state),
-                               event_cb->ProfileName);
+               CONNECTION_LOG(CONNECTION_INFO, "state: %s", __libnet_convert_cp_state_to_string(cp_state));
+               SECURE_CONNECTION_LOG(CONNECTION_INFO, "profile name: %s", event_cb->ProfileName);
 
                __libnet_state_changed_cb(event_cb->ProfileName, cp_state);
 
                break;
-       case NET_EVENT_WIFI_SCAN_IND:
-       case NET_EVENT_WIFI_SCAN_RSP:
-               CONNECTION_LOG(CONNECTION_INFO, "Got wifi scan IND\n");
-               break;
-       case NET_EVENT_WIFI_POWER_IND:
-       case NET_EVENT_WIFI_POWER_RSP:
-               CONNECTION_LOG(CONNECTION_INFO, "Got wifi power IND\n");
-               break;
        case NET_EVENT_CELLULAR_SET_DEFAULT_RSP:
                result = __libnet_convert_to_cp_error_type(event_cb->Error);
-               CONNECTION_LOG(CONNECTION_INFO, "Got set default profile RSP %d\n", result);
+               CONNECTION_LOG(CONNECTION_INFO, "Got set default profile RSP %d", result);
                __libnet_default_cb(result);
                break;
-       case NET_EVENT_WIFI_WPS_RSP:
-               CONNECTION_LOG(CONNECTION_INFO, "Got wifi WPS RSP\n");
-               /* fall through */
+
        case NET_EVENT_CELLULAR_RESET_DEFAULT_RSP:
                result = __libnet_convert_to_cp_error_type(event_cb->Error);
                CONNECTION_LOG(CONNECTION_INFO, "Got reset default profile RSP %d", result);
                __libnet_reset_profile_cb(result);
-
+               break;
        case NET_EVENT_ETHERNET_CABLE_ATTACHED:
                CONNECTION_LOG(CONNECTION_INFO, "Got Ethernet cable Attached Indication\n");
                __libnet_ethernet_cable_state_changed_cb(CONNECTION_ETHERNET_CABLE_ATTACHED);
@@ -390,11 +469,12 @@ static void __libnet_evt_cb(net_event_info_t*  event_cb, void* user_data)
                CONNECTION_LOG(CONNECTION_INFO, "Got Ethernet cable detached Indication\n");
                __libnet_ethernet_cable_state_changed_cb(CONNECTION_ETHERNET_CABLE_DETACHED);
                break;
-       default :
-               CONNECTION_LOG(CONNECTION_ERROR, "Error! Unknown Event\n\n");
+
+       default:
                break;
        }
 }
+//LCOV_EXCL_STOP
 
 static int __libnet_check_address_type(int address_family, const char *address)
 {
@@ -402,7 +482,7 @@ static int __libnet_check_address_type(int address_family, const char *address)
        int err = 0;
 
        err = inet_pton(address_family, address, &buf);
-       if(err > 0)
+       if (err > 0)
                return 1;
 
        return 0;
@@ -413,7 +493,7 @@ int __libnet_get_connected_count(struct _profile_list_s *profile_list)
        int count = 0;
        int i = 0;
 
-       for (;i < profile_list->count;i++) {
+       for (; i < profile_list->count; i++) {
                if (profile_list->profiles[i].ProfileState == NET_STATE_TYPE_ONLINE ||
                    profile_list->profiles[i].ProfileState == NET_STATE_TYPE_READY)
                        count++;
@@ -426,7 +506,7 @@ void __libnet_copy_connected_profile(net_profile_info_t **dest, struct _profile_
 {
        int i = 0;
 
-       for (;i < source->count;i++) {
+       for (; i < source->count; i++) {
                if (source->profiles[i].ProfileState == NET_STATE_TYPE_ONLINE ||
                    source->profiles[i].ProfileState == NET_STATE_TYPE_READY) {
                        memcpy(*dest, &source->profiles[i], sizeof(net_profile_info_t));
@@ -435,16 +515,43 @@ void __libnet_copy_connected_profile(net_profile_info_t **dest, struct _profile_
        }
 }
 
+//LCOV_EXCL_START
+int __libnet_get_default_count(struct _profile_list_s *profile_list)
+{
+       int count = 0;
+       int i = 0;
+
+       for (; i < profile_list->count; i++) {
+               if (profile_list->profiles[i].ProfileInfo.Pdp.DefaultConn == TRUE)
+                       count++;
+       }
+
+       return count;
+}
+
+void __libnet_copy_default_profile(net_profile_info_t **dest, struct _profile_list_s *source)
+{
+       int i = 0;
+
+       for (; i < source->count; i++) {
+               if (source->profiles[i].ProfileInfo.Pdp.DefaultConn == TRUE) {
+                       memcpy(*dest, &source->profiles[i], sizeof(net_profile_info_t));
+                       (*dest)++;
+               }
+       }
+}
+//LCOV_EXCL_STOP
+
 int _connection_libnet_init(void)
 {
        int rv;
 
-       if (!libnet.registered) {
+       if (_connection_is_created() != true) {
                rv = net_register_client_ext((net_event_cb_t)__libnet_evt_cb, NET_DEVICE_DEFAULT, NULL);
                if (rv != NET_ERR_NONE)
-                       return false;
+                       return rv;
 
-               libnet.registered = true;
+               __connection_set_created(true);
 
                if (profile_cb_table == NULL)
                        profile_cb_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
@@ -455,11 +562,11 @@ int _connection_libnet_init(void)
 
 bool _connection_libnet_deinit(void)
 {
-       if (libnet.registered) {
+       if (_connection_is_created() == true) {
                if (net_deregister_client_ext(NET_DEVICE_DEFAULT) != NET_ERR_NONE)
                        return false;
 
-               libnet.registered = false;
+               __connection_set_created(false);
 
                if (profile_cb_table) {
                        g_hash_table_destroy(profile_cb_table);
@@ -488,12 +595,13 @@ bool _connection_libnet_check_profile_validity(connection_profile_h profile)
        for (list = prof_handle_list; list; list = list->next)
                if (profile == list->data) return true;
 
-       for (;i < profile_iterator.count;i++)
+       for (; i < profile_iterator.count; i++)
                if (profile == &profile_iterator.profiles[i]) return true;
 
        return false;
 }
 
+//LCOV_EXCL_START
 bool _connection_libnet_check_profile_cb_validity(connection_profile_h profile)
 {
        struct _profile_cb_s *cb_info;
@@ -508,21 +616,20 @@ bool _connection_libnet_check_profile_cb_validity(connection_profile_h profile)
 
        return false;
 }
-
+//LCOV_EXCL_STOP
 
 int _connection_libnet_get_wifi_state(connection_wifi_state_e *state)
 {
        int rv;
        net_wifi_state_t wlan_state;
-       net_profile_name_t profile_name;
 
-       rv = net_get_wifi_state(&wlan_state, &profile_name);
+       rv = net_get_wifi_state(&wlan_state);
        if (rv == NET_ERR_ACCESS_DENIED) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
-               return CONNECTION_ERROR_PERMISSION_DENIED;
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
        } else if (rv != NET_ERR_NONE) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Failed to get Wi-Fi state[%d]", rv);
-               return CONNECTION_ERROR_OPERATION_FAILED;
+               CONNECTION_LOG(CONNECTION_ERROR, "Failed to get Wi-Fi state[%d]", rv); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
        }
 
        switch (wlan_state) {
@@ -530,22 +637,24 @@ int _connection_libnet_get_wifi_state(connection_wifi_state_e *state)
                *state = CONNECTION_WIFI_STATE_DEACTIVATED;
                break;
        case WIFI_ON:
-       case WIFI_CONNECTING:
+       case WIFI_ASSOCIATION:
+       case WIFI_CONFIGURATION:
                *state = CONNECTION_WIFI_STATE_DISCONNECTED;
                break;
        case WIFI_CONNECTED:
        case WIFI_DISCONNECTING:
                *state = CONNECTION_WIFI_STATE_CONNECTED;
                break;
-       default :
-               CONNECTION_LOG(CONNECTION_ERROR, "Error!! Unknown state\n");
-               return CONNECTION_ERROR_INVALID_OPERATION;
+       default:
+               CONNECTION_LOG(CONNECTION_ERROR, "Unknown Wi-Fi state"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_INVALID_OPERATION; //LCOV_EXCL_LINE
        }
 
        return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_get_ethernet_state(connection_ethernet_state_e* state)
+//LCOV_EXCL_START
+int _connection_libnet_get_ethernet_state(connection_ethernet_state_e *state)
 {
        int rv;
        struct _profile_list_s ethernet_profiles = {0, 0, NULL};
@@ -556,7 +665,7 @@ int _connection_libnet_get_ethernet_state(connection_ethernet_state_e* state)
        }
 
        if (ethernet_profiles.count == 0) {
-               state = CONNECTION_ETHERNET_STATE_DEACTIVATED;
+               *state = CONNECTION_ETHERNET_STATE_DEACTIVATED;
                return CONNECTION_ERROR_NONE;
        }
 
@@ -573,6 +682,7 @@ int _connection_libnet_get_ethernet_state(connection_ethernet_state_e* state)
                *state = CONNECTION_ETHERNET_STATE_DISCONNECTED;
                break;
        default:
+               __libnet_clear_profile_list(&ethernet_profiles);
                return CONNECTION_ERROR_OPERATION_FAILED;
        }
 
@@ -595,7 +705,7 @@ int _connection_libnet_get_ethernet_cable_state(connection_ethernet_cable_state_
                return CONNECTION_ERROR_OPERATION_FAILED;
        }
 
-       if(status == 1)
+       if (status == 1)
                *state = CONNECTION_ETHERNET_CABLE_ATTACHED;
        else
                *state = CONNECTION_ETHERNET_CABLE_DETACHED;
@@ -609,16 +719,17 @@ int _connection_libnet_set_ethernet_cable_state_changed_cb(
 
        return CONNECTION_ERROR_NONE;
 }
+//LCOV_EXCL_STOP
 
-int _connection_libnet_get_bluetooth_state(connection_bt_state_estate)
+int _connection_libnet_get_bluetooth_state(connection_bt_state_e *state)
 {
        int i = 0;
        int rv = 0;
        struct _profile_list_s bluetooth_profiles = {0, 0, NULL};
        rv = net_get_profile_list(NET_DEVICE_BLUETOOTH, &bluetooth_profiles.profiles, &bluetooth_profiles.count);
        if (rv == NET_ERR_ACCESS_DENIED) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
-               return CONNECTION_ERROR_PERMISSION_DENIED;
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
        }
 
        if (bluetooth_profiles.count == 0) {
@@ -626,6 +737,7 @@ int _connection_libnet_get_bluetooth_state(connection_bt_state_e* state)
                return CONNECTION_ERROR_NONE;
        }
 
+       //LCOV_EXCL_START
        for (; i < bluetooth_profiles.count; i++) {
                switch (bluetooth_profiles.profiles[i].ProfileState) {
                case NET_STATE_TYPE_ONLINE:
@@ -644,8 +756,9 @@ int _connection_libnet_get_bluetooth_state(connection_bt_state_e* state)
                        return CONNECTION_ERROR_OPERATION_FAILED;
                }
        }
+       //LCOV_EXCL_STOP
 
-done:
+done :
        __libnet_clear_profile_list(&bluetooth_profiles);
 
        return CONNECTION_ERROR_NONE;
@@ -654,60 +767,167 @@ done:
 int _connection_libnet_get_profile_iterator(connection_iterator_type_e type, connection_profile_iterator_h* profile_iter_h)
 {
        int count = 0;
-       int rv;
+       int rv1, rv2, rv3, rv4;
        net_profile_info_t *profiles = NULL;
 
-       struct _profile_list_s all_profiles = {0, 0, NULL};
+       struct _profile_list_s wifi_profiles = {0, 0, NULL};
+       struct _profile_list_s cellular_profiles = {0, 0, NULL};
+       struct _profile_list_s ethernet_profiles = {0, 0, NULL};
+       struct _profile_list_s bluetooth_profiles = {0, 0, NULL};
 
        __libnet_clear_profile_list(&profile_iterator);
 
-       rv = net_get_profile_list(NET_DEVICE_MAX, &all_profiles.profiles, &all_profiles.count);
-
-       if (rv != NET_ERR_NONE) {
-               if (rv == NET_ERR_NO_SERVICE) {
-                       *profile_iter_h = &profile_iterator;
-                       return CONNECTION_ERROR_NONE;
-               } else
-                       return CONNECTION_ERROR_OPERATION_FAILED;
+       rv1 = net_get_profile_list(NET_DEVICE_WIFI, &wifi_profiles.profiles, &wifi_profiles.count);
+       if (rv1 == NET_ERR_ACCESS_DENIED) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
+       } else if (rv1 != NET_ERR_NO_SERVICE && rv1 != NET_ERR_NONE)
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
+
+       CONNECTION_LOG(CONNECTION_INFO, "Wi-Fi profile count: %d", wifi_profiles.count);
+
+       rv2 = net_get_profile_list(NET_DEVICE_CELLULAR, &cellular_profiles.profiles, &cellular_profiles.count);
+       if (rv2 == NET_ERR_ACCESS_DENIED) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               __libnet_clear_profile_list(&wifi_profiles);
+               return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
+       } else if (rv2 != NET_ERR_NO_SERVICE && rv2 != NET_ERR_NONE) {
+               __libnet_clear_profile_list(&wifi_profiles);
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
+       }
+       CONNECTION_LOG(CONNECTION_INFO, "Cellular profile count: %d", cellular_profiles.count);
+
+       rv3 = net_get_profile_list(NET_DEVICE_ETHERNET, &ethernet_profiles.profiles, &ethernet_profiles.count);
+       if (rv3 == NET_ERR_ACCESS_DENIED) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               __libnet_clear_profile_list(&wifi_profiles);
+               __libnet_clear_profile_list(&cellular_profiles);
+               return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
+       } else if (rv3 != NET_ERR_NO_SERVICE && rv3 != NET_ERR_NONE) {
+               __libnet_clear_profile_list(&wifi_profiles);
+               __libnet_clear_profile_list(&cellular_profiles);
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
+       }
+       CONNECTION_LOG(CONNECTION_INFO, "Ethernet profile count : %d", ethernet_profiles.count);
+
+       rv4 = net_get_profile_list(NET_DEVICE_BLUETOOTH, &bluetooth_profiles.profiles, &bluetooth_profiles.count);
+       if (rv4 == NET_ERR_ACCESS_DENIED) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               __libnet_clear_profile_list(&wifi_profiles);
+               __libnet_clear_profile_list(&cellular_profiles);
+               __libnet_clear_profile_list(&ethernet_profiles);
+               return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
+       } else if (rv4 != NET_ERR_NO_SERVICE && rv4 != NET_ERR_NONE) {
+               __libnet_clear_profile_list(&wifi_profiles);
+               __libnet_clear_profile_list(&cellular_profiles);
+               __libnet_clear_profile_list(&ethernet_profiles);
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
        }
+       CONNECTION_LOG(CONNECTION_INFO, "Bluetooth profile count : %d", bluetooth_profiles.count);
 
        *profile_iter_h = &profile_iterator;
 
        switch (type) {
        case CONNECTION_ITERATOR_TYPE_REGISTERED:
-               count = all_profiles.count;
-               CONNECTION_LOG(CONNECTION_INFO, "Total profile count : %d\n", count);
-
+               count = wifi_profiles.count + cellular_profiles.count + ethernet_profiles.count + bluetooth_profiles.count;
+               CONNECTION_LOG(CONNECTION_INFO, "Total profile count : %d", count);
                if (count == 0)
                        return CONNECTION_ERROR_NONE;
 
-               profile_iterator.profiles = all_profiles.profiles;
+               profiles = g_try_new0(net_profile_info_t, count);
+               if (profiles == NULL) {
+                       __libnet_clear_profile_list(&wifi_profiles);
+                       __libnet_clear_profile_list(&cellular_profiles);
+                       __libnet_clear_profile_list(&ethernet_profiles);
+                       __libnet_clear_profile_list(&bluetooth_profiles);
+                       return CONNECTION_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE
+               }
+
+               profile_iterator.profiles = profiles;
+
+               if (wifi_profiles.count > 0) {
+                       memcpy(profiles, wifi_profiles.profiles,
+                                       sizeof(net_profile_info_t) * wifi_profiles.count);
+                       profiles += wifi_profiles.count;
+               }
+
+               if (cellular_profiles.count > 0) {
+                       memcpy(profiles, cellular_profiles.profiles,
+                                       sizeof(net_profile_info_t) * cellular_profiles.count);
+                       profiles += cellular_profiles.count;
+               }
+
+               if (ethernet_profiles.count > 0) {
+                       memcpy(profiles, ethernet_profiles.profiles,
+                                       sizeof(net_profile_info_t) * ethernet_profiles.count);
+                       profiles += ethernet_profiles.count;
+               }
+
+               if (bluetooth_profiles.count > 0)
+                       memcpy(profiles, bluetooth_profiles.profiles,
+                                       sizeof(net_profile_info_t) * bluetooth_profiles.count);
 
                break;
        case CONNECTION_ITERATOR_TYPE_CONNECTED:
-               count = __libnet_get_connected_count(&all_profiles);
-               CONNECTION_LOG(CONNECTION_INFO, "Total connected profile count : %d\n", count);
-
+               count = __libnet_get_connected_count(&wifi_profiles);
+               count += __libnet_get_connected_count(&cellular_profiles);
+               count += __libnet_get_connected_count(&ethernet_profiles);
+               count += __libnet_get_connected_count(&bluetooth_profiles);
+               CONNECTION_LOG(CONNECTION_INFO, "Total connected profile count : %d", count);
                if (count == 0)
                        return CONNECTION_ERROR_NONE;
 
                profiles = g_try_new0(net_profile_info_t, count);
                if (profiles == NULL) {
-                       __libnet_clear_profile_list(&all_profiles);
-                       return CONNECTION_ERROR_OUT_OF_MEMORY;
+                       __libnet_clear_profile_list(&wifi_profiles);
+                       __libnet_clear_profile_list(&cellular_profiles);
+                       __libnet_clear_profile_list(&ethernet_profiles);
+                       __libnet_clear_profile_list(&bluetooth_profiles);
+                       return CONNECTION_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE
+               }
+
+               profile_iterator.profiles = profiles;
+
+               if (wifi_profiles.count > 0)
+                       __libnet_copy_connected_profile(&profiles, &wifi_profiles);
+
+               if (cellular_profiles.count > 0)
+                       __libnet_copy_connected_profile(&profiles, &cellular_profiles);
+
+               if (ethernet_profiles.count > 0)
+                       __libnet_copy_connected_profile(&profiles, &ethernet_profiles);
+
+               if (bluetooth_profiles.count > 0)
+                       __libnet_copy_connected_profile(&profiles, &bluetooth_profiles);
+
                break;
        case CONNECTION_ITERATOR_TYPE_DEFAULT:
-                       /* To do : Not supported yet */
-               break;
+               count = __libnet_get_default_count(&cellular_profiles);
+               CONNECTION_LOG(CONNECTION_INFO, "Total default profile count : %d", count); //LCOV_EXCL_LINE
+               if (count == 0)
+                       return CONNECTION_ERROR_NONE;
+
+               profiles = g_try_new0(net_profile_info_t, count);
+               if (profiles == NULL) {
+                       __libnet_clear_profile_list(&wifi_profiles);
+                       __libnet_clear_profile_list(&cellular_profiles);
+                       __libnet_clear_profile_list(&ethernet_profiles);
+                       __libnet_clear_profile_list(&bluetooth_profiles);
+                       return CONNECTION_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE
                }
 
                profile_iterator.profiles = profiles;
 
-               __libnet_copy_connected_profile(&profiles, &all_profiles);
-
-               __libnet_clear_profile_list(&all_profiles);
+               if (cellular_profiles.count > 0)
+                       __libnet_copy_default_profile(&profiles, &cellular_profiles);
+               break;
        }
 
+       __libnet_clear_profile_list(&wifi_profiles);
+       __libnet_clear_profile_list(&cellular_profiles);
+       __libnet_clear_profile_list(&ethernet_profiles);
+       __libnet_clear_profile_list(&bluetooth_profiles);
+
        profile_iterator.count = count;
 
        return CONNECTION_ERROR_NONE;
@@ -741,7 +961,7 @@ bool _connection_libnet_iterator_has_next(connection_profile_iterator_h profile_
 int _connection_libnet_destroy_iterator(connection_profile_iterator_h profile_iter_h)
 {
        if (profile_iter_h != &profile_iterator)
-               return CONNECTION_ERROR_INVALID_PARAMETER;
+               return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
 
        __libnet_clear_profile_list(&profile_iterator);
 
@@ -755,16 +975,16 @@ int _connection_libnet_get_current_profile(connection_profile_h *profile)
 
        rv = net_get_active_net_info(&active_profile);
        if (rv == NET_ERR_NO_SERVICE)
-               return CONNECTION_ERROR_NO_CONNECTION;
+               return CONNECTION_ERROR_NO_CONNECTION; //LCOV_EXCL_LINE
        else if (rv == NET_ERR_ACCESS_DENIED) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
-               return CONNECTION_ERROR_PERMISSION_DENIED;
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
        } else if (rv != NET_ERR_NONE)
-               return CONNECTION_ERROR_OPERATION_FAILED;
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
 
        *profile = g_try_malloc0(sizeof(net_profile_info_t));
        if (*profile == NULL)
-               return CONNECTION_ERROR_OUT_OF_MEMORY;
+               return CONNECTION_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE
 
        memcpy(*profile, &active_profile, sizeof(net_profile_info_t));
        prof_handle_list = g_slist_append(prof_handle_list, *profile);
@@ -779,11 +999,11 @@ int _connection_libnet_reset_profile(connection_reset_option_e type,
 
        rv = net_reset_profile(type, id);
        if (rv == NET_ERR_ACCESS_DENIED) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
-               return CONNECTION_ERROR_PERMISSION_DENIED;
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
        } else if (rv != NET_ERR_NONE) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Failed to add profile[%d]", rv);
-               return CONNECTION_ERROR_OPERATION_FAILED;
+               CONNECTION_LOG(CONNECTION_ERROR, "Failed to add profile[%d]", rv); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
        }
 
        __libnet_set_reset_profile_cb(callback, user_data);
@@ -791,68 +1011,95 @@ int _connection_libnet_reset_profile(connection_reset_option_e type,
        return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_open_profile(connection_profile_h profile, connection_opened_cb callback, void* user_data)
+int _connection_libnet_open_profile(connection_profile_h profile,
+               connection_opened_cb callback, void* user_data)
 {
        int rv;
 
        if (!(_connection_libnet_check_profile_validity(profile))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
-               return CONNECTION_ERROR_INVALID_PARAMETER;
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
 
        net_profile_info_t *profile_info = profile;
 
        rv = net_open_connection_with_profile(profile_info->ProfileName);
        if (rv == NET_ERR_ACCESS_DENIED) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
-               return CONNECTION_ERROR_PERMISSION_DENIED;
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
        } else if (rv != NET_ERR_NONE)
-               return CONNECTION_ERROR_OPERATION_FAILED;
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
 
        __libnet_set_opened_cb(callback, user_data);
 
        return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_get_cellular_service_profile(connection_cellular_service_type_e type, connection_profile_h *profile)
+int _connection_libnet_get_cellular_service_profile(
+               connection_cellular_service_type_e type, connection_profile_h *profile)
 {
-       int i = 0;
-       int j = 0;
+       int i = 0, j = 0;
        int rv = NET_ERR_NONE;
-       net_service_type_t service_type = _connection_profile_convert_to_libnet_cellular_service_type(type);
+#if defined TIZEN_DUALSIM_ENABLE
+       int default_subscriber_id = 0;
+       char subscriber_id[3];
+#endif
 
-       struct _profile_list_s cellular_profiles = {0, 0, NULL};
+       struct _profile_list_s cellular_profiles = { 0, 0, NULL };
+       net_service_type_t service_type = _connection_profile_convert_to_libnet_cellular_service_type(type);
 
        rv = net_get_profile_list(NET_DEVICE_CELLULAR, &cellular_profiles.profiles, &cellular_profiles.count);
        if (rv == NET_ERR_ACCESS_DENIED) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
-               return CONNECTION_ERROR_PERMISSION_DENIED;
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
        } else if (rv != NET_ERR_NONE) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Failed to get profile list (%d)", rv);
-               return CONNECTION_ERROR_OPERATION_FAILED;
+               CONNECTION_LOG(CONNECTION_ERROR, "Failed to get profile list (%d)", rv); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
        }
 
-       for (;i < cellular_profiles.count;i++)
-               if (cellular_profiles.profiles[i].ProfileInfo.Pdp.ServiceType == service_type)
-                       break;
+#if defined TIZEN_DUALSIM_ENABLE
+       if (vconf_get_int(VCONF_TELEPHONY_DEFAULT_DATA_SERVICE,
+                                               &default_subscriber_id) != 0) {
+               CONNECTION_LOG(CONNECTION_ERROR,
+                                               "Failed to get VCONF_TELEPHONY_DEFAULT_DATA_SERVICE");
+               __libnet_clear_profile_list(&cellular_profiles); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
+       }
 
-       if (i >= cellular_profiles.count)
-               return CONNECTION_ERROR_OPERATION_FAILED;
+       g_snprintf(subscriber_id, sizeof(subscriber_id), "%d", default_subscriber_id);
+#endif
+
+       for (i = 0; i < cellular_profiles.count; i++)
+               if (cellular_profiles.profiles[i].ProfileInfo.Pdp.ServiceType == service_type)
+#if defined TIZEN_DUALSIM_ENABLE
+                       if (g_str_has_suffix(
+                                       cellular_profiles.profiles[i].ProfileInfo.Pdp.PSModemPath,
+                                       subscriber_id) == TRUE)
+#endif
+                               break;
+
+       if (i >= cellular_profiles.count) {
+               __libnet_clear_profile_list(&cellular_profiles); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
+       }
 
        *profile = g_try_malloc0(sizeof(net_profile_info_t));
-       if (*profile == NULL)
-               return CONNECTION_ERROR_OUT_OF_MEMORY;
+       if (*profile == NULL) {
+               __libnet_clear_profile_list(&cellular_profiles); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE
+       }
 
        memcpy(*profile, &cellular_profiles.profiles[i], sizeof(net_profile_info_t));
 
        if (cellular_profiles.profiles[i].ProfileInfo.Pdp.DefaultConn)
                goto done;
 
+       //LCOV_EXCL_START
        if (type != CONNECTION_CELLULAR_SERVICE_TYPE_INTERNET &&
            type != CONNECTION_CELLULAR_SERVICE_TYPE_PREPAID_INTERNET)
                goto done;
 
-       for (;j < cellular_profiles.count;j++) {
+       for (j = 0; j < cellular_profiles.count; j++) {
                if (i == j)
                        continue;
 
@@ -864,8 +1111,10 @@ int _connection_libnet_get_cellular_service_profile(connection_cellular_service_
                        goto done;
                }
        }
+       //LCOV_EXCL_STOP
 
-done:
+done :
+       __libnet_clear_profile_list(&cellular_profiles);
        prof_handle_list = g_slist_append(prof_handle_list, *profile);
 
        return CONNECTION_ERROR_NONE;
@@ -876,8 +1125,8 @@ int _connection_libnet_set_cellular_service_profile_sync(connection_cellular_ser
        int rv;
 
        if (!(_connection_libnet_check_profile_validity(profile))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
-               return CONNECTION_ERROR_INVALID_PARAMETER;
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
 
        net_profile_info_t *profile_info = profile;
@@ -886,14 +1135,14 @@ int _connection_libnet_set_cellular_service_profile_sync(connection_cellular_ser
        service_type = _profile_convert_to_connection_cellular_service_type(profile_info->ProfileInfo.Pdp.ServiceType);
 
        if (service_type != type)
-               return CONNECTION_ERROR_INVALID_PARAMETER;
+               return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
 
        rv = net_set_default_cellular_service_profile(profile_info->ProfileName);
        if (rv == NET_ERR_ACCESS_DENIED) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
-               return CONNECTION_ERROR_PERMISSION_DENIED;
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
        } else if (rv != NET_ERR_NONE)
-               return CONNECTION_ERROR_OPERATION_FAILED;
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
 
        return CONNECTION_ERROR_NONE;
 }
@@ -904,8 +1153,8 @@ int _connection_libnet_set_cellular_service_profile_async(connection_cellular_se
        int rv;
 
        if (!(_connection_libnet_check_profile_validity(profile))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
-               return CONNECTION_ERROR_INVALID_PARAMETER;
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
 
        net_profile_info_t *profile_info = profile;
@@ -914,14 +1163,14 @@ int _connection_libnet_set_cellular_service_profile_async(connection_cellular_se
        service_type = _profile_convert_to_connection_cellular_service_type(profile_info->ProfileInfo.Pdp.ServiceType);
 
        if (service_type != type)
-               return CONNECTION_ERROR_INVALID_PARAMETER;
+               return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
 
        rv = net_set_default_cellular_service_profile_async(profile_info->ProfileName);
        if (rv == NET_ERR_ACCESS_DENIED) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
-               return CONNECTION_ERROR_PERMISSION_DENIED;
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
        } else if (rv != NET_ERR_NONE)
-               return CONNECTION_ERROR_OPERATION_FAILED;
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
 
        __libnet_set_default_cb(callback, user_data);
 
@@ -933,21 +1182,18 @@ int _connection_libnet_close_profile(connection_profile_h profile, connection_cl
        int rv;
 
        if (!(_connection_libnet_check_profile_validity(profile))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
-               return CONNECTION_ERROR_INVALID_PARAMETER;
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
 
        net_profile_info_t *profile_info = profile;
 
        rv = net_close_connection(profile_info->ProfileName);
        if (rv == NET_ERR_ACCESS_DENIED) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
-               return CONNECTION_ERROR_PERMISSION_DENIED;
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
        } else if (rv != NET_ERR_NONE)
-               return CONNECTION_ERROR_OPERATION_FAILED;
-
-       if (net_close_connection(profile_info->ProfileName) != NET_ERR_NONE)
-               return CONNECTION_ERROR_OPERATION_FAILED;
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
 
        __libnet_set_closed_cb(callback, user_data);
 
@@ -960,32 +1206,23 @@ int _connection_libnet_add_route(const char *interface_name, const char *host_ad
        char *endstr = NULL;
        int address_family = 0;
 
-       if(__libnet_check_address_type(AF_INET, host_address))
-               address_family = AF_INET;
-       else
-               return CONNECTION_ERROR_INVALID_PARAMETER;
+       address_family = AF_INET;
 
-       switch(address_family) {
-               case AF_INET:
-                       endstr = strrchr(host_address, '.');
-                       if (endstr == NULL ||
-                                       strcmp(endstr, ".0") == 0 ||
-                                       strncmp(host_address, "0.", 2) == 0 ||
-                                       strstr(host_address, "255") != NULL) {
-                               CONNECTION_LOG(CONNECTION_ERROR, "Invalid IP address Passed\n");
-                               return CONNECTION_ERROR_INVALID_PARAMETER;
-                       }
-                       break;
-               default:
-                       return CONNECTION_ERROR_OPERATION_FAILED;
+       endstr = strrchr(host_address, '.');
+       if (endstr == NULL ||
+                       strcmp(endstr, ".0") == 0 ||
+                       strncmp(host_address, "0.", 2) == 0 ||
+                       strstr(host_address, "255") != NULL) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid IP address Passed\n"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
 
        rv = net_add_route(host_address, interface_name, address_family);
        if (rv == NET_ERR_ACCESS_DENIED) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
-               return CONNECTION_ERROR_PERMISSION_DENIED;
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
        } else if (rv != NET_ERR_NONE)
-               return CONNECTION_ERROR_OPERATION_FAILED;
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
 
        return CONNECTION_ERROR_NONE;
 }
@@ -996,32 +1233,23 @@ int _connection_libnet_remove_route(const char *interface_name, const char *host
        char *endstr = strrchr(host_address, '.');
        int address_family = 0;
 
-       if (__libnet_check_address_type(AF_INET, host_address))
-               address_family = AF_INET;
-       else
-               return CONNECTION_ERROR_INVALID_PARAMETER;
+       address_family = AF_INET;
 
-       switch(address_family) {
-               case AF_INET:
-                       endstr = strrchr(host_address, '.');
-                       if (endstr == NULL ||
-                               strcmp(endstr, ".0") == 0 ||
-                               strncmp(host_address, "0.", 2) == 0 ||
-                               strstr(host_address, ".0.") != NULL ||strstr(host_address, "255") != NULL) {
-                               CONNECTION_LOG(CONNECTION_ERROR, "Invalid IP address Passed");
-                               return CONNECTION_ERROR_INVALID_PARAMETER;
-                       }
-                       break;
-               default:
-                       return CONNECTION_ERROR_OPERATION_FAILED;
+       endstr = strrchr(host_address, '.');
+       if (endstr == NULL ||
+               strcmp(endstr, ".0") == 0 ||
+               strncmp(host_address, "0.", 2) == 0 ||
+               strstr(host_address, ".0.") != NULL || strstr(host_address, "255") != NULL) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid IP address Passed"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
 
        rv = net_remove_route(host_address, interface_name, address_family);
        if (rv == NET_ERR_ACCESS_DENIED) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
-               return CONNECTION_ERROR_PERMISSION_DENIED;
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
        } else if (rv != NET_ERR_NONE)
-               return CONNECTION_ERROR_OPERATION_FAILED;
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
 
        return CONNECTION_ERROR_NONE;
 }
@@ -1032,30 +1260,20 @@ int _connection_libnet_add_route_ipv6(const char *interface_name, const char *ho
        int address_family = 0;
 
        address_family = AF_INET6;
-/*     if(__libnet_check_address_type(AF_INET6, host_address))
-               address_family = AF_INET6;
-       else
-               return CONNECTION_ERROR_INVALID_PARAMETER;*/
-
-       switch(address_family) {
-               case AF_INET6:
-                       if (strncmp(host_address, "fe80:", 5) == 0 ||
-                               strncmp(host_address, "ff00:", 5) == 0 ||
-                               strncmp(host_address, "::", 2) == 0) {
-                               CONNECTION_LOG(CONNECTION_ERROR, "Invalid IP address Passed\n");
-                               return CONNECTION_ERROR_INVALID_PARAMETER;
-                       }
-                       break;
-               default:
-                       return CONNECTION_ERROR_OPERATION_FAILED;
+
+       if (strncmp(host_address, "fe80:", 5) == 0 ||
+               strncmp(host_address, "ff00:", 5) == 0 ||
+               strncmp(host_address, "::", 2) == 0) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid IP address Passed\n"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
 
        rv = net_add_route_ipv6(host_address, interface_name, address_family, gateway);
        if (rv == NET_ERR_ACCESS_DENIED) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
-               return CONNECTION_ERROR_PERMISSION_DENIED;
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
        } else if (rv != NET_ERR_NONE)
-               return CONNECTION_ERROR_OPERATION_FAILED;
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
 
        return CONNECTION_ERROR_NONE;
 }
@@ -1066,30 +1284,20 @@ int _connection_libnet_remove_route_ipv6(const char *interface_name, const char
        int address_family = 0;
 
        address_family = AF_INET6;
-/*     if (__libnet_check_address_type(AF_INET6, host_address))
-               address_family = AF_INET6;
-       else
-               return CONNECTION_ERROR_INVALID_PARAMETER;*/
-
-       switch(address_family) {
-               case AF_INET6:
-                       if (strncmp(host_address, "fe80:", 5) == 0 ||
-                               strncmp(host_address, "ff00:", 5) == 0 ||
-                               strncmp(host_address, "::", 2) == 0) {
-                               CONNECTION_LOG(CONNECTION_ERROR, "Invalid IP address Passed\n");
-                               return CONNECTION_ERROR_INVALID_PARAMETER;
-                       }
-                       break;
-               default:
-                       return CONNECTION_ERROR_OPERATION_FAILED;
+
+       if (strncmp(host_address, "fe80:", 5) == 0 ||
+               strncmp(host_address, "ff00:", 5) == 0 ||
+               strncmp(host_address, "::", 2) == 0) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid IP address Passed\n"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
 
        rv = net_remove_route_ipv6(host_address, interface_name, address_family, gateway);
        if (rv == NET_ERR_ACCESS_DENIED) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
-               return CONNECTION_ERROR_PERMISSION_DENIED;
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
        } else if (rv != NET_ERR_NONE)
-               return CONNECTION_ERROR_OPERATION_FAILED;
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
 
        return CONNECTION_ERROR_NONE;
 }
@@ -1113,14 +1321,15 @@ bool _connection_libnet_add_to_profile_cb_list(connection_profile_h profile,
 
        struct _profile_cb_s *profile_cb_info = g_try_malloc0(sizeof(struct _profile_cb_s));
        if (profile_cb_info == NULL) {
-               g_free(profile_name);
-               return false;
+               g_free(profile_name); //LCOV_EXCL_LINE
+               return false; //LCOV_EXCL_LINE
        }
 
        profile_cb_info->callback = callback;
        profile_cb_info->user_data = user_data;
+       profile_cb_info->state = _profile_convert_to_cp_state(profile_info->ProfileState);
 
-       g_hash_table_insert(profile_cb_table, profile_name, profile_cb_info);
+       g_hash_table_replace(profile_cb_table, profile_name, profile_cb_info);
 
        return true;
 }
@@ -1128,10 +1337,11 @@ bool _connection_libnet_add_to_profile_cb_list(connection_profile_h profile,
 bool _connection_libnet_remove_from_profile_cb_list(connection_profile_h profile)
 {
        net_profile_info_t *profile_info = profile;
+
        if (g_hash_table_remove(profile_cb_table, profile_info->ProfileName) == TRUE)
                return true;
 
-       return false;
+       return false; //LCOV_EXCL_LINE
 }
 
 int _connection_libnet_set_statistics(net_device_t device_type, net_statistics_type_e statistics_type)
@@ -1139,10 +1349,10 @@ int _connection_libnet_set_statistics(net_device_t device_type, net_statistics_t
        int rv;
        rv = net_set_statistics(device_type, statistics_type);
        if (rv == NET_ERR_ACCESS_DENIED) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
-               return CONNECTION_ERROR_PERMISSION_DENIED;
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
        } else if (rv != NET_ERR_NONE)
-               return CONNECTION_ERROR_OPERATION_FAILED;
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
 
        return CONNECTION_ERROR_NONE;
 }
@@ -1152,10 +1362,10 @@ int _connection_libnet_get_statistics(net_statistics_type_e statistics_type, uns
        int rv;
        rv = net_get_statistics(NET_DEVICE_WIFI, statistics_type, size);
        if (rv == NET_ERR_ACCESS_DENIED) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
-               return CONNECTION_ERROR_PERMISSION_DENIED;
-       }else if (rv != NET_ERR_NONE)
-               return CONNECTION_ERROR_OPERATION_FAILED;
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
+       } else if (rv != NET_ERR_NONE)
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
 
        return CONNECTION_ERROR_NONE;
 }
@@ -1167,13 +1377,13 @@ int _connection_libnet_set_cellular_subscriber_id(connection_profile_h profile,
        net_profile_info_t *profile_info = (net_profile_info_t *)profile;
 
        if (net_get_cellular_modem_object_path(&modem_path, sim_id) != NET_ERR_NONE) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Failed to get subscriber[%d]", sim_id);
-               return CONNECTION_ERROR_OPERATION_FAILED;
+               CONNECTION_LOG(CONNECTION_ERROR, "Failed to get subscriber[%d]", sim_id); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
        }
 
        if (!modem_path) {
-               CONNECTION_LOG(CONNECTION_ERROR, "NULL modem object path");
-               return CONNECTION_ERROR_OPERATION_FAILED;
+               CONNECTION_LOG(CONNECTION_ERROR, "NULL modem object path"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
        }
 
        g_strlcpy(profile_info->ProfileInfo.Pdp.PSModemPath, modem_path,
@@ -1206,6 +1416,8 @@ guint _connection_callback_add(GSourceFunc func, gpointer user_data)
 {
        guint id;
        struct managed_idle_data *data;
+       GMainContext *context;
+       GSource *src;
 
        if (!func)
                return 0;
@@ -1217,8 +1429,12 @@ guint _connection_callback_add(GSourceFunc func, gpointer user_data)
        data->func = func;
        data->user_data = user_data;
 
-       id = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE, __connection_idle_cb, data,
-                       __connection_idle_destroy_cb);
+       context = g_main_context_get_thread_default();
+       src = g_idle_source_new();
+       g_source_set_callback(src, __connection_idle_cb, data,
+               __connection_idle_destroy_cb);
+       id = g_source_attach(src, context);
+       g_source_unref(src);
        if (!id) {
                g_free(data);
                return id;
@@ -1238,6 +1454,7 @@ void _connection_callback_cleanup(void)
        struct managed_idle_data *data;
 
        while (cur) {
+               //LCOV_EXCL_START
                GSList *next = cur->next;
                data = (struct managed_idle_data *)cur->data;
 
@@ -1247,6 +1464,7 @@ void _connection_callback_cleanup(void)
                        cur = managed_idler_list;
                } else
                        cur = next;
+               //LCOV_EXCL_STOP
        }
 
        g_slist_free(managed_idler_list);
@@ -1259,10 +1477,10 @@ int _connection_libnet_check_get_privilege()
 
        rv = net_check_get_privilege();
        if (rv == NET_ERR_ACCESS_DENIED) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
-               return CONNECTION_ERROR_PERMISSION_DENIED;
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
        } else if (rv != NET_ERR_NONE)
-               return CONNECTION_ERROR_OPERATION_FAILED;
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
 
        return CONNECTION_ERROR_NONE;
 }
@@ -1273,34 +1491,58 @@ int _connection_libnet_check_profile_privilege()
 
        rv = net_check_profile_privilege();
        if (rv == NET_ERR_ACCESS_DENIED) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
-               return CONNECTION_ERROR_PERMISSION_DENIED;
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+               return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
        } else if (rv != NET_ERR_NONE)
-               return CONNECTION_ERROR_OPERATION_FAILED;
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
 
        return CONNECTION_ERROR_NONE;
 }
 
-bool _connection_libnet_get_is_check_enable_feature()
+bool __libnet_check_feature_supported(const char *key, connection_supported_feature_e feature)
 {
-       return is_check_enable_feature;
+       if (!connection_is_feature_checked[feature]) {
+               if (system_info_get_platform_bool(key, &connection_feature_supported[feature]) < 0) {
+                       CONNECTION_LOG(CONNECTION_ERROR, "Error - Feature getting from System Info"); //LCOV_EXCL_LINE
+                       set_last_result(CONNECTION_ERROR_OPERATION_FAILED); //LCOV_EXCL_LINE
+                       return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
+               }
+               connection_is_feature_checked[feature] = true;
+       }
+       return connection_feature_supported[feature];
 }
 
-bool _connection_libnet_get_enable_feature_state(enable_feature_type_e feature_type)
+int _connection_check_feature_supported(const char *feature_name, ...)
 {
-       if(is_check_enable_feature){
-               switch(feature_type) {
-               case FEATURE_TYPE_TELEPHONY:
-                       return enable_feature.telephony;
-               case FEATURE_TYPE_WIFI:
-                       return enable_feature.wifi;
-               case FEATURE_TYPE_TETHERING_BLUETOOTH:
-                       return enable_feature.tethering_bluetooth;
-               default:
-                       CONNECTION_LOG(CONNECTION_ERROR, "Invalid feature type");
-                       return false;
-               }
+       va_list list;
+       const char *key;
+       bool value = false;
+       bool feature_supported = false;
+
+       va_start(list, feature_name);
+       key = feature_name;
+       while (1) {
+               if (strcmp(key, TELEPHONY_FEATURE) == 0)
+                       value = __libnet_check_feature_supported(key, CONNECTION_SUPPORTED_FEATURE_TELEPHONY);
+               if (strcmp(key, WIFI_FEATURE) == 0)
+                       value = __libnet_check_feature_supported(key, CONNECTION_SUPPORTED_FEATURE_WIFI);
+               if (strcmp(key, TETHERING_BLUETOOTH_FEATURE) == 0)
+                       value = __libnet_check_feature_supported(key, CONNECTION_SUPPORTED_FEATURE_TETHERING_BLUETOOTH);
+               if (strcmp(key, ETHERNET_FEATURE) == 0)
+                       value = __libnet_check_feature_supported(key, CONNECTION_SUPPORTED_FEATURE_ETHERNET);
+
+               feature_supported |= value;
+               key = va_arg(list, const char *);
+               if (!key) break;
        }
-       CONNECTION_LOG(CONNECTION_ERROR, "Not checked enable feature yet");
-       return false;
+       if (!feature_supported) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Error - Feature is not supported");
+               set_last_result(CONNECTION_ERROR_NOT_SUPPORTED);
+               va_end(list);
+               return CONNECTION_ERROR_NOT_SUPPORTED;
+       }
+
+       va_end(list);
+       set_last_result(CONNECTION_ERROR_NONE);
+       return CONNECTION_ERROR_NONE;
 }