Made parent set size configuraple in RPL

Set default parent count in Wi-SUN to be 2

Author: Mika Tervonen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -2254,6 +2254,7 @@ static void ws_bootstrap_rpl_activate(protocol_interface_info_entry_t *cur)
     rpl_control_set_dio_multicast_min_config_advertisment_count(WS_MIN_DIO_MULTICAST_CONFIG_ADVERTISMENT_COUNT);
     rpl_control_set_dao_retry_count(WS_MAX_DAO_RETRIES);
     rpl_control_set_initial_dao_ack_wait(WS_MAX_DAO_INITIAL_TIMEOUT);
+    rpl_control_set_mrhof_parent_set_size(WS_MAX_PARENT_SET_COUNT);
 
     cur->ws_info->rpl_state = 0xff; // Set invalid state and learn from event
 }

source/6LoWPAN/ws/ws_config.h

@@ -149,6 +149,7 @@ extern uint8_t DEVICE_MIN_SENS;
 #define WS_MAX_DAO_RETRIES 3 // With 40s, 80s, 160s, 320s, 640s
 #define WS_MAX_DAO_INITIAL_TIMEOUT 400 // With 40s initial value exponentially increasing
 #define WS_MIN_DIO_MULTICAST_CONFIG_ADVERTISMENT_COUNT 0xff // Advertisment config at every MC DIO
+#define WS_MAX_PARENT_SET_COUNT 2 // maximum amount of parents selected by node
 
 /*
  * Candidate parent list parameters

source/RPL/rpl_control.c

@@ -190,6 +190,10 @@ void rpl_control_set_initial_dao_ack_wait(uint16_t timeout_in_ms)
 {
     rpl_policy_set_initial_dao_ack_wait(timeout_in_ms);
 }
+void rpl_control_set_mrhof_parent_set_size(uint16_t parent_set_size)
+{
+    rpl_policy_set_mrhof_parent_set_size(parent_set_size);
+}
 
 /* Send address registration to either specified address, or to non-registered address */
 void rpl_control_register_address(protocol_interface_info_entry_t *interface, const uint8_t addr[16])

source/RPL/rpl_control.h

@@ -168,6 +168,7 @@ void rpl_control_request_parent_link_confirmation(bool requested);
 void rpl_control_set_dio_multicast_min_config_advertisment_count(uint8_t min_count);
 void rpl_control_set_dao_retry_count(uint8_t count);
 void rpl_control_set_initial_dao_ack_wait(uint16_t timeout_in_ms);
+void rpl_control_set_mrhof_parent_set_size(uint16_t parent_set_size);
 void rpl_control_register_address(struct protocol_interface_info_entry *interface, const uint8_t addr[16]);
 void rpl_control_address_register_done(struct protocol_interface_info_entry *interface, const uint8_t ll_addr[16], uint8_t status);
 
@@ -195,6 +196,7 @@ uint8_t rpl_policy_mrhof_parent_set_size_get(const rpl_domain_t *domain);
 #define rpl_control_register_address(interface, addr) ((void) 0)
 #define rpl_control_address_register_done(interface, ll_addr, status) ((void) 0)
 #define rpl_policy_mrhof_parent_set_size_get(domain) (0)
+#define rpl_control_set_mrhof_parent_set_size(parent_set_size)
 
 #endif /* HAVE_RPL */
 

source/RPL/rpl_policy.c

@@ -39,7 +39,7 @@ static int8_t rpl_policy_dao_retry_count_conf = 0;
 static int16_t rpl_policy_dao_initial_timeout_conf = 20; // Default is 2 seconds 100ms ticks
 static uint16_t rpl_policy_dio_validity_period_hysteresis = 0x0180; //Fixed Point 1.5
 static uint8_t rpl_policy_multicast_config_min_advertisment_count = 0;
-
+static uint8_t rpl_policy_mrhof_parent_set_size_conf = 3; // default parent set size
 
 /* TODO - application API to control when to join new instances / DODAGs
  *
@@ -326,11 +326,16 @@ uint_fast8_t rpl_policy_of0_max_backup_successors(const rpl_domain_t *domain)
     return 1;
 }
 
+void rpl_policy_set_mrhof_parent_set_size(uint8_t parent_set_size)
+{
+    rpl_policy_mrhof_parent_set_size_conf = parent_set_size;
+}
+
 uint_fast8_t rpl_policy_mrhof_parent_set_size(const rpl_domain_t *domain)
 {
     (void)domain;
 
-    return 3;
+    return rpl_policy_mrhof_parent_set_size_conf;
 }
 
 uint16_t rpl_policy_mrhof_max_rank_stretch_for_extra_parents(const rpl_domain_t *domain)

source/RPL/rpl_policy.h

@@ -59,6 +59,7 @@ uint_fast8_t rpl_policy_of0_rank_factor(const rpl_domain_t *domain);
 bool rpl_policy_of0_dodag_preference_supersedes_grounded(const rpl_domain_t *domain);
 uint_fast8_t rpl_policy_of0_max_backup_successors(const rpl_domain_t *domain);
 
+void rpl_policy_set_mrhof_parent_set_size(uint8_t parent_set_size);
 uint_fast8_t rpl_policy_mrhof_parent_set_size(const rpl_domain_t *domain);
 uint16_t rpl_policy_mrhof_max_link_metric(const rpl_domain_t *domain);
 uint16_t rpl_policy_mrhof_parent_switch_threshold(const rpl_domain_t *domain);

test/nanostack/unittest/stub/rpl_control_stub.c

@@ -264,6 +264,10 @@ void rpl_control_set_initial_dao_ack_wait(uint16_t timeout_in_ms)
 
 }
 
+void rpl_control_set_parent_set_size(uint16_t parent_set_size)
+{
+}
+
 bool rpl_control_probe_parent_candidate(protocol_interface_info_entry_t *interface, const uint8_t ll_addr[16])
 {
     return false;

test/nanostack/unittest/stub/rpl_policy_stub.c

@@ -158,6 +158,10 @@ uint_fast8_t rpl_policy_of0_max_backup_successors(const rpl_domain_t *domain)
     return 0;
 }
 
+void rpl_policy_set_mrhof_parent_set_size(uint8_t parent_set_size)
+{
+}
+
 uint_fast8_t rpl_policy_mrhof_parent_set_size(const rpl_domain_t *domain)
 {
     return 0;