Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

netdev: Drop separate mde parameter, simplify

This commit is contained in:
Andrew Zaborowski 2016-12-12 18:34:20 +01:00 committed by Denis Kenzior
parent 9c6643b773
commit b99c89fd35
3 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/device.c
View File

@ -764,8 +764,7 @@ void device_connect_network(struct device *device, struct network *network,
device->connect_pending = l_dbus_message_ref(message); device->connect_pending = l_dbus_message_ref(message);
if (netdev_connect(device->netdev, bss, hs, mde, if (netdev_connect(device->netdev, bss, hs, device_netdev_event,
device_netdev_event,
device_connect_cb, device) < 0) { device_connect_cb, device) < 0) {
handshake_state_free(hs); handshake_state_free(hs);

39
src/netdev.c
View File

@ -73,7 +73,6 @@ struct netdev {
uint32_t connect_cmd_id; uint32_t connect_cmd_id;
uint32_t disconnect_cmd_id; uint32_t disconnect_cmd_id;
enum netdev_result result; enum netdev_result result;
uint8_t *mde;
struct l_queue *watches; struct l_queue *watches;
uint32_t next_watch_id; uint32_t next_watch_id;
@ -319,9 +318,6 @@ static void netdev_connect_free(struct netdev *netdev)
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;
} }
l_free(netdev->mde);
netdev->mde = NULL;
} }
static void netdev_connect_failed(struct l_genl_msg *msg, void *user_data) static void netdev_connect_failed(struct l_genl_msg *msg, void *user_data)
@ -1101,13 +1097,14 @@ static void netdev_connect_event(struct l_genl_msg *msg,
goto error; goto error;
/* Check 802.11r IEs */ /* Check 802.11r IEs */
if (netdev->mde && !ies) if (netdev->handshake->mde && !ies)
goto error; goto error;
if (ies) { if (ies) {
struct ie_tlv_iter iter; struct ie_tlv_iter iter;
const uint8_t *mde = NULL; const uint8_t *mde = NULL;
const uint8_t *fte = NULL; const uint8_t *fte = NULL;
const uint8_t *sent_mde = netdev->handshake->mde;
ie_tlv_iter_init(&iter, ies, ies_len); ie_tlv_iter_init(&iter, ies, ies_len);
@ -1130,8 +1127,8 @@ static void netdev_connect_event(struct l_genl_msg *msg,
} }
/* An MD IE identical to the one we sent must be present */ /* An MD IE identical to the one we sent must be present */
if (netdev->mde && (!mde || memcmp(netdev->mde, if (sent_mde && (!mde || memcmp(sent_mde, mde,
mde, netdev->mde[1] + 2))) sent_mde[1] + 2)))
goto error; goto error;
/* /*
@ -1140,10 +1137,10 @@ static void netdev_connect_event(struct l_genl_msg *msg,
* in a non-RSN (12.4.2 vs. 12.4.3). * in a non-RSN (12.4.2 vs. 12.4.3).
*/ */
if (netdev->mde && !is_rsn && fte) if (sent_mde && !is_rsn && fte)
goto error; goto error;
if (netdev->mde && is_rsn) { if (sent_mde && is_rsn) {
struct ie_ft_info ft_info; struct ie_ft_info ft_info;
uint8_t zeros[32]; uint8_t zeros[32];
@ -1269,8 +1266,7 @@ static unsigned int ie_rsn_akm_suite_to_nl80211(enum ie_rsn_akm_suite akm)
static struct l_genl_msg *netdev_build_cmd_connect(struct netdev *netdev, static struct l_genl_msg *netdev_build_cmd_connect(struct netdev *netdev,
struct scan_bss *bss, struct scan_bss *bss,
struct handshake_state *hs, struct handshake_state *hs)
const uint8_t *mde)
{ {
uint32_t auth_type = NL80211_AUTHTYPE_OPEN_SYSTEM; uint32_t auth_type = NL80211_AUTHTYPE_OPEN_SYSTEM;
struct l_genl_msg *msg; struct l_genl_msg *msg;
@ -1337,9 +1333,9 @@ static struct l_genl_msg *netdev_build_cmd_connect(struct netdev *netdev,
iov_elems += 1; iov_elems += 1;
} }
if (mde) { if (hs->mde) {
iov[iov_elems].iov_base = (void *) mde; iov[iov_elems].iov_base = (void *) hs->mde;
iov[iov_elems].iov_len = mde[1] + 2; iov[iov_elems].iov_len = hs->mde[1] + 2;
iov_elems += 1; iov_elems += 1;
} }
@ -1353,7 +1349,7 @@ static int netdev_connect_common(struct netdev *netdev,
struct l_genl_msg *cmd_connect, struct l_genl_msg *cmd_connect,
struct scan_bss *bss, struct scan_bss *bss,
struct handshake_state *hs, struct handshake_state *hs,
struct eapol_sm *sm, const uint8_t *mde, struct eapol_sm *sm,
netdev_event_func_t event_filter, netdev_event_func_t event_filter,
netdev_connect_cb_t cb, void *user_data) netdev_connect_cb_t cb, void *user_data)
{ {
@ -1374,9 +1370,6 @@ static int netdev_connect_common(struct netdev *netdev,
netdev->handshake = hs; netdev->handshake = hs;
netdev->sm = sm; netdev->sm = sm;
if (mde)
netdev->mde = l_memdup(mde, mde[1] + 2);
handshake_state_set_authenticator_address(hs, bss->addr); handshake_state_set_authenticator_address(hs, bss->addr);
handshake_state_set_supplicant_address(hs, netdev->addr); handshake_state_set_supplicant_address(hs, netdev->addr);
@ -1385,7 +1378,7 @@ static int netdev_connect_common(struct netdev *netdev,
} }
int netdev_connect(struct netdev *netdev, struct scan_bss *bss, int netdev_connect(struct netdev *netdev, struct scan_bss *bss,
struct handshake_state *hs, const uint8_t *mde, struct handshake_state *hs,
netdev_event_func_t event_filter, netdev_event_func_t event_filter,
netdev_connect_cb_t cb, void *user_data) netdev_connect_cb_t cb, void *user_data)
{ {
@ -1396,14 +1389,14 @@ int netdev_connect(struct netdev *netdev, struct scan_bss *bss,
if (netdev->connected) if (netdev->connected)
return -EISCONN; return -EISCONN;
cmd_connect = netdev_build_cmd_connect(netdev, bss, hs, mde); cmd_connect = netdev_build_cmd_connect(netdev, bss, hs);
if (!cmd_connect) if (!cmd_connect)
return -EINVAL; return -EINVAL;
if (is_rsn) if (is_rsn)
sm = eapol_sm_new(hs); sm = eapol_sm_new(hs);
return netdev_connect_common(netdev, cmd_connect, bss, hs, sm, mde, return netdev_connect_common(netdev, cmd_connect, bss, hs, sm,
event_filter, cb, user_data); event_filter, cb, user_data);
} }
@ -1425,7 +1418,7 @@ int netdev_connect_wsc(struct netdev *netdev, struct scan_bss *bss,
if (netdev->connected) if (netdev->connected)
return -EISCONN; return -EISCONN;
cmd_connect = netdev_build_cmd_connect(netdev, bss, hs, NULL); cmd_connect = netdev_build_cmd_connect(netdev, bss, hs);
if (!cmd_connect) if (!cmd_connect)
return -EINVAL; return -EINVAL;
@ -1449,7 +1442,7 @@ int netdev_connect_wsc(struct netdev *netdev, struct scan_bss *bss,
eapol_sm_set_user_data(sm, user_data); eapol_sm_set_user_data(sm, user_data);
eapol_sm_set_event_func(sm, eapol_cb); eapol_sm_set_event_func(sm, eapol_cb);
return netdev_connect_common(netdev, cmd_connect, bss, hs, sm, NULL, return netdev_connect_common(netdev, cmd_connect, bss, hs, sm,
event_filter, cb, user_data); event_filter, cb, user_data);
error: error:

2
src/netdev.h
View File

@ -77,7 +77,7 @@ const char *netdev_get_name(struct netdev *netdev);
bool netdev_get_is_up(struct netdev *netdev); bool netdev_get_is_up(struct netdev *netdev);
int netdev_connect(struct netdev *netdev, struct scan_bss *bss, int netdev_connect(struct netdev *netdev, struct scan_bss *bss,
struct handshake_state *hs, const uint8_t *mde, struct handshake_state *hs,
netdev_event_func_t event_filter, netdev_event_func_t event_filter,
netdev_connect_cb_t cb, void *user_data); netdev_connect_cb_t cb, void *user_data);
int netdev_connect_wsc(struct netdev *netdev, struct scan_bss *bss, int netdev_connect_wsc(struct netdev *netdev, struct scan_bss *bss,