Skip to content

Commit a099524

Browse files
Juha HeiskanenMika Leppänen
authored andcommitted
EAPOL authtentication start fix
Corrected WS state machine that EAPOL is started after network scan. Corrected EAPOL parent destination set and added missing unicast timing inforo set to neighbor. Change-Id: I02cec1436a4177f6060d705b1613363091785135
1 parent 3f32a7a commit a099524

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

source/6LoWPAN/ws/ws_bootstrap.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1735,9 +1735,8 @@ static void ws_bootstrap_authentication_completed(bool success, protocol_interfa
17351735
if (success) {
17361736
ws_bootstrap_set_test_key(cur);
17371737

1738-
ws_bootstrap_event_operation_start(cur);
17391738

1740-
//ws_bootstrap_event_configuration_start(cur);
1739+
ws_bootstrap_event_configuration_start(cur);
17411740
} else {
17421741
// What else to do to start over again...
17431742
ws_bootstrap_event_discovery_start(cur);
@@ -1753,7 +1752,6 @@ static void ws_bootstrap_start_configuration_learn(protocol_interface_info_entry
17531752
cur->ws_info->configuration_learned = false;
17541753
// Clear parent info
17551754

1756-
ws_pae_controller_set_target(cur->ws_info->parent_info.addr); // temporary!!! store since auth made later
17571755
memset(cur->ws_info->parent_info.addr, 0, 8);
17581756

17591757
// Clear all temporary information
@@ -2120,12 +2118,15 @@ void ws_bootstrap_network_scan_process(protocol_interface_info_entry_t *cur)
21202118
return;
21212119
}
21222120

2121+
ws_neighbor_class_neighbor_unicast_time_info_update(neighbor_info.ws_neighbor, &cur->ws_info->parent_info.ws_utt, cur->ws_info->parent_info.timestamp);
2122+
ws_neighbor_class_neighbor_unicast_schedule_set(neighbor_info.ws_neighbor, &cur->ws_info->parent_info.ws_us);
2123+
2124+
21232125
ws_bootstrap_network_information_learn(cur);
21242126
ws_bootstrap_fhss_activate(cur);
21252127

2126-
ws_bootstrap_set_test_key(cur);
2127-
ws_bootstrap_event_configuration_start(cur);
2128-
//ws_bootstrap_event_authentication_start(cur);
2128+
ws_pae_controller_set_target(cur->ws_info->parent_info.addr); // temporary!!! store since auth
2129+
ws_bootstrap_event_authentication_start(cur);
21292130
return;
21302131
}
21312132

@@ -2136,9 +2137,8 @@ void ws_bootstrap_configure_process(protocol_interface_info_entry_t *cur)
21362137
ws_bootstrap_network_configuration_learn(cur);
21372138

21382139

2139-
//ws_bootstrap_event_operation_start(cur);
2140+
ws_bootstrap_event_operation_start(cur);
21402141

2141-
ws_bootstrap_event_authentication_start(cur);
21422142

21432143
return;
21442144
}

0 commit comments

Comments
 (0)