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

libiwinfo: fix signal, bitrate and assoclist for nl80211 wds ap mode

Browse source
This commit is contained in:
Jo-Philipp Wich 2011-04-30 10:16:35 +00:00
parent 4d7777f44d
commit 087f4b2752
2 changed files with 69 additions and 39 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:=14 PKG_RELEASE:=15
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)

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

@ -655,7 +655,7 @@ int nl80211_get_txpower(const char *ifname, int *buf)
} }
static int nl80211_get_signal_cb(struct nl_msg *msg, void *arg) static int nl80211_fill_signal_cb(struct nl_msg *msg, void *arg)
{ {
int8_t dbm; int8_t dbm;
int16_t mbit; int16_t mbit;
@ -719,30 +719,53 @@ static int nl80211_get_signal_cb(struct nl_msg *msg, void *arg)
return NL_SKIP; return NL_SKIP;
} }
static void nl80211_fill_signal(const char *ifname, struct nl80211_rssi_rate *r)
{
DIR *d;
struct dirent *de;
struct nl80211_msg_conveyor *req;
r->rssi = 0;
r->rate = 0;
if ((d = opendir("/sys/class/net")) != NULL)
{
while ((de = readdir(d)) != NULL)
{
if (!strncmp(de->d_name, ifname, strlen(ifname)) &&
(!de->d_name[strlen(ifname)] ||
!strncmp(&de->d_name[strlen(ifname)], ".sta", 4)))
{
req = nl80211_msg(de->d_name, NL80211_CMD_GET_STATION,
NLM_F_DUMP);
if (req)
{
nl80211_cb(req, nl80211_fill_signal_cb, r);
nl80211_send(req);
nl80211_free(req);
}
}
}
closedir(d);
}
}
int nl80211_get_bitrate(const char *ifname, int *buf) int nl80211_get_bitrate(const char *ifname, int *buf)
{ {
struct nl80211_rssi_rate rr; struct nl80211_rssi_rate rr;
struct nl80211_msg_conveyor *req;
if( !wext_get_bitrate(ifname, buf) ) if( !wext_get_bitrate(ifname, buf) )
return 0; return 0;
req = nl80211_msg(ifname, NL80211_CMD_GET_STATION, NLM_F_DUMP); nl80211_fill_signal(ifname, &rr);
if( req )
{
rr.rssi = 0;
rr.rate = 0;
nl80211_cb(req, nl80211_get_signal_cb, &rr);
nl80211_send(req);
nl80211_free(req);
if (rr.rate) if (rr.rate)
{ {
*buf = (rr.rate * 100); *buf = (rr.rate * 100);
return 0; return 0;
} }
}
return -1; return -1;
} }
@ -750,27 +773,17 @@ int nl80211_get_bitrate(const char *ifname, int *buf)
int nl80211_get_signal(const char *ifname, int *buf) int nl80211_get_signal(const char *ifname, int *buf)
{ {
struct nl80211_rssi_rate rr; struct nl80211_rssi_rate rr;
struct nl80211_msg_conveyor *req;
if( !wext_get_signal(ifname, buf) ) if( !wext_get_signal(ifname, buf) )
return 0; return 0;
req = nl80211_msg(ifname, NL80211_CMD_GET_STATION, NLM_F_DUMP); nl80211_fill_signal(ifname, &rr);
if( req )
{
rr.rssi = 0;
rr.rate = 0;
nl80211_cb(req, nl80211_get_signal_cb, &rr);
nl80211_send(req);
nl80211_free(req);
if (rr.rssi) if (rr.rssi)
{ {
*buf = rr.rssi; *buf = rr.rssi;
return 0; return 0;
} }
}
return -1; return -1;
} }
@ -1085,20 +1098,37 @@ static int nl80211_get_assoclist_cb(struct nl_msg *msg, void *arg)
int nl80211_get_assoclist(const char *ifname, char *buf, int *len) int nl80211_get_assoclist(const char *ifname, char *buf, int *len)
{ {
DIR *d;
struct dirent *de;
struct nl80211_assoc_count ac; struct nl80211_assoc_count ac;
struct nl80211_msg_conveyor *req; struct nl80211_msg_conveyor *req;
nl80211_get_noise(ifname, &ac.noise); if ((d = opendir("/sys/class/net")) != NULL)
req = nl80211_msg(ifname, NL80211_CMD_GET_STATION, NLM_F_DUMP);
if( req )
{ {
ac.count = 0; ac.count = 0;
ac.entry = (struct iwinfo_assoclist_entry *)buf; ac.entry = (struct iwinfo_assoclist_entry *)buf;
nl80211_get_noise(ifname, &ac.noise);
while ((de = readdir(d)) != NULL)
{
if (!strncmp(de->d_name, ifname, strlen(ifname)) &&
(!de->d_name[strlen(ifname)] ||
!strncmp(&de->d_name[strlen(ifname)], ".sta", 4)))
{
req = nl80211_msg(de->d_name, NL80211_CMD_GET_STATION,
NLM_F_DUMP);
if (req)
{
nl80211_cb(req, nl80211_get_assoclist_cb, &ac); nl80211_cb(req, nl80211_get_assoclist_cb, &ac);
nl80211_send(req); nl80211_send(req);
nl80211_free(req); nl80211_free(req);
}
}
}
closedir(d);
*len = (ac.count * sizeof(struct iwinfo_assoclist_entry)); *len = (ac.count * sizeof(struct iwinfo_assoclist_entry));
return 0; return 0;