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

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

Bluetooth: Add support for connect failed management event 



This patch add a new connect failed management event to track failures
in connecting to remote devices. It is particularly useful for security
mode 3 scenarios when we don't have a connected state while pairing but
still need to detect when the connect attempt failed.

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

include/net/bluetooth/hci_core.h

+1 −0
Original line number Diff line number Diff line
@@ -717,6 +717,7 @@ int mgmt_new_key(u16 index, struct link_key *key, u8 old_key_type); 
int mgmt_connected(u16 index, bdaddr_t *bdaddr);

int mgmt_disconnected(u16 index, bdaddr_t *bdaddr);

int mgmt_disconnect_failed(u16 index);

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



/* HCI info for socket */

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

include/net/bluetooth/mgmt.h

+7 −0
Original line number Diff line number Diff line
@@ -184,3 +184,10 @@ struct mgmt_ev_disconnected { 
	__le16 index;

	bdaddr_t bdaddr;

} __packed;



#define MGMT_EV_CONNECT_FAILED		0x000D

struct mgmt_ev_connect_failed {

	__le16 index;

	bdaddr_t bdaddr;

	__u8 status;

} __packed;

net/bluetooth/hci_event.c

+4 −1
Original line number Diff line number Diff line
@@ -1166,8 +1166,11 @@ static inline void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *s 
			hci_send_cmd(hdev, HCI_OP_CHANGE_CONN_PTYPE,

							sizeof(cp), &cp);

		}

	} else

	} else {

		conn->state = BT_CLOSED;

		if (conn->type == ACL_LINK)

			mgmt_connect_failed(hdev->id, &ev->bdaddr, ev->status);

	}



	if (conn->type == ACL_LINK)

		hci_sco_setup(conn, ev->status);

net/bluetooth/mgmt.c

+11 −0
Original line number Diff line number Diff line
@@ -1227,3 +1227,14 @@ int mgmt_disconnect_failed(u16 index) 


	return err;

}



int mgmt_connect_failed(u16 index, bdaddr_t *bdaddr, u8 status)

{

	struct mgmt_ev_connect_failed ev;



	put_unaligned_le16(index, &ev.index);

	bacpy(&ev.bdaddr, bdaddr);

	ev.status = status;



	return mgmt_event(MGMT_EV_CONNECT_FAILED, &ev, sizeof(ev), NULL);

}