espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-08-30 05:40:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

nimble/test: Check for ble_gap_conn_find return value

Browse Source 
Make sure ble_gap_test_conn_desc is not left in invalid state if
connection (on bug) wasn't found.

X-Original-Commit: f307b7226d0003c7bf8c0811ff196df1ff463ade
This commit is contained in:
Szymon Janc
2017-08-31 16:04:10 +02:00
parent dfca210761
commit bfa341f173
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/test/src/ble_gap_test.c
+13 -7
View File
@@ -79,6 +79,7 @@ static int
ble_gap_test_util_connect_cb(struct ble_gap_event *event, void *arg)
{
int *fail_reason;
int ret;
ble_gap_test_event = *event;
ble_gap_test_conn_arg = arg;
@@ -86,7 +87,9 @@ ble_gap_test_util_connect_cb(struct ble_gap_event *event, void *arg)
switch (event->type) {
case BLE_GAP_EVENT_CONNECT:
ble_gap_test_conn_status = event->connect.status;
ble_gap_conn_find(event->connect.conn_handle, &ble_gap_test_conn_desc);
ret = ble_gap_conn_find(event->connect.conn_handle,
&ble_gap_test_conn_desc);
TEST_ASSERT_FATAL(ble_gap_test_conn_status || ret == 0);
break;
case BLE_GAP_EVENT_DISCONNECT:
@@ -96,8 +99,9 @@ ble_gap_test_util_connect_cb(struct ble_gap_event *event, void *arg)
case BLE_GAP_EVENT_CONN_UPDATE:
ble_gap_test_conn_status = event->conn_update.status;
ble_gap_conn_find(event->conn_update.conn_handle,
&ble_gap_test_conn_desc);
ret = ble_gap_conn_find(event->conn_update.conn_handle,
&ble_gap_test_conn_desc);
TEST_ASSERT_FATAL(ret == 0);
break;
case BLE_GAP_EVENT_CONN_CANCEL:
@@ -105,8 +109,9 @@ ble_gap_test_util_connect_cb(struct ble_gap_event *event, void *arg)
case BLE_GAP_EVENT_TERM_FAILURE:
ble_gap_test_conn_status = event->term_failure.status;
ble_gap_conn_find(event->term_failure.conn_handle,
&ble_gap_test_conn_desc);
ret = ble_gap_conn_find(event->term_failure.conn_handle,
&ble_gap_test_conn_desc);
TEST_ASSERT_FATAL(ret == 0);
break;
case BLE_GAP_EVENT_ADV_COMPLETE:
@@ -116,8 +121,9 @@ ble_gap_test_util_connect_cb(struct ble_gap_event *event, void *arg)
case BLE_GAP_EVENT_CONN_UPDATE_REQ:
ble_gap_test_conn_peer_params = *event->conn_update_req.peer_params;
*event->conn_update_req.self_params = ble_gap_test_conn_self_params;
ble_gap_conn_find(event->conn_update_req.conn_handle,
&ble_gap_test_conn_desc);
ret = ble_gap_conn_find(event->conn_update_req.conn_handle,
&ble_gap_test_conn_desc);
TEST_ASSERT_FATAL(ret == 0);
fail_reason = arg;
if (fail_reason == NULL) {