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

Merge pull request #63 from g-oikonomou/uip_ds6_route-fix

Browse source 
Fix a route lifetime bug
This commit is contained in:
Adam Dunkels 2012-12-20 00:26:38 -08:00
parent b8f79b9da3 68f59113d6
commit a3094a7afe
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
core/net/rpl/rpl.c
View file

@ -62,14 +62,31 @@ rpl_purge_routes(void)
{ {
uip_ds6_route_t *r; uip_ds6_route_t *r;
/* First pass, decrement lifetime */
r = uip_ds6_route_list_head(); r = uip_ds6_route_list_head();
while(r != NULL) { while(r != NULL) {
if(r->state.lifetime <= 1) { if(r->state.lifetime >= 1) {
/*
* If a route is at lifetime == 1, set it to 0, scheduling it for
* immediate removal below. This achieves the same as the original code,
* which would delete lifetime <= 1
*/
r->state.lifetime--;
}
r = list_item_next(r);
}
/* Second pass, remove dead routes */
r = uip_ds6_route_list_head();
while(r != NULL) {
if(r->state.lifetime < 1) {
/* Routes with lifetime == 1 have only just been decremented from 2 to 1,
* thus we want to keep them. Hence < and not <= */
uip_ds6_route_rm(r); uip_ds6_route_rm(r);
r = uip_ds6_route_list_head(); r = uip_ds6_route_list_head();
} else { } else {
r->state.lifetime--;
r = list_item_next(r); r = list_item_next(r);
} }
} }