bt_ad_add_appearance(client->data, appearance);
}
+ /* Scan response shall not be used when connectable and setting a
+ * secondary PHY since that would end up using EA types instead of
+ * legacy which doesn't support being connectable and scannable
+ * simultaneously.
+ */
+ if ((*flags & MGMT_ADV_FLAG_CONNECTABLE) &&
+ (*flags & MGMT_ADV_FLAG_SEC_MASK) &&
+ client->name) {
+ *flags &= ~MGMT_ADV_FLAG_LOCAL_NAME;
+ bt_ad_add_name(client->data, client->name);
+ }
+
return bt_ad_generate(client->data, len);
}
return false;
}
+ /* Scan response shall not be used when connectable and setting a
+ * secondary PHY since that would end up using EA types instead of
+ * legacy which doesn't support being connectable and scannable
+ * simultaneously.
+ */
+ if (flags & MGMT_ADV_FLAG_CONNECTABLE &&
+ flags & MGMT_ADV_FLAG_SEC_MASK)
+ return false;
+
return true;
}
uint8_t *adv_data = NULL;
size_t adv_data_len;
uint8_t *scan_rsp = NULL;
- size_t scan_rsp_len = -1;
+ size_t scan_rsp_len = 0;
uint32_t flags = 0;
unsigned int mgmt_ret;
dbus_int16_t tx_power;
goto fail;
}
- scan_rsp = generate_scan_rsp(client, &flags, &scan_rsp_len);
- if ((!scan_rsp && scan_rsp_len) ||
- scan_rsp_len > rp->max_scan_rsp_len) {
- error("Scan data couldn't be generated.");
- goto fail;
+ if (adv_client_has_scan_response(client, flags)) {
+ scan_rsp = generate_scan_rsp(client, &flags, &scan_rsp_len);
+ if ((!scan_rsp && scan_rsp_len) ||
+ scan_rsp_len > rp->max_scan_rsp_len) {
+ error("Scan data couldn't be generated.");
+ goto fail;
+ }
}
param_len = sizeof(struct mgmt_cp_add_advertising) + adv_data_len +
cp->adv_data_len = adv_data_len;
cp->scan_rsp_len = scan_rsp_len;
memcpy(cp->data, adv_data, adv_data_len);
- memcpy(cp->data + adv_data_len, scan_rsp, scan_rsp_len);
+
+ if (scan_rsp)
+ memcpy(cp->data + adv_data_len, scan_rsp, scan_rsp_len);
free(adv_data);
free(scan_rsp);