Hi Jakub,
> Currently, when trying to connect to already paired device that just
> rotated its RPA MAC address, old address would be used and connection
> would fail. In order to fix that, kernel must scan and receive
> advertisement with fresh RPA before connecting.
>
> This patch adds hci_connect_le_scan with dependencies, new method that
> will be used to connect to remote LE devices. Instead of just sending
> connect request, it adds a device to whitelist. Later patches will make
> use of this whitelist to send conenct request when advertisement is
> received, and properly handle timeouts.
>
> Signed-off-by: Jakub Pawlowski <jpawlowski@xxxxxxxxxx>
> ---
> include/net/bluetooth/hci_core.h | 6 ++
> net/bluetooth/hci_conn.c | 174 +++++++++++++++++++++++++++++++++++++++
> net/bluetooth/hci_core.c | 33 ++++++++
> 3 files changed, 213 insertions(+)
>
> diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
> index f0a9fc1..9e1a59e 100644
> --- a/include/net/bluetooth/hci_core.h
> +++ b/include/net/bluetooth/hci_core.h
> @@ -846,6 +846,9 @@ void hci_chan_del(struct hci_chan *chan);
> void hci_chan_list_flush(struct hci_conn *conn);
> struct hci_chan *hci_chan_lookup_handle(struct hci_dev *hdev, __u16 handle);
>
> +struct hci_conn *hci_connect_le_scan(struct hci_dev *hdev, bdaddr_t *dst,
> + u8 dst_type, u8 sec_level,
> + u16 conn_timeout, u8 role);
> struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst,
> u8 dst_type, u8 sec_level, u16 conn_timeout,
> u8 role);
> @@ -1011,6 +1014,9 @@ void hci_conn_params_clear_disabled(struct hci_dev *hdev);
> struct hci_conn_params *hci_pend_le_action_lookup(struct list_head *list,
> bdaddr_t *addr,
> u8 addr_type);
> +struct hci_conn_params *hci_explicit_connect_lookup(struct hci_dev *hdev,
> + bdaddr_t *addr,
> + u8 addr_type);
>
> void hci_uuids_clear(struct hci_dev *hdev);
>
> diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
> index 0b4d919..76e1317 100644
> --- a/net/bluetooth/hci_conn.c
> +++ b/net/bluetooth/hci_conn.c
> @@ -64,6 +64,48 @@ static void hci_le_create_connection_cancel(struct hci_conn *conn)
> hci_send_cmd(conn->hdev, HCI_OP_LE_CREATE_CONN_CANCEL, 0, NULL);
> }
>
> +/* This function requires the caller holds hdev->lock */
> +static void hci_connect_le_scan_cleanup(struct hci_conn *conn)
> +{
> + struct hci_conn_params *params;
> + struct smp_irk *irk;
> + bdaddr_t *bdaddr;
> + u8 bdaddr_type;
> +
> + bdaddr = &conn->dst;
> + bdaddr_type = conn->dst_type;
> +
> + /* Check if we need to convert to identity address */
> + irk = hci_get_irk(conn->hdev, bdaddr, bdaddr_type);
> + if (irk) {
> + bdaddr = &irk->bdaddr;
> + bdaddr_type = irk->addr_type;
> + }
> +
> + params = hci_explicit_connect_lookup(conn->hdev, bdaddr, bdaddr_type);
> + if (!params)
> + return;
> +
> + /* The connection attempt was doing scan for new RPA, and is
> + * in scan phase. If params are not associated with any other
> + * autoconnect action, remove them completely. If they are, just unmark
> + * them as waiting for connection, by clearing explicit_connect field.
> + */
> + if (params->auto_connect == HCI_AUTO_CONN_EXPLICIT)
> + hci_conn_params_del(conn->hdev, bdaddr, bdaddr_type);
> + else
> + params->explicit_connect = false;
> +}
> +
> +/* This function requires the caller holds hdev->lock */
> +static void hci_connect_le_scan_remove(struct hci_conn *conn)
> +{
> + hci_connect_le_scan_cleanup(conn);
> +
> + hci_conn_hash_del(conn->hdev, conn);
> + hci_update_background_scan(conn->hdev);
> +}
> +
> static void hci_acl_create_connection(struct hci_conn *conn)
> {
> struct hci_dev *hdev = conn->hdev;
> @@ -858,6 +900,138 @@ done:
> return conn;
> }
>
> +static void hci_connect_le_scan_complete(struct hci_dev *hdev, u8 status,
> + u16 opcode)
> +{
> + struct hci_conn *conn;
> +
> + if (!status)
> + return;
> +
> + BT_ERR("Failed to add device to auto conn whitelist: status 0x%2.2x",
> + status);
> +
> + hci_dev_lock(hdev);
> +
> + conn = hci_conn_hash_lookup_state(hdev, LE_LINK, BT_CONNECT);
> + if (conn)
> + hci_le_conn_failed(conn, status);
> +
> + hci_dev_unlock(hdev);
> +}
> +
> +static bool is_connected(struct hci_dev *hdev, bdaddr_t *addr, u8 type)
> +{
> + struct hci_conn *conn;
> +
> + conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, addr);
> + if (!conn)
> + return false;
> +
> + if (conn->dst_type != type)
> + return false;
> +
> + if (conn->state != BT_CONNECTED)
> + return false;
> +
> + return true;
> +}
> +
> +/* This function requires the caller holds hdev->lock */
> +int hci_explicit_conn_params_set(struct hci_request *req, bdaddr_t *addr,
> + u8 addr_type)
> +{
this function needed to be made static. I fixed that up and applied all 6 patches.
Regards
Marcel
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
