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

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

Bluetooth: mgmt: Add support for setting the local name 



This patch adds a new set_local_name management command as well as a
local_name_changed management event. With these user space can both
change the local name as well as monitor changes to it by others.

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

include/net/bluetooth/hci_core.h

+1 −0
Original line number Diff line number Diff line
@@ -767,6 +767,7 @@ int mgmt_user_confirm_reply_complete(u16 index, bdaddr_t *bdaddr, u8 status); 
int mgmt_user_confirm_neg_reply_complete(u16 index, bdaddr_t *bdaddr,

								u8 status);

int mgmt_auth_failed(u16 index, bdaddr_t *bdaddr, u8 status);

int mgmt_set_local_name_complete(u16 index, u8 *name, u8 status);



/* HCI info for socket */

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

include/net/bluetooth/mgmt.h

+10 −0
Original line number Diff line number Diff line
@@ -172,6 +172,11 @@ struct mgmt_rp_user_confirm_reply { 


#define MGMT_OP_USER_CONFIRM_NEG_REPLY	0x0016



#define MGMT_OP_SET_LOCAL_NAME		0x0017

struct mgmt_cp_set_local_name {

	__u8 name[MGMT_MAX_NAME_LENGTH];

} __packed;



#define MGMT_EV_CMD_COMPLETE		0x0001

struct mgmt_ev_cmd_complete {

	__le16 opcode;
@@ -239,3 +244,8 @@ struct mgmt_ev_auth_failed { 
	bdaddr_t bdaddr;

	__u8 status;

} __packed;



#define MGMT_EV_LOCAL_NAME_CHANGED	0x0011

struct mgmt_ev_local_name_changed {

	__u8 name[MGMT_MAX_NAME_LENGTH];

} __packed;

net/bluetooth/hci_event.c

+6 −3
Original line number Diff line number Diff line
@@ -193,13 +193,16 @@ static void hci_cc_write_local_name(struct hci_dev *hdev, struct sk_buff *skb) 


	BT_DBG("%s status 0x%x", hdev->name, status);



	if (status)

		return;



	sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_LOCAL_NAME);

	if (!sent)

		return;



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

		mgmt_set_local_name_complete(hdev->id, sent, status);



	if (status)

		return;



	memcpy(hdev->dev_name, sent, HCI_MAX_NAME_LENGTH);

}

net/bluetooth/mgmt.c

+75 −0
Original line number Diff line number Diff line
@@ -1256,6 +1256,45 @@ static int user_confirm_reply(struct sock *sk, u16 index, unsigned char *data, 
	return err;

}



static int set_local_name(struct sock *sk, u16 index, unsigned char *data,

								u16 len)

{

	struct mgmt_cp_set_local_name *mgmt_cp = (void *) data;

	struct hci_cp_write_local_name hci_cp;

	struct hci_dev *hdev;

	struct pending_cmd *cmd;

	int err;



	BT_DBG("");



	if (len != sizeof(*mgmt_cp))

		return cmd_status(sk, index, MGMT_OP_SET_LOCAL_NAME, EINVAL);



	hdev = hci_dev_get(index);

	if (!hdev)

		return cmd_status(sk, index, MGMT_OP_SET_LOCAL_NAME, ENODEV);



	hci_dev_lock_bh(hdev);



	cmd = mgmt_pending_add(sk, MGMT_OP_SET_LOCAL_NAME, index, data, len);

	if (!cmd) {

		err = -ENOMEM;

		goto failed;

	}



	memcpy(hci_cp.name, mgmt_cp->name, sizeof(hci_cp.name));

	err = hci_send_cmd(hdev, HCI_OP_WRITE_LOCAL_NAME, sizeof(hci_cp),

								&hci_cp);

	if (err < 0)

		mgmt_pending_remove(cmd);



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;
@@ -1351,6 +1390,9 @@ int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen) 
	case MGMT_OP_USER_CONFIRM_NEG_REPLY:

		err = user_confirm_reply(sk, index, buf + sizeof(*hdr), len, 0);

		break;

	case MGMT_OP_SET_LOCAL_NAME:

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

		break;

	default:

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

		err = cmd_status(sk, index, opcode, 0x01);
@@ -1647,3 +1689,36 @@ int mgmt_auth_failed(u16 index, bdaddr_t *bdaddr, u8 status) 


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

}



int mgmt_set_local_name_complete(u16 index, u8 *name, u8 status)

{

	struct pending_cmd *cmd;

	struct mgmt_cp_set_local_name ev;

	int err;



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

	memcpy(ev.name, name, HCI_MAX_NAME_LENGTH);



	cmd = mgmt_pending_find(MGMT_OP_SET_LOCAL_NAME, index);

	if (!cmd)

		goto send_event;



	if (status) {

		err = cmd_status(cmd->sk, index, MGMT_OP_SET_LOCAL_NAME, EIO);

		goto failed;

	}



	err = cmd_complete(cmd->sk, index, MGMT_OP_SET_LOCAL_NAME, &ev,

								sizeof(ev));

	if (err < 0)

		goto failed;



send_event:

	err = mgmt_event(MGMT_EV_LOCAL_NAME_CHANGED, index, &ev, sizeof(ev),

							cmd ? cmd->sk : NULL);



failed:

	if (cmd)

		mgmt_pending_remove(cmd);

	return err;

}