#include "bt-service-opp-client.h"
-#ifdef TIZEN_FEATURE_BT_DPM
+#ifdef TIZEN_DPM_ENABLE
#include "bt-service-dpm.h"
#endif
static GList *p_cache_list = NULL;
static guint event_id;
-static guint le_scan_event_id = 0;
static guint session_reinit_timer;
guint nap_connected_device_count = 0;
static guint hid_connected_device_count = 0;
}
g_free(uuid_value);
}
- } else if (strcasecmp(key, "ManufacturerDataLen") == 0) {
+ } else if (strcasecmp(key, "LegacyManufacturerDataLen") == 0) {
g_variant_get(val, "q", &dev_info->manufacturer_data_len);
if (dev_info->manufacturer_data_len > BLUETOOTH_MANUFACTURER_DATA_LENGTH_MAX) {
BT_ERR("manufacturer_data_len is too long(len = %d)", dev_info->manufacturer_data_len);
if (dev_info->manufacturer_data_len == 0)
dev_info->manufacturer_data = g_strdup("");
- } else if (strcasecmp(key, "ManufacturerData") == 0) {
+ } else if (strcasecmp(key, "LegacyManufacturerData") == 0) {
int i = 0;
int len = 0;
GVariantIter *value_iter;
static gboolean __bt_le_discovery_finished_cb(gpointer user_data)
{
int result = BLUETOOTH_ERROR_NONE;
- le_scan_event_id = 0;
+ event_id = 0;
GVariant *param = NULL;
if (_bt_get_discovering_property(DISCOVERY_ROLE_LE) == FALSE) {
if (_bt_get_cancel_by_user() == TRUE)
gboolean __bt_handle_is_flight_mode_enabled(void)
{
+#ifdef TIZEN_FEATURE_FLIGHTMODE_ENABLED
int is_flight_mode = 0;
int ret = -1;
- if (TIZEN_FEATURE_FLIGHTMODE_ENABLED) {
- ret = vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &is_flight_mode);
- if (ret != 0)
- BT_ERR("vconf_get_bool failed");
+ ret = vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &is_flight_mode);
+ if (ret != 0)
+ BT_ERR("vconf_get_bool failed");
- return (is_flight_mode == 0) ? FALSE : TRUE;
- } else {
- return FALSE;
- }
+ return (is_flight_mode == 0) ? FALSE : TRUE;
+#else
+ return FALSE;
+#endif
}
void _bt_handle_adapter_event(GVariant *msg, const char *member)
/* Bonding from remote device */
address = g_malloc0(BT_ADDRESS_STRING_SIZE);
+ if (address == NULL)
+ return;
g_variant_get(msg, "(&o)", &object_path);
param);
g_free(address);
} else if (strcasecmp(member, BT_HARDWARE_ERROR) == 0) {
- BT_ERR_C("Hardware error received from BLUEZ");
+ BT_ERR_C("### Hardware error received from BLUEZ");
/* Don't add the recovery logic into platform */
#if 0
_bt_recover_adapter();
#endif
} else if (strcasecmp(member, BT_TX_TIMEOUT_ERROR) == 0) {
- BT_ERR_C("Tx timeout error received from BLUEZ");
+ BT_ERR_C("### Tx timeout error received from BLUEZ");
/* Don't add the recovery logic into platform */
#if 0
_bt_recover_adapter();
BLUETOOTH_EVENT_LE_DISCOVERY_STARTED,
param);
} else {
- ret_if(le_scan_event_id > 0);
+ ret_if(event_id > 0);
adapter_proxy = _bt_get_adapter_proxy();
ret_if(adapter_proxy == NULL);
if (ret)
g_variant_unref(ret);
- le_scan_event_id = g_timeout_add(BT_DISCOVERY_FINISHED_DELAY,
+ event_id = g_timeout_add(BT_DISCOVERY_FINISHED_DELAY,
(GSourceFunc)__bt_le_discovery_finished_cb, NULL);
}
} else if (strcasecmp(property, "Name") == 0) {
g_variant_get(val, "b", &powered);
BT_DBG("Powered = %d", powered);
if (powered == FALSE) {
- if (TIZEN_FEATURE_BT_USB_DONGLE) {
- _bt_handle_adapter_removed();
- } else {
- if (vconf_get_int(VCONFKEY_BT_STATUS, &bt_state) == 0 &&
- bt_state != VCONFKEY_BT_STATUS_OFF) {
- if (__bt_handle_is_flight_mode_enabled() == FALSE)
- _bt_disable_adapter();
- else
- _bt_handle_adapter_removed();
- }
+#ifdef USB_BLUETOOTH
+ _bt_handle_adapter_removed();
+#else
+ if (vconf_get_int(VCONFKEY_BT_STATUS, &bt_state) == 0 &&
+ bt_state != VCONFKEY_BT_STATUS_OFF) {
+ if (__bt_handle_is_flight_mode_enabled() == FALSE)
+ _bt_disable_adapter();
+ else
+ _bt_handle_adapter_removed();
}
+#endif
if (vconf_get_int(VCONFKEY_BT_LE_STATUS, &bt_state) == 0 &&
bt_state != VCONFKEY_BT_LE_STATUS_OFF) {
_bt_set_le_disabled(BLUETOOTH_ERROR_NONE);
}
} else {
- if (TIZEN_FEATURE_BT_USB_DONGLE)
- _bt_handle_adapter_added();
+#ifdef USB_BLUETOOTH
+ _bt_handle_adapter_added();
+#endif
}
} else if (strcasecmp(property, "Connectable") == 0) {
gboolean connectable = FALSE;
char *value = NULL;
GVariantIter *iter = NULL;
g_variant_get(val, "as", &iter);
-
- ret_if(iter == NULL);
-
while (g_variant_iter_loop(iter, "s", &name)) {
BT_DBG("name = %s", name);
g_variant_iter_loop(iter, "s", &value);
if (FALSE == _bt_update_le_feature_support(name, value))
BT_INFO("Fail to update LE feature info");
}
-
- g_variant_iter_free(iter);
+ if (iter)
+ g_variant_iter_free(iter);
} else if (strcasecmp(property, "IpspInitStateChanged") == 0) {
gboolean ipsp_initialized = FALSE;
GVariant *param = NULL;
bt_remote_dev_info_t *remote_dev_info;
g_variant_iter_init(&value_iter, msg);
-#ifdef TIZEN_FEATURE_BT_DPM
- int desktop_state = DPM_BT_ERROR;
-#endif
while ((g_variant_iter_loop(&value_iter, "{sv}", &property, &val))) {
BT_DBG("Property %s", property);
if (strcasecmp(property, "Connected") == 0) {
if (remote_dev_info->addr_type == 0) {
BT_DBG("Name %s", remote_dev_info->name);
-#ifdef TIZEN_FEATURE_BT_DPM
- _bt_dpm_get_bluetooth_desktop_connectivity_state(&desktop_state);
- if (desktop_state == DPM_RESTRICTED) {
+#ifdef TIZEN_DPM_ENABLE
+ if (_bt_dpm_get_bluetooth_desktop_connectivity_state() ==
+ DPM_RESTRICTED) {
bluetooth_device_class_t device_class;
_bt_divide_device_class(&device_class, remote_dev_info->class);
BT_DBG("BT_PROXIMITY_REPORTER_INTERFACE");
_bt_handle_pxp_property_changed_event(val,
object_path, BT_PXP_REPORTER_ROLE);
+ } else if (strcasecmp(interface_name, BT_PROXIMITY_MONITOR_INTERFACE) == 0) {
+ BT_DBG("BT_PROXIMITY_MONITOR_INTERFACE");
+ _bt_handle_pxp_property_changed_event(val,
+ object_path, BT_PXP_MONITOR_ROLE);
}
g_variant_unref(val);
}
g_variant_iter_init(&value_iter, msg);
char_handle = g_strdup(path);
while ((g_variant_iter_loop(&value_iter, "{sv}", &property, &val))) {
- BT_INFO("Property %s", property);
+ BT_DBG("Property %s", property);
ret_if(property == NULL);
if (strcasecmp(property, "Notifying") == 0) {
gboolean property_flag = FALSE;
g_variant_get(val, "b", &property_flag);
- if (property_flag == TRUE)
- BT_DBG("notifying is enabled");
- else
- BT_DBG("notifying is disabled");
+ BT_INFO("Notifying is %s", property_flag ? "enabled" : "disabled");
} else if (strcasecmp(property, "ChangedValue") == 0) {
int len = 0;
GByteArray *gp_byte_array = NULL;
!addr_type ? dev_name : secure_address);
g_free(dev_name);
+ if (addr_type)
+ _bt_add_le_connected_dev_info(address);
+
_bt_logging_connection(TRUE, addr_type);
param = g_variant_new("(isy)", result, address, addr_type);
/*Send event to application*/
0x02 BDADDR_LE_RANDOM */
_bt_convert_addr_string_to_secure_string(secure_address, address);
BT_INFO("Address : %s Type : %d", secure_address, addr_type);
- BT_ERR_C("### Disconnected [%s] [%d : %s] [%s]", !addr_type ? "BREDR" : "LE",
- disc_reason, _bt_convert_disc_reason_to_string(disc_reason),
- !addr_type ? dev_name : secure_address);
+ BT_ERR_C("### Disconnected [%s] [%s] [%d : %s]", !addr_type ? "BREDR" : "LE",
+ !addr_type ? dev_name : secure_address,
+ disc_reason, _bt_convert_disc_reason_to_string(disc_reason));
g_free(dev_name);
_bt_headset_set_local_connection(FALSE);
_bt_logging_connection(FALSE, addr_type);
- if (!addr_type) {
+ if (addr_type)
+ _bt_remove_le_connected_dev_info(address);
+ else {
#ifdef TIZEN_BT_A2DP_SINK_AUTO_CONNECT
{
int bt_device_state = VCONFKEY_BT_DEVICE_NONE;
_bt_convert_addr_string_to_type(bd_addr.addr, address);
_bt_convert_addr_string_to_secure_string(secure_address, address);
- BT_DBG("Address: %s", secure_address);
- BT_DBG("Profile UUID: %s", profile_uuid);
- BT_DBG("State: %d", state);
+ BT_INFO_C("[%s] state: %s, addr: %s",
+ _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)) {
le_dev_info = g_malloc0(sizeof(bt_remote_le_dev_info_t));
- g_variant_get(msg, "(syyii@ay)", &le_dev_info->address,
+ g_variant_get(msg, "(&syyii@ay)", &le_dev_info->address,
&le_dev_info->addr_type,
&le_dev_info->adv_type,
&le_dev_info->rssi,
&le_dev_info->adv_data_len,
&value);
-
- ret_if(value == NULL);
+ if (value == NULL) {
+ _bt_free_le_device_info(le_dev_info);
+ return;
+ }
_bt_convert_device_path_to_address(path, le_dev_info->address);
event,
param);
g_free(address);
+ } else if (strcasecmp(member, "iBeaconReport") == 0) {
+ bt_remote_ibeacon_dev_info_t *ibeacon_dev_info = NULL;
+
+ ret_if(_bt_is_le_scanning() == FALSE);
+
+ ibeacon_dev_info = g_malloc0(sizeof(bt_remote_ibeacon_dev_info_t));
+
+ g_variant_get(msg, "(syuusuuy)", &ibeacon_dev_info->address,
+ &ibeacon_dev_info->addr_type,
+ &ibeacon_dev_info->company_id,
+ &ibeacon_dev_info->ibeacon_type,
+ &ibeacon_dev_info->uuid,
+ &ibeacon_dev_info->major_id,
+ &ibeacon_dev_info->minor_id,
+ &ibeacon_dev_info->measured_power);
+ _bt_send_ibeacon_scan_result_event(ibeacon_dev_info);
+ g_free(ibeacon_dev_info);
}
}
g_variant_get(parameters, "(&o@a{sa{sv}})", &obj_path, &value);
if (strcasecmp(obj_path, BT_BLUEZ_HCI_PATH) == 0) {
- if (TIZEN_FEATURE_BT_USB_DONGLE) {
- BT_DBG("Enable Adapter");
- _bt_enable_adapter();
- } else {
- _bt_handle_adapter_added();
- }
+#ifdef USB_BLUETOOTH
+ BT_DBG("Enable Adapter");
+ _bt_enable_adapter();
+#else
+ _bt_handle_adapter_added();
+#endif
} else {
bt_event = __bt_parse_event(value);
if (bt_event == BT_DEVICE_EVENT) {
bt_cache_info_t *cache_info;
bt_remote_dev_info_t *dev_info;
-#ifdef TIZEN_FEATURE_BT_DPM
- int desktop_state = DPM_BT_ERROR;
-#endif
- ret_if(_bt_is_discovering() == FALSE &&
- _bt_is_le_scanning() == FALSE);
+
+ if (_bt_is_discovering() == FALSE &&
+ _bt_is_le_scanning() == FALSE) {
+ g_variant_unref(value);
+ return;
+ }
cache_info = g_malloc0(sizeof(bt_cache_info_t));
*/
dev_info->name = g_strdup(dev_info->address);
-#ifdef TIZEN_FEATURE_BT_DPM
- _bt_dpm_get_bluetooth_desktop_connectivity_state(&desktop_state);
- if (desktop_state == DPM_RESTRICTED) {
+#ifdef TIZEN_DPM_ENABLE
+ if (_bt_dpm_get_bluetooth_desktop_connectivity_state() ==
+ DPM_RESTRICTED) {
bluetooth_device_class_t device_class;
_bt_divide_device_class(&device_class, dev_info->class);
BT_DBG("[%s]device_class.major_class : %d", dev_info->name, device_class.major_class);
}
g_variant_unref(value);
} else if (strcasecmp(signal_name, "InterfacesRemoved") == 0) {
- if (TIZEN_FEATURE_BT_USB_DONGLE) {
- BT_DBG("InterfacesRemoved");
- _bt_handle_adapter_removed();
- }
+#ifdef USB_BLUETOOTH
+ BT_DBG("InterfacesRemoved");
+ _bt_handle_adapter_removed();
+#endif
if (g_strcmp0(interface_name, BT_MEDIATRANSPORT_INTERFACE) == 0)
bt_event = BT_MEDIA_TRANSFER_EVENT;
else if (g_strcmp0(interface_name, BT_DEVICE_INTERFACE) == 0)
_bt_rfcomm_server_check_termination(name);
}
+ /* Reset connection interval */
+ _bt_remove_all_le_conn_param_info(name);
+
/* Stop advertising started by terminated process */
_bt_stop_advertising_by_terminated_process(name);
+
/* Stop LE Scan */
_bt_stop_le_scan(name);
- /* Stop the Proximity reporter service */
- _bt_proximity_reporter_stop_by_terminated_process(name);
-
g_free(name);
g_free(previous);
g_free(current);
static int __bt_init_obexd_receiver(void)
{
BT_DBG("+");
- if (!TIZEN_PROFILE_TV) { /* TODO: obexd doesn't work in TV profile. It should be resolved later. */
- GError *error = NULL;
+#ifndef TIZEN_TV /* TODO: obexd doesn't work in TV profile. It should be resolved later. */
+ GError *error = NULL;
- if (obexd_conn == NULL) {
- obexd_conn = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error);
- if (error != NULL) {
- BT_ERR("ERROR: Can't get on session bus [%s]", error->message);
- g_clear_error(&error);
- }
- retv_if(obexd_conn == NULL, BLUETOOTH_ERROR_INTERNAL);
+ if (obexd_conn == NULL) {
+ obexd_conn = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error);
+ if (error != NULL) {
+ BT_ERR("ERROR: Can't get on session bus [%s]", error->message);
+ g_clear_error(&error);
}
+ retv_if(obexd_conn == NULL, BLUETOOTH_ERROR_INTERNAL);
+ }
- if (_bt_register_service_event(obexd_conn,
- BT_OPP_SERVER_EVENT) != BLUETOOTH_ERROR_NONE) {
- BT_ERR("Error while registering service event");
- g_object_unref(obexd_conn);
- obexd_conn = NULL;
- return BLUETOOTH_ERROR_INTERNAL;
- }
+ if (_bt_register_service_event(obexd_conn,
+ BT_OPP_SERVER_EVENT) != BLUETOOTH_ERROR_NONE) {
+ BT_ERR("Error while registering service event");
+ g_object_unref(obexd_conn);
+ obexd_conn = NULL;
+ return BLUETOOTH_ERROR_INTERNAL;
}
+#endif
BT_DBG("-");
return BLUETOOTH_ERROR_NONE;
g_source_remove(event_id);
event_id = 0;
- if (le_scan_event_id > 0)
- g_source_remove(le_scan_event_id);
- le_scan_event_id = 0;
-
BT_DBG("-");
}
-
projects / platform / core / connectivity / bluetooth-frwk.git / blobdiff