Unicast Shedule update

Store neighbor unicast channel count which enable that EAPOL tarffic works.

Change-Id: I0e0f163f822718c66393f683c7905efe2c0ab381

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_neighbor_class.c

@@ -24,6 +24,7 @@
 #include "fhss_config.h"
 #include "6LoWPAN/ws/ws_config.h"
 #include "6LoWPAN/ws/ws_neighbor_class.h"
+#include "ws_management_api.h"
 
 #ifdef HAVE_WS
 
@@ -92,11 +93,75 @@ void ws_neighbor_class_neighbor_unicast_time_info_update(ws_neighbor_class_entry
     ws_neighbor->fhss_data.uc_timing_info.ufsi = ws_utt->ufsi;
 }
 
+static uint16_t ws_common_channel_number_calc(uint8_t regulatory_domain, uint8_t operating_class)
+{
+    if (regulatory_domain == REG_DOMAIN_KR) {
+        if (operating_class == 1) {
+            return 32;
+        } else if (operating_class == 2) {
+            return 16;
+        } else {
+            return 0;
+        }
+    } else if (regulatory_domain == REG_DOMAIN_EU) {
+        if (operating_class == 1) {
+            return 69;
+        } else if (operating_class == 2) {
+            return 35;
+        } else if (operating_class == 3) {
+            return 59;
+        } else if (operating_class == 4) {
+            return 30;
+        } else {
+            return 0;
+        }
+    } else if (regulatory_domain == REG_DOMAIN_NA) {
+        if (operating_class == 1) {
+            return 129;
+        } else if (operating_class == 2) {
+            return 64;
+        } else if (operating_class == 3) {
+            return 42;
+        } else {
+            return 0;
+        }
+    } else if (regulatory_domain == REG_DOMAIN_JP) {
+        if (operating_class == 1) {
+            return 38;
+        } else if (operating_class == 2) {
+            return 18;
+        } else if (operating_class == 3) {
+            return 12;
+        } else {
+            return 0;
+        }
+    } else if (regulatory_domain == REG_DOMAIN_WW) {
+        if (operating_class == 1) {
+            return 416;
+        } else if (operating_class == 2) {
+            return 207;
+        } else {
+            return 0;
+        }
+    } else {
+        return 0;
+    }
+}
+
 void ws_neighbor_class_neighbor_unicast_schedule_set(ws_neighbor_class_entry_t *ws_neighbor, ws_us_ie_t *ws_us)
 {
     ws_neighbor->fhss_data.uc_timing_info.unicast_channel_function = ws_us->channel_function;
     if (ws_us->channel_function == WS_FIXED_CHANNEL) {
         ws_neighbor->fhss_data.uc_timing_info.fixed_channel = ws_us->function.zero.fixed_channel;
+        ws_neighbor->fhss_data.uc_timing_info.unicast_number_of_channels = 1;
+    } else {
+        if (ws_us->channel_plan == 0) {
+            ws_neighbor->fhss_data.uc_timing_info.unicast_number_of_channels = ws_common_channel_number_calc(ws_us->plan.zero.regulator_domain, ws_us->plan.zero.operation_class);
+        } 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 {
+            ws_neighbor->fhss_data.uc_timing_info.unicast_number_of_channels = 0;
+        }
     }
     ws_neighbor->fhss_data.uc_timing_info.unicast_dwell_interval = ws_us->dwell_interval;
 }

source/Service_Libs/fhss/fhss_ws.c

@@ -449,7 +449,9 @@ static int fhss_ws_tx_handle_callback(const fhss_api_t *api, bool is_broadcast_a
             return -2;
         }
         // TODO: WS bootstrap has to store neighbors number of channels
-        neighbor_timing_info->uc_timing_info.unicast_number_of_channels = fhss_structure->number_of_channels;
+        if (neighbor_timing_info->uc_timing_info.unicast_number_of_channels == 0) {
+            neighbor_timing_info->uc_timing_info.unicast_number_of_channels = fhss_structure->number_of_channels;
+        }
         uint16_t destination_slot = fhss_ws_calculate_destination_slot(neighbor_timing_info, tx_time);
         int32_t tx_channel = neighbor_timing_info->uc_timing_info.fixed_channel;
         if (neighbor_timing_info->uc_timing_info.unicast_channel_function == WS_TR51CF) {