Bläddra i källkod

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: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Marcel Holtmann 11 år sedan
förälder
incheckning
8afef092a1
2 ändrade filer med 40 tillägg och 0 borttagningar
  1. 11 0
      include/net/bluetooth/mgmt.h
  2. 29 0
      net/bluetooth/mgmt.c

+ 11 - 0
include/net/bluetooth/mgmt.h

@@ -603,3 +603,14 @@ struct mgmt_ev_new_csrk {
 	__u8 store_hint;
 	__u8 store_hint;
 	struct mgmt_csrk_info key;
 	struct mgmt_csrk_info key;
 } __packed;
 } __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;

+ 29 - 0
net/bluetooth/mgmt.c

@@ -114,6 +114,8 @@ static const u16 mgmt_events[] = {
 	MGMT_EV_PASSKEY_NOTIFY,
 	MGMT_EV_PASSKEY_NOTIFY,
 	MGMT_EV_NEW_IRK,
 	MGMT_EV_NEW_IRK,
 	MGMT_EV_NEW_CSRK,
 	MGMT_EV_NEW_CSRK,
+	MGMT_EV_DEVICE_ADDED,
+	MGMT_EV_DEVICE_REMOVED,
 };
 };
 
 
 #define CACHE_TIMEOUT	msecs_to_jiffies(2 * 1000)
 #define CACHE_TIMEOUT	msecs_to_jiffies(2 * 1000)
@@ -4968,6 +4970,18 @@ unlock:
 	return err;
 	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,
 static int add_device(struct sock *sk, struct hci_dev *hdev,
 		      void *data, u16 len)
 		      void *data, u16 len)
 {
 {
@@ -5009,6 +5023,8 @@ static int add_device(struct sock *sk, struct hci_dev *hdev,
 		goto unlock;
 		goto unlock;
 	}
 	}
 
 
+	device_added(sk, hdev, &cp->addr.bdaddr, cp->addr.type, cp->action);
+
 	err = cmd_complete(sk, hdev->id, MGMT_OP_ADD_DEVICE,
 	err = cmd_complete(sk, hdev->id, MGMT_OP_ADD_DEVICE,
 			   MGMT_STATUS_SUCCESS, &cp->addr, sizeof(cp->addr));
 			   MGMT_STATUS_SUCCESS, &cp->addr, sizeof(cp->addr));
 
 
@@ -5017,6 +5033,17 @@ unlock:
 	return err;
 	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,
 static int remove_device(struct sock *sk, struct hci_dev *hdev,
 			 void *data, u16 len)
 			 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;
 			addr_type = ADDR_LE_DEV_RANDOM;
 
 
 		hci_conn_params_del(hdev, &cp->addr.bdaddr, addr_type);
 		hci_conn_params_del(hdev, &cp->addr.bdaddr, addr_type);
+
+		device_removed(sk, hdev, &cp->addr.bdaddr, cp->addr.type);
 	} else {
 	} else {
 		if (cp->addr.type) {
 		if (cp->addr.type) {
 			err = cmd_complete(sk, hdev->id, MGMT_OP_REMOVE_DEVICE,
 			err = cmd_complete(sk, hdev->id, MGMT_OP_REMOVE_DEVICE,