Added periodic RPL version number increase

Mika Tervonen · Mika Tervonen · commit 20289f675ddf · 2020-01-10T13:05:58.000+02:00
After restart increase version number in 1 hour interval about 16 times
then drop the rate to once in 12 hours
diff --git a/source/6LoWPAN/ws/ws_bbr_api.c b/source/6LoWPAN/ws/ws_bbr_api.c
@@ -85,7 +85,27 @@ static rpl_dodag_conf_t rpl_conf = {
     .dio_redundancy_constant = WS_RPL_DIO_REDUNDANCY
 };
 
-void ws_bbr_rpl_config(uint8_t imin, uint8_t doubling, uint8_t redundancy, uint16_t dag_max_rank_increase, uint16_t min_hop_rank_increase)
+static void ws_bbr_rpl_version_timer_start(protocol_interface_info_entry_t *cur, uint8_t version)
+{
+    // Set the next timeout value for version update
+    if (version < 128) {
+        //stable version for RPL so slow timer update is ok
+        cur->ws_info->rpl_version_timer = RPL_VERSION_LIFETIME;
+    } else {
+        cur->ws_info->rpl_version_timer = RPL_VERSION_LIFETIME_RESTART;
+    }
+}
+
+static void ws_bbr_rpl_version_increase(protocol_interface_info_entry_t *cur)
+{
+    if (!protocol_6lowpan_rpl_root_dodag) {
+        return;
+    }
+    ws_bbr_rpl_version_timer_start(cur, rpl_control_increment_dodag_version(protocol_6lowpan_rpl_root_dodag));
+}
+
+
+void ws_bbr_rpl_config(protocol_interface_info_entry_t *cur, uint8_t imin, uint8_t doubling, uint8_t redundancy, uint16_t dag_max_rank_increase, uint16_t min_hop_rank_increase)
 {
     if (imin == 0 || doubling == 0) {
         // use default values
@@ -111,11 +131,11 @@ void ws_bbr_rpl_config(uint8_t imin, uint8_t doubling, uint8_t redundancy, uint1
 
     if (protocol_6lowpan_rpl_root_dodag) {
         rpl_control_update_dodag_config(protocol_6lowpan_rpl_root_dodag, &rpl_conf);
-        rpl_control_increment_dodag_version(protocol_6lowpan_rpl_root_dodag);
+        ws_bbr_rpl_version_increase(cur);
     }
 }
 
-static void ws_bbr_rpl_root_start(uint8_t *dodag_id)
+static void ws_bbr_rpl_root_start(protocol_interface_info_entry_t *cur, uint8_t *dodag_id)
 {
     tr_info("RPL root start");
     rpl_data_init_root();
@@ -132,6 +152,10 @@ static void ws_bbr_rpl_root_start(uint8_t *dodag_id)
     }
     // RPL memory limits set larger for Border router
     rpl_control_set_memory_limits(64 * 1024, 0);
+
+    // Initial version number for RPL start is 240 from RPL RFC
+    ws_bbr_rpl_version_timer_start(cur, 240);
+
 }
 
 static void ws_bbr_rpl_root_stop(void)
@@ -350,7 +374,7 @@ static void ws_bbr_rpl_status_check(protocol_interface_info_entry_t *cur)
     if (!protocol_6lowpan_rpl_root_dodag) {
         // Generate DODAGID
         if (ws_bbr_static_dodagid_create(cur) == 0) {
-            ws_bbr_rpl_root_start(current_dodag_id);
+            ws_bbr_rpl_root_start(cur, current_dodag_id);
         }
     }
 
@@ -465,7 +489,8 @@ static void ws_bbr_rpl_status_check(protocol_interface_info_entry_t *cur)
 
         }
         memcpy(current_global_prefix, global_prefix, 8);
-        rpl_control_increment_dodag_version(protocol_6lowpan_rpl_root_dodag);
+        ws_bbr_rpl_version_increase(cur);
+
         nd_proxy_downstream_interface_register(cur->id, ws_border_router_proxy_validate, ws_border_router_proxy_state_update);
     } else if (memcmp(current_global_prefix, ADDR_UNSPECIFIED, 8) != 0) {
         /*
@@ -526,7 +551,7 @@ void ws_bbr_seconds_timer(protocol_interface_info_entry_t *cur, uint32_t seconds
         if (cur->ws_info->pan_version_timer > seconds) {
             cur->ws_info->pan_version_timer -= seconds;
         } else {
-            // Border router has timed out
+            // PAN version number update
             tr_debug("Border router version number update");
             cur->ws_info->pan_version_timer = ws_common_version_lifetime_get(cur->ws_info->network_size_config);
             cur->ws_info->pan_information.pan_version++;
@@ -537,9 +562,13 @@ void ws_bbr_seconds_timer(protocol_interface_info_entry_t *cur, uint32_t seconds
                 ws_common_network_size_configure(cur, cur->ws_info->pan_information.pan_size);
             }
         }
-
+        if (cur->ws_info->rpl_version_timer > seconds) {
+            cur->ws_info->rpl_version_timer -= seconds;
+        } else {
+            // RPL version update needed
+            ws_bbr_rpl_version_increase(cur);
+        }
     }
-
 }
 
 uint16_t test_pan_size_override = 0xffff;
diff --git a/source/6LoWPAN/ws/ws_bbr_api_internal.h b/source/6LoWPAN/ws/ws_bbr_api_internal.h
@@ -27,7 +27,7 @@ void ws_bbr_seconds_timer(protocol_interface_info_entry_t *cur, uint32_t seconds
 
 uint16_t ws_bbr_pan_size(protocol_interface_info_entry_t *cur);
 
-void ws_bbr_rpl_config(uint8_t imin, uint8_t doubling, uint8_t redundancy, uint16_t dag_max_rank_increase, uint16_t min_hop_rank_increase);
+void ws_bbr_rpl_config(protocol_interface_info_entry_t *cur, uint8_t imin, uint8_t doubling, uint8_t redundancy, uint16_t dag_max_rank_increase, uint16_t min_hop_rank_increase);
 
 bool ws_bbr_ready_to_start(protocol_interface_info_entry_t *cur);
 
@@ -36,7 +36,7 @@ bool ws_bbr_ready_to_start(protocol_interface_info_entry_t *cur);
 
 #define ws_bbr_seconds_timer( cur, seconds)
 #define ws_bbr_pan_size(cur) 0
-#define ws_bbr_rpl_config( imin, doubling, redundancy, dag_max_rank_increase, min_hop_rank_increase)
+#define ws_bbr_rpl_config( cur, imin, doubling, redundancy, dag_max_rank_increase, min_hop_rank_increase)
 #define ws_bbr_ready_to_start(cur) true
 
 #endif //HAVE_WS_BORDER_ROUTER
diff --git a/source/6LoWPAN/ws/ws_common.c b/source/6LoWPAN/ws/ws_common.c
@@ -338,11 +338,11 @@ void ws_common_network_size_configure(protocol_interface_info_entry_t *cur, uint
         // doublings:3 (128s)
         // redundancy; 0 Disabled
         if (cur->ws_info->network_size_config == NETWORK_SIZE_AUTOMATIC) {
-            ws_bbr_rpl_config(14, 3, 0, WS_RPL_MAX_HOP_RANK_INCREASE, WS_RPL_MIN_HOP_RANK_INCREASE);
+            ws_bbr_rpl_config(cur, 14, 3, 0, WS_RPL_MAX_HOP_RANK_INCREASE, WS_RPL_MIN_HOP_RANK_INCREASE);
         } else if (cur->ws_info->network_size_config == NETWORK_SIZE_CERTIFICATE) {
-            ws_bbr_rpl_config(0, 0, 0, WS_CERTIFICATE_RPL_MAX_HOP_RANK_INCREASE, WS_CERTIFICATE_RPL_MIN_HOP_RANK_INCREASE);
+            ws_bbr_rpl_config(cur, 0, 0, 0, WS_CERTIFICATE_RPL_MAX_HOP_RANK_INCREASE, WS_CERTIFICATE_RPL_MIN_HOP_RANK_INCREASE);
         } else {
-            ws_bbr_rpl_config(0, 0, 0, WS_RPL_MAX_HOP_RANK_INCREASE, WS_RPL_MIN_HOP_RANK_INCREASE);
+            ws_bbr_rpl_config(cur, 0, 0, 0, WS_RPL_MAX_HOP_RANK_INCREASE, WS_RPL_MIN_HOP_RANK_INCREASE);
         }
         ws_pae_controller_timing_adjust(1); // Fast and reactive network
     } else if (network_size < 300) {
@@ -352,7 +352,7 @@ void ws_common_network_size_configure(protocol_interface_info_entry_t *cur, uint
         // imin: 15 (32s)
         // doublings:5 (960s)
         // redundancy; 10
-        ws_bbr_rpl_config(15, 5, 10, WS_RPL_MAX_HOP_RANK_INCREASE, WS_RPL_MIN_HOP_RANK_INCREASE);
+        ws_bbr_rpl_config(cur, 15, 5, 10, WS_RPL_MAX_HOP_RANK_INCREASE, WS_RPL_MIN_HOP_RANK_INCREASE);
         ws_pae_controller_timing_adjust(9); // medium limited network
     } else {
         // Configure the Wi-SUN discovery trickle parameters
@@ -361,7 +361,7 @@ void ws_common_network_size_configure(protocol_interface_info_entry_t *cur, uint
         // imin: 19 (524s, 9 min)
         // doublings:1 (1048s, 17 min)
         // redundancy; 10 May need some tuning still
-        ws_bbr_rpl_config(19, 1, 10, WS_RPL_MAX_HOP_RANK_INCREASE, WS_RPL_MIN_HOP_RANK_INCREASE);
+        ws_bbr_rpl_config(cur, 19, 1, 10, WS_RPL_MAX_HOP_RANK_INCREASE, WS_RPL_MIN_HOP_RANK_INCREASE);
         ws_pae_controller_timing_adjust(24); // Very slow and high latency network
     }
     return;
diff --git a/source/6LoWPAN/ws/ws_common.h b/source/6LoWPAN/ws/ws_common.h
@@ -88,7 +88,8 @@ typedef struct ws_info_s {
     parent_info_t parent_info[WS_PARENT_LIST_SIZE];
     parent_info_list_t parent_list_free;
     parent_info_list_t parent_list_reserved;
-    uint32_t pan_version_timer;            /**< border router version udate timeout */
+    uint16_t rpl_version_timer;            /**< RPL version update timeout */
+    uint32_t pan_version_timer;            /**< border router version update timeout */
     uint32_t pan_version_timeout_timer;    /**< routers will fallback to previous state after this */
     uint32_t pan_config_sol_max_timeout;
     uint8_t gtkhash[32];
diff --git a/source/6LoWPAN/ws/ws_config.h b/source/6LoWPAN/ws/ws_config.h
@@ -46,7 +46,10 @@
 #define PAN_VERSION_MEDIUM_NETWORK_LIFETIME 15*60
 #define PAN_VERSION_LARGE_NETWORK_LIFETIME 30*60 //30min
 
-#define RPL_VERSION_LIFETIME 5*3600
+// RPL version number update intervall
+// after restart version numbers are increased faster and then slowed down when network is stable
+#define RPL_VERSION_LIFETIME 12*3600
+#define RPL_VERSION_LIFETIME_RESTART 3600
 
 /* Border router connection lost timeout
  *
diff --git a/source/RPL/rpl_control.c b/source/RPL/rpl_control.c
@@ -621,13 +621,16 @@ void rpl_control_increment_dtsn(rpl_dodag_t *dodag)
     //rpl_dodag_inconsistency(dodag); currently implied by rpl_dodag_increment_dtsn
 }
 
-void rpl_control_increment_dodag_version(rpl_dodag_t *dodag)
+uint8_t rpl_control_increment_dodag_version(rpl_dodag_t *dodag)
 {
+    uint8_t new_version = 240;
     if (rpl_dodag_am_root(dodag)) {
-        uint8_t new_version = rpl_seq_inc(rpl_dodag_get_version_number_as_root(dodag));
+        new_version = rpl_seq_inc(rpl_dodag_get_version_number_as_root(dodag));
         rpl_dodag_set_version_number_as_root(dodag, new_version);
     }
+    return new_version;
 }
+
 void rpl_control_update_dodag_config(struct rpl_dodag *dodag, const rpl_dodag_conf_t *conf)
 {
 
diff --git a/source/RPL/rpl_control.h b/source/RPL/rpl_control.h
@@ -130,7 +130,7 @@ struct rpl_dodag *rpl_control_create_dodag_root(rpl_domain_t *domain, uint8_t in
 void rpl_control_delete_dodag_root(rpl_domain_t *domain, struct rpl_dodag *dodag);
 void rpl_control_update_dodag_route(struct rpl_dodag *dodag, const uint8_t *prefix, uint8_t prefix_len, uint8_t flags, uint32_t lifetime, bool age);
 void rpl_control_update_dodag_prefix(struct rpl_dodag *dodag, const uint8_t *prefix, uint8_t prefix_len, uint8_t flags, uint32_t lifetime, uint32_t preftime, bool age);
-void rpl_control_increment_dodag_version(struct rpl_dodag *dodag);
+uint8_t rpl_control_increment_dodag_version(struct rpl_dodag *dodag);
 void rpl_control_update_dodag_config(struct rpl_dodag *dodag, const rpl_dodag_conf_t *conf);
 void rpl_control_set_dodag_pref(struct rpl_dodag *dodag, uint8_t pref);
 void rpl_control_increment_dtsn(struct rpl_dodag *dodag);
diff --git a/test/nanostack/unittest/stub/rpl_control_stub.c b/test/nanostack/unittest/stub/rpl_control_stub.c
@@ -144,9 +144,9 @@ void rpl_control_increment_dtsn(rpl_dodag_t *dodag)
 
 }
 
-void rpl_control_increment_dodag_version(rpl_dodag_t *dodag)
+uint8_t rpl_control_increment_dodag_version(rpl_dodag_t *dodag)
 {
-
+    return 0;
 }
 
 void rpl_control_set_dodag_pref(rpl_dodag_t *dodag, uint8_t pref)

Original file line number	Diff line number	Diff line change
`@@ -621,13 +621,16 @@ void rpl_control_increment_dtsn(rpl_dodag_t *dodag)`
`621`	`621`	`//rpl_dodag_inconsistency(dodag); currently implied by rpl_dodag_increment_dtsn`
`622`	`622`	`}`
`623`	`623`
`624`		`-void rpl_control_increment_dodag_version(rpl_dodag_t *dodag)`
	`624`	`+uint8_t rpl_control_increment_dodag_version(rpl_dodag_t *dodag)`
`625`	`625`	`{`
	`626`	`+ uint8_t new_version = 240;`
`626`	`627`	`if (rpl_dodag_am_root(dodag)) {`
`627`		`- uint8_t new_version = rpl_seq_inc(rpl_dodag_get_version_number_as_root(dodag));`
	`628`	`+ new_version = rpl_seq_inc(rpl_dodag_get_version_number_as_root(dodag));`
`628`	`629`	`rpl_dodag_set_version_number_as_root(dodag, new_version);`
`629`	`630`	`}`
	`631`	`+ return new_version;`
`630`	`632`	`}`
	`633`	`+`
`631`	`634`	`void rpl_control_update_dodag_config(struct rpl_dodag dodag, const rpl_dodag_conf_t conf)`
`632`	`635`	`{`
`633`	`636`
Original file line number	Diff line number	Diff line change
`@@ -144,9 +144,9 @@ void rpl_control_increment_dtsn(rpl_dodag_t *dodag)`
`144`	`144`
`145`	`145`	`}`
`146`	`146`
`147`		`-void rpl_control_increment_dodag_version(rpl_dodag_t *dodag)`
	`147`	`+uint8_t rpl_control_increment_dodag_version(rpl_dodag_t *dodag)`
`148`	`148`	`{`
`149`		`-`
	`149`	`+ return 0;`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`void rpl_control_set_dodag_pref(rpl_dodag_t *dodag, uint8_t pref)`