Merge branch 'apache:master' into guym/sm_invalid_key_size_cb

guy-m · web-flow · commit c88bac0dda94 · 2025-01-23T15:11:21.000+02:00
diff --git a/apps/blemesh/src/main.c b/apps/blemesh/src/main.c
@@ -32,6 +32,10 @@
 #include "services/gap/ble_svc_gap.h"
 #include "mesh/glue.h"
 
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
 /* Company ID */
 #define CID_VENDOR 0x05C3
 #define STANDARD_TEST_ID 0x00
diff --git a/apps/blestress/src/rx_stress.c b/apps/blestress/src/rx_stress.c
@@ -20,6 +20,10 @@
 #include <host/ble_gap.h>
 #include "rx_stress.h"
 
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
 /* UUID128 of stress test use cases*/
 static uint8_t rx_stress_uuid128[STRESS_UUIDS_NUM][16];
 
diff --git a/apps/btshell/src/cmd.c b/apps/btshell/src/cmd.c
@@ -45,6 +45,10 @@
 #include "cmd_l2cap.h"
 #include "cmd_leaudio.h"
 
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
 #define BTSHELL_MODULE "btshell"
 
 int
diff --git a/apps/btshell/src/main.c b/apps/btshell/src/main.c
@@ -58,6 +58,10 @@
 #include "../src/ble_hs_atomic_priv.h"
 #include "../src/ble_hs_priv.h"
 
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
 #if MYNEWT_VAL(BLE_ROLE_CENTRAL)
 #define BTSHELL_MAX_SVCS               32
 #define BTSHELL_MAX_CHRS               64
diff --git a/apps/bttester/src/btp_mesh.c b/apps/bttester/src/btp_mesh.c
@@ -38,6 +38,10 @@
 
 #include "btp/btp.h"
 
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
 extern uint8_t own_addr_type;
 
 #define CONTROLLER_INDEX 0
diff --git a/apps/bttester/src/bttester.c b/apps/bttester/src/bttester.c
@@ -35,6 +35,10 @@
 #include "bttester_pipe.h"
 #include "btp/btp.h"
 
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
 #define CMD_QUEUED 2
 
 static struct os_eventq avail_queue;
diff --git a/apps/bttester/src/rtt_pipe.c b/apps/bttester/src/rtt_pipe.c
@@ -19,6 +19,10 @@
 
 #include "syscfg/syscfg.h"
 
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
 #if MYNEWT_VAL(BTTESTER_PIPE_RTT)
 
 #include "os/mynewt.h"
diff --git a/apps/mesh_badge/src/mesh.c b/apps/mesh_badge/src/mesh.c
@@ -11,6 +11,10 @@
 #include "mesh.h"
 #include "board.h"
 
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
 #define BT_COMP_ID_LF 0x05f1
 
 #define MOD_LF            0x0000
diff --git a/apps/mesh_badge/src/reel_board.c b/apps/mesh_badge/src/reel_board.c
@@ -20,6 +20,10 @@
 
 #define printk console_printf
 
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
 enum font_size {
 	FONT_BIG = 0,
 	FONT_MEDIUM = 1,
diff --git a/nimble/controller/src/ble_ll_isoal.c b/nimble/controller/src/ble_ll_isoal.c
@@ -24,6 +24,10 @@
 #include <controller/ble_ll_isoal.h>
 #include <controller/ble_ll_iso_big.h>
 
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
 #if MYNEWT_VAL(BLE_LL_ISO)
 
 STAILQ_HEAD(ble_ll_iso_tx_q, os_mbuf_pkthdr);
diff --git a/nimble/controller/src/ble_ll_scan_aux.c b/nimble/controller/src/ble_ll_scan_aux.c
@@ -1150,19 +1150,20 @@ ble_ll_scan_aux_scan_req_tx_pdu_cb(uint8_t *dptr, void *arg, uint8_t *hdr_byte)
     uint8_t rpa[BLE_DEV_ADDR_LEN];
 #endif
     uint8_t hb;
+    uint8_t own_addr_type = ble_ll_scan_get_own_addr_type();
 
     hb = BLE_ADV_PDU_TYPE_SCAN_REQ;
 
     /* ScanA */
-    if (ble_ll_scan_get_own_addr_type() & 0x01) {
+    if (own_addr_type & 0x01) {
         hb |= BLE_ADV_PDU_HDR_TXADD_RAND;
         scana = g_random_addr;
     } else {
         scana = g_dev_addr;
     }
 
 #if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
-    if (ble_ll_scan_get_own_addr_type() & 0x02) {
+    if (own_addr_type & 0x02) {
         if (aux->rpa_index >=0) {
             rl = &g_ble_ll_resolv_list[aux->rpa_index];
         } else {
@@ -1171,15 +1172,20 @@ ble_ll_scan_aux_scan_req_tx_pdu_cb(uint8_t *dptr, void *arg, uint8_t *hdr_byte)
 
         /*
          * If device is on RL and we have local IRK, we use RPA generated using
-         * that IRK as ScanA. Otherwise we use NRPA as ScanA to prevent our
-         * device from being tracked when doing an active scan
+         * that IRK as ScanA. Otherwise we use NRPA or RPA from global local IRK
+         * as ScanA to prevent our device from being tracked when doing
+         * an active scan
          * ref: Core 5.2, Vol 6, Part B, section 6.3)
          */
         if (rl && rl->rl_has_local) {
             ble_ll_resolv_get_priv_addr(rl, 1, rpa);
             scana = rpa;
         } else {
-            scana = ble_ll_get_scan_nrpa();
+            if (ble_ll_resolv_local_rpa_get(own_addr_type & 0x01, rpa) == 0) {
+                scana = rpa;
+            } else {
+                scana = ble_ll_get_scan_nrpa();
+            }
         }
 
         hb |= BLE_ADV_PDU_HDR_TXADD_RAND;
diff --git a/nimble/drivers/dialog_cmac/src/ble_phy.c b/nimble/drivers/dialog_cmac/src/ble_phy.c
@@ -39,6 +39,10 @@
 #error LE Coded PHY cannot be enabled on DA1469x
 #endif
 
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
 /* Statistics */
 STATS_SECT_START(ble_phy_stats)
     STATS_SECT_ENTRY(phy_isrs)
diff --git a/nimble/drivers/native/src/ble_phy.c b/nimble/drivers/native/src/ble_phy.c
@@ -28,6 +28,10 @@
 #include "controller/ble_phy.h"
 #include "controller/ble_ll.h"
 
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
 /* BLE PHY data structure */
 struct ble_phy_obj
 {
diff --git a/nimble/drivers/nrf51/src/ble_phy.c b/nimble/drivers/nrf51/src/ble_phy.c
@@ -47,6 +47,10 @@
 #error LE Coded PHY cannot be enabled on nRF51
 #endif
 
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
 static uint32_t
 ble_phy_mode_pdu_start_off(int phy_mode)
 {
diff --git a/nimble/drivers/nrf5x/src/ble_phy.c b/nimble/drivers/nrf5x/src/ble_phy.c
@@ -56,6 +56,10 @@
 #include <nrf_erratas.h>
 #include "phy_priv.h"
 
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
 #if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
 #if !MYNEWT_VAL_CHOICE(MCU_TARGET, nRF52840) && \
     !MYNEWT_VAL_CHOICE(MCU_TARGET, nRF52811) && \
diff --git a/nimble/host/src/ble_iso.c b/nimble/host/src/ble_iso.c
@@ -30,6 +30,10 @@
 #include "ble_hs_hci_priv.h"
 #include "ble_hs_mbuf_priv.h"
 
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
 #define ble_iso_big_conn_handles_init(_big, _handles, _num_handles)         \
     do {                                                                    \
         struct ble_iso_conn *conn = SLIST_FIRST(&ble_iso_conns);            \
diff --git a/nimble/host/src/ble_l2cap_coc.c b/nimble/host/src/ble_l2cap_coc.c
@@ -25,6 +25,10 @@
 #include "ble_l2cap_coc_priv.h"
 #include "ble_l2cap_sig_priv.h"
 
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
 #if MYNEWT_VAL(BLE_L2CAP_COC_MAX_NUM) != 0 && NIMBLE_BLE_CONNECT
 
 #ifndef min
diff --git a/nimble/host/test/src/ble_att_svr_test.c b/nimble/host/test/src/ble_att_svr_test.c
@@ -27,6 +27,10 @@
 #include "host/ble_l2cap.h"
 #include "ble_hs_test_util.h"
 
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
 static uint8_t *ble_att_svr_test_attr_r_1;
 static uint16_t ble_att_svr_test_attr_r_1_len;
 static uint8_t *ble_att_svr_test_attr_r_2;
diff --git a/porting/nimble/src/os_mbuf.c b/porting/nimble/src/os_mbuf.c
@@ -1273,4 +1273,4 @@ os_mbuf_pack_chains(struct os_mbuf *m1, struct os_mbuf *m2)
     }
 
     return m1;
-}
+}
diff --git a/porting/npl/riot/include/nimble/nimble_npl_os_log.h b/porting/npl/riot/include/nimble/nimble_npl_os_log.h
@@ -21,6 +21,7 @@
 #define _NIMBLE_NPL_OS_LOG_H_
 
 #include <stdarg.h>
+#include <stdio.h>
 
 /* Example on how to use macro to generate module logging functions */
 #define BLE_NPL_LOG_IMPL(lvl) \
