hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[package] iwinfo: transparently handle radioX names in madwifi backend 

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33180 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Jo-Philipp Wich 2012-08-14 10:33:40 +00:00
parent 4867ab5490
commit 07f112a8e7
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
package/iwinfo/src/iwinfo_madwifi.c
View File

@ -196,6 +196,18 @@ static struct ISO3166_to_CCode
}; };
static const char * madwifi_phyname(const char *ifname)
{
static char phyname[IFNAMSIZ];
if (strlen(ifname) > 5 && !strncmp(ifname, "radio", 5))
snprintf(phyname, sizeof(phyname), "wifi%s", ifname + 5);
else
snprintf(phyname, sizeof(phyname), "%s", ifname);
return (const char *)phyname;
}
static int madwifi_wrq(struct iwreq *wrq, const char *ifname, int cmd, void *data, size_t len) static int madwifi_wrq(struct iwreq *wrq, const char *ifname, int cmd, void *data, size_t len)
{ {
strncpy(wrq->ifr_name, ifname, IFNAMSIZ); strncpy(wrq->ifr_name, ifname, IFNAMSIZ);
@ -263,12 +275,14 @@ static int madwifi_iswifi(const char *ifname)
int ret; int ret;
char path[32]; char path[32];
struct stat s; struct stat s;
const char *phy;
ret = 0; ret = 0;
phy = madwifi_phyname(ifname);
if( strlen(ifname) <= 7 ) if( strlen(phy) <= 7 )
{ {
sprintf(path, "/proc/sys/dev/%s/diversity", ifname); sprintf(path, "/proc/sys/dev/%s/diversity", phy);
if( ! stat(path, &s) ) if( ! stat(path, &s) )
ret = (s.st_mode & S_IFREG); ret = (s.st_mode & S_IFREG);
@ -279,13 +293,13 @@ static int madwifi_iswifi(const char *ifname)
static char * madwifi_ifadd(const char *ifname) static char * madwifi_ifadd(const char *ifname)
{ {
char *wifidev = NULL; const char *wifidev = NULL;
struct ifreq ifr = { 0 }; struct ifreq ifr = { 0 };
struct ieee80211_clone_params cp = { 0 }; struct ieee80211_clone_params cp = { 0 };
static char nif[IFNAMSIZ] = { 0 }; static char nif[IFNAMSIZ] = { 0 };
if( !(wifidev = madwifi_isvap(ifname, NULL)) && madwifi_iswifi(ifname) ) if( !(wifidev = madwifi_isvap(ifname, NULL)) && madwifi_iswifi(ifname) )
wifidev = (char *)ifname; wifidev = madwifi_phyname(ifname);
if( wifidev ) if( wifidev )
{ {
@ -1014,8 +1028,9 @@ int madwifi_get_hardware_id(const char *ifname, char *buf)
char device[64]; char device[64];
struct iwinfo_hardware_id *ids; struct iwinfo_hardware_id *ids;
struct iwinfo_hardware_entry *e; struct iwinfo_hardware_entry *e;
const char *phy = madwifi_phyname(ifname);
if (wext_get_hardware_id(ifname, buf)) if (wext_get_hardware_id(phy, buf))
return iwinfo_hardware_id_from_mtd((struct iwinfo_hardware_id *)buf); return iwinfo_hardware_id_from_mtd((struct iwinfo_hardware_id *)buf);
return 0; return 0;