DGNum/iwinfo
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nl80211: turn nl80211_wait() into variadic function

Browse source 
Extend the nl82011_wait() function to accept multiple command numbers.

This is useful to wait for different possible results, e.g. either
NL80211_CMD_NEW_SCAN_RESULTS or NL80211_CMD_SCAN_ABORTED.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2018-01-17 13:27:03 +01:00
parent 5a5e21b158
commit 75c572074f
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
iwinfo_nl80211.c
View file

@ -510,7 +510,7 @@ static int nl80211_wait_cb(struct nl_msg *msg, void *arg)
struct nl80211_event_conveyor *cv = arg; struct nl80211_event_conveyor *cv = arg;
struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg)); struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
if (gnlh->cmd == cv->wait) if (cv->wait[gnlh->cmd / 32] & (1 << (gnlh->cmd % 32)))
cv->recv = gnlh->cmd; cv->recv = gnlh->cmd;
return NL_SKIP; return NL_SKIP;
@ -521,11 +521,13 @@ static int nl80211_wait_seq_check(struct nl_msg *msg, void *arg)
return NL_OK; return NL_OK;
} }
static int nl80211_wait(const char *family, const char *group, int cmd) static int __nl80211_wait(const char *family, const char *group, ...)
{ {
struct nl80211_event_conveyor cv = { .wait = cmd }; struct nl80211_event_conveyor cv = { };
struct nl_cb *cb; struct nl_cb *cb;
int err = 0; int err = 0;
int cmd;
va_list ap;
if (nl80211_subscribe(family, group)) if (nl80211_subscribe(family, group))
return -ENOENT; return -ENOENT;
@ -539,6 +541,13 @@ static int nl80211_wait(const char *family, const char *group, int cmd)
nl_cb_set(cb, NL_CB_SEQ_CHECK, NL_CB_CUSTOM, nl80211_wait_seq_check, NULL); nl_cb_set(cb, NL_CB_SEQ_CHECK, NL_CB_CUSTOM, nl80211_wait_seq_check, NULL);
nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, nl80211_wait_cb, &cv ); nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, nl80211_wait_cb, &cv );
va_start(ap, group);
for (cmd = va_arg(ap, int); cmd != 0; cmd = va_arg(ap, int))
cv.wait[cmd / 32] |= (1 << (cmd % 32));
va_end(ap);
while (!cv.recv && !err) while (!cv.recv && !err)
nl_recvmsgs(nls->nl_sock, cb); nl_recvmsgs(nls->nl_sock, cb);
@ -547,6 +556,9 @@ static int nl80211_wait(const char *family, const char *group, int cmd)
return err; return err;
} }
#define nl80211_wait(family, group, ...) \
__nl80211_wait(family, group, __VA_ARGS__, 0)
static int nl80211_freq2channel(int freq) static int nl80211_freq2channel(int freq)
{ {

2
iwinfo_nl80211.h
View file

@ -48,7 +48,7 @@ struct nl80211_msg_conveyor {
}; };
struct nl80211_event_conveyor { struct nl80211_event_conveyor {
int wait; uint32_t wait[(NL80211_CMD_MAX / 32) + !!(NL80211_CMD_MAX % 32)];
int recv; int recv;
}; };