From 699c946dafc43100dd91b3ab1dbab9693e302a7c Mon Sep 17 00:00:00 2001 From: Ravi kumar Veeramally Date: Tue, 19 Nov 2013 16:56:25 +0200 Subject: [PATCH] android/hal-pan: Return error in case of unsupported PAN roles --- android/hal-pan.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/android/hal-pan.c b/android/hal-pan.c index 0ca9e123e..e12eac817 100644 --- a/android/hal-pan.c +++ b/android/hal-pan.c @@ -74,6 +74,9 @@ static bt_status_t pan_enable(int local_role) if (!interface_ready()) return BT_STATUS_NOT_READY; + if (!(local_role == BTPAN_ROLE_PANU || local_role == BTPAN_ROLE_PANNAP)) + return BT_STATUS_UNSUPPORTED; + cmd.local_role = local_role; return hal_ipc_cmd(HAL_SERVICE_ID_PAN, HAL_OP_PAN_ENABLE, @@ -109,6 +112,20 @@ static bt_status_t pan_connect(const bt_bdaddr_t *bd_addr, int local_role, if (!interface_ready()) return BT_STATUS_NOT_READY; + switch (local_role) { + case BTPAN_ROLE_PANNAP: + if (remote_role != BTPAN_ROLE_PANU) + return BT_STATUS_UNSUPPORTED; + break; + case BTPAN_ROLE_PANU: + if (remote_role != BTPAN_ROLE_PANNAP && + remote_role != BTPAN_ROLE_PANU) + return BT_STATUS_UNSUPPORTED; + break; + default: + return BT_STATUS_UNSUPPORTED; + } + memcpy(cmd.bdaddr, bd_addr, sizeof(cmd.bdaddr)); cmd.local_role = local_role; cmd.remote_role = remote_role; -- 2.47.3