Wi-sun RPL candidate accept update

Earlier we have it static limit for accept new RPL candidate neighbours now we have in fuure possibility to add dynamic parameters to that.

Default setup works like before but certificate network config accept 8 candidates and 3 selected parent.

Change-Id: Ie0d2100ab0fb5c0e76a9773b518ac72c31924943

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -1577,13 +1577,13 @@ static bool ws_rpl_dio_new_parent_accept(struct protocol_interface_info_entry *i
     uint16_t parent_candidate_size = rpl_control_parent_candidate_list_size(interface, false);
     //TODO check bootstarap state for review
     //if we have enough candidates at list do not accept new multicast neighbours
-    if (parent_candidate_size > WS_NEIGHBOUR_MAX_CANDIDATE_PROBE) {
+    if (parent_candidate_size > interface->ws_info->rpl_parent_candidate_max) {
         return false;
     }
 
     parent_candidate_size = rpl_control_parent_candidate_list_size(interface, true);
-    //If we have already enough parent selected Candidates count is bigger tahn 4
-    if (parent_candidate_size >= 2) {
+    //If we have already enough parent selected Candidates count is bigger than configured
+    if (parent_candidate_size >= interface->ws_info->rpl_selected_parent_max) {
         return false;
     }
 

source/6LoWPAN/ws/ws_common.c

@@ -300,6 +300,8 @@ int8_t ws_common_allocate_and_init(protocol_interface_info_entry_t *cur)
     cur->ws_info->hopping_schdule.operating_class = 2;
     ws_common_regulatory_domain_config(cur);
     cur->ws_info->network_size_config = NETWORK_SIZE_MEDIUM;
+    cur->ws_info->rpl_parent_candidate_max = WS_RPL_PARENT_CANDIDATE_MAX;
+    cur->ws_info->rpl_selected_parent_max = WS_RPL_SELECTED_PARENT_MAX;
     ws_common_network_size_configure(cur, 200); // defaults to medium network size
 
     // Set defaults for the device. user can modify these.

source/6LoWPAN/ws/ws_common.h

@@ -72,6 +72,8 @@ typedef struct ws_info_s {
     trickle_t trickle_pan_advertisement;
     trickle_params_t trickle_params_pan_discovery;
     uint8_t network_size_config; // configuration for network size selection of application.
+    uint16_t rpl_parent_candidate_max;
+    uint16_t rpl_selected_parent_max;
     uint8_t rpl_state; // state from rpl_event_t
     uint8_t pas_requests; // Amount of PAN solicits sent
     parent_info_t parent_info[WS_PARENT_LIST_SIZE];

source/6LoWPAN/ws/ws_common_defines.h

@@ -207,6 +207,12 @@ typedef struct ws_bs_ie {
 
 #define WS_ETX_MIN_WAIT_TIME 60
 
+#define WS_RPL_PARENT_CANDIDATE_MAX 5
+#define WS_RPL_SELECTED_PARENT_MAX 2
+
+#define WS_CERTIFICATE_RPL_PARENT_CANDIDATE_MAX 8
+#define WS_CERTIFICATE_RPL_SELECTED_PARENT_MAX 3
+
 /**
  * Wi-sun spesific non-preferred prefix policy label
  */

source/6LoWPAN/ws/ws_management_api.c

@@ -140,6 +140,17 @@ int ws_management_network_size_set(
     uint8_t old_setup = ws_info(cur)->network_size_config;
     ws_info(cur)->network_size_config = network_size;
 
+    uint16_t rpl_parent_candidate_max;
+    uint16_t rpl_selected_parent_max;
+
+    if (network_size == NETWORK_SIZE_CERTIFICATE) {
+        rpl_parent_candidate_max = WS_CERTIFICATE_RPL_PARENT_CANDIDATE_MAX;
+        rpl_selected_parent_max = WS_CERTIFICATE_RPL_SELECTED_PARENT_MAX;
+    } else {
+        rpl_parent_candidate_max = WS_RPL_PARENT_CANDIDATE_MAX;
+        rpl_selected_parent_max = WS_RPL_SELECTED_PARENT_MAX;
+    }
+
     if (network_size == NETWORK_SIZE_LARGE) {
         ws_common_network_size_configure(cur, 5000);
     } else if (network_size == NETWORK_SIZE_MEDIUM) {
@@ -152,6 +163,8 @@ int ws_management_network_size_set(
         ws_info(cur)->network_size_config = old_setup;
         return -2;
     }
+    cur->ws_info->rpl_parent_candidate_max = rpl_parent_candidate_max;
+    cur->ws_info->rpl_selected_parent_max = rpl_selected_parent_max;
     return 0;
 }