From 6de52d252a9a463cdeb74a63aeff703f4c75d074 Mon Sep 17 00:00:00 2001 From: Andrzej Kaczmarek Date: Tue, 5 Dec 2017 10:20:27 +0100 Subject: [PATCH] nimble/host: Fix invalid connection handle usage '0' is a valid connection handle, we need to return proper symbol if there is no connection found. X-Original-Commit: e5a7f8ac1b9b13018c01d2f69b08d20bc6f33aa9 --- nimble/host/src/ble_att.c | 2 +- nimble/host/src/ble_l2cap.c | 2 +- nimble/host/src/ble_sm.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nimble/host/src/ble_att.c b/nimble/host/src/ble_att.c index 8261e09e7..774444ab0 100644 --- a/nimble/host/src/ble_att.c +++ b/nimble/host/src/ble_att.c @@ -471,7 +471,7 @@ ble_att_rx(struct ble_l2cap_chan *chan) int rc; conn_handle = ble_l2cap_get_conn_handle(chan); - if (!conn_handle) { + if (conn_handle == BLE_HS_CONN_HANDLE_NONE) { return BLE_HS_ENOTCONN; } diff --git a/nimble/host/src/ble_l2cap.c b/nimble/host/src/ble_l2cap.c index 1c7e27a2a..883bde78a 100644 --- a/nimble/host/src/ble_l2cap.c +++ b/nimble/host/src/ble_l2cap.c @@ -135,7 +135,7 @@ uint16_t ble_l2cap_get_conn_handle(struct ble_l2cap_chan *chan) { if (!chan) { - return 0; + return BLE_HS_CONN_HANDLE_NONE; } return chan->conn_handle; diff --git a/nimble/host/src/ble_sm.c b/nimble/host/src/ble_sm.c index 205b05f9a..e53b4ff1a 100644 --- a/nimble/host/src/ble_sm.c +++ b/nimble/host/src/ble_sm.c @@ -2565,7 +2565,7 @@ ble_sm_rx(struct ble_l2cap_chan *chan) STATS_INC(ble_l2cap_stats, sm_rx); conn_handle = ble_l2cap_get_conn_handle(chan); - if (!conn_handle) { + if (conn_handle == BLE_HS_CONN_HANDLE_NONE) { return BLE_HS_ENOTCONN; }