Add CONNECTION_MUTEX_UNLOCK in connection_create routine
[platform/core/api/connection.git] / src / connection.c
index 9622656..55cbda8 100644 (file)
@@ -219,12 +219,15 @@ static void __connection_cb_proxy_change_cb(keynode_t *node, void *user_data)
 
 static bool __connection_check_handle_validity(connection_h connection)
 {
-       GSList *list;
+       bool ret = false;
+
+       if (connection == NULL)
+               return false;
 
-       for (list = conn_handle_list; list; list = list->next)
-               if (connection == list->data) return true;
+       if (g_slist_find(conn_handle_list, connection) != NULL)
+               ret = true;
 
-       return false;
+       return ret;
 }
 
 static int __connection_get_handle_count(void)
@@ -244,15 +247,21 @@ static int __connection_get_handle_count(void)
 EXPORT_API int connection_create(connection_h* connection)
 {
        CONNECTION_MUTEX_LOCK;
-
+       int rv;
        if (connection == NULL || __connection_check_handle_validity(*connection)) {
                CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
                CONNECTION_MUTEX_UNLOCK;
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       if (_connection_libnet_init() == false) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Creation failed!\n");
+       rv = _connection_libnet_init();
+       if (rv == NET_ERR_ACCESS_DENIED) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
+               CONNECTION_MUTEX_UNLOCK;
+               return CONNECTION_ERROR_PERMISSION_DENIED;
+       }
+       else if (rv != NET_ERR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Failed to create connection[%d]", rv);
                CONNECTION_MUTEX_UNLOCK;
                return CONNECTION_ERROR_OPERATION_FAILED;
        }
@@ -345,8 +354,6 @@ EXPORT_API int connection_get_ip_address(connection_h connection,
                return CONNECTION_ERROR_OPERATION_FAILED;
        }
 
-       CONNECTION_LOG(CONNECTION_INFO, "IP Address %s\n", *ip_address);
-
        return CONNECTION_ERROR_NONE;
 }
 
@@ -376,8 +383,6 @@ EXPORT_API int connection_get_proxy(connection_h connection,
                return CONNECTION_ERROR_OPERATION_FAILED;
        }
 
-       CONNECTION_LOG(CONNECTION_INFO, "Proxy Address %s\n", *proxy);
-
        return CONNECTION_ERROR_NONE;
 }
 
@@ -419,14 +424,17 @@ EXPORT_API int connection_get_cellular_state(connection_h connection, connection
 
 EXPORT_API int connection_get_wifi_state(connection_h connection, connection_wifi_state_e* state)
 {
+       int rv;
+
        if (state == NULL || !(__connection_check_handle_validity(connection))) {
                CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       if (_connection_libnet_get_wifi_state(state) == false) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Fail to get wifi state\n");
-               return CONNECTION_ERROR_OPERATION_FAILED;
+       rv = _connection_libnet_get_wifi_state(state);
+       if (rv != CONNECTION_ERROR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Fail to get Wi-Fi state[%d]", rv);
+               return rv;
        }
 
        CONNECTION_LOG(CONNECTION_INFO, "WiFi state = %d\n", *state);
@@ -441,10 +449,7 @@ EXPORT_API int connection_get_ethernet_state(connection_h connection, connection
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       if (_connection_libnet_get_ethernet_state(state) == false)
-               return CONNECTION_ERROR_OPERATION_FAILED;
-
-       return CONNECTION_ERROR_NONE;
+       return _connection_libnet_get_ethernet_state(state);
 }
 
 EXPORT_API int connection_get_bt_state(connection_h connection, connection_bt_state_e* state)
@@ -454,10 +459,8 @@ EXPORT_API int connection_get_bt_state(connection_h connection, connection_bt_st
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       if (_connection_libnet_get_bluetooth_state(state) == false)
-               return CONNECTION_ERROR_OPERATION_FAILED;
+       return _connection_libnet_get_bluetooth_state(state);
 
-       return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_set_type_changed_cb(connection_h connection,
@@ -541,8 +544,11 @@ EXPORT_API int connection_add_profile(connection_h connection, connection_profil
        }
 
        rv = net_add_profile(profile_info->ProfileInfo.Pdp.ServiceType, (net_profile_info_t*)profile);
-       if (rv != NET_ERR_NONE) {
-               CONNECTION_LOG(CONNECTION_ERROR, "net_add_profile Failed = %d\n", rv);
+       if (rv == NET_ERR_ACCESS_DENIED) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
+               return CONNECTION_ERROR_PERMISSION_DENIED;
+       } else if (rv != NET_ERR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Failed to add profile[%d]", rv);
                return CONNECTION_ERROR_OPERATION_FAILED;
        }
 
@@ -567,8 +573,11 @@ EXPORT_API int connection_remove_profile(connection_h connection, connection_pro
        }
 
        rv = net_delete_profile(profile_info->ProfileName);
-       if (rv != NET_ERR_NONE) {
-               CONNECTION_LOG(CONNECTION_ERROR, "net_delete_profile Failed = %d\n", rv);
+       if (rv == NET_ERR_ACCESS_DENIED) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
+               return CONNECTION_ERROR_PERMISSION_DENIED;
+       } else if (rv != NET_ERR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Failed to delete profile[%d]", rv);
                return CONNECTION_ERROR_OPERATION_FAILED;
        }
 
@@ -587,8 +596,11 @@ EXPORT_API int connection_update_profile(connection_h connection, connection_pro
        net_profile_info_t *profile_info = profile;
 
        rv = net_modify_profile(profile_info->ProfileName, (net_profile_info_t*)profile);
-       if (rv != NET_ERR_NONE) {
-               CONNECTION_LOG(CONNECTION_ERROR, "net_modify_profile Failed = %d\n", rv);
+       if (rv == NET_ERR_ACCESS_DENIED) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Access denied");
+               return CONNECTION_ERROR_PERMISSION_DENIED;
+       } else if (rv != NET_ERR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Failed to modify profile[%d]", rv);
                return CONNECTION_ERROR_OPERATION_FAILED;
        }
 
@@ -600,8 +612,9 @@ EXPORT_API int connection_get_profile_iterator(connection_h connection,
 {
        if (!(__connection_check_handle_validity(connection)) ||
            (type != CONNECTION_ITERATOR_TYPE_REGISTERED &&
-            type != CONNECTION_ITERATOR_TYPE_CONNECTED)) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+            type != CONNECTION_ITERATOR_TYPE_CONNECTED &&
+            type != CONNECTION_ITERATOR_TYPE_DEFAULT)) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -693,6 +706,22 @@ EXPORT_API int connection_close_profile(connection_h connection, connection_prof
        return _connection_libnet_close_profile(profile, callback, user_data);
 }
 
+EXPORT_API int connection_reset_profile(connection_h connection,
+                               connection_reset_option_e type, int id, connection_reset_cb callback, void *user_data)
+{
+       if (!(__connection_check_handle_validity(connection))) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed");
+               return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
+
+       if(id < 0 || id > 1) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed");
+               return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
+
+       return _connection_libnet_reset_profile(type, id, callback, user_data);
+}
+
 EXPORT_API int connection_add_route(connection_h connection, const char* interface_name, const char* host_address)
 {
        if (!(__connection_check_handle_validity(connection)) ||
@@ -704,13 +733,23 @@ EXPORT_API int connection_add_route(connection_h connection, const char* interfa
        return _connection_libnet_add_route(interface_name, host_address);
 }
 
+EXPORT_API int connection_remove_route(connection_h connection, const char* interface_name, const char* host_address)
+{
+       if (!(__connection_check_handle_validity(connection)) ||
+           interface_name == NULL || host_address == NULL) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
+
+       return _connection_libnet_remove_route(interface_name, host_address);
+}
 
 /* Connection Statistics module ******************************************************************/
 
 static int __get_statistic(connection_type_e connection_type,
                        connection_statistics_type_e statistics_type, long long* llsize)
 {
-       int size;
+       int rv, size;
        unsigned long long ull_size;
        int stat_type;
        char *key = NULL;
@@ -764,8 +803,11 @@ static int __get_statistic(connection_type_e connection_type,
                        return CONNECTION_ERROR_INVALID_PARAMETER;
                }
 
-               if (_connection_libnet_get_statistics(stat_type, &ull_size) != CONNECTION_ERROR_NONE) {
-                       CONNECTION_LOG(CONNECTION_ERROR, "Cannot Get Wi-Fi statistics : %d\n", ull_size);
+               rv  = _connection_libnet_get_statistics(stat_type, &ull_size);
+               if (rv == CONNECTION_ERROR_PERMISSION_DENIED)
+                       return rv;
+               else if (rv != CONNECTION_ERROR_NONE) {
+                       CONNECTION_LOG(CONNECTION_ERROR, "Failed to get Wi-Fi statistics");
                        *llsize = 0;
                        return CONNECTION_ERROR_OPERATION_FAILED;
                }
@@ -819,14 +861,26 @@ static int __reset_statistic(connection_type_e connection_type,
        return CONNECTION_ERROR_NONE;
 }
 
-EXPORT_API int connection_get_statistics(connection_type_e connection_type,
+EXPORT_API int connection_get_statistics(connection_h connection,
+                               connection_type_e connection_type,
                                connection_statistics_type_e statistics_type, long long* size)
 {
+       if (!(__connection_check_handle_validity(connection)) || size == NULL) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
+
        return __get_statistic(connection_type, statistics_type, size);
 }
 
-EXPORT_API int connection_reset_statistics(connection_type_e connection_type,
+EXPORT_API int connection_reset_statistics(connection_h connection,
+                               connection_type_e connection_type,
                                connection_statistics_type_e statistics_type)
 {
+       if (!(__connection_check_handle_validity(connection))) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed");
+               return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
+
        return __reset_statistic(connection_type, statistics_type);
 }