diff options
author | Abhay agarwal <ay.agarwal@samsung.com> | 2019-11-27 11:40:11 +0530 |
---|---|---|
committer | DoHyun Pyun <dh79.pyun@samsung.com> | 2019-12-30 16:45:56 +0900 |
commit | 97ab9149e4d30d07ed5e4b8908c21e486c37aa12 (patch) | |
tree | 7d64d2f7d0e0d358c736db33f49e889757b9cef6 | |
parent | 8c78cdf26ff363834e73a4aea4e934c052604142 (diff) | |
download | user-awareness-97ab9149e4d30d07ed5e4b8908c21e486c37aa12.tar.gz user-awareness-97ab9149e4d30d07ed5e4b8908c21e486c37aa12.tar.bz2 user-awareness-97ab9149e4d30d07ed5e4b8908c21e486c37aa12.zip |
Rename ble payload service_id to primary_key
Renamed to hide SEC BLE Adv format.
Signed-off-by: Abhay agarwal <ay.agarwal@samsung.com>
-rw-r--r-- | include/user-awareness-private.h | 2 | ||||
-rw-r--r-- | include/user-awareness.h | 22 | ||||
-rw-r--r-- | src/user-awareness-device.c | 28 | ||||
-rw-r--r-- | test/uat-devices.c | 40 | ||||
-rw-r--r-- | test/uat-service.c | 8 | ||||
-rw-r--r-- | test/uat-users.c | 6 |
6 files changed, 53 insertions, 53 deletions
diff --git a/include/user-awareness-private.h b/include/user-awareness-private.h index 4acb15c..3713cde 100644 --- a/include/user-awareness-private.h +++ b/include/user-awareness-private.h @@ -289,7 +289,7 @@ typedef enum { * @since_tizen 5.5 */ typedef struct { - char service_id; /**< service id for manufacturer data */ + char primary_key; /**< primary key for manufacturer data */ char device_icon; /**< device icon for manufacturer data */ char purpose; /**< purpose for manufacturer data */ char *duid; /**< duid for manufacturer data */ diff --git a/include/user-awareness.h b/include/user-awareness.h index e3a329a..ae44f9e 100644 --- a/include/user-awareness.h +++ b/include/user-awareness.h @@ -2618,7 +2618,7 @@ int ua_device_get_discriminant( * @see ua_device_set_os_info() * @see ua_device_set_wifi_ipv4_address() * @see ua_device_set_discriminant() - * @see ua_device_set_payload_service_id() + * @see ua_device_set_payload_primary_key() * @see ua_device_set_payload_device_icon() * @see ua_device_set_payload_purpose() * @see ua_device_set_payload_duid() @@ -2628,11 +2628,11 @@ int ua_device_update( /** * @ingroup CAPI_NETWORK_UA_MODULE - * @brief Sets BLE payload service_id for device. + * @brief Sets BLE payload primary_key for device. * @since_tizen 5.5 * * @param[in] handle The device handle. - * @param[in] service_id The BLE payload service_id. + * @param[in] primary_key The BLE payload primary_key. * * @return 0 on success, otherwise a negative error value * @retval #UA_ERROR_NONE Successful @@ -2642,11 +2642,11 @@ int ua_device_update( * @pre * @post * - * @see ua_device_get_payload_service_id() + * @see ua_device_get_payload_primary_key() */ -int ua_device_set_payload_service_id( +int ua_device_set_payload_primary_key( ua_device_h handle, - const char service_id); + const char primary_key); /** * @ingroup CAPI_NETWORK_UA_MODULE @@ -2741,11 +2741,11 @@ int ua_add_ibeacon_adv_data( /** * @ingroup CAPI_NETWORK_UA_MODULE - * @brief Gets device's BLE payload service_id. + * @brief Gets device's BLE payload primary_key. * @since_tizen 5.5 * * @param[in] handle The device handle. - * @param[out] service_id The BLE payload service_id. + * @param[out] primary_key The BLE payload primary_key. * * @return 0 on success, otherwise a negative error value * @retval #UA_ERROR_NONE Successful @@ -2755,11 +2755,11 @@ int ua_add_ibeacon_adv_data( * @pre * @post * - * @see ua_device_set_payload_service_id() + * @see ua_device_set_payload_primary_key() */ -int ua_device_get_payload_service_id( +int ua_device_get_payload_primary_key( ua_device_h handle, - char *service_id); + char *primary_key); /** * @ingroup CAPI_NETWORK_UA_MODULE diff --git a/src/user-awareness-device.c b/src/user-awareness-device.c index 671fdaa..5e3f59c 100644 --- a/src/user-awareness-device.c +++ b/src/user-awareness-device.c @@ -192,7 +192,7 @@ void _ua_create_ua_ble_payload_s(ua_ble_payload_s **payload_handle) return; } - payload->service_id = 13; + payload->primary_key = 13; payload->device_icon = 1; payload->purpose = 1; payload->duid = NULL; @@ -229,7 +229,7 @@ ua_ble_payload_s* _ua_get_payload_from_uam(uam_ble_payload_s *uam_payload) return NULL; } - payload->service_id = uam_payload->service_id; + payload->primary_key = uam_payload->primary_key; payload->device_icon = uam_payload->device_icon; payload->purpose = uam_payload->purpose; @@ -258,14 +258,14 @@ void _ua_get_uam_payload_from_ua(uam_ble_payload_s *uam_payload, memset(uam_payload, 0, sizeof(uam_ble_payload_s)); if (NULL == payload) { - uam_payload->service_id = 13; + uam_payload->primary_key = 13; uam_payload->device_icon = 1; uam_payload->purpose = 1; UA_DBG("(NULL == payload) return"); return; } - uam_payload->service_id = payload->service_id; + uam_payload->primary_key = payload->primary_key; uam_payload->device_icon = payload->device_icon; uam_payload->purpose = payload->purpose; @@ -291,7 +291,7 @@ ua_ble_payload_s* _ua_payload_clone(ua_ble_payload_s *org_payload) return NULL; } - payload->service_id = org_payload->service_id; + payload->primary_key = org_payload->primary_key; payload->device_icon = org_payload->device_icon; payload->purpose = org_payload->purpose; @@ -678,9 +678,9 @@ int ua_device_set_discriminant( return UA_ERROR_NONE; } -int ua_device_set_payload_service_id( +int ua_device_set_payload_primary_key( ua_device_h handle, - const char service_id) + const char primary_key) { FUNC_ENTRY; ua_dev_info_s *device = (ua_dev_info_s *)handle; @@ -697,7 +697,7 @@ int ua_device_set_payload_service_id( } } - device->payload->service_id = service_id; + device->payload->primary_key = primary_key; FUNC_EXIT; return UA_ERROR_NONE; @@ -966,25 +966,25 @@ int ua_device_get_last_presence( return UA_ERROR_NONE; } -int ua_device_get_payload_service_id( +int ua_device_get_payload_primary_key( ua_device_h handle, - char *service_id) + char *primary_key) { FUNC_ENTRY; ua_dev_info_s *device = (ua_dev_info_s *)handle; UA_VALIDATE_INPUT_PARAMETER(handle); - UA_VALIDATE_INPUT_PARAMETER(service_id); + UA_VALIDATE_INPUT_PARAMETER(primary_key); UA_PRINT_DEVICE_HANDLE(handle); retv_if(device->type != UA_MAC_TYPE_BLE, UA_ERROR_INVALID_PARAMETER); if (!device->payload) { - *service_id = 0x00; - UA_DBG("payload(service_id) is not found"); + *primary_key = 0x00; + UA_DBG("payload(primary_key) is not found"); goto done; } - *service_id = device->payload->service_id; + *primary_key = device->payload->primary_key; done: FUNC_EXIT; diff --git a/test/uat-devices.c b/test/uat-devices.c index 3960536..17ebefe 100644 --- a/test/uat-devices.c +++ b/test/uat-devices.c @@ -43,7 +43,7 @@ static char g_bss_id_str[MENU_DATA_SIZE + 1] = {0,}; /**< BSSID of the selected static char g_discriminant[MENU_DATA_SIZE + 1] = {"1",}; /**< Discrimniant for a device */ static char g_ipv4_address_str[MENU_DATA_SIZE + 1] = {0,}; /**< IPv4 of the selected device */ static char g_is_paring_required_str[MENU_DATA_SIZE + 1] = {0,}; /**< Is paring required for the selected device */ -static char g_payload_service_id[MENU_DATA_SIZE + 1] = {0,}; /**< payload service_id for the selected device */ +static char g_payload_primary_key[MENU_DATA_SIZE + 1] = {0,}; /**< payload primary_key for the selected device */ static char g_payload_device_icon[MENU_DATA_SIZE + 1] = {0,}; /**< payload device_icon for the selected device */ static char g_payload_purpose[MENU_DATA_SIZE + 1] = {0,}; /**< payload purpose for the selected device */ static char g_payload_duid_str[MENU_DATA_SIZE + 1] = {0,}; /**< payload duid for the selected device */ @@ -70,7 +70,7 @@ static bool __foreach_added_device_cb( bool required = false; unsigned long long last_seen = 0; bool discriminant = false; - char service_id = 0; + char primary_key = 0; char device_icon = 0; char purpose = 0; char *duid = NULL; @@ -136,9 +136,9 @@ static bool __foreach_added_device_cb( if (UA_ERROR_NONE == ret_temp) msgb("Last present at : %llu", last_seen); - ret_temp = ua_device_get_payload_service_id(handle, &service_id); + ret_temp = ua_device_get_payload_primary_key(handle, &primary_key); if (UA_ERROR_NONE == ret_temp) - msgb("payload service_id : %d[hex: 0x%X]", service_id, service_id); + msgb("payload primary_key : %d[hex: 0x%X]", primary_key, primary_key); ret_temp = ua_device_get_payload_device_icon(handle, &device_icon); if (UA_ERROR_NONE == ret_temp) @@ -170,7 +170,7 @@ void uat_update_device_info(void) char *ipv4 = NULL; bool required = false; bool discriminant = false; - char service_id = 0; + char primary_key = 0; char device_icon = 0; char purpose = 0; char *duid = NULL; @@ -232,10 +232,10 @@ void uat_update_device_info(void) required ? "YES" : "NO ", sizeof("YES")); } - ret = ua_device_get_payload_service_id(g_device_h, &service_id); + ret = ua_device_get_payload_primary_key(g_device_h, &primary_key); if (UA_ERROR_NONE == ret) - snprintf(g_payload_service_id, MENU_DATA_SIZE + 1, "%u", - (unsigned int)service_id); + snprintf(g_payload_primary_key, MENU_DATA_SIZE + 1, "%u", + (unsigned int)primary_key); ret = ua_device_get_payload_device_icon(g_device_h, &device_icon); if (UA_ERROR_NONE == ret) @@ -456,20 +456,20 @@ static int run_ua_device_set_wifi_ipv4_address( return RET_SUCCESS; } -static int run_ua_device_set_payload_service_id( +static int run_ua_device_set_payload_primary_key( MManager *mm, struct menu_data *menu) { int ret = UA_ERROR_NONE; - char service_id = 0; + char primary_key = 0; - msg("ua_device_set_payload_service_id"); + msg("ua_device_set_payload_primary_key"); - if (strlen(g_payload_service_id)) - service_id = (unsigned char)strtol(g_payload_service_id, NULL, 10); + if (strlen(g_payload_primary_key)) + primary_key = (unsigned char)strtol(g_payload_primary_key, NULL, 10); - ret = ua_device_set_payload_service_id(g_device_h, service_id); + ret = ua_device_set_payload_primary_key(g_device_h, primary_key); - msg(" - ua_device_set_payload_service_id() ret: [0x%X] [%s]", + msg(" - ua_device_set_payload_primary_key() ret: [0x%X] [%s]", ret, uat_get_error_str(ret)); return RET_SUCCESS; @@ -659,11 +659,11 @@ static struct menu_data menu_ua_discrminiant[] = { { NULL, NULL, }, }; -static struct menu_data menu_ua_device_set_payload_service_id[] = { +static struct menu_data menu_ua_device_set_payload_primary_key[] = { { "1", "Service_ID (0 to 255)", - NULL, NULL, g_payload_service_id }, + NULL, NULL, g_payload_primary_key }, { "2", "run", NULL, - run_ua_device_set_payload_service_id, NULL }, + run_ua_device_set_payload_primary_key, NULL }, { NULL, NULL, }, }; @@ -730,8 +730,8 @@ struct menu_data menu_ua_devices[] = { menu_ua_discrminiant, NULL, g_discriminant}, { "8", "ua_device_set_wifi_ipv4_address", menu_ua_ipv4_address, NULL, g_ipv4_address_str }, - { "9", "ua_device_set_payload_service_id", - menu_ua_device_set_payload_service_id, NULL, g_payload_service_id }, + { "9", "ua_device_set_payload_primary_key", + menu_ua_device_set_payload_primary_key, NULL, g_payload_primary_key }, { "10", "ua_device_set_payload_device_icon", menu_ua_device_set_payload_device_icon, NULL, g_payload_device_icon }, { "11", "ua_device_set_payload_purpose", diff --git a/test/uat-service.c b/test/uat-service.c index 89c491a..33a2938 100644 --- a/test/uat-service.c +++ b/test/uat-service.c @@ -191,7 +191,7 @@ static bool _service_foreach_added_device_cb( bool required = false; bool discriminant = false; unsigned long long last_seen = 0; - char service_id = 0; + char primary_key = 0; char device_icon = 0; char purpose = 0; char *duid = NULL; @@ -268,9 +268,9 @@ static bool _service_foreach_added_device_cb( if (UA_ERROR_NONE == ret_temp) msgb("Last present at : %llu", last_seen); - ret_temp = ua_device_get_payload_service_id(handle, &service_id); + ret_temp = ua_device_get_payload_primary_key(handle, &primary_key); if (UA_ERROR_NONE == ret_temp) - msgb("payload service_id : %d[hex: 0x%X]", service_id, service_id); + msgb("payload primary_key : %d[hex: 0x%X]", primary_key, primary_key); ret_temp = ua_device_get_payload_device_icon(handle, &device_icon); if (UA_ERROR_NONE == ret_temp) @@ -796,4 +796,4 @@ struct menu_data menu_ua_services[] = { { "33", ANSI_COLOR_LIGHTMAGENTA "ua_service_foreach_added_users" ANSI_COLOR_NORMAL, menu_sel_service_added_user, NULL, NULL }, { NULL, NULL, }, -};
\ No newline at end of file +}; diff --git a/test/uat-users.c b/test/uat-users.c index 1c29b8b..2ecb677 100644 --- a/test/uat-users.c +++ b/test/uat-users.c @@ -206,7 +206,7 @@ static bool _user_foreach_added_device_cb(ua_device_h device_handle, bool required = false; unsigned long long last_seen = 0; bool discriminant = false; - char service_id = 0; + char primary_key = 0; char device_icon = 0; char purpose = 0; char *duid = NULL; @@ -273,9 +273,9 @@ static bool _user_foreach_added_device_cb(ua_device_h device_handle, if (UA_ERROR_NONE == ret_temp) msgc("Last present at : %llu", last_seen); - ret_temp = ua_device_get_payload_service_id(handle, &service_id); + ret_temp = ua_device_get_payload_primary_key(handle, &primary_key); if (UA_ERROR_NONE == ret_temp) - msgc("payload service_id : %d[hex: 0x%X]", service_id, service_id); + msgc("payload primary_key : %d[hex: 0x%X]", primary_key, primary_key); ret_temp = ua_device_get_payload_device_icon(handle, &device_icon); if (UA_ERROR_NONE == ret_temp) |