Make local handle for event loop
[platform/core/api/connection.git] / src / libnetwork.c
index fb5eaf2..ea5ce4b 100755 (executable)
@@ -24,8 +24,8 @@
 
 #include "net_connection_private.h"
 
-static __thread GSList *prof_handle_list = NULL;
-static __thread GHashTable *profile_cb_table = NULL;
+static GSList *prof_handle_list = NULL;
+static GHashTable *profile_cb_table = NULL;
 
 struct _profile_cb_s {
        connection_profile_state_changed_cb callback;
@@ -39,46 +39,9 @@ struct _profile_list_s {
        net_profile_info_t *profiles;
 };
 
-struct _libnet_s {
-       connection_opened_cb opened_cb;
-       connection_closed_cb closed_cb;
-       connection_set_default_cb set_default_cb;
-       connection_reset_cb reset_profile_cb;
-       libnet_ethernet_cable_state_changed_cb ethernet_cable_state_changed_cb;
-       void *opened_user_data;
-       void *closed_user_data;
-       void *set_default_user_data;
-       void *reset_profile_user_data;
-       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;
-};
-
-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 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;
-}
+static struct _profile_list_s profile_iterator = {0, 0, NULL};
+static bool connection_is_feature_checked[CONNECTION_SUPPORTED_FEATURE_MAX] = {0, };
+static bool connection_feature_supported[CONNECTION_SUPPORTED_FEATURE_MAX] = {0, };
 
 //LCOV_EXCL_START
 static connection_error_e __libnet_convert_to_cp_error_type(net_err_t err_type)
@@ -146,6 +109,10 @@ static const char *__libnet_convert_cp_error_type_to_string(connection_error_e e
                return "PERMISSION_DENIED";
        case CONNECTION_ERROR_NOT_SUPPORTED:
                return "NOT_SUPPORTED";
+       case CONNECTION_ERROR_ALREADY_INITIALIZED:
+               return "ALREADY_INITIALIZED";
+       case CONNECTION_ERROR_NOT_INITIALIZED:
+               return "NOT_INITIALIZED";
        }
 
        return "UNKNOWN";
@@ -167,178 +134,10 @@ static const char *__libnet_convert_cp_state_to_string(connection_profile_state_
        }
 }
 
-static void __libnet_set_reset_profile_cb(connection_opened_cb user_cb, void *user_data)
-{
-       if (user_cb != NULL) {
-               libnet.reset_profile_cb = user_cb;
-               libnet.reset_profile_user_data = user_data;
-       }
-}
-
-static gboolean __libnet_reset_profile_cb_idle(gpointer data)
-{
-       connection_error_e result = (connection_error_e)data;
-
-       if (libnet.reset_profile_cb != NULL)
-               libnet.reset_profile_cb(result, libnet.reset_profile_user_data);
-
-       libnet.reset_profile_cb = NULL;
-       libnet.reset_profile_user_data = NULL;
-
-       return FALSE;
-}
-
-static void __libnet_reset_profile_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.reset_profile_cb != NULL)
-               _connection_callback_add(__libnet_reset_profile_cb_idle, (gpointer)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)
-{
-       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 != NULL) {
-               libnet.closed_cb = user_cb;
-               libnet.closed_user_data = user_data;
-       }
-}
-
-static gboolean __libnet_closed_cb_idle(gpointer data)
-{
-       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 != NULL) {
-               libnet.set_default_cb = user_cb;
-               libnet.set_default_user_data = user_data;
-       }
-}
-
-static gboolean __libnet_default_cb_idle(gpointer data)
-{
-       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(
-               libnet_ethernet_cable_state_changed_cb user_cb)
-{
-       libnet.ethernet_cable_state_changed_cb = user_cb;
-}
-
-static void __libnet_ethernet_cable_state_changed_cb(
-               connection_ethernet_cable_state_e state)
-{
-       if (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;
 
@@ -354,18 +153,7 @@ static void __libnet_state_changed_cb(char *profile_name, connection_profile_sta
        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);
+       cb_info->callback(cb_info->state, cb_info->user_data);
 }
 
 static void __libnet_clear_profile_list(struct _profile_list_s *profile_list)
@@ -382,6 +170,7 @@ 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;
+       connection_handle_s *conn_handle = (connection_handle_s *)user_data;
 
        switch (event_cb->Event) {
        case NET_EVENT_OPEN_RSP:
@@ -393,8 +182,15 @@ static void __libnet_evt_cb(net_event_info_t *event_cb, void *user_data)
                                        (is_requested) ? "RSP" : "IND",
                                        __libnet_convert_cp_error_type_to_string(result));
 
-               if (is_requested)
-                       __libnet_opened_cb(result);
+               if (is_requested) {
+                       if (conn_handle->opened_callback) {
+                               conn_handle->opened_callback(result,
+                                       conn_handle->opened_user_data);
+
+                               conn_handle->opened_callback = NULL;
+                               conn_handle->opened_user_data = NULL;
+                       }
+               }
 
                switch (event_cb->Error) {
                case NET_ERR_NONE:
@@ -420,8 +216,15 @@ static void __libnet_evt_cb(net_event_info_t *event_cb, void *user_data)
                                        (is_requested) ? "RSP" : "IND",
                                        __libnet_convert_cp_error_type_to_string(result));
 
-               if (is_requested)
-                       __libnet_closed_cb(result);
+               if (is_requested) {
+                       if (conn_handle->closed_callback) {
+                               conn_handle->closed_callback(result,
+                                       conn_handle->closed_user_data);
+
+                               conn_handle->closed_callback = NULL;
+                               conn_handle->closed_user_data = NULL;
+                       }
+               }
 
                switch (event_cb->Error) {
                case NET_ERR_NONE:
@@ -453,21 +256,118 @@ static void __libnet_evt_cb(net_event_info_t *event_cb, void *user_data)
        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", result);
-               __libnet_default_cb(result);
-               break;
+               if (conn_handle->set_default_callback) {
+                       conn_handle->set_default_callback(result,
+                               conn_handle->set_default_user_data);
 
+                       conn_handle->set_default_callback = NULL;
+                       conn_handle->set_default_user_data = NULL;
+               }
+               break;
        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);
+               if (conn_handle->reset_callback) {
+                       conn_handle->reset_callback(result,
+                               conn_handle->reset_user_data);
+
+                       conn_handle->reset_callback = NULL;
+                       conn_handle->reset_user_data = NULL;
+               }
                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);
+               if (conn_handle->ethernet_cable_state_changed_callback) {
+                       conn_handle->ethernet_cable_state_changed_callback(CONNECTION_ETHERNET_CABLE_ATTACHED,
+                               conn_handle->ethernet_cable_state_changed_user_data);
+               }
                break;
        case NET_EVENT_ETHERNET_CABLE_DETACHED:
                CONNECTION_LOG(CONNECTION_INFO, "Got Ethernet cable detached Indication\n");
-               __libnet_ethernet_cable_state_changed_cb(CONNECTION_ETHERNET_CABLE_DETACHED);
+               if (conn_handle->ethernet_cable_state_changed_callback) {
+                       conn_handle->ethernet_cable_state_changed_callback(CONNECTION_ETHERNET_CABLE_DETACHED,
+                               conn_handle->ethernet_cable_state_changed_user_data);
+               }
+               break;
+       case NET_EVENT_NETWORK_TYPE_CHANGED:
+               CONNECTION_LOG(CONNECTION_INFO, "Got Network Type Changed Indication");
+               int *state = (int *) event_cb->Data;
+               if (conn_handle->type_changed_callback) {
+                       int type = CONNECTION_TYPE_DISCONNECTED;
+
+                       switch (*state) {
+                       case VCONFKEY_NETWORK_CELLULAR:
+                               type = CONNECTION_TYPE_CELLULAR;
+                               break;
+                       case VCONFKEY_NETWORK_WIFI:
+                               type = CONNECTION_TYPE_WIFI;
+                               break;
+                       case VCONFKEY_NETWORK_ETHERNET:
+                               type = CONNECTION_TYPE_ETHERNET;
+                               break;
+                       case VCONFKEY_NETWORK_BLUETOOTH:
+                               type = CONNECTION_TYPE_BT;
+                               break;
+                       case VCONFKEY_NETWORK_DEFAULT_PROXY:
+                               type = CONNECTION_TYPE_NET_PROXY;
+                               break;
+                       default:
+                               type = CONNECTION_TYPE_DISCONNECTED;
+                               break;
+                       }
+
+                       conn_handle->type_changed_callback(type,
+                               conn_handle->type_changed_user_data);
+               }
+               break;
+       case NET_EVENT_IPV4_ADDRESS_CHANGED:
+               CONNECTION_LOG(CONNECTION_INFO, "Got IPv4 Address Changed Indication");
+               if (conn_handle->ip_changed_callback) {
+                       char *ipv4_addr = NULL;
+                       char *ipv6_addr = NULL;
+                       char *addr = (char *)event_cb->Data;
+
+                       ipv4_addr = g_strdup(addr);
+                       ipv6_addr = vconf_get_str(VCONFKEY_NETWORK_IP6);
+                       if (ipv6_addr == NULL)
+                               CONNECTION_LOG(CONNECTION_ERROR, //LCOV_EXCL_LINE
+                                               "vconf_get_str(VCONFKEY_NETWORK_IP6) failed");
+
+                       conn_handle->ip_changed_callback(ipv4_addr, ipv6_addr,
+                               conn_handle->ip_changed_user_data);
+
+                       g_free(ipv4_addr);
+                       g_free(ipv6_addr);
+               }
+               break;
+       case NET_EVENT_IPV6_ADDRESS_CHANGED:
+               CONNECTION_LOG(CONNECTION_INFO, "Got IPv6 Address Changed Indication");
+               if (conn_handle->ip_changed_callback) {
+                       char *ipv4_addr = NULL;
+                       char *ipv6_addr = NULL;
+                       char *addr = (char *)event_cb->Data;
+
+                       ipv6_addr = g_strdup(addr);
+                       ipv4_addr = vconf_get_str(VCONFKEY_NETWORK_IP);
+                       if (ipv4_addr == NULL)
+                               CONNECTION_LOG(CONNECTION_ERROR, //LCOV_EXCL_LINE
+                                               "vconf_get_str(VCONFKEY_NETWORK_IP) failed");
+
+                       conn_handle->ip_changed_callback(ipv4_addr, ipv6_addr,
+                               conn_handle->ip_changed_user_data);
+
+                       g_free(ipv4_addr);
+                       g_free(ipv6_addr);
+               }
+               break;
+       case NET_EVENT_PROXY_ADDRESS_CHANGED:
+               CONNECTION_LOG(CONNECTION_INFO, "Got Proxy Changed Indication");
+               char *proxy_addr = (char *)event_cb->Data;
+
+               if (conn_handle->proxy_changed_callback) {
+                       conn_handle->proxy_changed_callback(proxy_addr, NULL,
+                               conn_handle->proxy_changed_user_data);
+               }
                break;
 
        default:
@@ -530,48 +430,50 @@ void __libnet_copy_default_profile(net_profile_info_t **dest, struct _profile_li
 }
 //LCOV_EXCL_STOP
 
-int _connection_libnet_init(void)
+int _connection_libnet_init(connection_handle_s *conn_handle)
 {
        int rv;
 
-       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 rv;
-
-               __connection_set_created(true);
+       rv = net_register_client(&(conn_handle->network_info_handle),
+                               (net_event_cb_t)__libnet_evt_cb, conn_handle);
+       if (rv != NET_ERR_NONE)
+               return rv;
 
-               if (profile_cb_table == NULL)
-                       profile_cb_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
-       }
+       if (profile_cb_table == NULL)
+               profile_cb_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
 
        return NET_ERR_NONE;
 }
 
-bool _connection_libnet_deinit(void)
+bool _connection_libnet_deinit(connection_handle_s *conn_handle)
 {
-       if (_connection_is_created() == true) {
-               if (net_deregister_client_ext(NET_DEVICE_DEFAULT) != NET_ERR_NONE)
-                       return false;
+       net_deregister_client(conn_handle->network_info_handle);
 
-               __connection_set_created(false);
-
-               if (profile_cb_table) {
-                       g_hash_table_destroy(profile_cb_table);
-                       profile_cb_table = NULL;
-               }
+       if (profile_cb_table) {
+               g_hash_table_destroy(profile_cb_table);
+               profile_cb_table = NULL;
+       }
 
-               __libnet_clear_profile_list(&profile_iterator);
+       __libnet_clear_profile_list(&profile_iterator);
 
-               if (prof_handle_list) {
-                       g_slist_free_full(prof_handle_list, g_free);
-                       prof_handle_list = NULL;
-               }
+       if (prof_handle_list) {
+               g_slist_free_full(prof_handle_list, g_free);
+               prof_handle_list = NULL;
        }
 
        return true;
 }
 
+void _connection_set_cs_tid(int tid, connection_handle_s *conn_handle)
+{
+       net_set_cs_tid(tid, conn_handle->network_info_handle);
+}
+
+void _connection_unset_cs_tid(int tid, connection_handle_s *conn_handle)
+{
+       net_unset_cs_tid(tid, conn_handle->network_info_handle);
+}
+
 bool _connection_libnet_check_profile_validity(connection_profile_h profile)
 {
        GSList *list;
@@ -589,29 +491,12 @@ bool _connection_libnet_check_profile_validity(connection_profile_h profile)
        return false;
 }
 
-//LCOV_EXCL_START
-bool _connection_libnet_check_profile_cb_validity(connection_profile_h profile)
-{
-       struct _profile_cb_s *cb_info;
-       net_profile_info_t *profile_info = profile;
-
-       if (profile == NULL)
-               return false;
-
-       cb_info = g_hash_table_lookup(profile_cb_table, profile_info->ProfileName);
-       if (cb_info != NULL)
-               return true;
-
-       return false;
-}
-//LCOV_EXCL_STOP
-
-int _connection_libnet_get_metered_state(bool* is_metered)
+int _connection_libnet_get_metered_state(connection_handle_s *conn_handle, bool* is_metered)
 {
        int rv = 0;
        int status = 0;
 
-       rv = net_get_metered_state(&status);
+       rv = net_get_metered_state(conn_handle->network_info_handle, &status);
        if (rv == NET_ERR_ACCESS_DENIED) {
                CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
                return CONNECTION_ERROR_PERMISSION_DENIED;
@@ -627,12 +512,12 @@ int _connection_libnet_get_metered_state(bool* is_metered)
        return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_get_wifi_state(connection_wifi_state_e *state)
+int _connection_libnet_get_wifi_state(connection_handle_s *conn_handle, connection_wifi_state_e *state)
 {
        int rv;
        net_wifi_state_t wlan_state;
 
-       rv = net_get_wifi_state(&wlan_state);
+       rv = net_get_wifi_state(conn_handle->network_info_handle, &wlan_state);
        if (rv == NET_ERR_ACCESS_DENIED) {
                CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
                return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
@@ -663,11 +548,14 @@ int _connection_libnet_get_wifi_state(connection_wifi_state_e *state)
 }
 
 //LCOV_EXCL_START
-int _connection_libnet_get_ethernet_state(connection_ethernet_state_e *state)
+int _connection_libnet_get_ethernet_state(connection_handle_s *conn_handle,
+                       connection_ethernet_state_e *state)
 {
        int rv;
        struct _profile_list_s ethernet_profiles = {0, 0, NULL};
-       rv = net_get_profile_list(NET_DEVICE_ETHERNET, &ethernet_profiles.profiles, &ethernet_profiles.count);
+       rv = net_get_profile_list(conn_handle->network_info_handle,
+                       NET_DEVICE_ETHERNET, &ethernet_profiles.profiles,
+                       &ethernet_profiles.count);
        if (rv == NET_ERR_ACCESS_DENIED) {
                CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
                return CONNECTION_ERROR_PERMISSION_DENIED;
@@ -700,12 +588,13 @@ int _connection_libnet_get_ethernet_state(connection_ethernet_state_e *state)
        return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_get_ethernet_cable_state(connection_ethernet_cable_state_e* state)
+int _connection_libnet_get_ethernet_cable_state(connection_handle_s *conn_handle,
+                       connection_ethernet_cable_state_e* state)
 {
        int rv = 0;
        int status = 0;
 
-       rv = net_get_ethernet_cable_state(&status);
+       rv = net_get_ethernet_cable_state(conn_handle->network_info_handle, &status);
        if (rv == NET_ERR_ACCESS_DENIED) {
                CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
                return CONNECTION_ERROR_PERMISSION_DENIED;
@@ -720,22 +609,16 @@ int _connection_libnet_get_ethernet_cable_state(connection_ethernet_cable_state_
                *state = CONNECTION_ETHERNET_CABLE_DETACHED;
        return CONNECTION_ERROR_NONE;
 }
-
-int _connection_libnet_set_ethernet_cable_state_changed_cb(
-               libnet_ethernet_cable_state_changed_cb callback)
-{
-       __libnet_set_ethernet_cable_state_changed_cb(callback);
-
-       return CONNECTION_ERROR_NONE;
-}
 //LCOV_EXCL_STOP
 
-int _connection_libnet_get_bluetooth_state(connection_bt_state_e *state)
+int _connection_libnet_get_bluetooth_state(connection_handle_s *conn_handle, 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);
+       rv = net_get_profile_list(conn_handle->network_info_handle,
+                       NET_DEVICE_BLUETOOTH, &bluetooth_profiles.profiles,
+                       &bluetooth_profiles.count);
        if (rv == NET_ERR_ACCESS_DENIED) {
                CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
                return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
@@ -773,20 +656,23 @@ done:
        return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_get_profile_iterator(connection_iterator_type_e type, connection_profile_iterator_h* profile_iter_h)
+int _connection_libnet_get_profile_iterator(connection_handle_s *conn_handle,
+                       connection_iterator_type_e type, connection_profile_iterator_h* profile_iter_h)
 {
        int count = 0;
-       int rv1, rv2, rv3, rv4;
+       int rv1, rv2, rv3, rv4, rv5;
        net_profile_info_t *profiles = 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};
+       struct _profile_list_s mesh_profiles = {0, 0, NULL};
 
        __libnet_clear_profile_list(&profile_iterator);
 
-       rv1 = net_get_profile_list(NET_DEVICE_WIFI, &wifi_profiles.profiles, &wifi_profiles.count);
+       rv1 = net_get_profile_list(conn_handle->network_info_handle,
+               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
@@ -795,7 +681,8 @@ int _connection_libnet_get_profile_iterator(connection_iterator_type_e type, con
 
        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);
+       rv2 = net_get_profile_list(conn_handle->network_info_handle,
+               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);
@@ -806,7 +693,8 @@ int _connection_libnet_get_profile_iterator(connection_iterator_type_e type, con
        }
        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);
+       rv3 = net_get_profile_list(conn_handle->network_info_handle,
+               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);
@@ -819,7 +707,8 @@ int _connection_libnet_get_profile_iterator(connection_iterator_type_e type, con
        }
        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);
+       rv4 = net_get_profile_list(conn_handle->network_info_handle,
+               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);
@@ -834,11 +723,23 @@ int _connection_libnet_get_profile_iterator(connection_iterator_type_e type, con
        }
        CONNECTION_LOG(CONNECTION_INFO, "Bluetooth profile count : %d", bluetooth_profiles.count);
 
+       rv5 = net_get_profile_list(conn_handle->network_info_handle,
+               NET_DEVICE_MESH, &mesh_profiles.profiles, &mesh_profiles.count);
+       if (rv5 == 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 (rv5 != NET_ERR_NO_SERVICE && rv5 != NET_ERR_NONE) {
+               __libnet_clear_profile_list(&wifi_profiles);
+               return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
+       }
+
+       CONNECTION_LOG(CONNECTION_INFO, "Mesh profile count: %d", mesh_profiles.count);
        *profile_iter_h = &profile_iterator;
 
        switch (type) {
        case CONNECTION_ITERATOR_TYPE_REGISTERED:
-               count = wifi_profiles.count + cellular_profiles.count + ethernet_profiles.count + bluetooth_profiles.count;
+               count = wifi_profiles.count + cellular_profiles.count + ethernet_profiles.count + bluetooth_profiles.count + mesh_profiles.count;
                CONNECTION_LOG(CONNECTION_INFO, "Total profile count : %d", count);
                if (count == 0)
                        return CONNECTION_ERROR_NONE;
@@ -849,6 +750,7 @@ int _connection_libnet_get_profile_iterator(connection_iterator_type_e type, con
                        __libnet_clear_profile_list(&cellular_profiles);
                        __libnet_clear_profile_list(&ethernet_profiles);
                        __libnet_clear_profile_list(&bluetooth_profiles);
+                       __libnet_clear_profile_list(&mesh_profiles);
                        return CONNECTION_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE
                }
 
@@ -872,6 +774,12 @@ int _connection_libnet_get_profile_iterator(connection_iterator_type_e type, con
                        profiles += ethernet_profiles.count;
                }
 
+               if (mesh_profiles.count > 0) {
+                       memcpy(profiles, mesh_profiles.profiles,
+                                       sizeof(net_profile_info_t) * mesh_profiles.count);
+                       profiles += mesh_profiles.count;
+               }
+
                if (bluetooth_profiles.count > 0)
                        memcpy(profiles, bluetooth_profiles.profiles,
                                        sizeof(net_profile_info_t) * bluetooth_profiles.count);
@@ -882,6 +790,7 @@ int _connection_libnet_get_profile_iterator(connection_iterator_type_e type, con
                count += __libnet_get_connected_count(&cellular_profiles);
                count += __libnet_get_connected_count(&ethernet_profiles);
                count += __libnet_get_connected_count(&bluetooth_profiles);
+               count += __libnet_get_connected_count(&mesh_profiles);
                CONNECTION_LOG(CONNECTION_INFO, "Total connected profile count : %d", count);
                if (count == 0)
                        return CONNECTION_ERROR_NONE;
@@ -892,6 +801,7 @@ int _connection_libnet_get_profile_iterator(connection_iterator_type_e type, con
                        __libnet_clear_profile_list(&cellular_profiles);
                        __libnet_clear_profile_list(&ethernet_profiles);
                        __libnet_clear_profile_list(&bluetooth_profiles);
+                       __libnet_clear_profile_list(&mesh_profiles);
                        return CONNECTION_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE
                }
 
@@ -909,6 +819,9 @@ int _connection_libnet_get_profile_iterator(connection_iterator_type_e type, con
                if (bluetooth_profiles.count > 0)
                        __libnet_copy_connected_profile(&profiles, &bluetooth_profiles);
 
+               if (mesh_profiles.count > 0)
+                       __libnet_copy_connected_profile(&profiles, &mesh_profiles);
+
                break;
        case CONNECTION_ITERATOR_TYPE_DEFAULT:
                count = __libnet_get_default_count(&cellular_profiles);
@@ -922,6 +835,7 @@ int _connection_libnet_get_profile_iterator(connection_iterator_type_e type, con
                        __libnet_clear_profile_list(&cellular_profiles);
                        __libnet_clear_profile_list(&ethernet_profiles);
                        __libnet_clear_profile_list(&bluetooth_profiles);
+                       __libnet_clear_profile_list(&mesh_profiles);
                        return CONNECTION_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE
                }
 
@@ -936,6 +850,7 @@ int _connection_libnet_get_profile_iterator(connection_iterator_type_e type, con
        __libnet_clear_profile_list(&cellular_profiles);
        __libnet_clear_profile_list(&ethernet_profiles);
        __libnet_clear_profile_list(&bluetooth_profiles);
+       __libnet_clear_profile_list(&mesh_profiles);
 
        profile_iterator.count = count;
 
@@ -977,12 +892,13 @@ int _connection_libnet_destroy_iterator(connection_profile_iterator_h profile_it
        return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_get_current_profile(connection_profile_h *profile)
+int _connection_libnet_get_current_profile(connection_handle_s *conn_handle,
+                       connection_profile_h *profile)
 {
        net_profile_info_t active_profile;
        int rv;
 
-       rv = net_get_active_net_info(&active_profile);
+       rv = net_get_active_net_info(conn_handle->network_info_handle, &active_profile);
        if (rv == NET_ERR_NO_SERVICE)
                return CONNECTION_ERROR_NO_CONNECTION; //LCOV_EXCL_LINE
        else if (rv == NET_ERR_ACCESS_DENIED) {
@@ -1001,27 +917,22 @@ int _connection_libnet_get_current_profile(connection_profile_h *profile)
        return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_reset_profile(connection_reset_option_e type,
-               connection_cellular_subscriber_id_e id, connection_reset_cb callback, void *user_data)
+int _connection_libnet_reset_profile(connection_handle_s *conn_handle,
+               connection_reset_option_e type, connection_cellular_subscriber_id_e id)
 {
        int rv;
 
-       rv = net_reset_profile(type, id);
-       if (rv == NET_ERR_ACCESS_DENIED) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
+       rv = net_reset_profile(conn_handle->network_info_handle, type, id);
+       if (rv == NET_ERR_ACCESS_DENIED)
                return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
-       } else if (rv != NET_ERR_NONE) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Failed to add profile[%d]", rv); //LCOV_EXCL_LINE
+       else if (rv != NET_ERR_NONE)
                return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
-       }
-
-       __libnet_set_reset_profile_cb(callback, user_data);
 
        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_handle_s *conn_handle,
+                       connection_profile_h profile)
 {
        int rv;
 
@@ -1032,19 +943,22 @@ int _connection_libnet_open_profile(connection_profile_h profile,
 
        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"); //LCOV_EXCL_LINE
+       if (profile_info->profile_type == NET_DEVICE_MESH)
+               rv = net_open_mesh_connection_with_profile(conn_handle->network_info_handle,
+                               profile_info->ProfileName);
+       else
+               rv = net_open_connection_with_profile(conn_handle->network_info_handle,
+                               profile_info->ProfileName);
+
+       if (rv == NET_ERR_ACCESS_DENIED)
                return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
-       else if (rv != NET_ERR_NONE)
+       else if (rv != NET_ERR_NONE)
                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(
+int _connection_libnet_get_cellular_service_profile(connection_handle_s *conn_handle,
                connection_cellular_service_type_e type, connection_profile_h *profile)
 {
        int i = 0, j = 0;
@@ -1057,7 +971,9 @@ int _connection_libnet_get_cellular_service_profile(
        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);
+       rv = net_get_profile_list(conn_handle->network_info_handle,
+                       NET_DEVICE_CELLULAR, &cellular_profiles.profiles,
+                       &cellular_profiles.count);
        if (rv == NET_ERR_ACCESS_DENIED) {
                CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
                return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
@@ -1129,7 +1045,8 @@ done:
        return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_set_cellular_service_profile_sync(connection_cellular_service_type_e type, connection_profile_h profile)
+int _connection_libnet_set_cellular_service_profile_sync(connection_handle_s *conn_handle,
+                       connection_cellular_service_type_e type, connection_profile_h profile)
 {
        int rv;
 
@@ -1146,7 +1063,8 @@ int _connection_libnet_set_cellular_service_profile_sync(connection_cellular_ser
        if (service_type != type)
                return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
 
-       rv = net_set_default_cellular_service_profile(profile_info->ProfileName);
+       rv = net_set_default_cellular_service_profile(conn_handle->network_info_handle,
+                               profile_info->ProfileName);
        if (rv == NET_ERR_ACCESS_DENIED) {
                CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
                return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
@@ -1156,8 +1074,8 @@ int _connection_libnet_set_cellular_service_profile_sync(connection_cellular_ser
        return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_set_cellular_service_profile_async(connection_cellular_service_type_e type,
-                       connection_profile_h profile, connection_set_default_cb callback, void* user_data)
+int _connection_libnet_set_cellular_service_profile_async(connection_handle_s *conn_handle,
+                       connection_cellular_service_type_e type, connection_profile_h profile)
 {
        int rv;
 
@@ -1174,19 +1092,17 @@ int _connection_libnet_set_cellular_service_profile_async(connection_cellular_se
        if (service_type != type)
                return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
 
-       rv = net_set_default_cellular_service_profile_async(profile_info->ProfileName);
+       rv = net_set_default_cellular_service_profile_async(conn_handle->network_info_handle,
+                               profile_info->ProfileName);
        if (rv == NET_ERR_ACCESS_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; //LCOV_EXCL_LINE
 
-       __libnet_set_default_cb(callback, user_data);
-
        return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_close_profile(connection_profile_h profile, connection_closed_cb callback, void *user_data)
+int _connection_libnet_close_profile(connection_handle_s *conn_handle, connection_profile_h profile)
 {
        int rv;
 
@@ -1197,19 +1113,21 @@ int _connection_libnet_close_profile(connection_profile_h profile, connection_cl
 
        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"); //LCOV_EXCL_LINE
+       if (profile_info->profile_type == NET_DEVICE_MESH)
+               rv = net_close_mesh_connection(conn_handle->network_info_handle, profile_info->ProfileName);
+       else
+               rv = net_close_connection(conn_handle->network_info_handle, profile_info->ProfileName);
+
+       if (rv == NET_ERR_ACCESS_DENIED)
                return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
-       else if (rv != NET_ERR_NONE)
+       else if (rv != NET_ERR_NONE)
                return CONNECTION_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
 
-       __libnet_set_closed_cb(callback, user_data);
-
        return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_add_route(const char *interface_name, const char *host_address)
+int _connection_libnet_add_route(connection_handle_s *conn_handle,
+                       const char *interface_name, const char *host_address)
 {
        int rv;
        char *endstr = NULL;
@@ -1226,7 +1144,8 @@ int _connection_libnet_add_route(const char *interface_name, const char *host_ad
                return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
 
-       rv = net_add_route(host_address, interface_name, address_family);
+       rv = net_add_route(conn_handle->network_info_handle,
+                               host_address, interface_name, address_family);
        if (rv == NET_ERR_ACCESS_DENIED) {
                CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
                return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
@@ -1236,7 +1155,8 @@ int _connection_libnet_add_route(const char *interface_name, const char *host_ad
        return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_remove_route(const char *interface_name, const char *host_address)
+int _connection_libnet_remove_route(connection_handle_s *conn_handle,
+                       const char *interface_name, const char *host_address)
 {
        int rv;
        char *endstr = strrchr(host_address, '.');
@@ -1253,7 +1173,8 @@ int _connection_libnet_remove_route(const char *interface_name, const char *host
                return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
 
-       rv = net_remove_route(host_address, interface_name, address_family);
+       rv = net_remove_route(conn_handle->network_info_handle,
+                               host_address, interface_name, address_family);
        if (rv == NET_ERR_ACCESS_DENIED) {
                CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
                return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
@@ -1263,7 +1184,8 @@ int _connection_libnet_remove_route(const char *interface_name, const char *host
        return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_add_route_ipv6(const char *interface_name, const char *host_address, const char *gateway)
+int _connection_libnet_add_route_ipv6(connection_handle_s *conn_handle,
+                       const char *interface_name, const char *host_address, const char *gateway)
 {
        int rv;
        int address_family = 0;
@@ -1277,7 +1199,8 @@ int _connection_libnet_add_route_ipv6(const char *interface_name, const char *ho
                return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
 
-       rv = net_add_route_ipv6(host_address, interface_name, address_family, gateway);
+       rv = net_add_route_ipv6(conn_handle->network_info_handle,
+                               host_address, interface_name, address_family, gateway);
        if (rv == NET_ERR_ACCESS_DENIED) {
                CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
                return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
@@ -1287,7 +1210,8 @@ int _connection_libnet_add_route_ipv6(const char *interface_name, const char *ho
        return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_remove_route_ipv6(const char *interface_name, const char *host_address, const char *gateway)
+int _connection_libnet_remove_route_ipv6(connection_handle_s *conn_handle,
+                       const char *interface_name, const char *host_address, const char *gateway)
 {
        int rv;
        int address_family = 0;
@@ -1301,7 +1225,8 @@ int _connection_libnet_remove_route_ipv6(const char *interface_name, const char
                return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
 
-       rv = net_remove_route_ipv6(host_address, interface_name, address_family, gateway);
+       rv = net_remove_route_ipv6(conn_handle->network_info_handle,
+                               host_address, interface_name, address_family, gateway);
        if (rv == NET_ERR_ACCESS_DENIED) {
                CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
                return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
@@ -1311,8 +1236,9 @@ int _connection_libnet_remove_route_ipv6(const char *interface_name, const char
        return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_add_route_entry(connection_address_family_e address_family,
-               const char *interface_name, const char *host_address, const char *gateway)
+int _connection_libnet_add_route_entry(connection_handle_s *conn_handle,
+               connection_address_family_e address_family, const char *interface_name,
+               const char *host_address, const char *gateway)
 {
        int rv;
        char *endstr = NULL;
@@ -1334,7 +1260,8 @@ int _connection_libnet_add_route_entry(connection_address_family_e address_famil
                        return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
                }
 
-               rv = net_add_route_entry(host_address, interface_name, address_family_type, gateway);
+               rv = net_add_route_entry(conn_handle->network_info_handle,
+                               host_address, interface_name, address_family_type, gateway);
                if (rv == NET_ERR_ACCESS_DENIED) {
                        CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
                        return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
@@ -1350,7 +1277,8 @@ int _connection_libnet_add_route_entry(connection_address_family_e address_famil
                        return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
                }
 
-               rv = net_add_route_ipv6(host_address, interface_name, address_family_type, gateway);
+               rv = net_add_route_ipv6(conn_handle->network_info_handle,
+                               host_address, interface_name, address_family_type, gateway);
                if (rv == NET_ERR_ACCESS_DENIED) {
                        CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
                        return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
@@ -1361,8 +1289,9 @@ int _connection_libnet_add_route_entry(connection_address_family_e address_famil
        return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_remove_route_entry(connection_address_family_e address_family,
-               const char *interface_name, const char *host_address, const char *gateway)
+int _connection_libnet_remove_route_entry(connection_handle_s *conn_handle,
+               connection_address_family_e address_family, const char *interface_name,
+               const char *host_address, const char *gateway)
 {
        int rv;
        char *endstr = strrchr(host_address, '.');
@@ -1383,7 +1312,8 @@ int _connection_libnet_remove_route_entry(connection_address_family_e address_fa
                        return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
                }
 
-               rv = net_remove_route_entry(host_address, interface_name, address_family_type, gateway);
+               rv = net_remove_route_entry(conn_handle->network_info_handle, host_address,
+                                       interface_name, address_family_type, gateway);
                if (rv == NET_ERR_ACCESS_DENIED) {
                        CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
                        return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
@@ -1399,7 +1329,8 @@ int _connection_libnet_remove_route_entry(connection_address_family_e address_fa
                        return CONNECTION_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
                }
 
-               rv = net_remove_route_ipv6(host_address, interface_name, address_family_type, gateway);
+               rv = net_remove_route_ipv6(conn_handle->network_info_handle, host_address,
+                                       interface_name, address_family_type, gateway);
                if (rv == NET_ERR_ACCESS_DENIED) {
                        CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
                        return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
@@ -1452,10 +1383,12 @@ bool _connection_libnet_remove_from_profile_cb_list(connection_profile_h profile
        return false; //LCOV_EXCL_LINE
 }
 
-int _connection_libnet_set_statistics(net_device_t device_type, net_statistics_type_e statistics_type)
+int _connection_libnet_set_statistics(connection_handle_s *conn_handle,
+                       net_device_t device_type, net_statistics_type_e statistics_type)
 {
        int rv;
-       rv = net_set_statistics(device_type, statistics_type);
+       rv = net_set_statistics(conn_handle->network_info_handle,
+                               device_type, statistics_type);
        if (rv == NET_ERR_ACCESS_DENIED) {
                CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
                return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
@@ -1465,10 +1398,12 @@ int _connection_libnet_set_statistics(net_device_t device_type, net_statistics_t
        return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_get_statistics(net_statistics_type_e statistics_type, unsigned long long *size)
+int _connection_libnet_get_statistics(connection_handle_s *conn_handle,
+                       net_statistics_type_e statistics_type, unsigned long long *size)
 {
        int rv;
-       rv = net_get_statistics(NET_DEVICE_WIFI, statistics_type, size);
+       rv = net_get_statistics(conn_handle->network_info_handle,
+                               NET_DEVICE_WIFI, statistics_type, size);
        if (rv == NET_ERR_ACCESS_DENIED) {
                CONNECTION_LOG(CONNECTION_ERROR, "Access denied"); //LCOV_EXCL_LINE
                return CONNECTION_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
@@ -1501,85 +1436,7 @@ int _connection_libnet_set_cellular_subscriber_id(connection_profile_h profile,
        return CONNECTION_ERROR_NONE;
 }
 
-static void __connection_idle_destroy_cb(gpointer data)
-{
-       if (!data)
-               return;
-
-       managed_idler_list = g_slist_remove(managed_idler_list, data);
-       g_free(data);
-}
-
-static gboolean __connection_idle_cb(gpointer user_data)
-{
-       struct managed_idle_data *data = (struct managed_idle_data *)user_data;
-
-       if (!data)
-               return FALSE;
-
-       return data->func(data->user_data);
-}
-
-guint _connection_callback_add(GSourceFunc func, gpointer user_data)
-{
-       guint id;
-       struct managed_idle_data *data;
-       GMainContext *context;
-       GSource *src;
-
-       if (!func)
-               return 0;
-
-       data = g_try_new0(struct managed_idle_data, 1);
-       if (!data)
-               return 0;
-
-       data->func = func;
-       data->user_data = user_data;
-
-       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;
-       }
-
-       data->id = id;
-
-       managed_idler_list = g_slist_append(managed_idler_list, data);
-
-       return id;
-}
-
-void _connection_callback_cleanup(void)
-{
-       GSList *cur = managed_idler_list;
-       GSource *src;
-       struct managed_idle_data *data;
-
-       while (cur) {
-               //LCOV_EXCL_START
-               GSList *next = cur->next;
-               data = (struct managed_idle_data *)cur->data;
-
-               src = g_main_context_find_source_by_id(g_main_context_default(), data->id);
-               if (src) {
-                       g_source_destroy(src);
-                       cur = managed_idler_list;
-               } else
-                       cur = next;
-               //LCOV_EXCL_STOP
-       }
-
-       g_slist_free(managed_idler_list);
-       managed_idler_list = NULL;
-}
-
-int _connection_libnet_check_get_privilege()
+int _connection_libnet_check_get_privilege(void)
 {
        int rv;
 
@@ -1593,7 +1450,7 @@ int _connection_libnet_check_get_privilege()
        return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_check_profile_privilege()
+int _connection_libnet_check_profile_privilege(void)
 {
        int rv;
 
@@ -1655,34 +1512,35 @@ int _connection_check_feature_supported(const char *feature_name, ...)
        return CONNECTION_ERROR_NONE;
 }
 
-int _connection_libnet_start_tcpdump(void)
+int _connection_libnet_start_tcpdump(connection_handle_s *conn_handle)
 {
        connection_error_e result = CONNECTION_ERROR_NONE;
        net_err_t ret = NET_ERR_NONE;
 
-       ret = net_start_tcpdump();
+       ret = net_start_tcpdump(conn_handle->network_info_handle);
        result = __libnet_convert_to_cp_error_type(ret);
 
        return result;
 }
 
-int _connection_libnet_stop_tcpdump(void)
+int _connection_libnet_stop_tcpdump(connection_handle_s *conn_handle)
 {
        connection_error_e result = CONNECTION_ERROR_NONE;
        net_err_t ret = NET_ERR_NONE;
 
-       ret = net_stop_tcpdump();
+       ret = net_stop_tcpdump(conn_handle->network_info_handle);
        result = __libnet_convert_to_cp_error_type(ret);
 
        return result;
 }
 
-int _connection_libnet_get_tcpdump_state(gboolean *tcpdump_state)
+int _connection_libnet_get_tcpdump_state(connection_handle_s *conn_handle,
+                       gboolean *tcpdump_state)
 {
        connection_error_e result = CONNECTION_ERROR_NONE;
        net_err_t ret = NET_ERR_NONE;
 
-       ret = net_get_tcpdump_state(tcpdump_state);
+       ret = net_get_tcpdump_state(conn_handle->network_info_handle, tcpdump_state);
        result = __libnet_convert_to_cp_error_type(ret);
 
        return result;