Skip to content

Commit 13e68c3

Browse files
author
Mika Leppänen
committed
Corrected defects
1 parent ac51ec5 commit 13e68c3

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

source/6LoWPAN/ws/ws_pae_controller.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ typedef struct {
6565
uint8_t gtkhash[32]; /**< GTK hashes */
6666
sec_prot_certs_t certs; /**< Certificates */
6767
nw_key_t nw_key[4]; /**< Currently active network keys (on MAC) */
68-
char network_name[33]; /**< Network name for GAK generation */
68+
char *network_name; /**< Network name for GAK generation */
6969
timer_settings_t timer_settings; /**< Timer settings */
7070
protocol_interface_info_entry_t *interface_ptr; /**< List link entry */
7171
ws_pae_controller_auth_completed *auth_completed; /**< Authentication completed callback, continue bootstrap */
@@ -238,7 +238,7 @@ int8_t ws_pae_controller_nw_info_set(protocol_interface_info_entry_t *interface_
238238
return -1;
239239
}
240240

241-
strncpy(controller->network_name, network_name, 32);
241+
controller->network_name = network_name;
242242

243243
return ws_pae_supp_nw_info_set(interface_ptr, pan_id, network_name);
244244
}
@@ -451,7 +451,6 @@ int8_t ws_pae_controller_init(protocol_interface_info_entry_t *interface_ptr)
451451
memset(controller->br_eui_64, 0, 8);
452452
memset(controller->gtkhash, 0, 32);
453453
memset(controller->nw_key, 0, sizeof(controller->nw_key));
454-
memset(controller->network_name, 0, sizeof(controller->network_name));
455454
controller->target_pan_id = 0xffff;
456455
controller->interface_ptr = interface_ptr;
457456
controller->auth_completed = NULL;
@@ -471,6 +470,7 @@ int8_t ws_pae_controller_init(protocol_interface_info_entry_t *interface_ptr)
471470
controller->key_index_set = false;
472471
controller->nw_keys_init_done = false;
473472
controller->gtk_index = -1;
473+
controller->network_name = NULL;
474474
sec_prot_keys_gtks_init(&controller->gtks);
475475
sec_prot_keys_gtks_init(&controller->next_gtks);
476476
sec_prot_certs_init(&controller->certs);
@@ -831,7 +831,9 @@ int8_t ws_pae_controller_gtk_time_settings_update(int8_t interface_id, uint8_t r
831831

832832
int8_t ws_pae_controller_node_keys_remove(int8_t interface_id, uint8_t *eui_64)
833833
{
834+
#ifndef HAVE_PAE_AUTH
834835
(void) eui_64;
836+
#endif
835837

836838
pae_controller_t *controller = ws_pae_controller_get_or_create(interface_id);
837839
if (!controller) {

0 commit comments

Comments
 (0)