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

Removed redundant code, moved the control of acceptable rank increases into a separate function.

Browse source
This commit is contained in:
nvt-se 2010-06-07 14:01:22 +00:00
parent c6c6760838
commit 4e61d69a49
1 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,7 +32,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: rpl-dag.c,v 1.21 2010/06/07 13:40:05 nvt-se Exp $ * $Id: rpl-dag.c,v 1.22 2010/06/07 14:01:22 nvt-se Exp $
*/ */
/** /**
* \file * \file
@ -68,7 +68,7 @@ static rpl_of_t *objective_functions[] = {&rpl_of_etx, NULL};
#endif /* !RPL_CONF_MAX_DAG_ENTRIES */ #endif /* !RPL_CONF_MAX_DAG_ENTRIES */
#ifndef RPL_CONF_MAX_PARENTS #ifndef RPL_CONF_MAX_PARENTS
#define RPL_MAX_PARENTS 8 #define RPL_MAX_PARENTS 4
#else #else
#define RPL_MAX_PARENTS RPL_CONF_MAX_PARENTS #define RPL_MAX_PARENTS RPL_CONF_MAX_PARENTS
#endif /* !RPL_CONF_MAX_PARENTS */ #endif /* !RPL_CONF_MAX_PARENTS */
@ -131,6 +131,13 @@ should_send_dao(rpl_dag_t *dag, rpl_dio_t *dio, rpl_parent_t *p)
dio->dtsn > p->dtsn && p == dag->best_parent; dio->dtsn > p->dtsn && p == dag->best_parent;
} }
/************************************************************************/ /************************************************************************/
static int
acceptable_rank_increase(rpl_dag_t *dag, rpl_parent_t *p)
{
return !dag->max_rankinc ||
dag->of->increment_rank(p->rank, p) <= dag->min_rank + dag->max_rankinc;
}
/************************************************************************/
rpl_dag_t * rpl_dag_t *
rpl_set_root(uip_ipaddr_t *dag_id) rpl_set_root(uip_ipaddr_t *dag_id)
{ {
@ -501,7 +508,7 @@ rpl_process_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
rpl_dag_t *dag; rpl_dag_t *dag;
rpl_parent_t *p; rpl_parent_t *p;
rpl_parent_t *preferred_parent; rpl_parent_t *preferred_parent;
uint8_t new_rank; rpl_rank_t new_rank;
uint8_t new_parent; uint8_t new_parent;
dag = rpl_get_dag(dio->instance_id); dag = rpl_get_dag(dio->instance_id);
@ -533,7 +540,6 @@ rpl_process_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
PRINTF("RPL: Root received inconsistent DIO version number\n"); PRINTF("RPL: Root received inconsistent DIO version number\n");
dag->version = dio->version + 1; dag->version = dio->version + 1;
rpl_reset_dio_timer(dag, 1); rpl_reset_dio_timer(dag, 1);
return;
} else { } else {
global_repair(from, dag, dio); global_repair(from, dag, dio);
} }
@ -545,7 +551,7 @@ rpl_process_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
return; return;
} }
if(dag->rank != ROOT_RANK && dag->dtsn < dio->dtsn || dag->dtsn == ~0) { if(dag->rank != ROOT_RANK && (dag->dtsn < dio->dtsn || dag->dtsn == (uint8_t)~0)) {
dag->dtsn = dio->dtsn; dag->dtsn = dio->dtsn;
} }
@ -655,29 +661,29 @@ rpl_process_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
void void
rpl_ds6_neighbor_callback(uip_ds6_nbr_t *nbr) rpl_ds6_neighbor_callback(uip_ds6_nbr_t *nbr)
{ {
rpl_dag_t *dag;
rpl_parent_t *p;
if(nbr->isused) { if(nbr->isused) {
PRINTF("RPL: Neighbor state %u: ", nbr->state); PRINTF("RPL: Neighbor state %u: ", nbr->state);
PRINT6ADDR(&nbr->ipaddr); PRINT6ADDR(&nbr->ipaddr);
PRINTF("\n"); PRINTF("\n");
} else { } else {
rpl_dag_t *dag;
rpl_parent_t *p;
char acceptable_rank_increase;
p = NULL;
PRINTF("RPL: Removed neighbor "); PRINTF("RPL: Removed neighbor ");
PRINT6ADDR(&nbr->ipaddr); PRINT6ADDR(&nbr->ipaddr);
PRINTF("\n"); PRINTF("\n");
dag = rpl_get_dag(RPL_ANY_INSTANCE); dag = rpl_get_dag(RPL_ANY_INSTANCE);
if(dag != NULL) { if(dag == NULL) {
return;
}
p = rpl_find_parent(dag, &nbr->ipaddr); p = rpl_find_parent(dag, &nbr->ipaddr);
if(p != NULL) { if(p != NULL) {
rpl_remove_parent(dag, p); rpl_remove_parent(dag, p);
} }
}
if(dag != NULL && dag->def_route != NULL && if(dag->def_route != NULL &&
uip_ipaddr_cmp(&dag->def_route->ipaddr, &p->addr)) { uip_ipaddr_cmp(&dag->def_route->ipaddr, &p->addr)) {
p = rpl_preferred_parent(dag); p = rpl_preferred_parent(dag);
if(p == NULL) { if(p == NULL) {
@ -685,9 +691,7 @@ rpl_ds6_neighbor_callback(uip_ds6_nbr_t *nbr)
return; return;
} }
acceptable_rank_increase = !dag->max_rankinc || if(acceptable_rank_increase(dag, p)) {
dag->of->increment_rank(p->rank, p) <= dag->min_rank + dag->max_rankinc;
if(acceptable_rank_increase) {
dag->rank = dag->of->increment_rank(p->rank, p); dag->rank = dag->of->increment_rank(p->rank, p);
if(dag->rank < dag->min_rank) { if(dag->rank < dag->min_rank) {
dag->min_rank = dag->rank; dag->min_rank = dag->rank;