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

fix hearingmap ubus call

Browse source
This commit is contained in:
PolynomialDivision 2017-12-24 20:35:12 +01:00
parent 2d5607b4fc
commit 66a9898eb6
1 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/storage/datastorage.c
View file

@ -97,7 +97,18 @@ int build_hearing_map_sort_client(struct blob_buf *b)
int i; int i;
for (i = 0; i <= probe_entry_last; i++) { for (i = 0; i <= probe_entry_last; i++) {
if(!mac_is_equal(ap_array[m].bssid_addr, probe_array[i].bssid_addr)) /*if(!mac_is_equal(ap_array[m].bssid_addr, probe_array[i].bssid_addr))
{
continue;
}*/
ap ap_entry_i = ap_array_get_ap(probe_array[i].bssid_addr);
if (!mac_is_equal(ap_entry_i.bssid_addr, probe_array[i].bssid_addr)) {
continue;
}
if(strcmp((char*)ap_entry_i.ssid, (char*)ap_array[m].ssid) != 0)
{ {
continue; continue;
} }
@ -106,6 +117,17 @@ int build_hearing_map_sort_client(struct blob_buf *b)
sprintf(client_mac_buf, MACSTR, MAC2STR(probe_array[i].client_addr)); sprintf(client_mac_buf, MACSTR, MAC2STR(probe_array[i].client_addr));
client_list = blobmsg_open_table(b, client_mac_buf); client_list = blobmsg_open_table(b, client_mac_buf);
for (k = i; i <= probe_entry_last; k++) { for (k = i; i <= probe_entry_last; k++) {
ap ap_entry = ap_array_get_ap(probe_array[k].bssid_addr);
if (!mac_is_equal(ap_entry.bssid_addr, probe_array[k].bssid_addr)) {
continue;
}
if(strcmp((char*)ap_entry.ssid, (char*)ap_array[m].ssid) != 0)
{
continue;
}
if (!mac_is_equal(probe_array[k].client_addr, probe_array[i].client_addr)) { if (!mac_is_equal(probe_array[k].client_addr, probe_array[i].client_addr)) {
i = k - 1; i = k - 1;
break; break;
@ -117,15 +139,12 @@ int build_hearing_map_sort_client(struct blob_buf *b)
blobmsg_add_u8(b, "ht_support", probe_array[k].ht_support); blobmsg_add_u8(b, "ht_support", probe_array[k].ht_support);
blobmsg_add_u8(b, "vht_support", probe_array[k].vht_support); blobmsg_add_u8(b, "vht_support", probe_array[k].vht_support);
ap ap_entry = ap_array_get_ap(probe_array[k].bssid_addr);
// check if ap entry is available // check if ap entry is available
if (mac_is_equal(ap_entry.bssid_addr, probe_array[k].bssid_addr)) { blobmsg_add_u32(b, "channel_utilization", ap_entry.channel_utilization);
blobmsg_add_u32(b, "channel_utilization", ap_entry.channel_utilization); blobmsg_add_u32(b, "num_sta", ap_entry.station_count);
blobmsg_add_u32(b, "num_sta", ap_entry.station_count); blobmsg_add_u32(b, "ht", ap_entry.ht);
blobmsg_add_u32(b, "ht", ap_entry.ht); blobmsg_add_u32(b, "vht", ap_entry.vht);
blobmsg_add_u32(b, "vht", ap_entry.vht);
}
blobmsg_add_u32(b, "score", eval_probe_metric(probe_array[k])); blobmsg_add_u32(b, "score", eval_probe_metric(probe_array[k]));
blobmsg_close_table(b, ap_list); blobmsg_close_table(b, ap_list);