RPL, FHSS and Wisun Update

Channel switch will be cancelled if active TX wait ACK.

Wi-sun neighbor NUD callback will trig a init NS probe to new learned
neighbor if ETX is uninitialized.

Wi-sun NUD will be done to all neighbours

Wi-sun disable auto probe at Neigh cache.

Wi-sun BBR accept 2 path to root.

RPL unicast DIS tx will be randomized.

Change-Id: Ib563bf88d91842113ba1db45fff83bc3e2d35ca4

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bbr_api.c

@@ -55,7 +55,7 @@ static void ws_bbr_rpl_root_activate(uint8_t *dodag_prefix, uint8_t *dodag_id)
         .lifetime_unit = 60,
         .objective_code_point = 1, // MRHOF algorithm used
         .authentication = 0,
-        .path_control_size = 0,
+        .path_control_size = 1,
         .dag_max_rank_increase = 2048,
         .min_hop_rank_increase = 128,
         // DIO configuration

source/6LoWPAN/ws/ws_bootstrap.c

@@ -360,8 +360,9 @@ uint16_t ws_etx_read(protocol_interface_info_entry_t *interface, addrtype_t addr
     }
     attribute_index = mac_neighbor->index;
     ws_neighbor_class_entry_t *ws_neighbour = ws_neighbor_class_entry_get(&interface->ws_info->neighbor_storage, attribute_index);
+    etx_storage_t *etx_entry = etx_storage_entry_get(interface->id, attribute_index);
 
-    if (!ws_neighbour ||
+    if (!ws_neighbour || !etx_entry || etx_entry->etx_samples < 1 ||
         !ws_neighbour->candidate_parent) {
         // if RSL value is not good enough candidate parent flag is removed and device not accepted as parent
         //tr_debug("ws_etx_read not valid parent");
@@ -397,6 +398,8 @@ static int8_t ws_bootstrap_up(protocol_interface_info_entry_t *cur)
         tr_error("fhss initialization failed");
         return -3;
     }
+
+
     // Save FHSS api
     cur->ws_info->fhss_api = ns_sw_mac_get_fhss_api(cur->mac_api);
 
@@ -412,6 +415,8 @@ static int8_t ws_bootstrap_up(protocol_interface_info_entry_t *cur)
     cur->ipv6_neighbour_cache.use_eui64_as_slla_in_aro = true;
     /* Omit sending of NA if ARO SUCCESS */
     cur->ipv6_neighbour_cache.omit_aro_success = true;
+    /* Disable NUD Probes */
+    cur->ipv6_neighbour_cache.send_nud_probes = false;
 
     ws_bootstrap_event_discovery_start(cur);
 
@@ -714,7 +719,6 @@ static void ws_bootstrap_pan_config_analyse(struct protocol_interface_info_entry
     ws_neighbor_class_neighbor_unicast_schedule_set(neighbor_info.ws_neighbor, ws_us);
     ws_neighbor_class_neighbor_broadcast_time_info_update(neighbor_info.ws_neighbor, &ws_bt_ie, data->timestamp);
     ws_neighbor_class_neighbor_broadcast_schedule_set(neighbor_info.ws_neighbor, &ws_bs_ie);
-    neighbor_info.neighbor->trusted_device = true;
 
     if (cur->ws_info->configuration_learned) {
         // received version is lower se we need to reset the trickle
@@ -972,24 +976,38 @@ static void ws_neighbor_entry_remove_notify(mac_neighbor_table_entry_t *entry_pt
     ws_bootstrap_neighbor_delete(cur,entry_ptr->index);
 }
 
-
 static bool ws_neighbor_entry_nud_notify(mac_neighbor_table_entry_t *entry_ptr, void *user_data)
 {
     uint32_t time_from_start = entry_ptr->link_lifetime - entry_ptr->lifetime;
     bool activate_nud = false;
-    if ((entry_ptr->link_role == PRIORITY_PARENT_NEIGHBOUR || entry_ptr->link_role == SECONDARY_PARENT_NEIGHBOUR)  && time_from_start > WS_NEIGHBOR_NUD_TIMEOUT) {
-        if (entry_ptr->trusted_device) {
+    protocol_interface_info_entry_t *cur = user_data;
+
+    ws_neighbor_class_entry_t *ws_neighbor = ws_neighbor_class_entry_get(&cur->ws_info->neighbor_storage, entry_ptr->index);
+    etx_storage_t *etx_entry = etx_storage_entry_get(cur->id, entry_ptr->index);
+
+    if (!entry_ptr->trusted_device || !ws_neighbor || !etx_entry) {
+        return false;
+    }
+
+    if (time_from_start > WS_NEIGHBOR_NUD_TIMEOUT) {
+        //Take Random from 1-1.5 time WS_NEIGHBOR_NUD_TIMEOUT
+        uint32_t compare_random = randLIB_randomise_base(WS_NEIGHBOR_NUD_TIMEOUT, 0x8000, 0xC000);
+        if (time_from_start > compare_random) {
+            activate_nud = true;
+        }
+    } else if (etx_entry->etx_samples < 1) {
+        uint32_t compare_random = randLIB_get_random_in_range(0, 8);
+        if (time_from_start > compare_random) {
+            tr_debug("Link Probe test %u with jitter", compare_random);
             activate_nud = true;
         }
-
     }
+
     if (!activate_nud) {
         return false;
     }
 
 
-    protocol_interface_info_entry_t *cur = user_data;
-
     uint8_t ll_target[16];
     memcpy(ll_target, ADDR_LINK_LOCAL_PREFIX, 8);
     memcpy(ll_target + 8, entry_ptr->mac64, 8);

source/6LoWPAN/ws/ws_common_defines.h

@@ -182,7 +182,7 @@ typedef struct ws_bs_ie {
 
 #define WS_FAN_VERSION_1_0 1
 
-#define WS_NEIGHBOR_LINK_TIMEOUT 240
+#define WS_NEIGHBOR_LINK_TIMEOUT 2200
 #define WS_NEIGHBOR_NUD_TIMEOUT WS_NEIGHBOR_LINK_TIMEOUT / 2
 
 /*

source/6LoWPAN/ws/ws_neighbor_class.c

@@ -27,7 +27,7 @@
 
 #ifdef HAVE_WS
 
-#define RSL_UNITITIALIZED 0x7fff
+
 #define TRACE_GROUP "wsne"
 
 

source/6LoWPAN/ws/ws_neighbor_class.h

@@ -21,6 +21,8 @@
 #include "fhss_ws_extension.h"
 #include "6LoWPAN/ws/ws_common_defines.h"
 
+#define RSL_UNITITIALIZED 0x7fff
+
 typedef struct ws_neighbor_class_entry {
     fhss_ws_neighbor_timing_info_t   fhss_data;
     uint16_t rsl_in;                                       /*!< RSL EWMA heard from neighbour*/

source/MAC/IEEE802_15_4/mac_fhss_callbacks.c

@@ -82,7 +82,7 @@ int mac_set_channel(const fhss_api_t *fhss_api, uint8_t channel_number)
     if (!mac_setup) {
         return -1;
     }
-    if (mac_setup->mac_ack_tx_active || (mac_setup->active_pd_data_request && mac_setup->active_pd_data_request->asynch_request)) {
+    if (mac_setup->mac_ack_tx_active || (mac_setup->active_pd_data_request && (mac_setup->active_pd_data_request->asynch_request || mac_setup->timer_mac_event == MAC_TIMER_ACK))) {
         return -1;
     }
     return mac_mlme_rf_channel_change(mac_setup, channel_number);

source/RPL/rpl_structures.h

@@ -134,6 +134,7 @@ typedef struct rpl_dao_non_root
     uint32_t refresh_timer;             /* Refresh timer (seconds) - 0xFFFFFFFF = infinite, 0 = not yet set */
 } rpl_dao_non_root_t;
 
+
 /* Descriptor for a RPL DAO target */
 struct rpl_dao_target
 {

source/RPL/rpl_upward.c

@@ -1555,6 +1555,7 @@ void rpl_instance_slow_timer(rpl_instance_t *instance, uint16_t seconds)
     }
 }
 
+
 void rpl_upward_dio_timer(rpl_instance_t *instance, uint16_t ticks)
 {
     rpl_dodag_version_t *dodag_version = instance->current_dodag_version;

source/Service_Libs/etx/etx.c

@@ -81,6 +81,9 @@ void etx_transm_attempts_update(int8_t interface_id, uint8_t attempts, bool succ
     if (!entry) {
         return;
     }
+    if (entry->etx_samples < 7) {
+        entry->etx_samples++;
+    }
 
     accumulated_failures = entry->accumulated_failures;
 

source/Service_Libs/etx/etx.h

@@ -38,6 +38,7 @@ typedef struct etx_storage_s {
     unsigned        accumulated_failures: 5;
     unsigned        tmp_etx: 1;
     unsigned        linkIdr: 4;
+    unsigned        etx_samples: 3;
 } etx_storage_t;
 
 /**

source/Service_Libs/mac_neighbor_table/mac_neighbor_table.c

@@ -192,6 +192,9 @@ void mac_neighbor_table_neighbor_connected(mac_neighbor_table_t *table_class, ma
 void mac_neighbor_table_trusted_neighbor(mac_neighbor_table_t *table_class, mac_neighbor_table_entry_t *neighbor_entry, bool trusted_device)
 {
     (void)table_class;
+    if (!neighbor_entry->trusted_device && trusted_device) {
+        neighbor_entry->lifetime = neighbor_entry->link_lifetime;
+    }
     neighbor_entry->trusted_device = trusted_device;
 }
 

test/nanostack/unittest/service_libs/mac_neighbor_table/test_mac_neighbor_table.c

@@ -133,19 +133,19 @@ bool test_mac_neighbor_table_use()
 
     mac_neighbor_table_trusted_neighbor(entry, mac_entry3, true);
 
-    if (!mac_entry3->trusted_device) {
+    if (!mac_entry3->trusted_device && mac_entry3->lifetime != 240) {
         return false;
     }
 
     mac_neighbor_table_neighbor_timeout_update(entry, 31);
 
-    if (mac_entry3->lifetime != 199 || mac_entry2->lifetime != 199 || mac_entry1->lifetime != 199) {
+    if (mac_entry3->lifetime != 209 || mac_entry2->lifetime != 199 || mac_entry1->lifetime != 199) {
         return false;
     }
 
     mac_neighbor_table_neighbor_timeout_update(entry, 170);
 
-    if (mac_entry3->lifetime != 29 || mac_entry2->lifetime != 29 || mac_entry1->lifetime != 29) {
+    if (mac_entry3->lifetime != 39 || mac_entry2->lifetime != 29 || mac_entry1->lifetime != 29) {
             return false;
         }