Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-12-22 21:22:37 +01:00
Code Releases Activity

netdev: remove OWE handling from netdev_connect_event

Browse Source 
OWE processing can be completely taken care of inside
netdev_authenticate_event and netdev_associate_event. This removes
the need for OWE specific checks inside netdev_connect_event. We can
now return early out of the connect event if OWE is in progress.
This commit is contained in:
James Prestwood 2019-03-01 14:58:12 -08:00 committed by Denis Kenzior
parent 6de133aee7
commit 210b8645b7
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/netdev.c
View File

@ -1739,6 +1739,9 @@ static void netdev_connect_event(struct l_genl_msg *msg, struct netdev *netdev)
l_debug(""); l_debug("");
if (netdev->owe)
return;
if (!netdev->connected) { if (!netdev->connected) {
l_warn("Unexpected connection related event -- " l_warn("Unexpected connection related event -- "
"is another supplicant running?"); "is another supplicant running?");
@ -1803,9 +1806,7 @@ static void netdev_connect_event(struct l_genl_msg *msg, struct netdev *netdev)
} }
} }
/* OWE can skip this since it handles associate itself */ if (!netdev_handle_associate_resp_ies(netdev->handshake, rsne, mde, fte,
if (!netdev->owe && !netdev_handle_associate_resp_ies(netdev->handshake,
rsne, mde, fte,
netdev->in_ft)) netdev->in_ft))
goto error; goto error;
@ -1832,28 +1833,11 @@ static void netdev_connect_event(struct l_genl_msg *msg, struct netdev *netdev)
} }
} }
/* OWE must have failed, this is handled inside netdev_owe_complete */
if (netdev->owe && !netdev->sm)
return;
netdev_connect_ok(netdev); netdev_connect_ok(netdev);
return; return;
error: error:
/*
* RFC 8110 Section 4.3 - OWE Association
* A client that receives an 802.11 association response with a status
* code of seventy-seven SHOULD retry OWE with a different supported
* group...
*
* Note: OWE (should have) received this already in an associate
* response and will handle it.
*/
if (netdev->owe && *status_code ==
MMPDU_STATUS_CODE_UNSUPP_FINITE_CYCLIC_GROUP)
return;
netdev_connect_failed(netdev, NETDEV_RESULT_ASSOCIATION_FAILED, netdev_connect_failed(netdev, NETDEV_RESULT_ASSOCIATION_FAILED,
*status_code); *status_code);
} }
@ -2608,6 +2592,7 @@ static void netdev_owe_complete(uint16_t status, void *user_data)
netdev->sm = eapol_sm_new(netdev->handshake); netdev->sm = eapol_sm_new(netdev->handshake);
eapol_register(netdev->sm); eapol_register(netdev->sm);
eapol_start(netdev->sm);
} }
static struct l_genl_msg *netdev_build_cmd_connect(struct netdev *netdev, static struct l_genl_msg *netdev_build_cmd_connect(struct netdev *netdev,