Wi-sun PAN_VERSION lifetime and timeout update

Lifetime and timeout will be now dynamic and based on network size.
Small network setup:
PAN_TIMEOUT 32 min version lifetime 4 min.

Medium network setup:
PAN_TIMEOUT 64 min version lifetime 15 min.

Large network setup:
PAN_TIMEOUT 90 min version lifetime 30 min.

Change-Id: I58ae12d4dc5d4d5804ac4fabadb6f2cfcf8dc034

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bbr_api.c

@@ -467,7 +467,7 @@ void ws_bbr_seconds_timer(protocol_interface_info_entry_t *cur, uint32_t 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_version_timer = ws_common_version_lifetime_get(cur->ws_info->network_size_config);
             cur->ws_info->pan_information.pan_version++;
             // Inconsistent for border router to make information distribute faster
             ws_bootstrap_configuration_trickle_reset(cur);
@@ -478,7 +478,7 @@ void ws_bbr_seconds_timer(protocol_interface_info_entry_t *cur, uint32_t seconds
             // 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
             // Version number update is only done if DoDAG MAX Rank Increase parameter is 0
-            if (rpl_conf.dag_max_rank_increase == 0 && cur->ws_info->pan_information.pan_version && cur->ws_info->pan_information.pan_version % RPL_VERSION_LIFETIME / PAN_VERSION_LIFETIME == 0) {
+            if (rpl_conf.dag_max_rank_increase == 0 && cur->ws_info->pan_information.pan_version && cur->ws_info->pan_information.pan_version % RPL_VERSION_LIFETIME / cur->ws_info->pan_version_timer  == 0) {
                 // Third the rate of configuration version change at default 5 hours
                 rpl_control_increment_dodag_version(protocol_6lowpan_rpl_root_dodag);
             }
@@ -619,3 +619,4 @@ int ws_bbr_node_access_revoke_start(int8_t interface_id)
     return -1;
 #endif
 }
+

source/6LoWPAN/ws/ws_bootstrap.c

@@ -1126,7 +1126,7 @@ static void ws_bootstrap_pan_config_analyse(struct protocol_interface_info_entry
     tr_info("Updated PAN configuration own:%d, heard:%d", cur->ws_info->pan_information.pan_version, pan_version);
 
     // restart PAN version timer
-    cur->ws_info->pan_version_timeout_timer = PAN_VERSION_TIMEOUT;
+    cur->ws_info->pan_version_timeout_timer = ws_common_version_timeout_get(cur->ws_info->network_size_config);
     cur->ws_info->pan_information.pan_version = pan_version;
 
     ws_pae_controller_gtk_hash_update(cur, gtkhash_ptr);
@@ -2412,7 +2412,7 @@ static void ws_bootstrap_event_handler(arm_event_s *event)
 
                 uint8_t *gtkhash = ws_pae_controller_gtk_hash_ptr_get(cur);
                 ws_llc_set_gtkhash(cur, gtkhash);
-                cur->ws_info->pan_version_timer = PAN_VERSION_LIFETIME;
+                cur->ws_info->pan_version_timer = ws_common_version_lifetime_get(cur->ws_info->network_size_config);
 
                 // Set default parameters for FHSS when starting a discovery
                 ws_fhss_border_router_configure(cur);

source/6LoWPAN/ws/ws_common.c

@@ -422,6 +422,35 @@ void ws_common_etx_validate(protocol_interface_info_entry_t *interface, mac_neig
     ws_bootstrap_etx_accelerate(interface, neigh);
 }
 
+uint32_t ws_common_version_lifetime_get(uint8_t config)
+{
+    uint32_t lifetime;
+    if (config == NETWORK_SIZE_SMALL) {
+        lifetime = PAN_VERSION_SMALL_NETWORK_LIFETIME;
+    } else if (config == NETWORK_SIZE_MEDIUM) {
+        lifetime = PAN_VERSION_MEDIUM_NETWORK_LIFETIME;
+    } else {
+        lifetime = PAN_VERSION_LARGE_NETWORK_LIFETIME;
+    }
+
+    return lifetime;
+
+}
+
+uint32_t ws_common_version_timeout_get(uint8_t config)
+{
+    uint32_t lifetime;
+    if (config == NETWORK_SIZE_SMALL) {
+        lifetime = PAN_VERSION_SMALL_NETWORK_TIMEOUT;
+    } else if (config == NETWORK_SIZE_MEDIUM) {
+        lifetime = PAN_VERSION_MEDIUM_NETWORK_TIMEOUT;
+    } else {
+        lifetime = PAN_VERSION_LARGE_NETWORK_TIMEOUT;
+    }
+
+    return lifetime;
+}
+
 
 #endif // HAVE_WS
 

source/6LoWPAN/ws/ws_common.h

@@ -126,6 +126,11 @@ void ws_common_etx_validate(protocol_interface_info_entry_t *interface, mac_neig
 
 bool ws_common_negative_aro_mark(protocol_interface_info_entry_t *interface, const uint8_t *eui64);
 
+
+uint32_t ws_common_version_lifetime_get(uint8_t config);
+
+uint32_t ws_common_version_timeout_get(uint8_t config);
+
 #define ws_info(cur) ((cur)->ws_info)
 #else
 #define ws_info(cur) ((ws_info_t *) NULL)

source/6LoWPAN/ws/ws_config.h

@@ -37,7 +37,9 @@
  * Minimum interval at which a Border Router shall increment its PAN Version value.
  */
 
-#define PAN_VERSION_LIFETIME 240
+#define PAN_VERSION_SMALL_NETWORK_LIFETIME 4*60
+#define PAN_VERSION_MEDIUM_NETWORK_LIFETIME 15*60
+#define PAN_VERSION_LARGE_NETWORK_LIFETIME 30*60 //30min
 
 #define RPL_VERSION_LIFETIME 5*3600
 
@@ -50,7 +52,11 @@
  *
  */
 
-#define PAN_VERSION_TIMEOUT 1920
+#define PAN_VERSION_SMALL_NETWORK_TIMEOUT 32*60
+
+#define PAN_VERSION_MEDIUM_NETWORK_TIMEOUT 64*60
+
+#define PAN_VERSION_LARGE_NETWORK_TIMEOUT 90*60
 
 /* Routing Cost Weighting factor
  */