Commit e17acd40 authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo F. Padovan
Browse files

Bluetooth: Add mgmt_device_found event 



This patch adds a device_found event to the Management interface. For
now the event only maps to BR/EDR inquiry result HCI events, but in the
future the plan is to also use it for the LE device discovery process.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 1e429f38

include/net/bluetooth/hci_core.h

+2 −0
Original line number Diff line number Diff line
@@ -787,6 +787,8 @@ int mgmt_auth_failed(u16 index, bdaddr_t *bdaddr, u8 status); 
int mgmt_set_local_name_complete(u16 index, u8 *name, u8 status);

int mgmt_read_local_oob_data_reply_complete(u16 index, u8 *hash, u8 *randomizer,

								u8 status);

int mgmt_device_found(u16 index, bdaddr_t *bdaddr, u8 *dev_class, s8 rssi,

								u8 *eir);



/* HCI info for socket */

#define hci_pi(sk) ((struct hci_pinfo *) sk)

include/net/bluetooth/mgmt.h

+8 −0
Original line number Diff line number Diff line
@@ -267,3 +267,11 @@ struct mgmt_ev_auth_failed { 
struct mgmt_ev_local_name_changed {

	__u8 name[MGMT_MAX_NAME_LENGTH];

} __packed;



#define MGMT_EV_DEVICE_FOUND		0x0012

struct mgmt_ev_device_found {

	bdaddr_t bdaddr;

	__u8 dev_class[3];

	__s8 rssi;

	__u8 eir[HCI_MAX_EIR_LENGTH];

} __packed;

net/bluetooth/hci_event.c

+14 −8
Original line number Diff line number Diff line
@@ -1228,7 +1228,7 @@ static inline void hci_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff * 


	hci_dev_lock(hdev);



	for (; num_rsp; num_rsp--) {

	for (; num_rsp; num_rsp--, info++) {

		bacpy(&data.bdaddr, &info->bdaddr);

		data.pscan_rep_mode	= info->pscan_rep_mode;

		data.pscan_period_mode	= info->pscan_period_mode;
@@ -1237,8 +1237,9 @@ static inline void hci_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff * 
		data.clock_offset	= info->clock_offset;

		data.rssi		= 0x00;

		data.ssp_mode		= 0x00;

		info++;

		hci_inquiry_cache_update(hdev, &data);

		mgmt_device_found(hdev->id, &info->bdaddr, info->dev_class, 0,

									NULL);

	}



	hci_dev_unlock(hdev);
@@ -2158,7 +2159,7 @@ static inline void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, struct 
		struct inquiry_info_with_rssi_and_pscan_mode *info;

		info = (void *) (skb->data + 1);



		for (; num_rsp; num_rsp--) {

		for (; num_rsp; num_rsp--, info++) {

			bacpy(&data.bdaddr, &info->bdaddr);

			data.pscan_rep_mode	= info->pscan_rep_mode;

			data.pscan_period_mode	= info->pscan_period_mode;
@@ -2167,13 +2168,15 @@ static inline void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, struct 
			data.clock_offset	= info->clock_offset;

			data.rssi		= info->rssi;

			data.ssp_mode		= 0x00;

			info++;

			hci_inquiry_cache_update(hdev, &data);

			mgmt_device_found(hdev->id, &info->bdaddr,

						info->dev_class, info->rssi,

						NULL);

		}

	} else {

		struct inquiry_info_with_rssi *info = (void *) (skb->data + 1);



		for (; num_rsp; num_rsp--) {

		for (; num_rsp; num_rsp--, info++) {

			bacpy(&data.bdaddr, &info->bdaddr);

			data.pscan_rep_mode	= info->pscan_rep_mode;

			data.pscan_period_mode	= info->pscan_period_mode;
@@ -2182,8 +2185,10 @@ static inline void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, struct 
			data.clock_offset	= info->clock_offset;

			data.rssi		= info->rssi;

			data.ssp_mode		= 0x00;

			info++;

			hci_inquiry_cache_update(hdev, &data);

			mgmt_device_found(hdev->id, &info->bdaddr,

						info->dev_class, info->rssi,

						NULL);

		}

	}
@@ -2314,7 +2319,7 @@ static inline void hci_extended_inquiry_result_evt(struct hci_dev *hdev, struct 


	hci_dev_lock(hdev);



	for (; num_rsp; num_rsp--) {

	for (; num_rsp; num_rsp--, info++) {

		bacpy(&data.bdaddr, &info->bdaddr);

		data.pscan_rep_mode	= info->pscan_rep_mode;

		data.pscan_period_mode	= info->pscan_period_mode;
@@ -2323,8 +2328,9 @@ static inline void hci_extended_inquiry_result_evt(struct hci_dev *hdev, struct 
		data.clock_offset	= info->clock_offset;

		data.rssi		= info->rssi;

		data.ssp_mode		= 0x01;

		info++;

		hci_inquiry_cache_update(hdev, &data);

		mgmt_device_found(hdev->id, &info->bdaddr, info->dev_class,

						info->rssi, info->data);

	}



	hci_dev_unlock(hdev);

net/bluetooth/mgmt.c

+17 −0
Original line number Diff line number Diff line
@@ -2046,3 +2046,20 @@ int mgmt_read_local_oob_data_reply_complete(u16 index, u8 *hash, u8 *randomizer, 


	return err;

}



int mgmt_device_found(u16 index, bdaddr_t *bdaddr, u8 *dev_class, s8 rssi,

								u8 *eir)

{

	struct mgmt_ev_device_found ev;



	memset(&ev, 0, sizeof(ev));



	bacpy(&ev.bdaddr, bdaddr);

	memcpy(ev.dev_class, dev_class, sizeof(ev.dev_class));

	ev.rssi = rssi;



	if (eir)

		memcpy(ev.eir, eir, sizeof(ev.eir));



	return mgmt_event(MGMT_EV_DEVICE_FOUND, index, &ev, sizeof(ev), NULL);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE