commit 6f8f2572e3d4101f5abae4a05a820e0672994de5
author Szymon Janc <szymon.janc@codecoup.pl> Wed Mar 20 13:25:25 2024 +0100
committer Szymon Janc <szymon.janc@codecoup.pl> Thu Mar 21 08:52:42 2024 +0100
tree edb50f251a588c98660d1b00fdd882125b193fb4
parent a6e47b687bf316a2bfd456a455ca904a9903884d

nimble/host: Connect EATT when encryption is enabled

Some peers reject connection to EATT PSM if encryption is not enabled.
Since EATT requires any PDUs to be sent only on encrypted link we
can postpone initiating EATT connection until encryption with no real
drawbacks.

nimble/host/src/ble_eatt.c

diff --git a/nimble/host/src/ble_eatt.c b/nimble/host/src/ble_eatt.c
index 93ff0f5..21732b0 100644
--- a/nimble/host/src/ble_eatt.c
+++ b/nimble/host/src/ble_eatt.c
@@ -450,15 +450,20 @@
     struct ble_eatt *eatt;
 
     switch (event->type) {
-    case BLE_GAP_EVENT_CONNECT:
-        if (event->connect.status != 0) {
+    case BLE_GAP_EVENT_ENC_CHANGE:
+        if (event->enc_change.status != 0) {
             return 0;
         }
 
-        BLE_EATT_LOG_DEBUG("eatt: Device connected, waiting to write into "
-                           "client supported features\n");
+        /* don't try to connect if already connected */
+        if (ble_eatt_find_by_conn_handle(event->enc_change.conn_handle)) {
+            return 0;
+        }
 
-        ble_npl_event_set_arg(&g_read_sup_srv_feat_ev, UINT_TO_POINTER(event->connect.conn_handle));
+        BLE_EATT_LOG_DEBUG("eatt: Encryption enabled, connecting EATT (conn_handle=0x%04x)\n",
+                            event->enc_change.conn_handle);
+
+        ble_npl_event_set_arg(&g_read_sup_srv_feat_ev, UINT_TO_POINTER(event->enc_change.conn_handle));
         ble_npl_eventq_put(ble_hs_evq_get(), &g_read_sup_srv_feat_ev);
 
         break;