Wait RPL to be ready before bootstrap is ready

Author: Mika Tervonen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -76,6 +76,7 @@ static void ws_bootstrap_event_handler(arm_event_s *event);
 static void ws_bootstrap_state_change(protocol_interface_info_entry_t *cur, icmp_state_t nwk_bootstrap_state);
 static bool ws_bootstrap_state_active(struct protocol_interface_info_entry *cur);
 static bool ws_bootstrap_state_discovery(struct protocol_interface_info_entry *cur);
+static bool ws_bootstrap_state_wait_rpl(struct protocol_interface_info_entry *cur);
 
 static mac_neighbor_table_entry_t * ws_bootstrap_add_neighbor(struct protocol_interface_info_entry *interface, const uint8_t *src64)
 {
@@ -838,7 +839,17 @@ static void ws_bootstrap_rpl_callback(rpl_event_t event, void *handle)
     if (!cur->rpl_domain || cur->interface_mode != INTERFACE_UP) {
         return;
     }
-    tr_warn("RPL callback event %d", event);
+    // if waiting for RPL and
+    if (event == RPL_EVENT_DAO_DONE) {
+        // Trigger statemachine check
+        cur->bootsrap_state_machine_cnt = 1;
+    } else if(event == RPL_EVENT_LOCAL_REPAIR_NO_MORE_DIS) {
+        // RPL gave up so we need to re-trigger network scan.
+        // TODO is this correct?
+        ws_bootstrap_event_configuration_start(cur);
+    }
+    cur->ws_info->rpl_state = event;
+    tr_info("RPL event %d", event);
 }
 
 static void ws_bootstrap_rpl_activate(protocol_interface_info_entry_t *cur)
@@ -853,6 +864,7 @@ static void ws_bootstrap_rpl_activate(protocol_interface_info_entry_t *cur)
     // If i am router I Do this
     rpl_control_force_leaf(protocol_6lowpan_rpl_domain, leaf);
 
+    cur->ws_info->rpl_state = 0xff; // Set invalid state and learn from event
     if (cur->bootsrap_mode == ARM_NWK_BOOTSRAP_MODE_6LoWPAN_ROUTER) {
         rpl_control_transmit_dis(cur->rpl_domain, cur, 0, 0, NULL, 0, ADDR_LINK_LOCAL_ALL_ROUTERS);
     }
@@ -1061,7 +1073,13 @@ static void ws_bootstrap_event_handler(arm_event_s *event)
         ws_bootstrap_rpl_activate(cur);
         ws_bootstrap_network_start(cur);
         ws_bootstrap_advertise_start(cur);
-        ws_bootstrap_event_routing_ready(cur);
+        // Wait for RPL start
+        if (cur->bootsrap_mode == ARM_NWK_BOOTSRAP_MODE_6LoWPAN_BORDER_ROUTER) {
+            ws_bootstrap_event_routing_ready(cur);
+        } else {
+            // routers wait until RPL root is contacted
+             ws_bootstrap_state_change(cur, ER_RPL_SCAN);
+         }
         break;
     case WS_ROUTING_READY:
         tr_info("Routing ready");
@@ -1101,6 +1119,15 @@ void ws_bootstrap_configure_process(protocol_interface_info_entry_t *cur)
     }
     return;
 }
+void ws_bootstrap_rpl_wait_process(protocol_interface_info_entry_t *cur)
+{
+
+    if (cur->ws_info->rpl_state == RPL_EVENT_DAO_DONE) {
+        // Trigger statemachine check
+        ws_bootstrap_event_routing_ready(cur);
+    }
+    return;
+}
 
 static bool ws_bootstrap_state_active(struct protocol_interface_info_entry *cur)
 {
@@ -1119,6 +1146,15 @@ static bool ws_bootstrap_state_configure(struct protocol_interface_info_entry *c
     return false;
 }
 
+static bool ws_bootstrap_state_wait_rpl(struct protocol_interface_info_entry *cur)
+{
+    // Think about the state value
+    if(cur->nwk_bootstrap_state == ER_RPL_SCAN) {
+        return true;
+    }
+    return false;
+}
+
 static bool ws_bootstrap_state_discovery(struct protocol_interface_info_entry *cur)
 {
     if(cur->nwk_bootstrap_state == ER_ACTIVE_SCAN) {
@@ -1144,6 +1180,10 @@ void ws_bootstrap_state_machine(protocol_interface_info_entry_t *cur)
         tr_debug("WS SM:configuration Scan");
         ws_bootstrap_configure_process(cur);
     break;
+    case ER_RPL_SCAN:
+        tr_debug("WS SM:Wait RPL to contact DODAG root");
+        ws_bootstrap_rpl_wait_process(cur);
+    break;
     case ER_BOOTSRAP_DONE:
         tr_debug("WS SM:Bootstrap Done");
         // Bootstrap_done event to application

source/6LoWPAN/ws/ws_common.h

@@ -46,6 +46,7 @@ typedef struct ws_info_s {
     trickle_t trickle_pan_config;
     trickle_t trickle_pan_advertisement_solicit;
     trickle_t trickle_pan_advertisement;
+    uint8_t rpl_state; // state from rpl_event_t
     parent_info_t parent_info;
     uint8_t gtkhash[32];
     bool configuration_learned:1;