Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-12-22 10:30:13 +00:00
Code Issues Projects Releases Wiki Activity

Orchestra: fix orchestra-rule-eb-per-time-source to handle hash collisions

Browse Source
This commit is contained in:
Simon Duquennoy 2016-05-20 13:51:24 +02:00
parent 7e8d042609
commit c7694e4dbd
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/orchestra/orchestra-rule-eb-per-time-source.c
View File

@ -83,14 +83,24 @@ new_time_source(const struct tsch_neighbor *old, const struct tsch_neighbor *new
if(old_ts != 0xffff) { if(old_ts != 0xffff) {
/* Stop listening to the old time source's EBs */ /* Stop listening to the old time source's EBs */
tsch_schedule_remove_link_by_timeslot(sf_eb, old_ts); if(old_ts == get_node_timeslot(&linkaddr_node_addr)) {
/* This was the same timeslot as slot. Reset original link options */
tsch_schedule_add_link(sf_eb, LINK_OPTION_TX, LINK_TYPE_ADVERTISING_ONLY,
&tsch_broadcast_address, old_ts, 0);
} else {
/* Remove slot */
tsch_schedule_remove_link_by_timeslot(sf_eb, old_ts);
}
} }
if(new_ts != 0xffff) { if(new_ts != 0xffff) {
uint8_t link_options = LINK_OPTION_RX;
if(new_ts == get_node_timeslot(&linkaddr_node_addr)) {
/* This is also our timeslot, add necessary flags */
link_options |= LINK_OPTION_TX;
}
/* Listen to the time source's EBs */ /* Listen to the time source's EBs */
tsch_schedule_add_link(sf_eb, tsch_schedule_add_link(sf_eb, link_options, LINK_TYPE_ADVERTISING_ONLY,
LINK_OPTION_RX, &tsch_broadcast_address, new_ts, 0);
LINK_TYPE_ADVERTISING_ONLY, NULL,
new_ts, 0);
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/