Corrected Wi-SUN security component initializations

Components are now initialized only once.

Author: Mika Leppänen

source/6LoWPAN/ws/ws_eapol_auth_relay.c

@@ -46,9 +46,15 @@ static int8_t ws_eapol_auth_relay_eapol_pdu_receive(const uint8_t *eui_64, const
 static int8_t ws_eapol_auth_relay_socket_pdu_receive(const ns_address_t *src_addr, void *data, uint16_t len);
 static int8_t ws_eapol_auth_relay_send_to_kmp(const uint8_t *eui_64, const uint8_t *ip_addr, uint16_t port, const void *data, uint16_t data_len);
 
+static bool relay_initiated = false;
 
 int8_t ws_eapol_auth_relay_init(protocol_interface_info_entry_t *interface_ptr)
 {
+    if (relay_initiated) {
+        return 0;
+    }
+    relay_initiated = true;
+
     ws_eapol_relay_init(interface_ptr);
     ws_eapol_relay_cb_register(ws_eapol_auth_relay_socket_pdu_receive);
 

source/6LoWPAN/ws/ws_eapol_pdu.c

@@ -72,12 +72,15 @@ static eapol_pdu_data_t *eapol_pdu_data;
 
 int8_t ws_eapol_pdu_init(protocol_interface_info_entry_t *interface_ptr)
 {
+    if (eapol_pdu_data) {
+        return 0;
+    }
+
+    eapol_pdu_data = ns_dyn_mem_alloc(sizeof(eapol_pdu_data_t));
     if (!eapol_pdu_data) {
-       eapol_pdu_data = ns_dyn_mem_alloc(sizeof(eapol_pdu_data_t));
-       if (!eapol_pdu_data) {
-           return -1;
-       }
+        return -1;
     }
+
     eapol_pdu_data->interface_ptr = interface_ptr;
     ns_list_init(&eapol_pdu_data->recv_cb_list);
     ns_list_init(&eapol_pdu_data->msdu_list);

source/6LoWPAN/ws/ws_eapol_relay.c

@@ -52,13 +52,16 @@ static eapol_relay_data_t *eapol_relay_data;
 
 int8_t ws_eapol_relay_init(protocol_interface_info_entry_t *interface_ptr)
 {
+    if (eapol_relay_data) {
+        return 0;
+    }
+
+    eapol_relay_data = ns_dyn_mem_alloc(sizeof(eapol_relay_data_t));
     if (!eapol_relay_data) {
-       eapol_relay_data = ns_dyn_mem_alloc(sizeof(eapol_relay_data_t));
-       if (!eapol_relay_data) {
-           return -1;
-       }
-       eapol_relay_data->relay_socket_id = -1;
+        return -1;
     }
+
+    eapol_relay_data->relay_socket_id = -1;
     eapol_relay_data->interface_ptr = interface_ptr;
 
     if (eapol_relay_data->relay_socket_id  < 0) {
@@ -67,7 +70,6 @@ int8_t ws_eapol_relay_init(protocol_interface_info_entry_t *interface_ptr)
             return -1;
         }
     }
-
     return 0;
 }
 

source/6LoWPAN/ws/ws_eapol_supp_relay.c

@@ -43,10 +43,16 @@ static int8_t ws_eapol_supp_relay_eapol_pdu_address_check(const uint8_t *eui_64)
 static int8_t ws_eapol_supp_relay_eapol_pdu_receive(const uint8_t *eui_64, const void *pdu, uint16_t size);
 static int8_t ws_eapol_supp_relay_socket_pdu_receive(const ns_address_t *src_addr, void *data, uint16_t len);
 
+static bool relay_initiated = false;
 static uint8_t supp_br_addr[16];
 
 int8_t ws_eapol_supp_relay_init(protocol_interface_info_entry_t *interface_ptr)
 {
+    if (relay_initiated) {
+        return 0;
+    }
+    relay_initiated = true;
+
     if (ws_eapol_relay_init(interface_ptr) < 0) {
         return -1;
     }

source/6LoWPAN/ws/ws_pae_auth.c

@@ -76,12 +76,15 @@ static void ws_pae_auth_kmp_api_finished(kmp_api_t *kmp);
 
 int8_t ws_pae_auth_init(protocol_interface_info_entry_t *interface_ptr)
 {
+    if (auth_data) {
+        return 0;
+    }
+
+    auth_data = ns_dyn_mem_alloc(sizeof(pae_auth_data_t));
     if (!auth_data) {
-        auth_data = ns_dyn_mem_alloc(sizeof(pae_auth_data_t));
-        if (!auth_data) {
-            return -1;
-        }
+        return -1;
     }
+
     auth_data->interface_ptr = interface_ptr;
     ws_pae_lib_supp_list_init(&auth_data->active_supp_list);
     ws_pae_lib_supp_list_init(&auth_data->inactive_supp_list);

source/6LoWPAN/ws/ws_pae_controller.c

@@ -92,14 +92,14 @@ void ws_pae_controller_set_target(uint8_t *dest_eui_64)
 
 void ws_pae_controller_init(protocol_interface_info_entry_t *interface_ptr)
 {
-    if (!controller_data) {
-        controller_data = ns_dyn_mem_alloc(sizeof(pae_controller_data_t));
+    if (controller_data) {
+        return;
     }
 
+    controller_data = ns_dyn_mem_alloc(sizeof(pae_controller_data_t));
     controller_data->auth_completed_cb = 0;
     controller_data->interface_ptr = interface_ptr;
 }
 
-
 #endif /* HAVE_WS */