Commit 8afef092 authored by Marcel Holtmann's avatar Marcel Holtmann
Browse files

Bluetooth: Add Device Added and Device Removed management events 



When devices are added or removed, then make sure that events are send
out to all other clients so that the list of devices can be easily
tracked. This is especially important when external clients are
adding or removing devices within the auto-connection list.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 0b3c7d37

include/net/bluetooth/mgmt.h

+11 −0
Original line number Diff line number Diff line
@@ -603,3 +603,14 @@ struct mgmt_ev_new_csrk { 
	__u8 store_hint;

	struct mgmt_csrk_info key;

} __packed;



#define MGMT_EV_DEVICE_ADDED		0x001a

struct mgmt_ev_device_added {

	struct mgmt_addr_info addr;

	__u8 action;

} __packed;



#define MGMT_EV_DEVICE_REMOVED		0x001b

struct mgmt_ev_device_removed {

	struct mgmt_addr_info addr;

} __packed;

net/bluetooth/mgmt.c

+29 −0
Original line number Diff line number Diff line
@@ -114,6 +114,8 @@ static const u16 mgmt_events[] = { 
	MGMT_EV_PASSKEY_NOTIFY,

	MGMT_EV_NEW_IRK,

	MGMT_EV_NEW_CSRK,

	MGMT_EV_DEVICE_ADDED,

	MGMT_EV_DEVICE_REMOVED,

};



#define CACHE_TIMEOUT	msecs_to_jiffies(2 * 1000)
@@ -4968,6 +4970,18 @@ static int get_clock_info(struct sock *sk, struct hci_dev *hdev, void *data, 
	return err;

}



static void device_added(struct sock *sk, struct hci_dev *hdev,

			 bdaddr_t *bdaddr, u8 type, u8 action)

{

	struct mgmt_ev_device_added ev;



	bacpy(&ev.addr.bdaddr, bdaddr);

	ev.addr.type = type;

	ev.action = action;



	mgmt_event(MGMT_EV_DEVICE_ADDED, hdev, &ev, sizeof(ev), sk);

}



static int add_device(struct sock *sk, struct hci_dev *hdev,

		      void *data, u16 len)

{
@@ -5009,6 +5023,8 @@ static int add_device(struct sock *sk, struct hci_dev *hdev, 
		goto unlock;

	}



	device_added(sk, hdev, &cp->addr.bdaddr, cp->addr.type, cp->action);



	err = cmd_complete(sk, hdev->id, MGMT_OP_ADD_DEVICE,

			   MGMT_STATUS_SUCCESS, &cp->addr, sizeof(cp->addr));
@@ -5017,6 +5033,17 @@ static int add_device(struct sock *sk, struct hci_dev *hdev, 
	return err;

}



static void device_removed(struct sock *sk, struct hci_dev *hdev,

			   bdaddr_t *bdaddr, u8 type)

{

	struct mgmt_ev_device_removed ev;



	bacpy(&ev.addr.bdaddr, bdaddr);

	ev.addr.type = type;



	mgmt_event(MGMT_EV_DEVICE_REMOVED, hdev, &ev, sizeof(ev), sk);

}



static int remove_device(struct sock *sk, struct hci_dev *hdev,

			 void *data, u16 len)

{
@@ -5043,6 +5070,8 @@ static int remove_device(struct sock *sk, struct hci_dev *hdev, 
			addr_type = ADDR_LE_DEV_RANDOM;



		hci_conn_params_del(hdev, &cp->addr.bdaddr, addr_type);



		device_removed(sk, hdev, &cp->addr.bdaddr, cp->addr.type);

	} else {

		if (cp->addr.type) {

			err = cmd_complete(sk, hdev->id, MGMT_OP_REMOVE_DEVICE,