Rename ble payload service_id to primary_key

Renamed to hide SEC BLE Adv format

Signed-off-by: Abhay agarwal <ay.agarwal@samsung.com>

diff --git a/include/ua-api.h b/include/ua-api.h
index 8d57f07..4e12ec0 100644 (file)
--- a/include/ua-api.h
+++ b/include/ua-api.h
@@ -484,7 +484,7 @@ typedef enum {
  * @since_tizen 5.5
  */
 typedef struct {
-       char service_id; /** Service Id */
+       char primary_key; /** Primary Key */
        char device_icon; /** Device icon */
        char purpose; /** Purpose */
        char duid[UAM_BLE_PAYLOAD_DUID_LEN + 1]; /** DUID */

diff --git a/ua-daemon/include/ua-manager-core.h b/ua-daemon/include/ua-manager-core.h
index 01b653d..a05ada7 100644 (file)
--- a/ua-daemon/include/ua-manager-core.h
+++ b/ua-daemon/include/ua-manager-core.h
@@ -68,7 +68,7 @@ typedef struct {
 } uam_db_address_info_t;
 
 typedef struct {
-       char service_id; /** Service Id */
+       char primary_key; /** Primary key */
        char device_icon; /** Device icon */
        char purpose; /** Purpose */
        char *duid; /** DUID */

diff --git a/ua-daemon/src/pm/ua-pm-util.c b/ua-daemon/src/pm/ua-pm-util.c
index 2bac0d9..2e1d9d8 100644 (file)
--- a/ua-daemon/src/pm/ua-pm-util.c
+++ b/ua-daemon/src/pm/ua-pm-util.c
@@ -198,7 +198,7 @@ void _pm_util_uam_db_dev_to_uas_dev(unsigned int tech_type,
                        (*device)->addr_list[i++].address = g_strdup(addr->address);
                }
                (*device)->payload = g_new0(uas_ble_payload_t, 1);
-               (*device)->payload->service_id = tech->payload->service_id;
+               (*device)->payload->primary_key = tech->payload->primary_key;
                (*device)->payload->purpose = tech->payload->purpose;
                (*device)->payload->device_icon = tech->payload->device_icon;
                (*device)->payload->duid = g_memdup(tech->payload->duid, UAM_BLE_PAYLOAD_DUID_LEN);
@@ -260,7 +260,7 @@ uas_device_info_t *_pm_util_uam_dev_info_to_uas_dev_info(const uam_device_info_s
        device->device_id = g_strdup(dev->device_id);
 
        device->payload = g_new0(uas_ble_payload_t, 1);
-       device->payload->service_id = dev->payload.service_id;
+       device->payload->primary_key = dev->payload.primary_key;
        device->payload->purpose = dev->payload.purpose;
        device->payload->device_icon = dev->payload.device_icon;
        device->payload->duid = g_memdup(&(dev->payload.duid), UAM_BLE_PAYLOAD_DUID_LEN);
@@ -300,7 +300,7 @@ uam_device_info_s *_pm_util_uas_dev_info_to_uam_dev_info(const uas_device_info_t
        memset(device->payload.duid, 0, UAM_BLE_PAYLOAD_DUID_LEN + 1);
        memset(device->payload.bt_mac, 0, UAM_BT_MAC_ADDRESS_STRING_LEN);
        if (dev->payload) {
-               device->payload.service_id = dev->payload->service_id;
+               device->payload.primary_key = dev->payload->primary_key;
                device->payload.device_icon = dev->payload->device_icon;
                device->payload.purpose = dev->payload->purpose;
                if (dev->payload->duid)

diff --git a/ua-daemon/src/ua-manager-core.c b/ua-daemon/src/ua-manager-core.c
index 9a78865..3f96239 100644 (file)
--- a/ua-daemon/src/ua-manager-core.c
+++ b/ua-daemon/src/ua-manager-core.c
@@ -275,7 +275,7 @@ static void __uam_core_copy_addr(uam_device_info_s *device, uam_db_address_info_
 static void __uam_copy_payload_info(uam_ble_payload_s *dev_payload, uam_db_ble_payload_t *payload)
 {
        if (payload) {
-               dev_payload->service_id = payload->service_id;
+               dev_payload->primary_key = payload->primary_key;
                dev_payload->device_icon = payload->device_icon;
                dev_payload->purpose = payload->purpose;
                if (payload->duid)
@@ -700,7 +700,7 @@ static void __uam_core_add_dev_to_list(
        tech->discriminant = dev_info->discriminant;
 
        tech->payload = g_new0(uam_db_ble_payload_t, 1);
-       tech->payload->service_id = dev_info->payload.service_id;
+       tech->payload->primary_key = dev_info->payload.primary_key;
        tech->payload->purpose = dev_info->payload.purpose;
        tech->payload->device_icon = dev_info->payload.device_icon;
        tech->payload->duid = g_memdup(&(dev_info->payload.duid), UAM_BLE_PAYLOAD_DUID_LEN);
@@ -1195,7 +1195,7 @@ int _uam_core_update_device(const uam_device_info_s *a_device)
                tech->discriminant = a_device->discriminant;
 
                /* Update Payload for device-tech */
-               tech->payload->service_id = a_device->payload.service_id;
+               tech->payload->primary_key = a_device->payload.primary_key;
                tech->payload->purpose = a_device->payload.purpose;
                tech->payload->device_icon = a_device->payload.device_icon;
                tech->payload->duid = g_memdup(&(a_device->payload.duid), UAM_BLE_PAYLOAD_DUID_LEN);

diff --git a/ua-daemon/src/ua-manager-db.c b/ua-daemon/src/ua-manager-db.c
index 3431f20..a852097 100644 (file)
--- a/ua-daemon/src/ua-manager-db.c
+++ b/ua-daemon/src/ua-manager-db.c
@@ -49,7 +49,7 @@
        "presence_state INTEGER, " \
        "os_type INTEGER, " \
        "discriminant INTEGER, " \
-       "service_id TEXT, " \
+       "primary_key TEXT, " \
        "purpose TEXT, " \
        "duid TEXT, " \
        "device_icon TEXT, " \

diff --git a/ua-daemon/src/ua-manager-device-db.c b/ua-daemon/src/ua-manager-device-db.c
index 69d51c3..f8b2781 100644 (file)
--- a/ua-daemon/src/ua-manager-device-db.c
+++ b/ua-daemon/src/ua-manager-device-db.c
@@ -26,11 +26,11 @@
 
 #define SELECT_ALL_DEVICES "SELECT device_id, tech_type, address, " \
        "ip_address, last_seen, presence_state, os_type, " \
-       "user_id, discriminant, service_id, purpose, duid, device_icon FROM devices"
+       "user_id, discriminant, primary_key, purpose, duid, device_icon FROM devices"
 
 #define SELECT_DEVICE "SELECT device_id, tech_type, address, " \
        "ip_address, last_seen, presence_state, os_type, " \
-       "user_id, discriminant, service_id, purpose, duid, device_icon FROM devices " \
+       "user_id, discriminant, primary_key, purpose, duid, device_icon FROM devices " \
        "WHERE device_id = ? AND tech_type = ? AND address = ?"
 
 #define SELECT_DEVICE_NUMBER "SELECT device_number FROM devices " \
@@ -38,7 +38,7 @@
 
 #define INSERT_DEVICE "insert into devices " \
        "(device_id, tech_type, address, ip_address, last_seen, " \
-       "presence_state, os_type, user_id, discriminant, service_id, " \
+       "presence_state, os_type, user_id, discriminant, primary_key, " \
        "purpose, duid, device_icon)" \
        "values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"
 
@@ -55,7 +55,7 @@
        "SET address = ? WHERE device_id = ? AND tech_type = ?"
 
 #define UPDATE_DEVICE "UPDATE devices " \
-       "SET (os_type, discriminant, ip_address, service_id, " \
+       "SET (os_type, discriminant, ip_address, primary_key, " \
        "purpose, duid, device_icon) = (?, ?, ?, ?, ?, ?, ?) " \
        "WHERE device_id = ? AND tech_type = ? AND address = ?"
 
@@ -431,7 +431,7 @@ int _uam_device_db_update_device_device(char *device_id, int tech_type,
                error_code, handle_error);
        DB_ACTION(sqlite3_bind_text(stmt, 3, ip, -1, SQLITE_TRANSIENT),
                error_code, handle_error);
-       DB_ACTION(sqlite3_bind_text(stmt, 4, &(payload.service_id), 1, SQLITE_TRANSIENT),
+       DB_ACTION(sqlite3_bind_text(stmt, 4, &(payload.primary_key), 1, SQLITE_TRANSIENT),
                error_code, handle_error);
        DB_ACTION(sqlite3_bind_text(stmt, 5, &(payload.purpose), 1, SQLITE_TRANSIENT),
                error_code, handle_error);
@@ -475,7 +475,7 @@ int _uam_device_db_insert_device_info(int user_id,
        UAM_INFO("%s-%d-%s-%s-%llu-%d-%d-%d-%d-0x%2.2X", dev_info->device_id,
                        dev_info->type, dev_info->mac, dev_info->ipv4_addr,
                        last_seen, presence_state, dev_info->operating_system, dev_info->discriminant,
-                       user_id, dev_info->payload.service_id);
+                       user_id, dev_info->payload.primary_key);
 
        DB_ACTION(sqlite3_bind_text(stmt, 1, dev_info->device_id, -1, SQLITE_TRANSIENT),
                error_code, handle_error);
@@ -495,7 +495,7 @@ int _uam_device_db_insert_device_info(int user_id,
                error_code, handle_error);
        DB_ACTION(sqlite3_bind_int(stmt, 9, dev_info->discriminant),
                error_code, handle_error);
-       DB_ACTION(sqlite3_bind_text(stmt, 10, &(dev_info->payload.service_id), 1, SQLITE_TRANSIENT),
+       DB_ACTION(sqlite3_bind_text(stmt, 10, &(dev_info->payload.primary_key), 1, SQLITE_TRANSIENT),
                error_code, handle_error);
        DB_ACTION(sqlite3_bind_text(stmt, 11, &(dev_info->payload.purpose), 1, SQLITE_TRANSIENT),
                error_code, handle_error);
@@ -605,7 +605,7 @@ int _uam_device_db_get_device(char *device_id, int tech_type, char *address,
                info->dev_info.discriminant = sqlite3_column_int(stmt, 8);
                memset(info->dev_info.payload.duid, 0, UAM_BLE_PAYLOAD_DUID_LEN + 1);
                buf = (char *)sqlite3_column_text(stmt, 9);
-               info->dev_info.payload.service_id = buf ? *buf : 13;
+               info->dev_info.payload.primary_key = buf ? *buf : 13;
                buf = (char *)sqlite3_column_text(stmt, 10);
                info->dev_info.payload.purpose = buf ? *buf : 1;
                if ((char*)sqlite3_column_text(stmt, 11))
@@ -624,7 +624,7 @@ int _uam_device_db_get_device(char *device_id, int tech_type, char *address,
                        info->dev_info.operating_system,
                        info->user_id,
                        info->dev_info.discriminant,
-                       info->dev_info.payload.service_id);
+                       info->dev_info.payload.primary_key);
        }
 
 handle_error:
@@ -708,7 +708,7 @@ GSList *_uam_device_db_get_all_devices(void)
                        info->dev_info.discriminant = sqlite3_column_int(stmt, 8);
                        memset(info->dev_info.payload.duid, 0, UAM_BLE_PAYLOAD_DUID_LEN + 1);
                        buf = (char *)sqlite3_column_text(stmt, 9);
-                       info->dev_info.payload.service_id = buf ? *buf : 13;
+                       info->dev_info.payload.primary_key = buf ? *buf : 13;
                        buf = (char *)sqlite3_column_text(stmt, 10);
                        info->dev_info.payload.purpose = buf ? *buf : 1;
                        if ((char*)sqlite3_column_text(stmt, 11))
@@ -727,7 +727,7 @@ GSList *_uam_device_db_get_all_devices(void)
                                info->dev_info.operating_system,
                                info->user_id,
                                info->dev_info.discriminant,
-                               info->dev_info.payload.service_id);
+                               info->dev_info.payload.primary_key);
 
                        device_list = g_slist_append(device_list, info);
                        break;

diff --git a/ua-daemon/src/ua-manager-request-handler.c b/ua-daemon/src/ua-manager-request-handler.c
index 7afa318..a10a088 100644 (file)
--- a/ua-daemon/src/ua-manager-request-handler.c
+++ b/ua-daemon/src/ua-manager-request-handler.c
@@ -811,7 +811,7 @@ static int __uam_manager_async_request_handler(
                                account, dev_info.type, dev_info.mac,
                                dev_info.ipv4_addr, dev_info.device_id,
                                dev_info.discriminant ? "true" : "false",
-                               dev_info.payload.service_id, dev_info.payload.purpose,
+                               dev_info.payload.primary_key, dev_info.payload.purpose,
                                dev_info.payload.duid, dev_info.payload.device_icon,
                                dev_info.payload.bt_mac);
 

diff --git a/ua-plugins/include/ua-plugin.h b/ua-plugins/include/ua-plugin.h
index f9d71f9..bd40701 100644 (file)
--- a/ua-plugins/include/ua-plugin.h
+++ b/ua-plugins/include/ua-plugin.h
@@ -101,7 +101,7 @@ typedef struct {
 
 /* Device ble payload information structure */
 typedef struct {
-       char service_id; /** Service Id */
+       char primary_key; /** Primary Key */
        char device_icon; /** Device icon */
        char purpose; /** Purpose */
        char *duid; /** DUID */