Drop only non trusted devices when life is over 60 seconds old.

Change-Id: Id8e2f1ceb6262cdcaa8d52debe4d8461fd0ea9f9

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -1292,19 +1292,32 @@ static void ws_bootstrap_neighbor_table_clean(struct protocol_interface_info_ent
             continue;
         }
 
-        if (ipv6_neighbour_has_registered_by_eui64(&interface->ipv6_neighbour_cache, cur->mac64)) {
-            // We have registered entry so we have been selected as parent
-            continue;
+        if (cur->trusted_device) {
+
+            if (ipv6_neighbour_has_registered_by_eui64(&interface->ipv6_neighbour_cache, cur->mac64)) {
+                // We have registered entry so we have been selected as parent
+                continue;
+            }
+
+            memcpy(ll_target + 8, cur->mac64, 8);
+            ll_target[8] ^= 2;
+
+            if (rpl_control_is_dodag_parent(interface, ll_target)) {
+                // Possible parent is limited to 3 by default?
+                continue;
+            }
         }
 
-        memcpy(ll_target + 8, cur->mac64, 8);
-        ll_target[8] ^= 2;
 
-        if (rpl_control_is_dodag_parent(interface, ll_target)) {
-            // Possible parent is limited to 3 by default?
-            continue;
+
+        if (cur->trusted_device) {
+            neighbor_entry_ptr = cur;
+        } else {
+            if (cur->link_lifetime - cur->lifetime > WS_NEIGHBOR_NOT_TRUSTED_LINK_TIMEOUT) {
+                //Accept only Enough Old not trusted Device
+                neighbor_entry_ptr = cur;
+            }
         }
-        neighbor_entry_ptr = cur;
     }
     if (neighbor_entry_ptr) {
         tr_info("dropped oldest neighbour %s", trace_array(neighbor_entry_ptr->mac64, 8));

source/6LoWPAN/ws/ws_common_defines.h

@@ -186,6 +186,7 @@ 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_NUD_TIMEOUT WS_NEIGHBOR_LINK_TIMEOUT / 2
 
 #define WS_NEIGBOR_ETX_SAMPLE_MAX 3