nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use bssid instead of iface name

Browse Source
This commit is contained in:
lemoer 2020-01-11 17:50:02 +01:00
parent e65c0fbdb6
commit eae0e6ac59
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package/gluon-mesh-batman-adv/src/respondd.c
View File

@ -718,6 +718,10 @@ static struct json_object * get_wifi_neighbours(const char *ifname) {
if (iw->assoclist(ifname, buf, &len) < 0) if (iw->assoclist(ifname, buf, &len) < 0)
return NULL; return NULL;
char *ifaddr = gluonutil_get_interface_address(ifname);
if (!ifaddr)
return NULL;
struct json_object *neighbours = json_object_new_object(); struct json_object *neighbours = json_object_new_object();
struct iwinfo_assoclist_entry *entry; struct iwinfo_assoclist_entry *entry;
@ -730,7 +734,7 @@ static struct json_object * get_wifi_neighbours(const char *ifname) {
json_object_object_add(obj, "signal", json_object_new_int(entry->signal)); json_object_object_add(obj, "signal", json_object_new_int(entry->signal));
json_object_object_add(obj, "noise", json_object_new_int(entry->noise)); json_object_object_add(obj, "noise", json_object_new_int(entry->noise));
json_object_object_add(obj, "inactive", json_object_new_int(entry->inactive)); json_object_object_add(obj, "inactive", json_object_new_int(entry->inactive));
json_object_object_add(obj, "iface", json_object_new_string(ifname)); json_object_object_add(obj, "bssid", json_object_new_string(ifaddr));
char mac[18]; char mac[18];
snprintf(mac, sizeof(mac), "%02x:%02x:%02x:%02x:%02x:%02x", snprintf(mac, sizeof(mac), "%02x:%02x:%02x:%02x:%02x:%02x",
@ -740,6 +744,8 @@ static struct json_object * get_wifi_neighbours(const char *ifname) {
json_object_object_add(neighbours, mac, obj); json_object_object_add(neighbours, mac, obj);
} }
free(ifaddr);
struct json_object *ret = json_object_new_object(); struct json_object *ret = json_object_new_object();
if (json_object_object_length(neighbours)) if (json_object_object_length(neighbours))