external/DAWN
1
0
Fork 0
mirror of https://github.com/berlin-open-wireless-lab/DAWN.git synced 2025-03-09 15:40:12 +00:00
Code Issues Releases Wiki Activity

Revert "ubus: addd empty aps"

Browse source 
This reverts commit 3a6ef89998.
This commit is contained in:
twy_2000 2020-05-28 20:17:03 +08:00
parent 3a6ef89998
commit 0eccc8c8e6
1 changed files with 38 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

80
src/storage/datastorage.c
View file

@ -200,47 +200,46 @@ int build_network_overview(struct blob_buf *b) {
blob_buf_init(b, 0);
int m;
for (m = 0; m <= ap_entry_last; m++) {
bool add_ssid = false;
bool close_ssid = false;
if (m == 0 || strcmp((char *) ap_array[m].ssid, (char *) ap_array[m - 1].ssid) != 0) {
add_ssid = true;
}
if (m >= ap_entry_last || strcmp((char *) ap_array[m].ssid, (char *) ap_array[m + 1].ssid) != 0) {
close_ssid = true;
}
if(add_ssid)
{
ssid_list = blobmsg_open_table(b, (char *) ap_array[m].ssid);
}
sprintf(ap_mac_buf, MACSTR, MAC2STR(ap_array[m].bssid_addr));
ap_list = blobmsg_open_table(b, ap_mac_buf);
blobmsg_add_u32(b, "freq", ap_array[m].freq);
blobmsg_add_u32(b, "channel_utilization", ap_array[m].channel_utilization);
blobmsg_add_u32(b, "num_sta", ap_array[m].station_count);
blobmsg_add_u8(b, "ht_support", ap_array[m].ht_support);
blobmsg_add_u8(b, "vht_support", ap_array[m].vht_support);
char *nr;
nr = blobmsg_alloc_string_buffer(b, "neighbor_report", NEIGHBOR_REPORT_LEN);
sprintf(nr, "%s", ap_array[m].neighbor_report);
blobmsg_add_string_buffer(b);
int k;
for (k = 0; k <= client_entry_last; k++) {
if (mac_is_greater(ap_array[m].bssid_addr, client_array[k].bssid_addr))
{
break;
if (m > 0) {
if (strcmp((char *) ap_array[m].ssid, (char *) ap_array[m - 1].ssid) == 0) {
continue;
}
}
ssid_list = blobmsg_open_table(b, (char *) ap_array[m].ssid);
int i;
for (i = 0; i <= client_entry_last; i++) {
ap ap_entry_i = ap_array_get_ap(client_array[i].bssid_addr);
if (strcmp((char *) ap_entry_i.ssid, (char *) ap_array[m].ssid) != 0) {
continue;
}
int k;
sprintf(ap_mac_buf, MACSTR, MAC2STR(client_array[i].bssid_addr));
ap_list = blobmsg_open_table(b, ap_mac_buf);
blobmsg_add_u32(b, "freq", ap_entry_i.freq);
blobmsg_add_u32(b, "channel_utilization", ap_entry_i.channel_utilization);
blobmsg_add_u32(b, "num_sta", ap_entry_i.station_count);
blobmsg_add_u8(b, "ht_support", ap_entry_i.ht_support);
blobmsg_add_u8(b, "vht_support", ap_entry_i.vht_support);
char *nr;
nr = blobmsg_alloc_string_buffer(b, "neighbor_report", NEIGHBOR_REPORT_LEN);
sprintf(nr, "%s", ap_entry_i.neighbor_report);
blobmsg_add_string_buffer(b);
for (k = i; k <= client_entry_last; k++) {
if (!mac_is_equal(client_array[k].bssid_addr, client_array[i].bssid_addr)) {
i = k - 1;
break;
} else if (k == client_entry_last) {
i = k;
}
if (mac_is_equal(ap_array[m].bssid_addr, client_array[k].bssid_addr)) {
sprintf(client_mac_buf, MACSTR, MAC2STR(client_array[k].client_addr));
client_list = blobmsg_open_table(b, client_mac_buf);
if(strlen(client_array[k].signature) != 0)
{
char *s;
@ -263,12 +262,9 @@ int build_network_overview(struct blob_buf *b) {
}
blobmsg_close_table(b, client_list);
}
blobmsg_close_table(b, ap_list);
}
blobmsg_close_table(b, ap_list);
if(close_ssid)
{
blobmsg_close_table(b, ssid_list);
}
blobmsg_close_table(b, ssid_list);
}
return 0;
}