RPL dio config advertisment update

Added API for set minium advertisment count for RPL config option by DIO multicast message.

RPL DIO multicast will advertisment also RPL config in first configured number  Multicast DIO.

Advertiment will be started again if config is updated by Dodag Root.

Wi-sun bootstrap set 10 to config multicast advertisment.

Change-Id: Ia4d8e021e7efd6d49845912e2c305084eaa1ee0f

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -2062,6 +2062,7 @@ static void ws_bootstrap_rpl_activate(protocol_interface_info_entry_t *cur)
     // If i am router I Do this
     rpl_control_force_leaf(protocol_6lowpan_rpl_domain, leaf);
     rpl_control_request_parent_link_confirmation(true);
+    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);
 

source/6LoWPAN/ws/ws_config.h

@@ -139,5 +139,6 @@ 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 10 // Define 10 multicast advertisment when learn config or learn config update
 
 #endif /* WS_CONFIG_H_ */

source/RPL/rpl_control.c

@@ -176,6 +176,11 @@ void rpl_control_request_parent_link_confirmation(bool requested)
     rpl_policy_set_parent_confirmation_request(requested);
 }
 
+void rpl_control_set_dio_multicast_min_config_advertisment_count(uint8_t min_count)
+{
+    rpl_policy_set_dio_multicast_config_advertisment_min_count(min_count);
+}
+
 void rpl_control_set_dao_retry_count(uint8_t count)
 {
     rpl_policy_set_dao_retry_count(count);

source/RPL/rpl_control.h

@@ -157,6 +157,7 @@ uint16_t rpl_control_parent_candidate_list_size(struct protocol_interface_info_e
 void rpl_control_neighbor_delete(struct protocol_interface_info_entry *interface, const uint8_t ll_addr[16]);
 /* Parent link confirmation API extension */
 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_register_address(struct protocol_interface_info_entry *interface, const uint8_t addr[16]);

source/RPL/rpl_policy.c

@@ -38,6 +38,8 @@ static bool rpl_policy_parent_confirmation_req = false;
 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;
+
 
 /* TODO - application API to control when to join new instances / DODAGs
  *
@@ -364,6 +366,16 @@ bool rpl_policy_parent_confirmation_requested(void)
     return rpl_policy_parent_confirmation_req;
 }
 
+uint8_t rpl_policy_dio_multicast_config_advertisment_min_count(void)
+{
+    return rpl_policy_multicast_config_min_advertisment_count;
+}
+
+void rpl_policy_set_dio_multicast_config_advertisment_min_count(uint8_t min_count)
+{
+    rpl_policy_multicast_config_min_advertisment_count = min_count;
+}
+
 
 #ifdef RPL_STRUCTURES_H_
 #error "rpl_structures.h should not be included by rpl_policy.c"

source/RPL/rpl_policy.h

@@ -65,5 +65,7 @@ uint16_t rpl_policy_mrhof_parent_switch_threshold(const rpl_domain_t *domain);
 uint16_t rpl_policy_mrhof_max_rank_stretch_for_extra_parents(const rpl_domain_t *domain);
 bool rpl_policy_parent_confirmation_requested(void);
 void rpl_policy_set_parent_confirmation_request(bool confirmation_requested);
+uint8_t rpl_policy_dio_multicast_config_advertisment_min_count(void);
+void rpl_policy_set_dio_multicast_config_advertisment_min_count(uint8_t min_count);
 
 #endif /* RPL_POLICY_H_ */

source/RPL/rpl_structures.h

@@ -90,6 +90,7 @@ struct rpl_dodag {
     bool leaf: 1;                                   /* We are a leaf in this DODAG (by policy) */
     bool have_config: 1;                            /* We have the config */
     bool used: 1;                                   /* We have ever been a member of this DODAG? */
+    uint8_t new_config_advertisment_count;      /* We have advertiment new config at multicasti DIO */
     NS_LIST_HEAD(rpl_dodag_version_t, link) versions; /* List of DODAG versions (newest first) */
     prefix_list_t prefixes;                         /* Prefixes advertised in DIO PIOs */
     rpl_dio_route_list_t routes;                    /* Routes advertised in DIO RIOs*/

source/RPL/rpl_upward.c

@@ -635,6 +635,7 @@ rpl_dodag_t *rpl_create_dodag(rpl_instance_t *instance, const uint8_t *dodagid,
     dodag->have_config = false;
     dodag->used = false;
     dodag->g_mop_prf = g_mop_prf;
+    dodag->new_config_advertisment_count = 0;
     // Default timer parameters and trickle start should never normally
     // be used - we would set the parameters from the DODAG Config and start
     // as we join a version. But initialising here catches odd cases where
@@ -728,6 +729,7 @@ bool rpl_dodag_update_config(rpl_dodag_t *dodag, const rpl_dodag_conf_t *conf, c
         /* They've changed the timing parameters for our currently-in-use trickle timer! */
         tr_warn("Trickle parameters changed");
         trickle_start(&dodag->instance->dio_timer, &dodag->dio_timer_params);
+        dodag->new_config_advertisment_count = 0;
     }
     dodag->instance->of = rpl_objective_lookup(conf->objective_code_point);
     /* We could be a leaf of an unknown OCP. Still need an OF to choose parents */
@@ -1547,7 +1549,15 @@ void rpl_instance_dio_trigger(rpl_instance_t *instance, protocol_interface_info_
     }
 
     // Always send config in unicasts (as required), never in multicasts (optional)
-    rpl_dodag_conf_t *conf = addr ? &dodag->config : NULL;
+    rpl_dodag_conf_t *conf;
+    if (addr) {
+        conf = &dodag->config;
+    } else if (dodag->new_config_advertisment_count < rpl_policy_dio_multicast_config_advertisment_min_count()) {
+        conf = &dodag->config;
+        dodag->new_config_advertisment_count++;
+    } else {
+        conf = NULL;
+    }
 
     rpl_control_transmit_dio(instance->domain, cur, instance->id, dodag_version->number, rank, dodag->g_mop_prf, instance->dtsn, dodag, dodag->id, conf, addr);
 

test/nanostack/unittest/stub/rpl_control_stub.c

@@ -249,6 +249,11 @@ 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)
 {
 

test/nanostack/unittest/stub/rpl_policy_stub.c

@@ -197,4 +197,14 @@ int8_t rpl_policy_dao_retry_count()
     return 0;
 }
 
+void rpl_policy_set_dio_multicast_config_advertisment_min_count(uint8_t min_count)
+{
+
+}
+
+uint8_t rpl_policy_dio_multicast_config_advertisment_min_count(void)
+{
+    return 0;
+}
+
 #endif /* HAVE_RPL */