Channel Plan 2 validation and FAN 1.0 reject

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -1936,6 +1936,16 @@ static bool ws_channel_plan_one_compare(ws_channel_plan_one_t *rx_plan, ws_hoppi
     return true;
 }
 
+static bool ws_channel_plan_two_compare(ws_channel_plan_two_t *rx_plan, ws_hopping_schedule_t *hopping_schdule)
+{
+    if (rx_plan->channel_plan_id != hopping_schdule->channel_plan_id) {
+        return false;
+    } else if (rx_plan->regulator_domain != hopping_schdule->regulatory_domain) {
+        return false;
+    }
+    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) {
@@ -1946,6 +1956,15 @@ bool ws_bootstrap_validate_channel_plan(ws_us_ie_t *ws_us, struct protocol_inter
         if (!ws_channel_plan_one_compare(&ws_us->plan.one, &cur->ws_info->hopping_schdule)) {
             return false;
         }
+    } else if (ws_us->channel_plan == 2) {
+        if (!ws_version_1_1(cur)) {
+            return false;
+        }
+        if (!ws_channel_plan_two_compare(&ws_us->plan.two, &cur->ws_info->hopping_schdule)) {
+            return false;
+        }
+    } else {
+        return false;
     }
 
     return true;

source/6LoWPAN/ws/ws_neighbor_class.c

@@ -258,6 +258,8 @@ void ws_neighbor_class_neighbor_unicast_schedule_set(ws_neighbor_class_entry_t *
         } else if (ws_us->channel_plan == 1) {
             ws_neighbor->fhss_data.uc_timing_info.unicast_number_of_channels = ws_us->plan.one.number_of_channel;
 
+        } else if (ws_us->channel_plan == 2) {
+            //TODO add Channel plan 2 channel count function call here
         }
 
         //Handle excluded channel and generate activate channel list