Various bug fixes and adjustments for rpl-11
This commit is contained in:
parent
11d5a3eb28
commit
adf6961a85
5 changed files with 56 additions and 45 deletions
|
@ -32,7 +32,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: rpl-of-etx.c,v 1.5 2010/06/14 12:44:37 nvt-se Exp $
|
||||
* $Id: rpl-of-etx.c,v 1.6 2010/09/15 13:22:23 nvt-se Exp $
|
||||
*/
|
||||
/**
|
||||
* \file
|
||||
|
@ -61,7 +61,7 @@ rpl_of_t rpl_of_etx = {
|
|||
|
||||
#define LINK_ETX_MIN 1
|
||||
#define LINK_ETX_MAX 10
|
||||
#define LINK_ETX_GUESS (LINK_ETX_MAX - 1)
|
||||
#define LINK_ETX_GUESS 3
|
||||
#define PATH_ETX_MIN 1
|
||||
#define PATH_ETX_MAX 200
|
||||
#define PARENT_SWITCH_ETX_THRESHOLD 0.5
|
||||
|
@ -98,20 +98,25 @@ calculate_rank(rpl_parent_t *p, rpl_rank_t base_rank)
|
|||
rpl_rank_t new_rank;
|
||||
rpl_rank_t rank_increase;
|
||||
|
||||
PRINTF("RPL: OF1 calculate rank\n");
|
||||
|
||||
dag = (rpl_dag_t *)p->dag;
|
||||
|
||||
rank_increase = p == NULL ? LINK_ETX_GUESS : p->local_confidence;
|
||||
rank_increase += dag->min_hoprankinc;
|
||||
|
||||
if(base_rank == 0) {
|
||||
if(p == NULL) {
|
||||
if(p == NULL) {
|
||||
if(base_rank == 0) {
|
||||
return INFINITE_RANK;
|
||||
}
|
||||
base_rank = p->rank;
|
||||
rank_increase = LINK_ETX_GUESS * DEFAULT_MIN_HOPRANKINC;
|
||||
} else {
|
||||
dag = (rpl_dag_t *)p->dag;
|
||||
if(p->local_confidence == 0) {
|
||||
p->local_confidence = LINK_ETX_GUESS;
|
||||
}
|
||||
rank_increase = p->local_confidence * dag->min_hoprankinc;
|
||||
if(base_rank == 0) {
|
||||
base_rank = p->rank;
|
||||
}
|
||||
}
|
||||
|
||||
PRINTF("RPL: OF1 calculate rank, base rank = %u, rank_increase = %u\n",
|
||||
(unsigned)base_rank, rank_increase);
|
||||
|
||||
if(base_rank < min_path_etx) {
|
||||
min_path_etx = base_rank;
|
||||
PRINTF("RPL: min_path_etx updated to %u\n", min_path_etx);
|
||||
|
@ -138,12 +143,13 @@ best_parent(rpl_parent_t *p1, rpl_parent_t *p2)
|
|||
rpl_rank_t p1_rank;
|
||||
rpl_rank_t p2_rank;
|
||||
|
||||
p1_rank = calculate_rank(p1, 0);
|
||||
p2_rank = calculate_rank(p2, 0);
|
||||
dag = (rpl_dag_t *)p1->dag; /* Both parents must be in the same DAG. */
|
||||
|
||||
p1_rank = DAG_RANK(calculate_rank(p1, 0), dag);
|
||||
p2_rank = DAG_RANK(calculate_rank(p2, 0), dag);
|
||||
|
||||
/* Maintain stability of the preferred parent in case of similar ranks. */
|
||||
if(p1_rank == p2_rank) {
|
||||
dag = (rpl_dag_t *)p1->dag;
|
||||
if(p1 == dag->preferred_parent) {
|
||||
return p1;
|
||||
} else if(p2 == dag->preferred_parent) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue