From c7ceba59143ee5a2cd0e7081ac21c226b72dca07 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Mon, 4 Dec 2023 18:03:21 +0100 Subject: [PATCH] gap: use bool for gap_reconnect_security_setup_active --- src/ble/sm.c | 14 +++++++------- src/gap.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/ble/sm.c b/src/ble/sm.c index 560f2d866..0bb29b79c 100644 --- a/src/ble/sm.c +++ b/src/ble/sm.c @@ -5472,26 +5472,26 @@ void gap_advertisements_set_params(uint16_t adv_int_min, uint16_t adv_int_max, u } #endif -int gap_reconnect_security_setup_active(hci_con_handle_t con_handle){ +bool gap_reconnect_security_setup_active(hci_con_handle_t con_handle){ sm_connection_t * sm_conn = sm_get_connection_for_handle(con_handle); // wrong connection - if (!sm_conn) return 0; + if (!sm_conn) return false; // already encrypted - if (sm_conn->sm_connection_encrypted) return 0; + if (sm_conn->sm_connection_encrypted) return false; // irk status? switch(sm_conn->sm_irk_lookup_state){ case IRK_LOOKUP_FAILED: // done, cannot setup encryption - return 0; + return false; case IRK_LOOKUP_SUCCEEDED: break; default: // IR Lookup pending - return 1; + return true; } // IRK Lookup Succeeded, re-encryption should be initiated. When done, state gets reset or indicates failure - if (sm_conn->sm_engine_state == SM_GENERAL_REENCRYPTION_FAILED) return 0; - if (sm_conn->sm_role){ + if (sm_conn->sm_engine_state == SM_GENERAL_REENCRYPTION_FAILED) return false; + if (sm_conn->sm_role != 0){ return sm_conn->sm_engine_state != SM_RESPONDER_IDLE; } else { return sm_conn->sm_engine_state != SM_INITIATOR_CONNECTED; diff --git a/src/gap.h b/src/gap.h index 879872731..df3b7a2bc 100644 --- a/src/gap.h +++ b/src/gap.h @@ -1409,7 +1409,7 @@ void gap_le_get_own_connection_address(uint8_t * addr_type, bd_addr_t addr); * @param con_handle * @return 1 if security setup is active */ -int gap_reconnect_security_setup_active(hci_con_handle_t con_handle); +bool gap_reconnect_security_setup_active(hci_con_handle_t con_handle); /** * @brief Delete bonding information for remote device