Minor BT improvements

 * Save interface id in the clinet connect struct
 * Configure MTU on newly established connections
 * Add mgos_bt_gap_parse_name()

CL: Add mgos_bt_gap_parse_name()

PUBLISHED_FROM=82d13bf0a779141d6febc3b4edba96db2574b0f3

Author: Deomid Ryabkov

include/mgos_bt_gap.h

@@ -52,6 +52,9 @@ enum mgos_bt_gap_eir_type {
 struct mg_str mgos_bt_gap_parse_adv_data(const uint8_t *data,
                                          enum mgos_bt_gap_eir_type);
 
+/* Either LONG or, if not provided, SHORT_NAME. */
+struct mg_str mgos_bt_gap_parse_name(const uint8_t *data);
+
 struct mgos_bt_gap_scan_result {
   uint8_t adv_data[MGOS_BT_GAP_ADV_DATA_LEN];
   uint8_t scan_rsp[MGOS_BT_GAP_ADV_DATA_LEN];

src/esp32/esp32_bt_gap.c

@@ -201,10 +201,12 @@ static void esp32_gap_ev_handler(esp_gap_ble_cb_event_t ev,
       struct mgos_bt_gap_scan_result data = {.rssi = p->rssi};
       if (p->search_evt == ESP_GAP_SEARCH_INQ_RES_EVT) {
         char buf[BT_ADDR_STR_LEN], hexbuf[MGOS_BT_GAP_ADV_DATA_LEN * 2 + 1];
+        const struct mg_str name = mgos_bt_gap_parse_name(p->ble_adv);
         cs_to_hex(hexbuf, p->ble_adv, MGOS_BT_GAP_ADV_DATA_LEN);
-        LOG(LL_DEBUG, ("SCAN_RESULT %d %s rssi %d srl %d adl %d [%s]",
-                       p->search_evt, esp32_bt_addr_to_str(p->bda, buf),
-                       p->rssi, p->scan_rsp_len, p->adv_data_len, hexbuf));
+        LOG(LL_DEBUG,
+            ("SCAN_RESULT %d %s [%.*s] rssi %d srl %d adl %d [%s]",
+             p->search_evt, esp32_bt_addr_to_str(p->bda, buf), (int) name.len,
+             name.p, p->rssi, p->scan_rsp_len, p->adv_data_len, hexbuf));
         memcpy(data.addr.addr, p->bda, sizeof(data.addr.addr));
         memcpy(data.adv_data, p->ble_adv, sizeof(data.adv_data));
         memcpy(data.scan_rsp, p->ble_adv + sizeof(data.adv_data),

src/esp32/esp32_bt_gattc.c

@@ -130,19 +130,19 @@ static void esp32_bt_gattc_ev(esp_gattc_cb_event_t ev, esp_gatt_if_t iface,
     case ESP_GATTC_OPEN_EVT: {
       const struct gattc_open_evt_param *p = &ep->open;
       enum cs_log_level ll = ll_from_status(p->status);
-      LOG(ll, ("OPEN if %d st %#hx conn %d %s", iface, p->status, p->conn_id,
-               esp32_bt_addr_to_str(p->remote_bda, buf)));
+      LOG(ll, ("OPEN if %d cid %u addr %s st %#hx mtu %d", iface, p->conn_id,
+               esp32_bt_addr_to_str(p->remote_bda, buf), p->status, p->mtu));
       if (p->status == ESP_GATT_OK) {
         struct conn *conn = find_by_addr(p->remote_bda);
         if (conn == NULL) {
           conn = calloc(1, sizeof(*conn));
+          conn->iface = iface;
           memcpy(conn->c.addr.addr, p->remote_bda, sizeof(conn->c.addr.addr));
+          esp_ble_gattc_send_mtu_req(iface, p->conn_id);
           SLIST_INSERT_HEAD(&s_conns, conn, next);
         }
         conn->c.conn_id = p->conn_id;
         conn->c.mtu = p->mtu;
-        mgos_event_trigger_schedule(MGOS_BT_GATTC_EVENT_CONNECT, &conn->c,
-                                    sizeof(conn->c));
       } else {
         esp_ble_gattc_close(iface, p->conn_id);
         disconnect(p->conn_id, p->remote_bda);
@@ -281,6 +281,12 @@ static void esp32_bt_gattc_ev(esp_gattc_cb_event_t ev, esp_gatt_if_t iface,
       const struct gattc_cfg_mtu_evt_param *p = &ep->cfg_mtu;
       enum cs_log_level ll = ll_from_status(p->status);
       LOG(ll, ("CFG_MTU st %d cid %u mtu %d", p->status, p->conn_id, p->mtu));
+      struct conn *conn = find_by_conn_id(p->conn_id);
+      if (conn != NULL) {
+        conn->c.mtu = p->mtu;
+        mgos_event_trigger_schedule(MGOS_BT_GATTC_EVENT_CONNECT, &conn->c,
+                                    sizeof(conn->c));
+      }
       break;
     }
     case ESP_GATTC_ADV_DATA_EVT: {

src/mgos_bt_gap.c

@@ -12,3 +12,11 @@ struct mg_str mgos_bt_gap_parse_adv_data(const uint8_t *data,
   }
   return res;
 }
+
+struct mg_str mgos_bt_gap_parse_name(const uint8_t *data) {
+  struct mg_str s = mgos_bt_gap_parse_adv_data(data, MGOS_BT_GAP_EIR_FULL_NAME);
+  if (s.len == 0) {
+    s = mgos_bt_gap_parse_adv_data(data, MGOS_BT_GAP_EIR_SHORT_NAME);
+  }
+  return s;
+}