Skip to content

Commit

Permalink
Bluetooth: Add name resolving support for mgmt based discovery
Browse files Browse the repository at this point in the history 
This patch adds the necessary logic to perform name lookups after
inquiry completes. This is done by checking for entries in the resolve
list after each inquiry complete and remote name complete HCI event.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
  • Loading branch information
Johan Hedberg committed Feb 13, 2012
1 parent ff9ef57 commit 30dc78e
Show file tree
Hide file tree
Showing 4 changed files with 149 additions and 11 deletions.
8 changes: 7 additions & 1 deletion include/net/bluetooth/hci_core.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ struct discovery_state {
enum {
DISCOVERY_STOPPED,
DISCOVERY_STARTING,
DISCOVERY_ACTIVE,
DISCOVERY_INQUIRY,
DISCOVERY_RESOLVING,
DISCOVERY_STOPPING,
} state;
struct list_head all; /* All devices found during inquiry */
Expand Down Expand Up @@ -371,6 +372,8 @@ static inline void discovery_init(struct hci_dev *hdev)
INIT_LIST_HEAD(&hdev->discovery.resolve);
}

bool hci_discovery_active(struct hci_dev *hdev);

void hci_discovery_set_state(struct hci_dev *hdev, int state);

static inline int inquiry_cache_empty(struct hci_dev *hdev)
Expand All @@ -393,6 +396,9 @@ struct inquiry_entry *hci_inquiry_cache_lookup(struct hci_dev *hdev,
bdaddr_t *bdaddr);
struct inquiry_entry *hci_inquiry_cache_lookup_unknown(struct hci_dev *hdev,
bdaddr_t *bdaddr);
struct inquiry_entry *hci_inquiry_cache_lookup_resolve(struct hci_dev *hdev,
bdaddr_t *bdaddr,
int state);
bool hci_inquiry_cache_update(struct hci_dev *hdev, struct inquiry_data *data,
bool name_known);

Expand Down
34 changes: 33 additions & 1 deletion net/bluetooth/hci_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,17 @@ struct hci_dev *hci_dev_get(int index)

/* ---- Inquiry support ---- */

bool hci_discovery_active(struct hci_dev *hdev)
{
struct discovery_state *discov = &hdev->discovery;

if (discov->state == DISCOVERY_INQUIRY ||
discov->state == DISCOVERY_RESOLVING)
return true;

return false;
}

void hci_discovery_set_state(struct hci_dev *hdev, int state)
{
BT_DBG("%s state %u -> %u", hdev->name, hdev->discovery.state, state);
Expand All @@ -369,9 +380,11 @@ void hci_discovery_set_state(struct hci_dev *hdev, int state)
break;
case DISCOVERY_STARTING:
break;
case DISCOVERY_ACTIVE:
case DISCOVERY_INQUIRY:
mgmt_discovering(hdev, 1);
break;
case DISCOVERY_RESOLVING:
break;
case DISCOVERY_STOPPING:
break;
}
Expand Down Expand Up @@ -425,6 +438,25 @@ struct inquiry_entry *hci_inquiry_cache_lookup_unknown(struct hci_dev *hdev,
return NULL;
}

struct inquiry_entry *hci_inquiry_cache_lookup_resolve(struct hci_dev *hdev,
bdaddr_t *bdaddr,
int state)
{
struct discovery_state *cache = &hdev->discovery;
struct inquiry_entry *e;

BT_DBG("cache %p bdaddr %s state %d", cache, batostr(bdaddr), state);

list_for_each_entry(e, &cache->resolve, list) {
if (!bacmp(bdaddr, BDADDR_ANY) && e->name_state == state)
return e;
if (!bacmp(&e->data.bdaddr, bdaddr))
return e;
}

return NULL;
}

bool hci_inquiry_cache_update(struct hci_dev *hdev, struct inquiry_data *data,
bool name_known)
{
Expand Down
81 changes: 77 additions & 4 deletions net/bluetooth/hci_event.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1119,7 +1119,7 @@ static inline void hci_cs_inquiry(struct hci_dev *hdev, __u8 status)
set_bit(HCI_INQUIRY, &hdev->flags);

hci_dev_lock(hdev);
hci_discovery_set_state(hdev, DISCOVERY_ACTIVE);
hci_discovery_set_state(hdev, DISCOVERY_INQUIRY);
hci_dev_unlock(hdev);
}

Expand Down Expand Up @@ -1271,6 +1271,50 @@ static int hci_outgoing_auth_needed(struct hci_dev *hdev,
return 1;
}

static inline int hci_resolve_name(struct hci_dev *hdev, struct inquiry_entry *e)
{
struct hci_cp_remote_name_req cp;

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

bacpy(&cp.bdaddr, &e->data.bdaddr);
cp.pscan_rep_mode = e->data.pscan_rep_mode;
cp.pscan_mode = e->data.pscan_mode;
cp.clock_offset = e->data.clock_offset;

return hci_send_cmd(hdev, HCI_OP_REMOTE_NAME_REQ, sizeof(cp), &cp);
}

static void hci_resolve_next_name(struct hci_dev *hdev, bdaddr_t *bdaddr)
{
struct discovery_state *discov = &hdev->discovery;
struct inquiry_entry *e;

if (discov->state == DISCOVERY_STOPPING)
goto discov_complete;

if (discov->state != DISCOVERY_RESOLVING)
return;

e = hci_inquiry_cache_lookup_resolve(hdev, bdaddr, NAME_PENDING);
if (e) {
e->name_state = NAME_KNOWN;
list_del(&e->list);
}

if (list_empty(&discov->resolve))
goto discov_complete;

e = hci_inquiry_cache_lookup_resolve(hdev, BDADDR_ANY, NAME_NEEDED);
if (hci_resolve_name(hdev, e) == 0) {
e->name_state = NAME_PENDING;
return;
}

discov_complete:
hci_discovery_set_state(hdev, DISCOVERY_STOPPED);
}

static void hci_cs_remote_name_req(struct hci_dev *hdev, __u8 status)
{
struct hci_cp_remote_name_req *cp;
Expand All @@ -1289,6 +1333,9 @@ static void hci_cs_remote_name_req(struct hci_dev *hdev, __u8 status)

hci_dev_lock(hdev);

if (test_bit(HCI_MGMT, &hdev->flags))
hci_resolve_next_name(hdev, &cp->bdaddr);

conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &cp->bdaddr);
if (!conn)
goto unlock;
Expand Down Expand Up @@ -1496,6 +1543,8 @@ static void hci_cs_le_start_enc(struct hci_dev *hdev, u8 status)
static inline void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
{
__u8 status = *((__u8 *) skb->data);
struct discovery_state *discov = &hdev->discovery;
struct inquiry_entry *e;

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

Expand All @@ -1506,8 +1555,28 @@ static inline void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff
if (!test_and_clear_bit(HCI_INQUIRY, &hdev->flags))
return;

if (!test_bit(HCI_MGMT, &hdev->flags))
return;

hci_dev_lock(hdev);
hci_discovery_set_state(hdev, DISCOVERY_STOPPED);

if (discov->state != DISCOVERY_INQUIRY)
goto unlock;

if (list_empty(&discov->resolve)) {
hci_discovery_set_state(hdev, DISCOVERY_STOPPED);
goto unlock;
}

e = hci_inquiry_cache_lookup_resolve(hdev, BDADDR_ANY, NAME_NEEDED);
if (e && hci_resolve_name(hdev, e) == 0) {
e->name_state = NAME_PENDING;
hci_discovery_set_state(hdev, DISCOVERY_RESOLVING);
} else {
hci_discovery_set_state(hdev, DISCOVERY_STOPPED);
}

unlock:
hci_dev_unlock(hdev);
}

Expand Down Expand Up @@ -1807,8 +1876,12 @@ static inline void hci_remote_name_evt(struct hci_dev *hdev, struct sk_buff *skb

hci_dev_lock(hdev);

if (ev->status == 0 && test_bit(HCI_MGMT, &hdev->flags))
mgmt_remote_name(hdev, &ev->bdaddr, ev->name);
if (test_bit(HCI_MGMT, &hdev->flags)) {
if (ev->status == 0)
mgmt_remote_name(hdev, &ev->bdaddr, ev->name);

hci_resolve_next_name(hdev, &ev->bdaddr);
}

conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &ev->bdaddr);
if (!conn)
Expand Down
37 changes: 32 additions & 5 deletions net/bluetooth/mgmt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1947,6 +1947,8 @@ static int stop_discovery(struct sock *sk, u16 index)
{
struct hci_dev *hdev;
struct pending_cmd *cmd;
struct hci_cp_remote_name_req_cancel cp;
struct inquiry_entry *e;
int err;

BT_DBG("hci%u", index);
Expand All @@ -1958,25 +1960,44 @@ static int stop_discovery(struct sock *sk, u16 index)

hci_dev_lock(hdev);

if (hdev->discovery.state != DISCOVERY_ACTIVE) {
if (!hci_discovery_active(hdev)) {
err = cmd_status(sk, index, MGMT_OP_STOP_DISCOVERY,
MGMT_STATUS_REJECTED);
goto failed;
goto unlock;
}

cmd = mgmt_pending_add(sk, MGMT_OP_STOP_DISCOVERY, hdev, NULL, 0);
if (!cmd) {
err = -ENOMEM;
goto failed;
goto unlock;
}

if (hdev->discovery.state == DISCOVERY_INQUIRY) {
err = hci_cancel_inquiry(hdev);
if (err < 0)
mgmt_pending_remove(cmd);
else
hci_discovery_set_state(hdev, DISCOVERY_STOPPING);
goto unlock;
}

e = hci_inquiry_cache_lookup_resolve(hdev, BDADDR_ANY, NAME_PENDING);
if (!e) {
mgmt_pending_remove(cmd);
err = cmd_complete(sk, index, MGMT_OP_STOP_DISCOVERY, NULL, 0);
hci_discovery_set_state(hdev, DISCOVERY_STOPPED);
goto unlock;
}

err = hci_cancel_inquiry(hdev);
bacpy(&cp.bdaddr, &e->data.bdaddr);
err = hci_send_cmd(hdev, HCI_OP_REMOTE_NAME_REQ_CANCEL,
sizeof(cp), &cp);
if (err < 0)
mgmt_pending_remove(cmd);
else
hci_discovery_set_state(hdev, DISCOVERY_STOPPING);

failed:
unlock:
hci_dev_unlock(hdev);
hci_dev_put(hdev);

Expand Down Expand Up @@ -2004,6 +2025,12 @@ static int confirm_name(struct sock *sk, u16 index, unsigned char *data,

hci_dev_lock(hdev);

if (!hci_discovery_active(hdev)) {
err = cmd_status(sk, index, MGMT_OP_CONFIRM_NAME,
MGMT_STATUS_FAILED);
goto failed;
}

e = hci_inquiry_cache_lookup_unknown(hdev, &cp->bdaddr);
if (!e) {
err = cmd_status (sk, index, MGMT_OP_CONFIRM_NAME,
Expand Down

0 comments on commit 30dc78e

Please sign in to comment.