Ignore neighbors using unsupported channel function (ARMmbed#2395)

Nodes do not support Vendor specific channel function. Ignore
potential neighbors which do not support node's channel function.

Author: Arto Kinnunen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -156,7 +156,7 @@ static void ws_bootstap_eapol_neigh_entry_allocate(struct protocol_interface_inf
     uint8_t mac_64[8];
     memset(mac_64, 0, sizeof(mac_64));
 
-    mac_neighbor_table_entry_t *mac_entry =  ws_bootstrap_mac_neighbor_add(interface, mac_64);
+    mac_neighbor_table_entry_t *mac_entry = ws_bootstrap_mac_neighbor_add(interface, mac_64);
 
     if (!mac_entry) {
         return;
@@ -1580,6 +1580,26 @@ bool ws_bootstrap_validate_channel_plan(ws_us_ie_t *ws_us, struct protocol_inter
     return true;
 }
 
+bool ws_bootstrap_validate_channel_function(ws_us_ie_t *ws_us, ws_bs_ie_t *ws_bs)
+{
+    if (ws_us) {
+        if (ws_us->channel_function != WS_FIXED_CHANNEL &&
+                ws_us->channel_function != WS_TR51CF &&
+                ws_us->channel_function != WS_DH1CF) {
+            return false;
+        }
+    }
+
+    if (ws_bs) {
+        if (ws_bs->channel_function != WS_FIXED_CHANNEL &&
+                ws_bs->channel_function != WS_TR51CF &&
+                ws_bs->channel_function != WS_DH1CF) {
+            return false;
+        }
+    }
+
+    return true;
+}
 
 static void ws_bootstrap_asynch_ind(struct protocol_interface_info_entry *cur, const struct mcps_data_ind_s *data, const struct mcps_data_ie_list *ie_ext, uint8_t message_type)
 {
@@ -1618,7 +1638,8 @@ static void ws_bootstrap_asynch_ind(struct protocol_interface_info_entry *cur, c
         return;
     }
 
-    if (!ws_bootstrap_validate_channel_plan(&ws_us, cur)) {
+    if (!ws_bootstrap_validate_channel_plan(&ws_us, cur) ||
+            !ws_bootstrap_validate_channel_function(&ws_us, NULL)) {
         return;
     }
 

source/6LoWPAN/ws/ws_bootstrap.h

@@ -31,6 +31,7 @@ typedef enum {
 
 struct llc_neighbour_req;
 struct ws_us_ie;
+struct ws_bs_ie;
 struct ws_neighbor_class_entry;
 
 int ws_bootstrap_init(int8_t interface_id, net_6lowpan_mode_e bootstrap_mode);
@@ -82,6 +83,8 @@ void ws_bootstrap_eapol_parent_synch(struct protocol_interface_info_entry *cur,
 
 bool ws_bootstrap_validate_channel_plan(struct ws_us_ie *ws_us, struct protocol_interface_info_entry *cur);
 
+bool ws_bootstrap_validate_channel_function(struct ws_us_ie *ws_us, struct ws_bs_ie *ws_bs);
+
 void ws_bootstrap_eapol_rx_temporary_set(struct protocol_interface_info_entry *interface, const uint8_t *src64);
 
 struct ws_neighbor_class_entry *ws_bootstrap_eapol_tx_temporary_set(struct protocol_interface_info_entry *interface, const uint8_t *src64);

source/6LoWPAN/ws/ws_llc_data_service.c

@@ -613,8 +613,14 @@ static void ws_llc_data_indication_cb(const mac_api_t *api, const mcps_data_ind_
     protocol_interface_info_entry_t *interface = base->interface_ptr;
 
     //Validate Unicast shedule Channel Plan
-    if (us_ie_inline && !ws_bootstrap_validate_channel_plan(&us_ie, interface)) {
-        //Channel plan configuration mismatch
+    if (us_ie_inline &&
+            (!ws_bootstrap_validate_channel_plan(&us_ie, interface) ||
+             !ws_bootstrap_validate_channel_function(&us_ie, NULL))) {
+        //Channel plan or channel function configuration mismatch
+        return;
+    }
+
+    if (bs_ie_inline && !ws_bootstrap_validate_channel_function(NULL, &ws_bs_ie)) {
         return;
     }
 
@@ -730,8 +736,14 @@ static void ws_llc_eapol_indication_cb(const mac_api_t *api, const mcps_data_ind
     protocol_interface_info_entry_t *interface = base->interface_ptr;
 
     //Validate Unicast shedule Channel Plan
-    if (us_ie_inline && !ws_bootstrap_validate_channel_plan(&us_ie, interface)) {
-        //Channel plan configuration mismatch
+    if (us_ie_inline &&
+            (!ws_bootstrap_validate_channel_plan(&us_ie, interface) ||
+             !ws_bootstrap_validate_channel_function(&us_ie, NULL))) {
+        //Channel plan or channel function configuration mismatch
+        return;
+    }
+
+    if (bs_ie_inline && !ws_bootstrap_validate_channel_function(NULL, &ws_bs_ie)) {
         return;
     }
 

test/nanostack/unittest/stub/ws_bootstrap_stub.c

@@ -131,6 +131,11 @@ bool ws_bootstrap_validate_channel_plan(ws_us_ie_t *ws_us, struct protocol_inter
     return true;
 }
 
+bool ws_bootstrap_validate_channel_function(ws_us_ie_t *ws_us, ws_bs_ie_t *ws_bs)
+{
+    return true;
+}
+
 struct ws_neighbor_class_entry *ws_bootstrap_eapol_tx_temporary_set(struct protocol_interface_info_entry *interface, const uint8_t *src64)
 {
     return NULL;