deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

TSCH: start scheduling keep-alives only after tsch_is_associated is set

Browse source
This commit is contained in:
Simon Duquennoy 2016-06-23 18:36:04 +02:00
parent 1acb69e280
commit 5a1a8e84d8
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/net/mac/tsch/tsch.c
View file

@ -562,10 +562,6 @@ tsch_associate(const struct input_packet *input_eb, rtimer_clock_t timestamp)
if(n != NULL) { if(n != NULL) {
tsch_queue_update_time_source((linkaddr_t *)&frame.src_addr); tsch_queue_update_time_source((linkaddr_t *)&frame.src_addr);
#ifdef TSCH_CALLBACK_JOINING_NETWORK
TSCH_CALLBACK_JOINING_NETWORK();
#endif
/* Set PANID */ /* Set PANID */
frame802154_set_pan_id(frame.src_pid); frame802154_set_pan_id(frame.src_pid);
@ -576,9 +572,13 @@ tsch_associate(const struct input_packet *input_eb, rtimer_clock_t timestamp)
tsch_is_associated = 1; tsch_is_associated = 1;
tsch_is_pan_secured = frame.fcf.security_enabled; tsch_is_pan_secured = frame.fcf.security_enabled;
/* Association done, schedule keepalive messages */ /* Start sending keep-alives now that tsch_is_associated is set */
tsch_schedule_keepalive(); tsch_schedule_keepalive();
#ifdef TSCH_CALLBACK_JOINING_NETWORK
TSCH_CALLBACK_JOINING_NETWORK();
#endif
PRINTF("TSCH: association done, sec %u, PAN ID %x, asn-%x.%lx, jp %u, timeslot id %u, hopping id %u, slotframe len %u with %u links, from ", PRINTF("TSCH: association done, sec %u, PAN ID %x, asn-%x.%lx, jp %u, timeslot id %u, hopping id %u, slotframe len %u with %u links, from ",
tsch_is_pan_secured, tsch_is_pan_secured,
frame.src_pid, frame.src_pid,