Wi-SUN Expedite forward state update

At Expedite forward state ETX update, NUD and Probe process are blocked.

Author: Juha Heiskanen

source/6LoWPAN/adaptation_interface.c

@@ -1242,6 +1242,15 @@ void lowpan_adaptation_expedite_forward_enable(protocol_interface_info_entry_t *
     lowpan_adaptation_high_priority_state_enable(cur, interface_ptr);
 }
 
+bool lowpan_adaptation_expedite_forward_state_get(protocol_interface_info_entry_t *cur)
+{
+    fragmenter_interface_t *interface_ptr = lowpan_adaptation_interface_discover(cur->id);
+    if (!interface_ptr || !interface_ptr->last_rx_high_priority) {
+        return false;
+    }
+    return true;
+}
+
 void lowpan_adaptation_interface_slow_timer(protocol_interface_info_entry_t *cur)
 {
     fragmenter_interface_t *interface_ptr = lowpan_adaptation_interface_discover(cur->id);

source/6LoWPAN/lowpan_adaptation_interface.h

@@ -64,6 +64,8 @@ int8_t lowpan_adaptation_indirect_queue_params_set(struct protocol_interface_inf
 
 void lowpan_adaptation_expedite_forward_enable(struct protocol_interface_info_entry *cur);
 
+bool lowpan_adaptation_expedite_forward_state_get(struct protocol_interface_info_entry *cur);
+
 void lowpan_adaptation_interface_slow_timer(struct protocol_interface_info_entry *cur);
 
 #endif /* LOWPAN_ADAPTATION_INTERFACE_H_ */

source/6LoWPAN/ws/ws_bootstrap.c

@@ -2204,6 +2204,11 @@ static bool ws_neighbor_entry_nud_notify(mac_neighbor_table_entry_t *entry_ptr,
         return false;
     }
 
+    if (lowpan_adaptation_expedite_forward_state_get(cur)) {
+        //Do not send any probe or NUD when Expedite forward state is enabled
+        return false;
+    }
+
     ws_bootsrap_create_ll_address(ll_address, entry_ptr->mac64);
 
     if (time_from_start > WS_NEIGHBOR_NUD_TIMEOUT) {

source/6LoWPAN/ws/ws_llc_data_service.c

@@ -490,8 +490,11 @@ static void ws_llc_mac_confirm_cb(const mac_api_t *api, const mcps_data_conf_t *
                 }
 
                 if (neighbor_info.ws_neighbor && neighbor_info.neighbor && neighbor_info.neighbor->link_lifetime == WS_NEIGHBOR_LINK_TIMEOUT) {
-                    etx_transm_attempts_update(interface->id, 1 + data->tx_retries, success, neighbor_info.neighbor->index, neighbor_info.neighbor->mac64);
-                    //TODO discover RSL from Enchanced ACK Header IE elements
+
+                    if (!base->high_priority_mode) {
+                        //Update ETX only when High priority state is not activated
+                        etx_transm_attempts_update(interface->id, 1 + data->tx_retries, success, neighbor_info.neighbor->index, neighbor_info.neighbor->mac64);
+                    }
                     ws_utt_ie_t ws_utt;
                     if (ws_wh_utt_read(conf_data->headerIeList, conf_data->headerIeListLength, &ws_utt)) {
                         //UTT header

test/nanostack/unittest/stub/adaptation_interface_stub.c

@@ -121,3 +121,8 @@ void lowpan_adaptation_expedite_forward_enable(struct protocol_interface_info_en
 {
 
 }
+
+bool lowpan_adaptation_expedite_forward_state_get(protocol_interface_info_entry_t *cur)
+{
+    return false;
+}