Fix the issue that can not send device event

[platform/core/connectivity/bluetooth-frwk.git] / bt-oal / oal-device-mgr.c

diff --git a/bt-oal/oal-device-mgr.c b/bt-oal/oal-device-mgr.c
index aedbd1a..d0d9d35 100755 (executable)
--- a/bt-oal/oal-device-mgr.c
+++ b/bt-oal/oal-device-mgr.c
@@ -52,7 +52,7 @@ oal_status_t device_query_attributes(bt_address_t *addr)
 
        OAL_CHECK_PARAMETER(addr, return);
 
-       API_TRACE("[%s]", bdt_bd2str(addr, &bdstr));
+       API_TRACE("[%s]", bdt_bd2str(addr, &bdstr) + 12);
 
        res = blued_api->get_remote_device_properties((bt_bdaddr_t *)addr);
        if (res != BT_STATUS_SUCCESS) {
@@ -72,7 +72,7 @@ oal_status_t device_query_services(bt_address_t * addr)
 
        OAL_CHECK_PARAMETER(addr, return);
 
-       API_TRACE("[%s]", bdt_bd2str(addr, &bdstr));
+       API_TRACE("[%s]", bdt_bd2str(addr, &bdstr) + 12);
 
        res = blued_api->get_remote_services((bt_bdaddr_t *)addr);
        if (res != BT_STATUS_SUCCESS) {
@@ -104,7 +104,7 @@ oal_status_t device_set_alias(bt_address_t * addr, char * alias)
        OAL_CHECK_PARAMETER(addr, return);
        OAL_CHECK_PARAMETER(alias, return);
 
-       API_TRACE("%s ->Alias: %s", bdt_bd2str(addr, &bdstr), alias);
+       API_TRACE("%s ->Alias: %s", bdt_bd2str(addr, &bdstr) + 12, alias);
 
        prop.type = BT_PROPERTY_REMOTE_FRIENDLY_NAME;
        prop.len = strlen(alias);
@@ -128,7 +128,7 @@ oal_status_t device_create_bond(bt_address_t *addr, oal_conn_type_e transport)
 
        OAL_CHECK_PARAMETER(addr, return);
 
-       API_TRACE("[%s]", bdt_bd2str(addr, &bdstr));
+       API_TRACE("[%s]", bdt_bd2str(addr, &bdstr) + 12);
 
        res = blued_api->create_bond((bt_bdaddr_t *)addr, transport);
        if (res != BT_STATUS_SUCCESS) {
@@ -148,7 +148,7 @@ oal_status_t device_destroy_bond(bt_address_t * addr)
 
        OAL_CHECK_PARAMETER(addr, return);
 
-       API_TRACE("[%s]", bdt_bd2str(addr, &bdstr));
+       API_TRACE("[%s]", bdt_bd2str(addr, &bdstr) + 12);
 
        res = blued_api->remove_bond((bt_bdaddr_t *)addr);
        if (res != BT_STATUS_SUCCESS) {
@@ -168,7 +168,7 @@ oal_status_t device_stop_bond(bt_address_t * addr)
 
        OAL_CHECK_PARAMETER(addr, return);
 
-       API_TRACE("[%s]", bdt_bd2str(addr, &bdstr));
+       API_TRACE("[%s]", bdt_bd2str(addr, &bdstr) + 12);
 
        res = blued_api->cancel_bond((bt_bdaddr_t *)addr);
        if (res != BT_STATUS_SUCCESS) {
@@ -179,6 +179,25 @@ oal_status_t device_stop_bond(bt_address_t * addr)
        return OAL_STATUS_SUCCESS;
 }
 
+oal_status_t device_get_ida(bt_address_t *device_address, bt_address_t *id_address)
+{
+       int res;
+
+       CHECK_OAL_INITIALIZED();
+
+       OAL_CHECK_PARAMETER(device_address, return);
+
+       API_TRACE();
+
+       res = blued_api->get_device_ida((bt_bdaddr_t*) device_address, (bt_bdaddr_t*) id_address);
+
+       if (res != BT_STATUS_SUCCESS)
+               BT_ERR("get_device_IDA failed: [%s]",status2string(res));
+
+       res = convert_to_oal_status(res);
+       return res;
+}
+
 oal_status_t device_accept_pin_request(bt_address_t * addr, const char * pin)
 {
        int res;
@@ -189,7 +208,7 @@ oal_status_t device_accept_pin_request(bt_address_t * addr, const char * pin)
        OAL_CHECK_PARAMETER(addr, return);
        OAL_CHECK_PARAMETER(pin, return);
 
-       API_TRACE("[%s] PIN: %s", bdt_bd2str(addr, &bdstr), pin);
+       API_TRACE("[%s] PIN: %s", bdt_bd2str(addr, &bdstr) + 12, pin);
 
        res = blued_api->pin_reply((bt_bdaddr_t *)addr, TRUE, strlen(pin), (bt_pin_code_t *)pin);
        if (res != BT_STATUS_SUCCESS) {
@@ -210,7 +229,7 @@ oal_status_t device_reject_pin_request(bt_address_t * addr)
 
        OAL_CHECK_PARAMETER(addr, return);
 
-       API_TRACE("[%s]", bdt_bd2str(addr, &bdstr));
+       API_TRACE("[%s]", bdt_bd2str(addr, &bdstr) + 12);
 
        res = blued_api->pin_reply((bt_bdaddr_t *)addr, FALSE, 0, NULL);
        if (res != BT_STATUS_SUCCESS) {
@@ -230,7 +249,7 @@ oal_status_t device_accept_passkey_entry(bt_address_t * addr, uint32_t passkey)
 
        OAL_CHECK_PARAMETER(addr, return);
 
-       API_TRACE("[%s] Passkey: %d", bdt_bd2str(addr, &bdstr), passkey);
+       API_TRACE("[%s] Passkey: %d", bdt_bd2str(addr, &bdstr) + 12, passkey);
 
        res = blued_api->ssp_reply((bt_bdaddr_t *)addr, BT_SSP_VARIANT_PASSKEY_ENTRY, TRUE, passkey);
        if (res != BT_STATUS_SUCCESS) {
@@ -252,7 +271,7 @@ oal_status_t device_reject_passkey_entry(bt_address_t * addr)
 
        OAL_CHECK_PARAMETER(addr, return);
 
-       API_TRACE("[%s]", bdt_bd2str(addr, &bdstr));
+       API_TRACE("[%s]", bdt_bd2str(addr, &bdstr) + 12);
 
        res = blued_api->ssp_reply((bt_bdaddr_t *)addr, BT_SSP_VARIANT_PASSKEY_ENTRY, FALSE, 0);
        if (res != BT_STATUS_SUCCESS) {
@@ -272,7 +291,7 @@ oal_status_t device_reply_passkey_confirmation(bt_address_t * addr, int accept)
 
        OAL_CHECK_PARAMETER(addr, return);
 
-       API_TRACE("[%s] accept: %d", bdt_bd2str(addr, &bdstr), accept);
+       API_TRACE("[%s] accept: %d", bdt_bd2str(addr, &bdstr) + 12, accept);
 
        res = blued_api->ssp_reply((bt_bdaddr_t *)addr, BT_SSP_VARIANT_PASSKEY_CONFIRMATION, accept, 0);
        if (res != BT_STATUS_SUCCESS) {
@@ -294,7 +313,7 @@ oal_status_t device_reply_ssp_consent(bt_address_t * addr, int accept)
 
        OAL_CHECK_PARAMETER(addr, return);
 
-       API_TRACE("[%s] %d", bdt_bd2str(addr, &bdstr), accept);
+       API_TRACE("[%s] %d", bdt_bd2str(addr, &bdstr) + 12, accept);
 
        res = blued_api->ssp_reply((bt_bdaddr_t *)addr, BT_SSP_VARIANT_CONSENT, accept, 0);
        if (res != BT_STATUS_SUCCESS) {
@@ -315,7 +334,7 @@ oal_status_t device_reply_auth_request(bt_address_t * addr, oal_service_t servic
 
        OAL_CHECK_PARAMETER(addr, return);
 
-       API_TRACE("[%s] Accept: %d, always: %d, service_type: %d", bdt_bd2str(addr, &bdstr), accept, always, service_type);
+       API_TRACE("[%s] Accept: %d, always: %d, service_type: %d", bdt_bd2str(addr, &bdstr) + 12, accept, always, service_type);
 
        res = blued_api->authorize_response((bt_bdaddr_t *)addr, service_type, accept, always);
        if (res != BT_STATUS_SUCCESS) {
@@ -336,7 +355,7 @@ oal_status_t device_set_authorized(bt_address_t * addr, int authorize)
 
        OAL_CHECK_PARAMETER(addr, return);
 
-       API_TRACE("[%s] %d", bdt_bd2str(addr, &bdstr), authorize);
+       API_TRACE("[%s] %d", bdt_bd2str(addr, &bdstr) + 12, authorize);
 
        res = blued_api->set_authorization((bt_bdaddr_t *)addr, authorize);
        if (res != BT_STATUS_SUCCESS) {
@@ -356,7 +375,7 @@ gboolean device_get_acl_conn_state(bt_address_t * addr)
        CHECK_OAL_INITIALIZED();
        OAL_CHECK_PARAMETER(addr, return);
 
-       API_TRACE("[%s]", bdt_bd2str(addr, &bdstr));
+       API_TRACE("[%s]", bdt_bd2str(addr, &bdstr) + 12);
 
        res = blued_api->get_connection_state((bt_bdaddr_t *)addr);
        BT_ERR("get_connection_state returned: [%s]", res ? "TRUE" : "FALSE");
@@ -372,7 +391,7 @@ gboolean device_get_svc_conn_state(bt_address_t * addr, oal_service_t svc_id)
        CHECK_OAL_INITIALIZED();
        OAL_CHECK_PARAMETER(addr, return);
 
-       API_TRACE("[%s] %d", bdt_bd2str(addr, &bdstr), svc_id);
+       API_TRACE("[%s] %d", bdt_bd2str(addr, &bdstr) + 12, svc_id);
 
 #ifdef TIZEN_BT_HAL
        res = blued_api->get_service_connection_state((bt_bdaddr_t *)addr, svc_id);
@@ -466,7 +485,7 @@ oal_status_t device_set_trust_profile(bt_address_t *addr, oal_trusted_profile_e
 
        OAL_CHECK_PARAMETER(addr, return);
 
-       API_TRACE("[%s]", bdt_bd2str(addr, &bdstr));
+       API_TRACE("[%s]", bdt_bd2str(addr, &bdstr) + 12);
 
 #ifdef TIZEN_BT_HAL
        res = blued_api->set_trusted_profile((bt_bdaddr_t *)addr, profile, (trust ? 1 : 0));
@@ -492,7 +511,7 @@ oal_status_t device_get_trust_profile(bt_address_t *addr, oal_trusted_profile_e
 
        OAL_CHECK_PARAMETER(addr, return);
 
-       API_TRACE("[%s]", bdt_bd2str(addr, &bdstr));
+       API_TRACE("[%s]", bdt_bd2str(addr, &bdstr) + 12);
 
 #ifdef TIZEN_BT_HAL
        res = blued_api->get_trusted_profile((bt_bdaddr_t *)addr, profile, trusted);
@@ -519,7 +538,7 @@ oal_status_t device_enable_rssi_monitoring(bt_address_t *addr, unsigned int link
 
        OAL_CHECK_PARAMETER(addr, return);
 
-       API_TRACE("[%s]", bdt_bd2str(addr, &bdstr));
+       API_TRACE("[%s]", bdt_bd2str(addr, &bdstr) + 12);
 
 #ifdef TIZEN_BT_HAL
        res = blued_api->enable_rssi_monitoring((bt_bdaddr_t *)addr, link_type,
@@ -546,7 +565,7 @@ oal_status_t device_get_connected_link_rssi_strength(bt_address_t *addr, unsigne
 
        OAL_CHECK_PARAMETER(addr, return);
 
-       API_TRACE("[%s]", bdt_bd2str(addr, &bdstr));
+       API_TRACE("[%s]", bdt_bd2str(addr, &bdstr) + 12);
 
 #ifdef TIZEN_BT_HAL
        res = blued_api->get_connected_link_rssi_strength((bt_bdaddr_t *)addr, link_type);
@@ -595,7 +614,7 @@ oal_status_t device_disconnect(bt_address_t * addr)
 
        OAL_CHECK_PARAMETER(addr, return);
 
-       API_TRACE("[%s]", bdt_bd2str(addr, &bdstr));
+       API_TRACE("[%s]", bdt_bd2str(addr, &bdstr) + 12);
 
        res = blued_api->device_disconnect((bt_bdaddr_t *)addr);
        if (res != BT_STATUS_SUCCESS) {
@@ -616,7 +635,7 @@ void cb_device_properties(bt_status_t status, bt_bdaddr_t *bd_addr,
        gsize size = 0;
        bdstr_t bdstr;
 
-       BT_DBG("[%s]status: [%d] num properties [%d]", bdt_bd2str((bt_address_t*)bd_addr, &bdstr),
+       BT_DBG("[%s]status: [%d] num properties [%d]", bdt_bd2str((bt_address_t*)bd_addr, &bdstr) + 12,
                        status, num_properties);
 
        dev_info = g_new0(remote_device_t, 1);
@@ -650,13 +669,13 @@ void cb_device_properties(bt_status_t status, bt_bdaddr_t *bd_addr,
                case BT_PROPERTY_UUIDS: {
                        event_dev_services_t *services_info;
                        bt_uuid_t *uuids = (bt_uuid_t *) properties[0].val;
-                       BT_INFO("Properties len [%d] event structure size [%zu]", properties[0].len, sizeof(event_dev_services_t));
+                       BT_DBG("Properties len [%d] event structure size [%zu]", properties[0].len, sizeof(event_dev_services_t));
 
                        services_info = g_malloc(sizeof(event_dev_services_t) + properties[0].len);
                        services_info->address = dev_info->address;
                        memcpy(services_info->service_list, uuids, properties[0].len);
                        services_info->num = properties[0].len/sizeof(bt_uuid_t);
-                       BT_INFO("Number of UUID [%d]", services_info->num);
+                       BT_DBG("Number of UUID [%d]", services_info->num);
                        event = OAL_EVENT_DEVICE_SERVICES;
                        event_data = services_info;
                        size = sizeof(event_dev_services_t) + properties[0].len;
@@ -673,7 +692,7 @@ void cb_device_properties(bt_status_t status, bt_bdaddr_t *bd_addr,
                if (dev_info->type != DEV_TYPE_BREDR) {
                        int i;
 
-                       BT_INFO("BLE Device");
+                       BT_DBG("BLE Device");
                        /* BLE Single or DUAL mode found, so it should have Adv data */
                        dev_props_event->adv_len = adv_info.len;
                        if (dev_props_event->adv_len > 0)
@@ -681,12 +700,12 @@ void cb_device_properties(bt_status_t status, bt_bdaddr_t *bd_addr,
                                        adv_info.adv_data, adv_info.len);
 
                        for (i = 0; i < dev_props_event->adv_len; i++)
-                               BT_INFO("Adv Data[%d] = [0x%x]",
+                               BT_DBG("Adv Data[%d] = [0x%x]",
                                        i, dev_props_event->adv_data[i]);
                        memcpy(&dev_props_event->device_info,
                                dev_info, sizeof(remote_device_t));
                } else {
-                       BT_INFO("BREDR type Device");
+                       BT_DBG("BREDR type Device");
                        memcpy(&dev_props_event->device_info,
                                dev_info, sizeof(remote_device_t));
                }
@@ -743,16 +762,13 @@ void cb_device_acl_state_changed(bt_status_t status, bt_bdaddr_t *bd_addr,
                bt_acl_state_t state)
 {
        event_dev_conn_status_t * conn_status = g_new0(event_dev_conn_status_t, 1);
-       //bt_address_t * address = g_new0(bt_address_t, 1);
        oal_event_t event;
        gsize size = 0;
 
-       BT_DBG("ACL State:%d, state: %d", status, state);
-
        memcpy(conn_status->address.addr, bd_addr->address, 6);
 
 #ifdef TIZEN_BT_HAL
-       conn_status->status = convert_to_oal_status(status);
+       conn_status->status = status;
 #else
        if (BT_STATUS_SUCCESS != status) {
                /* At present only timeout will cause non-success status, later we can add more */
@@ -764,7 +780,7 @@ void cb_device_acl_state_changed(bt_status_t status, bt_bdaddr_t *bd_addr,
        memcpy(conn_status->address.addr, bd_addr->address, 6);
 #endif
 
-       BT_INFO("ACL STATE :%d, conn_status->status :%d, BT_ACL_STATE: %d", status, conn_status->status, state);
+       BT_INFO("[ACL] Status: %d, State: %d", conn_status->status, state);
 
        switch (state) {
        case BT_ACL_STATE_CONNECTED:
@@ -789,13 +805,12 @@ void cb_device_le_conn_state_changed(bt_status_t status, bt_bdaddr_t *bd_addr,
                bt_le_conn_state_t state)
 {
        event_dev_conn_status_t * conn_status = g_new0(event_dev_conn_status_t, 1);
-       //bt_address_t * address = g_new0(bt_address_t, 1);
        oal_event_t event;
        gsize size = 0;
 
-       BT_DBG("LE conn status:%d, state: %d", status, state);
        memcpy(conn_status->address.addr, bd_addr->address, 6);
-       conn_status->status = convert_to_oal_status(status);
+       conn_status->status = status;
+       BT_INFO("[LE ACL] Status: %d, State: %d", conn_status->status, state);
 
        switch (state) {
        case BT_LE_CONN_STATE_CONNECTED: