Merge pull request ARMmbed#1794 from ARMmbed/rpl_address_learn

Rpl address learn

Author: Juha Heiskanen

source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_bootstrap.c

@@ -2073,6 +2073,8 @@ static void protocol_6lowpan_bootstrap_rpl_callback(rpl_event_t event, void *han
             tr_error("RPL Local repair fail-->interface to idle");
             nwk_bootsrap_state_update(ARM_NWK_NWK_CONNECTION_DOWN, cur);
             break;
+        default:
+            break;
     }
 }
 

source/6LoWPAN/ws/ws_bootstrap.c

@@ -126,7 +126,10 @@ static void ws_bootstrap_address_notification_cb(struct protocol_interface_info_
     }
 
     if (reason == ADDR_CALLBACK_DAD_COMPLETE) {
-        ws_bootsrap_event_trig(WS_ADDRESS_ADDED, interface->bootStrapId, ARM_LIB_LOW_PRIORITY_EVENT, (void *)addr);
+		//Trig Address Registartion only when Bootstrap is ready
+        if (interface->nwk_bootstrap_state == ER_BOOTSRAP_DONE) {
+            ws_bootsrap_event_trig(WS_ADDRESS_ADDED, interface->bootStrapId, ARM_LIB_LOW_PRIORITY_EVENT, (void *)addr);
+        }
     } else if (reason == ADDR_CALLBACK_DELETED) {
         // What to do?
     }
@@ -1194,6 +1197,9 @@ static void ws_bootstrap_rpl_callback(rpl_event_t event, void *handle)
          *
          */
 
+    } else if (event == RPL_EVENT_DAO_PARENT_SWITCH) {
+        tr_info("RPL parent update ... register ARO");
+        ws_bootsrap_event_trig(WS_ADDRESS_ADDED, cur->bootStrapId, ARM_LIB_LOW_PRIORITY_EVENT, NULL);
     }
     cur->ws_info->rpl_state = event;
     tr_info("RPL event %d", event);

source/RPL/rpl_control.c

@@ -677,28 +677,16 @@ static void rpl_control_process_prefix_options(protocol_interface_info_entry_t *
         const uint8_t *prefix = ptr + 16;
 
         if (!pref_parent || neighbour == pref_parent) {
-            //Check is L Flag active
-            if (flags & PIO_L) {
-                //define ONLink Route Information
-                //tr_debug("Register On Link Prefix to routing table");
-                ipv6_route_add(prefix, prefix_len, cur->id, NULL, ROUTE_RADV, valid, 0);
-            }
-            /* Check if A-Flag.
-             * A RPL node may use this option for the purpose of Stateless Address Autoconfiguration (SLAAC)
-             * from a prefix advertised by a parent.
-             */
-            if (pref_parent && (flags & PIO_A)) {
-                if (icmpv6_slaac_prefix_update(cur, prefix, prefix_len, valid, preferred) != 0) {
-                    ipv6_interface_slaac_handler(cur, prefix, prefix_len, valid, preferred);
-                }
-            }
 
             /* Store prefixes for possible forwarding */
             /* XXX if leaf - don't bother? Or do we want to remember them for
              * when we switch DODAG, as mentioned above?
              */
 
-            rpl_dodag_update_dio_prefix(dodag, prefix, prefix_len, flags, valid, preferred, false, true);
+            prefix_entry_t *prefix_entry = rpl_dodag_update_dio_prefix(dodag, prefix, prefix_len, flags, valid, preferred, false, true);
+            if (prefix_entry && pref_parent) {
+                rpl_control_process_prefix_option(prefix_entry, cur);
+            }
         }
 
         if ((flags & PIO_R) && !router_addr_set) {
@@ -715,6 +703,26 @@ static void rpl_control_process_prefix_options(protocol_interface_info_entry_t *
     }
 }
 
+void rpl_control_process_prefix_option(prefix_entry_t *prefix, protocol_interface_info_entry_t *cur)
+{
+    //Check is L Flag active
+    if (prefix->options & PIO_L) {
+        //define ONLink Route Information
+        //tr_debug("Register On Link Prefix to routing table");
+        ipv6_route_add(prefix->prefix, prefix->prefix_len, cur->id, NULL, ROUTE_RADV, prefix->lifetime, 0);
+    }
+    /* Check if A-Flag.
+     * A RPL node may use this option for the purpose of Stateless Address Autoconfiguration (SLAAC)
+     * from a prefix advertised by a parent.
+     */
+    if (prefix->options & PIO_A) {
+        if (icmpv6_slaac_prefix_update(cur, prefix->prefix, prefix->prefix_len, prefix->lifetime, prefix->preftime) != 0) {
+            ipv6_interface_slaac_handler(cur, prefix->prefix, prefix->prefix_len, prefix->lifetime, prefix->preftime);
+        }
+    }
+}
+
+
 /*
  *   0                   1                   2                   3
  *   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1

source/RPL/rpl_control.h

@@ -29,11 +29,13 @@ struct rpl_dodag;
 struct buffer;
 struct protocol_interface_info_entry;
 struct rpl_dodag_info_t;
+struct prefix_entry_t;
 
 typedef enum rpl_event {
     RPL_EVENT_DAO_DONE,         /* Simplistic trigger for bootstrap advance - a DAO registration completed */
     RPL_EVENT_LOCAL_REPAIR_START, /* RPL start scanning new parent by multicast DIS user can disable beacon request responser here*/
     RPL_EVENT_LOCAL_REPAIR_NO_MORE_DIS, /* RPL not sending DIS anymore user can report bootstrap error */
+    RPL_EVENT_DAO_PARENT_SWITCH, /* RPL indicate that DAO downward Parent state have been updated */
 } rpl_event_t;
 
 typedef void rpl_domain_callback_t(rpl_event_t event, void *handle);
@@ -100,6 +102,7 @@ void rpl_control_transmit_dio(struct rpl_domain *domain, struct protocol_interfa
 bool rpl_control_transmit_dao(struct rpl_domain *domain, struct protocol_interface_info_entry *cur, struct rpl_instance *instance, uint8_t instance_id, uint8_t dao_sequence, const uint8_t dodagid[16], const uint8_t *opts, uint16_t opts_size, const uint8_t *dst);
 void rpl_control_disable_ra_routes(struct rpl_domain *domain);
 void rpl_control_event(struct rpl_domain *domain, rpl_event_t event);
+void rpl_control_process_prefix_option(struct prefix_entry_t *prefix, struct protocol_interface_info_entry *cur);
 
 /*********************** RPL control API to rest of system *******************/
 
@@ -160,7 +163,6 @@ const rpl_dodag_conf_t *rpl_control_get_dodag_config(const struct rpl_instance *
 const uint8_t *rpl_control_preferred_parent_addr(const struct rpl_instance *instance, bool global);
 uint16_t rpl_control_current_rank(const struct rpl_instance *instance);
 
-
 #else /* HAVE_RPL */
 
 #define rpl_control_fast_timer(ticks) ((void) 0)

source/RPL/rpl_downward.c

@@ -243,6 +243,8 @@ void rpl_downward_process_dao_parent_changes(rpl_instance_t *instance)
                 }
             }
         }
+        //GENERATE PARENT Update event
+        rpl_control_event(instance->domain, RPL_EVENT_DAO_PARENT_SWITCH);
         rpl_instance_dao_trigger(instance, 0);
     }
 }

source/RPL/rpl_upward.c

@@ -1174,9 +1174,6 @@ bool rpl_instance_purge(rpl_instance_t *instance)
 void rpl_instance_neighbours_changed(rpl_instance_t *instance)
 {
     instance->neighbours_changed = true;
-    if (!rpl_instance_preferred_parent(instance)) {
-        rpl_instance_set_local_repair(instance, true);
-    }
     rpl_instance_trigger_parent_selection(instance, rpl_policy_dio_parent_selection_delay(instance->domain));
 }
 
@@ -1366,7 +1363,18 @@ void rpl_instance_run_parent_selection(rpl_instance_t *instance)
         }
     }
 
-    rpl_instance_set_local_repair(instance, preferred_parent == NULL);
+    //Control Local repair state
+    if (preferred_parent) {
+        // Always stop repair if we find a parent
+        rpl_instance_set_local_repair(instance, false);
+    } else if (original_preferred) {
+        // Only start repair if we just lost a parent
+        rpl_instance_set_local_repair(instance, true);
+    } else {
+        // !preferred_parent && !original_preferred - didn't have a parent,
+        // still don't. Leave repair flag as-is (would be off on initial start
+        // up, may be on if having problems mid-session).
+    }
 
     if (rpl_instance_mop(instance) != RPL_MODE_NO_DOWNWARD) {
         rpl_downward_process_dao_parent_changes(instance);
@@ -1384,6 +1392,17 @@ void rpl_instance_run_parent_selection(rpl_instance_t *instance)
     rpl_control_print(trace_info_print);
     /* Changing DODAG version is an inconsistency */
     if (original_version != instance->current_dodag_version) {
+        //learn Routes an Prefixes
+        if (preferred_parent && instance->current_dodag_version) {
+            rpl_dodag_t *dodag = instance->current_dodag_version->dodag;
+            protocol_interface_info_entry_t *rpl_interface = protocol_stack_interface_info_get_by_id(preferred_parent->interface_id);
+            if (rpl_interface) {
+                ns_list_foreach(prefix_entry_t, prefix, &dodag->prefixes) {
+                    rpl_control_process_prefix_option(prefix, rpl_interface);
+                }
+            }
+        }
+
         rpl_instance_inconsistency(instance);
         return;
     }

test/nanostack/unittest/stub/rpl_control_stub.c

@@ -233,3 +233,8 @@ void rpl_control_address_register_done(struct buffer *buf, uint8_t status)
 {
 
 }
+
+void rpl_control_process_prefix_option(struct prefix_entry_t *prefix, struct protocol_interface_info_entry *cur)
+{
+
+}