Added Network size setup for certificate test

This setup will select Small network setup but set Dag max rank increase to 0 and min hop rank increase to 128.

Change-Id: I8b47bf5eb4dc84b05fe75cfd6238fe31ff5dc15a

Author: Juha Heiskanen

nanostack/ws_management_api.h

@@ -79,6 +79,7 @@ extern "C" {
 #define NETWORK_SIZE_SMALL 0x01
 #define NETWORK_SIZE_MEDIUM 0x08
 #define NETWORK_SIZE_LARGE 0x10
+#define NETWORK_SIZE_CERTIFICATE 0xFF
 
 
 /** Temporary API change flag. this will be removed when new version of API is implemented on applications

source/6LoWPAN/ws/ws_bbr_api.c

@@ -72,33 +72,40 @@ static rpl_dodag_conf_t rpl_conf = {
     .default_lifetime = 120,
     .lifetime_unit = 60,
     .objective_code_point = 1, // MRHOF algorithm used
-    .authentication = 0,
+    .authentication = false,
     .path_control_size = 7,
-    .dag_max_rank_increase = 2048,
-    .min_hop_rank_increase = 196,
+    .dag_max_rank_increase = WS_RPL_MAX_HOP_RANK_INCREASE,
+    .min_hop_rank_increase = WS_RPL_MIN_HOP_RANK_INCREASE,
     // DIO configuration
     .dio_interval_min = WS_RPL_DIO_IMIN,
     .dio_interval_doublings = WS_RPL_DIO_DOUBLING,
     .dio_redundancy_constant = WS_RPL_DIO_REDUNDANCY
 };
 
-void ws_bbr_rpl_config(uint8_t imin, uint8_t doubling, uint8_t 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)
 {
     if (imin == 0 || doubling == 0) {
         // use default values
         imin = WS_RPL_DIO_IMIN;
         doubling = WS_RPL_DIO_DOUBLING;
         redundancy = WS_RPL_DIO_REDUNDANCY;
     }
+
     if (rpl_conf.dio_interval_min == imin &&
             rpl_conf.dio_interval_doublings == doubling &&
-            rpl_conf.dio_redundancy_constant == redundancy) {
+            rpl_conf.dio_redundancy_constant == redundancy &&
+            rpl_conf.dag_max_rank_increase == dag_max_rank_increase &&
+            rpl_conf.min_hop_rank_increase == min_hop_rank_increase) {
         // Same values no update needed
         return;
     }
+
     rpl_conf.dio_interval_min = imin;
     rpl_conf.dio_interval_doublings = doubling;
     rpl_conf.dio_redundancy_constant = redundancy;
+    rpl_conf.dag_max_rank_increase = dag_max_rank_increase;
+    rpl_conf.min_hop_rank_increase = min_hop_rank_increase;
+
     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);

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);
+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);
 
 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)
+#define ws_bbr_rpl_config( imin, doubling, redundancy, dag_max_rank_increase, min_hop_rank_increase)
 #define ws_bbr_ready_to_start(cur) true
 
 #endif //HAVE_WS_BORDER_ROUTER

source/6LoWPAN/ws/ws_common.c

@@ -329,9 +329,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_bbr_rpl_config(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);
         } else {
-            ws_bbr_rpl_config(0, 0, 0);
+            ws_bbr_rpl_config(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) {
@@ -341,7 +343,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_bbr_rpl_config(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
@@ -350,7 +352,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_bbr_rpl_config(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;
@@ -456,7 +458,7 @@ void ws_common_etx_validate(protocol_interface_info_entry_t *interface, mac_neig
 uint32_t ws_common_version_lifetime_get(uint8_t config)
 {
     uint32_t lifetime;
-    if (config == NETWORK_SIZE_SMALL) {
+    if (config == NETWORK_SIZE_SMALL || config == NETWORK_SIZE_CERTIFICATE) {
         lifetime = PAN_VERSION_SMALL_NETWORK_LIFETIME;
     } else if (config == NETWORK_SIZE_MEDIUM) {
         lifetime = PAN_VERSION_MEDIUM_NETWORK_LIFETIME;
@@ -471,7 +473,7 @@ uint32_t ws_common_version_lifetime_get(uint8_t config)
 uint32_t ws_common_version_timeout_get(uint8_t config)
 {
     uint32_t lifetime;
-    if (config == NETWORK_SIZE_SMALL) {
+    if (config == NETWORK_SIZE_SMALL || config == NETWORK_SIZE_CERTIFICATE) {
         lifetime = PAN_VERSION_SMALL_NETWORK_TIMEOUT;
     } else if (config == NETWORK_SIZE_MEDIUM) {
         lifetime = PAN_VERSION_MEDIUM_NETWORK_TIMEOUT;

source/6LoWPAN/ws/ws_config.h

@@ -31,6 +31,11 @@
 #define WS_RPL_DIO_DOUBLING 2
 #define WS_RPL_DIO_REDUNDANCY 0
 
+#define WS_RPL_MIN_HOP_RANK_INCREASE 196
+#define WS_RPL_MAX_HOP_RANK_INCREASE 2048
+
+#define WS_CERTIFICATE_RPL_MIN_HOP_RANK_INCREASE 128
+#define WS_CERTIFICATE_RPL_MAX_HOP_RANK_INCREASE 0
 
 /* Border router version change interval
  *

source/6LoWPAN/ws/ws_management_api.c

@@ -136,17 +136,21 @@ int ws_management_network_size_set(
     if (!cur || !ws_info(cur)) {
         return -1;
     }
-    if (network_size > NETWORK_SIZE_LARGE) {
-        return -2;
-    }
+    //Store old setup if new is not accepted
+    uint8_t old_setup = ws_info(cur)->network_size_config;
     ws_info(cur)->network_size_config = network_size;
 
     if (network_size == NETWORK_SIZE_LARGE) {
         ws_common_network_size_configure(cur, 5000);
     } else if (network_size == NETWORK_SIZE_MEDIUM) {
         ws_common_network_size_configure(cur, 200);
-    } else {
+    } else if (network_size == NETWORK_SIZE_SMALL) {
         ws_common_network_size_configure(cur, 10);
+    } else if (network_size == NETWORK_SIZE_CERTIFICATE) {
+        ws_common_network_size_configure(cur, 0);
+    } else {
+        ws_info(cur)->network_size_config = old_setup;
+        return -2;
     }
     return 0;
 }