WS RPL paret soft filter update

Removed bootstrap active check

Selected parent will also check if there is more than selected candidates before drop.

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -2381,19 +2381,21 @@ static void ws_rpl_prefix_callback(prefix_entry_t *prefix, void *handle, uint8_t
 
 static bool ws_rpl_candidate_soft_filtering(protocol_interface_info_entry_t *cur, struct rpl_instance *instance)
 {
-    //If bootstrap active we not need any candidate filtering
-    if ((cur->lowpan_info & INTERFACE_NWK_BOOTSRAP_ACTIVE) && (ws_info(cur)->cfg->gen.network_size == NETWORK_SIZE_CERTIFICATE)) {
-        return true;
-    }
-
     //Already many candidates
-    if (rpl_control_candidate_list_size(cur, instance) > cur->ws_info->cfg->gen.rpl_parent_candidate_max) {
+    uint16_t candidate_list_size = rpl_control_candidate_list_size(cur, instance);
+    if (candidate_list_size > cur->ws_info->cfg->gen.rpl_parent_candidate_max) {
         return false;
     }
 
+    uint16_t selected_parents = rpl_control_selected_parent_count(cur, instance);
+
     //Already enough selected candidates
-    if (rpl_control_selected_parent_count(cur, instance) >= cur->ws_info->cfg->gen.rpl_selected_parent_max) {
-        return false;
+    if (selected_parents >= cur->ws_info->cfg->gen.rpl_selected_parent_max) {
+        candidate_list_size -= selected_parents;
+        if (candidate_list_size >= 2) {
+            //We have more candidates than selected
+            return false;
+        }
     }
 
     return true;