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

p2p: Use nl80211_parse_attrs

Browse Source 
Simplify p2p_device_update_from_genl by making use of nl80211_parse_attrs.
This commit is contained in:
Andrew Zaborowski 2020-07-11 03:00:39 +02:00 committed by Denis Kenzior
parent 09c9482045
commit a09d7628dd
1 changed files with 16 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/p2p.c
View File

@ -3044,74 +3044,34 @@ static void p2p_mlme_notify(struct l_genl_msg *msg, void *user_data)
struct p2p_device *p2p_device_update_from_genl(struct l_genl_msg *msg, struct p2p_device *p2p_device_update_from_genl(struct l_genl_msg *msg,
bool create) bool create)
{ {
struct l_genl_attr attr; const uint8_t *ifaddr;
uint16_t type, len; uint32_t iftype;
const void *data; uint64_t wdev_id;
const uint8_t *ifaddr = NULL; uint32_t wiphy_id;
const uint64_t *wdev_id = NULL; struct wiphy *wiphy;
struct wiphy *wiphy = NULL;
struct p2p_device *dev; struct p2p_device *dev;
char hostname[HOST_NAME_MAX + 1]; char hostname[HOST_NAME_MAX + 1];
char *str; char *str;
unsigned int uint_val; unsigned int uint_val;
if (!l_genl_attr_init(&attr, msg)) if (nl80211_parse_attrs(msg, NL80211_ATTR_WDEV, &wdev_id,
return NULL; NL80211_ATTR_WIPHY, &wiphy_id,
NL80211_ATTR_IFTYPE, &iftype,
while (l_genl_attr_next(&attr, &type, &len, &data)) { NL80211_ATTR_MAC, &ifaddr,
switch (type) { NL80211_ATTR_UNSPEC) < 0 ||
case NL80211_ATTR_WDEV: L_WARN_ON(!(wiphy = wiphy_find(wiphy_id))) ||
if (len != sizeof(uint64_t)) { L_WARN_ON(iftype != NL80211_IFTYPE_P2P_DEVICE)) {
l_warn("Invalid wdev index attribute");
return NULL;
}
wdev_id = data;
break;
case NL80211_ATTR_WIPHY:
if (len != sizeof(uint32_t)) {
l_warn("Invalid wiphy attribute");
return NULL;
}
wiphy = wiphy_find(*((uint32_t *) data));
break;
case NL80211_ATTR_IFTYPE:
if (len != sizeof(uint32_t)) {
l_warn("Invalid interface type attribute");
return NULL;
}
if (*((uint32_t *) data) != NL80211_IFTYPE_P2P_DEVICE)
return NULL;
break;
case NL80211_ATTR_MAC:
if (len != ETH_ALEN) {
l_warn("Invalid interface address attribute");
return NULL;
}
ifaddr = data;
break;
}
}
if (!wiphy || !wdev_id || !ifaddr) {
l_warn("Unable to parse interface information"); l_warn("Unable to parse interface information");
return NULL; return NULL;
} }
if (create) { if (create) {
if (p2p_device_find(*wdev_id)) { if (p2p_device_find(wdev_id)) {
l_debug("Duplicate p2p device %" PRIx64, *wdev_id); l_debug("Duplicate p2p device %" PRIx64, wdev_id);
return NULL; return NULL;
} }
} else { } else {
dev = p2p_device_find(*wdev_id); dev = p2p_device_find(wdev_id);
if (!dev) if (!dev)
return NULL; return NULL;
@ -3120,7 +3080,7 @@ struct p2p_device *p2p_device_update_from_genl(struct l_genl_msg *msg,
} }
dev = l_new(struct p2p_device, 1); dev = l_new(struct p2p_device, 1);
dev->wdev_id = *wdev_id; dev->wdev_id = wdev_id;
memcpy(dev->addr, ifaddr, ETH_ALEN); memcpy(dev->addr, ifaddr, ETH_ALEN);
dev->nl80211 = l_genl_family_new(iwd_get_genl(), NL80211_GENL_NAME); dev->nl80211 = l_genl_family_new(iwd_get_genl(), NL80211_GENL_NAME);
dev->wiphy = wiphy; dev->wiphy = wiphy;