Wi-sun ETX and proping update

Removed Accelaterd Probe feature to child address registration.

ETX support now dynamic init sampling count.

ETX local read return configured MAX value for neighbour when no ETX sample have been done.

Change-Id: I2a59b7bb52b52a24a87c9c956d252726703a275a

Author: Juha Heiskanen

source/6LoWPAN/ND/nd_router_object.c

@@ -856,9 +856,6 @@ static void nd_update_registration(protocol_interface_info_entry_t *cur_interfac
         mac_neighbor_table_entry_t *entry = mac_neighbor_table_address_discover(mac_neighbor_info(cur_interface), ipv6_neighbour_eui64(&cur_interface->ipv6_neighbour_cache, neigh), ADDR_802_15_4_LONG);
 
         if (entry) {
-            if (ws_info(cur_interface)) {
-                ws_common_etx_validate(cur_interface, entry);
-            }
 
             if (!entry->ffd_device) {
                 rpl_control_publish_host_address(protocol_6lowpan_rpl_domain, neigh->ip_address, neigh->lifetime);

source/6LoWPAN/ws/ws_bootstrap.c

@@ -663,33 +663,8 @@ uint16_t ws_etx_read(protocol_interface_info_entry_t *interface, addrtype_t addr
     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 (interface->bootsrap_mode == ARM_NWK_BOOTSRAP_MODE_6LoWPAN_BORDER_ROUTER) {
-        if (!ws_neighbour || !etx_entry) {
-            return 0xffff;
-        }
-    } else {
-
-        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 params");
-            return 0xffff;
-        }
-
-        //If we are not following gbobal Broadcast synch
-        if (!interface->ws_info->pan_information.use_parent_bs) {
-            //We must know both information's here
-            if (!ws_neighbour->broadcast_shedule_info_stored ||
-                    !ws_neighbour->broadcast_timing_info_stored) {
-                return 0xffff;
-            }
-        } else {
-            if (!ws_neighbour->broadcast_timing_info_stored) {
-                //Global shedule is stored already
-                tr_debug("ws_etx_read not valid NO BTI");
-                return 0xffff;
-            }
-        }
+    if (!ws_neighbour || !etx_entry) {
+        return 0xffff;
     }
 
     etx = etx_local_etx_read(interface->id, attribute_index);
@@ -1497,7 +1472,7 @@ static void ws_bootstrap_neighbor_table_clean(struct protocol_interface_info_ent
             continue;
         }
 
-        if (cur->nud_active || ws_neighbor->accelerated_etx_probe || ws_neighbor->negative_aro_send) {
+        if (cur->nud_active || ws_neighbor->negative_aro_send) {
             //If NUD process is active do not trig
             continue;
         }
@@ -1657,34 +1632,28 @@ static bool ws_neighbor_entry_nud_notify(mac_neighbor_table_entry_t *entry_ptr,
             }
         }
         nud_proces = activate_nud;
-    } else if (etx_entry->etx_samples < WS_NEIGBOR_ETX_SAMPLE_MAX) {
+    } else if (etx_entry->etx_samples < WS_NEIGHBOR_ETX_SAMPLE_MAX) {
         //Take Random number for trig a prope.
         //ETX Sample 0: random 1-8
         //ETX Sample 1: random 2-16
         //ETX Sample 2: random 4-32
-        if (etx_entry->etx_samples == 0 && ws_neighbor->accelerated_etx_probe) {
-            //Accept quick Probe for init ETX
-            activate_nud = true;
-        } else {
-
-            ws_bootsrap_create_ll_address(ll_address, entry_ptr->mac64);
-            if (!rpl_control_probe_parent_candidate(cur, ll_address)) {
-                return false;
-            }
+        ws_bootsrap_create_ll_address(ll_address, entry_ptr->mac64);
+        if (!rpl_control_probe_parent_candidate(cur, ll_address)) {
+            return false;
+        }
 
 
-            uint32_t probe_period = WS_PROBE_INIT_BASE_SECONDS << etx_entry->etx_samples;
-            uint32_t time_block = 1 << etx_entry->etx_samples;
-            if (time_from_start >= probe_period) {
-                //tr_debug("Link Probe test %u Sample trig", etx_entry->etx_samples);
+        uint32_t probe_period = WS_PROBE_INIT_BASE_SECONDS << etx_entry->etx_samples;
+        uint32_t time_block = 1 << etx_entry->etx_samples;
+        if (time_from_start >= probe_period) {
+            //tr_debug("Link Probe test %u Sample trig", etx_entry->etx_samples);
+            activate_nud = true;
+        } else if (time_from_start > time_block) {
+            uint16_t switch_prob = randLIB_get_random_in_range(0, probe_period - 1);
+            //Take Random from time WS_NEIGHBOR_NUD_TIMEOUT - WS_NEIGHBOR_NUD_TIMEOUT*1.5
+            if (switch_prob < 2) {
+                //tr_debug("Link Probe test with jitter %"PRIu32", sample %u", time_from_start, etx_entry->etx_samples);
                 activate_nud = true;
-            } else if (time_from_start > time_block) {
-                uint16_t switch_prob = randLIB_get_random_in_range(0, probe_period - 1);
-                //Take Random from time WS_NEIGHBOR_NUD_TIMEOUT - WS_NEIGHBOR_NUD_TIMEOUT*1.5
-                if (switch_prob < 2) {
-                    //tr_debug("Link Probe test with jitter %"PRIu32", sample %u", time_from_start, etx_entry->etx_samples);
-                    activate_nud = true;
-                }
             }
         }
     }
@@ -1698,10 +1667,6 @@ static bool ws_neighbor_entry_nud_notify(mac_neighbor_table_entry_t *entry_ptr,
         return false;
     }
     entry->neighbor_info = entry_ptr;
-    if (ws_neighbor->accelerated_etx_probe) {
-        ws_neighbor->accelerated_etx_probe = false;
-        entry->timer = 1;
-    }
 
     entry->nud_process = nud_proces;
 
@@ -1737,12 +1702,13 @@ int ws_bootstrap_init(int8_t interface_id, net_6lowpan_mode_e bootstrap_mode)
     if (!etx_storage_list_allocate(cur->id, buffer.device_decription_table_size)) {
         return -1;
     }
-    if (!etx_cached_etx_parameter_set(WS_ETX_MIN_WAIT_TIME, WS_ETX_MIN_SAMPLE_COUNT)) {
+    if (!etx_cached_etx_parameter_set(WS_ETX_MIN_WAIT_TIME, WS_ETX_MIN_SAMPLE_COUNT, WS_NEIGHBOR_FIRST_ETX_SAMPLE_MIN_COUNT)) {
         etx_storage_list_allocate(cur->id, 0);
         return -1;
     }
 
     etx_max_update_set(WS_ETX_MAX_UPDATE);
+    etx_max_set(WS_ETX_MAX);
 
     if (blacklist_init() != 0) {
         tr_err("MLE blacklist init failed.");
@@ -2597,10 +2563,7 @@ static uint16_t ws_bootstrap_routing_cost_calculate(protocol_interface_info_entr
     if (etx == 0) {
         etx = 0xffff;
     }
-    if (etx > 0x800) {
-        // Wi-SUN section 6.2.3.1.6.1 says ETX can only be maximum of 1024 (8*128) in RPL units, ie 8.0.
-        etx = 0x800;
-    }
+    //Scale to 128 based ETX (local read retur 0x100 - 0xffff
     etx = etx >> 1;
 
     return ws_neighbor->routing_cost + etx;
@@ -3076,23 +3039,4 @@ void ws_secondary_parent_update(protocol_interface_info_entry_t *interface)
     }
 }
 
-void ws_bootstrap_etx_accelerate(protocol_interface_info_entry_t *interface, mac_neighbor_table_entry_t *neigh)
-{
-    ws_neighbor_class_entry_t *ws_neighbor = ws_neighbor_class_entry_get(&interface->ws_info->neighbor_storage, neigh->index);
-    //Enable Faster ETX probing
-    ws_neighbor->accelerated_etx_probe = true;
-    //Move Neighbor to first to for accelerate Process
-    mac_neighbor_table_t *table_class = mac_neighbor_info(interface);
-    ns_list_remove(&table_class->neighbour_list, neigh);
-    ns_list_add_to_start(&table_class->neighbour_list, neigh);
-    //Try to Generate Active NUD Immediately
-    if (!ws_neighbor_entry_nud_notify(neigh, interface)) {
-        return;//Return if NUD active is full
-    }
-    table_class->active_nud_process++;
-    neigh->nud_active = true;
-    //Push NS to send
-    ws_nud_active_timer(interface, 0);
-}
-
 #endif //HAVE_WS

source/6LoWPAN/ws/ws_bootstrap.h

@@ -76,8 +76,6 @@ bool ws_eapol_relay_state_active(protocol_interface_info_entry_t *cur);
 
 void ws_bootstrap_eapol_parent_synch(struct protocol_interface_info_entry *cur, struct llc_neighbour_req *neighbor_info);
 
-void ws_bootstrap_etx_accelerate(struct protocol_interface_info_entry *cur, mac_neighbor_table_entry_t *neigh);
-
 #else
 
 #define ws_bootstrap_init(interface_id, bootstrap_mode) (-1)
@@ -87,7 +85,6 @@ void ws_bootstrap_etx_accelerate(struct protocol_interface_info_entry *cur, mac_
 #define ws_bootstrap_aro_failure(cur, ll_address)
 #define ws_primary_parent_update(interface, neighbor)
 #define ws_secondary_parent_update(interface)
-#define ws_bootstrap_etx_accelerate(cur, neigh) ((void) 0)
 
 #endif //HAVE_WS
 

source/6LoWPAN/ws/ws_common.c

@@ -456,17 +456,6 @@ bool ws_common_negative_aro_mark(protocol_interface_info_entry_t *interface, con
     return true;
 }
 
-void ws_common_etx_validate(protocol_interface_info_entry_t *interface, mac_neighbor_table_entry_t *neigh)
-{
-    etx_storage_t *etx_entry = etx_storage_entry_get(interface->id, neigh->index);
-
-    if (neigh->nud_active || !neigh->trusted_device || !etx_entry || etx_entry->etx_samples) {
-        return; //Do not trig Second NS if Active NUD already, not trusted or ETX samples already done
-    }
-
-    ws_bootstrap_etx_accelerate(interface, neigh);
-}
-
 uint32_t ws_common_version_lifetime_get(uint8_t config)
 {
     uint32_t lifetime;

source/6LoWPAN/ws/ws_common.h

@@ -142,8 +142,6 @@ void ws_common_neighbor_remove(protocol_interface_info_entry_t *cur, const uint8
 
 bool ws_common_allow_child_registration(protocol_interface_info_entry_t *cur, const uint8_t *eui64);
 
-void ws_common_etx_validate(protocol_interface_info_entry_t *interface, mac_neighbor_table_entry_t *neigh);
-
 bool ws_common_negative_aro_mark(protocol_interface_info_entry_t *interface, const uint8_t *eui64);
 
 
@@ -160,7 +158,6 @@ uint32_t ws_common_version_timeout_get(uint8_t config);
 #define ws_common_neighbor_remove(cur, ll_address)
 #define ws_common_fast_timer(cur, ticks) ((void) 0)
 #define ws_common_allow_child_registration(cur, eui64) (false)
-#define ws_common_etx_validate(interface, neigh) ((void) 0)
 #define ws_common_negative_aro_mark(interface, eui64)(false)
 
 #endif //HAVE_WS

source/6LoWPAN/ws/ws_common_defines.h

@@ -190,7 +190,8 @@ typedef struct ws_bs_ie {
 #define WS_NEIGHBOR_TEMPORARY_LINK_MIN_TIMEOUT_SMALL 260
 #define WS_NEIGHBOR_NUD_TIMEOUT WS_NEIGHBOR_LINK_TIMEOUT / 2
 
-#define WS_NEIGBOR_ETX_SAMPLE_MAX 3
+#define WS_NEIGHBOR_ETX_SAMPLE_MAX 3
+#define WS_NEIGHBOR_FIRST_ETX_SAMPLE_MIN_COUNT 3 //This can't be bigger than WS_NEIGHBOR_ETX_SAMPLE_MAX
 #define WS_NEIGHBOUR_MAX_CANDIDATE_PROBE 5
 
 #define WS_PROBE_INIT_BASE_SECONDS 8
@@ -204,6 +205,7 @@ typedef struct ws_bs_ie {
 #define WS_ETX_MIN_SAMPLE_COUNT 4
 
 #define WS_ETX_MAX_UPDATE 1024
+#define WS_ETX_MAX 1024
 
 #define WS_ETX_MIN_WAIT_TIME 60
 

source/6LoWPAN/ws/ws_neighbor_class.h

@@ -32,7 +32,6 @@ typedef struct ws_neighbor_class_entry {
     bool broadcast_timing_info_stored: 1;
     bool broadcast_shedule_info_stored: 1;
     bool synch_done : 1;
-    bool accelerated_etx_probe : 1;
     bool negative_aro_send : 1;
     bool unicast_data_rx : 1;
 } ws_neighbor_class_entry_t;