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

monitor: Use genl APIs instead of open coding

Browse Source 
l_genl class has nice ways of discovering and requesting families.  The
genl functionality has been added after the iwmon skeleton was created,
but it is now time to migrate to using these APIs.
This commit is contained in:
Denis Kenzior 2024-07-26 10:04:05 -05:00
parent d8803b309d
commit 9762c61b4d
1 changed files with 11 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
monitor/main.c
View File

@ -224,110 +224,39 @@ struct iwmon_interface {
char *ifname; char *ifname;
bool exists; bool exists;
struct l_netlink *rtnl; struct l_netlink *rtnl;
struct l_netlink *genl; struct l_genl *genl;
struct l_io *io; struct l_io *io;
}; };
static struct iwmon_interface monitor_interface = { }; static struct iwmon_interface monitor_interface = { };
static void genl_parse(uint16_t type, const void *data, uint32_t len, static void nl80211_appeared(const struct l_genl_family_info *info,
const char *ifname) void *user_data)
{ {
const struct genlmsghdr *genlmsg = data; const char *ifname = user_data;
const struct nlattr *nla;
char name[GENL_NAMSIZ];
uint16_t id = 0;
if (nlmon)
return;
if (type != GENL_ID_CTRL)
return;
if (genlmsg->cmd != CTRL_CMD_NEWFAMILY)
return;
for (nla = data + GENL_HDRLEN; NLA_OK(nla, len);
nla = NLA_NEXT(nla, len)) {
switch (nla->nla_type & NLA_TYPE_MASK) {
case CTRL_ATTR_FAMILY_ID:
id = *((uint16_t *) NLA_DATA(nla));
break;
case CTRL_ATTR_FAMILY_NAME:
strncpy(name, NLA_DATA(nla), GENL_NAMSIZ - 1);
break;
}
}
if (id == 0)
return;
if (strcmp(name, NL80211_GENL_NAME))
return;
monitor_interface.io = open_packet(ifname); monitor_interface.io = open_packet(ifname);
if (!monitor_interface.io) if (!monitor_interface.io)
goto failed; goto failed;
nlmon = nlmon_open(id, writer_path, &config); nlmon = nlmon_open(l_genl_family_info_get_id(info),
writer_path, &config);
if (!nlmon) if (!nlmon)
goto failed; goto failed;
l_io_set_read_handler(monitor_interface.io, nlmon_receive, nlmon, NULL); l_io_set_read_handler(monitor_interface.io, nlmon_receive, nlmon, NULL);
return; return;
failed: failed:
l_main_quit(); l_main_quit();
} }
static void genl_notify(uint16_t type, const void *data, static struct l_genl *genl_lookup(const char *ifname)
uint32_t len, void *user_data)
{ {
const char *ifname = user_data; struct l_genl *genl = l_genl_new();
genl_parse(type, data, len, ifname);
}
static void genl_callback(int error, uint16_t type, const void *data,
uint32_t len, void *user_data)
{
const char *ifname = user_data;
if (error < 0) {
fprintf(stderr, "Failed to lookup nl80211 family\n");
l_main_quit();
return;
}
genl_parse(type, data, len, ifname);
}
static struct l_netlink *genl_lookup(const char *ifname)
{
struct l_netlink *genl;
char buf[GENL_HDRLEN + NLA_HDRLEN + GENL_NAMSIZ];
struct genlmsghdr *genlmsg;
struct nlattr *nla;
genl = l_netlink_new(NETLINK_GENERIC);
l_netlink_register(genl, GENL_ID_CTRL, genl_notify, NULL, NULL);
genlmsg = (struct genlmsghdr *) buf;
genlmsg->cmd = CTRL_CMD_GETFAMILY;
genlmsg->version = 0;
genlmsg->reserved = 0;
nla = (struct nlattr *) (buf + GENL_HDRLEN);
nla->nla_len = NLA_HDRLEN + GENL_NAMSIZ;
nla->nla_type = CTRL_ATTR_FAMILY_NAME;
strncpy(buf + GENL_HDRLEN + NLA_HDRLEN,
NL80211_GENL_NAME, GENL_NAMSIZ);
l_netlink_send(genl, GENL_ID_CTRL, 0, buf, sizeof(buf),
genl_callback, (char *) ifname, NULL);
l_genl_request_family(genl, NL80211_GENL_NAME, nl80211_appeared,
(char *) ifname, NULL);
return genl; return genl;
} }
@ -957,7 +886,7 @@ int main(int argc, char *argv[])
l_io_destroy(monitor_interface.io); l_io_destroy(monitor_interface.io);
l_netlink_destroy(monitor_interface.rtnl); l_netlink_destroy(monitor_interface.rtnl);
l_netlink_destroy(monitor_interface.genl); l_genl_unref(monitor_interface.genl);
l_free(monitor_interface.ifname); l_free(monitor_interface.ifname);
nlmon_close(nlmon); nlmon_close(nlmon);