Merge pull request #1959 from ARMmbed/ws_eapol_ie_update

Ws eapol ie update

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -1750,6 +1750,15 @@ void ws_dhcp_client_address_delete(protocol_interface_info_entry_t *cur, uint8_t
     dhcp_client_global_address_delete(cur->id, NULL, prefix);
 }
 
+bool ws_eapol_relay_state_active(protocol_interface_info_entry_t *cur)
+{
+    if (cur->bootsrap_mode == ARM_NWK_BOOTSRAP_MODE_6LoWPAN_BORDER_ROUTER || cur->nwk_bootstrap_state == ER_BOOTSRAP_DONE) {
+        return true;
+    }
+
+    return false;
+}
+
 static void ws_rpl_prefix_callback(prefix_entry_t *prefix, void *handle, uint8_t *parent_link_local)
 {
     protocol_interface_info_entry_t *cur = (protocol_interface_info_entry_t *) handle;
@@ -2156,6 +2165,9 @@ static void ws_bootstrap_event_handler(arm_event_s *event)
                 uint8_t ll_addr[16];
                 addr_interface_get_ll_address(cur, ll_addr, 1);
 
+                //SET EAPOL authenticator EUI64
+                ws_pae_controller_border_router_addr_write(cur, cur->mac);
+
                 // Set EAPOL relay to port 10255 and authenticator relay to 10253 (and to own ll address)
                 ws_eapol_relay_start(cur, BR_EAPOL_RELAY_SOCKET_PORT, ll_addr, EAPOL_RELAY_SOCKET_PORT);
 

source/6LoWPAN/ws/ws_bootstrap.h

@@ -70,6 +70,8 @@ void ws_dhcp_client_address_request(protocol_interface_info_entry_t *cur, uint8_
 
 void ws_dhcp_client_address_delete(protocol_interface_info_entry_t *cur, uint8_t *prefix);
 
+bool ws_eapol_relay_state_active(protocol_interface_info_entry_t *cur);
+
 #else
 
 #define ws_bootstrap_init(interface_id, bootstrap_mode) (-1)

source/6LoWPAN/ws/ws_common_defines.h

@@ -27,6 +27,7 @@
 #define WH_IE_RSL_TYPE              4   /**< Received Signal Level information */
 #define WH_IE_MHDS_TYPE             5   /**< MHDS information for mesh routing */
 #define WH_IE_VH_TYPE               6   /**< Vendor header information */
+#define WH_IE_EA_TYPE               9   /**< Eapol Auhtenticator EUI-64 header information */
 
 #define WS_WP_NESTED_IE             4 /**< WS nested Payload IE element'selement could include mltiple sub payload IE */
 

source/6LoWPAN/ws/ws_ie_lib.c

@@ -118,6 +118,14 @@ uint8_t *ws_wh_rsl_write(uint8_t *ptr, int8_t rssi)
     return ptr;
 }
 
+uint8_t *ws_wh_ea_write(uint8_t *ptr, uint8_t *eui64)
+{
+    ptr = ws_wh_header_base_write(ptr, 8, WH_IE_EA_TYPE);
+    memcpy(ptr, eui64, 8);
+    ptr += 8;
+    return ptr;
+}
+
 uint8_t *ws_wh_vh_write(uint8_t *ptr, uint8_t *vendor_header, uint8_t vendor_header_length)
 {
     ptr = ws_wh_header_base_write(ptr, vendor_header_length, WH_IE_VH_TYPE);
@@ -300,6 +308,18 @@ bool ws_wh_rsl_read(uint8_t *data, uint16_t length, int8_t *rsl)
     return true;
 }
 
+bool ws_wh_ea_read(uint8_t *data, uint16_t length, uint8_t *eui64)
+{
+    mac_header_IE_t rsl_ie_data;
+    rsl_ie_data.id = MAC_HEADER_ASSIGNED_EXTERNAL_ORG_IE_ID;
+    if (8 != mac_ie_header_sub_id_discover(data, length, &rsl_ie_data, WH_IE_EA_TYPE)) {
+        return false;
+    }
+    memcpy(eui64, rsl_ie_data.content_ptr, 8);
+
+    return true;
+}
+
 static uint8_t *ws_channel_plan_zero_read(uint8_t *ptr, ws_channel_plan_zero_t *plan)
 {
     plan->regulator_domain = *ptr++;

source/6LoWPAN/ws/ws_ie_lib.h

@@ -38,10 +38,12 @@ uint8_t *ws_wh_bt_write(uint8_t *ptr);
 uint8_t *ws_wh_fc_write(uint8_t *ptr, uint8_t flow_ctrl);
 uint8_t *ws_wh_rsl_write(uint8_t *ptr, int8_t rssi);
 uint8_t *ws_wh_vh_write(uint8_t *ptr, uint8_t *vendor_header, uint8_t vendor_header_length);
+uint8_t *ws_wh_ea_write(uint8_t *ptr, uint8_t *eui64);
 
 bool ws_wh_utt_read(uint8_t *data, uint16_t length, struct ws_utt_ie *utt_ie);
 bool ws_wh_bt_read(uint8_t *data, uint16_t length, struct ws_bt_ie *bt_ie);
 bool ws_wh_rsl_read(uint8_t *data, uint16_t length, int8_t *rsl);
+bool ws_wh_ea_read(uint8_t *data, uint16_t length, uint8_t *eui64);
 
 /* WS_WP_NESTED PAYLOD IE */
 uint8_t *ws_wp_base_write(uint8_t *ptr, uint16_t length);

source/6LoWPAN/ws/ws_llc.h

@@ -41,6 +41,7 @@ typedef struct wh_ie_sub_list_s {
     bool fc_ie: 1;   /**< Flow Control for Extended Direct Frame Exchange */
     bool rsl_ie: 1;  /**< Received Signal Level information */
     bool vh_ie: 1;   /**< Vendor header information */
+    bool ea_ie: 1;   /**< EAPOL autheticator EUI-64 header information */
 } wh_ie_sub_list_t;
 
 /**

source/6LoWPAN/ws/ws_llc_data_service.c

@@ -31,9 +31,11 @@
 #include "6LoWPAN/MAC/mac_ie_lib.h"
 #include "6LoWPAN/ws/ws_common_defines.h"
 #include "6LoWPAN/ws/ws_common.h"
+#include "6LoWPAN/ws/ws_bootstrap.h"
 #include "6LoWPAN/ws/ws_ie_lib.h"
 #include "6LoWPAN/ws/ws_llc.h"
 #include "6LoWPAN/ws/ws_mpx_header.h"
+#include "6LoWPAN/ws/ws_pae_controller.h"
 #include "Service_Libs/etx/etx.h"
 #include "fhss_ws_extension.h"
 
@@ -282,6 +284,10 @@ static uint16_t ws_wh_headers_length(wh_ie_sub_list_t requested_list, llc_ie_par
         length += WH_IE_ELEMENT_HEADER_LENGTH + params->vendor_header_length;
     }
 
+    if (requested_list.ea_ie) {
+        length += WH_IE_ELEMENT_HEADER_LENGTH + 8;
+    }
+
     return length;
 }
 
@@ -521,6 +527,15 @@ static void ws_llc_mac_indication_cb(const mac_api_t *api, const mcps_data_ind_t
         if (us_ie_inline) {
             ws_neighbor_class_neighbor_unicast_schedule_set(neighbor_info.ws_neighbor, &us_ie);
         }
+
+        if (ws_utt.message_type == WS_FT_EAPOL) {
+            uint8_t auth_eui64[8];
+            //Discover and write Auhtenticator EUI-64
+            if (ws_wh_ea_read(ie_ext->headerIeList, ie_ext->headerIeListLength, auth_eui64)) {
+                ws_pae_controller_border_router_addr_write(base->interface_ptr, auth_eui64);
+            }
+        }
+
         //Update BT if it is part of message
         ws_bt_ie_t ws_bt;
         if (ws_wh_bt_read(ie_ext->headerIeList, ie_ext->headerIeListLength, &ws_bt)) {
@@ -620,13 +635,23 @@ static void ws_llc_mpx_data_request(const mpx_api_t *api, const struct mcps_data
     wp_nested_ie_sub_list_t nested_wp_id;
     memset(&nested_wp_id, 0, sizeof(wp_nested_ie_sub_list_t));
     ie_header_mask.utt_ie = true;
-    ie_header_mask.bt_ie = true;
-    if (base->ie_params.vendor_header_length && user_id == MPX_LOWPAN_ENC_USER_ID) {
-        ie_header_mask.vh_ie = true;
-    }
 
-    if (base->ie_params.vendor_payload_length && user_id == MPX_LOWPAN_ENC_USER_ID) {
-        nested_wp_id.vp_ie = true;
+    if (user_id == MPX_LOWPAN_ENC_USER_ID) {
+        ie_header_mask.bt_ie = true;
+        if (base->ie_params.vendor_header_length) {
+            ie_header_mask.vh_ie = true;
+        }
+
+        if (base->ie_params.vendor_payload_length) {
+            nested_wp_id.vp_ie = true;
+        }
+    } else if (user_id == MPX_KEY_MANAGEMENT_ENC_USER_ID) {
+
+        if (*data->msdu == 1) { //Only when KMP_ID is 1
+            ie_header_mask.ea_ie = ws_eapol_relay_state_active(base->interface_ptr);
+            ie_header_mask.bt_ie = ie_header_mask.ea_ie;
+        }
+
     }
 
     nested_wp_id.us_ie = true;
@@ -681,12 +706,24 @@ static void ws_llc_mpx_data_request(const mpx_api_t *api, const struct mcps_data
     //Write UTT
 
     ptr = ws_wh_utt_write(ptr, message->messsage_type);
-    ptr = ws_wh_bt_write(ptr);
+    if (ie_header_mask.bt_ie) {
+        ptr = ws_wh_bt_write(ptr);
+    }
 
-    if (user_id == MPX_LOWPAN_ENC_USER_ID && ie_header_mask.vh_ie) {
-        ptr = ws_wh_vh_write(ptr, base->ie_params.vendor_header_data, base->ie_params.vendor_header_length);
+    if (user_id == MPX_LOWPAN_ENC_USER_ID) {
+        if (ie_header_mask.vh_ie) {
+            ptr = ws_wh_vh_write(ptr, base->ie_params.vendor_header_data, base->ie_params.vendor_header_length);
+        }
+    } else if (user_id == MPX_KEY_MANAGEMENT_ENC_USER_ID) {
+        if (ie_header_mask.ea_ie) {
+            uint8_t eapol_auth_eui64[8];
+            ws_pae_controller_border_router_addr_read(base->interface_ptr, eapol_auth_eui64);
+            ptr = ws_wh_ea_write(ptr, eapol_auth_eui64);
+        }
     }
 
+
+
     message->ie_vector_list[0].iovLen = ie_header_length;
     message->ie_ext.headerIeVectorList = &message->ie_vector_list[0];
     message->ie_ext.headerIovLength = 1;

source/6LoWPAN/ws/ws_pae_controller.h

@@ -114,7 +114,7 @@ int8_t ws_pae_controller_certificate_chain_set(const arm_certificate_chain_entry
 int8_t ws_pae_controller_border_router_addr_write(protocol_interface_info_entry_t *interface_ptr, uint8_t *eui_64);
 
 /**
- * ws_pae_controller_bored_router_addr_read read border router address
+ * ws_pae_controller_border_router_addr_read read border router address
  *
  * \param interface_ptr interface
  * \param eui_64 pointer to EUI-64
@@ -123,7 +123,7 @@ int8_t ws_pae_controller_border_router_addr_write(protocol_interface_info_entry_
  * \return >= 0 success
  *
  */
-int8_t ws_pae_controller_bored_router_addr_read(protocol_interface_info_entry_t *interface_ptr, uint8_t *eui_64);
+int8_t ws_pae_controller_border_router_addr_read(protocol_interface_info_entry_t *interface_ptr, uint8_t *eui_64);
 
 /**
  * ws_pae_controller_key_insert new GTK key available callback

test/nanostack/unittest/6LoWPAN/ws_llc_data_service/Makefile

@@ -28,8 +28,10 @@ TEST_SRC_FILES = \
         ../../stub/adaptation_interface_stub.c \
         ../../stub/mac_ie_lib_stub.c \
         ../../stub/ws_ie_lib_stub.c \
+        ../../stub/ws_bootstrap_stub.c \
         ../../stub/ws_mpx_header_stub.c \
         ../../stub/ws_neighbour_class_stub.c \
+        ../../stub/ws_pae_controller_stub.c \
         ../../stub/mac_neighbor_table_stub.c \
         ../../stub/iphc_decompress_stub.c \
         ../../stub/fhss_config_stub.c \

test/nanostack/unittest/stub/ws_bootstrap_stub.c

@@ -66,3 +66,8 @@ void ws_secondary_parent_update(protocol_interface_info_entry_t *interface)
 {
 
 }
+
+bool ws_eapol_relay_state_active(protocol_interface_info_entry_t *cur)
+{
+    return false;
+}

test/nanostack/unittest/stub/ws_ie_lib_stub.c

@@ -164,6 +164,16 @@ bool ws_wh_utt_read(uint8_t *data, uint16_t length, struct ws_utt_ie *utt_ie)
     return ws_ie_lib_stub.utt_bool_value;
 }
 
+bool ws_wh_ea_read(uint8_t *data, uint16_t length, uint8_t *eui64)
+{
+    return ws_ie_lib_stub.utt_bool_value;
+}
+
+uint8_t *ws_wh_ea_write(uint8_t *ptr, uint8_t *eui64)
+{
+    return ptr + 11;
+}
+
 bool ws_wh_bt_read(uint8_t *data, uint16_t length, struct ws_bt_ie *bt_ie)
 {
     *bt_ie = ws_ie_lib_stub.bt_ie;

test/nanostack/unittest/stub/ws_pae_controller_stub.c

@@ -43,3 +43,13 @@ void ws_pae_controller_timer(uint16_t ticks)
 {
 
 }
+
+int8_t ws_pae_controller_border_router_addr_write(protocol_interface_info_entry_t *interface_ptr, uint8_t *eui_64)
+{
+    return 0;
+}
+
+int8_t ws_pae_controller_border_router_addr_read(protocol_interface_info_entry_t *interface_ptr, uint8_t *eui_64)
+{
+    return 0;
+}