station: handle ROAMING state in disconnect event
PATCH 1/3 station: handle ROAMING state in disconnect event
This both adds proper handling to the new roaming logic and fixes a potential bug with firmware roams.
The new way roaming works doesn't use a connect callback. This means that any disconnect event or call to netdev_connect_failed will result in the event handler being called, where before the connect callback would. This means we need to handle the ROAMING state in the station disconnect event so IWD properly disassociates and station goes out of ROAMING.
With firmware roams netdev gets an event which transitions station into ROAMING. Then netdev issues GET_SCAN. During this time a disconnect event could come in which would end up in station_disconnect_event since there is no connect callback. This needs to be handled the same and let IWD transition out of the ROAMING state.
--- src/station.c | 1 + 1 file changed, 1 insertion(+)
src/station.c +1 -0
@@ -3172,6 +3172,7 @@ static void station_disconnect_event(struct station *station, void *event_data) event_data, station);return ;case STATION_STATE_CONNECTED : +case STATION_STATE_ROAMING :station_disassociated (station);return ;default :
Signature · 1 line
2.34.3
PATCH 2/3 ft: clear ft_info inside offchannel destroy
Once offchannel completes we can check if the info structure was parsed, indicating authentication succeeded. If not there is no reason to keep it around since IWD will either try another BSS or fail.
--- src/ft.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
src/ft.c +10 -6
@@ -960,18 +960,17 @@ void __ft_rx_authenticate(uint32_t ifindex, const uint8_t *frame, &status, &ies, &ies_len))return ; -/* Verified to be expected target, offchannel can be canceled */ -offchannel_cancel (netdev_get_wdev_id (netdev), info->offchannel_id); -if (status !=0 ) -return ; + goto cancel;if (!ft_parse_ies (info, hs, ies, ies_len)) -return ; + goto cancel; info->parsed = true; -return ; +cancel: +/* Verified to be expected target, offchannel can be canceled */ +offchannel_cancel (netdev_get_wdev_id (netdev), info->offchannel_id); }static void ft_send_authenticate (void *user_data)
@@ -1007,6 +1006,11 @@ static void ft_authenticate_destroy(int error, void *user_data)struct ft_info *info = user_data; info->offchannel_id =0 ; + +if (!info->parsed) { +l_queue_remove (info_list, info); +ft_info_destroy (info); + } }/*
Signature · 1 line
2.34.3
PATCH 3/3 ft: fix ft_associate to verify if authentication succeeded
In reply to James Prestwoodft_associate was only checking the presence of the info structure, not if it actually succeeded to authenticate.
--- src/ft.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
src/ft.c +1 -1
@@ -1055,7 +1055,7 @@ int ft_associate(uint32_t ifindex, const uint8_t *addr)* a different BSS. */ info =ft_info_find (ifindex, addr); -if (!info) +if (!info || !info->parsed)return -ENOENT ;ft_prepare_handshake (info, hs);
Signature · 1 line
2.34.3
Hi James,
Quoted 16 lines · James Prestwood
This both adds proper handling to the new roaming logic and fixes a potential bug with firmware roams.
The new way roaming works doesn't use a connect callback. This means that any disconnect event or call to
netdev_connect_failedwill result in the event handler being called, where before the connect callback would. This means we need to handle the ROAMING state in the station disconnect event so IWD properly disassociates and station goes out of ROAMING.With firmware roams netdev gets an event which transitions station into ROAMING. Then netdev issues
GET_SCAN. During this time a disconnect event could come in which would end up instation_disconnect_eventsince there is no connect callback. This needs to be handled the same and let IWD transition out of the ROAMING state.
Quoted 4 lines
--- src/station.c | 1 + 1 file changed, 1 insertion(+)
All applied, thanks.
Regards,
-Denis