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

fixed the case when the lladdr did not change but the LLAO is there and it is not an override.

Browse source
This commit is contained in:
Joakim Eriksson 2015-11-26 14:10:16 +01:00
parent 6f271bf853
commit 223f002676
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/net/ipv6/uip-nd6.c
View file

@ -534,9 +534,12 @@ na_input(void)
} }
goto discard; goto discard;
} else { } else {
if(is_override || (!is_override && nd6_opt_llao != NULL && !is_llchange) /**
|| nd6_opt_llao == NULL) { * If this is an cache override, or same lladdr, or no llao -
if(nd6_opt_llao != NULL) { * do updates of nbr states.
*/
if(is_override || !is_llchange || nd6_opt_llao == NULL) {
if(nd6_opt_llao != NULL && is_llchange) {
uip_lladdr_t lladdr_aligned; uip_lladdr_t lladdr_aligned;
extract_lladdr_aligned(&lladdr_aligned); extract_lladdr_aligned(&lladdr_aligned);
@ -554,10 +557,6 @@ na_input(void)
nbr->state = NBR_REACHABLE; nbr->state = NBR_REACHABLE;
/* reachable time is stored in ms */ /* reachable time is stored in ms */
stimer_set(&(nbr->reachable), uip_ds6_if.reachable_time / 1000); stimer_set(&(nbr->reachable), uip_ds6_if.reachable_time / 1000);
} else {
if(nd6_opt_llao != NULL && is_llchange) {
nbr->state = NBR_STALE;
}
} }
} }
} }