const char *address = NULL;
const char *name = NULL;
const char *str_passkey = NULL;
+ bool incoming = false;
bluetooth_authentication_request_info_t auth_info;
memset(&auth_info, 0x00, sizeof(bluetooth_authentication_request_info_t));
- g_variant_get(parameters, "(i&s&s&s)", &result, &address, &name, &str_passkey);
+ g_variant_get(parameters, "(b&s&s&s)", &incoming, &address, &name, &str_passkey);
g_strlcpy(auth_info.device_name.name, name,
BLUETOOTH_DEVICE_NAME_LENGTH_MAX + 1);
_bt_convert_addr_string_to_type(auth_info.device_address.addr,
address);
g_strlcpy(auth_info.str_passkey, str_passkey, strlen(str_passkey)+1);
+ auth_info.incoming = incoming;
+ BT_INFO("BLUETOOTH_EVENT_KEYBOARD_PASSKEY_DISPLAY");
_bt_common_event_cb(BLUETOOTH_EVENT_KEYBOARD_PASSKEY_DISPLAY,
result, &auth_info,
event_info->cb, event_info->user_data);
} else if (strcasecmp(signal_name, BT_PIN_REQ_RECEIVED) == 0) {
const char *address = NULL;
const char *name = NULL;
+ bool incoming = false;
bluetooth_authentication_request_info_t auth_info;
memset(&auth_info, 0x00, sizeof(bluetooth_authentication_request_info_t));
- g_variant_get(parameters, "(i&s&s)", &result, &address, &name);
+ g_variant_get(parameters, "(b&s&s)", &incoming, &address, &name);
g_strlcpy(auth_info.device_name.name, name,
BLUETOOTH_DEVICE_NAME_LENGTH_MAX + 1);
_bt_convert_addr_string_to_type(auth_info.device_address.addr,
address);
+ auth_info.incoming = incoming;
+
+ BT_INFO("BLUETOOTH_EVENT_PIN_REQUEST");
_bt_common_event_cb(BLUETOOTH_EVENT_PIN_REQUEST,
result, &auth_info,
} else if (strcasecmp(signal_name, BT_PASSKEY_REQ_RECEIVED) == 0) {
const char *address = NULL;
const char *name = NULL;
+ bool incoming = false;
bluetooth_authentication_request_info_t auth_info;
memset(&auth_info, 0x00, sizeof(bluetooth_authentication_request_info_t));
- g_variant_get(parameters, "(i&s&s)", &result, &address, &name);
+ g_variant_get(parameters, "(b&s&s)", &incoming, &address, &name);
g_strlcpy(auth_info.device_name.name, name,
BLUETOOTH_DEVICE_NAME_LENGTH_MAX + 1);
_bt_convert_addr_string_to_type(auth_info.device_address.addr,
address);
+ auth_info.incoming = incoming;
+
+ BT_INFO("BLUETOOTH_EVENT_PASSKEY_REQUEST");
_bt_common_event_cb(BLUETOOTH_EVENT_PASSKEY_REQUEST,
result, &auth_info,
const char *address = NULL;
const char *name = NULL;
const char *str_passkey = NULL;
+ bool incoming = false;
bluetooth_authentication_request_info_t auth_info;
memset(&auth_info, 0x00, sizeof(bluetooth_authentication_request_info_t));
- g_variant_get(parameters, "(i&s&s&s)", &result, &address, &name, &str_passkey);
+ g_variant_get(parameters, "(b&s&s&s)", &incoming, &address, &name, &str_passkey);
g_strlcpy(auth_info.device_name.name, name,
BLUETOOTH_DEVICE_NAME_LENGTH_MAX + 1);
_bt_convert_addr_string_to_type(auth_info.device_address.addr,
address);
g_strlcpy(auth_info.str_passkey, str_passkey, strlen(str_passkey)+1);
+ auth_info.incoming = incoming;
+
+ BT_INFO("BLUETOOTH_EVENT_PASSKEY_CONFIRM_REQUEST");
_bt_common_event_cb(BLUETOOTH_EVENT_PASSKEY_CONFIRM_REQUEST,
result, &auth_info,
GVariant *param;
char address[BT_ADDRESS_STRING_SIZE];
char pin_code[BLUETOOTH_PIN_CODE_MAX_LENGTH + 1];
+ bool incoming = false;
BT_DBG("+");
_bt_convert_addr_type_to_string(address, pin_req_event->address.addr);
device_accept_pin_request(&pin_req_event->address, str_passkey);
BT_DBG("Send BLUETOOTH_EVENT_KEYBOARD_PASSKEY_DISPLAY");
- param = g_variant_new("(isss)", BLUETOOTH_ERROR_NONE, address, pin_req_event->name, str_passkey);
+
+ if(trigger_bond_info == NULL)
+ incoming = true;
+
+ param = g_variant_new("(bsss)", incoming, address, pin_req_event->name, str_passkey);
_bt_send_event(BT_ADAPTER_EVENT,
BLUETOOTH_EVENT_KEYBOARD_PASSKEY_DISPLAY, param);
BT_DBG("Key board pairing in process");
trigger_pairing_info->is_ssp = FALSE;
BT_DBG("Send BLUETOOTH_EVENT_PIN_REQUEST");
- param = g_variant_new("(iss)", BLUETOOTH_ERROR_NONE, address, pin_req_event->name);
+
+ if(trigger_bond_info == NULL)
+ incoming = true;
+
+ param = g_variant_new("(bss)", incoming, address, pin_req_event->name);
_bt_send_event(BT_ADAPTER_EVENT,
BLUETOOTH_EVENT_PIN_REQUEST, param);
}
gchar address[BT_ADDRESS_STR_LEN];
char *p_addr;
gchar *name;
- int result = BLUETOOTH_ERROR_NONE;
+ bool incoming = false;
+
BT_DBG("+");
_bt_convert_addr_type_to_string(address, dev_info->address.addr);
trigger_pairing_info->addr = g_strdup(address);
trigger_pairing_info->is_ssp = TRUE;
- param = g_variant_new("(iss)", result, p_addr, name);
+ if(trigger_bond_info == NULL)
+ incoming = true;
+
+ param = g_variant_new("(bss)", incoming, p_addr, name);
_bt_send_event(BT_ADAPTER_EVENT,
BLUETOOTH_EVENT_PASSKEY_REQUEST, param);
BT_DBG("-");
char *p_addr;
gchar *name;
char str_passkey[7];
- int result = BLUETOOTH_ERROR_NONE;
+ bool incoming = false; /*Stores if bonding request is incoming(true) or outgoing(false) */
BT_DBG("+");
_bt_convert_addr_type_to_string(address, dev_info->device_info.address.addr);
BT_DBG("Send BLUETOOTH_EVENT_PASSKEY_CONFIRMATION");
snprintf(str_passkey, sizeof(str_passkey), "%.6d", dev_info->pass_key);
- param = g_variant_new("(isss)", result, p_addr, name, str_passkey);
+ /*Storing if bond is incoming or outgoing*/
+ if(trigger_bond_info == NULL)
+ incoming = true;
+
+ param = g_variant_new("(bsss)", incoming, p_addr, name, str_passkey);
_bt_send_event(BT_ADAPTER_EVENT,
BLUETOOTH_EVENT_PASSKEY_CONFIRM_REQUEST, param);
BT_DBG("-");
char *p_addr;
gchar *name;
char str_passkey[7];
- int result = BLUETOOTH_ERROR_NONE;
+ bool incoming = false;
BT_DBG("+");
_bt_convert_addr_type_to_string(address, dev_info->device_info.address.addr);
BT_DBG("Send BLUETOOTH_EVENT_KEYBOARD_PASSKEY_DISPLAY");
snprintf(str_passkey, sizeof(str_passkey), "%06d", dev_info->pass_key);
- param = g_variant_new("(isss)", result, p_addr, name, str_passkey);
+ if(trigger_bond_info == NULL)
+ incoming = true;
+
+ param = g_variant_new("(bsss)", incoming, p_addr, name, str_passkey);
+
if (passkey_watcher) {
BT_INFO("Send passkey to %s", passkey_watcher);
_bt_send_event_to_dest(passkey_watcher, BT_ADAPTER_EVENT,