Thread Neighbor and MLE API update

Thread neighbour table base API generated

Mle entry table API removed link margin parameter

Integrate new neighbor class and remove duplicate parameters from mle
table
entry

Change-Id: Ieaa002d191786d299b75602ee950f5fa98087a43

Author: Juha Heiskanen

nanostack/platform/arm_hal_aes.h

@@ -35,7 +35,7 @@
  */
 
 #include "ns_types.h"
-#include "nsconfig.h"
+
 
 #ifdef __cplusplus
 extern "C" {

source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_bootstrap.c

@@ -550,15 +550,6 @@ static int protocol_6lowpan_mle_neigh_advertise(protocol_interface_info_entry_t
 }
 #endif
 
-static uint8_t compute_link_margin(int8_t rssi)
-{
-    if (rssi < -94) {
-        return 0;
-    }
-
-    return (rssi + 94);
-}
-
 static int mle_validate_6lowpan_link_request_message(uint8_t *ptr, uint16_t data_len, mle_tlv_info_t *tlv_info)
 {
     /**
@@ -759,7 +750,7 @@ static int mle_router_accept_request_build(protocol_interface_info_entry_t *cur,
 
 static void protocol_6lowpan_link_reject_handler(protocol_interface_info_entry_t *cur, uint8_t *ll64)
 {
-    mle_neigh_table_entry_t *entry_temp = mle_class_get_entry_by_ll64(cur->id, 0, ll64, false, NULL);
+    mle_neigh_table_entry_t *entry_temp = mle_class_get_entry_by_ll64(cur->id, ll64, false, NULL);
     tr_debug("MLE link reject");
     if (entry_temp) {
         mle_class_remove_entry(cur->id, entry_temp);
@@ -1052,16 +1043,13 @@ void mle_6lowpan_message_handler(int8_t interface_id, mle_message_t *mle_msg, ml
     mle_tlv_info_t mle_tlv_info;
     mle_tlv_info_t mle_challenge;
     mle_neigh_table_entry_t *entry_temp;
-    uint8_t linkMargin;
     uint8_t incoming_idr;
     uint16_t responseId, own_mac16;
     protocol_interface_info_entry_t *cur = protocol_stack_interface_info_get_by_id(interface_id);
     if (!cur) {
         return;
     }
 
-    //Calculate link margin
-    linkMargin = compute_link_margin(mle_msg->dbm);
 
     own_mac16 = mac_helper_mac16_address_get(cur);
 
@@ -1084,7 +1072,7 @@ void mle_6lowpan_message_handler(int8_t interface_id, mle_message_t *mle_msg, ml
                 mle_6lowpan_data->link_req_token_bucket--;
             } else {
                 //Update only old information based on link request
-                entry_temp = mle_class_get_entry_by_ll64(interface_id, linkMargin, mle_msg->packet_src_address, false, NULL);
+                entry_temp = mle_class_get_entry_by_ll64(interface_id, mle_msg->packet_src_address, false, NULL);
                 if (entry_temp) {
                     mle_neigh_time_and_mode_update(entry_temp,mle_msg->data_ptr, mle_msg->data_length);
                     mle_neigh_entry_update_by_mle_tlv_list(interface_id, entry_temp, mle_msg->data_ptr, mle_msg->data_length, cur->mac, own_mac16);
@@ -1121,12 +1109,12 @@ void mle_6lowpan_message_handler(int8_t interface_id, mle_message_t *mle_msg, ml
 
             tr_debug("Accept & Request");
 
-            entry_temp = mle_class_get_entry_by_ll64(interface_id, linkMargin, mle_msg->packet_src_address, false, NULL);
+            entry_temp = mle_class_get_entry_by_ll64(interface_id, mle_msg->packet_src_address, false, NULL);
 
             if (!entry_temp) {
                 // If there is space for neighbors try to allocate new entry
                 if (mle_6lowpan_neighbor_limit_check(interface_id, mle_msg, true)) {
-                    entry_temp = mle_class_get_entry_by_ll64(interface_id, linkMargin, mle_msg->packet_src_address, true, NULL);
+                    entry_temp = mle_class_get_entry_by_ll64(interface_id, mle_msg->packet_src_address, true, NULL);
                 }
             }
 
@@ -1186,7 +1174,7 @@ void mle_6lowpan_message_handler(int8_t interface_id, mle_message_t *mle_msg, ml
                     mode = *t_ptr;
                 }
 
-                entry_temp = mle_class_get_entry_by_ll64(interface_id, linkMargin, mle_msg->packet_src_address, false, NULL);
+                entry_temp = mle_class_get_entry_by_ll64(interface_id, mle_msg->packet_src_address, false, NULL);
                 if (!entry_temp) {
                     if ((mode & MLE_DEV_MASK) == MLE_FFD_DEV) {
                         // If there is space for neighbors synchronizes to new router
@@ -2793,6 +2781,7 @@ static void lowpan_comm_status_indication_cb(int8_t if_id, const mlme_comm_statu
             break;
         case MLME_DATA_POLL_NOTIFICATION:
             mle_refresh_entry_timeout(if_id, status->SrcAddr, (addrtype_t)status->SrcAddrMode, false);
+            //TIMEOUT REFRESH missing
             break;
         default:
             break;
@@ -2804,7 +2793,7 @@ bool lowpan_neighbour_data_clean(int8_t interface_id, const uint8_t *link_local_
 {
     bool return_value = false;
 #ifndef NO_MLE
-    mle_neigh_table_entry_t * neigh_entry = mle_class_get_entry_by_ll64(interface_id, 0, link_local_address, false, NULL);
+    mle_neigh_table_entry_t * neigh_entry = mle_class_get_entry_by_ll64(interface_id, link_local_address, false, NULL);
     if (neigh_entry) {
         //Remove entry
         if (neigh_entry->priorityFlag) {

source/6LoWPAN/MAC/mac_data_poll.c

@@ -295,20 +295,21 @@ void mac_mlme_poll_confirm(protocol_interface_info_entry_t *cur, const mlme_poll
     }
 
     rf_ptr->pollActive = false;
+    mle_neigh_table_entry_t *entry = NULL;
 
     switch (confirm->status) {
         case MLME_SUCCESS:
             //tr_debug("Poll Confirm: Data with Data");
             rf_ptr->nwk_parent_poll_fail = 0;
             //Trig new Data Poll immediately
-            mle_refresh_entry_timeout(cur->id, rf_ptr->poll_req.CoordAddress, (addrtype_t)rf_ptr->poll_req.CoordAddrMode, true);
+            entry = mle_refresh_entry_timeout(cur->id, rf_ptr->poll_req.CoordAddress, (addrtype_t)rf_ptr->poll_req.CoordAddrMode, true);
             poll_time = 1;
             break;
 
         case MLME_NO_DATA:
             //Start next case timer
             rf_ptr->nwk_parent_poll_fail = 0;
-            mle_refresh_entry_timeout(cur->id, rf_ptr->poll_req.CoordAddress, (addrtype_t)rf_ptr->poll_req.CoordAddrMode, true);
+            entry = mle_refresh_entry_timeout(cur->id, rf_ptr->poll_req.CoordAddress, (addrtype_t)rf_ptr->poll_req.CoordAddrMode, true);
             //tr_debug("Poll Confirm: No Data");
 
             if (rf_ptr->protocol_poll == 0) {
@@ -333,6 +334,9 @@ void mac_mlme_poll_confirm(protocol_interface_info_entry_t *cur, const mlme_poll
             }
             break;
     }
+    if (thread_info(cur) && entry) {
+        thread_neighbor_commucation_update(cur, entry->attribute_index);
+    }
 
     mac_poll_timer_trig(poll_time, cur);
 

source/6LoWPAN/MAC/mac_pairwise_key.c

@@ -266,10 +266,11 @@ int mac_pairwise_key_add(int8_t interface_id, uint32_t valid_life_time, const ui
     }
 
     //Allocate mle entry
-    mle_neigh_table_entry_t *mle_entry = mle_class_get_entry_by_mac64(interface_id, 0, eui64, true, &new_entry_created);
+    mle_neigh_table_entry_t *mle_entry = mle_class_get_entry_by_mac64(interface_id, eui64, true, &new_entry_created);
     if (!mle_entry) {
         return -1;
     }
+
     mle_entry->thread_commission = true;
     mle_entry->short_adr = 0xffff;
     mle_entry->ttl = 20;
@@ -311,7 +312,7 @@ int mac_pairwise_key_del(int8_t interface_id, const uint8_t eui64[static 8])
         return -1;
     }
     //Get from mle
-    mle_neigh_table_entry_t *mle_entry = mle_class_get_entry_by_mac64(interface_id, 0, eui64, true, NULL);
+    mle_neigh_table_entry_t *mle_entry = mle_class_get_entry_by_mac64(interface_id, eui64, true, NULL);
     if (!mle_entry) {
         return -1;
     }

source/6LoWPAN/Thread/thread_bootstrap.c

@@ -59,6 +59,7 @@
 #include "6LoWPAN/Thread/thread_router_bootstrap.h"
 #include "6LoWPAN/Thread/thread_management_internal.h"
 #include "6LoWPAN/Thread/thread_management_server.h"
+#include "6LoWPAN/Thread/thread_neighbor_class.h"
 #include "6LoWPAN/Thread/thread_network_data_lib.h"
 #include "6LoWPAN/Thread/thread_network_synch.h"
 #include "6LoWPAN/Thread/thread_joiner_application.h"
@@ -153,6 +154,12 @@ int8_t thread_mle_class_init(int8_t interface_id)
         return -1;
     }
 
+    thread_neighbor_class_delete(&cur->thread_info->neighbor_class);
+
+    if (!thread_neighbor_class_create(&cur->thread_info->neighbor_class, buffer.device_decription_table_size - 1)) {
+        return -1;
+    }
+
     if (mle_class_init(interface_id, buffer.device_decription_table_size - 1, &thread_neighbor_remove, &thread_host_bootstrap_child_update, &thread_interface_is_active) != 0) {
         return -1;
     }

source/6LoWPAN/Thread/thread_common.c

@@ -64,6 +64,7 @@
 #include "6LoWPAN/Thread/thread_address_registration_client.h"
 #include "6LoWPAN/Thread/thread_resolution_client.h"
 #include <6LoWPAN/Thread/thread_extension_bootstrap.h>
+#include "6LoWPAN/Thread/thread_neighbor_class.h"
 #include "MLE/mle.h"
 #include "Service_Libs/mle_service/mle_service_security.h"
 #include "Service_Libs/blacklist/blacklist.h"
@@ -1121,14 +1122,20 @@ uint8_t thread_beacon_indication(uint8_t *ptr, uint8_t len, protocol_interface_i
 
 static uint8_t *thread_linkquality_write(int8_t interface_id, uint8_t *buffer)
 {
+    protocol_interface_info_entry_t *interface_ptr = protocol_stack_interface_info_get_by_id(interface_id);
+    if (!interface_ptr && !interface_ptr->thread_info) {
+        return buffer;
+    }
+
     uint8_t lqi1 = 0, lqi2 = 0, lqi3 = 0;
     thread_link_quality_e thread_link_quality;
     mle_neigh_table_list_t *neigh_list = mle_class_active_list_get(interface_id);
 
     ns_list_foreach(mle_neigh_table_entry_t, cur, neigh_list) {
         if (thread_is_router_addr(cur->short_adr)) {
             // Only count routers to link quality
-            thread_link_quality = thread_link_margin_to_quality(cur->link_margin);
+            uint16_t link_margin = thread_neighbor_class_linkmargin_get(&interface_ptr->thread_info->neighbor_class, cur->attribute_index);
+            thread_link_quality = thread_link_margin_to_quality(link_margin);
             switch (thread_link_quality) {
                 case QUALITY_20dB:
                     lqi3++;
@@ -1865,6 +1872,7 @@ void thread_reset_neighbour_info(protocol_interface_info_entry_t *cur, mle_neigh
     thread_router_bootstrap_reset_child_info(cur, neighbour);
     protocol_6lowpan_release_long_link_address_from_neighcache(cur, neighbour->mac64);
     mac_helper_devicetable_remove(cur->mac_api, neighbour->attribute_index);
+    thread_neighbor_class_table_remove(&cur->thread_info->neighbor_class, neighbour->attribute_index);
 }
 
 uint8_t thread_get_router_count_from_route_tlv(mle_tlv_info_t *routeTlv)
@@ -1940,5 +1948,10 @@ void thread_old_partition_data_purge(protocol_interface_info_entry_t *cur)
 
 }
 
+void thread_neighbor_commucation_update(protocol_interface_info_entry_t *cur, uint8_t neighbor_attribute_index)
+{
+    thread_neighbor_last_communincation_time_update(&cur->thread_info->neighbor_class, neighbor_attribute_index);
+}
+
 #endif
 

source/6LoWPAN/Thread/thread_common.h

@@ -92,6 +92,20 @@ typedef enum {
     THREAD_COMMISSIONER_REGISTERED
 } thread_commissioner_register_status_e;
 
+typedef struct thread_neigh_table_entry_s {
+    uint8_t         mlEid[8];
+    uint32_t        last_contact_time;  /*!< monotonic time - hard to define "contact"; used for Thread Leasequery replies */
+    uint16_t        link_margin;
+} thread_neigh_table_entry_t ;
+
+/**
+ * Neighbor info data base
+ */
+typedef struct thread_neighbor_class_s {
+    thread_neigh_table_entry_t *neigh_info_list;          /*!< Allocated Neighbour info array*/
+    uint8_t list_size;                                    /*!< List size*/
+} thread_neighbor_class_t;
+
 typedef struct thread_mcast_child {
     uint8_t mac64[8];
     ns_list_link_t link;
@@ -261,6 +275,7 @@ typedef struct thread_previous_partition_info_s {
 
 typedef struct thread_info_s {
     thread_routing_info_t routing;
+    thread_neighbor_class_t neighbor_class;
     thread_master_secret_material_t masterSecretMaterial;
     thread_network_data_cache_entry_t networkDataStorage;
     thread_network_local_data_cache_entry_t localServerDataBase;
@@ -417,6 +432,7 @@ void thread_calculate_key_guard_timer(protocol_interface_info_entry_t *cur, link
 void thread_set_link_local_address(protocol_interface_info_entry_t *cur);
 void thread_mcast_group_change(struct protocol_interface_info_entry *interface, struct if_group_entry *group, bool group_added);
 void thread_old_partition_data_purge(protocol_interface_info_entry_t *cur);
+void thread_neighbor_commucation_update(protocol_interface_info_entry_t *cur, uint8_t neighbor_attribute_index);
 
 #else // HAVE_THREAD
 
@@ -438,6 +454,7 @@ NS_DUMMY_DEFINITIONS_OK
 #define thread_link_reject_send(interface, ll64) 0
 #define thread_addr_is_mesh_local_16(addr, cur) false
 #define thread_mcast_group_change(interface, group, group_added) ((void)0)
+#define thread_neighbor_commucation_update(cur, neighbor_attribute_index) ((void)0)
 #endif // HAVE_THREAD
 
 #endif /* LOWPAN_THREAD_H_ */

source/6LoWPAN/Thread/thread_extension.c

@@ -52,6 +52,7 @@
 #include "6LoWPAN/Thread/thread_discovery.h"
 #include "6LoWPAN/Thread/thread_extension_bootstrap.h"
 #include "6LoWPAN/Thread/thread_extension_constants.h"
+#include "6LoWPAN/Thread/thread_neighbor_class.h"
 #include "6LoWPAN/MAC/mac_helper.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "Common_Protocols/ipv6.h"
@@ -381,7 +382,11 @@ void thread_extension_address_registration(struct protocol_interface_info_entry
             return;
         }
 
-        ml_eid = entry->mlEid;
+        ml_eid = thread_neighbor_class_get_mleid(&interface->thread_info->neighbor_class, entry->attribute_index);
+        if (!ml_eid) {
+            tr_error("No Thread neighbor.");
+            return;
+        }
     } else {
         link_configuration_s *link_config = thread_joiner_application_get_config(interface->id);
 

source/6LoWPAN/Thread/thread_host_bootstrap.c

@@ -63,6 +63,7 @@
 #include "6LoWPAN/Thread/thread_management_client.h"
 #include "6LoWPAN/Thread/thread_network_data_lib.h"
 #include "6LoWPAN/Thread/thread_tmfcop_lib.h"
+#include "6LoWPAN/Thread/thread_neighbor_class.h"
 #include "thread_management_if.h"
 #include "Common_Protocols/ipv6.h"
 #include "MPL/mpl.h"
@@ -157,10 +158,13 @@ static bool thread_parent_discover_timeout_cb(int8_t interface_id, uint16_t msgI
         memcpy(&ll64[8], parent->mac64 , 8);
         ll64[8] ^= 2;
 
-        entry_temp = mle_class_get_entry_by_ll64(interface_id, parent->linkMarginToParent,ll64, true, &new_entry_created);
+        entry_temp = mle_class_get_entry_by_ll64(interface_id,ll64, true, &new_entry_created);
         if (entry_temp == NULL) {
             return false;
         }
+        thread_neighbor_class_update_link(&cur->thread_info->neighbor_class, entry_temp->attribute_index, parent->linkMarginToParent, new_entry_created);
+        thread_neighbor_last_communincation_time_update(&cur->thread_info->neighbor_class, entry_temp->attribute_index);
+
         entry_temp->short_adr = parent->shortAddress;
         entry_temp->priorityFlag = true;
 
@@ -325,12 +329,14 @@ static int thread_end_device_synch_response_validate(protocol_interface_info_ent
     }
 
     //Update parent link information
-    entry_temp = mle_class_get_entry_by_ll64(cur->id, linkMargin, src_address, true, &new_entry_created);
+    entry_temp = mle_class_get_entry_by_ll64(cur->id, src_address, true, &new_entry_created);
 
     if (!entry_temp) {
         tr_debug("Neighbor allocate fail");
         return -2;
     }
+    thread_neighbor_class_update_link(&cur->thread_info->neighbor_class, entry_temp->attribute_index, linkMargin, new_entry_created);
+    thread_neighbor_last_communincation_time_update(&cur->thread_info->neighbor_class, entry_temp->attribute_index);
 /*
 
 */
@@ -787,11 +793,13 @@ static void thread_mle_child_request_receive_cb(int8_t interface_id, mle_message
             thread_merge_prepare(cur);
 
             // Create entry for new parent
-            entry_temp = mle_class_get_entry_by_ll64(cur->id, thread_compute_link_margin(mle_msg->dbm), mle_msg->packet_src_address, true, &new_entry_created);
+            entry_temp = mle_class_get_entry_by_ll64(cur->id, mle_msg->packet_src_address, true, &new_entry_created);
             if (entry_temp == NULL) {
                 // todo: what to do here?
                 return;
             }
+            thread_neighbor_class_update_link(&cur->thread_info->neighbor_class, entry_temp->attribute_index, thread_compute_link_margin(mle_msg->dbm), new_entry_created);
+            thread_neighbor_last_communincation_time_update(&cur->thread_info->neighbor_class, entry_temp->attribute_index);
 
             //Parse mandatory TLV's
             if (!thread_leader_data_parse(mle_msg->data_ptr, mle_msg->data_length, &leaderData)) {
@@ -948,9 +956,13 @@ void thread_endevice_synch_start(protocol_interface_info_entry_t *cur)
         bool new_entry_created;
 
         // Add the parent to the MLE neighbor table
-        entry_temp = mle_class_get_entry_by_mac64(cur->id, 64, cur->thread_info->thread_endnode_parent->mac64, true, &new_entry_created);
+        entry_temp = mle_class_get_entry_by_mac64(cur->id, cur->thread_info->thread_endnode_parent->mac64, true, &new_entry_created);
 
         if (entry_temp) {
+            //Add link margin 64
+            thread_neighbor_class_update_link(&cur->thread_info->neighbor_class, entry_temp->attribute_index,64, new_entry_created);
+            thread_neighbor_last_communincation_time_update(&cur->thread_info->neighbor_class, entry_temp->attribute_index);
+
             entry_temp->short_adr = cur->thread_info->thread_endnode_parent->shortAddress;
             entry_temp->handshakeReady = 1;
 
@@ -1019,7 +1031,7 @@ static bool thread_child_id_req_timeout(int8_t interface_id, uint16_t msgId, boo
         memcpy(&ll64[8], scanned_parent->mac64 , 8);
         ll64[8] ^= 2;
 
-        entry_temp = mle_class_get_entry_by_ll64(cur->id, scanned_parent->linkMarginToParent, ll64, false, NULL);
+        entry_temp = mle_class_get_entry_by_ll64(cur->id, ll64, false, NULL);
         if (entry_temp) {
             mle_class_remove_entry(cur->id, entry_temp);
         }

source/6LoWPAN/Thread/thread_management_if.c

@@ -797,6 +797,7 @@ void thread_comm_status_indication_cb(int8_t if_id, const mlme_comm_status_t* st
     if (!cur) {
         return;
     }
+    mle_neigh_table_entry_t *entry;
 
     switch (status->status) {
 
@@ -809,7 +810,10 @@ void thread_comm_status_indication_cb(int8_t if_id, const mlme_comm_status_t* st
             break;
 
         case MLME_DATA_POLL_NOTIFICATION:
-            mle_refresh_entry_timeout(if_id, status->SrcAddr, (addrtype_t)status->SrcAddrMode, false);
+            entry = mle_refresh_entry_timeout(if_id, status->SrcAddr, (addrtype_t)status->SrcAddrMode, false);
+            if (entry) {
+                thread_neighbor_commucation_update(cur, entry->attribute_index);
+            }
             break;
         default:
             break;