Corrected memory errors and some compiler warnings

Corrected some dynamic memory errors detected by valgrind.

Author: Mika Leppänen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -1725,7 +1725,7 @@ static void ws_bootstrap_start_discovery(protocol_interface_info_entry_t *cur)
 }
 
 // Start authentication
-static void ws_bootstrap_start_authentication(protocol_interface_info_entry_t *cur)
+static void ws_bootstrap_start_authentication(void)
 {
     ws_pae_controller_supplicant_authenticate();
 }
@@ -2036,15 +2036,13 @@ static void ws_bootstrap_event_handler(arm_event_s *event)
             //Add Test ecurity key and security level's
 
 
-            //////////////////
             // Advertisements stopped during the EAPOL
             cur->ws_info->trickle_pa_running = false;
             cur->ws_info->trickle_pc_running = false;
             cur->ws_info->trickle_pas_running = false;
             cur->ws_info->trickle_pcs_running = false;
-            //////////////////
 
-            ws_bootstrap_start_authentication(cur);
+            ws_bootstrap_start_authentication();
             break;
 
         case WS_CONFIGURATION_START:

source/6LoWPAN/ws/ws_eapol_relay.c

@@ -45,11 +45,21 @@ static void ws_eapol_relay_mpx_data_confirm(const mpx_api_t* api, const struct m
 static void ws_eapol_relay_mpx_data_indication(const mpx_api_t* api, const struct mcps_data_ind_s *data);
 static void ws_eapol_relay_data_request_primitiv_set(mcps_data_req_t *dataReq, protocol_interface_info_entry_t *cur);
 
+typedef struct {
+    uint8_t handle;
+    void *data_ptr;
+    ns_list_link_t link;
+} eapol_relay_msdu_entry_t;
+
+typedef NS_LIST_HEAD(eapol_relay_msdu_entry_t, link) eapol_relay_msdu_list_t;
+
 typedef struct {
     protocol_interface_info_entry_t *interface_ptr;                 /**< List link entry */
     int8_t relay_socket_id;                                         /**< Socket ID for relay */
     mpx_api_t *mpx_api;                                             /**< mpx api */
     uint16_t mpx_user_id;                                           /**< mpx user identifier */
+    eapol_relay_msdu_list_t msdu_list;                              /**< msdu list */
+    uint8_t msdu_handle;                                            /**< msdu handle */
 } eapol_relay_data_t;
 
 static eapol_relay_data_t *eapol_relay_data;
@@ -61,6 +71,8 @@ void ws_eapol_relay_init(protocol_interface_info_entry_t *cur)
     }
     eapol_relay_data->interface_ptr = cur;
     eapol_relay_data->relay_socket_id = socket_open(IPV6_NH_UDP, 10253, &ws_eapol_relay_socket_cb);
+    ns_list_init(&eapol_relay_data->msdu_list);
+    eapol_relay_data->msdu_handle = 0;
 }
 
 static void ws_eapol_relay_socket_cb(void *cb)
@@ -82,14 +94,20 @@ static void ws_eapol_relay_socket_cb(void *cb)
         return;
     }
 
-    memcpy(data_request.DstAddr, pdu->eui_64, 8);
+    eapol_relay_msdu_entry_t *msdu_entry = ns_dyn_mem_temporary_alloc(sizeof(eapol_relay_msdu_entry_t));
+    if (!msdu_entry) {
+        ns_dyn_mem_free(pdu);
+        return;
+    }
+    msdu_entry->data_ptr = pdu;
+    msdu_entry->handle = eapol_relay_data->msdu_handle++;
+    ns_list_add_to_start(&eapol_relay_data->msdu_list, msdu_entry);
 
-    data_request.msdu = &(pdu->kmp_id);
+    memcpy(data_request.DstAddr, pdu->eui_64, 8);
+    data_request.msdu = &pdu->kmp_id;
     data_request.msduLength = cb_data->d_len - 8;
 
     eapol_relay_data->mpx_api->mpx_data_request(eapol_relay_data->mpx_api, &data_request, eapol_relay_data->mpx_user_id);
-
-    ns_dyn_mem_free(pdu);
 }
 
 static void ws_eapol_relay_data_request_primitiv_set(mcps_data_req_t *dataReq, protocol_interface_info_entry_t *cur)
@@ -116,8 +134,20 @@ int8_t ws_eapol_relay_mpx_register(struct mpx_api_s *mpx_api, uint16_t mpx_user_
 
 static void ws_eapol_relay_mpx_data_confirm(const mpx_api_t* api, const struct mcps_data_conf_s *data)
 {
-     (void) api;
-     (void) data;
+    (void) api;
+
+    if (!eapol_relay_data) {
+        return;
+    }
+
+    ns_list_foreach(eapol_relay_msdu_entry_t, msdu, &eapol_relay_data->msdu_list) {
+        if (msdu->handle == data->msduHandle) {
+            ns_dyn_mem_free(msdu->data_ptr);
+            ns_list_remove(&eapol_relay_data->msdu_list, msdu);
+            ns_dyn_mem_free(msdu);
+            return;
+        }
+    }
 }
 
 static void ws_eapol_relay_mpx_data_indication(const mpx_api_t* api, const struct mcps_data_ind_s *data)

source/6LoWPAN/ws/ws_pae_auth.c

@@ -169,18 +169,15 @@ static kmp_api_t *ws_pae_auth_kmp_incoming_ind(kmp_type_e type, uint8_t *eui_64)
 
 static void ws_pae_auth_kmp_api_create_confirm(kmp_api_t *kmp, kmp_result_e result)
 {
-    // KMP-CREATE.request has failed, authentication error, just stop for now
-    if (result != KMP_RESULT_OK) {
-        supp_entry_t *supp = kmp->app_data_ptr;
-        ws_pae_lib_kmp_list_delete(&supp->kmp_list, kmp);
-    }
+    (void) kmp;
+    (void) result;
+    // If KMP-CREATE.request has failed, authentication error, just stop for now
 }
 
 static void ws_pae_auth_kmp_api_create_indication(kmp_api_t *kmp, kmp_type_e type, uint8_t *eui_64)
 {
     (void) type;
     (void) eui_64;
-
     // For now, accept every KMP-CREATE.indication
     kmp_api_create_response(kmp, KMP_RESULT_OK);
 }

source/6LoWPAN/ws/ws_pae_supp.c

@@ -129,10 +129,11 @@ static kmp_api_t *ws_pae_supp_kmp_incoming_ind(kmp_type_e type, uint8_t *eui_64)
 
 static void ws_pae_supp_kmp_api_create_confirm(kmp_api_t *kmp, kmp_result_e result)
 {
+    (void) kmp;
+
     // KMP-CREATE.request has failed, authentication error
     if (result != KMP_RESULT_OK) {
         supp_data->auth_completed_cb(false);
-        ws_pae_lib_kmp_list_delete(&supp_data->kmp_list, kmp);
     }
 }
 
@@ -155,8 +156,6 @@ static void ws_pae_supp_kmp_api_finished_indication(kmp_api_t *kmp, kmp_result_e
     if (type == IEEE_802_11_4WH && result == KMP_RESULT_OK && supp_data->auth_completed_cb) {
         supp_data->auth_completed_cb(true);
     }
-
-    ws_pae_lib_kmp_list_delete(&supp_data->kmp_list, kmp);
 }
 
 static void ws_pae_supp_kmp_api_finished(kmp_api_t *kmp)