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)
{
- int sock = -1, len;
+ 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 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( 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;
}
}
-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;
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)
{
struct nl80211_rssi_rate rr;
- struct nl80211_msg_conveyor *req;
if( !wext_get_bitrate(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.rate )
- {
- *buf = (rr.rate * 100);
- return 0;
- }
+ if (rr.rate)
+ {
+ *buf = (rr.rate * 100);
+ return 0;
}
return -1;
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) )
return 0;
- req = nl80211_msg(ifname, NL80211_CMD_GET_STATION, NLM_F_DUMP);
- if( req )
- {
- rr.rssi = 0;
- rr.rate = 0;
+ nl80211_fill_signal(ifname, &rr);
- nl80211_cb(req, nl80211_get_signal_cb, &rr);
- nl80211_send(req);
- nl80211_free(req);
-
- if( rr.rssi )
- {
- *buf = rr.rssi;
- return 0;
- }
+ if (rr.rssi)
+ {
+ *buf = rr.rssi;
+ return 0;
}
return -1;
char *val, *res;
struct iwinfo_crypto_entry *c = (struct iwinfo_crypto_entry *)buf;
- /* Hostapd */
- 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;
- }
-
/* WPA supplicant */
- else if( (res = nl80211_wpasupp_info(ifname, "STATUS")) &&
- (val = nl80211_getval(NULL, res, "pairwise_cipher")) )
+ if( (res = nl80211_wpactl_info(ifname, "STATUS", NULL)) &&
+ (val = nl80211_getval(NULL, res, "pairwise_cipher")) )
{
/* WEP */
if( strstr(val, "WEP") )
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;
}
int nl80211_get_assoclist(const char *ifname, char *buf, int *len)
{
+ DIR *d;
+ struct dirent *de;
struct nl80211_assoc_count ac;
struct nl80211_msg_conveyor *req;
- 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;
- nl80211_cb(req, nl80211_get_assoclist_cb, &ac);
- nl80211_send(req);
- nl80211_free(req);
+ 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_send(req);
+ nl80211_free(req);
+ }
+ }
+ }
+
+ closedir(d);
*len = (ac.count * sizeof(struct iwinfo_assoclist_entry));
return 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 = iwinfo_dbm2mw(dbm_cur);
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);
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 */
count++;
e++;
+
+ memset(ssid, 0, sizeof(ssid));
+ memset(bssid, 0, sizeof(bssid));
+ memset(cipher, 0, sizeof(cipher));
}
*len = count * sizeof(struct iwinfo_scanlist_entry);
if( req )
{
res = nl80211_send(req);
- if( res )
+ if( res && res->attr[NL80211_ATTR_WIPHY_BANDS] )
{
nla_for_each_nested(band,
res->attr[NL80211_ATTR_WIPHY_BANDS], bands_remain)
if( req )
{
res = nl80211_send(req);
- if( res )
+ if( res && res->attr[NL80211_ATTR_WIPHY_BANDS] )
{
nla_for_each_nested(band,
res->attr[NL80211_ATTR_WIPHY_BANDS], bands_remain)
projects / project / luci.git / blobdiff