Bluetooth: Increase size of max advertising received (now ~120b on high MTU builds)

            nRF52840: Fix crash if receiving >32b of advertisement data

Author: gfwilliams

libs/bluetooth/bluetooth.h

@@ -245,8 +245,8 @@ extern volatile uint16_t                         m_central_conn_handles[CENTRAL_
 typedef struct {
   ble_gap_addr_t            peer_addr;
   int8_t                    rssi;                  /**< Received Signal Strength Indication in dBm of the last packet received. */
-  uint8_t        dlen;                  /**< Advertising or scan response data length. */
-  uint8_t        data[BLE_GAP_ADV_MAX_SIZE];    /**< Advertising or scan response data. */
+  uint8_t                   dlen;                  /**< Advertising or scan response data length. */
+  uint8_t                   data[IOEVENT_MAX_LEN-10];    /**< Advertising or scan response data - ensure we can *just* fit it in our BLE buffer */
 } BLEAdvReportData;
 
 /** Initialise the BLE stack */

libs/bluetooth/bluetooth_utils.c

@@ -413,7 +413,7 @@ bool jsble_exec_pending_common(BLEPending blep, uint16_t data, unsigned char *bu
   }
   case BLEP_ADV_REPORT: {
     BLEAdvReportData *p_adv = (BLEAdvReportData *)buffer;
-    size_t len = sizeof(BLEAdvReportData) + p_adv->dlen - BLE_GAP_ADV_MAX_SIZE;
+    size_t len = sizeof(BLEAdvReportData) + p_adv->dlen - sizeof(adv.data);
     if (bufferLen != len) {
 #ifndef RELEASE
       jsiConsolePrintf("BLEP_ADV %d %d %d\n", bufferLen,len,p_adv->dlen);

targets/esp32/BLE/esp32_gap_func.c

@@ -126,9 +126,9 @@ void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *par
       espbtaddr_TO_bleaddr(param->scan_rst.bda, param->scan_rst.ble_addr_type, &adv.peer_addr);
       adv.rssi = param->scan_rst.rssi;
       adv.dlen = param->scan_rst.adv_data_len;
-      if (adv.dlen > BLE_GAP_ADV_MAX_SIZE) adv.dlen = BLE_GAP_ADV_MAX_SIZE;
+      if (adv.dlen > sizeof(adv.data)) adv.dlen = sizeof(adv.data);
       memcpy(adv.data, param->scan_rst.ble_adv, adv.dlen);
-      size_t len = sizeof(BLEAdvReportData) + adv.dlen - BLE_GAP_ADV_MAX_SIZE;
+      size_t len = sizeof(BLEAdvReportData) + adv.dlen - sizeof(adv.data);
       jsble_queue_pending_buf(BLEP_ADV_REPORT, 0, (char*)&adv, len);
       break;
     }

targets/nrf5x/bluetooth.c

@@ -1559,10 +1559,11 @@ static void ble_evt_handler(ble_evt_t const * p_ble_evt, void * p_context) {
         adv.dlen = p_adv->dlen;
         memcpy(adv.data, p_adv->data, adv.dlen);
 #else
-        adv.dlen = p_adv->data.len;
+        adv.dlen = (p_adv->data.len > sizeof(adv.data)) ? sizeof(adv.data) : p_adv->data.len;
         memcpy(adv.data, p_adv->data.p_data, adv.dlen);
 #endif
-        size_t len = sizeof(BLEAdvReportData) + adv.dlen - BLE_GAP_ADV_MAX_SIZE/*BLEAdvReportData contans uint8_t[BLE_GAP_ADV_MAX_SIZE]*/;
+        // FIXME: We might be getting *more* advertising data than we can push to our event queue, because we're limited by IOEVENT_MAX_LEN - I guess we could add >1 packet and decode it?
+        size_t len = sizeof(BLEAdvReportData) + adv.dlen - sizeof(adv.data)/* We don't want to add all of BLEAdvReportData if there isn't that much data */;
         jsble_queue_pending_buf(BLEP_ADV_REPORT, 0, (char*)&adv, len);
 #if NRF_SD_BLE_API_VERSION>5
         // On new APIs we need to continue scanning