EAPOL parent TX feilure is reorder candidate list.

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -110,6 +110,7 @@ static int8_t ws_bootstrap_neighbor_set(protocol_interface_info_entry_t *cur, pa
 
 static void ws_bootstrap_candidate_table_reset(protocol_interface_info_entry_t *cur);
 static parent_info_t *ws_bootstrap_candidate_parent_get(struct protocol_interface_info_entry *cur, const uint8_t *addr, bool create);
+static void ws_bootstrap_candidate_parent_sort(struct protocol_interface_info_entry *cur, parent_info_t *new_entry);
 
 typedef enum {
     WS_PARENT_SOFT_SYNCH = 0,  /**< let FHSS make decision if synchronization is needed*/
@@ -1165,7 +1166,7 @@ static void ws_bootstrap_pan_advertisement_analyse_active(struct protocol_interf
 static parent_info_t *ws_bootstrap_candidate_parent_get_best(protocol_interface_info_entry_t *cur)
 {
     ns_list_foreach_safe(parent_info_t, entry, &cur->ws_info->parent_list_reserved) {
-        tr_info("candidate list a:%s panid:%x cost:%d size:%d rssi:%d age:%"PRIu32, trace_array(entry->addr, 8), entry->pan_id, entry->pan_information.routing_cost, entry->pan_information.pan_size, entry->signal_dbm, protocol_core_monotonic_time - entry->age);
+        tr_info("candidate list a:%s panid:%x cost:%d size:%d rssi:%d txFailure:%u age:%"PRIu32, trace_array(entry->addr, 8), entry->pan_id, entry->pan_information.routing_cost, entry->pan_information.pan_size, entry->signal_dbm, entry->tx_fail, protocol_core_monotonic_time - entry->age);
     }
 
     return ns_list_get_first(&cur->ws_info->parent_list_reserved);
@@ -1263,19 +1264,12 @@ static parent_info_t *ws_bootstrap_candidate_parent_allocate(protocol_interface_
     } else {
         // If there is no free entries always allocate the last one of reserved as it is the worst
         entry = ns_list_get_last(&cur->ws_info->parent_list_reserved);
-    }
-    return entry;
-}
 
-static void ws_bootstrap_candidate_parent_free(protocol_interface_info_entry_t *cur, const uint8_t *addr)
-{
-    ns_list_foreach_safe(parent_info_t, entry, &cur->ws_info->parent_list_reserved) {
-        if (memcmp(entry->addr, addr, 8) == 0) {
-            ns_list_remove(&cur->ws_info->parent_list_reserved, entry);
-            ns_list_add_to_end(&cur->ws_info->parent_list_free, entry);
-            return;
-        }
     }
+    if (entry) {
+        entry->tx_fail = 0;
+    }
+    return entry;
 }
 
 static parent_info_t *ws_bootstrap_candidate_parent_get(struct protocol_interface_info_entry *cur, const uint8_t *addr, bool create)
@@ -1291,13 +1285,34 @@ static parent_info_t *ws_bootstrap_candidate_parent_get(struct protocol_interfac
     return NULL;
 }
 
+static void ws_bootstrap_candidate_parent_mark_failure(protocol_interface_info_entry_t *cur, const uint8_t *addr)
+{
+    parent_info_t *entry = ws_bootstrap_candidate_parent_get(cur, addr, false);
+    if (entry) {
+        ns_list_remove(&cur->ws_info->parent_list_reserved, entry);
+        if (entry->tx_fail >= 2) {
+            ns_list_add_to_end(&cur->ws_info->parent_list_free, entry);
+        } else {
+            entry->tx_fail++;
+            //New last
+            ns_list_add_to_end(&cur->ws_info->parent_list_reserved, entry);
+            ws_bootstrap_candidate_parent_sort(cur, entry);
+        }
+
+    }
+}
+
 static bool ws_bootstrap_candidate_parent_compare(parent_info_t *p1, parent_info_t *p2)
 {
     // Return true if P2 is better
     // signal lower than threshold for both
     // pan_cost
     // signal quality
 
+    if (p2->tx_fail > p1->tx_fail) {
+        return false;
+    }
+
     if (ws_neighbor_class_rsl_from_dbm_calculate(p1->signal_dbm) < (DEVICE_MIN_SENS + CAND_PARENT_THRESHOLD + CAND_PARENT_HYSTERISIS) &&
             ws_neighbor_class_rsl_from_dbm_calculate(p2->signal_dbm) > (DEVICE_MIN_SENS + CAND_PARENT_THRESHOLD + CAND_PARENT_HYSTERISIS)) {
         // above threshold is always better than not.
@@ -1349,11 +1364,15 @@ static void ws_bootstrap_candidate_list_clean(struct protocol_interface_info_ent
 
 static void ws_bootstrap_candidate_parent_sort(struct protocol_interface_info_entry *cur, parent_info_t *new_entry)
 {
+    //Remove from the list
+
     ns_list_foreach_safe(parent_info_t, entry, &cur->ws_info->parent_list_reserved) {
+
         if (entry == new_entry) {
             // own entry skip it
             continue;
         }
+
         if (ws_bootstrap_candidate_parent_compare(entry, new_entry)) {
             // New entry is better
             //tr_debug("candidate list new is better");
@@ -2912,7 +2931,7 @@ static void ws_bootstrap_authentication_completed(protocol_interface_info_entry_
         // eapol parent selected is not working
         tr_debug("authentication TX failed");
 
-        ws_bootstrap_candidate_parent_free(cur, target_eui_64);
+        ws_bootstrap_candidate_parent_mark_failure(cur, target_eui_64);
         // Go back for network scanning
         ws_bootstrap_state_change(cur, ER_ACTIVE_SCAN);
 
@@ -2934,7 +2953,7 @@ static void ws_bootstrap_authentication_completed(protocol_interface_info_entry_
 
 static const uint8_t *ws_bootstrap_authentication_next_target(protocol_interface_info_entry_t *cur, const uint8_t *previous_eui_64, uint16_t *pan_id)
 {
-    ws_bootstrap_candidate_parent_free(cur, previous_eui_64);
+    ws_bootstrap_candidate_parent_mark_failure(cur, previous_eui_64);
 
     // Gets best target
     parent_info_t *parent_info = ws_bootstrap_candidate_parent_get_best(cur);

source/6LoWPAN/ws/ws_common.h

@@ -42,6 +42,7 @@ typedef struct parent_info_s {
     uint16_t             pan_id;             /**< PAN ID */
     uint8_t              addr[8];            /**< address */
     uint8_t              link_quality;       /**< LQI value measured during reception of the MPDU */
+    uint8_t              tx_fail;
     int8_t               signal_dbm;         /**< This extension for normal IEEE 802.15.4 Data indication */
     ws_pan_information_t pan_information;
     ws_utt_ie_t          ws_utt;