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

Commit b12f62cf authored by Andre Guedes's avatar Andre Guedes Committed by Gustavo Padovan
Browse files

Bluetooth: Add dst_type parameter to hci_connect 



This patch adds the dst_type parameter to hci_connect function.
Instead of searching the address type in advertising cache, we
use the dst_type parameter to establish LE connections.

The dst_type is ignored for BR/EDR connection establishment.

Signed-off-by: default avatarAndre Guedes <andre.guedes@openbossa.org>
Acked-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 31f7956c

include/net/bluetooth/hci_core.h

+1 −1
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ int hci_chan_del(struct hci_chan *chan); 
void hci_chan_list_flush(struct hci_conn *conn);



struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst,

						__u8 sec_level, __u8 auth_type);

			     __u8 dst_type, __u8 sec_level, __u8 auth_type);

int hci_conn_check_link_mode(struct hci_conn *conn);

int hci_conn_check_secure(struct hci_conn *conn, __u8 sec_level);

int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type);

net/bluetooth/hci_conn.c

+3 −8
Original line number Diff line number Diff line
@@ -513,7 +513,8 @@ EXPORT_SYMBOL(hci_get_route); 


/* Create SCO, ACL or LE connection.

 * Device _must_ be locked */

struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst, __u8 sec_level, __u8 auth_type)

struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst,

			     __u8 dst_type, __u8 sec_level, __u8 auth_type)

{

	struct hci_conn *acl;

	struct hci_conn *sco;
@@ -522,19 +523,13 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst, __u8 
	BT_DBG("%s dst %s", hdev->name, batostr(dst));



	if (type == LE_LINK) {

		struct adv_entry *entry = NULL;



		le = hci_conn_hash_lookup_ba(hdev, LE_LINK, dst);

		if (!le) {

			entry = hci_find_adv_entry(hdev, dst);

			if (!entry)

				return ERR_PTR(-EHOSTUNREACH);



			le = hci_conn_add(hdev, LE_LINK, dst);

			if (!le)

				return ERR_PTR(-ENOMEM);



			le->dst_type = entry->bdaddr_type;

			le->dst_type = bdaddr_to_le(dst_type);

			hci_le_connect(le);

		}

net/bluetooth/l2cap_core.c

+4 −4
Original line number Diff line number Diff line
@@ -1479,10 +1479,10 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, bdaddr_t *d 
	auth_type = l2cap_get_auth_type(chan);



	if (chan->dcid == L2CAP_CID_LE_DATA)

		hcon = hci_connect(hdev, LE_LINK, dst,

		hcon = hci_connect(hdev, LE_LINK, dst, BDADDR_LE_RANDOM,

				   chan->sec_level, auth_type);

	else

		hcon = hci_connect(hdev, ACL_LINK, dst,

		hcon = hci_connect(hdev, ACL_LINK, dst, BDADDR_BREDR,

				   chan->sec_level, auth_type);



	if (IS_ERR(hcon)) {

net/bluetooth/mgmt.c

+4 −4
Original line number Diff line number Diff line
@@ -1903,11 +1903,11 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data, 
		auth_type = HCI_AT_DEDICATED_BONDING_MITM;



	if (cp->addr.type == BDADDR_BREDR)

		conn = hci_connect(hdev, ACL_LINK, &cp->addr.bdaddr, sec_level,

				   auth_type);

		conn = hci_connect(hdev, ACL_LINK, &cp->addr.bdaddr,

				   cp->addr.type, sec_level, auth_type);

	else

		conn = hci_connect(hdev, LE_LINK, &cp->addr.bdaddr, sec_level,

				   auth_type);

		conn = hci_connect(hdev, LE_LINK, &cp->addr.bdaddr,

				   cp->addr.type, sec_level, auth_type);



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

	bacpy(&rp.addr.bdaddr, &cp->addr.bdaddr);

net/bluetooth/sco.c

+2 −1
Original line number Diff line number Diff line
@@ -193,7 +193,8 @@ static int sco_connect(struct sock *sk) 
	else

		type = SCO_LINK;



	hcon = hci_connect(hdev, type, dst, BT_SECURITY_LOW, HCI_AT_NO_BONDING);

	hcon = hci_connect(hdev, type, dst, BDADDR_BREDR, BT_SECURITY_LOW,

			   HCI_AT_NO_BONDING);

	if (IS_ERR(hcon)) {

		err = PTR_ERR(hcon);

		goto done;