NEW API for Validation RX Unicast schedule channel.

Integrated to Asynch message handler and LLC layer for Data and EAPOL message.

Packet will be dropped if configuration mismatch.

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -1485,7 +1485,20 @@ static bool ws_channel_plan_one_compare(ws_channel_plan_one_t *rx_plan, ws_hoppi
     return true;
 }
 
+bool ws_bootstrap_validate_channel_plan(ws_us_ie_t *ws_us, struct protocol_interface_info_entry *cur)
+{
+    if (ws_us->channel_plan == 0) {
+        if (!ws_channel_plan_zero_compare(&ws_us->plan.zero, &cur->ws_info->hopping_schdule)) {
+            return false;
+        }
+    } else if (ws_us->channel_plan == 1) {
+        if (!ws_channel_plan_one_compare(&ws_us->plan.one, &cur->ws_info->hopping_schdule)) {
+            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)
@@ -1525,14 +1538,8 @@ static void ws_bootstrap_asynch_ind(struct protocol_interface_info_entry *cur, c
         return;
     }
 
-    if (ws_us.channel_plan == 0) {
-        if (!ws_channel_plan_zero_compare(&ws_us.plan.zero, &cur->ws_info->hopping_schdule)) {
-            return;
-        }
-    } else if (ws_us.channel_plan == 1) {
-        if (!ws_channel_plan_one_compare(&ws_us.plan.one, &cur->ws_info->hopping_schdule)) {
-            return;
-        }
+    if (!ws_bootstrap_validate_channel_plan(&ws_us, cur)) {
+        return;
     }
 
     //Handle Message's

source/6LoWPAN/ws/ws_bootstrap.h

@@ -30,6 +30,7 @@ typedef enum {
 #ifdef HAVE_WS
 
 struct llc_neighbour_req;
+struct ws_us_ie;
 
 int ws_bootstrap_init(int8_t interface_id, net_6lowpan_mode_e bootstrap_mode);
 
@@ -78,6 +79,8 @@ bool ws_eapol_relay_state_active(protocol_interface_info_entry_t *cur);
 
 void ws_bootstrap_eapol_parent_synch(struct protocol_interface_info_entry *cur, struct llc_neighbour_req *neighbor_info);
 
+bool ws_bootstrap_validate_channel_plan(struct ws_us_ie *ws_us, struct protocol_interface_info_entry *cur);
+
 #else
 
 #define ws_bootstrap_init(interface_id, bootstrap_mode) (-1)

source/6LoWPAN/ws/ws_llc_data_service.c

@@ -547,6 +547,12 @@ static void ws_llc_mac_indication_cb(const mac_api_t *api, const mcps_data_ind_t
             bs_ie_inline = ws_wp_nested_bs_read(ws_wp_nested.content_ptr, ws_wp_nested.length, &ws_bs_ie);
         }
 
+        //Validate Unicast shedule Channel Plan
+        if (us_ie_inline && !ws_bootstrap_validate_channel_plan(&us_ie, interface)) {
+            //Channel plan configuration mismatch
+            return;
+        }
+
         llc_neighbour_req_t neighbor_info;
         bool multicast;
         bool request_new_entry;

test/nanostack/unittest/stub/ws_bootstrap_stub.c

@@ -125,3 +125,8 @@ void ws_bootstrap_eapol_parent_synch(struct protocol_interface_info_entry *cur,
 {
 
 }
+
+bool ws_bootstrap_validate_channel_plan(ws_us_ie_t *ws_us, struct protocol_interface_info_entry *cur)
+{
+    return true;
+}