gnrc/rpl: extract gnrc_rpl_dodag_root_init

Author: elenaf9

sys/include/net/gnrc/rpl/dodag.h

@@ -100,6 +100,13 @@ void gnrc_rpl_instance_remove(gnrc_rpl_instance_t *inst);
  */
 gnrc_rpl_instance_t *gnrc_rpl_instance_get(uint8_t instance_id);
 
+/**
+ * @brief   Setup self as root for the @p dodag.
+ *
+ * @param[in] dodag     Pointer to the dodag.
+ */
+void gnrc_rpl_dodag_root_init(gnrc_rpl_dodag_t *dodag);
+
 /**
  * @brief   Initialize a new RPL DODAG with the id @p dodag_id for the instance @p instance.
  *

sys/net/gnrc/routing/rpl/gnrc_rpl.c

@@ -141,37 +141,14 @@ gnrc_rpl_instance_t *gnrc_rpl_root_init(uint8_t instance_id, const ipv6_addr_t *
         instance_id = gnrc_rpl_gen_instance_id(local_inst_id);
     }
 
-    gnrc_rpl_dodag_t *dodag = NULL;
     gnrc_rpl_instance_t *inst = gnrc_rpl_root_instance_init(instance_id, dodag_id,
                                                             GNRC_RPL_DEFAULT_MOP);
 
     if (!inst) {
         return NULL;
     }
-
-    dodag = &inst->dodag;
-
-    dodag->dtsn = 1;
-    dodag->prf = 0;
-    dodag->dio_interval_doubl = CONFIG_GNRC_RPL_DEFAULT_DIO_INTERVAL_DOUBLINGS;
-    dodag->dio_min = CONFIG_GNRC_RPL_DEFAULT_DIO_INTERVAL_MIN;
-    dodag->dio_redun = CONFIG_GNRC_RPL_DEFAULT_DIO_REDUNDANCY_CONSTANT;
-    dodag->default_lifetime = CONFIG_GNRC_RPL_DEFAULT_LIFETIME;
-    dodag->lifetime_unit = CONFIG_GNRC_RPL_LIFETIME_UNIT;
-    dodag->version = GNRC_RPL_COUNTER_INIT;
-    dodag->grounded = GNRC_RPL_GROUNDED;
-    dodag->node_status = GNRC_RPL_ROOT_NODE;
-    dodag->my_rank = GNRC_RPL_ROOT_RANK;
-    dodag->dio_opts |= GNRC_RPL_REQ_DIO_OPT_DODAG_CONF;
-
-    if (!IS_ACTIVE(CONFIG_GNRC_RPL_WITHOUT_PIO)) {
-        dodag->dio_opts |= GNRC_RPL_REQ_DIO_OPT_PREFIX_INFO;
-    }
-
-    trickle_start(gnrc_rpl_pid, &dodag->trickle, GNRC_RPL_MSG_TYPE_TRICKLE_MSG,
-                  (1 << dodag->dio_min), dodag->dio_interval_doubl,
-                  dodag->dio_redun);
-    gnrc_rpl_rpble_update(dodag);
+    gnrc_rpl_dodag_root_init(&inst->dodag);
+    gnrc_rpl_rpble_update(&inst->dodag);
 
     return inst;
 }

sys/net/gnrc/routing/rpl/gnrc_rpl_dodag.c

@@ -150,6 +150,30 @@ gnrc_rpl_instance_t *gnrc_rpl_instance_get(uint8_t instance_id)
     return NULL;
 }
 
+void gnrc_rpl_dodag_root_init(gnrc_rpl_dodag_t *dodag)
+{
+    dodag->dtsn = 1;
+    dodag->prf = 0;
+    dodag->dio_interval_doubl = CONFIG_GNRC_RPL_DEFAULT_DIO_INTERVAL_DOUBLINGS;
+    dodag->dio_min = CONFIG_GNRC_RPL_DEFAULT_DIO_INTERVAL_MIN;
+    dodag->dio_redun = CONFIG_GNRC_RPL_DEFAULT_DIO_REDUNDANCY_CONSTANT;
+    dodag->default_lifetime = CONFIG_GNRC_RPL_DEFAULT_LIFETIME;
+    dodag->lifetime_unit = CONFIG_GNRC_RPL_LIFETIME_UNIT;
+    dodag->version = GNRC_RPL_COUNTER_INIT;
+    dodag->grounded = GNRC_RPL_GROUNDED;
+    dodag->node_status = GNRC_RPL_ROOT_NODE;
+    dodag->my_rank = GNRC_RPL_ROOT_RANK;
+    dodag->dio_opts |= GNRC_RPL_REQ_DIO_OPT_DODAG_CONF;
+
+    if (!IS_ACTIVE(CONFIG_GNRC_RPL_WITHOUT_PIO)) {
+        dodag->dio_opts |= GNRC_RPL_REQ_DIO_OPT_PREFIX_INFO;
+    }
+
+    trickle_start(gnrc_rpl_pid, &dodag->trickle, GNRC_RPL_MSG_TYPE_TRICKLE_MSG,
+                  (1 << dodag->dio_min), dodag->dio_interval_doubl,
+                  dodag->dio_redun);
+}
+
 bool gnrc_rpl_dodag_init(gnrc_rpl_instance_t *instance, const ipv6_addr_t *dodag_id,
                          kernel_pid_t iface)
 {