giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sixtop: start transaction timer in its allocation process

Browse Source 
While the timer is designed to get started on state transition from
SIXP_TRANS_STATE_INIT, the state transition may not happen in some
erroneous situation. This change makes sure that the timer is started
once it's allocated.
This commit is contained in:
Yasuyuki Tanaka 2017-07-12 11:07:41 +09:00
parent cac54874d2
commit efd84940d8
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
os/net/mac/tsch/sixtop/sixp-trans.c
View File

@ -98,6 +98,13 @@ handle_trans_timeout(void *ptr)
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void
start_trans_timer(sixp_trans_t *trans)
{
ctimer_set(&trans->timer, trans->sf->timeout_interval,
handle_trans_timeout, trans);
}
/*---------------------------------------------------------------------------*/
static void
process_trans(void *ptr) process_trans(void *ptr)
{ {
sixp_trans_t *trans = (sixp_trans_t *)ptr; sixp_trans_t *trans = (sixp_trans_t *)ptr;
@ -139,8 +146,7 @@ process_trans(void *ptr)
if(trans->state != SIXP_TRANS_STATE_TERMINATING) { if(trans->state != SIXP_TRANS_STATE_TERMINATING) {
/* set the timer with a timeout values defined by the SF */ /* set the timer with a timeout values defined by the SF */
ctimer_set(&trans->timer, trans->sf->timeout_interval, start_trans_timer(trans);
handle_trans_timeout, trans);
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -338,6 +344,7 @@ sixp_trans_alloc(const sixp_pkt_t *pkt, const linkaddr_t *peer_addr)
trans->state = SIXP_TRANS_STATE_INIT; trans->state = SIXP_TRANS_STATE_INIT;
trans->mode = determine_trans_mode(pkt); trans->mode = determine_trans_mode(pkt);
list_add(trans_list, trans); list_add(trans_list, trans);
start_trans_timer(trans);
return trans; return trans;
} }