From 9d94c4efae9c7604790034264d22e6cbf7fb61cd Mon Sep 17 00:00:00 2001
From: Laurent Deru <laurent.deru@cetic.be>
Date: Fri, 16 Jan 2015 16:43:14 +0100
Subject: [PATCH] Remove all the DODAG from the instance when the node is set
 as Root

---
 core/net/rpl/rpl-dag.c | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c
index f75719b6c..53e1e18e3 100644
--- a/core/net/rpl/rpl-dag.c
+++ b/core/net/rpl/rpl-dag.c
@@ -269,17 +269,27 @@ rpl_set_root(uint8_t instance_id, uip_ipaddr_t *dag_id)
   rpl_dag_t *dag;
   rpl_instance_t *instance;
   uint8_t version;
+  int i;
 
   version = RPL_LOLLIPOP_INIT;
-  dag = get_dag(instance_id, dag_id);
-  if(dag != NULL) {
-    version = dag->version;
-    RPL_LOLLIPOP_INCREMENT(version);
-    PRINTF("RPL: Dropping a joined DAG when setting this node as root");
-    if(dag == dag->instance->current_dag) {
-      dag->instance->current_dag = NULL;
+  instance = rpl_get_instance(instance_id);
+  if(instance != NULL) {
+    for(i = 0; i < RPL_MAX_DAG_PER_INSTANCE; ++i) {
+      dag = &instance->dag_table[i];
+      if(dag->used) {
+        if(uip_ipaddr_cmp(&dag->dag_id, dag_id)) {
+          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);