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

netdev: Move CMD_DISCONNECT builder to nl80211util

Browse Source
This commit is contained in:
Denis Kenzior 2023-11-14 09:20:16 -06:00
parent d12d8bec85
commit 7498eaae62
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/netdev.c
View File

@ -1245,18 +1245,6 @@ static void netdev_cmd_disconnect_cb(struct l_genl_msg *msg, void *user_data)
disconnect_cb(netdev, r, disconnect_data); disconnect_cb(netdev, r, disconnect_data);
} }
static struct l_genl_msg *netdev_build_cmd_disconnect(struct netdev *netdev,
uint16_t reason_code)
{
struct l_genl_msg *msg;
msg = l_genl_msg_new_sized(NL80211_CMD_DISCONNECT, 64);
l_genl_msg_append_attr(msg, NL80211_ATTR_IFINDEX, 4, &netdev->index);
l_genl_msg_append_attr(msg, NL80211_ATTR_REASON_CODE, 2, &reason_code);
return msg;
}
static void netdev_deauthenticate_event(struct l_genl_msg *msg, static void netdev_deauthenticate_event(struct l_genl_msg *msg,
struct netdev *netdev) struct netdev *netdev)
{ {
@ -1460,7 +1448,7 @@ static void netdev_setting_keys_failed(struct netdev_handshake_state *nhs,
return; return;
} }
msg = netdev_build_cmd_disconnect(netdev, msg = nl80211_build_disconnect(netdev->index,
MMPDU_REASON_CODE_UNSPECIFIED); MMPDU_REASON_CODE_UNSPECIFIED);
netdev->disconnect_cmd_id = l_genl_family_send(nl80211, msg, netdev->disconnect_cmd_id = l_genl_family_send(nl80211, msg,
netdev_disconnect_cb, netdev_disconnect_cb,
@ -2246,7 +2234,7 @@ void netdev_handshake_failed(struct handshake_state *hs, uint16_t reason_code)
switch (netdev->type) { switch (netdev->type) {
case NL80211_IFTYPE_STATION: case NL80211_IFTYPE_STATION:
case NL80211_IFTYPE_P2P_CLIENT: case NL80211_IFTYPE_P2P_CLIENT:
msg = netdev_build_cmd_disconnect(netdev, reason_code); msg = nl80211_build_disconnect(netdev->index, reason_code);
netdev->disconnect_cmd_id = l_genl_family_send(nl80211, msg, netdev->disconnect_cmd_id = l_genl_family_send(nl80211, msg,
netdev_disconnect_cb, netdev_disconnect_cb,
netdev, NULL); netdev, NULL);
@ -2989,7 +2977,7 @@ error:
deauth: deauth:
netdev->result = NETDEV_RESULT_ASSOCIATION_FAILED; netdev->result = NETDEV_RESULT_ASSOCIATION_FAILED;
netdev->last_code = MMPDU_STATUS_CODE_UNSPECIFIED; netdev->last_code = MMPDU_STATUS_CODE_UNSPECIFIED;
msg = netdev_build_cmd_disconnect(netdev, msg = nl80211_build_disconnect(netdev->index,
MMPDU_REASON_CODE_UNSPECIFIED); MMPDU_REASON_CODE_UNSPECIFIED);
netdev->disconnect_cmd_id = l_genl_family_send(nl80211, netdev->disconnect_cmd_id = l_genl_family_send(nl80211,
msg, msg,
@ -4159,7 +4147,7 @@ int netdev_disconnect(struct netdev *netdev,
} }
if (send_disconnect) { if (send_disconnect) {
disconnect = netdev_build_cmd_disconnect(netdev, disconnect = nl80211_build_disconnect(netdev->index,
MMPDU_REASON_CODE_DEAUTH_LEAVING); MMPDU_REASON_CODE_DEAUTH_LEAVING);
netdev->disconnect_cmd_id = l_genl_family_send(nl80211, netdev->disconnect_cmd_id = l_genl_family_send(nl80211,
disconnect, netdev_cmd_disconnect_cb, disconnect, netdev_cmd_disconnect_cb,
@ -4695,7 +4683,7 @@ static void netdev_sa_query_timeout(struct l_timeout *timeout,
l_timeout_remove(netdev->sa_query_timeout); l_timeout_remove(netdev->sa_query_timeout);
netdev->sa_query_timeout = NULL; netdev->sa_query_timeout = NULL;
msg = netdev_build_cmd_disconnect(netdev, msg = nl80211_build_disconnect(netdev->index,
MMPDU_REASON_CODE_PREV_AUTH_NOT_VALID); MMPDU_REASON_CODE_PREV_AUTH_NOT_VALID);
netdev->disconnect_cmd_id = l_genl_family_send(nl80211, msg, netdev->disconnect_cmd_id = l_genl_family_send(nl80211, msg,
netdev_disconnect_cb, netdev, NULL); netdev_disconnect_cb, netdev, NULL);

12
src/nl80211util.c
View File

@ -284,6 +284,18 @@ done:
return ret; return ret;
} }
struct l_genl_msg *nl80211_build_disconnect(uint32_t ifindex,
uint16_t reason_code)
{
struct l_genl_msg *msg;
msg = l_genl_msg_new_sized(NL80211_CMD_DISCONNECT, 64);
l_genl_msg_append_attr(msg, NL80211_ATTR_IFINDEX, 4, &ifindex);
l_genl_msg_append_attr(msg, NL80211_ATTR_REASON_CODE, 2, &reason_code);
return msg;
}
struct l_genl_msg *nl80211_build_new_key_group(uint32_t ifindex, uint32_t cipher, struct l_genl_msg *nl80211_build_new_key_group(uint32_t ifindex, uint32_t cipher,
uint8_t key_id, const uint8_t *key, uint8_t key_id, const uint8_t *key,
size_t key_len, const uint8_t *ctr, size_t key_len, const uint8_t *ctr,

3
src/nl80211util.h
View File

@ -28,6 +28,9 @@ struct band_freq_attrs;
int nl80211_parse_attrs(struct l_genl_msg *msg, int tag, ...); int nl80211_parse_attrs(struct l_genl_msg *msg, int tag, ...);
struct l_genl_msg *nl80211_build_disconnect(uint32_t ifindex,
uint16_t reason_code);
struct l_genl_msg *nl80211_build_new_key_group(uint32_t ifindex, struct l_genl_msg *nl80211_build_new_key_group(uint32_t ifindex,
uint32_t cipher, uint8_t key_id, uint32_t cipher, uint8_t key_id,
const uint8_t *key, size_t key_len, const uint8_t *key, size_t key_len,