From 2197dbaf9148b19ffcb39a1779bdaf2165216fca Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Mon, 4 Dec 2023 18:12:03 +0100 Subject: [PATCH] gatt_client: use bool for wait_for_authentication_complete --- src/ble/gatt_client.c | 8 ++++---- src/ble/gatt_client.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ble/gatt_client.c b/src/ble/gatt_client.c index a61fe02da..3bfb0e31e 100644 --- a/src/ble/gatt_client.c +++ b/src/ble/gatt_client.c @@ -1128,7 +1128,7 @@ static bool gatt_client_run_for_gatt_client(gatt_client_t * gatt_client){ } if (client_request_pending && (gatt_client_required_security_level > gatt_client->security_level) && check_security){ log_info("Trigger pairing, current security level %u, required %u\n", gatt_client->security_level, gatt_client_required_security_level); - gatt_client->wait_for_authentication_complete = 1; + gatt_client->wait_for_authentication_complete = true; // set att error code for pairing failure based on required level switch (gatt_client_required_security_level){ case LEVEL_4: @@ -1483,7 +1483,7 @@ static void gatt_client_handle_reencryption_complete(const uint8_t * packet){ gatt_client->reencryption_result = sm_event_reencryption_complete_get_status(packet); gatt_client->reencryption_active = false; - gatt_client->wait_for_authentication_complete = 0; + gatt_client->wait_for_authentication_complete = false; if (gatt_client->state == P_READY) return; @@ -1555,7 +1555,7 @@ static void gatt_client_event_packet_handler(uint8_t packet_type, uint16_t chann gatt_client->security_level = gatt_client_le_security_level_for_connection(con_handle); if (gatt_client->wait_for_authentication_complete){ - gatt_client->wait_for_authentication_complete = 0; + gatt_client->wait_for_authentication_complete = false; if (sm_event_pairing_complete_get_status(packet)){ log_info("pairing failed, report previous error 0x%x", gatt_client->pending_error_code); gatt_client_report_error_if_pending(gatt_client, gatt_client->pending_error_code); @@ -2098,7 +2098,7 @@ static void gatt_client_handle_att_response(gatt_client_t * gatt_client, uint8_t log_info("security error, start pairing"); // start pairing for higher security level - gatt_client->wait_for_authentication_complete = 1; + gatt_client->wait_for_authentication_complete = true; gatt_client->pending_error_code = att_status; sm_request_pairing(gatt_client->con_handle); break; diff --git a/src/ble/gatt_client.h b/src/ble/gatt_client.h index 73bffdfd0..b2f3409ac 100644 --- a/src/ble/gatt_client.h +++ b/src/ble/gatt_client.h @@ -245,7 +245,7 @@ typedef struct gatt_client{ btstack_timer_source_t gc_timeout; uint8_t security_counter; - uint8_t wait_for_authentication_complete; + bool wait_for_authentication_complete; uint8_t pending_error_code; bool reencryption_active;