KMP address update

KMP address is not anymore dynamic size.

KMP address is not static stuctrure at kmp entry.

Change-Id: I470174512af61edae637109d54563252caabf75d

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_pae_auth.c

@@ -332,15 +332,15 @@ int8_t ws_pae_auth_node_keys_remove(protocol_interface_info_entry_t *interface_p
         sec_prot_keys_pmk_delete(&supp->sec_keys);
         sec_prot_keys_ptk_delete(&supp->sec_keys);
         supp->access_revoked = true;
-        tr_info("Access revoked; keys removed, eui-64: %s", trace_array(kmp_address_eui_64_get(supp->addr), 8));
+        tr_info("Access revoked; keys removed, eui-64: %s", trace_array(supp->addr.eui_64, 8));
         return 0;
     }
 
     // Checks if supplicant is inactive
     supp = ws_pae_lib_supp_list_entry_eui_64_get(&pae_auth->inactive_supp_list, eui_64);
     if (supp) {
         // Deletes supplicant
-        tr_info("Access revoked; deleted, eui-64: %s", trace_array(kmp_address_eui_64_get(supp->addr), 8));
+        tr_info("Access revoked; deleted, eui-64: %s", trace_array(supp->addr.eui_64, 8));
         ws_pae_lib_supp_list_remove(&pae_auth->inactive_supp_list, supp);
         return 0;
     }
@@ -720,8 +720,8 @@ static void ws_pae_auth_kmp_service_addr_get(kmp_service_t *service, kmp_api_t *
 
     // Get supplicant address
     supp_entry_t *entry = kmp_api_data_get(kmp);
-    if (entry && entry->addr) {
-        kmp_address_copy(remote_addr, entry->addr);
+    if (entry) {
+        kmp_address_copy(remote_addr, &entry->addr);
     }
 }
 
@@ -767,7 +767,7 @@ static kmp_api_t *ws_pae_auth_kmp_incoming_ind(kmp_service_t *service, kmp_type_
         sec_prot_keys_ptk_eui_64_write(&supp_entry->sec_keys, kmp_address_eui_64_get(addr));
     } else {
         // Updates relay address
-        kmp_address_copy(supp_entry->addr, addr);
+        kmp_address_copy(&supp_entry->addr, addr);
     }
 
     // Increases waiting time for supplicant authentication
@@ -788,7 +788,7 @@ static kmp_api_t *ws_pae_auth_kmp_incoming_ind(kmp_service_t *service, kmp_type_
 
     kmp_api_data_set(kmp, supp_entry);
     // Sets address to KMP
-    kmp_api_addr_set(kmp, supp_entry->addr);
+    kmp_api_addr_set(kmp, &supp_entry->addr);
 
     // Sets security keys to KMP
     kmp_api_sec_keys_set(kmp, &supp_entry->sec_keys);
@@ -864,7 +864,7 @@ static void ws_pae_auth_next_kmp_trigger(pae_auth_t *pae_auth, supp_entry_t *sup
         return;
     } else {
         if (ws_pae_lib_kmp_list_type_get(&supp_entry->kmp_list, next_type) != NULL) {
-            tr_info("KMP already ongoing; ignored, eui-64: %s", trace_array(kmp_address_eui_64_get(supp_entry->addr), 8));
+            tr_info("KMP already ongoing; ignored, eui-64: %s", trace_array(supp_entry->addr.eui_64, 8));
             return;
         }
     }
@@ -882,7 +882,7 @@ static void ws_pae_auth_next_kmp_trigger(pae_auth_t *pae_auth, supp_entry_t *sup
         uint16_t ongoing_eap_tls_cnt = ws_pae_lib_supp_list_kmp_count(&pae_auth->active_supp_list, IEEE_802_1X_MKA);
         if (ongoing_eap_tls_cnt >= MAX_SIMULTANEOUS_EAP_TLS_NEGOTIATIONS) {
             supp_entry->retry_ticks = EAP_TLS_NEGOTIATION_TRIGGER_TIMEOUT;
-            tr_info("EAP-TLS max ongoing reached, count %i, delayed: eui-64: %s", ongoing_eap_tls_cnt, trace_array(kmp_address_eui_64_get(supp_entry->addr), 8));
+            tr_info("EAP-TLS max ongoing reached, count %i, delayed: eui-64: %s", ongoing_eap_tls_cnt, trace_array(supp_entry->addr.eui_64, 8));
             return;
         }
     }
@@ -907,7 +907,7 @@ static void ws_pae_auth_next_kmp_trigger(pae_auth_t *pae_auth, supp_entry_t *sup
         }
     }
 
-    kmp_api_create_request(new_kmp, next_type, supp_entry->addr, &supp_entry->sec_keys);
+    kmp_api_create_request(new_kmp, next_type, &supp_entry->addr, &supp_entry->sec_keys);
 }
 
 static kmp_type_e ws_pae_auth_next_protocol_get(supp_entry_t *supp_entry)
@@ -920,11 +920,11 @@ static kmp_type_e ws_pae_auth_next_protocol_get(supp_entry_t *supp_entry)
         sec_keys->ptk_mismatch = true;
         // start EAP-TLS towards supplicant
         next_type = IEEE_802_1X_MKA;
-        tr_info("PAE start EAP-TLS, eui-64: %s", trace_array(kmp_address_eui_64_get(supp_entry->addr), 8));
+        tr_info("PAE start EAP-TLS, eui-64: %s", trace_array(supp_entry->addr.eui_64, 8));
     } else if (sec_keys->ptk_mismatch) {
         // start 4WH towards supplicant
         next_type = IEEE_802_11_4WH;
-        tr_info("PAE start 4WH, eui-64: %s", trace_array(kmp_address_eui_64_get(supp_entry->addr), 8));
+        tr_info("PAE start 4WH, eui-64: %s", trace_array(supp_entry->addr.eui_64, 8));
     }
 
     int8_t gtk_index = -1;
@@ -942,14 +942,14 @@ static kmp_type_e ws_pae_auth_next_protocol_get(supp_entry_t *supp_entry)
         if (next_type == KMP_TYPE_NONE && gtk_index >= 0) {
             // Update just GTK
             next_type = IEEE_802_11_GKH;
-            tr_info("PAE start GKH, eui-64: %s", trace_array(kmp_address_eui_64_get(supp_entry->addr), 8));
+            tr_info("PAE start GKH, eui-64: %s", trace_array(supp_entry->addr.eui_64, 8));
         }
 
-        tr_info("PAE update GTK index: %i, eui-64: %s", gtk_index, trace_array(kmp_address_eui_64_get(supp_entry->addr), 8));
+        tr_info("PAE update GTK index: %i, eui-64: %s", gtk_index, trace_array(supp_entry->addr.eui_64, 8));
     }
 
     if (next_type == KMP_TYPE_NONE) {
-        tr_info("PAE authenticated, eui-64: %s", trace_array(kmp_address_eui_64_get(supp_entry->addr), 8));
+        tr_info("PAE authenticated, eui-64: %s", trace_array(supp_entry->addr.eui_64, 8));
     }
 
     return next_type;
@@ -1009,7 +1009,7 @@ static void ws_pae_auth_kmp_api_finished(kmp_api_t *kmp)
     ws_pae_lib_kmp_list_delete(&supp_entry->kmp_list, kmp);
 
     if (retry_supp) {
-        tr_info("PAE next KMP trigger, eui-64: %s", trace_array(kmp_address_eui_64_get(retry_supp->addr), 8));
+        tr_info("PAE next KMP trigger, eui-64: %s", trace_array(retry_supp->addr.eui_64, 8));
         ws_pae_auth_next_kmp_trigger(pae_auth, retry_supp);
     }
 

source/6LoWPAN/ws/ws_pae_lib.c

@@ -156,9 +156,9 @@ supp_entry_t *ws_pae_lib_supp_list_add(supp_list_t *supp_list, const kmp_addr_t
     }
 
     ws_pae_lib_supp_init(entry);
-
-    entry->addr = kmp_address_create(KMP_ADDR_EUI_64_AND_IP, 0);
-    kmp_address_copy(entry->addr, addr);
+    memset(&entry->addr, 0, sizeof(kmp_addr_t));
+    entry->addr.type = KMP_ADDR_EUI_64_AND_IP;
+    kmp_address_copy(&entry->addr, addr);
 
     ns_list_add_to_end(supp_list, entry);
 
@@ -178,7 +178,7 @@ int8_t ws_pae_lib_supp_list_remove(supp_list_t *supp_list, supp_entry_t *supp)
 supp_entry_t *ws_pae_lib_supp_list_entry_eui_64_get(const supp_list_t *supp_list, const uint8_t *eui_64)
 {
     ns_list_foreach(supp_entry_t, cur, supp_list) {
-        if (memcmp(kmp_address_eui_64_get(cur->addr), eui_64, 8) == 0) {
+        if (memcmp(cur->addr.eui_64, eui_64, 8) == 0) {
             return cur;
         }
     }
@@ -213,10 +213,10 @@ void ws_pae_lib_supp_list_slow_timer_update(supp_list_t *supp_list, timer_settin
 {
     ns_list_foreach(supp_entry_t, entry, supp_list) {
         if (sec_prot_keys_pmk_lifetime_decrement(&entry->sec_keys, timer_settings->pmk_lifetime, seconds)) {
-            tr_info("PMK and PTK expired, eui-64: %s, system time: %"PRIu32"", trace_array(kmp_address_eui_64_get(entry->addr), 8), protocol_core_monotonic_time / 10);
+            tr_info("PMK and PTK expired, eui-64: %s, system time: %"PRIu32"", trace_array(entry->addr.eui_64, 8), protocol_core_monotonic_time / 10);
         }
         if (sec_prot_keys_ptk_lifetime_decrement(&entry->sec_keys, timer_settings->ptk_lifetime, seconds)) {
-            tr_info("PTK expired, eui-64: %s, system time: %"PRIu32"", trace_array(kmp_address_eui_64_get(entry->addr), 8), protocol_core_monotonic_time / 10);
+            tr_info("PTK expired, eui-64: %s, system time: %"PRIu32"", trace_array(entry->addr.eui_64, 8), protocol_core_monotonic_time / 10);
         }
     }
 
@@ -225,7 +225,7 @@ void ws_pae_lib_supp_list_slow_timer_update(supp_list_t *supp_list, timer_settin
 void ws_pae_lib_supp_init(supp_entry_t *entry)
 {
     ws_pae_lib_kmp_list_init(&entry->kmp_list);
-    entry->addr = 0;
+    memset(&entry->addr, 0, sizeof(kmp_addr_t));
     memset(&entry->sec_keys, 0, sizeof(sec_prot_keys_t));
     entry->ticks = 0;
     entry->retry_ticks = 0;
@@ -236,7 +236,6 @@ void ws_pae_lib_supp_init(supp_entry_t *entry)
 void ws_pae_lib_supp_delete(supp_entry_t *entry)
 {
     ws_pae_lib_kmp_list_free(&entry->kmp_list);
-    kmp_address_delete(entry->addr);
 }
 
 bool ws_pae_lib_supp_timer_update(supp_entry_t *entry, uint16_t ticks, ws_pae_lib_kmp_timer_timeout timeout)
@@ -260,7 +259,7 @@ bool ws_pae_lib_supp_timer_update(supp_entry_t *entry, uint16_t ticks, ws_pae_li
         entry->retry_ticks -= ticks;
     } else {
         if (entry->retry_ticks > 0) {
-            tr_info("EAP-TLS max ongoing delay timeout eui-64: %s", trace_array(kmp_address_eui_64_get(entry->addr), 8));
+            tr_info("EAP-TLS max ongoing delay timeout eui-64: %s", trace_array(entry->addr.eui_64, 8));
         }
         entry->retry_ticks = 0;
     }
@@ -279,7 +278,7 @@ void ws_pae_lib_supp_list_to_active(supp_list_t *active_supp_list, supp_list_t *
         return;
     }
 
-    tr_debug("PAE: to active, eui-64: %s", trace_array(kmp_address_eui_64_get(entry->addr), 8));
+    tr_debug("PAE: to active, eui-64: %s", trace_array(entry->addr.eui_64, 8));
 
     ns_list_remove(inactive_supp_list, entry);
     ns_list_add_to_start(active_supp_list, entry);
@@ -288,9 +287,7 @@ void ws_pae_lib_supp_list_to_active(supp_list_t *active_supp_list, supp_list_t *
     entry->ticks = 0;
 
     // Adds relay address data
-    kmp_addr_t *addr = kmp_address_create(KMP_ADDR_EUI_64_AND_IP, kmp_address_eui_64_get(entry->addr));
-    kmp_address_delete(entry->addr);
-    entry->addr = addr;
+    entry->addr.type = KMP_ADDR_EUI_64_AND_IP;
 }
 
 void ws_pae_lib_supp_list_to_inactive(supp_list_t *active_supp_list, supp_list_t *inactive_supp_list, supp_entry_t *entry)
@@ -299,10 +296,10 @@ void ws_pae_lib_supp_list_to_inactive(supp_list_t *active_supp_list, supp_list_t
         return;
     }
 
-    tr_debug("PAE: to inactive, eui-64: %s", trace_array(kmp_address_eui_64_get(entry->addr), 8));
+    tr_debug("PAE: to inactive, eui-64: %s", trace_array(entry->addr.eui_64, 8));
 
     if (entry->access_revoked) {
-        tr_info("Access revoked; deleted, eui-64: %s", trace_array(kmp_address_eui_64_get(entry->addr), 8));
+        tr_info("Access revoked; deleted, eui-64: %s", trace_array(entry->addr.eui_64, 8));
         ws_pae_lib_supp_list_remove(active_supp_list, entry);
         return;
     }
@@ -314,9 +311,9 @@ void ws_pae_lib_supp_list_to_inactive(supp_list_t *active_supp_list, supp_list_t
     entry->ticks = 0;
 
     // Removes relay address data
-    kmp_addr_t *addr = kmp_address_create(KMP_ADDR_EUI_64, kmp_address_eui_64_get(entry->addr));
-    kmp_address_delete(entry->addr);
-    entry->addr = addr;
+    entry->addr.type = KMP_ADDR_EUI_64;
+    entry->addr.port = 0;
+    memset(entry->addr.relay_address, 0, 16);
 }
 
 uint16_t ws_pae_lib_supp_list_kmp_count(supp_list_t *supp_list, kmp_type_e type)

source/6LoWPAN/ws/ws_pae_lib.h

@@ -33,7 +33,7 @@ typedef NS_LIST_HEAD(kmp_entry_t, link) kmp_list_t;
 
 typedef struct {
     kmp_list_t kmp_list;               /**< Ongoing KMP negotiations */
-    kmp_addr_t *addr;                  /**< EUI-64 (Relay IP address, Relay port) */
+    kmp_addr_t addr;                  /**< EUI-64 (Relay IP address, Relay port) */
     sec_prot_keys_t sec_keys;          /**< Security keys */
     uint32_t ticks;                    /**< Ticks */
     uint16_t retry_ticks;              /**< Retry ticks */

source/6LoWPAN/ws/ws_pae_supp.c

@@ -103,6 +103,7 @@ typedef struct {
     bool timer_running : 1;                                /**< Timer is running */
     bool new_br_eui_64_set : 1;                            /**< Border router address has been set */
     bool new_br_eui_64_fresh : 1;                          /**< Border router address is fresh (set during this authentication attempt) */
+    bool entry_address_active: 1;
 } pae_supp_t;
 
 
@@ -185,7 +186,8 @@ int8_t ws_pae_supp_authenticate(protocol_interface_info_entry_t *interface_ptr,
     // Stores target/parent address
     kmp_address_init(KMP_ADDR_EUI_64, &pae_supp->target_addr, dest_eui_64);
     // Sets target address in use
-    pae_supp->entry.addr = (kmp_addr_t *) &pae_supp->target_addr;
+    pae_supp->entry.addr = pae_supp->target_addr;
+    pae_supp->entry_address_active = true;
 
     pae_supp->auth_requested = true;
 
@@ -362,7 +364,7 @@ static int8_t ws_pae_supp_nvm_nw_info_write(pae_supp_t *pae_supp)
     nvm_tlv_list_t tlv_list;
     ns_list_init(&tlv_list);
 
-    ws_pae_nvm_store_nw_info_tlv_create(tlv_entry,pae_supp->sec_keys_nw_info.key_pan_id,
+    ws_pae_nvm_store_nw_info_tlv_create(tlv_entry, pae_supp->sec_keys_nw_info.key_pan_id,
                                         pae_supp->sec_keys_nw_info.network_name,
                                         &pae_supp->gtks);
     ns_list_add_to_end(&tlv_list, tlv_entry);
@@ -445,7 +447,7 @@ static int8_t ws_pae_supp_initial_key_send(pae_supp_t *pae_supp)
         // Stores target/parent address
         kmp_address_init(KMP_ADDR_EUI_64, &pae_supp->target_addr, parent_eui_64);
         // Sets parent address in use
-        pae_supp->entry.addr = (kmp_addr_t *) &pae_supp->target_addr;
+        pae_supp->entry.addr = pae_supp->target_addr;
 
         ws_pae_lib_supp_timer_ticks_set(&pae_supp->entry, WAIT_FOR_REAUTHENTICATION_TICKS);
         tr_info("PAE wait for auth seconds: %i", WAIT_FOR_REAUTHENTICATION_TICKS / 10);
@@ -456,9 +458,9 @@ static int8_t ws_pae_supp_initial_key_send(pae_supp_t *pae_supp)
         return -1;
     }
 
-    tr_info("EAPOL target: %s", trace_array(kmp_address_eui_64_get(pae_supp->entry.addr), 8));
+    tr_info("EAPOL target: %s", trace_array(kmp_address_eui_64_get(&pae_supp->entry.addr), 8));
 
-    kmp_api_create_request(kmp, IEEE_802_1X_MKA_KEY, pae_supp->entry.addr, &pae_supp->entry.sec_keys);
+    kmp_api_create_request(kmp, IEEE_802_1X_MKA_KEY, &pae_supp->entry.addr, &pae_supp->entry.sec_keys);
 
     return 0;
 }
@@ -742,8 +744,7 @@ void ws_pae_supp_fast_timer(uint16_t ticks)
 
             tr_debug("PAE idle");
             // Sets target/parent address to null
-            pae_supp->entry.addr = NULL;
-
+            pae_supp->entry_address_active = false;
             // If not already completed, restart bootstrap
             ws_pae_supp_authenticate_response(pae_supp, false);
 
@@ -853,8 +854,8 @@ static int8_t ws_pae_supp_eapol_pdu_address_check(protocol_interface_info_entry_
     }
 
     // Message from EAPOL target node, route to self
-    if (pae_supp->entry.addr) {
-        if (memcmp(eui_64, kmp_address_eui_64_get(pae_supp->entry.addr), 8) == 0) {
+    if (pae_supp->entry_address_active) {
+        if (memcmp(eui_64, pae_supp->entry.addr.eui_64, 8) == 0) {
             return 0;
         }
     }
@@ -952,7 +953,7 @@ static kmp_api_t *ws_pae_supp_kmp_incoming_ind(kmp_service_t *service, kmp_type_
         return NULL;
     }
 
-    if (!pae_supp->entry.addr) {
+    if (!pae_supp->entry_address_active) {
         // Does no longer wait for authentication, ignores message
         return NULL;
     }
@@ -961,7 +962,7 @@ static kmp_api_t *ws_pae_supp_kmp_incoming_ind(kmp_service_t *service, kmp_type_
     pae_supp->auth_trickle_running = false;
 
     // Updates parent address
-    kmp_address_copy(pae_supp->entry.addr, addr);
+    kmp_address_copy(&pae_supp->entry.addr, addr);
 
     // Check if ongoing
     kmp_api_t *kmp = ws_pae_lib_kmp_list_type_get(&pae_supp->entry.kmp_list, type);
@@ -998,7 +999,7 @@ static kmp_api_t *ws_pae_supp_kmp_create_and_start(kmp_service_t *service, kmp_t
     }
 
     // Updates parent address
-    kmp_api_addr_set(kmp, pae_supp->entry.addr);
+    kmp_api_addr_set(kmp, &pae_supp->entry.addr);
 
     // Sets security keys to KMP
     kmp_api_sec_keys_set(kmp, &pae_supp->entry.sec_keys);