osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Add a bunch of casts to squelch -Wc++-compat warnings. 

Don't assume that enum nl80211_channel_type and enum
ws80211_channel_type happen to have matching values, map between them,
and always assign the right enum value to the right type.  This is safer
(yes, they do happen to have matching values, but it's not very clean to
assume that), and also eliminates some -Wc++-compat warnings.

svn path=/trunk/; revision=48717
This commit is contained in:
Guy Harris 2013-04-03 08:10:55 +00:00
parent b6ee206d2f
commit 88324c19ea
1 changed files with 55 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
ws80211_utils.c
View File

@ -106,21 +106,21 @@ int ws80211_init(void)
static int error_handler(struct sockaddr_nl *nla _U_, struct nlmsgerr *err,
void *arg)
{
int *ret = arg;
int *ret = (int *)arg;
*ret = err->error;
return NL_STOP;
}
static int finish_handler(struct nl_msg *msg _U_, void *arg)
{
int *ret = arg;
int *ret = (int *)arg;
*ret = 0;
return NL_SKIP;
}
static int ack_handler(struct nl_msg *msg _U_, void *arg)
{
int *ret = arg;
int *ret = (int *)arg;
*ret = 0;
return NL_STOP;
}
@ -156,12 +156,33 @@ struct nliface_cookie
GArray *interfaces;
};
/*
* And now for a steaming heap of suck.
*
* The nla_for_each_nested() macro defined by at least some versions of the
* Linux kernel's headers doesn't do the casting required when compiling
* with a C++ compiler or with -Wc++-compat, so we get warnings, and those
* warnings are fatal when we compile this file.
*
* So we replace it with our own version, which does the requisite cast.
*/
/**
* nla_for_each_nested - iterate over nested attributes
* @pos: loop counter, set to current attribute
* @nla: attribute containing the nested attributes
* @rem: initialized to len, holds bytes currently remaining in stream
*/
#undef nla_for_each_nested
#define nla_for_each_nested(pos, nla, rem) \
nla_for_each_attr(pos, (struct nlattr *)nla_data(nla), nla_len(nla), rem)
static int get_phys_handler(struct nl_msg *msg, void *arg)
{
struct nlattr *tb_msg[NL80211_ATTR_MAX + 1];
struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
struct genlmsghdr *gnlh = (struct genlmsghdr *)nlmsg_data(nlmsg_hdr(msg));
struct nliface_cookie *cookie = arg;
struct nliface_cookie *cookie = (struct nliface_cookie *)arg;
struct nlattr *tb_band[NL80211_BAND_ATTR_MAX + 1];
@ -198,7 +219,7 @@ static int get_phys_handler(struct nl_msg *msg, void *arg)
if (!cap_monitor)
return NL_SKIP;
iface = g_malloc0(sizeof(*iface));
iface = (struct ws80211_interface *)g_malloc0(sizeof(*iface));
if (!iface)
return NL_SKIP;
@ -213,7 +234,8 @@ static int get_phys_handler(struct nl_msg *msg, void *arg)
nla_for_each_nested(nl_band, tb_msg[NL80211_ATTR_WIPHY_BANDS], rem_band) {
bandidx++;
nla_parse(tb_band, NL80211_BAND_ATTR_MAX, nla_data(nl_band),
nla_parse(tb_band, NL80211_BAND_ATTR_MAX,
(struct nlattr *)nla_data(nl_band),
nla_len(nl_band), NULL);
#ifdef NL80211_BAND_ATTR_HT_CAPA
@ -230,7 +252,8 @@ static int get_phys_handler(struct nl_msg *msg, void *arg)
nla_for_each_nested(nl_freq, tb_band[NL80211_BAND_ATTR_FREQS], rem_freq) {
uint32_t freq;
nla_parse(tb_freq, NL80211_FREQUENCY_ATTR_MAX, nla_data(nl_freq),
nla_parse(tb_freq, NL80211_FREQUENCY_ATTR_MAX,
(struct nlattr *)nla_data(nl_freq),
nla_len(nl_freq), freq_policy);
if (!tb_freq[NL80211_FREQUENCY_ATTR_FREQ])
continue;
@ -321,9 +344,9 @@ struct __iface_info
static int get_iface_info_handler(struct nl_msg *msg, void *arg)
{
struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
struct genlmsghdr *gnlh = (struct genlmsghdr *)nlmsg_data(nlmsg_hdr(msg));
struct nlattr *tb_msg[NL80211_ATTR_MAX + 1];
struct __iface_info *iface_info = arg;
struct __iface_info *iface_info = (struct __iface_info *)arg;
nla_parse(tb_msg, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0),
genlmsg_attrlen(gnlh, 0), NULL);
@ -337,10 +360,28 @@ static int get_iface_info_handler(struct nl_msg *msg, void *arg)
if (tb_msg[NL80211_ATTR_WIPHY_FREQ]) {
iface_info->pub->current_freq = nla_get_u32(tb_msg[NL80211_ATTR_WIPHY_FREQ]);
iface_info->pub->current_chan_type = NL80211_CHAN_NO_HT;
iface_info->pub->current_chan_type = WS80211_CHAN_NO_HT;
if (tb_msg[NL80211_ATTR_WIPHY_CHANNEL_TYPE])
iface_info->pub->current_chan_type = nla_get_u32(tb_msg[NL80211_ATTR_WIPHY_CHANNEL_TYPE]);
if (tb_msg[NL80211_ATTR_WIPHY_CHANNEL_TYPE]) {
switch (nla_get_u32(tb_msg[NL80211_ATTR_WIPHY_CHANNEL_TYPE])) {
case NL80211_CHAN_NO_HT:
iface_info->pub->current_chan_type = WS80211_CHAN_NO_HT;
break;
case NL80211_CHAN_HT20:
iface_info->pub->current_chan_type = WS80211_CHAN_HT20;
break;
case NL80211_CHAN_HT40MINUS:
iface_info->pub->current_chan_type = WS80211_CHAN_HT40MINUS;
break;
case NL80211_CHAN_HT40PLUS:
iface_info->pub->current_chan_type = WS80211_CHAN_HT40PLUS;
break;
}
}
}
return NL_SKIP;
@ -390,7 +431,7 @@ int ws80211_get_iface_info(const char *name, struct ws80211_iface_info *iface_in
__iface_info.type = -1;
__iface_info.phyidx= -1;
__iface_info.pub->current_freq = -1;
__iface_info.pub->current_chan_type = -1;
__iface_info.pub->current_chan_type = WS80211_CHAN_NO_HT;
return __ws80211_get_iface_info(name, &__iface_info);
}