LLC update UTT / BT information to ws neighbor and refresh mac neighbor

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_llc_data_service.c

@@ -29,9 +29,14 @@
 #include "6LoWPAN/MAC/mpx_api.h"
 #include "6LoWPAN/MAC/mac_ie_lib.h"
 #include "6LoWPAN/ws/ws_common_defines.h"
+#include "6LoWPAN/ws/ws_common.h"
 #include "6LoWPAN/ws/ws_ie_lib.h"
 #include "6LoWPAN/ws/ws_llc.h"
 #include "6LoWPAN/ws/ws_mpx_header.h"
+#include "6LoWPAN/ws/ws_neighbour_class.h"
+#include "Service_Libs/mac_neighbor_table/mac_neighbor_table.h"
+
+#ifdef HAVE_WS
 
 #define TRACE_GROUP "wllc"
 
@@ -402,8 +407,34 @@ static void ws_llc_mac_indication_cb(const mac_api_t* api, const mcps_data_ind_t
         // NO UTT header
         return;
     }
+    protocol_interface_info_entry_t *interface = base->interface_ptr;
+
+    ws_neighbour_class_entry_t * ws_neighbor = NULL;
+    mac_neighbor_table_entry_t *neighbor = mac_neighbor_table_address_discover(interface->mac_parameters->mac_neighbor_table, data->SrcAddr, data->SrcAddrMode);
+    if (neighbor) {
+        ws_neighbor =  ws_neighbour_class_entry_get(&interface->ws_info->neighbor_storage, neighbor->index);
+    }
+
+
     const uint8_t *ptr = utt_ie.content_ptr;
-    message_type = *ptr & 0x0f;
+    message_type = *ptr++ & 0x0f;
+    if (ws_neighbor) {
+        ws_neighbor->fhhs_data.utt_timestamp = data->timestamp;
+        ws_neighbor->fhhs_data.ufsi = common_read_24_bit_inverse(ptr);
+        //Update BT if it is part of message
+        if (5 == mac_ie_header_sub_id_discover(ie_ext->headerIeList, ie_ext->headerIeListLength, &utt_ie, WH_IE_BT_TYPE)) {
+            ptr = utt_ie.content_ptr;
+            ws_neighbor->fhhs_data.bt_timestamp = data->timestamp;
+            ws_neighbor->fhhs_data.broadcast_slot_number = common_read_16_bit_inverse(ptr);
+            ws_neighbor->fhhs_data.broadcast_interval = common_read_24_bit_inverse(ptr + 2);
+        }
+
+        //Refresh Neighbor if unicast
+        if (message_type == WS_FT_DATA && data->DstAddrMode && addr_check_broadcast(data->DstAddr, data->DstAddrMode)) {
+            tr_debug("Refresh neigh index %u", neighbor->index);
+            mac_neighbor_table_neighbor_refresh(interface->mac_parameters->mac_neighbor_table, neighbor, neighbor->link_lifetime);
+        }
+    }
 
 
     //Discover 2 Payload Heder
@@ -876,3 +907,4 @@ void ws_llc_hopping_schedule_config(struct protocol_interface_info_entry *interf
     }
     base->ie_params.hopping_schedule = hopping_schedule;
 }
+#endif