X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=contrib%2Fpackage%2Fiwinfo%2Fsrc%2Fiwinfo_nl80211.c;h=da8d5bbe2859b950c0e0bd9aa77a27ac830738e8;hb=46f48453a84edfb0e0589da4b586ff03dd2a2990;hp=6b980235ec187717ba84196c666c3bebbfe67294;hpb=66736c857476550c68720a4cf933ab2f6d04031d;p=project%2Fluci.git diff --git a/contrib/package/iwinfo/src/iwinfo_nl80211.c b/contrib/package/iwinfo/src/iwinfo_nl80211.c index 6b980235e..da8d5bbe2 100644 --- a/contrib/package/iwinfo/src/iwinfo_nl80211.c +++ b/contrib/package/iwinfo/src/iwinfo_nl80211.c @@ -34,16 +34,16 @@ static int nl80211_init(void) { int err, fd; - if( !nls ) + if (!nls) { nls = malloc(sizeof(struct nl80211_state)); - if( !nls ) { + if (!nls) { err = -ENOMEM; goto err; } nls->nl_sock = nl_socket_alloc(); - if( !nls->nl_sock ) { + if (!nls->nl_sock) { err = -ENOMEM; goto err; } @@ -54,7 +54,7 @@ static int nl80211_init(void) } fd = nl_socket_get_fd(nls->nl_sock); - if( fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC) < 0 ) + if (fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC) < 0) { err = -EINVAL; goto err; @@ -66,7 +66,7 @@ static int nl80211_init(void) } nls->nl80211 = genl_ctrl_search_by_name(nls->nl_cache, "nl80211"); - if( !nls->nl80211 ) + if (!nls->nl80211) { err = -ENOENT; goto err; @@ -105,28 +105,17 @@ static int nl80211_msg_ack(struct nl_msg *msg, void *arg) static int nl80211_msg_response(struct nl_msg *msg, void *arg) { - struct nl80211_msg_conveyor *cv = arg; - - nlmsg_get(msg); - - cv->msg = msg; - cv->hdr = nlmsg_data(nlmsg_hdr(cv->msg)); - - nla_parse(cv->attr, NL80211_ATTR_MAX, - genlmsg_attrdata(cv->hdr, 0), - genlmsg_attrlen(cv->hdr, 0), NULL); - return NL_SKIP; } static void nl80211_free(struct nl80211_msg_conveyor *cv) { - if( cv ) + if (cv) { - if( cv->cb ) + if (cv->cb) nl_cb_put(cv->cb); - if( cv->msg ) + if (cv->msg) nlmsg_free(cv->msg); cv->cb = NULL; @@ -142,71 +131,67 @@ static struct nl80211_msg_conveyor * nl80211_msg(const char *ifname, int cmd, in struct nl_msg *req = NULL; struct nl_cb *cb = NULL; - if( nl80211_init() < 0 ) + if (nl80211_init() < 0) goto err; - if( !strncmp(ifname, "radio", 5) ) + if (!strncmp(ifname, "phy", 3)) + phyidx = atoi(&ifname[3]); + else if (!strncmp(ifname, "radio", 5)) phyidx = atoi(&ifname[5]); - else if( !strncmp(ifname, "mon.", 4) ) + else if (!strncmp(ifname, "mon.", 4)) ifidx = if_nametoindex(&ifname[4]); else ifidx = if_nametoindex(ifname); - if( (ifidx < 0) && (phyidx < 0) ) + if ((ifidx < 0) && (phyidx < 0)) return NULL; req = nlmsg_alloc(); - if( !req ) + if (!req) goto err; cb = nl_cb_alloc(NL_CB_DEFAULT); - if( !cb ) + if (!cb) goto err; genlmsg_put(req, 0, 0, genl_family_get_id(nls->nl80211), 0, flags, cmd, 0); - if( ifidx > -1 ) + if (ifidx > -1) NLA_PUT_U32(req, NL80211_ATTR_IFINDEX, ifidx); - if( phyidx > -1 ) + if (phyidx > -1) NLA_PUT_U32(req, NL80211_ATTR_WIPHY, phyidx); - nlmsg_get(req); - - cv.msg = req; - cv.cb = cb; - cv.custom_cb = 0; + cv.msg = req; + cv.cb = cb; return &cv; err: nla_put_failure: - if( cb ) + if (cb) nl_cb_put(cb); - if( req ) + if (req) nlmsg_free(req); return NULL; } -static void nl80211_cb(struct nl80211_msg_conveyor *cv, - int (*cb)(struct nl_msg *, void *), void *arg) -{ - cv->custom_cb = 1; - nl_cb_set(cv->cb, NL_CB_VALID, NL_CB_CUSTOM, cb, arg); -} - -static struct nl80211_msg_conveyor * nl80211_send(struct nl80211_msg_conveyor *cv) -{ +static struct nl80211_msg_conveyor * nl80211_send( + struct nl80211_msg_conveyor *cv, + int (*cb_func)(struct nl_msg *, void *), void *cb_arg +) { static struct nl80211_msg_conveyor rcv; int err = 1; - if( !cv->custom_cb ) + if (cb_func) + nl_cb_set(cv->cb, NL_CB_VALID, NL_CB_CUSTOM, cb_func, cb_arg); + else nl_cb_set(cv->cb, NL_CB_VALID, NL_CB_CUSTOM, nl80211_msg_response, &rcv); - if( nl_send_auto_complete(nls->nl_sock, cv->msg) < 0 ) + if (nl_send_auto_complete(nls->nl_sock, cv->msg) < 0) goto err; nl_cb_err(cv->cb, NL_CB_CUSTOM, nl80211_msg_error, &err); @@ -225,6 +210,17 @@ err: return NULL; } +static struct nlattr ** nl80211_parse(struct nl_msg *msg) +{ + struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg)); + static struct nlattr *attr[NL80211_ATTR_MAX + 1]; + + nla_parse(attr, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0), + genlmsg_attrlen(gnlh, 0), NULL); + + return attr; +} + static int nl80211_freq2channel(int freq) { if (freq == 2484) @@ -236,32 +232,43 @@ static int nl80211_freq2channel(int freq) return (freq / 5) - 1000; } -static char * nl80211_getval(const char *buf, const char *key) +static char * nl80211_getval(const char *ifname, const char *buf, const char *key) { int i, len; char lkey[64] = { 0 }; const char *ln = buf; static char lval[256] = { 0 }; + int matched_if = ifname ? 0 : 1; + + for( i = 0, len = strlen(buf); i < len; i++ ) { - if( !lkey[0] && (buf[i] == ' ' || buf[i] == '\t') ) + if (!lkey[0] && (buf[i] == ' ' || buf[i] == '\t')) { ln++; } - else if( !lkey[0] && (buf[i] == '=') ) + else if (!lkey[0] && (buf[i] == '=')) { - if( (&buf[i] - ln) > 0 ) + if ((&buf[i] - ln) > 0) memcpy(lkey, ln, min(sizeof(lkey) - 1, &buf[i] - ln)); } - else if( buf[i] == '\n' ) + else if (buf[i] == '\n') { - if( lkey[0] && !strcmp(lkey, key) ) + if (lkey[0]) { memcpy(lval, ln + strlen(lkey) + 1, min(sizeof(lval) - 1, &buf[i] - ln - strlen(lkey) - 1)); - return lval; + if ((ifname != NULL) && + (!strcmp(lkey, "interface") || !strcmp(lkey, "bss")) ) + { + matched_if = !strcmp(lval, ifname); + } + else if (matched_if && !strcmp(lkey, key)) + { + return lval; + } } ln = &buf[i+1]; @@ -273,24 +280,28 @@ static char * nl80211_getval(const char *buf, const char *key) return NULL; } +static int nl80211_ifname2phy_cb(struct nl_msg *msg, void *arg) +{ + char *buf = arg; + struct nlattr **attr = nl80211_parse(msg); + + if (attr[NL80211_ATTR_WIPHY_NAME]) + sprintf(buf, "%s", nla_data(attr[NL80211_ATTR_WIPHY_NAME])); + else + buf[0] = 0; + + return NL_SKIP; +} + static char * nl80211_ifname2phy(const char *ifname) { static char phy[32] = { 0 }; - struct nl80211_msg_conveyor *req, *res; + struct nl80211_msg_conveyor *req; req = nl80211_msg(ifname, NL80211_CMD_GET_WIPHY, 0); - if( req ) + if (req) { - res = nl80211_send(req); - if( res ) - { - if( res->attr[NL80211_ATTR_WIPHY_NAME] ) - { - snprintf(phy, sizeof(phy), "%s", - nla_get_string(res->attr[NL80211_ATTR_WIPHY_NAME])); - } - nl80211_free(res); - } + nl80211_send(req, nl80211_ifname2phy_cb, phy); nl80211_free(req); } @@ -304,11 +315,11 @@ static char * nl80211_hostapd_info(const char *ifname) static char buf[4096] = { 0 }; FILE *conf; - if( (phy = nl80211_ifname2phy(ifname)) != NULL ) + if ((phy = nl80211_ifname2phy(ifname)) != NULL) { snprintf(path, sizeof(path), "/var/run/hostapd-%s.conf", phy); - if( (conf = fopen(path, "r")) != NULL ) + if ((conf = fopen(path, "r")) != NULL) { fread(buf, sizeof(buf) - 1, 1, conf); fclose(conf); @@ -320,59 +331,80 @@ static char * nl80211_hostapd_info(const char *ifname) return NULL; } -static char * nl80211_wpasupp_info(const char *ifname, const char *cmd) +static inline int nl80211_wpactl_recv(int sock, char *buf, int blen) +{ + fd_set rfds; + struct timeval tv = { 2, 0 }; + + FD_ZERO(&rfds); + FD_SET(sock, &rfds); + + memset(buf, 0, blen); + + + if (select(sock + 1, &rfds, NULL, NULL, &tv) < 0) + return -1; + + if (!FD_ISSET(sock, &rfds)) + return -1; + + return recv(sock, buf, blen, 0); +} + +static char * nl80211_wpactl_info(const char *ifname, const char *cmd, + const char *event) { - int sock = -1, len; + int numtry = 0; + int sock = -1; char *rv = NULL; size_t remote_length, local_length; - static char buffer[1024] = { 0 }; + static char buffer[10240] = { 0 }; - struct timeval tv = { 2, 0 }; struct sockaddr_un local = { 0 }; struct sockaddr_un remote = { 0 }; - fd_set rfds; sock = socket(PF_UNIX, SOCK_DGRAM, 0); - if( sock < 0 ) + if (sock < 0) return NULL; remote.sun_family = AF_UNIX; remote_length = sizeof(remote.sun_family) + sprintf(remote.sun_path, "/var/run/wpa_supplicant-%s/%s", ifname, ifname); - if( fcntl(sock, F_SETFD, fcntl(sock, F_GETFD) | FD_CLOEXEC) < 0 ) + if (fcntl(sock, F_SETFD, fcntl(sock, F_GETFD) | FD_CLOEXEC) < 0) goto out; - if( connect(sock, (struct sockaddr *) &remote, remote_length) ) + if (connect(sock, (struct sockaddr *) &remote, remote_length)) goto out; local.sun_family = AF_UNIX; local_length = sizeof(local.sun_family) + sprintf(local.sun_path, "/var/run/iwinfo-%s-%d", ifname, getpid()); - if( bind(sock, (struct sockaddr *) &local, local_length) ) + if (bind(sock, (struct sockaddr *) &local, local_length)) goto out; - send(sock, cmd, strlen(cmd), 0); - while( 1 ) - { - FD_ZERO(&rfds); - FD_SET(sock, &rfds); + send(sock, "ATTACH", 6, 0); - if( select(sock + 1, &rfds, NULL, NULL, &tv) < 0 ) - goto out; + if (nl80211_wpactl_recv(sock, buffer, sizeof(buffer)) <= 0) + goto out; - if( !FD_ISSET(sock, &rfds) ) - break; - if( (len = recv(sock, buffer, sizeof(buffer), 0)) <= 0 ) - goto out; + send(sock, cmd, strlen(cmd), 0); + + while( numtry++ < 5 ) + { + if (nl80211_wpactl_recv(sock, buffer, sizeof(buffer)) <= 0) + { + if (event) + continue; - buffer[len] = 0; + break; + } - if( buffer[0] != '<' ) + if ((!event && buffer[0] != '<') || strstr(buffer, event)) break; } @@ -380,44 +412,67 @@ static char * nl80211_wpasupp_info(const char *ifname, const char *cmd) out: close(sock); - unlink(local.sun_path); + + if (local.sun_family) + unlink(local.sun_path); + + return rv; +} + +static inline int nl80211_readint(const char *path) +{ + int fd; + int rv = -1; + char buffer[16]; + + if ((fd = open(path, O_RDONLY)) > -1) + { + if (read(fd, buffer, sizeof(buffer)) > 0) + rv = atoi(buffer); + + close(fd); + } return rv; } static char * nl80211_phy2ifname(const char *ifname) { - int fd, phyidx = 0; + int fd, ifidx = -1, cifidx = -1, phyidx = -1; char buffer[64]; static char nif[IFNAMSIZ] = { 0 }; DIR *d; struct dirent *e; - if( !strncmp(ifname, "radio", 5) ) - { + if (!ifname) + return NULL; + else if (!strncmp(ifname, "phy", 3)) + phyidx = atoi(&ifname[3]); + else if (!strncmp(ifname, "radio", 5)) phyidx = atoi(&ifname[5]); - if( (d = opendir("/sys/class/net")) != NULL ) + if (phyidx > -1) + { + if ((d = opendir("/sys/class/net")) != NULL) { while( (e = readdir(d)) != NULL ) { snprintf(buffer, sizeof(buffer), "/sys/class/net/%s/phy80211/index", e->d_name); - if( (fd = open(buffer, O_RDONLY)) > 0 ) + if (nl80211_readint(buffer) == phyidx) { - if( (read(fd, buffer, sizeof(buffer)) > 0) && - (atoi(buffer) == phyidx) ) + snprintf(buffer, sizeof(buffer), + "/sys/class/net/%s/ifindex", e->d_name); + + if( (cifidx = nl80211_readint(buffer)) >= 0 && + ((ifidx < 0) || (cifidx < ifidx)) ) { + ifidx = cifidx; strncpy(nif, e->d_name, sizeof(nif)); } - - close(fd); } - - if( nif[0] ) - break; } closedir(d); @@ -427,7 +482,7 @@ static char * nl80211_phy2ifname(const char *ifname) return nif[0] ? nif : NULL; } -static char * nl80211_add_tempif(const char *ifname) +static char * nl80211_ifadd(const char *ifname) { int phyidx; char *rv = NULL; @@ -435,19 +490,16 @@ static char * nl80211_add_tempif(const char *ifname) struct nl80211_msg_conveyor *req, *res; req = nl80211_msg(ifname, NL80211_CMD_NEW_INTERFACE, 0); - if( req ) + if (req) { snprintf(nif, sizeof(nif), "tmp.%s", ifname); NLA_PUT_STRING(req->msg, NL80211_ATTR_IFNAME, nif); NLA_PUT_U32(req->msg, NL80211_ATTR_IFTYPE, NL80211_IFTYPE_STATION); - res = nl80211_send(req); - if( res ) - { - rv = nif; - nl80211_free(res); - } + nl80211_send(req, NULL, NULL); + + rv = nif; nla_put_failure: nl80211_free(req); @@ -456,22 +508,44 @@ static char * nl80211_add_tempif(const char *ifname) return rv; } -static void nl80211_del_tempif(const char *ifname) +static void nl80211_ifdel(const char *ifname) { - struct nl80211_msg_conveyor *req, *res; + struct nl80211_msg_conveyor *req; req = nl80211_msg(ifname, NL80211_CMD_DEL_INTERFACE, 0); - if( req ) + if (req) { NLA_PUT_STRING(req->msg, NL80211_ATTR_IFNAME, ifname); - nl80211_free(nl80211_send(req)); + nl80211_send(req, NULL, NULL); nla_put_failure: nl80211_free(req); } } +static void nl80211_hostapd_hup(const char *ifname) +{ + int fd, pid = 0; + char buf[32]; + char *phy = nl80211_ifname2phy(ifname); + + if (phy) + { + snprintf(buf, sizeof(buf), "/var/run/wifi-%s.pid", phy); + if ((fd = open(buf, O_RDONLY)) > 0) + { + if (read(fd, buf, sizeof(buf)) > 0) + pid = atoi(buf); + + close(fd); + } + + if (pid > 0) + kill(pid, 1); + } +} + int nl80211_probe(const char *ifname) { @@ -480,12 +554,12 @@ int nl80211_probe(const char *ifname) void nl80211_close(void) { - if( nls ) + if (nls) { - if( nls->nl_sock ) + if (nls->nl_sock) nl_socket_free(nls->nl_sock); - if( nls->nl_cache ) + if (nls->nl_cache) nl_cache_free(nls->nl_cache); free(nls); @@ -502,12 +576,12 @@ int nl80211_get_ssid(const char *ifname, char *buf) { char *ssid; - if( !wext_get_ssid(ifname, buf) ) + if (!wext_get_ssid(ifname, buf)) { return 0; } else if( (ssid = nl80211_hostapd_info(ifname)) && - (ssid = nl80211_getval(ssid, "ssid")) ) + (ssid = nl80211_getval(ifname, ssid, "ssid")) ) { memcpy(buf, ssid, strlen(ssid)); return 0; @@ -521,12 +595,12 @@ int nl80211_get_bssid(const char *ifname, char *buf) char *bssid; unsigned char mac[6]; - if( !wext_get_bssid(ifname, buf) ) + if (!wext_get_bssid(ifname, buf)) { return 0; } - else if( (bssid = nl80211_hostapd_info(ifname)) && - (bssid = nl80211_getval(bssid, "bssid")) ) + else if((bssid = nl80211_hostapd_info(ifname)) && + (bssid = nl80211_getval(ifname, bssid, "bssid"))) { mac[0] = strtol(&bssid[0], NULL, 16); mac[1] = strtol(&bssid[3], NULL, 16); @@ -546,12 +620,28 @@ int nl80211_get_bssid(const char *ifname, char *buf) int nl80211_get_channel(const char *ifname, int *buf) { - return wext_get_channel(ifname, buf); + char *first; + + if (!wext_get_channel(ifname, buf)) + return 0; + + else if ((first = nl80211_phy2ifname(nl80211_ifname2phy(ifname))) != NULL) + return wext_get_channel(first, buf); + + return -1; } int nl80211_get_frequency(const char *ifname, int *buf) { - return wext_get_frequency(ifname, buf); + char *first; + + if (!wext_get_frequency(ifname, buf)) + return 0; + + else if ((first = nl80211_phy2ifname(nl80211_ifname2phy(ifname))) != NULL) + return wext_get_frequency(first, buf); + + return -1; } int nl80211_get_txpower(const char *ifname, int *buf) @@ -560,14 +650,12 @@ 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; int16_t mbit; struct nl80211_rssi_rate *rr = arg; - - struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg)); - struct nlattr *attr[NL80211_ATTR_MAX + 1]; + struct nlattr **attr = nl80211_parse(msg); struct nlattr *sinfo[NL80211_STA_INFO_MAX + 1]; struct nlattr *rinfo[NL80211_RATE_INFO_MAX + 1]; @@ -591,26 +679,23 @@ static int nl80211_get_signal_cb(struct nl_msg *msg, void *arg) [NL80211_RATE_INFO_SHORT_GI] = { .type = NLA_FLAG }, }; - nla_parse(attr, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0), - genlmsg_attrlen(gnlh, 0), NULL); - - if( attr[NL80211_ATTR_STA_INFO] ) + if (attr[NL80211_ATTR_STA_INFO]) { if( !nla_parse_nested(sinfo, NL80211_STA_INFO_MAX, attr[NL80211_ATTR_STA_INFO], stats_policy) ) { - if( sinfo[NL80211_STA_INFO_SIGNAL] ) + if (sinfo[NL80211_STA_INFO_SIGNAL]) { dbm = nla_get_u8(sinfo[NL80211_STA_INFO_SIGNAL]); rr->rssi = rr->rssi ? (int8_t)((rr->rssi + dbm) / 2) : dbm; } - if( sinfo[NL80211_STA_INFO_TX_BITRATE] ) + if (sinfo[NL80211_STA_INFO_TX_BITRATE]) { if( !nla_parse_nested(rinfo, NL80211_RATE_INFO_MAX, sinfo[NL80211_STA_INFO_TX_BITRATE], rate_policy) ) { - if( rinfo[NL80211_RATE_INFO_BITRATE] ) + if (rinfo[NL80211_RATE_INFO_BITRATE]) { mbit = nla_get_u16(rinfo[NL80211_RATE_INFO_BITRATE]); rr->rate = rr->rate @@ -624,29 +709,51 @@ static int nl80211_get_signal_cb(struct nl_msg *msg, void *arg) return NL_SKIP; } -int nl80211_get_bitrate(const char *ifname, int *buf) +static void nl80211_fill_signal(const char *ifname, struct nl80211_rssi_rate *r) { - struct nl80211_rssi_rate rr; + DIR *d; + struct dirent *de; struct nl80211_msg_conveyor *req; - if( !wext_get_bitrate(ifname, buf) ) - return 0; + r->rssi = 0; + r->rate = 0; - req = nl80211_msg(ifname, NL80211_CMD_GET_STATION, NLM_F_DUMP); - if( req ) + if ((d = opendir("/sys/class/net")) != NULL) { - rr.rssi = 0; - rr.rate = 0; - - nl80211_cb(req, nl80211_get_signal_cb, &rr); - nl80211_send(req); - nl80211_free(req); - - if( rr.rate ) + while ((de = readdir(d)) != NULL) { - *buf = (rr.rate * 100); - return 0; + 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_send(req, nl80211_fill_signal_cb, r); + nl80211_free(req); + } + } } + + closedir(d); + } +} + +int nl80211_get_bitrate(const char *ifname, int *buf) +{ + struct nl80211_rssi_rate rr; + + if (!wext_get_bitrate(ifname, buf)) + return 0; + + nl80211_fill_signal(ifname, &rr); + + if (rr.rate) + { + *buf = (rr.rate * 100); + return 0; } return -1; @@ -655,35 +762,25 @@ int nl80211_get_bitrate(const char *ifname, int *buf) int nl80211_get_signal(const char *ifname, int *buf) { struct nl80211_rssi_rate rr; - struct nl80211_msg_conveyor *req; - if( !wext_get_signal(ifname, buf) ) + if (!wext_get_signal(ifname, buf)) return 0; - req = nl80211_msg(ifname, NL80211_CMD_GET_STATION, NLM_F_DUMP); - if( req ) - { - rr.rssi = 0; - rr.rate = 0; - - nl80211_cb(req, nl80211_get_signal_cb, &rr); - nl80211_send(req); - nl80211_free(req); + nl80211_fill_signal(ifname, &rr); - if( rr.rssi ) - { - *buf = rr.rssi; - return 0; - } + if (rr.rssi) + { + *buf = rr.rssi; + return 0; } return -1; } -int nl80211_get_noise(const char *ifname, int *buf) +static int nl80211_get_noise_cb(struct nl_msg *msg, void *arg) { - int rv = -1; - struct nl80211_msg_conveyor *req, *res; + int8_t *noise = arg; + struct nlattr **tb = nl80211_parse(msg); struct nlattr *si[NL80211_SURVEY_INFO_MAX + 1]; static struct nla_policy sp[NL80211_SURVEY_INFO_MAX + 1] = { @@ -691,43 +788,59 @@ int nl80211_get_noise(const char *ifname, int *buf) [NL80211_SURVEY_INFO_NOISE] = { .type = NLA_U8 }, }; + if (!tb[NL80211_ATTR_SURVEY_INFO]) + return NL_SKIP; + + if (nla_parse_nested(si, NL80211_SURVEY_INFO_MAX, + tb[NL80211_ATTR_SURVEY_INFO], sp)) + return NL_SKIP; + + if (!si[NL80211_SURVEY_INFO_NOISE]) + return NL_SKIP; + + if (!*noise || si[NL80211_SURVEY_INFO_IN_USE]) + *noise = (int8_t)nla_get_u8(si[NL80211_SURVEY_INFO_NOISE]); + + return NL_SKIP; +} + + +int nl80211_get_noise(const char *ifname, int *buf) +{ + int8_t noise; + struct nl80211_msg_conveyor *req; + req = nl80211_msg(ifname, NL80211_CMD_GET_SURVEY, NLM_F_DUMP); - if( req ) + if (req) { - res = nl80211_send(req); - if( res ) + noise = 0; + + nl80211_send(req, nl80211_get_noise_cb, &noise); + nl80211_free(req); + + if (noise) { - if( res->attr[NL80211_ATTR_SURVEY_INFO] ) - { - if( !nla_parse_nested(si, NL80211_SURVEY_INFO_MAX, - res->attr[NL80211_ATTR_SURVEY_INFO], sp) && - si[NL80211_SURVEY_INFO_NOISE] ) - { - *buf = (int8_t)nla_get_u8(si[NL80211_SURVEY_INFO_NOISE]); - rv = 0; - } - } - nl80211_free(res); + *buf = noise; + return 0; } - nl80211_free(req); } - return rv; + return -1; } int nl80211_get_quality(const char *ifname, int *buf) { int signal; - if( wext_get_quality(ifname, buf) ) + if (wext_get_quality(ifname, buf)) { *buf = 0; - if( !nl80211_get_signal(ifname, &signal) ) + if (!nl80211_get_signal(ifname, &signal)) { /* A positive signal level is usually just a quality * value, pass through as-is */ - if( signal >= 0 ) + if (signal >= 0) { *buf = signal; } @@ -737,9 +850,9 @@ int nl80211_get_quality(const char *ifname, int *buf) * by adding 110 to the signal level */ else { - if( signal < -110 ) + if (signal < -110) signal = -110; - else if( signal > -40 ) + else if (signal > -40) signal = -40; *buf = (signal + 110); @@ -752,7 +865,7 @@ int nl80211_get_quality(const char *ifname, int *buf) int nl80211_get_quality_max(const char *ifname, int *buf) { - if( wext_get_quality_max(ifname, buf) ) + if (wext_get_quality_max(ifname, buf)) /* The cfg80211 wext compat layer assumes a maximum * quality of 70 */ *buf = 70; @@ -767,98 +880,17 @@ int nl80211_get_encryption(const char *ifname, char *buf) char *val, *res; struct iwinfo_crypto_entry *c = (struct iwinfo_crypto_entry *)buf; - /* Hostapd */ - if( (res = nl80211_hostapd_info(ifname)) && - nl80211_getval(res, "interface") ) - { - if( (val = nl80211_getval(res, "auth_algs")) && (val > 0) ) - { - c->auth_suites |= IWINFO_KMGMT_NONE; - - switch(atoi(val)) { - case 1: - c->auth_algs |= IWINFO_AUTH_OPEN; - break; - - case 2: - c->auth_algs |= IWINFO_AUTH_SHARED; - break; - - case 3: - c->auth_algs |= IWINFO_AUTH_OPEN; - c->auth_algs |= IWINFO_AUTH_SHARED; - break; - - default: - break; - } - - for( i = 0; i < 4; i++ ) - { - snprintf(k, sizeof(k), "wep_key%d", i); - - if( (val = nl80211_getval(res, k)) ) - { - if( (strlen(val) == 5) || (strlen(val) == 10) ) - c->pair_ciphers |= IWINFO_CIPHER_WEP40; - - else if( (strlen(val) == 13) || (strlen(val) == 26) ) - c->pair_ciphers |= IWINFO_CIPHER_WEP104; - } - } - - c->group_ciphers = c->pair_ciphers; - - return 0; - } - - - if( (val = nl80211_getval(res, "wpa")) != NULL ) - c->wpa_version = atoi(val); - - - val = nl80211_getval(res, "wpa_key_mgmt"); - - if( !val || strstr(val, "PSK") ) - c->auth_suites |= IWINFO_KMGMT_PSK; - - if( val && strstr(val, "EAP") ) - c->auth_suites |= IWINFO_KMGMT_8021x; - - if( val && strstr(val, "NONE") ) - c->auth_suites |= IWINFO_KMGMT_NONE; - - - if( (val = nl80211_getval(res, "wpa_pairwise")) != NULL ) - { - if( strstr(val, "TKIP") ) - c->pair_ciphers |= IWINFO_CIPHER_TKIP; - - if( strstr(val, "CCMP") ) - c->pair_ciphers |= IWINFO_CIPHER_CCMP; - - if( strstr(val, "NONE") ) - c->pair_ciphers |= IWINFO_CIPHER_NONE; - } - - - c->group_ciphers = c->pair_ciphers; - c->enabled = (c->auth_algs || c->auth_suites) ? 1 : 0; - - return 0; - } - /* WPA supplicant */ - else if( (res = nl80211_wpasupp_info(ifname, "STATUS")) && - (val = nl80211_getval(res, "pairwise_cipher")) ) + if( (res = nl80211_wpactl_info(ifname, "STATUS", NULL)) && + (val = nl80211_getval(NULL, res, "pairwise_cipher")) ) { /* WEP */ - if( strstr(val, "WEP") ) + if (strstr(val, "WEP")) { - if( strstr(val, "WEP-40") ) + if (strstr(val, "WEP-40")) c->pair_ciphers |= IWINFO_CIPHER_WEP40; - else if( strstr(val, "WEP-104") ) + else if (strstr(val, "WEP-104")) c->pair_ciphers |= IWINFO_CIPHER_WEP104; c->enabled = 1; @@ -871,57 +903,57 @@ int nl80211_get_encryption(const char *ifname, char *buf) /* WPA */ else { - if( strstr(val, "TKIP") ) + if (strstr(val, "TKIP")) c->pair_ciphers |= IWINFO_CIPHER_TKIP; - else if( strstr(val, "CCMP") ) + else if (strstr(val, "CCMP")) c->pair_ciphers |= IWINFO_CIPHER_CCMP; - else if( strstr(val, "NONE") ) + else if (strstr(val, "NONE")) c->pair_ciphers |= IWINFO_CIPHER_NONE; - else if( strstr(val, "WEP-40") ) + else if (strstr(val, "WEP-40")) c->pair_ciphers |= IWINFO_CIPHER_WEP40; - else if( strstr(val, "WEP-104") ) + else if (strstr(val, "WEP-104")) c->pair_ciphers |= IWINFO_CIPHER_WEP104; - if( (val = nl80211_getval(res, "group_cipher")) ) + if ((val = nl80211_getval(NULL, res, "group_cipher"))) { - if( strstr(val, "TKIP") ) + if (strstr(val, "TKIP")) c->group_ciphers |= IWINFO_CIPHER_TKIP; - else if( strstr(val, "CCMP") ) + else if (strstr(val, "CCMP")) c->group_ciphers |= IWINFO_CIPHER_CCMP; - else if( strstr(val, "NONE") ) + else if (strstr(val, "NONE")) c->group_ciphers |= IWINFO_CIPHER_NONE; - else if( strstr(val, "WEP-40") ) + else if (strstr(val, "WEP-40")) c->group_ciphers |= IWINFO_CIPHER_WEP40; - else if( strstr(val, "WEP-104") ) + else if (strstr(val, "WEP-104")) c->group_ciphers |= IWINFO_CIPHER_WEP104; } - if( (val = nl80211_getval(res, "key_mgmt")) ) + if ((val = nl80211_getval(NULL, res, "key_mgmt"))) { - if( strstr(val, "WPA2") ) + if (strstr(val, "WPA2")) c->wpa_version = 2; - else if( strstr(val, "WPA") ) + else if (strstr(val, "WPA")) c->wpa_version = 1; - if( strstr(val, "PSK") ) + if (strstr(val, "PSK")) c->auth_suites |= IWINFO_KMGMT_PSK; - else if( strstr(val, "EAP") || strstr(val, "802.1X") ) + else if (strstr(val, "EAP") || strstr(val, "802.1X")) c->auth_suites |= IWINFO_KMGMT_8021x; - else if( strstr(val, "NONE") ) + else if (strstr(val, "NONE")) c->auth_suites |= IWINFO_KMGMT_NONE; } @@ -931,15 +963,85 @@ int nl80211_get_encryption(const char *ifname, char *buf) return 0; } + /* Hostapd */ + else if ((res = nl80211_hostapd_info(ifname))) + { + if ((val = nl80211_getval(ifname, res, "wpa")) != NULL) + c->wpa_version = atoi(val); + + val = nl80211_getval(ifname, res, "wpa_key_mgmt"); + + if (!val || strstr(val, "PSK")) + c->auth_suites |= IWINFO_KMGMT_PSK; + + if (val && strstr(val, "EAP")) + c->auth_suites |= IWINFO_KMGMT_8021x; + + if (val && strstr(val, "NONE")) + c->auth_suites |= IWINFO_KMGMT_NONE; + + if ((val = nl80211_getval(ifname, res, "wpa_pairwise")) != NULL) + { + if (strstr(val, "TKIP")) + c->pair_ciphers |= IWINFO_CIPHER_TKIP; + + if (strstr(val, "CCMP")) + c->pair_ciphers |= IWINFO_CIPHER_CCMP; + + if (strstr(val, "NONE")) + c->pair_ciphers |= IWINFO_CIPHER_NONE; + } + + if ((val = nl80211_getval(ifname, res, "auth_algs")) != NULL) + { + switch(atoi(val)) { + case 1: + c->auth_algs |= IWINFO_AUTH_OPEN; + break; + + case 2: + c->auth_algs |= IWINFO_AUTH_SHARED; + break; + + case 3: + c->auth_algs |= IWINFO_AUTH_OPEN; + c->auth_algs |= IWINFO_AUTH_SHARED; + break; + + default: + break; + } + + for( i = 0; i < 4; i++ ) + { + snprintf(k, sizeof(k), "wep_key%d", i); + + if ((val = nl80211_getval(ifname, res, k))) + { + if ((strlen(val) == 5) || (strlen(val) == 10)) + c->pair_ciphers |= IWINFO_CIPHER_WEP40; + + else if ((strlen(val) == 13) || (strlen(val) == 26)) + c->pair_ciphers |= IWINFO_CIPHER_WEP104; + } + } + } + + c->group_ciphers = c->pair_ciphers; + c->enabled = (c->auth_algs || c->auth_suites) ? 1 : 0; + + return 0; + } + return -1; } static int nl80211_get_assoclist_cb(struct nl_msg *msg, void *arg) { - struct nl80211_assoc_count *ac = arg; - struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg)); - struct nlattr *attr[NL80211_ATTR_MAX + 1]; + struct nl80211_array_buf *arr = arg; + struct iwinfo_assoclist_entry *e = arr->buf; + struct nlattr **attr = nl80211_parse(msg); struct nlattr *sinfo[NL80211_STA_INFO_MAX + 1]; static struct nla_policy stats_policy[NL80211_STA_INFO_MAX + 1] = { @@ -955,62 +1057,80 @@ static int nl80211_get_assoclist_cb(struct nl_msg *msg, void *arg) [NL80211_STA_INFO_PLINK_STATE] = { .type = NLA_U8 }, }; - nla_parse(attr, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0), - genlmsg_attrlen(gnlh, 0), NULL); + /* advance to end of array */ + e += arr->count; - if( attr[NL80211_ATTR_MAC] ) - memcpy(ac->entry->mac, nla_data(attr[NL80211_ATTR_MAC]), 6); + if (attr[NL80211_ATTR_MAC]) + memcpy(e->mac, nla_data(attr[NL80211_ATTR_MAC]), 6); - if( attr[NL80211_ATTR_STA_INFO] ) + if (attr[NL80211_ATTR_STA_INFO]) { - if( !nla_parse_nested(sinfo, NL80211_STA_INFO_MAX, - attr[NL80211_ATTR_STA_INFO], stats_policy) ) + if (!nla_parse_nested(sinfo, NL80211_STA_INFO_MAX, + attr[NL80211_ATTR_STA_INFO], stats_policy)) { - if( sinfo[NL80211_STA_INFO_SIGNAL] ) - ac->entry->signal = nla_get_u8(sinfo[NL80211_STA_INFO_SIGNAL]); + if (sinfo[NL80211_STA_INFO_SIGNAL]) + e->signal = nla_get_u8(sinfo[NL80211_STA_INFO_SIGNAL]); } } - ac->entry->noise = ac->noise; - ac->entry++; - ac->count++; + e->noise = 0; /* filled in by caller */ + arr->count++; return NL_SKIP; } int nl80211_get_assoclist(const char *ifname, char *buf, int *len) { - struct nl80211_assoc_count ac; + DIR *d; + int i, noise = 0; + struct dirent *de; struct nl80211_msg_conveyor *req; + struct nl80211_array_buf arr = { .buf = buf, .count = 0 }; + struct iwinfo_assoclist_entry *e; - nl80211_get_noise(ifname, &ac.noise); - - req = nl80211_msg(ifname, NL80211_CMD_GET_STATION, NLM_F_DUMP); - if( req ) + if ((d = opendir("/sys/class/net")) != NULL) { - ac.count = 0; - ac.entry = (struct iwinfo_assoclist_entry *)buf; + 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); - nl80211_cb(req, nl80211_get_assoclist_cb, &ac); - nl80211_send(req); - nl80211_free(req); + if (req) + { + nl80211_send(req, nl80211_get_assoclist_cb, &arr); + nl80211_free(req); + } + + break; + } + } - *len = (ac.count * sizeof(struct iwinfo_assoclist_entry)); + closedir(d); + + if (!nl80211_get_noise(ifname, &noise)) + for (i = 0, e = arr.buf; i < arr.count; i++, e++) + e->noise = noise; + + *len = (arr.count * sizeof(struct iwinfo_assoclist_entry)); return 0; } return -1; } -int nl80211_get_txpwrlist(const char *ifname, char *buf, int *len) +static int nl80211_get_txpwrlist_cb(struct nl_msg *msg, void *arg) { + int *dbm_max = arg; int ch_cur, ch_cmp, bands_remain, freqs_remain; - int dbm_max = -1, dbm_cur, dbm_cnt; - struct nl80211_msg_conveyor *req, *res; + + struct nlattr **attr = nl80211_parse(msg); struct nlattr *bands[NL80211_BAND_ATTR_MAX + 1]; struct nlattr *freqs[NL80211_FREQUENCY_ATTR_MAX + 1]; struct nlattr *band, *freq; - struct iwinfo_txpwrlist_entry entry; static struct nla_policy freq_policy[NL80211_FREQUENCY_ATTR_MAX + 1] = { [NL80211_FREQUENCY_ATTR_FREQ] = { .type = NLA_U32 }, @@ -1021,60 +1141,71 @@ int nl80211_get_txpwrlist(const char *ifname, char *buf, int *len) [NL80211_FREQUENCY_ATTR_MAX_TX_POWER] = { .type = NLA_U32 }, }; - if( nl80211_get_channel(ifname, &ch_cur) ) - ch_cur = 0; + ch_cur = *dbm_max; /* value int* is initialized with channel by caller */ + *dbm_max = -1; - req = nl80211_msg(ifname, NL80211_CMD_GET_WIPHY, 0); - if( req ) + nla_for_each_nested(band, attr[NL80211_ATTR_WIPHY_BANDS], bands_remain) { - res = nl80211_send(req); - if( res ) + nla_parse(bands, NL80211_BAND_ATTR_MAX, nla_data(band), + nla_len(band), NULL); + + nla_for_each_nested(freq, + bands[NL80211_BAND_ATTR_FREQS], freqs_remain) { - nla_for_each_nested(band, - res->attr[NL80211_ATTR_WIPHY_BANDS], bands_remain) + nla_parse(freqs, NL80211_FREQUENCY_ATTR_MAX, + nla_data(freq), nla_len(freq), freq_policy); + + ch_cmp = nl80211_freq2channel( + nla_get_u32(freqs[NL80211_FREQUENCY_ATTR_FREQ])); + + if( (!ch_cur || (ch_cmp == ch_cur)) && + freqs[NL80211_FREQUENCY_ATTR_MAX_TX_POWER] ) { - nla_parse(bands, NL80211_BAND_ATTR_MAX, nla_data(band), - nla_len(band), NULL); + *dbm_max = (int)(0.01 * nla_get_u32( + freqs[NL80211_FREQUENCY_ATTR_MAX_TX_POWER])); - nla_for_each_nested(freq, - bands[NL80211_BAND_ATTR_FREQS], freqs_remain) - { - nla_parse(freqs, NL80211_FREQUENCY_ATTR_MAX, - nla_data(freq), nla_len(freq), freq_policy); + break; + } + } + } - ch_cmp = nl80211_freq2channel( - nla_get_u32(freqs[NL80211_FREQUENCY_ATTR_FREQ])); + return NL_SKIP; +} - if( (!ch_cur || (ch_cmp == ch_cur)) && - freqs[NL80211_FREQUENCY_ATTR_MAX_TX_POWER] ) - { - dbm_max = (int)(0.01 * nla_get_u32( - freqs[NL80211_FREQUENCY_ATTR_MAX_TX_POWER])); +int nl80211_get_txpwrlist(const char *ifname, char *buf, int *len) +{ + int ch_cur; + int dbm_max = -1, dbm_cur, dbm_cnt; + struct nl80211_msg_conveyor *req; + struct iwinfo_txpwrlist_entry entry; - break; - } - } - } + if (nl80211_get_channel(ifname, &ch_cur)) + ch_cur = 0; - nl80211_free(res); - } + req = nl80211_msg(ifname, NL80211_CMD_GET_WIPHY, 0); + if (req) + { + /* initialize the value pointer with channel for callback */ + dbm_max = ch_cur; + + nl80211_send(req, nl80211_get_txpwrlist_cb, &dbm_max); nl80211_free(req); } - if( dbm_max > -1 ) + if (dbm_max > -1) { - for( dbm_cur = 0, dbm_cnt = 0; + for (dbm_cur = 0, dbm_cnt = 0; dbm_cur < dbm_max; - dbm_cur += 2, dbm_cnt++ ) + dbm_cur++, dbm_cnt++) { entry.dbm = dbm_cur; - entry.mw = wext_dbm2mw(dbm_cur); + entry.mw = iwinfo_dbm2mw(dbm_cur); memcpy(&buf[dbm_cnt * sizeof(entry)], &entry, sizeof(entry)); } entry.dbm = dbm_max; - entry.mw = wext_dbm2mw(dbm_max); + entry.mw = iwinfo_dbm2mw(dbm_max); memcpy(&buf[dbm_cnt * sizeof(entry)], &entry, sizeof(entry)); dbm_cnt++; @@ -1089,76 +1220,75 @@ int nl80211_get_txpwrlist(const char *ifname, char *buf, int *len) static void nl80211_get_scancrypto(const char *spec, struct iwinfo_crypto_entry *c) { - if( strstr(spec, "OPEN") ) - { - c->enabled = 0; - } - else + if (strstr(spec, "WPA") || strstr(spec, "WEP")) { c->enabled = 1; - if( strstr(spec, "WPA2-") && strstr(spec, "WPA-") ) + if (strstr(spec, "WPA2-") && strstr(spec, "WPA-")) c->wpa_version = 3; - else if( strstr(spec, "WPA2") ) + else if (strstr(spec, "WPA2")) c->wpa_version = 2; - else if( strstr(spec, "WPA") ) + else if (strstr(spec, "WPA")) c->wpa_version = 1; - else if( strstr(spec, "WEP") ) + else if (strstr(spec, "WEP")) c->auth_algs = IWINFO_AUTH_OPEN | IWINFO_AUTH_SHARED; - if( strstr(spec, "PSK") ) + if (strstr(spec, "PSK")) c->auth_suites |= IWINFO_KMGMT_PSK; - if( strstr(spec, "802.1X") || strstr(spec, "EAP") ) + if (strstr(spec, "802.1X") || strstr(spec, "EAP")) c->auth_suites |= IWINFO_KMGMT_8021x; - if( strstr(spec, "WPA-NONE") ) + if (strstr(spec, "WPA-NONE")) c->auth_suites |= IWINFO_KMGMT_NONE; - if( strstr(spec, "TKIP") ) + if (strstr(spec, "TKIP")) c->pair_ciphers |= IWINFO_CIPHER_TKIP; - if( strstr(spec, "CCMP") ) + if (strstr(spec, "CCMP")) c->pair_ciphers |= IWINFO_CIPHER_CCMP; - if( strstr(spec, "WEP-40") ) + if (strstr(spec, "WEP-40")) c->pair_ciphers |= IWINFO_CIPHER_WEP40; - if( strstr(spec, "WEP-104") ) + if (strstr(spec, "WEP-104")) c->pair_ciphers |= IWINFO_CIPHER_WEP104; c->group_ciphers = c->pair_ciphers; } + else + { + c->enabled = 0; + } } int nl80211_get_scanlist(const char *ifname, char *buf, int *len) { int freq, rssi, qmax, count; char *res; - char cmd[256]; char ssid[128] = { 0 }; char bssid[18] = { 0 }; char cipher[256] = { 0 }; /* Got a radioX pseudo interface, find some interface on it or create one */ - if( !strncmp(ifname, "radio", 5) ) + if (!strncmp(ifname, "radio", 5)) { /* Reuse existing interface */ - if( (res = nl80211_phy2ifname(ifname)) != NULL ) + if ((res = nl80211_phy2ifname(ifname)) != NULL) { return nl80211_get_scanlist(res, buf, len); } /* Need to spawn a temporary iface for scanning */ - else if( (res = nl80211_add_tempif(ifname)) != NULL ) + else if ((res = nl80211_ifadd(ifname)) != NULL) { count = nl80211_get_scanlist(res, buf, len); - nl80211_del_tempif(res); + nl80211_ifdel(res); return count; } } @@ -1166,12 +1296,9 @@ int nl80211_get_scanlist(const char *ifname, char *buf, int *len) struct iwinfo_scanlist_entry *e = (struct iwinfo_scanlist_entry *)buf; /* WPA supplicant */ - if( (res = nl80211_wpasupp_info(ifname, "SCAN")) && - !strcmp(res, "OK\n") ) + if ((res = nl80211_wpactl_info(ifname, "SCAN", "CTRL-EVENT-SCAN-RESULTS"))) { - sleep(2); - - if( (res = nl80211_wpasupp_info(ifname, "SCAN_RESULTS")) ) + if ((res = nl80211_wpactl_info(ifname, "SCAN_RESULTS", NULL))) { nl80211_get_quality_max(ifname, &qmax); @@ -1180,7 +1307,7 @@ int nl80211_get_scanlist(const char *ifname, char *buf, int *len) count = 0; - while( sscanf(res, "%17s %d %d %255s %127[^\n]\n", + while( sscanf(res, "%17s %d %d %255s%*[ \t]%127[^\n]\n", bssid, &freq, &rssi, cipher, ssid) > 0 ) { /* BSSID */ @@ -1205,14 +1332,14 @@ int nl80211_get_scanlist(const char *ifname, char *buf, int *len) e->signal = rssi; /* Quality */ - if( rssi < 0 ) + if (rssi < 0) { /* The cfg80211 wext compat layer assumes a signal range * of -110 dBm to -40 dBm, the quality value is derived * by adding 110 to the signal level */ - if( rssi < -110 ) + if (rssi < -110) rssi = -110; - else if( rssi > -40 ) + else if (rssi > -40) rssi = -40; e->quality = (rssi + 110); @@ -1233,6 +1360,10 @@ int nl80211_get_scanlist(const char *ifname, char *buf, int *len) count++; e++; + + memset(ssid, 0, sizeof(ssid)); + memset(bssid, 0, sizeof(bssid)); + memset(cipher, 0, sizeof(cipher)); } *len = count * sizeof(struct iwinfo_scanlist_entry); @@ -1243,72 +1374,64 @@ int nl80211_get_scanlist(const char *ifname, char *buf, int *len) /* AP scan */ else { - if( (res = nl80211_ifname2phy(ifname)) != NULL ) + /* Got a temp interface, don't create yet another one */ + if (!strncmp(ifname, "tmp.", 4)) { - /* Got a temp interface, don't create yet another one */ - if( !strncmp(ifname, "tmp.", 4) ) - { - sprintf(cmd, "ifconfig %s up 2>/dev/null", ifname); - if( WEXITSTATUS(system(cmd)) ) - return -1; + if (!iwinfo_ifup(ifname)) + return -1; + + wext_get_scanlist(ifname, buf, len); + iwinfo_ifdown(ifname); + return 0; + } - wext_get_scanlist(ifname, buf, len); + /* Spawn a new scan interface */ + else + { + if (!(res = nl80211_ifadd(ifname))) + goto out; - sprintf(cmd, "ifconfig %s down 2>/dev/null", ifname); - (void) WEXITSTATUS(system(cmd)); + if (!iwinfo_ifmac(res)) + goto out; - return 0; + /* if we can take the new interface up, the driver supports an + * additional interface and there's no need to tear down the ap */ + if (iwinfo_ifup(res)) + { + wext_get_scanlist(res, buf, len); + iwinfo_ifdown(res); } - /* Spawn a new scan interface */ - else + /* driver cannot create secondary interface, take down ap + * during scan */ + else if (iwinfo_ifdown(ifname) && iwinfo_ifup(res)) { - sprintf(cmd, "ifconfig %s down 2>/dev/null", ifname); - if( WEXITSTATUS(system(cmd)) ) - goto out; - - sprintf(cmd, "iw phy %s interface add scan.%s " - "type station 2>/dev/null", res, ifname); - if( WEXITSTATUS(system(cmd)) ) - goto out; - - sprintf(cmd, "ifconfig scan.%s up 2>/dev/null", ifname); - if( WEXITSTATUS(system(cmd)) ) - goto out; - - sprintf(cmd, "scan.%s", ifname); - wext_get_scanlist(cmd, buf, len); - - out: - sprintf(cmd, "ifconfig scan.%s down 2>/dev/null", ifname); - (void) WEXITSTATUS(system(cmd)); - - sprintf(cmd, "iw dev scan.%s del 2>/dev/null", ifname); - (void) WEXITSTATUS(system(cmd)); - - sprintf(cmd, "ifconfig %s up 2>/dev/null", ifname); - (void) WEXITSTATUS(system(cmd)); - - sprintf(cmd, "killall -HUP hostapd 2>/dev/null"); - (void) WEXITSTATUS(system(cmd)); - - return 0; + wext_get_scanlist(res, buf, len); + iwinfo_ifdown(res); + iwinfo_ifup(ifname); + nl80211_hostapd_hup(ifname); } + + out: + nl80211_ifdel(res); + return 0; } } return -1; } -int nl80211_get_freqlist(const char *ifname, char *buf, int *len) +static int nl80211_get_freqlist_cb(struct nl_msg *msg, void *arg) { - char *phy; - int count = 0, bands_remain, freqs_remain; - struct nl80211_msg_conveyor *req, *res; + int bands_remain, freqs_remain; + + struct nl80211_array_buf *arr = arg; + struct iwinfo_freqlist_entry *e = arr->buf; + + struct nlattr **attr = nl80211_parse(msg); struct nlattr *bands[NL80211_BAND_ATTR_MAX + 1]; struct nlattr *freqs[NL80211_FREQUENCY_ATTR_MAX + 1]; struct nlattr *band, *freq; - struct iwinfo_freqlist_entry *e = (struct iwinfo_freqlist_entry *)buf; static struct nla_policy freq_policy[NL80211_FREQUENCY_ATTR_MAX + 1] = { [NL80211_FREQUENCY_ATTR_FREQ] = { .type = NLA_U32 }, @@ -1319,73 +1442,85 @@ int nl80211_get_freqlist(const char *ifname, char *buf, int *len) [NL80211_FREQUENCY_ATTR_MAX_TX_POWER] = { .type = NLA_U32 }, }; - req = nl80211_msg(ifname, NL80211_CMD_GET_WIPHY, 0); - if( req ) + nla_for_each_nested(band, attr[NL80211_ATTR_WIPHY_BANDS], bands_remain) { - res = nl80211_send(req); - if( res ) - { - nla_for_each_nested(band, - res->attr[NL80211_ATTR_WIPHY_BANDS], bands_remain) - { - nla_parse(bands, NL80211_BAND_ATTR_MAX, nla_data(band), - nla_len(band), NULL); + nla_parse(bands, NL80211_BAND_ATTR_MAX, nla_data(band), + nla_len(band), NULL); - nla_for_each_nested(freq, - bands[NL80211_BAND_ATTR_FREQS], freqs_remain) - { - nla_parse(freqs, NL80211_FREQUENCY_ATTR_MAX, - nla_data(freq), nla_len(freq), freq_policy); + nla_for_each_nested(freq, + bands[NL80211_BAND_ATTR_FREQS], freqs_remain) + { + nla_parse(freqs, NL80211_FREQUENCY_ATTR_MAX, + nla_data(freq), nla_len(freq), NULL); - if( freqs[NL80211_FREQUENCY_ATTR_DISABLED] ) - continue; + if( !freqs[NL80211_FREQUENCY_ATTR_FREQ] || + freqs[NL80211_FREQUENCY_ATTR_DISABLED] ) + continue; - e->mhz = nla_get_u32(freqs[NL80211_FREQUENCY_ATTR_FREQ]); - e->channel = nl80211_freq2channel(e->mhz); + e->mhz = nla_get_u32(freqs[NL80211_FREQUENCY_ATTR_FREQ]); + 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->restricted = ( + freqs[NL80211_FREQUENCY_ATTR_PASSIVE_SCAN] || + freqs[NL80211_FREQUENCY_ATTR_NO_IBSS] || + freqs[NL80211_FREQUENCY_ATTR_RADAR] + ) ? 1 : 0; - e++; - count++; - } - } - nl80211_free(res); + e++; + arr->count++; } + } + + return NL_SKIP; +} + +int nl80211_get_freqlist(const char *ifname, char *buf, int *len) +{ + struct nl80211_msg_conveyor *req; + struct nl80211_array_buf arr = { .buf = buf, .count = 0 }; + + req = nl80211_msg(ifname, NL80211_CMD_GET_WIPHY, 0); + if (req) + { + nl80211_send(req, nl80211_get_freqlist_cb, &arr); nl80211_free(req); } - if( count > 0 ) + if (arr.count > 0) { - *len = count * sizeof(struct iwinfo_freqlist_entry); + *len = arr.count * sizeof(struct iwinfo_freqlist_entry); return 0; } return -1; } +static int nl80211_get_country_cb(struct nl_msg *msg, void *arg) +{ + char *buf = arg; + struct nlattr **attr = nl80211_parse(msg); + + if (attr[NL80211_ATTR_REG_ALPHA2]) + memcpy(buf, nla_data(attr[NL80211_ATTR_REG_ALPHA2]), 2); + else + buf[0] = 0; + + return NL_SKIP; +} + int nl80211_get_country(const char *ifname, char *buf) { int rv = -1; - struct nl80211_msg_conveyor *req, *res; + struct nl80211_msg_conveyor *req; req = nl80211_msg(ifname, NL80211_CMD_GET_REG, 0); - if( req ) + if (req) { - res = nl80211_send(req); - if( res ) - { - if( res->attr[NL80211_ATTR_REG_ALPHA2] ) - { - memcpy(buf, nla_data(res->attr[NL80211_ATTR_REG_ALPHA2]), 2); - rv = 0; - } - nl80211_free(res); - } + nl80211_send(req, nl80211_get_country_cb, buf); nl80211_free(req); + + if (buf[0]) + rv = 0; } return rv; @@ -1408,9 +1543,85 @@ int nl80211_get_countrylist(const char *ifname, char *buf, int *len) return 0; } +static int nl80211_get_hwmodelist_cb(struct nl_msg *msg, void *arg) +{ + int *modes = arg; + int bands_remain, freqs_remain; + uint16_t caps = 0; + struct nlattr **attr = nl80211_parse(msg); + struct nlattr *bands[NL80211_BAND_ATTR_MAX + 1]; + struct nlattr *freqs[NL80211_FREQUENCY_ATTR_MAX + 1]; + struct nlattr *band, *freq; + + *modes = 0; + + if (attr[NL80211_ATTR_WIPHY_BANDS]) + { + nla_for_each_nested(band, attr[NL80211_ATTR_WIPHY_BANDS], bands_remain) + { + nla_parse(bands, NL80211_BAND_ATTR_MAX, nla_data(band), + nla_len(band), NULL); + + if (bands[NL80211_BAND_ATTR_HT_CAPA]) + caps = nla_get_u16(bands[NL80211_BAND_ATTR_HT_CAPA]); + + /* Treat any nonzero capability as 11n */ + if (caps > 0) + *modes |= IWINFO_80211_N; + + nla_for_each_nested(freq, + bands[NL80211_BAND_ATTR_FREQS], freqs_remain) + { + nla_parse(freqs, NL80211_FREQUENCY_ATTR_MAX, + nla_data(freq), nla_len(freq), NULL); + + if (!freqs[NL80211_FREQUENCY_ATTR_FREQ]) + continue; + + if (nla_get_u32(freqs[NL80211_FREQUENCY_ATTR_FREQ]) < 2485) + { + *modes |= IWINFO_80211_B; + *modes |= IWINFO_80211_G; + } + else + { + *modes |= IWINFO_80211_A; + } + } + } + } + + return NL_SKIP; +} + +int nl80211_get_hwmodelist(const char *ifname, int *buf) +{ + struct nl80211_msg_conveyor *req; + + req = nl80211_msg(ifname, NL80211_CMD_GET_WIPHY, 0); + if (req) + { + nl80211_send(req, nl80211_get_hwmodelist_cb, buf); + nl80211_free(req); + } + + return *buf ? 0 : -1; +} + int nl80211_get_mbssid_support(const char *ifname, int *buf) { - /* We assume that multi bssid is always possible */ - *buf = 1; - return 0; + /* Test whether we can create another interface */ + char *nif = nl80211_ifadd(ifname); + + if (nif) + { + *buf = (iwinfo_ifmac(nif) && iwinfo_ifup(nif)); + + iwinfo_ifdown(nif); + nl80211_ifdel(nif); + + return 0; + } + + return -1; }