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

Merge pull request #1016 from cetic/pr-cleanup-dodag-when-root

Browse source 
Remove all the DODAG from the instance when the node is set as Root
This commit is contained in:
Nicolas Tsiftes 2015-05-10 17:15:25 +02:00
parent 44af0fa66b 9d94c4efae
commit 71427ed4cc
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
core/net/rpl/rpl-dag.c
View file

@ -269,17 +269,27 @@ rpl_set_root(uint8_t instance_id, uip_ipaddr_t *dag_id)
rpl_dag_t *dag; rpl_dag_t *dag;
rpl_instance_t *instance; rpl_instance_t *instance;
uint8_t version; uint8_t version;
int i;
version = RPL_LOLLIPOP_INIT; version = RPL_LOLLIPOP_INIT;
dag = get_dag(instance_id, dag_id); instance = rpl_get_instance(instance_id);
if(dag != NULL) { if(instance != NULL) {
version = dag->version; for(i = 0; i < RPL_MAX_DAG_PER_INSTANCE; ++i) {
RPL_LOLLIPOP_INCREMENT(version); dag = &instance->dag_table[i];
PRINTF("RPL: Dropping a joined DAG when setting this node as root"); if(dag->used) {
if(dag == dag->instance->current_dag) { if(uip_ipaddr_cmp(&dag->dag_id, dag_id)) {
dag->instance->current_dag = NULL; version = dag->version;
RPL_LOLLIPOP_INCREMENT(version);
}
if(dag == dag->instance->current_dag) {
PRINTF("RPL: Dropping a joined DAG when setting this node as root");
dag->instance->current_dag = NULL;
} else {
PRINTF("RPL: Dropping a DAG when setting this node as root");
}
rpl_free_dag(dag);
}
} }
rpl_free_dag(dag);
} }
dag = rpl_alloc_dag(instance_id, dag_id); dag = rpl_alloc_dag(instance_id, dag_id);