Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-05-06 09:27:25 +02:00
Code Releases Activity

wiphy: Keep track of new/set key command ids

Browse Source
This commit is contained in:
Denis Kenzior 2015-03-29 21:11:19 -05:00
parent e2badc9828
commit 85a5d7ba98
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/wiphy.c
View File

@ -84,6 +84,10 @@ struct netdev {
struct bss *connected_bss; struct bss *connected_bss;
struct l_dbus_message *connect_pending; struct l_dbus_message *connect_pending;
struct l_io *eapol_io; struct l_io *eapol_io;
uint32_t pairwise_new_key_cmd_id;
uint32_t pairwise_set_key_cmd_id;
uint32_t group_new_key_cmd_id;
}; };
struct wiphy { struct wiphy {
@ -730,6 +734,10 @@ static bool wiphy_match(const void *a, const void *b)
static void mlme_set_pairwise_key_cb(struct l_genl_msg *msg, void *data) static void mlme_set_pairwise_key_cb(struct l_genl_msg *msg, void *data)
{ {
struct netdev *netdev = data;
netdev->pairwise_set_key_cmd_id = 0;
/* TODO: De-authenticate */ /* TODO: De-authenticate */
if (l_genl_msg_get_error(msg) < 0) if (l_genl_msg_get_error(msg) < 0)
return; return;
@ -764,6 +772,10 @@ static unsigned int mlme_set_pairwise_key(struct netdev *netdev)
static void mlme_new_pairwise_key_cb(struct l_genl_msg *msg, void *data) static void mlme_new_pairwise_key_cb(struct l_genl_msg *msg, void *data)
{ {
struct netdev *netdev = data;
netdev->pairwise_new_key_cmd_id = 0;
/* TODO: De-authenticate */ /* TODO: De-authenticate */
if (l_genl_msg_get_error(msg) < 0) if (l_genl_msg_get_error(msg) < 0)
return; return;
@ -819,13 +831,10 @@ static void wiphy_set_tk(uint32_t ifindex, const uint8_t *aa,
return; return;
} }
/* netdev->pairwise_new_key_cmd_id =
* TODO: Save pending command ids so the commands can be canceled
* in case we de-authenticate
*/
mlme_new_pairwise_key(netdev, cipher, aa, mlme_new_pairwise_key(netdev, cipher, aa,
tk, crypto_cipher_key_len(cipher)); tk, crypto_cipher_key_len(cipher));
mlme_set_pairwise_key(netdev); netdev->pairwise_set_key_cmd_id = mlme_set_pairwise_key(netdev);
} }
static void operstate_cb(bool result, void *user_data) static void operstate_cb(bool result, void *user_data)
@ -892,6 +901,8 @@ static void mlme_new_group_key_cb(struct l_genl_msg *msg, void *data)
{ {
struct netdev *netdev = data; struct netdev *netdev = data;
netdev->group_new_key_cmd_id = 0;
/* TODO: De-authenticate */ /* TODO: De-authenticate */
if (l_genl_msg_get_error(msg) < 0) { if (l_genl_msg_get_error(msg) < 0) {
if (netdev->connect_pending) if (netdev->connect_pending)
@ -964,10 +975,7 @@ static void wiphy_set_gtk(uint32_t ifindex, uint8_t key_index,
return; return;
} }
/* netdev->group_new_key_cmd_id =
* TODO: Save pending command id so the command can be canceled
* in case we de-authenticate
*/
mlme_new_group_key(netdev, cipher, key_index, mlme_new_group_key(netdev, cipher, key_index,
gtk, crypto_cipher_key_len(cipher), gtk, crypto_cipher_key_len(cipher),
rsc, rsc_len); rsc, rsc_len);