This flag was being checked but it is explicitly being set to false prior. --- src/station.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/station.c b/src/station.c index bdb8859a..b9368ef2 100644 --- a/src/station.c +++ b/src/station.c @@ -1867,8 +1867,7 @@ static void station_transition_start(struct station *station, } /* FT-over-DS can be better suited for these situations */ - if ((hs->mde[4] & 1) && (station->ap_directed_roaming || - station->signal_low)) { + if ((hs->mde[4] & 1) && station->signal_low) { if (netdev_fast_transition_over_ds_action( station->netdev, bss, station_fast_transition_ds_cb, -- 2.31.1

The beauty of FT-over-DS is that a station can send and receive action frames to many APs to prepare for a future roam. Each AP authenticates the station and when a roam happens the station can immediately move to reassociation. To handle this a queue of netdev_ft_over_ds_info structs is used instead of a single entry. Using the new ft.c parser APIs these info structs can be looked up when responses come in. For now the timeouts/callbacks are kept but these will be removed as it really does not matter if the AP sends a response (keeps station happy until the next patch). --- src/netdev.c | 112 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 71 insertions(+), 41 deletions(-) diff --git a/src/netdev.c b/src/netdev.c index 65627b9f..c194e78f 100644 --- a/src/netdev.c +++ b/src/netdev.c @@ -169,7 +169,7 @@ struct netdev { struct l_genl_msg *auth_cmd; struct wiphy_radio_work_item work; - struct netdev_ft_over_ds_info *ft_ds_info; + struct l_queue *ft_ds_list; bool connected : 1; bool associated : 1; @@ -687,6 +687,13 @@ static void netdev_preauth_destroy(void *data) l_free(state); } +static void netdev_ft_ds_entry_free(void *data) +{ + struct netdev_ft_over_ds_info *info = data; + + ft_ds_info_free(&info->super); +} + static void netdev_connect_free(struct netdev *netdev) { if (netdev->work.id) @@ -754,8 +761,10 @@ static void netdev_connect_free(struct netdev *netdev) netdev->disconnect_cmd_id = 0; } - if (netdev->ft_ds_info) - ft_ds_info_free(&netdev->ft_ds_info->super); + if (netdev->ft_ds_list) { + l_queue_destroy(netdev->ft_ds_list, netdev_ft_ds_entry_free); + netdev->ft_ds_list = NULL; + } } static void netdev_connect_failed(struct netdev *netdev, @@ -854,6 +863,11 @@ static void netdev_free(void *data) netdev->disconnect_idle = NULL; } + if (netdev->ft_ds_list) { + l_queue_destroy(netdev->ft_ds_list, netdev_ft_ds_entry_free); + netdev->ft_ds_list = NULL; + } + if (netdev->events_ready) WATCHLIST_NOTIFY(&netdev_watches, netdev_watch_func_t, netdev, NETDEV_WATCH_EVENT_DEL); @@ -1286,6 +1300,11 @@ static void netdev_connect_ok(struct netdev *netdev) netdev->fw_roam_bss = NULL; } + if (netdev->ft_ds_list) { + l_queue_destroy(netdev->ft_ds_list, netdev_ft_ds_entry_free); + netdev->ft_ds_list = NULL; + } + if (netdev->connect_cb) { netdev->connect_cb(netdev, NETDEV_RESULT_OK, NULL, netdev->user_data); @@ -3442,12 +3461,6 @@ int netdev_reassociate(struct netdev *netdev, struct scan_bss *target_bss, if (err < 0) return err; - /* In case of a previous failed over-DS attempt */ - if (netdev->ft_ds_info) { - ft_ds_info_free(&netdev->ft_ds_info->super); - netdev->ft_ds_info = NULL; - } - memcpy(netdev->prev_bssid, orig_bss->addr, ETH_ALEN); netdev->associated = false; @@ -3676,12 +3689,6 @@ static int netdev_ft_tx_associate(struct iovec *ie_iov, size_t iov_len, return -EIO; } - /* No need to keep this around at this point */ - if (netdev->ft_ds_info) { - ft_ds_info_free(&netdev->ft_ds_info->super); - netdev->ft_ds_info = NULL; - } - return 0; } @@ -3756,9 +3763,26 @@ static void netdev_ft_over_ds_auth_failed(struct netdev_ft_over_ds_info *info, if (info->cb) info->cb(info->netdev, status, info->super.aa, info->user_data); + l_queue_remove(info->netdev->ft_ds_list, info); ft_ds_info_free(&info->super); +} - info->netdev->ft_ds_info = NULL; +struct ft_ds_finder { + const uint8_t *spa; + const uint8_t *aa; +}; + +static bool match_ft_ds_info(const void *a, const void *b) +{ + const struct netdev_ft_over_ds_info *info = a; + const struct ft_ds_finder *finder = b; + + if (memcmp(info->super.spa, finder->spa, 6)) + return false; + if (memcmp(info->super.aa, finder->aa, 6)) + return false; + + return true; } static void netdev_ft_response_frame_event(const struct mmpdu_header *hdr, @@ -3766,41 +3790,41 @@ static void netdev_ft_response_frame_event(const struct mmpdu_header *hdr, int rssi, void *user_data) { struct netdev *netdev = user_data; - struct netdev_ft_over_ds_info *info = netdev->ft_ds_info; + struct netdev_ft_over_ds_info *info; int ret; uint16_t status_code = MMPDU_STATUS_CODE_UNSPECIFIED; const uint8_t *aa; const uint8_t *spa; const uint8_t *ies; size_t ies_len; - - if (!info) - return; + struct ft_ds_finder finder; ret = ft_over_ds_parse_action_response(body, body_len, &spa, &aa, &ies, &ies_len); - if (ret != 0) + if (ret < 0) return; - if (memcmp(spa, info->super.spa, 6)) - return; - if (memcmp(aa, info->super.aa, 6)) + finder.spa = spa; + finder.aa = aa; + + info = l_queue_find(netdev->ft_ds_list, match_ft_ds_info, &finder); + if (!info) return; + /* Lookup successful, now check the status code */ + if (ret > 0) { + status_code = (uint16_t)ret; + goto ft_error; + } + ret = ft_over_ds_parse_action_ies(&info->super, netdev->handshake, ies, ies_len); if (ret < 0) - return; + goto ft_error; l_timeout_remove(info->timeout); info->timeout = NULL; - /* Now make sure the packet contained a success status code */ - if (ret > 0) { - status_code = (uint16_t)ret; - goto ft_error; - } - info->parsed = true; if (info->cb) @@ -3809,7 +3833,8 @@ static void netdev_ft_response_frame_event(const struct mmpdu_header *hdr, return; ft_error: - l_debug("FT-over-DS to "MAC" failed", MAC_STR(info->super.aa)); + l_debug("FT-over-DS to "MAC" failed (%d)", MAC_STR(info->super.aa), + status_code); netdev_ft_over_ds_auth_failed(info, status_code); } @@ -3887,10 +3912,8 @@ int netdev_fast_transition_over_ds(struct netdev *netdev, struct scan_bss *target_bss, netdev_connect_cb_t cb) { - struct netdev_ft_over_ds_info *info = netdev->ft_ds_info; - - if (!info || !info->parsed) - return -ENOENT; + struct netdev_ft_over_ds_info *info; + struct ft_ds_finder finder; if (!netdev->operational) return -ENOTCONN; @@ -3900,6 +3923,14 @@ int netdev_fast_transition_over_ds(struct netdev *netdev, l_get_le16(target_bss->mde)) return -EINVAL; + finder.spa = netdev->addr; + finder.aa = target_bss->addr; + + info = l_queue_find(netdev->ft_ds_list, match_ft_ds_info, &finder); + + if (!info || !info->parsed) + return -ENOENT; + prepare_ft(netdev, target_bss); ft_over_ds_prepare_handshake(&info->super, netdev->handshake); @@ -3963,10 +3994,6 @@ int netdev_fast_transition_over_ds_action(struct netdev *netdev, uint8_t buf[512]; size_t len; - /* TODO: Just allow single outstanding action frame for now */ - if (netdev->ft_ds_info) - return -EALREADY; - if (!netdev->operational) return -ENOTCONN; @@ -4005,7 +4032,10 @@ int netdev_fast_transition_over_ds_action(struct netdev *netdev, iovs[2].iov_base = NULL; - netdev->ft_ds_info = info; + if (!netdev->ft_ds_list) + netdev->ft_ds_list = l_queue_new(); + + l_queue_push_head(netdev->ft_ds_list, info); info->timeout = l_timeout_create_ms(300, netdev_ft_over_ds_timeout, info, NULL); -- 2.31.1

Roam times can be slightly improved by sending out the FT-over-DS action frames to any BSS in the mobility domain immediately after connecting. This preauthenticates IWD to each AP which means Reassociation can happen right away when a roam is needed. When a roam is needed station_transition_start will first try FT-over-DS (if supported) via netdev_fast_transtion_over_ds. The return is checked and if netdev has no cached entries FT-over-Air will be used instead. --- src/station.c | 109 +++++++++++++++++++++++++++----------------------- 1 file changed, 60 insertions(+), 49 deletions(-) v3: * Added back check for connected_bss on loop * Removed extra check for station_can_fast_transition, and instead only check values which were not previously checked diff --git a/src/station.c b/src/station.c index b9368ef2..bbd50aee 100644 --- a/src/station.c +++ b/src/station.c @@ -1720,45 +1720,6 @@ static bool bss_match_bssid(const void *a, const void *b) return !memcmp(bss->addr, bssid, sizeof(bss->addr)); } -static void station_fast_transition_ds_cb(struct netdev *netdev, - uint16_t status, const uint8_t *bssid, - void *user_data) -{ - struct station *station = user_data; - struct scan_bss *bss; - - if (status != 0) - goto failed; - - /* - * TODO: In the future it may be desired to start sending out these - * FT-over-DS action frames at the time of connecting then be able to - * roam immediately when required. If this is being done we can simply - * bail out now as ft already caches the entires. But since this was - * initiated due to a need to roam, do so now. - */ - - /* Make sure we still have our BSS */ - bss = l_queue_find(station->bss_list, bss_match_bssid, bssid); - if (!bss) - goto failed; - - l_debug("Starting FT-over-DS roam"); - - if (netdev_fast_transition_over_ds(station->netdev, bss, - station_fast_transition_cb) < 0) - goto failed; - - station->connected_bss = bss; - station->preparing_roam = false; - station_enter_state(station, STATION_STATE_ROAMING); - - return; - -failed: - station_roam_retry(station); -} - static void station_preauthenticate_cb(struct netdev *netdev, enum netdev_result result, const uint8_t *pmk, void *user_data) @@ -1849,6 +1810,7 @@ static void station_transition_start(struct station *station, enum security security = network_get_security(connected); struct handshake_state *new_hs; struct ie_rsn_info cur_rsne, target_rsne; + int ret; l_debug("%u, target %s", netdev_get_ifindex(station->netdev), util_address_to_string(bss->addr)); @@ -1868,19 +1830,21 @@ static void station_transition_start(struct station *station, /* FT-over-DS can be better suited for these situations */ if ((hs->mde[4] & 1) && station->signal_low) { - if (netdev_fast_transition_over_ds_action( - station->netdev, bss, - station_fast_transition_ds_cb, - station) < 0) { + ret = netdev_fast_transition_over_ds(station->netdev, + bss, station_fast_transition_cb); + /* No action responses from this BSS, try over air */ + if (ret == -ENOENT) + goto try_over_air; + else if (ret < 0) { + /* + * If we are here FT-over-air will not work + * either (identical checks) so try again later. + */ station_roam_retry(station); + return; } - - /* - * Set connected_bss/preparing_roam/state only on a - * successful FT-over-DS action frame response - */ - return; } else { +try_over_air: if (netdev_fast_transition(station->netdev, bss, station_fast_transition_cb) < 0) { station_roam_failed(station); @@ -2512,10 +2476,42 @@ static void station_connect_dbus_reply(struct station *station, dbus_pending_reply(&station->connect_pending, reply); } +static void station_ft_ds_action_start(struct station *station, uint16_t mdid) +{ + const struct l_queue_entry *entry; + struct scan_bss *bss; + struct ie_rsn_info rsn_info; + + for (entry = network_bss_list_get_entries(station->connected_network); + entry; entry = entry->next) { + bss = entry->data; + + if (bss == station->connected_bss) + continue; + + if (mdid != l_get_le16(bss->mde)) + continue; + + if (scan_bss_get_rsn_info(bss, &rsn_info) < 0) + continue; + + if (!IE_AKM_IS_FT(rsn_info.akm_suites)) + continue; + + /* + * Fire and forget. Netdev will maintain a cache of responses and + * when the time comes these can be referenced for a roam + */ + netdev_fast_transition_over_ds_action(station->netdev, bss, + NULL, NULL); + } +} + static void station_connect_cb(struct netdev *netdev, enum netdev_result result, void *event_data, void *user_data) { struct station *station = user_data; + struct handshake_state *hs = netdev_get_handshake(netdev); l_debug("%u, result: %d", netdev_get_ifindex(station->netdev), result); @@ -2566,6 +2562,21 @@ static void station_connect_cb(struct netdev *netdev, enum netdev_result result, l_warn("Could not request neighbor report"); } + /* + * If this network supports FT-over-DS send initial action frames now + * to prepare for future roams. + */ + if (station_can_fast_transition(hs, station->connected_bss) && + (hs->mde[4] & 1)) { + uint16_t mdid; + + if (ie_parse_mobility_domain_from_data(hs->mde, hs->mde[1] + 2, + &mdid, NULL, NULL) < 0) + return; + + station_ft_ds_action_start(station, mdid); + } + network_connected(station->connected_network); if (station->netconfig) -- 2.31.1

The FT-over-DS procedure now authenticates with multiple BSS's upon connecting. This causes list_sta() to return our address for any authenticated APs. It has now been changed to work with this new behavior, as well as a check that the station fully connected to the expected AP initially. --- autotests/testFT-PSK-over-DS/connection_test.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/autotests/testFT-PSK-over-DS/connection_test.py b/autotests/testFT-PSK-over-DS/connection_test.py index 4c751841..47104b69 100644 --- a/autotests/testFT-PSK-over-DS/connection_test.py +++ b/autotests/testFT-PSK-over-DS/connection_test.py @@ -62,8 +62,13 @@ class Test(unittest.TestCase): condition = 'obj.state == DeviceState.connected' wd.wait_for_object_condition(device, condition) + self.bss_hostapd[0].wait_for_event('AP-STA-CONNECTED %s' % device.address) + + # list_sta actually reports any authenticated stations. Due to the + # nature of FT-over-DS IWD should authenticate to all stations with + # the same mobility domain. This means both APs should show our station. self.assertTrue(self.bss_hostapd[0].list_sta()) - self.assertFalse(self.bss_hostapd[1].list_sta()) + self.assertTrue(self.bss_hostapd[1].list_sta()) wd.unregister_psk_agent(psk_agent) -- 2.31.1

Check that the current handshake is using an FT AKM and that the target BSS AKM suites contain an FT AKM. --- src/station.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/station.c b/src/station.c index 385bb272..325121f1 100644 --- a/src/station.c +++ b/src/station.c @@ -1796,10 +1796,23 @@ static bool station_can_fast_transition(struct handshake_state *hs, &mdid, NULL, NULL) < 0) return false; - if (bss->mde_present && l_get_le16(bss->mde) == mdid) - return true; + if (!(bss->mde_present && l_get_le16(bss->mde) == mdid)) + return false; - return false; + if (hs->supplicant_ie != NULL) { + struct ie_rsn_info rsn_info; + + if (!IE_AKM_IS_FT(hs->akm_suite)) + return false; + + if (scan_bss_get_rsn_info(bss, &rsn_info) < 0) + return false; + + if (!IE_AKM_IS_FT(rsn_info.akm_suites)) + return false; + } + + return true; } static void station_transition_start(struct station *station, -- 2.31.1