ETX and Source route validation update

RPL downward route link capable limit from 8.0 to 4.0. This will fix broken link at SRC route.

Return 0 if real is unknow.

RPL parent changes and ETX changes use same dynamic timer start for new neighbour or better ETX.

Change-Id: I9b7d22a45a96d100f9695184896e636f17804fbf

Author: Juha Heiskanen

source/6LoWPAN/adaptation_interface.c

@@ -1260,7 +1260,7 @@ int8_t lowpan_adaptation_interface_tx_confirm(protocol_interface_info_entry_t *c
             }
 
 #ifdef HAVE_RPL
-            if (confirm->status == MLME_TX_NO_ACK) {
+            if (confirm->status == MLME_TX_NO_ACK || confirm->status == MLME_UNAVAILABLE_KEY) {
                 if (buf->route && rpl_data_is_rpl_parent_route(buf->route->route_info.source)) {
                     protocol_stats_update(STATS_RPL_PARENT_TX_FAIL, 1);
                 }

source/6LoWPAN/ws/ws_bootstrap.c

@@ -648,7 +648,6 @@ static void ws_bootstrap_ll_address_validate(struct protocol_interface_info_entr
 uint16_t ws_etx_read(protocol_interface_info_entry_t *interface, addrtype_t addr_type, const uint8_t *addr_ptr)
 {
 
-    uint16_t etx;
     if (!addr_ptr || !interface) {
         return 0;
     }
@@ -667,13 +666,7 @@ uint16_t ws_etx_read(protocol_interface_info_entry_t *interface, addrtype_t addr
         return 0xffff;
     }
 
-    etx = etx_local_etx_read(interface->id, attribute_index);
-    if (etx == 0) {
-        return 0xffff;
-    }
-
-    //tr_debug("ws_etx_read etx:%d", etx);
-    return etx;
+    return etx_local_etx_read(interface->id, attribute_index);;
 }
 bool ws_bootstrap_nd_ns_transmit(protocol_interface_info_entry_t *cur, ipv6_neighbour_t *entry,  bool unicast, uint8_t seq)
 {
@@ -2564,10 +2557,11 @@ static uint16_t ws_bootstrap_routing_cost_calculate(protocol_interface_info_entr
 
     uint16_t etx = etx_local_etx_read(cur->id, mac_neighbor->index);
     if (etx == 0) {
-        etx = 0xffff;
+        etx = WS_ETX_MAX; //SET maxium value here if ETX is unknown
+    } else {
+        //Scale to 128 based ETX (local read retur 0x100 - 0xffff
+        etx = etx >> 1;
     }
-    //Scale to 128 based ETX (local read retur 0x100 - 0xffff
-    etx = etx >> 1;
 
     return ws_neighbor->routing_cost + etx;
 }

source/RPL/rpl_control.c

@@ -376,19 +376,24 @@ static void rpl_control_addr_notifier(struct protocol_interface_info_entry *inte
 
 static void rpl_control_etx_change_callback(int8_t  nwk_id, uint16_t previous_etx, uint16_t current_etx, uint8_t attribute_index)
 {
-    (void)previous_etx;
-    (void)current_etx;
 
     protocol_interface_info_entry_t *cur = protocol_stack_interface_info_get_by_id(nwk_id);
     if (!cur || !cur->rpl_domain) {
         return;
     }
+    // ETX is "better" if now lower, or previous was "unknown" and new isn't infinite
+    bool better = current_etx < previous_etx || (previous_etx == 0 && current_etx != 0xffff);
+
     rpl_domain_t *domain = cur->rpl_domain;
     uint16_t delay = rpl_policy_etx_change_parent_selection_delay(domain);
-    tr_debug("Triggering parent selection due to ETX change on neigh index %u, etx %u", attribute_index, current_etx);
+    tr_debug("Triggering parent selection due to ETX %s on neigh index %u, etx %u", better ? "better" : "worse", attribute_index, current_etx);
+    rpl_dodag_t *dodag = NULL;
 
     ns_list_foreach(rpl_instance_t, instance, &domain->instances) {
-        rpl_instance_trigger_parent_selection(instance, delay);
+        if (better) {
+            dodag = rpl_instance_current_dodag(instance);
+        }
+        rpl_instance_trigger_parent_selection(instance, delay, dodag);
         if (rpl_instance_am_root(instance)) {
             rpl_downward_paths_invalidate(instance);
         }

source/RPL/rpl_policy.c

@@ -147,7 +147,7 @@ int8_t rpl_policy_dao_retry_count()
 /* Given the next-hop address from a source routing header, which interface,
  * if any, should we assume that next hop is on?
  */
-#define ETX_SRH_THRESHOLD 0x800 /* 8.8 fixed-point, so 4 */
+#define ETX_SRH_THRESHOLD 0x400 /* 8.8 fixed-point, so 4 */
 int8_t rpl_policy_srh_next_hop_interface(rpl_domain_t *domain, int8_t if_id, const uint8_t *next_hop)
 {
     if (domain->non_storing_downstream_interface != -1) {

source/RPL/rpl_upward.c

@@ -352,8 +352,16 @@ void rpl_instance_force_leaf(rpl_instance_t *instance)
     instance->current_rank = RPL_RANK_INFINITE;
 }
 
-void rpl_instance_trigger_parent_selection(rpl_instance_t *instance, uint16_t delay)
+void rpl_instance_trigger_parent_selection(rpl_instance_t *instance, uint16_t delay, rpl_dodag_t *dodag)
 {
+    /* When "improving", let us have a minimum trigger time based on Imin, for large networks */
+    if (dodag) {
+        //Convert imin 100ms tick to seconds
+        uint16_t i_min_delay = dodag->dio_timer_params.Imin / 10;
+        if (i_min_delay > delay) {
+            delay = i_min_delay;
+        }
+    }
     if (instance->parent_selection_timer == 0 || instance->parent_selection_timer > delay) {
         instance->parent_selection_timer = randLIB_randomise_base(delay, 0x8000, 0x999A) /* Random between delay * 1.0-1.2 */;
         tr_debug("Timed parent triggered %u", instance->parent_selection_timer);
@@ -585,7 +593,7 @@ void rpl_delete_dodag_version(rpl_dodag_version_t *version)
         // triggering poison immediately.
         // Give parent selection a chance to select another version (but will it have any info on-hand?)
         instance->current_dodag_version = NULL;
-        rpl_instance_trigger_parent_selection(instance, 5);
+        rpl_instance_trigger_parent_selection(instance, 5, NULL);
     }
 
     ns_list_foreach_safe(rpl_neighbour_t, neighbour, &instance->candidate_neighbours) {
@@ -1278,18 +1286,12 @@ bool rpl_instance_purge(rpl_instance_t *instance)
     return false;
 }
 
-void rpl_instance_neighbours_changed(rpl_instance_t *instance, const rpl_dodag_t *dodag)
+void rpl_instance_neighbours_changed(rpl_instance_t *instance, rpl_dodag_t *dodag)
 {
     instance->neighbours_changed = true;
     uint16_t delay = rpl_policy_dio_parent_selection_delay(instance->domain);
-    if (dodag) {
-        //Convert imin 100ms tick to seconds
-        uint16_t i_min_delay = dodag->dio_timer_params.Imin / 10;
-        if (i_min_delay > delay) {
-            delay = i_min_delay;
-        }
-    }
-    rpl_instance_trigger_parent_selection(instance, delay);
+
+    rpl_instance_trigger_parent_selection(instance, delay, dodag);
 }
 
 static void rpl_instance_remove_parents(rpl_instance_t *instance)

source/RPL/rpl_upward.h

@@ -78,7 +78,7 @@ void rpl_instance_increment_dtsn(rpl_instance_t *instance);
 void rpl_dodag_set_pref(rpl_dodag_t *dodag, uint8_t pref);
 void rpl_instance_poison(rpl_instance_t *instance, uint8_t count);
 void rpl_instance_force_leaf(rpl_instance_t *instance);
-void rpl_instance_trigger_parent_selection(rpl_instance_t *instance, uint16_t delay);
+void rpl_instance_trigger_parent_selection(rpl_instance_t *instance, uint16_t delay, rpl_dodag_t *dodag);
 void rpl_instance_remove_interface(rpl_instance_t *instance, int8_t if_id);
 void rpl_instance_dio_trigger(rpl_instance_t *instance, struct protocol_interface_info_entry *cur, const uint8_t *addr);
 void rpl_instance_set_local_repair(rpl_instance_t *instance, bool repair);
@@ -147,7 +147,7 @@ bool rpl_neighbour_update_dtsn(rpl_neighbour_t *neighbour, uint8_t dtsn);
 rpl_instance_t *rpl_neighbour_instance(const rpl_neighbour_t *neighbour);
 
 
-void rpl_instance_neighbours_changed(rpl_instance_t *instance, const rpl_dodag_t *dodag);
+void rpl_instance_neighbours_changed(rpl_instance_t *instance, rpl_dodag_t *dodag);
 void rpl_instance_run_parent_selection(rpl_instance_t *instance);
 
 void rpl_upward_print_instance(rpl_instance_t *instance, route_print_fn_t *print_fn);

source/Service_Libs/etx/etx.c

@@ -394,8 +394,7 @@ uint16_t etx_local_etx_read(int8_t interface_id, uint8_t attribute_index)
 
     if (etx_info.cache_sample_requested && entry->etx_samples < etx_info.init_etx_sample_count) {
         if (!entry->etx_samples) {
-            //Return configured MAX value
-            return etx_info.max_etx >> 4;
+            return 0;
         }
     }
 
@@ -455,7 +454,12 @@ uint16_t etx_lqi_dbm_update(int8_t interface_id, uint8_t lqi, int8_t dbm, uint8_
         if (!entry->etx) {
             etx = etx_dbm_lqi_calc(lqi, dbm);
             entry->etx = etx;
+            entry->stored_diff_etx = etx;
             entry->tmp_etx = true;
+            if (etx_info.callback_ptr) {
+                etx_info.callback_ptr(etx_info.interface_id, 0, entry->etx >> 4,
+                                      attribute_index);
+            }
         }
         // If local ETX has been calculated without remote incoming IDR and
         // remote incoming IDR is available update it by remote incoming IDR value
@@ -470,11 +474,7 @@ uint16_t etx_lqi_dbm_update(int8_t interface_id, uint8_t lqi, int8_t dbm, uint8_
             entry->etx = etx >> 12;
 
             local_incoming_idr >>= 4;
-        }
-
-        // If local ETX has been calculated indicates new neighbor
-        if (etx) {
-            etx_neighbor_add(interface_id, attribute_index);
+            etx_value_change_callback_needed_check(entry->etx, &(entry->stored_diff_etx), entry->accumulated_failures, attribute_index);
         }
     }
 
@@ -808,35 +808,6 @@ void etx_neighbor_remove(int8_t interface_id, uint8_t attribute_index)
     }
 }
 
-/**
- * \brief A function to add ETX neighbor
- *
- *  Notifies ETX module that neighbor has been added. Calls ETX value change callback
- *  if that is set.
- *
- * \param mac64_addr_ptr long MAC address
- *
- */
-void etx_neighbor_add(int8_t interface_id, uint8_t attribute_index)
-{
-
-    //tr_debug("Add attribute %u", attribute_index);
-    uint16_t stored_diff_etx;
-    etx_storage_t *entry = etx_storage_entry_get(interface_id, attribute_index);
-    if (entry && etx_info.callback_ptr) {
-        // Gets table entry
-
-        if (entry->etx) {
-            stored_diff_etx = entry->stored_diff_etx;
-            if (!stored_diff_etx) {
-                stored_diff_etx = entry->etx;
-            }
-            etx_info.callback_ptr(etx_info.interface_id, stored_diff_etx >> 4, entry->etx >> 4,
-                                  attribute_index);
-        }
-    }
-}
-
 void etx_cache_timer(int8_t interface_id, uint16_t seconds_update)
 {
     if (!etx_info.cache_sample_requested) {

source/Service_Libs/etx/etx.h

@@ -236,17 +236,6 @@ uint8_t etx_accum_failures_callback_register(nwk_interface_id nwk_id, int8_t int
  */
 void etx_neighbor_remove(int8_t interface_id, uint8_t attribute_index);
 
-/**
- * \brief A function to add ETX neighbor
- *
- *  Notifies ETX module that neighbor has been added. Calls ETX value change callback
- *  if that is set.
- *
- * \param attribute_index Neighbour attribute index
- *
- */
-void etx_neighbor_add(int8_t interface_id, uint8_t attribute_index);
-
 /**
  * \brief A function for update cached ETX calculation
  *

test/nanostack/unittest/service_libs/etx/etxtest.cpp

@@ -111,7 +111,3 @@ TEST(ETX, test_ETX_etx_neighbor_remove_1)
     CHECK(test_ETX_etx_neighbor_remove_1());
 }
 
-TEST(ETX, test_ETX_etx_neighbor_add_1)
-{
-    CHECK(test_ETX_etx_neighbor_add_1());
-}

test/nanostack/unittest/service_libs/etx/test_etx.c

@@ -754,36 +754,3 @@ bool test_ETX_etx_neighbor_remove_1()
     etx_storage_list_allocate(0, 0);
     return true;
 }
-
-bool test_ETX_etx_neighbor_add_1()
-{
-    test_etx_set_protocol();
-    nsdynmemlib_stub.returnCounter = 1;
-    etx_storage_list_allocate(0, 10);
-    etx_storage_t *test_entry = etx_storage_entry_get(0, 0);
-    uint8_t i;
-    uint8_t attempts;
-    bool success;
-    double etx = 1;
-    double output_etx;
-    test_entry->etx = 1 << 12;
-
-    memset(change_ind_handler_values, 0, sizeof(change_ind_handler_values));
-    change_ind_handler_index = 0;
-
-    // 3/1 ETX
-    attempts = 3;
-    success = 1;
-
-    (void) etx_value_change_callback_register(IF_6LoWPAN, 0, 128, etx_value_change_ind_handler);
-
-    etx_neighbor_add(0, 0);
-
-    if ((change_ind_handler_values[0].current_etx != 0x0100) ||
-            (change_ind_handler_values[0].previous_etx != 0x0100)) {
-        return false;
-    }
-
-    etx_storage_list_allocate(0, 0);
-    return true;
-}

test/nanostack/unittest/service_libs/etx/test_etx.h

@@ -40,7 +40,6 @@ bool test_ETX_etx_lqi_dbm_update_2();
 bool test_ETX_etx_value_change_callback_register_1();
 bool test_ETX_etx_accum_failures_callback_register_1();
 bool test_ETX_etx_neighbor_remove_1();
-bool test_ETX_etx_neighbor_add_1();
 
 #ifdef __cplusplus
 }

test/nanostack/unittest/stub/etx_stub.c

@@ -67,11 +67,6 @@ void etx_neighbor_remove(int8_t interface_id, uint8_t attribute_index)
 {
 }
 
-void etx_neighbor_add(int8_t interface_id, uint8_t attribute_index)
-{
-
-}
-
 bool etx_storage_list_allocate(int8_t interface_id, uint8_t etx_storage_size)
 {
     return true;

test/nanostack/unittest/stub/rpl_upward_stub.c

@@ -169,7 +169,7 @@ void rpl_instance_force_leaf(rpl_instance_t *instance)
 {
 }
 
-void rpl_instance_trigger_parent_selection(rpl_instance_t *instance, uint16_t delay)
+void rpl_instance_trigger_parent_selection(rpl_instance_t *instance, uint16_t delay, rpl_dodag_t *dodag)
 {
 }
 
@@ -393,7 +393,7 @@ bool rpl_instance_purge(rpl_instance_t *instance)
     return false;
 }
 
-void rpl_instance_neighbours_changed(rpl_instance_t *instance, const rpl_dodag_t *dodag)
+void rpl_instance_neighbours_changed(rpl_instance_t *instance, rpl_dodag_t *dodag)
 {
 }