Ws neighbor hoping storage init integrated to interface init.

Neighbor remove callback remove ws table and clean neigh cache.

Change-Id: Id7276fa05e5d21e4397c1a89833abd7cf7e34203

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+
 #include <string.h>
 #include "nsconfig.h"
 #include "ns_types.h"
@@ -33,6 +34,7 @@
 #include "6LoWPAN/ws/ws_common_defines.h"
 #include "6LoWPAN/ws/ws_common.h"
 #include "6LoWPAN/ws/ws_bootstrap.h"
+#include "6LoWPAN/ws/ws_neighbour_class.h"
 #include "RPL/rpl_control.h"
 #include "RPL/rpl_data.h"
 #include "Common_Protocols/icmpv6.h"
@@ -43,6 +45,7 @@
 #include "6LoWPAN/ws/ws_llc.h"
 #include "6LoWPAN/lowpan_adaptation_interface.h"
 #include "Service_Libs/mac_neighbor_table/mac_neighbor_table.h"
+#include "platform/topo_trace.h"
 
 #include "net_rpl.h"
 #include "mac_api.h"
@@ -447,9 +450,28 @@ static void ws_bootstrap_asynch_confirm(struct protocol_interface_info_entry *in
 
 static void ws_neighbor_entry_remove_notify(mac_neighbor_table_entry_t *entry_ptr, void *user_data)
 {
-    //TODO Remove from MAC helper remove, ETX, WS Table entry
-    (void) entry_ptr;
-    (void) user_data;
+
+    protocol_interface_info_entry_t *cur = user_data;
+
+    // Sleepy host
+    if (cur->lowpan_info & INTERFACE_NWK_CONF_MAC_RX_OFF_IDLE) {
+        mac_data_poll_protocol_poll_mode_decrement(cur);
+    }
+
+    //TODO State machine check here
+
+    if (entry_ptr->ffd_device) {
+        protocol_6lowpan_release_short_link_address_from_neighcache(cur, entry_ptr->mac16);
+        protocol_6lowpan_release_long_link_address_from_neighcache(cur, entry_ptr->mac64);
+    }
+    mac_helper_devicetable_remove(cur->mac_api, entry_ptr->index);
+
+    //Remove WS neighbor data
+    ws_neighbour_class_entry_remove(&cur->ws_info->neighbor_storage, entry_ptr->index);
+    topo_trace(TOPOLOGY_MLE, entry_ptr->ext64, TOPO_REMOVE);
+
+    //TODO Remove ETX neighbor
+    //etx_neighbor_remove(interface_id, entry);
 }
 
 
@@ -463,11 +485,12 @@ static bool ws_neighbor_entry_nud_notify(mac_neighbor_table_entry_t *entry_ptr,
 
 int ws_bootstrap_init(int8_t interface_id, net_6lowpan_mode_e bootstrap_mode)
 {
-    (void) bootstrap_mode;
+    int ret_val = 0;
 
-    protocol_interface_info_entry_t *cur;
-
-    cur = protocol_stack_interface_info_get_by_id(interface_id);
+    ws_neighbour_class_t neigh_info;
+    neigh_info.neigh_info_list = NULL;
+    neigh_info.list_size = 0;
+    protocol_interface_info_entry_t *cur = protocol_stack_interface_info_get_by_id(interface_id);
     if (!cur) {
         return -1;
     }
@@ -483,7 +506,7 @@ int ws_bootstrap_init(int8_t interface_id, net_6lowpan_mode_e bootstrap_mode)
     }
 
     switch (bootstrap_mode) {
-    //        case NET_6LOWPAN_SLEEPY_HOST:
+        //        case NET_6LOWPAN_SLEEPY_HOST:
         case NET_6LOWPAN_HOST:
             cur->bootsrap_mode = ARM_NWK_BOOTSRAP_MODE_6LoWPAN_HOST;
             break;
@@ -496,48 +519,64 @@ int ws_bootstrap_init(int8_t interface_id, net_6lowpan_mode_e bootstrap_mode)
         default:
             return -3;
     }
+
+    if (!ws_neighbour_class_alloc(&neigh_info, buffer.device_decription_table_size)) {
+        ret_val = -1;
+        goto init_fail;
+    }
+
     //Disable allways by default
     lowpan_adaptation_interface_mpx_register(interface_id, NULL, 0);
 
     mac_neighbor_table_delete(cur->mac_parameters->mac_neighbor_table);
     cur->mac_parameters->mac_neighbor_table = mac_neighbor_table_create(buffer.device_decription_table_size, ws_neighbor_entry_remove_notify
                                                                         , ws_neighbor_entry_nud_notify, cur, WS_NEIGHBOR_NUD_TIMEOUT);
     if (!cur->mac_parameters->mac_neighbor_table) {
-        return -4;
+        ret_val = -1;
+        goto init_fail;
     }
 
     ws_llc_create(cur, &ws_bootstrap_asynch_ind, &ws_bootstrap_asynch_confirm);
 
     mpx_api_t *mpx_api = ws_llc_mpx_api_get(cur);
     if (!mpx_api) {
-        ws_llc_delete(cur);
-        return -4;
+        ret_val =  -4;
+        goto init_fail;
     }
 
     if (ws_common_allocate_and_init(cur) < 0) {
-        ws_llc_delete(cur);
-        return -4;
+        ret_val =  -4;
+        goto init_fail;
     }
 
     if (ws_bootstrap_tasklet_init(cur) != 0) {
-        ws_llc_delete(cur);
-        return -4;
+        ret_val =  -4;
+        goto init_fail;
     }
 
     //Register MPXUser to adapatation layer
     if (lowpan_adaptation_interface_mpx_register(interface_id, mpx_api, MPX_LOWPAN_ENC_USER_ID) != 0) {
-        ws_llc_delete(cur);
-        return -4;
+        ret_val =  -4;
+        goto init_fail;
     }
 
 
     cur->if_up = ws_bootstrap_up;
     cur->if_down = ws_bootstrap_down;
+    cur->ws_info->neighbor_storage = neigh_info;
 
     ws_bootstrap_configuration_reset(cur);
     addr_notification_register(ws_bootstrap_address_notification_cb);
 
     return 0;
+
+    //Error handling and free memory
+    init_fail:
+    lowpan_adaptation_interface_mpx_register(interface_id, NULL, 0);
+    mac_neighbor_table_delete(cur->mac_parameters->mac_neighbor_table);
+    ws_neighbour_class_dealloc(&neigh_info);
+    ws_llc_delete(cur);
+    return ret_val;
 }
 
 static void ws_bootstrap_mac_activate(protocol_interface_info_entry_t *cur, uint16_t channel, uint16_t panid, bool coordinator)

source/6LoWPAN/ws/ws_common.h

@@ -17,12 +17,14 @@
 #ifndef WS_COMMON_H_
 #define WS_COMMON_H_
 
+#include <6LoWPAN/ws/ws_neighbour_class.h>
 #include "ns_types.h"
 #include "fhss_api.h"
 #include "fhss_config.h"
 #include "6LoWPAN/ws/ws_common_defines.h"
 
 struct ws_pan_information_s;
+struct ws_neighbour_class_s;
 
 typedef struct parent_info_s {
         uint16_t pan_id;            /**< PAN ID */
@@ -46,6 +48,7 @@ typedef struct ws_info_s {
 
     struct ws_pan_information_s pan_configuration;
     ws_hoopping_schedule_t hopping_schdule;
+    struct ws_neighbour_class_s neighbor_storage;
     struct fhss_timer *fhss_timer_ptr; // Platform adaptation for FHSS timers.
 } ws_info_t;
 

source/6LoWPAN/ws/ws_neighbour_class.c

@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2018, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "nsconfig.h"
+#include <string.h>
+#include "ns_types.h"
+#include "ns_list.h"
+#include "ns_trace.h"
+#include "nsdynmemLIB.h"
+#include "6LoWPAN/ws/ws_neighbour_class.h"
+
+bool ws_neighbour_class_alloc(ws_neighbour_class_t *class_data, uint8_t list_size)
+{
+
+    class_data->neigh_info_list = ns_dyn_mem_alloc(sizeof(ws_neighbour_class_entry_t) * list_size);
+    if (!class_data->neigh_info_list) {
+        return false;
+    }
+
+    class_data->list_size = list_size;
+    ws_neighbour_class_entry_t * list_ptr = class_data->neigh_info_list;
+    for (uint8_t i = 0; i< list_size; i++) {
+        memset(list_ptr, 0, sizeof(ws_neighbour_class_entry_t));
+        list_ptr++;
+    }
+    return true;
+}
+
+
+void ws_neighbour_class_dealloc(ws_neighbour_class_t *class_data)
+{
+    ns_dyn_mem_free(class_data->neigh_info_list);
+    class_data->neigh_info_list = NULL;
+    class_data->list_size = 0;
+}
+
+ws_neighbour_class_entry_t * ws_neighbour_class_entry_get(ws_neighbour_class_t *class_data, uint8_t attribute_index)
+{
+    if (!class_data->neigh_info_list || attribute_index >= class_data->list_size) {
+        return NULL;
+    }
+
+    ws_neighbour_class_entry_t *entry = class_data->neigh_info_list + attribute_index;
+    return entry;
+}
+
+void ws_neighbour_class_entry_remove(ws_neighbour_class_t *class_data, uint8_t attribute_index)
+{
+    ws_neighbour_class_entry_t *entry = ws_neighbour_class_entry_get(class_data, attribute_index);
+    if (entry) {
+        memset(entry, 0, sizeof(ws_neighbour_class_entry_t));
+    }
+}

sources.mk

@@ -21,6 +21,7 @@ SRCS += \
 	source/6LoWPAN/ws/ws_ie_lib.c \
 	source/6LoWPAN/ws/ws_llc_data_service.c \
 	source/6LoWPAN/ws/ws_mpx_header.c \
+	source/6LoWPAN/ws/ws_neighbour_class.c \
 	source/6LoWPAN/ws/ws_bootstrap.c \
 	source/6LoWPAN/ws/ws_common.c \
 	source/6LoWPAN/ws/ws_management_api.c \