Merge pull request contiki-os#2054 from cetic/pr-check-incoming-rank

Reject parents with invalid rank
yiliangw · Jan 13, 2017 · 3d40056 · 3d40056
2 parents 0fb4a68 + f9ffa25
commit 3d40056
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c
@@ -865,7 +865,10 @@ best_parent(rpl_dag_t *dag, int fresh_only)
   for(p = nbr_table_head(rpl_parents); p != NULL; p = nbr_table_next(rpl_parents, p)) {
 
     /* Exclude parents from other DAGs or announcing an infinite rank */
-    if(p->dag != dag || p->rank == INFINITE_RANK) {
+    if(p->dag != dag || p->rank == INFINITE_RANK || p->rank < ROOT_RANK(dag->instance)) {
+      if(p->rank < ROOT_RANK(dag->instance)) {
+        PRINTF("RPL: Parent has invalid rank\n");
+      }
       continue;
     }