michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: RFCOMM: Implement timer in dlc

Browse source 
This basically implements timer for connection and disconnection.

Conn timer will be started when dlc is initialized and stopped
when it is connected. Authentication if any, will be also included
in this timer.

Disc timer will be started during disconnect initiation.

Change-Id: Ia4b74e478fefa42db21aef528e623a24c72ddf7f
Signed-off-by: Jaganath Kanakkassery <jaganathx.kanakkassery@intel.com>
This commit is contained in:
Jaganath Kanakkassery 2016-12-21 20:20:04 +05:30 • committed by Johan Hedberg
commit 665937a19f
2 changed files with 32 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/bluetooth/rfcomm.h
View file

@ -84,6 +84,9 @@ typedef enum bt_rfcomm_role {
/** @brief RFCOMM DLC structure. */ /** @brief RFCOMM DLC structure. */
struct bt_rfcomm_dlc { struct bt_rfcomm_dlc {
/* Response Timeout eXpired (RTX) timer */
struct k_delayed_work rtx_work;
/* Queue for outgoing data */ /* Queue for outgoing data */
struct k_fifo tx_queue; struct k_fifo tx_queue;

30
subsys/bluetooth/host/rfcomm.c
View file

@ -52,6 +52,11 @@
#define RFCOMM_CREDITS_THRESHOLD (RFCOMM_MAX_CREDITS / 2) #define RFCOMM_CREDITS_THRESHOLD (RFCOMM_MAX_CREDITS / 2)
#define RFCOMM_DEFAULT_CREDIT RFCOMM_MAX_CREDITS #define RFCOMM_DEFAULT_CREDIT RFCOMM_MAX_CREDITS
#define RFCOMM_CONN_TIMEOUT K_SECONDS(60)
#define RFCOMM_DISC_TIMEOUT K_SECONDS(20)
#define DLC_RTX(_w) CONTAINER_OF(_w, struct bt_rfcomm_dlc, rtx_work)
static struct bt_rfcomm_server *servers; static struct bt_rfcomm_server *servers;
/* Pool for outgoing RFCOMM control packets, min MTU is 23 */ /* Pool for outgoing RFCOMM control packets, min MTU is 23 */
@ -243,6 +248,7 @@ static void rfcomm_dlc_destroy(struct bt_rfcomm_dlc *dlc)
{ {
BT_DBG("dlc %p", dlc); BT_DBG("dlc %p", dlc);
k_delayed_work_cancel(&dlc->rtx_work);
dlc->state = BT_RFCOMM_STATE_IDLE; dlc->state = BT_RFCOMM_STATE_IDLE;
dlc->session = NULL; dlc->session = NULL;
@ -421,6 +427,18 @@ static void rfcomm_disconnected(struct bt_l2cap_chan *chan)
session->state = BT_RFCOMM_STATE_IDLE; session->state = BT_RFCOMM_STATE_IDLE;
} }
static void rfcomm_dlc_rtx_timeout(struct k_work *work)
{
struct bt_rfcomm_dlc *dlc = DLC_RTX(work);
struct bt_rfcomm_session *session = dlc->session;
BT_WARN("dlc %p state %d timeout", dlc, dlc->state);
rfcomm_dlcs_remove_dlci(session->dlcs, dlc->dlci);
rfcomm_dlc_disconnect(dlc);
rfcomm_session_disconnect(session);
}
static void rfcomm_dlc_init(struct bt_rfcomm_dlc *dlc, static void rfcomm_dlc_init(struct bt_rfcomm_dlc *dlc,
struct bt_rfcomm_session *session, struct bt_rfcomm_session *session,
uint8_t dlci, uint8_t dlci,
@ -434,6 +452,10 @@ static void rfcomm_dlc_init(struct bt_rfcomm_dlc *dlc,
dlc->state = BT_RFCOMM_STATE_INIT; dlc->state = BT_RFCOMM_STATE_INIT;
dlc->role = role; dlc->role = role;
k_sem_init(&dlc->tx_credits, 0, UINT32_MAX); k_sem_init(&dlc->tx_credits, 0, UINT32_MAX);
k_delayed_work_init(&dlc->rtx_work, rfcomm_dlc_rtx_timeout);
/* Start a conn timer which includes auth as well */
k_delayed_work_submit(&dlc->rtx_work, RFCOMM_CONN_TIMEOUT);
dlc->_next = session->dlcs; dlc->_next = session->dlcs;
session->dlcs = dlc; session->dlcs = dlc;
@ -548,6 +570,7 @@ static void rfcomm_dlc_tx_thread(void *p1, void *p2, void *p3)
if (dlc->state == BT_RFCOMM_STATE_DISCONNECTING) { if (dlc->state == BT_RFCOMM_STATE_DISCONNECTING) {
rfcomm_send_disc(dlc->session, dlc->dlci); rfcomm_send_disc(dlc->session, dlc->dlci);
k_delayed_work_submit(&dlc->rtx_work, RFCOMM_DISC_TIMEOUT);
} else { } else {
rfcomm_dlc_destroy(dlc); rfcomm_dlc_destroy(dlc);
} }
@ -670,6 +693,9 @@ static void rfcomm_dlc_connected(struct bt_rfcomm_dlc *dlc)
rfcomm_send_msc(dlc, BT_RFCOMM_MSG_CMD_CR); rfcomm_send_msc(dlc, BT_RFCOMM_MSG_CMD_CR);
/* Cancel conn timer */
k_delayed_work_cancel(&dlc->rtx_work);
k_fifo_init(&dlc->tx_queue); k_fifo_init(&dlc->tx_queue);
k_thread_spawn(dlc->stack, sizeof(dlc->stack), rfcomm_dlc_tx_thread, k_thread_spawn(dlc->stack, sizeof(dlc->stack), rfcomm_dlc_tx_thread,
dlc, NULL, NULL, K_PRIO_COOP(7), 0, K_NO_WAIT); dlc, NULL, NULL, K_PRIO_COOP(7), 0, K_NO_WAIT);
@ -734,6 +760,7 @@ static int rfcomm_dlc_close(struct bt_rfcomm_dlc *dlc)
case BT_RFCOMM_STATE_CONFIG: case BT_RFCOMM_STATE_CONFIG:
dlc->state = BT_RFCOMM_STATE_DISCONNECTING; dlc->state = BT_RFCOMM_STATE_DISCONNECTING;
rfcomm_send_disc(dlc->session, dlc->dlci); rfcomm_send_disc(dlc->session, dlc->dlci);
k_delayed_work_submit(&dlc->rtx_work, RFCOMM_DISC_TIMEOUT);
break; break;
case BT_RFCOMM_STATE_CONNECTED: case BT_RFCOMM_STATE_CONNECTED:
dlc->state = BT_RFCOMM_STATE_DISCONNECTING; dlc->state = BT_RFCOMM_STATE_DISCONNECTING;
@ -785,7 +812,6 @@ static void rfcomm_handle_sabm(struct bt_rfcomm_session *session, uint8_t dlci)
switch (result) { switch (result) {
case RFCOMM_SECURITY_PENDING: case RFCOMM_SECURITY_PENDING:
dlc->state = BT_RFCOMM_STATE_SECURITY_PENDING; dlc->state = BT_RFCOMM_STATE_SECURITY_PENDING;
/* TODO: Start an auth timer */
return; return;
case RFCOMM_SECURITY_PASSED: case RFCOMM_SECURITY_PASSED:
break; break;
@ -1479,6 +1505,8 @@ int bt_rfcomm_dlc_disconnect(struct bt_rfcomm_dlc *dlc)
net_buf_put(&dlc->tx_queue, net_buf_put(&dlc->tx_queue,
net_buf_alloc(&dummy_pool, K_NO_WAIT)); net_buf_alloc(&dummy_pool, K_NO_WAIT));
k_delayed_work_submit(&dlc->rtx_work, RFCOMM_DISC_TIMEOUT);
return 0; return 0;
} }