michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Use shortened name if complete doesn't fit

Browse source 
If the complete name doesn't fit try shortening the name.

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Luiz Augusto von Dentz 2018-07-16 12:08:02 +03:00 • committed by Johan Hedberg
commit 4052ca6d17
1 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
subsys/bluetooth/host/hci_core.c
View file

@ -4722,18 +4722,25 @@ static int set_ad(u16_t hci_op, const struct bt_ad *ad, size_t ad_len)
const struct bt_data *data = ad[c].data;
for (i = 0; i < ad[c].len; i++) {
int len = data[i].data_len;
u8_t type = data[i].type;
/* Check if ad fit in the remaining buffer */
if (set_data->len + data[i].data_len + 2 > 31) {
net_buf_unref(buf);
return -EINVAL;
if (set_data->len + len + 2 > 31) {
len = 31 - (set_data->len + 2);
if (type != BT_DATA_NAME_COMPLETE || !len) {
net_buf_unref(buf);
return -EINVAL;
}
type = BT_DATA_NAME_SHORTENED;
}
set_data->data[set_data->len++] = data[i].data_len + 1;
set_data->data[set_data->len++] = data[i].type;
set_data->data[set_data->len++] = len + 1;
set_data->data[set_data->len++] = type;
memcpy(&set_data->data[set_data->len], data[i].data,
data[i].data_len);
set_data->len += data[i].data_len;
len);
set_data->len += len;
}
}