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

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

Bluetooth: Move address type macros to bluetooth.h 



This patch moves address type macros to bluetooth.h since they will be
used by management interface and Bluetooth socket interface. It also
replaces the macro prefix MGMT_ADDR_ by BDADDR_.

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 2bbf2968

include/net/bluetooth/bluetooth.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -163,6 +163,11 @@ typedef struct { 
	__u8 b[6];

	__u8 b[6];

} __packed bdaddr_t;

} __packed bdaddr_t;





/* BD Address type */

#define BDADDR_BREDR		0x00

#define BDADDR_LE_PUBLIC	0x01

#define BDADDR_LE_RANDOM	0x02



#define BDADDR_ANY   (&(bdaddr_t) {{0, 0, 0, 0, 0, 0}})

#define BDADDR_ANY   (&(bdaddr_t) {{0, 0, 0, 0, 0, 0}})

#define BDADDR_LOCAL (&(bdaddr_t) {{0, 0, 0, 0xff, 0xff, 0xff}})

#define BDADDR_LOCAL (&(bdaddr_t) {{0, 0, 0, 0xff, 0xff, 0xff}})

include/net/bluetooth/hci_core.h

+6 −10
Original line number Original line Diff line number Diff line
@@ -963,16 +963,12 @@ void hci_send_to_monitor(struct hci_dev *hdev, struct sk_buff *skb); 
void hci_sock_dev_event(struct hci_dev *hdev, int event);

void hci_sock_dev_event(struct hci_dev *hdev, int event);





/* Management interface */

/* Management interface */

#define MGMT_ADDR_BREDR			0x00

#define DISCOV_TYPE_BREDR		(BIT(BDADDR_BREDR))

#define MGMT_ADDR_LE_PUBLIC		0x01

#define DISCOV_TYPE_LE			(BIT(BDADDR_LE_PUBLIC) | \

#define MGMT_ADDR_LE_RANDOM		0x02

					 BIT(BDADDR_LE_RANDOM))



#define DISCOV_TYPE_INTERLEAVED		(BIT(BDADDR_BREDR) | \

#define DISCOV_TYPE_BREDR		(BIT(MGMT_ADDR_BREDR))

					 BIT(BDADDR_LE_PUBLIC) | \

#define DISCOV_TYPE_LE			(BIT(MGMT_ADDR_LE_PUBLIC) | \

					 BIT(BDADDR_LE_RANDOM))

						BIT(MGMT_ADDR_LE_RANDOM))

#define DISCOV_TYPE_INTERLEAVED		(BIT(MGMT_ADDR_BREDR) | \

						BIT(MGMT_ADDR_LE_PUBLIC) | \

						BIT(MGMT_ADDR_LE_RANDOM))





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

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

int mgmt_index_added(struct hci_dev *hdev);

int mgmt_index_added(struct hci_dev *hdev);

net/bluetooth/mgmt.c

+15 −15
Original line number Original line Diff line number Diff line
@@ -1524,7 +1524,7 @@ static int unpair_device(struct sock *sk, struct hci_dev *hdev, void *data, 
		goto unlock;

		goto unlock;

	}

	}





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

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

		err = hci_remove_link_key(hdev, &cp->addr.bdaddr);

		err = hci_remove_link_key(hdev, &cp->addr.bdaddr);

	else

	else

		err = hci_remove_ltk(hdev, &cp->addr.bdaddr);

		err = hci_remove_ltk(hdev, &cp->addr.bdaddr);
@@ -1536,7 +1536,7 @@ static int unpair_device(struct sock *sk, struct hci_dev *hdev, void *data, 
	}

	}





	if (cp->disconnect) {

	if (cp->disconnect) {

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

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

			conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK,

			conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK,

							&cp->addr.bdaddr);

							&cp->addr.bdaddr);

		else

		else
@@ -1596,7 +1596,7 @@ static int disconnect(struct sock *sk, struct hci_dev *hdev, void *data, 
		goto failed;

		goto failed;

	}

	}





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

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

		conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &cp->addr.bdaddr);

		conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &cp->addr.bdaddr);

	else

	else

		conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &cp->addr.bdaddr);

		conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &cp->addr.bdaddr);
@@ -1631,23 +1631,23 @@ static u8 link_to_mgmt(u8 link_type, u8 addr_type) 
	case LE_LINK:

	case LE_LINK:

		switch (addr_type) {

		switch (addr_type) {

		case ADDR_LE_DEV_PUBLIC:

		case ADDR_LE_DEV_PUBLIC:

			return MGMT_ADDR_LE_PUBLIC;

			return BDADDR_LE_PUBLIC;





		default:

		default:

			/* Fallback to LE Random address type */

			/* Fallback to LE Random address type */

			return MGMT_ADDR_LE_RANDOM;

			return BDADDR_LE_RANDOM;

		}

		}





	default:

	default:

		/* Fallback to BR/EDR type */

		/* Fallback to BR/EDR type */

		return MGMT_ADDR_BREDR;

		return BDADDR_BREDR;

	}

	}

}

}





static u8 mgmt_to_le(u8 mgmt_type)

static u8 mgmt_to_le(u8 mgmt_type)

{

{

	switch (mgmt_type) {

	switch (mgmt_type) {

	case MGMT_ADDR_LE_PUBLIC:

	case BDADDR_LE_PUBLIC:

		return ADDR_LE_DEV_PUBLIC;

		return ADDR_LE_DEV_PUBLIC;





	default:

	default:
@@ -1914,7 +1914,7 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data, 
	else

	else

		auth_type = HCI_AT_DEDICATED_BONDING_MITM;

		auth_type = HCI_AT_DEDICATED_BONDING_MITM;





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

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

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

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

				   auth_type);

				   auth_type);

	else

	else
@@ -1947,7 +1947,7 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data, 
	}

	}





	/* For LE, just connecting isn't a proof that the pairing finished */

	/* For LE, just connecting isn't a proof that the pairing finished */

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

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

		conn->connect_cfm_cb = pairing_complete_cb;

		conn->connect_cfm_cb = pairing_complete_cb;





	conn->security_cfm_cb = pairing_complete_cb;

	conn->security_cfm_cb = pairing_complete_cb;
@@ -2024,7 +2024,7 @@ static int user_pairing_resp(struct sock *sk, struct hci_dev *hdev, 
		goto done;

		goto done;

	}

	}





	if (type == MGMT_ADDR_BREDR)

	if (type == BDADDR_BREDR)

		conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, bdaddr);

		conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, bdaddr);

	else

	else

		conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, bdaddr);

		conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, bdaddr);
@@ -2035,7 +2035,7 @@ static int user_pairing_resp(struct sock *sk, struct hci_dev *hdev, 
		goto done;

		goto done;

	}

	}





	if (type == MGMT_ADDR_LE_PUBLIC || type == MGMT_ADDR_LE_RANDOM) {

	if (type == BDADDR_LE_PUBLIC || type == BDADDR_LE_RANDOM) {

		/* Continue with pairing via SMP */

		/* Continue with pairing via SMP */

		err = smp_user_confirm_reply(conn, mgmt_op, passkey);

		err = smp_user_confirm_reply(conn, mgmt_op, passkey);
@@ -2967,7 +2967,7 @@ int mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key, bool persisten 




	ev.store_hint = persistent;

	ev.store_hint = persistent;

	bacpy(&ev.key.addr.bdaddr, &key->bdaddr);

	bacpy(&ev.key.addr.bdaddr, &key->bdaddr);

	ev.key.addr.type = MGMT_ADDR_BREDR;

	ev.key.addr.type = BDADDR_BREDR;

	ev.key.type = key->type;

	ev.key.type = key->type;

	memcpy(ev.key.val, key->val, 16);

	memcpy(ev.key.val, key->val, 16);

	ev.key.pin_len = key->pin_len;

	ev.key.pin_len = key->pin_len;
@@ -3125,7 +3125,7 @@ int mgmt_pin_code_request(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 secure) 
	struct mgmt_ev_pin_code_request ev;

	struct mgmt_ev_pin_code_request ev;





	bacpy(&ev.addr.bdaddr, bdaddr);

	bacpy(&ev.addr.bdaddr, bdaddr);

	ev.addr.type = MGMT_ADDR_BREDR;

	ev.addr.type = BDADDR_BREDR;

	ev.secure = secure;

	ev.secure = secure;





	return mgmt_event(MGMT_EV_PIN_CODE_REQUEST, hdev, &ev, sizeof(ev),

	return mgmt_event(MGMT_EV_PIN_CODE_REQUEST, hdev, &ev, sizeof(ev),
@@ -3144,7 +3144,7 @@ int mgmt_pin_code_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, 
		return -ENOENT;

		return -ENOENT;





	bacpy(&rp.addr.bdaddr, bdaddr);

	bacpy(&rp.addr.bdaddr, bdaddr);

	rp.addr.type = MGMT_ADDR_BREDR;

	rp.addr.type = BDADDR_BREDR;





	err = cmd_complete(cmd->sk, hdev->id, MGMT_OP_PIN_CODE_REPLY,

	err = cmd_complete(cmd->sk, hdev->id, MGMT_OP_PIN_CODE_REPLY,

			   mgmt_status(status), &rp, sizeof(rp));

			   mgmt_status(status), &rp, sizeof(rp));
@@ -3166,7 +3166,7 @@ int mgmt_pin_code_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, 
		return -ENOENT;

		return -ENOENT;





	bacpy(&rp.addr.bdaddr, bdaddr);

	bacpy(&rp.addr.bdaddr, bdaddr);

	rp.addr.type = MGMT_ADDR_BREDR;

	rp.addr.type = BDADDR_BREDR;





	err = cmd_complete(cmd->sk, hdev->id, MGMT_OP_PIN_CODE_NEG_REPLY,

	err = cmd_complete(cmd->sk, hdev->id, MGMT_OP_PIN_CODE_NEG_REPLY,

			   mgmt_status(status), &rp, sizeof(rp));

			   mgmt_status(status), &rp, sizeof(rp));