You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by we...@apache.org on 2016/06/03 15:41:03 UTC

[1/3] incubator-mynewt-core git commit: Fix TXADD bit not being set correctly in advertisements for all cases

Repository: incubator-mynewt-core
Updated Branches:
  refs/heads/develop 7b7ff8ddc -> 8b9c08139


Fix TXADD bit not being set correctly in advertisements for all cases


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/8b9c0813
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/8b9c0813
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/8b9c0813

Branch: refs/heads/develop
Commit: 8b9c0813940695f786e431f73a484b8b5feacfcf
Parents: c6725f9
Author: William San Filippo <wi...@runtime.io>
Authored: Fri Jun 3 08:40:09 2016 -0700
Committer: William San Filippo <wi...@runtime.io>
Committed: Fri Jun 3 08:40:31 2016 -0700

----------------------------------------------------------------------
 net/nimble/controller/src/ble_ll_adv.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/8b9c0813/net/nimble/controller/src/ble_ll_adv.c
----------------------------------------------------------------------
diff --git a/net/nimble/controller/src/ble_ll_adv.c b/net/nimble/controller/src/ble_ll_adv.c
index a5974ed..c7b0e2f 100644
--- a/net/nimble/controller/src/ble_ll_adv.c
+++ b/net/nimble/controller/src/ble_ll_adv.c
@@ -79,6 +79,7 @@ struct ble_ll_adv_sm
     uint8_t adv_pdu_len;
     int8_t adv_rpa_index;
     uint8_t adv_directed;
+    uint8_t adv_txadd;
     uint16_t adv_itvl_min;
     uint16_t adv_itvl_max;
     uint32_t adv_itvl_usecs;
@@ -126,7 +127,7 @@ ble_ll_adv_chk_rpa_timeout(struct ble_ll_adv_sm *advsm)
 
     if (advsm->own_addr_type > BLE_HCI_ADV_OWN_ADDR_RANDOM) {
         now = os_time_get();
-        if ((int32_t)(now >= advsm->adv_rpa_timer)) {
+        if ((int32_t)(now - advsm->adv_rpa_timer) >= 0) {
             ble_ll_resolv_gen_rpa(advsm->peer_addr, advsm->peer_addr_type,
                                   advsm->adva, 1);
 
@@ -135,6 +136,17 @@ ble_ll_adv_chk_rpa_timeout(struct ble_ll_adv_sm *advsm)
                                       advsm->initiator_addr, 0);
             }
             advsm->adv_rpa_timer = now + ble_ll_resolv_get_rpa_tmo();
+
+            /* May have to reset txadd bit */
+            if (ble_ll_is_rpa(advsm->adva, 1)) {
+                advsm->adv_txadd = 1;
+            } else {
+                if (advsm->own_addr_type & 1) {
+                    advsm->adv_txadd = 1;
+                } else {
+                    advsm->adv_txadd = 0;
+                }
+            }
         }
     }
 }
@@ -222,8 +234,7 @@ ble_ll_adv_pdu_make(struct ble_ll_adv_sm *advsm, struct os_mbuf *m)
     advsm->adv_pdu_len = pdulen + BLE_LL_PDU_HDR_LEN;
 
     /* Set TxAdd to random if needed. */
-    if (ble_ll_is_rpa(advsm->adva, 1) ||
-        (advsm->own_addr_type & 1)) {
+    if (advsm->adv_txadd) {
         pdu_type |= BLE_ADV_PDU_HDR_TXADD_RAND;
     }
 
@@ -273,7 +284,7 @@ ble_ll_adv_scan_rsp_pdu_make(struct ble_ll_adv_sm *advsm)
     /* Set BLE transmit header */
     pdulen = BLE_DEV_ADDR_LEN + scan_rsp_len;
     hdr = BLE_ADV_PDU_TYPE_SCAN_RSP;
-    if (advsm->own_addr_type & 1) {
+    if (advsm->adv_txadd) {
         hdr |= BLE_ADV_PDU_HDR_TXADD_RAND;
     }
 
@@ -359,7 +370,7 @@ ble_ll_adv_tx_start_cb(struct ble_ll_sched_item *sch)
 #endif
 
 #if (BLE_LL_CFG_FEAT_LL_PRIVACY == 1)
-    advsm->adv_rpa_index = 0;
+    advsm->adv_rpa_index = -1;
     if (ble_ll_resolv_enabled()) {
         ble_phy_resolv_list_enable();
     } else {
@@ -659,8 +670,10 @@ ble_ll_adv_sm_start(struct ble_ll_adv_sm *advsm)
     /* Set advertising address */
     if ((advsm->own_addr_type & 1) == 0) {
         addr = g_dev_addr;
+        advsm->adv_txadd = 0;
     } else {
         addr = g_random_addr;
+        advsm->adv_txadd = 1;
     }
     memcpy(advsm->adva, addr, BLE_DEV_ADDR_LEN);
 


[2/3] incubator-mynewt-core git commit: Fix RPA usage for scanner when advertising not using RPA

Posted by we...@apache.org.
Fix RPA usage for scanner when advertising not using RPA


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/c6725f9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/c6725f9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/c6725f9c

Branch: refs/heads/develop
Commit: c6725f9c64f76ac0a47ff6933c9cc1d5e25505cf
Parents: 81fe132
Author: William San Filippo <wi...@runtime.io>
Authored: Fri Jun 3 08:39:30 2016 -0700
Committer: William San Filippo <wi...@runtime.io>
Committed: Fri Jun 3 08:40:31 2016 -0700

----------------------------------------------------------------------
 apps/bletest/src/main.c                 | 34 ++++++++++++----------------
 net/nimble/controller/src/ble_ll_scan.c | 19 ++++++++--------
 2 files changed, 25 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c6725f9c/apps/bletest/src/main.c
----------------------------------------------------------------------
diff --git a/apps/bletest/src/main.c b/apps/bletest/src/main.c
index f4e4424..7aa2396 100755
--- a/apps/bletest/src/main.c
+++ b/apps/bletest/src/main.c
@@ -99,23 +99,24 @@ os_membuf_t g_mbuf_buffer[MBUF_MEMPOOL_SIZE];
 #define BLETEST_ROLE_INITIATOR          (2)
 
 //#define BLETEST_CFG_ROLE                (BLETEST_ROLE_INITIATOR)
-#define BLETEST_CFG_ROLE                (BLETEST_ROLE_ADVERTISER)
-//#define BLETEST_CFG_ROLE                (BLETEST_ROLE_SCANNER)
+//#define BLETEST_CFG_ROLE                (BLETEST_ROLE_ADVERTISER)
+#define BLETEST_CFG_ROLE                (BLETEST_ROLE_SCANNER)
 
 /* Advertiser config */
 #define BLETEST_CFG_ADV_OWN_ADDR_TYPE   (BLE_HCI_ADV_OWN_ADDR_PRIV_PUB)
 #define BLETEST_CFG_ADV_PEER_ADDR_TYPE  (BLE_HCI_ADV_PEER_ADDR_PUBLIC)
-#define BLETEST_CFG_FILT_DUP_ADV        (1)
 #define BLETEST_CFG_ADV_ITVL            (60000 / BLE_HCI_ADV_ITVL)
 #define BLETEST_CFG_ADV_TYPE            BLE_HCI_ADV_TYPE_ADV_IND
 #define BLETEST_CFG_ADV_FILT_POLICY     (BLE_HCI_ADV_FILT_NONE)
+#define BLETEST_CFG_ADV_ADDR_RES_EN     (1)
 
 /* Scan config */
 #define BLETEST_CFG_SCAN_ITVL           (700000 / BLE_HCI_SCAN_ITVL)
 #define BLETEST_CFG_SCAN_WINDOW         (700000 / BLE_HCI_SCAN_ITVL)
-#define BLETEST_CFG_SCAN_TYPE           (BLE_HCI_SCAN_TYPE_PASSIVE)
-#define BLETEST_CFG_SCAN_OWN_ADDR_TYPE  (BLE_HCI_ADV_OWN_ADDR_PUBLIC)
-#define BLETEST_CFG_SCAN_FILT_POLICY    (BLE_HCI_SCAN_FILT_NO_WL)
+#define BLETEST_CFG_SCAN_TYPE           (BLE_HCI_SCAN_TYPE_ACTIVE)
+#define BLETEST_CFG_SCAN_OWN_ADDR_TYPE  (BLE_HCI_ADV_OWN_ADDR_PRIV_PUB)
+#define BLETEST_CFG_SCAN_FILT_POLICY    (BLE_HCI_SCAN_FILT_USE_WL)
+#define BLETEST_CFG_FILT_DUP_ADV        (1)
 
 /* Connection config */
 #define BLETEST_CFG_CONN_ITVL           (128)  /* in 1.25 msec increments */
@@ -125,7 +126,7 @@ os_membuf_t g_mbuf_buffer[MBUF_MEMPOOL_SIZE];
 #define BLETEST_CFG_MIN_CE_LEN          (6)
 #define BLETEST_CFG_MAX_CE_LEN          (BLETEST_CFG_CONN_ITVL)
 #define BLETEST_CFG_CONN_PEER_ADDR_TYPE (BLE_HCI_CONN_PEER_ADDR_PUBLIC_IDENT)
-#define BLETEST_CFG_CONN_OWN_ADDR_TYPE  (BLE_HCI_ADV_OWN_ADDR_PUBLIC)
+#define BLETEST_CFG_CONN_OWN_ADDR_TYPE  (BLE_HCI_ADV_OWN_ADDR_PRIV_PUB)
 #define BLETEST_CFG_CONCURRENT_CONNS    (1)
 
 /* Test packet config */
@@ -343,6 +344,9 @@ bletest_init_advertising(void)
     adv.adv_type = BLETEST_CFG_ADV_TYPE;
     adv.adv_channel_map = 0x07;
     adv.adv_filter_policy = BLETEST_CFG_ADV_FILT_POLICY;
+    if ((adv.adv_filter_policy & 1) || (BLETEST_CFG_ADV_ADDR_RES_EN == 1)) {
+        set_peer_addr = 1;
+    }
     adv.peer_addr_type = BLETEST_CFG_ADV_PEER_ADDR_TYPE;
     if ((adv.adv_type == BLE_HCI_ADV_TYPE_ADV_DIRECT_IND_HD) ||
         (adv.adv_type == BLE_HCI_ADV_TYPE_ADV_DIRECT_IND_LD)) {
@@ -380,7 +384,8 @@ bletest_init_advertising(void)
     assert(rc == 0);
 
 #if (BLE_LL_CFG_FEAT_LL_PRIVACY == 1)
-    if (adv.own_addr_type > BLE_HCI_ADV_OWN_ADDR_RANDOM) {
+    if ((adv.own_addr_type > BLE_HCI_ADV_OWN_ADDR_RANDOM) ||
+        (BLETEST_CFG_ADV_ADDR_RES_EN == 1)) {
         rc = bletest_hci_le_add_resolv_list(g_bletest_adv_irk,
                                             g_bletest_init_irk,
                                             adv.peer_addr,
@@ -410,7 +415,6 @@ bletest_init_scanner(void)
 {
     int rc;
     uint8_t own_addr_type;
-    uint8_t dev_addr[BLE_DEV_ADDR_LEN];
     uint8_t buf[BLE_HCI_CMD_HDR_LEN + BLE_HCI_SET_SCAN_PARAM_LEN];
     uint8_t add_whitelist;
 
@@ -435,19 +439,11 @@ bletest_init_scanner(void)
 
             rc = bletest_hci_le_enable_resolv_list(1);
             assert(rc == 0);
-
-            add_whitelist = 0;
         }
 #endif
         if (add_whitelist & 1) {
-            /* Add peer to whitelist */
-            dev_addr[0] = 0x00;
-            dev_addr[1] = 0x00;
-            dev_addr[2] = 0x00;
-            dev_addr[3] = 0x88;
-            dev_addr[4] = 0x88;
-            dev_addr[5] = 0x08;
-            rc = bletest_hci_le_add_to_whitelist(dev_addr,BLE_ADDR_TYPE_PUBLIC);
+            rc = bletest_hci_le_add_to_whitelist(g_bletest_cur_peer_addr,
+                                                 BLE_ADDR_TYPE_PUBLIC);
             assert(rc == 0);
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c6725f9c/net/nimble/controller/src/ble_ll_scan.c
----------------------------------------------------------------------
diff --git a/net/nimble/controller/src/ble_ll_scan.c b/net/nimble/controller/src/ble_ll_scan.c
index 008f632..e5c0b22 100644
--- a/net/nimble/controller/src/ble_ll_scan.c
+++ b/net/nimble/controller/src/ble_ll_scan.c
@@ -160,22 +160,23 @@ ble_ll_scan_req_pdu_make(struct ble_ll_scan_sm *scansm, uint8_t *adv_addr,
 
 #if (BLE_LL_CFG_FEAT_LL_PRIVACY == 1)
     if (scansm->own_addr_type > BLE_HCI_ADV_OWN_ADDR_RANDOM) {
+        rl = NULL;
         if (ble_ll_is_rpa(adv_addr, adv_addr_type)) {
-            rl = NULL;
             if (scansm->scan_rpa_index >= 0) {
                 /* Generate a RPA to use for scana */
                 rl = &g_ble_ll_resolv_list[scansm->scan_rpa_index];
-            } else {
-                if (ble_ll_resolv_enabled()) {
-                    rl = ble_ll_resolv_list_find(adv_addr, adv_addr_type);
-                }
             }
-
-            if (rl) {
-                ble_ll_resolv_gen_priv_addr(rl, 1, rpa);
-                scana = rpa;
+        } else {
+            if (ble_ll_resolv_enabled()) {
+                rl = ble_ll_resolv_list_find(adv_addr, adv_addr_type);
             }
         }
+
+        if (rl) {
+            ble_ll_resolv_gen_priv_addr(rl, 1, rpa);
+            scana = rpa;
+            pdu_type |= BLE_ADV_PDU_HDR_TXADD_RAND;
+        }
     }
 #endif
 


[3/3] incubator-mynewt-core git commit: Fix error in RPA timeout value

Posted by we...@apache.org.
Fix error in RPA timeout value


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/81fe1326
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/81fe1326
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/81fe1326

Branch: refs/heads/develop
Commit: 81fe1326ee478575b465ddef733b6c40fd54200a
Parents: 7b7ff8d
Author: William San Filippo <wi...@runtime.io>
Authored: Fri Jun 3 08:38:32 2016 -0700
Committer: William San Filippo <wi...@runtime.io>
Committed: Fri Jun 3 08:40:31 2016 -0700

----------------------------------------------------------------------
 net/nimble/controller/src/ble_ll_resolv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/81fe1326/net/nimble/controller/src/ble_ll_resolv.c
----------------------------------------------------------------------
diff --git a/net/nimble/controller/src/ble_ll_resolv.c b/net/nimble/controller/src/ble_ll_resolv.c
index b81d957..4d91685 100644
--- a/net/nimble/controller/src/ble_ll_resolv.c
+++ b/net/nimble/controller/src/ble_ll_resolv.c
@@ -323,7 +323,7 @@ ble_ll_resolv_set_rpa_tmo(uint8_t *cmdbuf)
 uint32_t
 ble_ll_resolv_get_rpa_tmo(void)
 {
-    return OS_TICKS_PER_SEC * g_ble_ll_resolv_rpa_tmo;
+    return g_ble_ll_resolv_rpa_tmo;
 }
 
 /**