static int __bt_get_owner_info(GVariant *msg, char **name,
char **previous, char **current)
{
- g_variant_get(msg, "(sss)", name, previous, current);
+ g_variant_get(msg, "(&s&s&s)", name, previous, current);
return BLUETOOTH_ERROR_NONE;
}
char secure_addr[BT_ADDRESS_STRING_SIZE] = { 0 };
_bt_convert_addr_string_to_secure_string(secure_addr, address);
- BT_INFO("### Paired: %s", secure_addr);
+ BT_INFO(" ### Paired: %s", secure_addr);
__bt_update_remote_cache_devinfo(address, TRUE);
- if (_bt_is_device_creating() == TRUE) {
- BT_DBG("Try to Pair by me");
- _bt_free_device_info(remote_dev_info);
- g_free(address);
- g_free(property);
- g_variant_unref(val);
- return;
- }
GVariant *uuids = NULL;
GVariantBuilder *builder = NULL;
int i = 0;
_bt_convert_uuid_to_string(profile_uuid),
_bt_convert_profile_state_to_string(state), secure_address);
- if ((strcmp(profile_uuid, A2DP_SINK_UUID) == 0) &&
- (state == BT_PROFILE_STATE_CONNECTED)) {
+ if (strcmp(profile_uuid, A2DP_SINK_UUID) == 0) {
+ if (state == BT_PROFILE_STATE_CONNECTED) {
- int event = BLUETOOTH_EVENT_AV_CONNECTED;
- char connected_address[BT_ADDRESS_STRING_SIZE + 1];
- bluetooth_device_address_t device_address;
- gboolean connected;
- bt_headset_wait_t *wait_list;
- guint restricted = 0x0;
+ int event = BLUETOOTH_EVENT_AV_CONNECTED;
+ char connected_address[BT_ADDRESS_STRING_SIZE + 1];
+ bluetooth_device_address_t device_address;
+ gboolean connected;
+ bt_headset_wait_t *wait_list;
+ guint restricted = 0x0;
- __bt_set_device_values(TRUE,
- VCONFKEY_BT_DEVICE_A2DP_HEADSET_CONNECTED);
+ __bt_set_device_values(TRUE,
+ VCONFKEY_BT_DEVICE_A2DP_HEADSET_CONNECTED);
- __bt_connection_manager_set_state(address, event);
+ __bt_connection_manager_set_state(address, event);
- _bt_get_restrict_profile(&bd_addr, RESTRICTED_PROFILE_HFP_HS, &restricted);
+ _bt_get_restrict_profile(&bd_addr, RESTRICTED_PROFILE_HFP_HS, &restricted);
- if (_bt_headset_get_local_connection() == FALSE) {
- if (restricted == 0x0) /* not restricted*/
- _bt_start_timer_for_connection(address, BT_AUDIO_HSP);
- } else {
- /* Connection Started from local device therefore no need to
- * intiate connection for pending profile */
- _bt_headset_set_local_connection(FALSE);
- }
- param = g_variant_new("(is)", result, address);
- _bt_send_event(BT_HEADSET_EVENT, event,
- param);
- connected = _bt_is_headset_type_connected(BT_AUDIO_A2DP,
- connected_address);
- if (connected) {
- if (g_strcmp0(connected_address, address) != 0) {
- _bt_convert_addr_string_to_type(
- device_address.addr,
- connected_address);
- _bt_audio_disconnect(0, BT_AUDIO_A2DP,
- &device_address, NULL);
+ if (_bt_headset_get_local_connection() == FALSE) {
+ if (restricted == 0x0) /* not restricted*/
+ _bt_start_timer_for_connection(address, BT_AUDIO_HSP);
+ } else {
+ /* Connection Started from local device therefore no need to
+ * intiate connection for pending profile */
+ _bt_headset_set_local_connection(FALSE);
+ }
+ param = g_variant_new("(is)", result, address);
+ _bt_send_event(BT_HEADSET_EVENT, event,
+ param);
+ connected = _bt_is_headset_type_connected(BT_AUDIO_A2DP,
+ connected_address);
+ if (connected) {
+ if (g_strcmp0(connected_address, address) != 0) {
+ _bt_convert_addr_string_to_type(
+ device_address.addr,
+ connected_address);
+ _bt_audio_disconnect(0, BT_AUDIO_A2DP,
+ &device_address, NULL);
+ }
}
- }
- _bt_add_headset_to_list(BT_AUDIO_A2DP,
- BT_STATE_CONNECTED, address);
+ _bt_add_headset_to_list(BT_AUDIO_A2DP,
+ BT_STATE_CONNECTED, address);
- wait_list = _bt_get_audio_wait_data();
- if (wait_list != NULL &&
- (g_strcmp0(wait_list->address, address) == 0))
- _bt_rel_wait_data();
+ wait_list = _bt_get_audio_wait_data();
+ if (wait_list != NULL &&
+ (g_strcmp0(wait_list->address, address) == 0))
+ _bt_rel_wait_data();
- } else if ((strcmp(profile_uuid, A2DP_SINK_UUID) == 0) &&
- (state == BT_PROFILE_STATE_DISCONNECTED)) {
+ } else if (state == BT_PROFILE_STATE_DISCONNECTED) {
- int event = BLUETOOTH_EVENT_AV_DISCONNECTED;
+ int event = BLUETOOTH_EVENT_AV_DISCONNECTED;
- if (!_bt_is_service_connected(address, BT_AUDIO_A2DP)) {
- g_free(address);
- g_free(profile_uuid);
- return;
- }
+ if (!_bt_is_service_connected(address, BT_AUDIO_A2DP)) {
+ g_free(address);
+ g_free(profile_uuid);
+ return;
+ }
- __bt_set_device_values(FALSE,
- VCONFKEY_BT_DEVICE_A2DP_HEADSET_CONNECTED);
+ __bt_set_device_values(FALSE,
+ VCONFKEY_BT_DEVICE_A2DP_HEADSET_CONNECTED);
- __bt_connection_manager_set_state(address, event);
- param = g_variant_new("(is)", result, address);
- _bt_send_event(BT_HEADSET_EVENT, event,
- param);
- /* Remove data from the connected list */
- _bt_remove_headset_from_list(BT_AUDIO_A2DP, address);
- wait_list = _bt_get_audio_wait_data();
+ __bt_connection_manager_set_state(address, event);
+ param = g_variant_new("(is)", result, address);
+ _bt_send_event(BT_HEADSET_EVENT, event,
+ param);
+ /* Remove data from the connected list */
+ _bt_remove_headset_from_list(BT_AUDIO_A2DP, address);
+ wait_list = _bt_get_audio_wait_data();
- if (wait_list == NULL) {
- g_free(address);
- g_free(profile_uuid);
- return;
- }
+ if (wait_list == NULL) {
+ g_free(address);
+ g_free(profile_uuid);
+ return;
+ }
- if (((wait_list->type == BT_AUDIO_ALL) &&
- (wait_list->ag_flag == TRUE)) ||
- (wait_list->type == BT_AUDIO_A2DP) ||
- (wait_list->disconnection_type == BT_AUDIO_A2DP)) {
- bluetooth_device_address_t device_address;
- _bt_convert_addr_string_to_type(
- device_address.addr,
- wait_list->address);
+ if (((wait_list->type == BT_AUDIO_ALL) &&
+ (wait_list->ag_flag == TRUE)) ||
+ (wait_list->type == BT_AUDIO_A2DP) ||
+ (wait_list->disconnection_type == BT_AUDIO_A2DP)) {
+ bluetooth_device_address_t device_address;
+ _bt_convert_addr_string_to_type(
+ device_address.addr,
+ wait_list->address);
- _bt_audio_connect(wait_list->req_id,
- wait_list->type,
- &device_address,
- NULL);
+ _bt_audio_connect(wait_list->req_id,
+ wait_list->type,
+ &device_address,
+ NULL);
+ }
}
} else if (strcmp(profile_uuid, AVRCP_TARGET_UUID) == 0) {
if (connected) {
/* Match connected device address */
if (g_strcmp0(connected_address, address) != 0) {
- /* Convert BD adress from string type */
+ /* Convert BD address from string type */
_bt_convert_addr_string_to_type(
device_address.addr,
connected_address);
if (strcasecmp(member, "ObexAuthorize") == 0) {
__bt_get_agent_signal_info(msg, &address, &name, &uuid);
- param = g_variant_new("(iss)", result, address, name);
+ param = g_variant_new("(i&s&s)", result, address, name);
_bt_send_event(BT_OPP_SERVER_EVENT,
BLUETOOTH_EVENT_OBEX_SERVER_CONNECTION_AUTHORIZE,
param);
- g_free(address);
- g_free(name);
} else if (strcasecmp(member, "RfcommAuthorize") == 0) {
bt_rfcomm_server_info_t *server_info;
server_info = _bt_rfcomm_get_server_info_using_uuid(uuid);
ret_if(server_info == NULL);
ret_if(server_info->server_type != BT_CUSTOM_SERVER);
- param = g_variant_new("(isssn)", result, address, uuid, name,
+ param = g_variant_new("(i&s&s&sn)", result, address, uuid, name,
server_info->control_fd);
_bt_send_event(BT_RFCOMM_SERVER_EVENT,
BLUETOOTH_EVENT_RFCOMM_AUTHORIZE,
param);
- g_free(address);
- g_free(uuid);
- g_free(name);
}
}
char *previous = NULL;
char *current = NULL;
+ if (g_strcmp0(g_variant_get_type_string(parameters), "(sss)") != 0) {
+ BT_ERR("Invalid variant format");
+ return;
+ }
+
if (__bt_get_owner_info(parameters, &name, &previous, ¤t)) {
BT_ERR("Fail to get the owner info");
return;
}
- if (*current != '\0') {
- g_free(current);
- if (name)
- g_free(name);
- if (previous)
- g_free(previous);
+ if (*current != '\0')
+ return;
+
+ if (name == NULL)
return;
- }
if (strcasecmp(name, BT_BLUEZ_NAME) == 0) {
BT_INFO_C("### Bluetoothd is terminated");
/* Stop LE Scan */
_bt_stop_le_scan(name);
-
- g_free(name);
- g_free(previous);
- g_free(current);
} else if (g_strcmp0(interface_name, BT_PROPERTIES_INTERFACE) == 0) {
const char *path = object_path;
} else if (g_strcmp0(interface_name, BT_NETWORK_SERVER_INTERFACE) == 0) {
_bt_handle_network_server_event(parameters, signal_name);
} else if (g_strcmp0(interface_name, BT_HEADSET_INTERFACE) == 0) {
- _bt_handle_headset_event(parameters, object_path);
+ if (g_strcmp0(signal_name, "PropertyChanged") == 0) {
+ _bt_handle_headset_event(parameters, object_path);
+ }
} else if (g_strcmp0(interface_name, BT_SINK_INTERFACE) == 0) {
_bt_handle_sink_event(parameters, object_path);
} else if (g_strcmp0(interface_name, BT_AGENT_INTERFACE) == 0) {
if (subs_headset_id == -1) {
subs_headset_id = g_dbus_connection_signal_subscribe(conn,
NULL, BT_HEADSET_INTERFACE,
- NULL, NULL, NULL, 0,
+ "PropertyChanged", NULL, NULL, 0,
__bt_manager_event_filter,
NULL, NULL);
}
projects / platform / core / connectivity / bluetooth-frwk.git / blobdiff