Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libiwinfo: add restricted flag for freqlist

Browse source
This commit is contained in:
Jo-Philipp Wich 2010-10-19 03:52:55 +00:00
parent f01178a19a
commit 66736c8574
7 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/package/iwinfo/Makefile
View file

@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libiwinfo PKG_NAME:=libiwinfo
PKG_RELEASE:=5 PKG_RELEASE:=6
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)

1
contrib/package/iwinfo/src/iwinfo.h
View file

@ -66,6 +66,7 @@ struct iwinfo_txpwrlist_entry {
struct iwinfo_freqlist_entry { struct iwinfo_freqlist_entry {
uint8_t channel; uint8_t channel;
uint32_t mhz; uint32_t mhz;
uint8_t restricted;
}; };
struct iwinfo_crypto_entry { struct iwinfo_crypto_entry {

5
contrib/package/iwinfo/src/iwinfo.lua
View file

@ -105,9 +105,10 @@ function print_freqlist(api, dev)
if fl and #fl > 0 then if fl and #fl > 0 then
for _, fe in ipairs(fl) do for _, fe in ipairs(fl) do
printf("%s %.3f GHz (Channel %d)", printf("%s %.3f GHz (Channel %d)%s",
(cc == fe.channel) and "*" or " ", (cc == fe.channel) and "*" or " ",
n(fe.mhz) / 1000, n(fe.channel)) n(fe.mhz) / 1000, n(fe.channel),
fe.restricted and " [restricted]" or "")
end end
else else
print("No frequency information available") print("No frequency information available")

4
contrib/package/iwinfo/src/iwinfo_lualib.c
View file

@ -671,6 +671,10 @@ static int iwinfo_L_freqlist(lua_State *L, int (*func)(const char *, char *, int
lua_pushinteger(L, e->channel); lua_pushinteger(L, e->channel);
lua_setfield(L, -2, "channel"); lua_setfield(L, -2, "channel");
/* Restricted (DFS/TPC/Radar) */
lua_pushboolean(L, e->restricted);
lua_setfield(L, -2, "restricted");
lua_rawseti(L, -2, x); lua_rawseti(L, -2, x);
} }
} }

5
contrib/package/iwinfo/src/iwinfo_madwifi.c
View file

@ -805,8 +805,9 @@ int madwifi_get_freqlist(const char *ifname, char *buf, int *len)
for( i = 0; i < chans.ic_nchans; i++ ) for( i = 0; i < chans.ic_nchans; i++ )
{ {
entry.mhz = chans.ic_chans[i].ic_freq; entry.mhz = chans.ic_chans[i].ic_freq;
entry.channel = chans.ic_chans[i].ic_ieee; entry.channel = chans.ic_chans[i].ic_ieee;
entry.restricted = 0;
memcpy(&buf[bl], &entry, sizeof(struct iwinfo_freqlist_entry)); memcpy(&buf[bl], &entry, sizeof(struct iwinfo_freqlist_entry));
bl += sizeof(struct iwinfo_freqlist_entry); bl += sizeof(struct iwinfo_freqlist_entry);

12
contrib/package/iwinfo/src/iwinfo_nl80211.c
View file

@ -1319,9 +1319,6 @@ int nl80211_get_freqlist(const char *ifname, char *buf, int *len)
[NL80211_FREQUENCY_ATTR_MAX_TX_POWER] = { .type = NLA_U32 }, [NL80211_FREQUENCY_ATTR_MAX_TX_POWER] = { .type = NLA_U32 },
}; };
if( !wext_get_freqlist(ifname, buf, len) )
return 0;
req = nl80211_msg(ifname, NL80211_CMD_GET_WIPHY, 0); req = nl80211_msg(ifname, NL80211_CMD_GET_WIPHY, 0);
if( req ) if( req )
{ {
@ -1340,9 +1337,18 @@ int nl80211_get_freqlist(const char *ifname, char *buf, int *len)
nla_parse(freqs, NL80211_FREQUENCY_ATTR_MAX, nla_parse(freqs, NL80211_FREQUENCY_ATTR_MAX,
nla_data(freq), nla_len(freq), freq_policy); nla_data(freq), nla_len(freq), freq_policy);
if( freqs[NL80211_FREQUENCY_ATTR_DISABLED] )
continue;
e->mhz = nla_get_u32(freqs[NL80211_FREQUENCY_ATTR_FREQ]); e->mhz = nla_get_u32(freqs[NL80211_FREQUENCY_ATTR_FREQ]);
e->channel = nl80211_freq2channel(e->mhz); e->channel = nl80211_freq2channel(e->mhz);
e->restricted = (
freqs[NL80211_FREQUENCY_ATTR_PASSIVE_SCAN] ||
freqs[NL80211_FREQUENCY_ATTR_NO_IBSS] ||
freqs[NL80211_FREQUENCY_ATTR_RADAR]
) ? 1 : 0;
e++; e++;
count++; count++;
} }

5
contrib/package/iwinfo/src/iwinfo_wext.c
View file

@ -444,8 +444,9 @@ int wext_get_freqlist(const char *ifname, char *buf, int *len)
for(i = 0; i < range.num_frequency; i++) for(i = 0; i < range.num_frequency; i++)
{ {
entry.mhz = wext_freq2mhz(&range.freq[i]); entry.mhz = wext_freq2mhz(&range.freq[i]);
entry.channel = range.freq[i].i; entry.channel = range.freq[i].i;
entry.restricted = 0;
memcpy(&buf[bl], &entry, sizeof(struct iwinfo_freqlist_entry)); memcpy(&buf[bl], &entry, sizeof(struct iwinfo_freqlist_entry));
bl += sizeof(struct iwinfo_freqlist_entry); bl += sizeof(struct iwinfo_freqlist_entry);