wi-sun LLC update

EAPOL data flow request will add EA-IE and BT-IE only for EAP Request Indentify, FWK MSG 1 and GWK MSG 1. This will save a band.

Change-Id: Ib07bf666b6227cd6b9a15dc8dd31679a1b50121b

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_llc_data_service.c

@@ -36,6 +36,8 @@
 #include "6LoWPAN/ws/ws_llc.h"
 #include "6LoWPAN/ws/ws_mpx_header.h"
 #include "6LoWPAN/ws/ws_pae_controller.h"
+#include "Security/PANA/pana_eap_header.h"
+#include "Security/eapol/eapol_helper.h"
 #include "Service_Libs/etx/etx.h"
 #include "fhss_ws_extension.h"
 
@@ -617,6 +619,37 @@ static uint16_t ws_mpx_header_size_get(llc_data_base_t *base, uint16_t user_id)
     return header_size;
 }
 
+static bool ws_eapol_handshake_first_msg(uint8_t *pdu, uint16_t length, protocol_interface_info_entry_t *cur)
+{
+    if (!ws_eapol_relay_state_active(cur)) {
+        return false;
+    }
+
+    eapol_pdu_t eapol_pdu;
+    uint8_t kmp_type = *pdu++;
+    length--;
+    if (!eapol_parse_pdu_header(pdu, length, &eapol_pdu)) {
+        return false;
+    }
+    if (eapol_pdu.packet_type == EAPOL_EAP_TYPE) {
+        if (eapol_pdu.msg.eap.eap_code == EAP_REQ && eapol_pdu.msg.eap.type == EAP_IDENTITY) {
+            return true;
+        }
+    } else {
+
+        uint8_t key_mask = eapol_pdu_key_mask_get(&eapol_pdu);
+        if (kmp_type == 6 && key_mask == KEY_INFO_KEY_ACK) {
+            //FWK first message validation
+            return true;
+        } else if (kmp_type == 7 && key_mask == (KEY_INFO_KEY_ACK | KEY_INFO_KEY_MIC | KEY_INFO_SECURED_KEY_FRAME)) {
+            //GWK first message validation
+            return true;
+        }
+    }
+
+    return false;
+}
+
 static void ws_llc_mpx_data_request(const mpx_api_t *api, const struct mcps_data_req_s *data, uint16_t user_id)
 {
     llc_data_base_t *base = ws_llc_discover_by_mpx(api);
@@ -646,12 +679,8 @@ static void ws_llc_mpx_data_request(const mpx_api_t *api, const struct mcps_data
             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;
-        }
-
+        ie_header_mask.ea_ie = ws_eapol_handshake_first_msg(data->msdu, data->msduLength, base->interface_ptr);
+        ie_header_mask.bt_ie = ie_header_mask.ea_ie;
     }
 
     nested_wp_id.us_ie = true;