Wi-sun neighbor temporary neigh update

Keep neigh min 120 seconds in all case before remove from the list. 120 seconds must be from last RX packet. Change-Id: Ife14e4606d3c49073fd0590513f266f37a1237b6
ARMmbed · Sep 3, 2019 · 313794c · 313794c
1 parent 05fa359
commit 313794c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/source/6LoWPAN/ws/ws_bootstrap.c b/source/6LoWPAN/ws/ws_bootstrap.c
@@ -1368,19 +1368,10 @@ 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) {
-            link_min_timeout = WS_NEIGHBOR_TRUSTED_LINK_MIN_TIMEOUT;
-        } else {
-
-            link_min_timeout = WS_NEIGHBOR_NOT_TRUSTED_LINK_MIN_TIMEOUT;
-        }
-
-        if (time_from_last_unicast_shedule > link_min_timeout || !ws_neighbor->unicast_data_rx) {
+        if (time_from_last_unicast_shedule > WS_NEIGHBOR_TEMPORARY_LINK_MIN_TIMEOUT || !ws_neighbor->unicast_data_rx) {
             //Accept only Enough Old Device
             if (!neighbor_entry_ptr) {
                 //Accept first compare

diff --git a/source/6LoWPAN/ws/ws_common.c b/source/6LoWPAN/ws/ws_common.c
@@ -426,7 +426,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_MIN_TIMEOUT; //Remove anyway if Packet is freed before MAC push
+    neighbour->lifetime = WS_NEIGHBOR_TEMPORARY_LINK_MIN_TIMEOUT; //Remove anyway if Packet is freed before MAC push
     return true;
 }
 

diff --git a/source/6LoWPAN/ws/ws_common_defines.h b/source/6LoWPAN/ws/ws_common_defines.h
@@ -186,8 +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_MIN_TIMEOUT 60
-#define WS_NEIGHBOR_TRUSTED_LINK_MIN_TIMEOUT 15
+#define WS_NEIGHBOR_TEMPORARY_LINK_MIN_TIMEOUT 120
 #define WS_NEIGHBOR_NUD_TIMEOUT WS_NEIGHBOR_LINK_TIMEOUT / 2
 
 #define WS_NEIGBOR_ETX_SAMPLE_MAX 3