Updated border router configuration

DAG_MAX_RANK_INCREASE is now 0
causing networks not to automatically go down in rank
for this reason Border router now updates RPL version in every 12 minutes

Moved Border router version timer to Border router file

Author: Mika Tervonen

source/6LoWPAN/ws/ws_bbr_api.c

@@ -26,6 +26,7 @@
 #include "6LoWPAN/Bootstraps/protocol_6lowpan_interface.h"
 #include "6LoWPAN/ws/ws_config.h"
 #include "6LoWPAN/ws/ws_common.h"
+#include "6LoWPAN/ws/ws_bootstrap.h"
 #include "RPL/rpl_control.h"
 #include "RPL/rpl_data.h"
 #include "Common_Protocols/icmpv6.h"
@@ -43,25 +44,21 @@
 static void ws_bbr_rpl_root_activate(uint8_t *dodag_prefix, uint8_t *dodag_id)
 {
     tr_debug("RPL root Activate");
-    rpl_dodag_conf_t new_conf;
-
-    // Lifetime values
-    new_conf.default_lifetime = 120;
-    new_conf.lifetime_unit = 60;
-    new_conf.objective_code_point = 1; // MRHOF algorithm used
-    new_conf.authentication = 0;
-    new_conf.path_control_size = 0;
-
-
-    // TODO temporary values spec says 0
-    new_conf.dag_max_rank_increase = 3072;
-    new_conf.min_hop_rank_increase = 128;// 24 Hop networks 3072/128 == 24
-
-
-    // DIO configuration
-    new_conf.dio_interval_min = WS_RPL_DIO_IMIN;
-    new_conf.dio_interval_doublings = WS_RPL_DIO_DOUBLING;
-    new_conf.dio_redundancy_constant = WS_RPL_DIO_REDUDANCY;
+    rpl_dodag_conf_t new_conf =
+    {
+         // Lifetime values
+        .default_lifetime = 120,
+        .lifetime_unit = 60,
+        .objective_code_point = 1, // MRHOF algorithm used
+        .authentication = 0,
+        .path_control_size = 0,
+        .dag_max_rank_increase = 0,
+        .min_hop_rank_increase = 128,
+        // DIO configuration
+        .dio_interval_min = WS_RPL_DIO_IMIN,
+        .dio_interval_doublings = WS_RPL_DIO_DOUBLING,
+        .dio_redundancy_constant = WS_RPL_DIO_REDUNDANCY
+    };
 
     rpl_data_init_root();
     protocol_6lowpan_rpl_root_dodag = rpl_control_create_dodag_root(protocol_6lowpan_rpl_domain, RPL_INSTANCE_ID, dodag_id, &new_conf, new_conf.min_hop_rank_increase, RPL_GROUNDED | RPL_MODE_NON_STORING | RPL_DODAG_PREF(0));
@@ -118,27 +115,48 @@ void ws_bbr_seconds_timer(protocol_interface_info_entry_t *cur, uint32_t seconds
        return;
    }
 
-   if (protocol_6lowpan_rpl_root_dodag) {
+   if (!protocol_6lowpan_rpl_root_dodag) {
        // RPL configured
+       // 1. Wait for backend connection
+       // 2. request own prefix if available
+       // 3. check if connected to RPL root
+       // 3.1 check if Globally connected root available (Backend with own mesh prefix)
+       // 3.2 check if Globally connected root available (ND proxy)
+       // 3.3 Check if grounded root available (Backend connectivity to static config in backend)
+       // 3.4 only local connectivity (No backend)
+       // 4. If I can provide better connectivity start root
+       // 4.1. If no other roots or backend start static root
+       // 4.2. If backend gets connectivity add global root
+       // 4.3. If backend loses connectivity remove global root, leave static
+       // 5. if someone has offered better connected root remove own
+       // 6. if multiple same level roots
+       // 6.1 lower connectivity must drop
+       // 6.2 lowest dodag ID remains
+
+       ws_bbr_root_start(cur);
        return;
    }
-   // 1. Wait for backend connection
-   // 2. request own prefix if available
-   // 3. check if connected to RPL root
-   // 3.1 check if Globally connected root available (Backend with own mesh prefix)
-   // 3.2 check if Globally connected root available (ND proxy)
-   // 3.3 Check if grounded root available (Backend connectivity to static config in backend)
-   // 3.4 only local connectivity (No backend)
-   // 4. If I can provide better connectivity start root
-   // 4.1. If no other roots or backend start static root
-   // 4.2. If backend gets connectivity add global root
-   // 4.3. If backend loses connectivity remove global root, leave static
-   // 5. if someone has offered better connected root remove own
-   // 6. if multiple same level roots
-   // 6.1 lower connectivity must drop
-   // 6.2 lowest dodag ID remains
-
-   ws_bbr_root_start(cur);
+
+   // Normal BBR operation
+   if (cur->ws_info->pan_version_timer > seconds ) {
+       cur->ws_info->pan_version_timer -= seconds;
+   } else {
+       // Border router has timed out
+       tr_debug("Border router version number update");
+       cur->ws_info->pan_version_timer = PAN_VERSION_LIFETIME;
+       cur->ws_info->pan_information.pan_version++;
+       // Inconsistent for border router to make information distribute faster
+       ws_bootstrap_configuration_trickle_reset(cur);
+
+       // We update the RPL version in same time to allow nodes to reselect parent
+       // As configuration is made so that devices cant move downward in dodag this allows it
+       // TODO think the correct rate for this
+       if (cur->ws_info->pan_information.pan_version % 3 == 0) {
+           // Third the rate of configuration version change at default 12 minutes
+           rpl_control_increment_dodag_version(protocol_6lowpan_rpl_root_dodag);
+       }
+   }
+
 }
 
 uint16_t test_pan_size_override = 0xffff;

source/6LoWPAN/ws/ws_bootstrap.c

@@ -1104,6 +1104,10 @@ void ws_bootstrap_event_routing_ready(protocol_interface_info_entry_t *cur)
 {
     ws_bootsrap_event_trig(WS_ROUTING_READY, cur->bootStrapId, ARM_LIB_LOW_PRIORITY_EVENT, NULL);
 }
+void ws_bootstrap_configuration_trickle_reset(protocol_interface_info_entry_t *cur)
+{
+    trickle_inconsistent_heard(&cur->ws_info->trickle_pan_config,&trickle_params_pan_configuration);
+}
 
 
 static void ws_bootstrap_pan_advert_solicit(protocol_interface_info_entry_t *cur)
@@ -1445,19 +1449,6 @@ void ws_bootstrap_seconds_timer(protocol_interface_info_entry_t *cur, uint32_t s
         tr_info("Send PAN configuration");
         ws_bootstrap_pan_config(cur);
     }
-    if (cur->bootsrap_mode == ARM_NWK_BOOTSRAP_MODE_6LoWPAN_BORDER_ROUTER) {
-        // update version number
-        if (cur->ws_info->pan_version_timer > seconds ) {
-            cur->ws_info->pan_version_timer -= seconds;
-        } else {
-            // Border router has timed out
-            tr_debug("Border router version number update");
-            cur->ws_info->pan_version_timer = PAN_VERSION_LIFETIME;
-            cur->ws_info->pan_information.pan_version++;
-            // Inconsistent for border router to make information distribute faster
-            trickle_inconsistent_heard(&cur->ws_info->trickle_pan_config,&trickle_params_pan_configuration);
-        }
-    }
     if (cur->ws_info->pan_version_timeout_timer){
         // PAN version timer running
         if (cur->ws_info->pan_version_timeout_timer > seconds ) {

source/6LoWPAN/ws/ws_bootstrap.h

@@ -46,6 +46,8 @@ void ws_bootstrap_event_operation_start(protocol_interface_info_entry_t *cur);
 
 void ws_bootstrap_event_routing_ready(protocol_interface_info_entry_t *cur);
 
+void ws_bootstrap_configuration_trickle_reset(protocol_interface_info_entry_t *cur);
+
 void ws_bootstrap_seconds_timer(protocol_interface_info_entry_t *cur, uint32_t seconds);
 
 #else

source/6LoWPAN/ws/ws_config.h

@@ -28,7 +28,7 @@
 
 #define WS_RPL_DIO_IMIN 15
 #define WS_RPL_DIO_DOUBLING 2
-#define WS_RPL_DIO_REDUDANCY 1
+#define WS_RPL_DIO_REDUNDANCY 1
 
 
 /* Border router version change interval

test/nanostack/unittest/stub/ws_bootstrap_stub.c

@@ -40,3 +40,8 @@ void ws_bootstrap_state_machine(protocol_interface_info_entry_t *cur)
 
     return;
 }
+
+void ws_bootstrap_configuration_trickle_reset(protocol_interface_info_entry_t *cur)
+{
+
+}