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

netdev: Deauthenticate prior to calling connect_cb

Browse Source
This commit is contained in:
Denis Kenzior 2016-09-21 16:19:47 -05:00
parent 92a51805c4
commit c380940b43
1 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/netdev.c
View File

@ -69,6 +69,7 @@ struct netdev {
uint32_t group_new_key_cmd_id; uint32_t group_new_key_cmd_id;
uint32_t connect_cmd_id; uint32_t connect_cmd_id;
uint32_t disconnect_cmd_id; uint32_t disconnect_cmd_id;
enum netdev_result result;
struct l_queue *watches; struct l_queue *watches;
uint32_t next_watch_id; uint32_t next_watch_id;
@ -282,6 +283,8 @@ static void netdev_connect_free(struct netdev *netdev)
netdev->connected = false; netdev->connected = false;
netdev->connect_cb = NULL; netdev->connect_cb = NULL;
netdev->event_filter = NULL; netdev->event_filter = NULL;
netdev->user_data = NULL;
netdev->result = NETDEV_RESULT_OK;
if (netdev->pairwise_new_key_cmd_id) { if (netdev->pairwise_new_key_cmd_id) {
l_genl_family_cancel(nl80211, netdev->pairwise_new_key_cmd_id); l_genl_family_cancel(nl80211, netdev->pairwise_new_key_cmd_id);
@ -301,9 +304,26 @@ static void netdev_connect_free(struct netdev *netdev)
if (netdev->connect_cmd_id) { if (netdev->connect_cmd_id) {
l_genl_family_cancel(nl80211, netdev->connect_cmd_id); l_genl_family_cancel(nl80211, netdev->connect_cmd_id);
netdev->connect_cmd_id = 0; netdev->connect_cmd_id = 0;
} else if (netdev->disconnect_cmd_id) {
l_genl_family_cancel(nl80211, netdev->disconnect_cmd_id);
netdev->disconnect_cmd_id = 0;
} }
} }
static void netdev_connect_failed(struct l_genl_msg *msg, void *user_data)
{
struct netdev *netdev = user_data;
netdev_connect_cb_t connect_cb = netdev->connect_cb;
void *connect_data = netdev->user_data;
enum netdev_result result = netdev->result;
/* Done this way to allow re-entract netdev_connect calls */
netdev_connect_free(netdev);
if (connect_cb)
connect_cb(netdev, result, connect_data);
}
static void netdev_free(void *data) static void netdev_free(void *data)
{ {
struct netdev *netdev = data; struct netdev *netdev = data;
@ -311,11 +331,8 @@ static void netdev_free(void *data)
l_debug("Freeing netdev %s[%d]", netdev->name, netdev->index); l_debug("Freeing netdev %s[%d]", netdev->name, netdev->index);
if (netdev->connected) { if (netdev->connected) {
if (netdev->connect_cb) netdev->result = NETDEV_RESULT_ABORTED;
netdev->connect_cb(netdev, NETDEV_RESULT_ABORTED, netdev_connect_failed(NULL, netdev);
netdev->user_data);
netdev_connect_free(netdev);
} else if (netdev->disconnect_cmd_id) { } else if (netdev->disconnect_cmd_id) {
l_genl_family_cancel(nl80211, netdev->disconnect_cmd_id); l_genl_family_cancel(nl80211, netdev->disconnect_cmd_id);
netdev->disconnect_cmd_id = 0; netdev->disconnect_cmd_id = 0;
@ -536,17 +553,12 @@ static void netdev_operstate_cb(bool success, void *user_data)
l_error("Setting LinkMode and OperState failed for ifindex: %d", l_error("Setting LinkMode and OperState failed for ifindex: %d",
netdev->index); netdev->index);
netdev->result = NETDEV_RESULT_KEY_SETTING_FAILED;
msg = netdev_build_cmd_deauthenticate(netdev, msg = netdev_build_cmd_deauthenticate(netdev,
MPDU_REASON_CODE_UNSPECIFIED); MPDU_REASON_CODE_UNSPECIFIED);
l_genl_family_send(nl80211, msg, NULL, NULL, NULL); netdev->disconnect_cmd_id = l_genl_family_send(nl80211, msg,
netdev_connect_failed,
if (netdev->connect_cb) netdev, NULL);
netdev->connect_cb(netdev,
NETDEV_RESULT_KEY_SETTING_FAILED,
netdev->user_data);
netdev_connect_free(netdev);
return; return;
} }
@ -576,15 +588,12 @@ static void netdev_setting_keys_failed(struct netdev *netdev,
l_genl_family_cancel(nl80211, netdev->group_new_key_cmd_id); l_genl_family_cancel(nl80211, netdev->group_new_key_cmd_id);
netdev->group_new_key_cmd_id = 0; netdev->group_new_key_cmd_id = 0;
netdev->result = NETDEV_RESULT_KEY_SETTING_FAILED;
msg = netdev_build_cmd_deauthenticate(netdev, msg = netdev_build_cmd_deauthenticate(netdev,
MPDU_REASON_CODE_UNSPECIFIED); MPDU_REASON_CODE_UNSPECIFIED);
l_genl_family_send(nl80211, msg, NULL, NULL, NULL); netdev->disconnect_cmd_id = l_genl_family_send(nl80211, msg,
netdev_connect_failed,
if (netdev->connect_cb) netdev, NULL);
netdev->connect_cb(netdev, NETDEV_RESULT_KEY_SETTING_FAILED,
netdev->user_data);
netdev_connect_free(netdev);
} }
static void netdev_set_station_cb(struct l_genl_msg *msg, void *user_data) static void netdev_set_station_cb(struct l_genl_msg *msg, void *user_data)
@ -887,14 +896,11 @@ static void netdev_handshake_failed(uint32_t ifindex,
netdev->eapol_active = false; netdev->eapol_active = false;
netdev->connected = false; netdev->connected = false;
netdev->result = NETDEV_RESULT_HANDSHAKE_FAILED;
msg = netdev_build_cmd_deauthenticate(netdev, reason_code); msg = netdev_build_cmd_deauthenticate(netdev, reason_code);
l_genl_family_send(nl80211, msg, NULL, NULL, NULL); netdev->disconnect_cmd_id = l_genl_family_send(nl80211, msg,
netdev_connect_failed,
if (netdev->connect_cb) netdev, NULL);
netdev->connect_cb(netdev, NETDEV_RESULT_HANDSHAKE_FAILED,
netdev->user_data);
netdev_connect_free(netdev);
} }
static void hardware_rekey_cb(struct l_genl_msg *msg, void *data) static void hardware_rekey_cb(struct l_genl_msg *msg, void *data)
@ -958,15 +964,6 @@ static void netdev_set_rekey_offload(uint32_t ifindex,
} }
static void netdev_connect_failed(struct netdev *netdev,
enum netdev_result result)
{
if (netdev->connect_cb)
netdev->connect_cb(netdev, result, netdev->user_data);
netdev_connect_free(netdev);
}
static void netdev_connect_event(struct l_genl_msg *msg, static void netdev_connect_event(struct l_genl_msg *msg,
struct netdev *netdev) struct netdev *netdev)
{ {
@ -1019,7 +1016,8 @@ static void netdev_connect_event(struct l_genl_msg *msg,
return; return;
error: error:
netdev_connect_failed(netdev, NETDEV_RESULT_ASSOCIATION_FAILED); netdev->result = NETDEV_RESULT_ASSOCIATION_FAILED;
netdev_connect_failed(NULL, netdev);
} }
static void netdev_authenticate_event(struct l_genl_msg *msg, static void netdev_authenticate_event(struct l_genl_msg *msg,
@ -1050,7 +1048,8 @@ static void netdev_cmd_connect_cb(struct l_genl_msg *msg, void *user_data)
return; return;
} }
netdev_connect_failed(netdev, NETDEV_RESULT_ASSOCIATION_FAILED); netdev->result = NETDEV_RESULT_ASSOCIATION_FAILED;
netdev_connect_failed(NULL, netdev);
} }
static struct l_genl_msg *netdev_build_cmd_connect(struct netdev *netdev, static struct l_genl_msg *netdev_build_cmd_connect(struct netdev *netdev,
@ -1203,7 +1202,8 @@ int netdev_disconnect(struct netdev *netdev,
if (!netdev->connected) if (!netdev->connected)
return -ENOTCONN; return -ENOTCONN;
netdev_connect_failed(netdev, NETDEV_RESULT_ABORTED); netdev->result = NETDEV_RESULT_ABORTED;
netdev_connect_failed(NULL, netdev);
deauthenticate = netdev_build_cmd_deauthenticate(netdev, deauthenticate = netdev_build_cmd_deauthenticate(netdev,
MPDU_REASON_CODE_DEAUTH_LEAVING); MPDU_REASON_CODE_DEAUTH_LEAVING);