MLE service Update and integrate new features

Added support to allocate and delete Framecounter storage list for
neighbors

Added support to update, delete and request framecounter info

Integrated frame counter allocate and frame counter storage use by new
API.

Removed MLE frame counter storage from mle_table_entry

Change-Id: I7fae11d3c47a5db3fbfc2b35a21d8b42df395b8b

Author: Juha Heiskanen

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

@@ -1164,7 +1164,7 @@ void mle_6lowpan_message_handler(int8_t interface_id, mle_message_t *mle_msg, ml
             mle_neigh_entry_frame_counter_update(entry_temp, mle_msg->data_ptr, mle_msg->data_length, cur, security_headers->KeyIndex);
             // If MLE frame counter was invalid update its value since three way handshake is complete
             if (security_headers->invalid_frame_counter) {
-                entry_temp->mle_frame_counter = security_headers->frameCounter;
+                mle_service_frame_counter_table_add(interface_id, entry_temp->attribute_index, security_headers->frameCounter);
             }
             break;
 
@@ -1687,6 +1687,10 @@ int8_t arm_6lowpan_bootstarp_bootstrap_set(int8_t interface_id, net_6lowpan_mode
             return -1;
         }
 
+        if (mle_service_frame_counter_table_allocate(interface_id, buffer.device_decription_table_size)) {
+            return -1;
+        }
+
         if (!etx_storage_list_allocate(cur->id, buffer.device_decription_table_size)) {
             return -1;
         }

source/6LoWPAN/Thread/thread_bootstrap.c

@@ -92,6 +92,7 @@
 #include "Service_Libs/etx/etx.h"
 #include "Service_Libs/nd_proxy/nd_proxy.h"
 #include "Service_Libs/blacklist/blacklist.h"
+#include "Service_Libs/mle_service/mle_service_api.h"
 #include "6LoWPAN/MAC/mac_data_poll.h"
 #include "6LoWPAN/lowpan_adaptation_interface.h"
 
@@ -156,6 +157,10 @@ int8_t thread_mle_class_init(int8_t interface_id)
         return -1;
     }
 
+    if (mle_service_frame_counter_table_allocate(interface_id, buffer.device_decription_table_size)) {
+        return -1;
+    }
+
     if (!etx_storage_list_allocate(cur->id, buffer.device_decription_table_size)) {
         return -1;
     }

source/6LoWPAN/Thread/thread_host_bootstrap.c

@@ -165,7 +165,8 @@ static bool thread_parent_discover_timeout_cb(int8_t interface_id, uint16_t msgI
         entry_temp->short_adr = parent->shortAddress;
         entry_temp->priorityFlag = true;
         entry_temp->holdTime = 90;
-        entry_temp->mle_frame_counter = parent->mleFrameCounter;
+
+        mle_service_frame_counter_table_add(interface_id, entry_temp->attribute_index, parent->mleFrameCounter);
 
         thread_management_key_sets_calc(cur, linkConfiguration, cur->thread_info->thread_attach_scanned_parent->keySequence);
         thread_calculate_key_guard_timer(cur, linkConfiguration, true);

source/6LoWPAN/Thread/thread_mle_message_handler.c

@@ -462,7 +462,7 @@ static void thread_parse_accept(protocol_interface_info_entry_t *cur, mle_messag
 
     entry_temp->threadNeighbor = true;
     entry_temp->short_adr = shortAddress;
-    entry_temp->mle_frame_counter = mleFrameCounter;
+    mle_service_frame_counter_table_add(cur->id, entry_temp->attribute_index, mleFrameCounter);
     // Set full data as REED needs full data and SED will not make links
     entry_temp->mode |= MLE_THREAD_REQ_FULL_DATA_SET;
     mlme_device_descriptor_t device_desc;

source/6LoWPAN/Thread/thread_network_synch.c

@@ -167,11 +167,13 @@ void thread_dynamic_storage_child_info_store(int8_t interface_id, mle_neigh_tabl
         return;
     }
 
+    uint32_t mle_frame_counter = mle_service_frame_counter_get(interface_id, child->attribute_index);
+
     thread_sync_child_info_t *child_info = thread_dynamic_storage_child_info_find(interface_id, child);
     if (child_info) {
         child_info->mode = child->mode;
         child_info->short_addr = child->short_adr;
-        child_info->mle_frame_counter = child->mle_frame_counter;
+        child_info->mle_frame_counter = mle_frame_counter;
         child_info->mac_frame_counter = 0;
         memcpy(child_info->long_addr, child->mac64, 8);
         return;
@@ -182,7 +184,7 @@ void thread_dynamic_storage_child_info_store(int8_t interface_id, mle_neigh_tabl
     if (child_info) {
         child_info->mode = child->mode;
         child_info->short_addr = child->short_adr;
-        child_info->mle_frame_counter = child->mle_frame_counter;
+        child_info->mle_frame_counter = mle_frame_counter;
         child_info->mac_frame_counter = 0;
         memcpy(child_info->long_addr, child->mac64, 8);
     }
@@ -265,7 +267,7 @@ void thread_dynamic_storage_build_mle_table(int8_t interface_id)
         mle_neigh_table_entry_t *entry = mle_class_get_entry_by_mac64(interface_id, 64, mac64, true, &new_entry_created);
         if (entry) {
             entry->short_adr = storeEntry->networ_dynamic_data_parameters.children[i].short_addr;
-            entry->mle_frame_counter = storeEntry->networ_dynamic_data_parameters.children[i].mle_frame_counter;
+            mle_service_frame_counter_table_add(interface_id, entry->attribute_index, storeEntry->networ_dynamic_data_parameters.children[i].mle_frame_counter);
             entry->mode = storeEntry->networ_dynamic_data_parameters.children[i].mode;
             entry->threadNeighbor = true;
 

source/6LoWPAN/Thread/thread_router_bootstrap.c

@@ -365,7 +365,7 @@ static void thread_router_synch_receive_cb(int8_t interface_id, mle_message_t *m
             entry_temp->short_adr = shortAddress;
 
             //when allocating neighbour entry, use MLE Frame counter if present to validate further advertisements from the neighbour
-            entry_temp->mle_frame_counter = mleFrameCounter;
+            mle_service_frame_counter_table_add(cur->id, entry_temp->attribute_index, mleFrameCounter);
             if (entry_temp->timeout_rx) {
                 mle_entry_timeout_refresh(entry_temp);
             } else {
@@ -1331,7 +1331,7 @@ void thread_router_bootstrap_child_id_handler(protocol_interface_info_entry_t *c
     entry_temp->mode = req->mode;
     entry_temp->threadNeighbor = true;
     entry_temp->handshakeReady = 1;
-    entry_temp->mle_frame_counter = req->mleFrameCounter;
+    mle_service_frame_counter_table_add(cur->id, entry_temp->attribute_index, req->mleFrameCounter);
 
     if (req->shortAddressReq) {
         if (!thread_child_id_request(cur, entry_temp)) {

source/MLE/mle.c

@@ -129,17 +129,29 @@ static void mle_table_remove_free_indirect_table(int8_t interface_id, mle_neigh_
     lowpan_adaptation_indirect_free_messages_from_queues_by_address(cur_interface, entry_ptr->mac64, ADDR_802_15_4_LONG);
 }
 
+static void mle_table_entry_delete(mle_table_class_t *mle_table_class, mle_neigh_table_entry_t *cur)
+{
+    //Remove from list
+    ns_list_remove(&mle_table_class->mle_table, cur);
+    //Free Indirect Queue
+    mle_table_remove_free_indirect_table(mle_table_class->interfaceId, cur);
+    //Call Remove callback
+    mle_table_class->remove_cb(mle_table_class->interfaceId, cur);
+
+    topo_trace(TOPOLOGY_MLE, entry->ext64, TOPO_REMOVE);
+    //Removes ETX neighbor
+    etx_neighbor_remove(mle_table_class->interfaceId, cur->attribute_index);
+    //Remove MLE frame counter info
+    mle_service_frame_counter_table_delete(mle_table_class->interfaceId, cur->attribute_index);
+    //Add to free list
+    ns_list_add_to_start(&mle_table_class->free_enty_list, cur);
+}
+
+
 static void mle_table_class_list_free(mle_table_class_t *mle_table_class) {
 
     ns_list_foreach_safe(mle_neigh_table_entry_t, cur, &mle_table_class->mle_table) {
-        ns_list_remove(&mle_table_class->mle_table, cur);
-        //Clean Indirect queue
-        mle_table_remove_free_indirect_table(mle_table_class->interfaceId, cur);
-        //Call Remove callback
-        mle_table_class->remove_cb(mle_table_class->interfaceId, cur);
-        //Removes ETX neighbor
-        etx_neighbor_remove(mle_table_class->interfaceId, cur->attribute_index);
-        ns_list_add_to_start(&mle_table_class->free_enty_list, cur);
+        mle_table_entry_delete(mle_table_class, cur);
     }
     topo_trace(TOPOLOGY_MLE, NULL, TOPO_CLEAR);
 }
@@ -331,7 +343,7 @@ int8_t mle_class_set_new_key_pending(int8_t interface_id)
     }
 
     ns_list_foreach_safe(mle_neigh_table_entry_t, cur, &mle_class_ptr->mle_table) {
-        cur->new_key_pending = true;
+        mle_service_frame_counter_table_new_key_pending(interface_id, cur->attribute_index);
     }
 
     return 0;
@@ -521,9 +533,6 @@ static mle_neigh_table_entry_t *mle_class_get_free_entry(mle_neigh_table_list_t
         mle_entry->mode = MLE_FFD_DEV | MLE_RX_ON_IDLE;
         mle_entry->holdTime = 7;
         mle_entry->last_contact_time = protocol_core_monotonic_time;
-        mle_entry->mle_frame_counter = 0;
-        mle_entry->last_key_sequence = 0;
-        mle_entry->new_key_pending = false;
         mle_entry->medium_ttl_challenge = false;
     }
 
@@ -577,18 +586,8 @@ int8_t mle_class_remove_entry(int8_t interface_id, mle_neigh_table_entry_t *entr
     if (!mle_class_neighbor_validate(&mle_class_ptr->mle_table, entry)) {
         return -2;
     }
-    //Remove from list
-    ns_list_remove(&mle_class_ptr->mle_table, entry);
-    //Free Indirect Queue
-    mle_table_remove_free_indirect_table(mle_class_ptr->interfaceId, entry);
-    //Call Remove callback
-    mle_class_ptr->remove_cb(mle_class_ptr->interfaceId, entry);
-    topo_trace(TOPOLOGY_MLE, entry->ext64, TOPO_REMOVE);
 
-    //Removes ETX neighbor
-    etx_neighbor_remove(interface_id, entry->attribute_index);
-    //Add to free list
-    ns_list_add_to_start(&mle_class_ptr->free_enty_list, entry);
+    mle_table_entry_delete(mle_class_ptr, entry);
     return 0;
 }
 
@@ -604,19 +603,7 @@ int8_t mle_class_remove_neighbour(int8_t interface_id, const uint8_t *address, a
     if (!entry) {
         return -2;
     }
-    //Remove from list
-    ns_list_remove(&mle_class_ptr->mle_table, entry);
-    //Free Indirect Queue
-    mle_table_remove_free_indirect_table(mle_class_ptr->interfaceId, entry);
-    //Call Remove callback
-    mle_class_ptr->remove_cb(mle_class_ptr->interfaceId, entry);
-
-    topo_trace(TOPOLOGY_MLE, entry->ext64, TOPO_REMOVE);
-
-     //Removes ETX neighbor
-     etx_neighbor_remove(interface_id, entry->attribute_index);
-    //Add to free list
-    ns_list_add_to_start(&mle_class_ptr->free_enty_list, entry);
+    mle_table_entry_delete(mle_class_ptr, entry);
 
     return 0;
 
@@ -682,17 +669,7 @@ static void mle_class_table_ttl(uint16_t ticks, mle_table_class_t *mle_class_ptr
 
         if (remove_entry) {
             //Silence delete
-            //Remove from list
-            ns_list_remove(&mle_class_ptr->mle_table, cur);
-            //Free Indirect Queue
-            mle_table_remove_free_indirect_table(mle_class_ptr->interfaceId, cur);
-            mle_class_ptr->remove_cb(mle_class_ptr->interfaceId, cur);
-            topo_trace(TOPOLOGY_MLE, cur->ext64, TOPO_REMOVE);
-            //Removes ETX neighbor
-            etx_neighbor_remove(mle_class_ptr->interfaceId, cur->attribute_index);
-            //Add to free list
-            ns_list_add_to_start(&mle_class_ptr->free_enty_list, cur);
-
+            mle_table_entry_delete(mle_class_ptr, cur);
         }
     } // for each entry
 

source/MLE/mle.h

@@ -148,16 +148,13 @@ typedef struct mle_neigh_table_entry_t {
     uint8_t         attribute_index;
     uint16_t        ttl;                /*!< destination TTL * 4 seconds */
     uint32_t        last_contact_time;  /*!< monotonic time - hard to define "contact"; used for Thread Leasequery replies */
-    uint32_t        mle_frame_counter;
     uint16_t        timeout_rx;
     uint16_t        holdTime;
     uint16_t        link_margin;
     uint8_t         mac64[8];           /*!< MAC64 */
     uint8_t         mlEid[8];
     uint16_t        short_adr;
     uint8_t         mode;
-    uint32_t        last_key_sequence;
-    unsigned        new_key_pending:1;
     unsigned        link_q_adv_sent: 1;
     unsigned        priority_child_flag: 1;    /* Is using our node as preferred parent */
     unsigned        second_priority_flag: 1;   /* Is secondary parent */

source/Service_Libs/mle_service/mle_service.c

@@ -35,6 +35,7 @@
 #include "Service_Libs/mle_service/mle_service_security.h"
 #include "Service_Libs/mle_service/mle_service_buffer.h"
 #include "Service_Libs/mle_service/mle_service_interface.h"
+#include "Service_Libs/mle_service/mle_service_frame_counter_table.h"
 #include "MLE/mle.h"
 #include "MLE/mle_tlv.h"
 #include "mac_common_defines.h"
@@ -654,6 +655,15 @@ static int mle_service_build_packet_send(service_instance_t *srv_ptr, mle_securi
     return 0;
 }
 
+static mle_neighbor_security_counter_info_t *mle_service_get_neighbour_info(int8_t interface_id, uint8_t *ll64)
+{
+    mle_neigh_table_entry_t *neighbour = mle_class_discover_entry_by_ll64(interface_id,ll64);
+    if (!neighbour) {
+        return NULL;
+    }
+    return mle_service_counter_info_get(interface_id, neighbour->attribute_index);
+}
+
 static void mle_service_socket_callback(void *cb)
 {
     socket_buffer_callback_t *cb_buf = cb;
@@ -729,7 +739,7 @@ static void mle_service_socket_callback(void *cb)
 
 
         /* MLE neighbour table frame counter check */
-        mle_neigh_table_entry_t *neighbour = NULL;
+        mle_neighbor_security_counter_info_t *neighbour = NULL;
         uint32_t keySeq;
         if (securityHeader.KeyIdMode == MAC_KEY_ID_MODE_SRC4_IDX) {
             keySeq = common_read_32_bit(securityHeader.Keysource);
@@ -738,7 +748,7 @@ static void mle_service_socket_callback(void *cb)
         }
 
         if (mle_service->mle_frame_counter_check_enabled) {
-            neighbour = mle_class_discover_entry_by_ll64(service_handler->interface_id,buf->src_sa.address);
+            neighbour = mle_service_get_neighbour_info(service_handler->interface_id,buf->src_sa.address);
             if (neighbour){
                 //key pending is set - incoming frame counter will be reset when new sequence is heard or lower framecounter is heard
                 if (neighbour->new_key_pending) {

source/Service_Libs/mle_service/mle_service_api.h

@@ -132,6 +132,7 @@ uint8_t retrans_max; /*!< Define max packet TX count */
 uint8_t delay; /*!< 100ms Ticks for random delay */
 } mle_message_timeout_params_t;
 
+
 /**
  *  MLE service message receiver handler call back function pointer
  *
@@ -719,6 +720,69 @@ void mle_service_set_fragmented_msg_ll_security(bool value);
 */
 void mle_service_set_accept_invalid_frame_counter(bool value);
 
+
+/**
+* Commands MLE service to allocate mle frame counter table for giving neighbor count.
+*
+* \param interface_id Interface ID
+* \param table_size Table size
+*
+* \return 0 Allocate OK
+* \return -1 Allocate Fail
+*
+*/
+int mle_service_frame_counter_table_allocate(int8_t interface_id, uint8_t table_size);
+
+/**
+* Commands MLE service to free mle frame counter table
+*
+* \param interface_id Interface ID
+*
+* \return 0 Free OK
+* \return -1 Free Fail
+*
+*/
+int mle_service_frame_counter_table_free(int8_t interface_id);
+
+/**
+* Commands MLE service to add / Update frame counter to neighbor
+*
+* \param interface_id Interface ID
+* \param attribute_index Attribute index for neighbor
+* \param frame_counter MLE frame counter
+*
+*/
+void mle_service_frame_counter_table_add(int8_t interface_id, uint8_t attribute_index, uint32_t frame_counter);
+
+/**
+* Commands MLE service get mle frame counter for neighbor
+*
+* \param interface_id Interface ID
+* \param attribute_index Attribute index for neighbor
+*
+* \return Stored Frame Counter, may return 0 if unknow attribute
+*
+*/
+uint32_t mle_service_frame_counter_get(int8_t interface_id, uint8_t attribute_index);
+
+/**
+* Commands MLE service frame counter new key pending state activate
+*
+* \param interface_id Interface ID
+* \param attribute_index Attribute index for neighbor
+*
+*/
+void mle_service_frame_counter_table_new_key_pending(int8_t interface_id, uint8_t attribute_index);
+
+/**
+* Commands MLE service frame counter info delete
+*
+* \param interface_id Interface ID
+* \param attribute_index Attribute index for neighbor
+*
+*/
+void mle_service_frame_counter_table_delete(int8_t interface_id, uint8_t attribute_index);
+
 #ifdef MLE_TEST
 /**
  * Set callback for MLE receiving packet filtering.