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

Replaced ROOT_RANK with a macro that allows for other min_hoprankinc parameters than the default. Also made some minor style improvements.

Browse source
This commit is contained in:
nvt 2011-02-20 20:15:40 +01:00
parent 263f7e6ebd
commit 01b7a4f7f2
3 changed files with 16 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -179,7 +179,6 @@ rpl_set_root(uip_ipaddr_t *dag_id)
dag->version = version + 1;
dag->grounded = RPL_GROUNDED;
dag->mop = RPL_MOP_DEFAULT;
dag->rank = ROOT_RANK;
dag->of = &RPL_OF;
dag->preferred_parent = NULL;
dag->dtsn_out = 1; /* Trigger DAOs from the beginning. */
@ -195,6 +194,8 @@ rpl_set_root(uip_ipaddr_t *dag_id)
dag->default_lifetime = DEFAULT_RPL_DEF_LIFETIME;
dag->lifetime_unit = DEFAULT_RPL_LIFETIME_UNIT;
dag->rank = ROOT_RANK(dag);
dag->of->update_metric_container(dag);
PRINTF("RPL: Node set to be a DAG root with DAG ID ");
@ -555,7 +556,7 @@ global_repair(uip_ipaddr_t *from, rpl_dag_t *dag, rpl_dio_t *dio)
int
rpl_repair_dag(rpl_dag_t *dag)
{
if(dag->rank == ROOT_RANK) {
if(dag->rank == ROOT_RANK(dag)) {
dag->version++;
dag->dtsn_out = 1;
rpl_reset_dio_timer(dag, 1);
@ -673,7 +674,7 @@ rpl_process_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
}
if(dio->version > dag->version) {
if(dag->rank == ROOT_RANK) {
if(dag->rank == ROOT_RANK(dag)) {
PRINTF("RPL: Root received inconsistent DIO version number\n");
dag->version = dio->version + 1;
rpl_reset_dio_timer(dag, 1);
@ -690,9 +691,13 @@ rpl_process_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
if(dio->rank == INFINITE_RANK) {
rpl_reset_dio_timer(dag, 1);
} else if(dio->rank < ROOT_RANK(dag)) {
PRINTF("RPL: Ignoring DIO with too low rank: %u\n",
(unsigned)dio->rank);
return;
}
if(dag->rank == ROOT_RANK) {
if(dag->rank == ROOT_RANK(dag)) {
if(dio->rank != INFINITE_RANK) {
dag->dio_counter++;
}