Added 15 second guarantee time for packet handler before remove link.

Change-Id: Ic134d0b0c004cf37e42997cb2f19c2c648ca70a0

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -1295,6 +1295,16 @@ static void ws_bootstrap_asynch_confirm(struct protocol_interface_info_entry *in
     (void)interface;
     (void)asynch_message;
 }
+
+uint32_t ws_time_from_last_unicast_traffic(uint32_t current_time_stamp, ws_neighbor_class_entry_t *ws_neighbor)
+{
+    uint32_t time_from_last_unicast_shedule = current_time_stamp;
+    //Time from last RX unicast in us
+    time_from_last_unicast_shedule -= ws_neighbor->fhss_data.uc_timing_info.utt_rx_timestamp;
+    time_from_last_unicast_shedule /= 1000000; //Convert to seconds
+    return time_from_last_unicast_shedule;
+}
+
 static void ws_bootstrap_neighbor_table_clean(struct protocol_interface_info_entry *interface)
 {
     uint8_t ll_target[16];
@@ -1305,6 +1315,9 @@ static void ws_bootstrap_neighbor_table_clean(struct protocol_interface_info_ent
     }
     memcpy(ll_target, ADDR_LINK_LOCAL_PREFIX, 8);
 
+    uint32_t current_time_stamp = 0;
+    ns_sw_mac_read_current_timestamp(interface->mac_api, &current_time_stamp);
+
     mac_neighbor_table_entry_t *neighbor_entry_ptr = NULL;
     ns_list_foreach_safe(mac_neighbor_table_entry_t, cur, &mac_neighbor_info(interface)->neighbour_list) {
         ws_neighbor_class_entry_t *ws_neighbor = ws_neighbor_class_entry_get(&interface->ws_info->neighbor_storage, cur->index);
@@ -1340,14 +1353,29 @@ static void ws_bootstrap_neighbor_table_clean(struct protocol_interface_info_ent
             }
         }
 
+        uint32_t link_min_timeout;
+        //Read current timestamp
+        uint32_t time_from_last_unicast_shedule = ws_time_from_last_unicast_traffic(current_time_stamp, ws_neighbor);
 
 
         if (cur->trusted_device) {
-            neighbor_entry_ptr = cur;
+            link_min_timeout = WS_NEIGHBOR_TRUSTED_LINK_MIN_TIMEOUT;
         } else {
-            if (cur->link_lifetime - cur->lifetime > WS_NEIGHBOR_NOT_TRUSTED_LINK_TIMEOUT) {
-                //Accept only Enough Old not trusted Device
+
+            link_min_timeout = WS_NEIGHBOR_NOT_TRUSTED_LINK_MIN_TIMEOUT;
+        }
+
+        if (time_from_last_unicast_shedule > link_min_timeout) {
+            //Accept only Enough Old Device
+            if (!neighbor_entry_ptr) {
+                //Accept first compare
                 neighbor_entry_ptr = cur;
+            } else {
+                uint32_t compare_neigh_time = ws_time_from_last_unicast_traffic(current_time_stamp, ws_neighbor_class_entry_get(&interface->ws_info->neighbor_storage, neighbor_entry_ptr->index));
+                if (compare_neigh_time < time_from_last_unicast_shedule)  {
+                    //Accept older RX timeout allways
+                    neighbor_entry_ptr = cur;
+                }
             }
         }
     }

source/6LoWPAN/ws/ws_common.c

@@ -407,7 +407,7 @@ bool ws_common_negative_aro_mark(protocol_interface_info_entry_t *interface, con
     }
     ws_neighbor_class_entry_t *ws_neighbor = ws_neighbor_class_entry_get(&interface->ws_info->neighbor_storage, neighbour->index);
     ws_neighbor->negative_aro_send = true;
-    neighbour->lifetime = WS_NEIGHBOR_NOT_TRUSTED_LINK_TIMEOUT; //Remove anyway if Packet is freed before MAC push
+    neighbour->lifetime = WS_NEIGHBOR_NOT_TRUSTED_LINK_MIN_TIMEOUT; //Remove anyway if Packet is freed before MAC push
     return true;
 }
 

source/6LoWPAN/ws/ws_common_defines.h

@@ -186,7 +186,8 @@ typedef struct ws_bs_ie {
 #define WS_FAN_VERSION_1_0 1
 
 #define WS_NEIGHBOR_LINK_TIMEOUT 2200
-#define WS_NEIGHBOR_NOT_TRUSTED_LINK_TIMEOUT 60
+#define WS_NEIGHBOR_NOT_TRUSTED_LINK_MIN_TIMEOUT 60
+#define WS_NEIGHBOR_TRUSTED_LINK_MIN_TIMEOUT 15
 #define WS_NEIGHBOR_NUD_TIMEOUT WS_NEIGHBOR_LINK_TIMEOUT / 2
 
 #define WS_NEIGBOR_ETX_SAMPLE_MAX 3