Renamed to hide SEC BLE Adv format
Signed-off-by: Abhay agarwal <ay.agarwal@samsung.com>
* @since_tizen 5.5
*/
typedef struct {
* @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 */
char device_icon; /** Device icon */
char purpose; /** Purpose */
char duid[UAM_BLE_PAYLOAD_DUID_LEN + 1]; /** DUID */
} uam_db_address_info_t;
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 */
char device_icon; /** Device icon */
char purpose; /** Purpose */
char *duid; /** DUID */
(*device)->addr_list[i++].address = g_strdup(addr->address);
}
(*device)->payload = g_new0(uas_ble_payload_t, 1);
(*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);
(*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);
device->device_id = g_strdup(dev->device_id);
device->payload = g_new0(uas_ble_payload_t, 1);
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);
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);
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) {
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)
device->payload.device_icon = dev->payload->device_icon;
device->payload.purpose = dev->payload->purpose;
if (dev->payload->duid)
static void __uam_copy_payload_info(uam_ble_payload_s *dev_payload, uam_db_ble_payload_t *payload)
{
if (payload) {
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)
dev_payload->device_icon = payload->device_icon;
dev_payload->purpose = payload->purpose;
if (payload->duid)
tech->discriminant = dev_info->discriminant;
tech->payload = g_new0(uam_db_ble_payload_t, 1);
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);
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);
tech->discriminant = a_device->discriminant;
/* Update Payload for device-tech */
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);
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);
"presence_state INTEGER, " \
"os_type INTEGER, " \
"discriminant INTEGER, " \
"presence_state INTEGER, " \
"os_type INTEGER, " \
"discriminant INTEGER, " \
"purpose TEXT, " \
"duid TEXT, " \
"device_icon TEXT, " \
"purpose TEXT, " \
"duid TEXT, " \
"device_icon TEXT, " \
#define SELECT_ALL_DEVICES "SELECT device_id, tech_type, address, " \
"ip_address, last_seen, presence_state, os_type, " \
#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, " \
#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 " \
"WHERE device_id = ? AND tech_type = ? AND address = ?"
#define SELECT_DEVICE_NUMBER "SELECT device_number FROM devices " \
#define INSERT_DEVICE "insert into devices " \
"(device_id, tech_type, address, ip_address, last_seen, " \
#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 (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"
"purpose, duid, device_icon)" \
"values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"
"SET address = ? WHERE device_id = ? AND tech_type = ?"
#define UPDATE_DEVICE "UPDATE devices " \
"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 = ?"
"purpose, duid, device_icon) = (?, ?, ?, ?, ?, ?, ?) " \
"WHERE device_id = ? AND tech_type = ? AND address = ?"
error_code, handle_error);
DB_ACTION(sqlite3_bind_text(stmt, 3, ip, -1, SQLITE_TRANSIENT),
error_code, handle_error);
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);
error_code, handle_error);
DB_ACTION(sqlite3_bind_text(stmt, 5, &(payload.purpose), 1, SQLITE_TRANSIENT),
error_code, handle_error);
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,
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);
DB_ACTION(sqlite3_bind_text(stmt, 1, dev_info->device_id, -1, SQLITE_TRANSIENT),
error_code, handle_error);
error_code, handle_error);
DB_ACTION(sqlite3_bind_int(stmt, 9, dev_info->discriminant),
error_code, handle_error);
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);
error_code, handle_error);
DB_ACTION(sqlite3_bind_text(stmt, 11, &(dev_info->payload.purpose), 1, SQLITE_TRANSIENT),
error_code, handle_error);
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.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))
buf = (char *)sqlite3_column_text(stmt, 10);
info->dev_info.payload.purpose = buf ? *buf : 1;
if ((char*)sqlite3_column_text(stmt, 11))
info->dev_info.operating_system,
info->user_id,
info->dev_info.discriminant,
info->dev_info.operating_system,
info->user_id,
info->dev_info.discriminant,
- info->dev_info.payload.service_id);
+ info->dev_info.payload.primary_key);
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.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))
buf = (char *)sqlite3_column_text(stmt, 10);
info->dev_info.payload.purpose = buf ? *buf : 1;
if ((char*)sqlite3_column_text(stmt, 11))
info->dev_info.operating_system,
info->user_id,
info->dev_info.discriminant,
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;
device_list = g_slist_append(device_list, info);
break;
account, dev_info.type, dev_info.mac,
dev_info.ipv4_addr, dev_info.device_id,
dev_info.discriminant ? "true" : "false",
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);
dev_info.payload.duid, dev_info.payload.device_icon,
dev_info.payload.bt_mac);
/* Device ble payload information structure */
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 */
char device_icon; /** Device icon */
char purpose; /** Purpose */
char *duid; /** DUID */