You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ry...@apache.org on 2018/12/21 14:00:15 UTC
[mynewt-nimble] branch master updated (146e1af -> 86e128b)
This is an automated email from the ASF dual-hosted git repository.
rymek pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git.
from 146e1af nimble/gap: Minor error code fix and enhance the comment
new 1a535e8 nimble/ll: Fix directed extended advertising
new 86e128b nimble/ll: Add support to advertise anonymously
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
nimble/controller/src/ble_ll_adv.c | 84 +++++++++++++++++++++++++++-----------
1 file changed, 60 insertions(+), 24 deletions(-)
[mynewt-nimble] 02/02: nimble/ll: Add support to advertise
anonymously
Posted by ry...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rymek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit 86e128baeb39431e2e1dbd7d3b4d936a430caa52
Author: Łukasz Rymanowski <lu...@codecoup.pl>
AuthorDate: Fri Dec 21 14:42:32 2018 +0100
nimble/ll: Add support to advertise anonymously
---
nimble/controller/src/ble_ll_adv.c | 56 ++++++++++++++++++++++++--------------
1 file changed, 36 insertions(+), 20 deletions(-)
diff --git a/nimble/controller/src/ble_ll_adv.c b/nimble/controller/src/ble_ll_adv.c
index 54563ba..0de1e94 100644
--- a/nimble/controller/src/ble_ll_adv.c
+++ b/nimble/controller/src/ble_ll_adv.c
@@ -500,11 +500,6 @@ ble_ll_adv_aux_pdu_make(uint8_t *dptr, void *pducb_arg, uint8_t *hdr_byte)
/* It's the same for AUX_ADV_IND and AUX_CHAIN_IND */
pdu_type = BLE_ADV_PDU_TYPE_AUX_ADV_IND;
- /* Set TxAdd to random if needed. */
- if (advsm->flags & BLE_LL_ADV_SM_FLAG_TX_ADD) {
- pdu_type |= BLE_ADV_PDU_HDR_TXADD_RAND;
- }
-
/* We do not create scannable PDUs here - this is handled separately */
adv_mode = 0;
if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_CONNECTABLE) {
@@ -519,6 +514,12 @@ ble_ll_adv_aux_pdu_make(uint8_t *dptr, void *pducb_arg, uint8_t *hdr_byte)
dptr += 1;
if (aux->ext_hdr & (1 << BLE_LL_EXT_ADV_ADVA_BIT)) {
+
+ /* Set TxAdd to random if needed. */
+ if (advsm->flags & BLE_LL_ADV_SM_FLAG_TX_ADD) {
+ pdu_type |= BLE_ADV_PDU_HDR_TXADD_RAND;
+ }
+
memcpy(dptr, advsm->adva, BLE_LL_EXT_ADV_ADVA_SIZE);
dptr += BLE_LL_EXT_ADV_ADVA_SIZE;
}
@@ -592,11 +593,6 @@ ble_ll_adv_aux_scannable_pdu_make(uint8_t *dptr, void *pducb_arg, uint8_t *hdr_b
pdu_type = BLE_ADV_PDU_TYPE_AUX_ADV_IND;
- /* Set TxAdd to random if needed. */
- if (advsm->flags & BLE_LL_ADV_SM_FLAG_TX_ADD) {
- pdu_type |= BLE_ADV_PDU_HDR_TXADD_RAND;
- }
-
ext_hdr_len = &dptr[0];
ext_hdr = &dptr[1];
dptr += 2;
@@ -605,11 +601,18 @@ ble_ll_adv_aux_scannable_pdu_make(uint8_t *dptr, void *pducb_arg, uint8_t *hdr_b
*ext_hdr_len = BLE_LL_EXT_ADV_FLAGS_SIZE;
*ext_hdr = 0;
- /* AdvA always */
- *ext_hdr_len += BLE_LL_EXT_ADV_ADVA_SIZE;
- *ext_hdr |= (1 << BLE_LL_EXT_ADV_ADVA_BIT);
- memcpy(dptr, advsm->adva, BLE_LL_EXT_ADV_ADVA_SIZE);
- dptr += BLE_LL_EXT_ADV_ADVA_SIZE;
+ /* AdvA when non anonymous */
+ if (!(advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_ANON_ADV)) {
+ /* Set TxAdd to random if needed. */
+ if (advsm->flags & BLE_LL_ADV_SM_FLAG_TX_ADD) {
+ pdu_type |= BLE_ADV_PDU_HDR_TXADD_RAND;
+ }
+
+ *ext_hdr_len += BLE_LL_EXT_ADV_ADVA_SIZE;
+ *ext_hdr |= (1 << BLE_LL_EXT_ADV_ADVA_BIT);
+ memcpy(dptr, advsm->adva, BLE_LL_EXT_ADV_ADVA_SIZE);
+ dptr += BLE_LL_EXT_ADV_ADVA_SIZE;
+ }
/* TargetA only for directed */
if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_DIRECTED) {
@@ -1079,9 +1082,14 @@ ble_ll_adv_aux_scannable_pdu_payload_len(struct ble_ll_adv_sm *advsm)
{
uint8_t len;
- /* Flags, AdvA and ADI always */
- len = BLE_LL_EXT_ADV_HDR_LEN + BLE_LL_EXT_ADV_FLAGS_SIZE +
- BLE_LL_EXT_ADV_ADVA_SIZE + BLE_LL_EXT_ADV_DATA_INFO_SIZE;
+ /* Flags, ADI always */
+ len = BLE_LL_EXT_ADV_HDR_LEN + BLE_LL_EXT_ADV_FLAGS_SIZE
+ + BLE_LL_EXT_ADV_DATA_INFO_SIZE;
+
+ /* AdvA if not anonymous */
+ if (!(advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_ANON_ADV)) {
+ len += BLE_LL_EXT_ADV_ADVA_SIZE;
+ }
/* TargetA only for directed */
if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_DIRECTED) {
@@ -1125,7 +1133,8 @@ ble_ll_adv_aux_calculate(struct ble_ll_adv_sm *advsm,
}
/* AdvA for 1st PDU in chain (i.e. AUX_ADV_IND or AUX_SCAN_RSP) */
- if (aux_data_offset == 0) {
+ if (aux_data_offset == 0 &&
+ !(advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_ANON_ADV)) {
aux->ext_hdr |= (1 << BLE_LL_EXT_ADV_ADVA_BIT);
hdr_len += BLE_LL_EXT_ADV_ADVA_SIZE;
}
@@ -2415,7 +2424,14 @@ ble_ll_adv_ext_set_param(uint8_t *cmdbuf, uint8_t *rspbuf, uint8_t *rsplen)
advsm->adv_txpwr = ble_phy_txpower_round(tx_power);
}
- advsm->own_addr_type = own_addr_type;
+ if (!(props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) &&
+ (props & BLE_HCI_LE_SET_EXT_ADV_PROP_ANON_ADV)) {
+ /* For anonymous don't care about address type */
+ advsm->own_addr_type = 0;
+ } else {
+ advsm->own_addr_type = own_addr_type;
+ }
+
advsm->peer_addr_type = peer_addr_type;
advsm->adv_filter_policy = adv_filter_policy;
advsm->adv_chanmask = adv_chanmask;
[mynewt-nimble] 01/02: nimble/ll: Fix directed extended advertising
Posted by ry...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rymek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit 1a535e8a56b87cb20e9558e7aac9fd661bb0a722
Author: Łukasz Rymanowski <lu...@codecoup.pl>
AuthorDate: Fri Dec 21 14:14:19 2018 +0100
nimble/ll: Fix directed extended advertising
This patch makes sure TargetA is added only to scannable AUX_ADV_IND
and not later to AUX_SCAN_RSP and chains.
---
nimble/controller/src/ble_ll_adv.c | 28 ++++++++++++++++++++++++----
1 file changed, 24 insertions(+), 4 deletions(-)
diff --git a/nimble/controller/src/ble_ll_adv.c b/nimble/controller/src/ble_ll_adv.c
index 928e88a..54563ba 100644
--- a/nimble/controller/src/ble_ll_adv.c
+++ b/nimble/controller/src/ble_ll_adv.c
@@ -1130,9 +1130,20 @@ ble_ll_adv_aux_calculate(struct ble_ll_adv_sm *advsm,
hdr_len += BLE_LL_EXT_ADV_ADVA_SIZE;
}
- /* TargetA for directed connectable */
- if ((advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_DIRECTED) &&
- (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_CONNECTABLE)) {
+ /* Note: this function does not calculate AUX_ADV_IND when advertising is
+ * scannable. Instead it is calculated in ble_ll_adv_aux_schedule_first().
+ *
+ * However this function calculates length of AUX_SCAN_RSP and according
+ * to BT 5.0 Vol 6 Part B, 2.3.2.3, TargetA shall not be include there.
+ *
+ * This is why TargetA is added to all directed advertising here unless it
+ * is scannable one.
+ *
+ * Note. TargetA shall not be also in AUX_CHAIN_IND
+ */
+ if (aux_data_offset == 0 &&
+ (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_DIRECTED) &&
+ !(advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_SCANNABLE)) {
aux->ext_hdr |= (1 << BLE_LL_EXT_ADV_TARGETA_BIT);
hdr_len += BLE_LL_EXT_ADV_TARGETA_SIZE;
}
@@ -1265,7 +1276,16 @@ ble_ll_adv_aux_schedule_first(struct ble_ll_adv_sm *advsm)
/* AUX_CONN_RSP */
ble_ll_pdu_tx_time_get(14, advsm->sec_phy);
} else if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_SCANNABLE) {
- /* Scheduled aux is calculated for AUX_SCAN_RSP, 1st aux is created separately */
+ /* For scannable advertising we need to calculate how much time we
+ * need for AUX_ADV_IND along with AUX_SCAN_REQ, AUX_SCAN_RSP and
+ * IFS in between.
+ *
+ * Note:
+ * 1. aux->payload_len, which calculated by above ble_ll_adv_aux_calulcate(),
+ * contains AUX_SCAN_RSP length.
+ * 2. length of AUX_ADV_IND is calculated by special function:
+ * ble_ll_adv_aux_scannable_pdu_payload_len()
+ */
max_usecs = ble_ll_pdu_tx_time_get(ble_ll_adv_aux_scannable_pdu_payload_len(advsm),
advsm->sec_phy) +
BLE_LL_IFS +