Wi-sun neighbor generate limitation

RPL control added API for request parent list size.

Avoid multicast neighbour generation after bootstarp.

Multicast will be dropped at Border router allwayd for genrating new neighbours.

Node drop multicast if neighbour candidate is 4 or bigger or selected parent size is 2 or gigger.

Data accepted if it is multicast but only accepted is multicast RPL DIS.

NS probe is only done 1 for unicast neighbour and multiple time only for parent.

Change-Id: I08761b3dc296a938b3a2a1ab10895643f8da69da

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -81,7 +81,7 @@ static void ws_bootstrap_state_change(protocol_interface_info_entry_t *cur, icmp
 static bool ws_bootstrap_state_discovery(struct protocol_interface_info_entry *cur);
 static int8_t ws_bootsrap_event_trig(ws_bootsrap_event_type_e event_type, int8_t interface_id, arm_library_event_priority_e priority, void *event_data);
 
-static bool ws_bootstrap_neighbor_info_request(struct protocol_interface_info_entry *interface, const uint8_t *mac_64, llc_neighbour_req_t *neighbor_buffer, bool request_new);
+static bool ws_bootstrap_neighbor_info_request(struct protocol_interface_info_entry *interface, const uint8_t *mac_64, llc_neighbour_req_t *neighbor_buffer, bool request_new, bool multicast);
 static uint16_t ws_bootstrap_routing_cost_calculate(protocol_interface_info_entry_t *cur);
 static uint16_t ws_bootstrap_rank_get(protocol_interface_info_entry_t *cur);
 static uint16_t ws_bootstrap_min_rank_inc_get(protocol_interface_info_entry_t *cur);
@@ -104,6 +104,13 @@ typedef enum {
     WS_EAPOL_PARENT_SYNCH,  /**< Broadcast synch with EAPOL parent*/
 } ws_parent_synch_e;
 
+static void ws_bootsrap_create_ll_address(uint8_t *ll_address, const uint8_t *mac64)
+{
+    memcpy(ll_address, ADDR_LINK_LOCAL_PREFIX, 8);
+    memcpy(ll_address + 8, mac64, 8);
+    ll_address[8] ^= 2;
+}
+
 mac_neighbor_table_entry_t *ws_bootstrap_mac_neighbor_add(struct protocol_interface_info_entry *interface, const uint8_t *src64)
 
 {
@@ -312,9 +319,7 @@ static bool ws_nud_message_build(protocol_interface_info_entry_t *cur, mac_neigh
 {
     //Send NS
     uint8_t ll_target[16];
-    memcpy(ll_target, ADDR_LINK_LOCAL_PREFIX, 8);
-    memcpy(ll_target + 8, neighbor->mac64, 8);
-    ll_target[8] ^= 2;
+    ws_bootsrap_create_ll_address(ll_target, neighbor->mac64);
     tr_info("NUD generate NS %u", neighbor->index);
     buffer_t *buffer = icmpv6_build_ns(cur, ll_target, NULL, true, false, NULL);
     if (buffer) {
@@ -923,7 +928,7 @@ static void ws_bootstrap_pan_advertisement_analyse(struct protocol_interface_inf
     // Save route cost for all neighbours
     llc_neighbour_req_t neighbor_info;
     neighbor_info.neighbor = NULL;
-    if (ws_bootstrap_neighbor_info_request(cur, data->SrcAddr, &neighbor_info, false)) {
+    if (ws_bootstrap_neighbor_info_request(cur, data->SrcAddr, &neighbor_info, false, false)) {
         neighbor_info.ws_neighbor->routing_cost = pan_information.routing_cost;
     }
 
@@ -1073,7 +1078,7 @@ static void ws_bootstrap_pan_config_analyse(struct protocol_interface_info_entry
         return;
     }
     llc_neighbour_req_t neighbor_info;
-    if (!ws_bootstrap_neighbor_info_request(cur, data->SrcAddr, &neighbor_info, true)) {
+    if (!ws_bootstrap_neighbor_info_request(cur, data->SrcAddr, &neighbor_info, true, true)) {
         return;
     }
 
@@ -1156,7 +1161,7 @@ static void ws_bootstrap_pan_config_solicit_analyse(struct protocol_interface_in
      */
 
     llc_neighbour_req_t neighbor_info;
-    if (ws_bootstrap_neighbor_info_request(cur, data->SrcAddr, &neighbor_info, false)) {
+    if (ws_bootstrap_neighbor_info_request(cur, data->SrcAddr, &neighbor_info, false, false)) {
         etx_lqi_dbm_update(cur->id, data->mpduLinkQuality, data->signal_dbm, neighbor_info.neighbor->index);
         ws_neighbor_class_neighbor_unicast_time_info_update(neighbor_info.ws_neighbor, ws_utt, data->timestamp);
         ws_neighbor_class_neighbor_unicast_schedule_set(neighbor_info.ws_neighbor, ws_us);
@@ -1347,7 +1352,7 @@ static void ws_bootstrap_neighbor_table_clean(struct protocol_interface_info_ent
             memcpy(ll_target + 8, cur->mac64, 8);
             ll_target[8] ^= 2;
 
-            if (rpl_control_is_dodag_parent(interface, ll_target)) {
+            if (rpl_control_is_dodag_parent(interface, ll_target, true)) {
                 // Possible parent is limited to 3 by default?
                 continue;
             }
@@ -1365,7 +1370,7 @@ static void ws_bootstrap_neighbor_table_clean(struct protocol_interface_info_ent
             link_min_timeout = WS_NEIGHBOR_NOT_TRUSTED_LINK_MIN_TIMEOUT;
         }
 
-        if (time_from_last_unicast_shedule > link_min_timeout) {
+        if (time_from_last_unicast_shedule > link_min_timeout || !ws_neighbor->unicast_data_rx) {
             //Accept only Enough Old Device
             if (!neighbor_entry_ptr) {
                 //Accept first compare
@@ -1386,7 +1391,7 @@ static void ws_bootstrap_neighbor_table_clean(struct protocol_interface_info_ent
 
 }
 
-static bool ws_bootstrap_neighbor_info_request(struct protocol_interface_info_entry *interface, const uint8_t *mac_64, llc_neighbour_req_t *neighbor_buffer, bool request_new)
+static bool ws_bootstrap_neighbor_info_request(struct protocol_interface_info_entry *interface, const uint8_t *mac_64, llc_neighbour_req_t *neighbor_buffer, bool request_new, bool multicast)
 {
     neighbor_buffer->neighbor = mac_neighbor_table_address_discover(mac_neighbor_info(interface), mac_64, ADDR_802_15_4_LONG);
     if (neighbor_buffer->neighbor) {
@@ -1399,15 +1404,34 @@ static bool ws_bootstrap_neighbor_info_request(struct protocol_interface_info_en
     if (!request_new) {
         return false;
     }
-    uint8_t ll_target[16];
-    memcpy(ll_target, ADDR_LINK_LOCAL_PREFIX, 8);
-    memcpy(ll_target + 8, mac_64, 8);
-    ll_target[8] ^= 2;
 
+    if (!multicast) {
+        uint8_t ll_target[16];
+        ws_bootsrap_create_ll_address(ll_target, mac_64);
 
-    if (blacklist_reject(ll_target)) {
-        // Rejected by blacklist
-        return false;
+        if (blacklist_reject(ll_target)) {
+            // Rejected by blacklist
+            return false;
+        }
+    } else {
+
+        if (interface->bootsrap_mode == ARM_NWK_BOOTSRAP_MODE_6LoWPAN_BORDER_ROUTER) {
+            //Border router never allocate neighbors by multicast
+            return false;
+        }
+
+        uint16_t parent_candidate_size = rpl_control_parent_candidate_list_size(interface, false);
+
+        //if we have enough candidates at list do not accept new multicast neighbours
+        if (parent_candidate_size >= 4) {
+            return false;
+        }
+
+        parent_candidate_size = rpl_control_parent_candidate_list_size(interface, true);
+        //If we have already enough parent selected Candidates count is bigger tahn 4
+        if (parent_candidate_size >= 2) {
+            return false;
+        }
     }
 
     ws_bootstrap_neighbor_table_clean(interface);
@@ -1483,6 +1507,21 @@ static bool ws_neighbor_entry_nud_notify(mac_neighbor_table_entry_t *entry_ptr,
             //Accept quick Probe for init ETX
             activate_nud = true;
         } else {
+            if (cur->bootsrap_mode == ARM_NWK_BOOTSRAP_MODE_6LoWPAN_BORDER_ROUTER) {
+                if (etx_entry->etx_samples || !ws_neighbor->unicast_data_rx) {
+                    //Border router just need 1 sample for ETX
+                    return false;
+                }
+            } else {
+                uint8_t ll_address[16];
+                ws_bootsrap_create_ll_address(ll_address, entry_ptr->mac64);
+                if (!rpl_control_is_dodag_parent(cur, ll_address, false)) {
+                    if (etx_entry->etx_samples || !ws_neighbor->unicast_data_rx) {
+                        return 0;
+                    }
+                }
+            }
+
             uint32_t probe_period = WS_PROBE_INIT_BASE_SECONDS << etx_entry->etx_samples;
             uint32_t time_block = 1 << etx_entry->etx_samples;
             if (time_from_start >= probe_period) {
@@ -2471,7 +2510,7 @@ void ws_bootstrap_network_scan_process(protocol_interface_info_entry_t *cur)
 
     // Add EAPOL neighbour
     llc_neighbour_req_t neighbor_info;
-    if (!ws_bootstrap_neighbor_info_request(cur, cur->ws_info->parent_info.addr, &neighbor_info, true)) {
+    if (!ws_bootstrap_neighbor_info_request(cur, cur->ws_info->parent_info.addr, &neighbor_info, true, false)) {
         return;
     }
 
@@ -2664,9 +2703,7 @@ void ws_primary_parent_update(protocol_interface_info_entry_t *interface, mac_ne
         neighbor_info.ws_neighbor = ws_neighbor_class_entry_get(&interface->ws_info->neighbor_storage, neighbor->index);
         ws_bootstrap_primary_parent_set(interface, &neighbor_info, WS_PARENT_HARD_SYNCH);
         uint8_t link_local_address[16];
-        memcpy(link_local_address, ADDR_LINK_LOCAL_PREFIX, 8);
-        memcpy(link_local_address + 8, neighbor->mac64, 8);
-        link_local_address[8] ^= 2;
+        ws_bootsrap_create_ll_address(link_local_address, neighbor->mac64);
         dhcp_client_server_address_update(interface->id, NULL, link_local_address);
 
         ws_secondary_parent_update(interface);

source/6LoWPAN/ws/ws_llc.h

@@ -99,11 +99,12 @@ typedef void ws_asynch_confirm(struct protocol_interface_info_entry *interface,
  * @param mac_64 Neighbor 64-bit address
  * @param neighbor_buffer Buffer where neighbor infor is buffered
  * @param request_new true if is possible to allocate new entry
+ * @param multicast true if packet is multicast
  *
  * @return true when neighbor info is available
  * @return false when no neighbor info
  */
-typedef bool ws_neighbor_info_request(struct protocol_interface_info_entry *interface, const uint8_t *mac_64, llc_neighbour_req_t *neighbor_buffer, bool request_new);
+typedef bool ws_neighbor_info_request(struct protocol_interface_info_entry *interface, const uint8_t *mac_64, llc_neighbour_req_t *neighbor_buffer, bool request_new, bool multicast);
 
 /**
  * @brief ws_llc_create ws LLC module create

source/6LoWPAN/ws/ws_llc_data_service.c

@@ -395,7 +395,7 @@ static void ws_llc_mac_confirm_cb(const mac_api_t *api, const mcps_data_conf_t *
                     success = true;
                 }
 
-                if (message->dst_address_type == MAC_ADDR_MODE_64_BIT && base->ws_neighbor_info_request_cb(interface, message->dst_address, &neighbor_info, false)) {
+                if (message->dst_address_type == MAC_ADDR_MODE_64_BIT && base->ws_neighbor_info_request_cb(interface, message->dst_address, &neighbor_info, false, false)) {
                     etx_transm_attempts_update(interface->id, 1 + data->tx_retries, success, neighbor_info.neighbor->index);
                     //TODO discover RSL from Enchanced ACK Header IE elements
                     ws_utt_ie_t ws_utt;
@@ -493,6 +493,7 @@ static void ws_llc_mac_indication_cb(const mac_api_t *api, const mcps_data_ind_t
             return;
         }
 
+        mpx_user_t *user_cb;
         mac_payload_IE_t mpx_ie;
         mpx_ie.id = MAC_PAYLOAD_MPX_IE_GROUP_ID;
         if (mac_ie_payload_discover(ie_ext->payloadIeList, ie_ext->payloadIeListLength, &mpx_ie) < 1) {
@@ -521,12 +522,24 @@ static void ws_llc_mac_indication_cb(const mac_api_t *api, const mcps_data_ind_t
         }
 
         llc_neighbour_req_t neighbor_info;
+        bool multicast;
+        if (data->DstAddrMode == ADDR_802_15_4_LONG) {
+            multicast = false;
+        } else {
+            multicast = true;
+        }
 
-        if (!base->ws_neighbor_info_request_cb(interface, data->SrcAddr, &neighbor_info, us_ie_inline)) {
-            tr_debug("Drop message no neighbor");
-            return;
+        if (!base->ws_neighbor_info_request_cb(interface, data->SrcAddr, &neighbor_info, us_ie_inline, multicast)) {
+            if (!multicast || ws_utt.message_type == WS_FT_EAPOL) {
+                tr_debug("Drop message no neighbor");
+                return;
+            } else {
+                goto mpx_data_ind;
+            }
         }
 
+        multicast = false;
+
         ws_neighbor_class_neighbor_unicast_time_info_update(neighbor_info.ws_neighbor, &ws_utt, data->timestamp);
         if (us_ie_inline) {
             ws_neighbor_class_neighbor_unicast_schedule_set(neighbor_info.ws_neighbor, &us_ie);
@@ -558,6 +571,7 @@ static void ws_llc_mac_indication_cb(const mac_api_t *api, const mcps_data_ind_t
 
         //Refresh Neighbor ETX if unicast
         if (ws_utt.message_type == WS_FT_DATA && data->DstAddrMode == ADDR_802_15_4_LONG) {
+            neighbor_info.ws_neighbor->unicast_data_rx = true;
             etx_lqi_dbm_update(interface->id, data->mpduLinkQuality, data->signal_dbm, neighbor_info.neighbor->index);
         }
         if (ws_utt.message_type == WS_FT_DATA) {
@@ -570,10 +584,15 @@ static void ws_llc_mac_indication_cb(const mac_api_t *api, const mcps_data_ind_t
             }
         }
 
+
+mpx_data_ind:
         // Discover MPX
-        mpx_user_t *user_cb = ws_llc_mpx_user_discover(&base->mpx_data_base, mpx_frame.multiplex_id);
+        user_cb = ws_llc_mpx_user_discover(&base->mpx_data_base, mpx_frame.multiplex_id);
         if (user_cb && user_cb->data_ind) {
             mcps_data_ind_t data_ind = *data;
+            if (multicast) {
+                data_ind.Key.SecurityLevel = 0; //Mark unknow device
+            }
             data_ind.msdu_ptr = mpx_frame.frame_ptr;
             data_ind.msduLength = mpx_frame.frame_length;
             user_cb->data_ind(&base->mpx_data_base.mpx_api, &data_ind);

source/6LoWPAN/ws/ws_neighbor_class.h

@@ -34,6 +34,7 @@ typedef struct ws_neighbor_class_entry {
     bool synch_done : 1;
     bool accelerated_etx_probe : 1;
     bool negative_aro_send : 1;
+    bool unicast_data_rx : 1;
 } ws_neighbor_class_entry_t;
 
 /**

source/Common_Protocols/icmpv6.c

@@ -1037,10 +1037,7 @@ buffer_t *icmpv6_up(buffer_t *buf)
 
     cur = buf->interface;
 
-    if (buf->options.ll_security_bypass_rx) {
-        tr_debug("ICMP: Drop by EP");
-        goto drop;
-    }
+
 
     if (data_len < 4) {
         //tr_debug("Ic1");
@@ -1051,6 +1048,13 @@ buffer_t *icmpv6_up(buffer_t *buf)
     buf->options.type = *dptr++;
     buf->options.code = *dptr++;
 
+    if (buf->options.ll_security_bypass_rx) {
+        if (!ws_info(buf->interface) || !(buf->options.type == ICMPV6_TYPE_INFO_RPL_CONTROL && buf->options.code == ICMPV6_CODE_RPL_DIS)) {
+            //tr_debug("ICMP: Drop by EP");
+            goto drop;
+        }
+    }
+
     /* Check FCS first */
     if (buffer_ipv6_fcf(buf, IPV6_NH_ICMPV6)) {
         tr_warn("ICMP cksum error!");

source/RPL/rpl_control.c

@@ -189,6 +189,9 @@ void rpl_control_register_address(protocol_interface_info_entry_t *interface, co
 
 void rpl_control_address_register_done(protocol_interface_info_entry_t *interface, const uint8_t ll_addr[16], uint8_t status)
 {
+    if (!interface->rpl_domain) {
+        return;
+    }
     if (!rpl_policy_parent_confirmation_requested()) {
         return;
     }
@@ -201,19 +204,44 @@ void rpl_control_address_register_done(protocol_interface_info_entry_t *interfac
     }
 }
 
-bool rpl_control_is_dodag_parent(protocol_interface_info_entry_t *interface, const uint8_t ll_addr[16])
+bool rpl_control_is_dodag_parent(protocol_interface_info_entry_t *interface, const uint8_t ll_addr[16], bool selected)
 {
+    if (!interface->rpl_domain) {
+        return false;
+    }
     // go through instances and parents and check if they match the address.
     ns_list_foreach(struct rpl_instance, instance, &interface->rpl_domain->instances) {
-        if (rpl_instance_address_is_parent(instance, ll_addr)) {
+        if (rpl_instance_address_is_parent(instance, ll_addr, selected)) {
             return true;
         }
     }
     return false;
 }
 
+uint16_t rpl_control_parent_candidate_list_size(protocol_interface_info_entry_t *interface, bool parent_list)
+{
+    if (!interface->rpl_domain) {
+        return 0;
+    }
+
+    uint16_t parent_list_size = 0;
+
+    // go through instances and parents and check if they match the address.
+    ns_list_foreach(struct rpl_instance, instance, &interface->rpl_domain->instances) {
+        uint16_t current_size = rpl_instance_address_candidate_count(instance, parent_list);
+        if (current_size > parent_list_size) {
+            parent_list_size = current_size;
+        }
+    }
+    return parent_list_size;
+}
+
+
 void rpl_control_neighbor_delete(protocol_interface_info_entry_t *interface, const uint8_t ll_addr[16])
 {
+    if (!interface->rpl_domain) {
+        return;
+    }
     // go through instances and delete address.
     ns_list_foreach(struct rpl_instance, instance, &interface->rpl_domain->instances) {
 

source/RPL/rpl_control.h

@@ -147,7 +147,8 @@ void rpl_control_set_callback(rpl_domain_t *domain, rpl_domain_callback_t callba
 /* Target publishing */
 void rpl_control_publish_host_address(rpl_domain_t *domain, const uint8_t addr[16], uint32_t lifetime);
 void rpl_control_unpublish_address(rpl_domain_t *domain, const uint8_t addr[16]);
-bool rpl_control_is_dodag_parent(struct protocol_interface_info_entry *interface, const uint8_t ll_addr[16]);
+bool rpl_control_is_dodag_parent(struct protocol_interface_info_entry *interface, const uint8_t ll_addr[16], bool selected);
+uint16_t rpl_control_parent_candidate_list_size(struct protocol_interface_info_entry  *interface, bool parent_list);
 void rpl_control_neighbor_delete(struct protocol_interface_info_entry *interface, const uint8_t ll_addr[16]);
 /* Parent link confirmation API extension */
 void rpl_control_request_parent_link_confirmation(bool requested);