Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-01-03 10:32:33 +01:00
Code Releases Activity

netdev: separate over-air and over-ds netdev APIs

Browse Source
This commit is contained in:
James Prestwood 2021-04-29 16:08:38 -07:00 committed by Denis Kenzior
parent 0d45316891
commit 6c5fe246a7
1 changed files with 39 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/netdev.c
View File

@ -3658,10 +3658,25 @@ static void prepare_ft(struct netdev *netdev, struct scan_bss *target_bss)
{ {
struct netdev_handshake_state *nhs; struct netdev_handshake_state *nhs;
/*
* We reuse the handshake_state object and reset what's needed.
* Could also create a new object and copy most of the state but
* we would end up doing more work.
*/
memcpy(netdev->prev_snonce, netdev->handshake->snonce, 32);
memcpy(netdev->prev_bssid, netdev->handshake->aa, 6); memcpy(netdev->prev_bssid, netdev->handshake->aa, 6);
netdev->prev_frequency = netdev->frequency; netdev->prev_frequency = netdev->frequency;
netdev->frequency = target_bss->frequency; netdev->frequency = target_bss->frequency;
handshake_state_set_authenticator_address(netdev->handshake,
target_bss->addr);
if (target_bss->rsne)
handshake_state_set_authenticator_ie(netdev->handshake,
target_bss->rsne);
memcpy(netdev->handshake->mde + 2, target_bss->mde, 3);
netdev->associated = false; netdev->associated = false;
netdev->operational = false; netdev->operational = false;
netdev->in_ft = true; netdev->in_ft = true;
@ -3809,8 +3824,7 @@ static const struct wiphy_radio_work_item_ops ft_work_ops = {
.do_work = netdev_ft_work_ready, .do_work = netdev_ft_work_ready,
}; };
static int fast_transition(struct netdev *netdev, struct scan_bss *target_bss, int netdev_fast_transition(struct netdev *netdev, struct scan_bss *target_bss,
bool over_air,
netdev_connect_cb_t cb) netdev_connect_cb_t cb)
{ {
if (!netdev->operational) if (!netdev->operational)
@ -3823,32 +3837,13 @@ static int fast_transition(struct netdev *netdev, struct scan_bss *target_bss,
prepare_ft(netdev, target_bss); prepare_ft(netdev, target_bss);
/*
* We reuse the handshake_state object and reset what's needed.
* Could also create a new object and copy most of the state but
* we would end up doing more work.
*/
memcpy(netdev->prev_snonce, netdev->handshake->snonce, 32);
handshake_state_new_snonce(netdev->handshake); handshake_state_new_snonce(netdev->handshake);
handshake_state_set_authenticator_address(netdev->handshake,
target_bss->addr);
if (target_bss->rsne)
handshake_state_set_authenticator_ie(netdev->handshake,
target_bss->rsne);
memcpy(netdev->handshake->mde + 2, target_bss->mde, 3);
netdev->connect_cb = cb; netdev->connect_cb = cb;
if (over_air) netdev->ap = ft_over_air_sm_new(netdev->handshake,
netdev->ap = ft_over_air_sm_new(netdev->handshake,
netdev_ft_tx_authenticate, netdev_ft_tx_authenticate,
netdev_ft_tx_associate, netdev); netdev_ft_tx_associate, netdev);
else
netdev->ap = ft_over_ds_sm_new(netdev->handshake,
netdev_ft_over_ds_tx_authenticate,
netdev_ft_tx_associate, netdev);
wiphy_radio_work_insert(netdev->wiphy, &netdev->work, 1, wiphy_radio_work_insert(netdev->wiphy, &netdev->work, 1,
&ft_work_ops); &ft_work_ops);
@ -3856,17 +3851,32 @@ static int fast_transition(struct netdev *netdev, struct scan_bss *target_bss,
return 0; return 0;
} }
int netdev_fast_transition(struct netdev *netdev, struct scan_bss *target_bss,
netdev_connect_cb_t cb)
{
return fast_transition(netdev, target_bss, true, cb);
}
int netdev_fast_transition_over_ds(struct netdev *netdev, int netdev_fast_transition_over_ds(struct netdev *netdev,
struct scan_bss *target_bss, struct scan_bss *target_bss,
netdev_connect_cb_t cb) netdev_connect_cb_t cb)
{ {
return fast_transition(netdev, target_bss, false, cb); if (!netdev->operational)
return -ENOTCONN;
if (!netdev->handshake->mde || !target_bss->mde_present ||
l_get_le16(netdev->handshake->mde + 2) !=
l_get_le16(target_bss->mde))
return -EINVAL;
prepare_ft(netdev, target_bss);
handshake_state_new_snonce(netdev->handshake);
netdev->connect_cb = cb;
netdev->ap = ft_over_ds_sm_new(netdev->handshake,
netdev_ft_over_ds_tx_authenticate,
netdev_ft_tx_associate, netdev);
wiphy_radio_work_insert(netdev->wiphy, &netdev->work, 1,
&ft_work_ops);
return 0;
} }
static void netdev_preauth_cb(const uint8_t *pmk, void *user_data) static void netdev_preauth_cb(const uint8_t *pmk, void *user_data)