diff options
| -rw-r--r-- | packaging/capi-network-ua.spec | 2 | ||||
| -rw-r--r-- | src/user-awareness-device.c | 10 | ||||
| -rw-r--r-- | src/user-awareness-service.c | 13 |
3 files changed, 12 insertions, 13 deletions
diff --git a/packaging/capi-network-ua.spec b/packaging/capi-network-ua.spec index a8d117a..3024c0c 100644 --- a/packaging/capi-network-ua.spec +++ b/packaging/capi-network-ua.spec @@ -1,6 +1,6 @@ Name: capi-network-ua Summary: User Awareness Framework CAPI -Version: 0.12.7 +Version: 0.12.8 Release: 1 License: Apache-2.0 Source0: %{name}-%{version}.tar.gz diff --git a/src/user-awareness-device.c b/src/user-awareness-device.c index 5d05a9c..fb7103b 100644 --- a/src/user-awareness-device.c +++ b/src/user-awareness-device.c @@ -523,7 +523,7 @@ int ua_device_set_mac_address( UA_VALIDATE_INPUT_PARAMETER(handle); UA_VALIDATE_INPUT_PARAMETER(mac_address); - retv_if(device->isadded, UA_ERROR_INVALID_PARAMETER); + retv_if(device->isadded, UA_ERROR_PERMISSION_DENIED); /* This code will check if app try to add mac address which is already set for same * or for some other device handle, Then it does not allow to set and restrict to make @@ -560,7 +560,7 @@ int ua_device_set_os_info( UA_VALIDATE_INPUT_PARAMETER(handle); - retv_if(device->isadded, UA_ERROR_INVALID_PARAMETER); + retv_if(device->isadded, UA_ERROR_PERMISSION_DENIED); if (os > UA_OS_TYPE_IOS) { /* LCOV_EXCL_START */ @@ -587,7 +587,7 @@ int ua_device_set_device_id( UA_VALIDATE_INPUT_PARAMETER(handle); UA_VALIDATE_INPUT_PARAMETER(device_id); - retv_if(device->isadded, UA_ERROR_INVALID_PARAMETER); + retv_if(device->isadded, UA_ERROR_PERMISSION_DENIED); /* This code will check if app try to add device id which is already set for same * or for some other device handle, Then it does not allow to set and restrict to make * suplicate entry as device id is suppose to same for one device. @@ -616,7 +616,7 @@ int ua_device_set_wifi_bssid( UA_VALIDATE_INPUT_PARAMETER(handle); UA_VALIDATE_INPUT_PARAMETER(bssid); - retv_if(device->isadded, UA_ERROR_INVALID_PARAMETER); + retv_if(device->isadded, UA_ERROR_PERMISSION_DENIED); retv_if((strlen(bssid) != (UA_MAC_ADDRESS_STRING_LEN -1)), UA_ERROR_INVALID_PARAMETER); g_free(device->bssid); @@ -642,7 +642,7 @@ int ua_device_set_wifi_ipv4_address( UA_VALIDATE_INPUT_PARAMETER(handle); UA_VALIDATE_INPUT_PARAMETER(ipv4_address); - retv_if(device->isadded, UA_ERROR_INVALID_PARAMETER); + retv_if(device->isadded, UA_ERROR_PERMISSION_DENIED); retv_if((strlen(ipv4_address) > (UA_IPV4_ADDRESS_STRING_LEN -1)), UA_ERROR_INVALID_PARAMETER); g_free(device->ipv4); diff --git a/src/user-awareness-service.c b/src/user-awareness-service.c index 1575402..df1f181 100644 --- a/src/user-awareness-service.c +++ b/src/user-awareness-service.c @@ -392,7 +392,7 @@ int ua_service_update(ua_service_h service_handle) UA_VALIDATE_HANDLE(service_handle, ua_services_list); retv_if(NULL == service->name, UA_ERROR_INVALID_PARAMETER); - retv_if(service->isadded != TRUE, UA_ERROR_INVALID_PARAMETER); + retv_if(service->isadded != TRUE, UA_ERROR_NOT_REGISTERED); memset(&uam_service, 0, sizeof(uam_service_info_s)); g_strlcpy(uam_service.name, service->name, UAM_SERVICE_MAX_STRING_LEN); @@ -422,7 +422,7 @@ int ua_service_remove(ua_service_h service_handle) UA_VALIDATE_INPUT_PARAMETER(service_handle); UA_VALIDATE_HANDLE(service_handle, ua_services_list); retv_if(NULL == service->name, UA_ERROR_INVALID_PARAMETER); - retv_if(service->isadded == FALSE, UA_ERROR_INVALID_PARAMETER); + retv_if(service->isadded == FALSE, UA_ERROR_NOT_REGISTERED); memset(&uam_service, 0, sizeof(uam_service_info_s)); g_strlcpy(uam_service.name, service->name, UAM_SERVICE_MAX_STRING_LEN); @@ -451,7 +451,6 @@ int ua_service_set_name(ua_service_h service_handle, const char *name) UA_VALIDATE_INPUT_PARAMETER(service_handle); UA_VALIDATE_HANDLE(service_handle, ua_services_list); - retv_if(service->isadded, UA_ERROR_NOT_PERMITTED); retv_if((strlen(name) > UAM_SERVICE_MAX_STRING_LEN), UA_ERROR_INVALID_PARAMETER); if (service->name) @@ -612,7 +611,7 @@ int ua_service_add_user(ua_service_h service_handle, ua_user_h user_handle) UA_IS_EXIST(_ua_get_user_from_list(user_info->account)); UA_IS_EXIST(__ua_get_service_from_list(service_info->name)); - retv_if(user_info->isadded == FALSE, UA_ERROR_INVALID_PARAMETER); + retv_if(user_info->isadded == FALSE, UA_ERROR_NOT_REGISTERED); tmp = service_info; @@ -668,7 +667,7 @@ int ua_service_add_device(ua_service_h service_handle, ua_device_h device_handle UA_IS_EXIST(_ua_get_device_from_list(dev_info->device_id, dev_info->mac, dev_info->type)); UA_IS_EXIST(__ua_get_service_from_list(service_info->name)); - retv_if(dev_info->isadded == FALSE, UA_ERROR_INVALID_PARAMETER); + retv_if(dev_info->isadded == FALSE, UA_ERROR_NOT_REGISTERED); ret = _ua_get_error_code(_uam_service_add_device(service_info->name, dev_info->device_id, _ua_to_uam_tech_type(dev_info->type))); @@ -725,7 +724,7 @@ int ua_service_set_device_discriminant(ua_service_h service_handle, UA_IS_EXIST(_ua_get_device_from_list(dev_info->device_id, dev_info->mac, dev_info->type)); UA_IS_EXIST(__ua_get_service_from_list(service_info->name)); - retv_if(dev_info->isadded == FALSE, UA_ERROR_INVALID_PARAMETER); + retv_if(dev_info->isadded == FALSE, UA_ERROR_NOT_REGISTERED); ret = _ua_get_error_code(_uam_service_set_device_discriminant(service_info->name, dev_info->device_id, _ua_to_uam_tech_type(dev_info->type), @@ -755,7 +754,7 @@ int ua_service_get_device_discriminant(ua_service_h service_handle, UA_IS_EXIST(_ua_get_device_from_list(dev_info->device_id, dev_info->mac, dev_info->type)); UA_IS_EXIST(__ua_get_service_from_list(service_info->name)); - retv_if(dev_info->isadded == FALSE, UA_ERROR_INVALID_PARAMETER); + retv_if(dev_info->isadded == FALSE, UA_ERROR_NOT_REGISTERED); ret = _ua_get_error_code(_uam_service_get_device_discriminant(service_info->name, dev_info->device_id, _ua_to_uam_tech_type(dev_info->type), |