On stop (ifdown) stores frame counters regardless of threshold

Author: Mika Leppänen

source/6LoWPAN/ws/ws_pae_controller.c

@@ -109,6 +109,7 @@ static int8_t ws_pae_controller_nw_key_check_and_insert(protocol_interface_info_
 static void ws_pae_controller_active_nw_key_clear(nw_key_t *nw_key);
 static void ws_pae_controller_active_nw_key_set(protocol_interface_info_entry_t *cur, uint8_t index);
 static int8_t ws_pae_controller_gak_from_gtk(uint8_t *gak, uint8_t *gtk, char *network_name);
+static void ws_pae_controller_frame_counter_store_and_nw_keys_remove(protocol_interface_info_entry_t *interface_ptr, pae_controller_t *controller, bool use_threshold);
 static void ws_pae_controller_nw_key_index_check_and_set(protocol_interface_info_entry_t *interface_ptr, uint8_t index);
 static void ws_pae_controller_data_init(pae_controller_t *controller);
 static void ws_pae_controller_frame_counter_read(pae_controller_t *controller);
@@ -477,8 +478,15 @@ void ws_pae_controller_nw_keys_remove(protocol_interface_info_entry_t *interface
         return;
     }
 
+    /* Stores frame counters if incremented by threshold and removes network keys from PAE
+       controller and MAC */
+    ws_pae_controller_frame_counter_store_and_nw_keys_remove(interface_ptr, controller, true);
+}
+
+static void ws_pae_controller_frame_counter_store_and_nw_keys_remove(protocol_interface_info_entry_t *interface_ptr, pae_controller_t *controller, bool use_threshold)
+{
     /* Checks if frame counters needs to be stored when keys are removed */
-    ws_pae_controller_frame_counter_store(controller, true);
+    ws_pae_controller_frame_counter_store(controller, use_threshold);
 
     tr_info("NW keys remove");
 
@@ -703,8 +711,8 @@ int8_t ws_pae_controller_stop(protocol_interface_info_entry_t *interface_ptr)
         return -1;
     }
 
-    // Removes network keys from PAE controller and MAC
-    ws_pae_controller_nw_keys_remove(interface_ptr);
+    // Stores frame counters and removes network keys from PAE controller and MAC
+    ws_pae_controller_frame_counter_store_and_nw_keys_remove(interface_ptr, controller, false);
 
     // If PAE has been initialized, deletes it
     if (controller->pae_delete) {