Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c542a06c authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

Bluetooth: Implement set_pairable managment command 



This patch implements a new set_pairable management command to control
the pairable state of local adapters. The state is represented using a
new HCI_PAIRABLE flag in the hci_dev struct.

For backwards compatibility with older user space versions the
HCI_PAIRABLE flag gets automatically set when the existence of an
adapter is reported to user space through legacy methods and the
HCI_MGMT flag is not set.

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

include/net/bluetooth/hci.h

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ enum { 
	HCI_SETUP,

	HCI_AUTO_OFF,

	HCI_MGMT,

	HCI_PAIRABLE,

};



/* HCI ioctl defines */

include/net/bluetooth/mgmt.h

+4 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ struct mgmt_mode { 


#define MGMT_OP_SET_CONNECTABLE		0x0007



#define MGMT_OP_SET_PAIRABLE		0x0008



#define MGMT_EV_CMD_COMPLETE		0x0001

struct mgmt_ev_cmd_complete {

	__le16 opcode;
@@ -103,3 +105,5 @@ struct mgmt_ev_index_removed { 
#define MGMT_EV_DISCOVERABLE		0x0007



#define MGMT_EV_CONNECTABLE		0x0008



#define MGMT_EV_PAIRABLE		0x0009

net/bluetooth/hci_core.c

+10 −0
Original line number Diff line number Diff line
@@ -799,10 +799,17 @@ int hci_get_dev_list(void __user *arg) 
	read_lock_bh(&hci_dev_list_lock);

	list_for_each(p, &hci_dev_list) {

		struct hci_dev *hdev;



		hdev = list_entry(p, struct hci_dev, list);



		hci_del_off_timer(hdev);



		if (!test_bit(HCI_MGMT, &hdev->flags))

			set_bit(HCI_PAIRABLE, &hdev->flags);



		(dr + n)->dev_id  = hdev->id;

		(dr + n)->dev_opt = hdev->flags;



		if (++n >= dev_num)

			break;

	}
@@ -832,6 +839,9 @@ int hci_get_dev_info(void __user *arg) 


	hci_del_off_timer(hdev);



	if (!test_bit(HCI_MGMT, &hdev->flags))

		set_bit(HCI_PAIRABLE, &hdev->flags);



	strcpy(di.name, hdev->name);

	di.bdaddr   = hdev->bdaddr;

	di.type     = (hdev->bus & 0x0f) | (hdev->dev_type << 4);

net/bluetooth/mgmt.c

+65 −23
Original line number Diff line number Diff line
@@ -481,6 +481,29 @@ static int set_connectable(struct sock *sk, unsigned char *data, u16 len) 
	return err;

}



static int mgmt_event(u16 event, void *data, u16 data_len, struct sock *skip_sk)

{

	struct sk_buff *skb;

	struct mgmt_hdr *hdr;



	skb = alloc_skb(sizeof(*hdr) + data_len, GFP_ATOMIC);

	if (!skb)

		return -ENOMEM;



	bt_cb(skb)->channel = HCI_CHANNEL_CONTROL;



	hdr = (void *) skb_put(skb, sizeof(*hdr));

	hdr->opcode = cpu_to_le16(event);

	hdr->len = cpu_to_le16(data_len);



	memcpy(skb_put(skb, data_len), data, data_len);



	hci_send_to_sock(NULL, skb, skip_sk);

	kfree_skb(skb);



	return 0;

}



static int send_mode_rsp(struct sock *sk, u16 opcode, u16 index, u8 val)

{

	struct mgmt_hdr *hdr;
@@ -509,6 +532,45 @@ static int send_mode_rsp(struct sock *sk, u16 opcode, u16 index, u8 val) 
	return 0;

}



static int set_pairable(struct sock *sk, unsigned char *data, u16 len)

{

	struct mgmt_mode *cp, ev;

	struct hci_dev *hdev;

	u16 dev_id;

	int err;



	cp = (void *) data;

	dev_id = get_unaligned_le16(&cp->index);



	BT_DBG("request for hci%u", dev_id);



	hdev = hci_dev_get(dev_id);

	if (!hdev)

		return cmd_status(sk, MGMT_OP_SET_PAIRABLE, ENODEV);



	hci_dev_lock_bh(hdev);



	if (cp->val)

		set_bit(HCI_PAIRABLE, &hdev->flags);

	else

		clear_bit(HCI_PAIRABLE, &hdev->flags);



	err = send_mode_rsp(sk, MGMT_OP_SET_PAIRABLE, dev_id, cp->val);

	if (err < 0)

		goto failed;



	put_unaligned_le16(dev_id, &ev.index);

	ev.val = cp->val;



	err = mgmt_event(MGMT_EV_PAIRABLE, &ev, sizeof(ev), sk);



failed:

	hci_dev_unlock_bh(hdev);

	hci_dev_put(hdev);



	return err;

}



int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen)

{

	unsigned char *buf;
@@ -558,6 +620,9 @@ int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen) 
	case MGMT_OP_SET_CONNECTABLE:

		err = set_connectable(sk, buf + sizeof(*hdr), len);

		break;

	case MGMT_OP_SET_PAIRABLE:

		err = set_pairable(sk, buf + sizeof(*hdr), len);

		break;

	default:

		BT_DBG("Unknown op %u", opcode);

		err = cmd_status(sk, opcode, 0x01);
@@ -574,29 +639,6 @@ int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen) 
	return err;

}



static int mgmt_event(u16 event, void *data, u16 data_len, struct sock *skip_sk)

{

	struct sk_buff *skb;

	struct mgmt_hdr *hdr;



	skb = alloc_skb(sizeof(*hdr) + data_len, GFP_ATOMIC);

	if (!skb)

		return -ENOMEM;



	bt_cb(skb)->channel = HCI_CHANNEL_CONTROL;



	hdr = (void *) skb_put(skb, sizeof(*hdr));

	hdr->opcode = cpu_to_le16(event);

	hdr->len = cpu_to_le16(data_len);



	memcpy(skb_put(skb, data_len), data, data_len);



	hci_send_to_sock(NULL, skb, skip_sk);

	kfree_skb(skb);



	return 0;

}



int mgmt_index_added(u16 index)

{

	struct mgmt_ev_index_added ev;