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

iwinfo: fix get_bandwidth_iwinfo

Browse source 
Bug that was preventing kicking working due to mishandling of bandwidth
discovery. Fixed bug in use of get_bandwidth_iwinfo() in AP kicking.
Fix rounding of transmission rate calculations in
get_bandwidth_iwinfo().
Restructure of get_bandwidth...() while finding bug.

Signed-off-by: Ian Clowes <clowes_ian@hotmail.com>
This commit is contained in:
Ian Clowes 2022-01-06 09:16:18 +01:00 • committed by Nick Hainke
parent 57be352a6a
commit 47c1e7a18b
2 changed files with 26 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/storage/datastorage.c
View file

@ -721,7 +721,7 @@ int kick_clients(ap* kicking_ap, uint32_t id) {
dawnlog_debug("Check if client is active receiving!\n"); dawnlog_debug("Check if client is active receiving!\n");
float rx_rate, tx_rate; float rx_rate, tx_rate;
bool have_bandwidth_iwinfo = !(get_bandwidth_iwinfo(j->client_addr, &rx_rate, &tx_rate)); bool have_bandwidth_iwinfo = get_bandwidth_iwinfo(j->client_addr, &rx_rate, &tx_rate);
if (!have_bandwidth_iwinfo && dawn_metric.bandwidth_threshold > 0) { if (!have_bandwidth_iwinfo && dawn_metric.bandwidth_threshold > 0) {
dawnlog_debug("No active transmission data for client. Don't kick!\n"); dawnlog_debug("No active transmission data for client. Don't kick!\n");
} }

53
src/utils/dawn_iwinfo.c
View file

@ -103,12 +103,10 @@ int get_bandwidth_iwinfo(struct dawn_mac client_addr, float *rx_rate, float *tx_
int sucess = 0; int sucess = 0;
while ((entry = readdir(dirp)) != NULL) { while (!sucess && ((entry = readdir(dirp)) != NULL)) {
if (entry->d_type == DT_SOCK) { if (entry->d_type == DT_SOCK) {
if (get_bandwidth(entry->d_name, client_addr, rx_rate, tx_rate)) { dawnlog_debug("[BANDWIDTH INFO] Trying %s\n", entry->d_name);
sucess = 1; sucess = get_bandwidth(entry->d_name, client_addr, rx_rate, tx_rate);
break;
}
} }
} }
closedir(dirp); closedir(dirp);
@ -116,35 +114,34 @@ int get_bandwidth_iwinfo(struct dawn_mac client_addr, float *rx_rate, float *tx_
} }
int get_bandwidth(const char *ifname, struct dawn_mac client_addr, float *rx_rate, float *tx_rate) { int get_bandwidth(const char *ifname, struct dawn_mac client_addr, float *rx_rate, float *tx_rate) {
int ret = 0;
int i, len; if (strcmp(ifname, "global") != 0)
char buf[IWINFO_BUFSIZE]; {
struct iwinfo_assoclist_entry *e; const struct iwinfo_ops* iw = iwinfo_backend(ifname);
const struct iwinfo_ops *iw;
if (strcmp(ifname, "global") == 0)
return 0;
iw = iwinfo_backend(ifname);
if (iw->assoclist(ifname, buf, &len)) { char buf[IWINFO_BUFSIZE];
iwinfo_finish(); int len;
return 0; if (iw->assoclist(ifname, buf, &len) == 0 && len > 0)
} else if (len <= 0) { {
iwinfo_finish(); struct iwinfo_assoclist_entry* e = (struct iwinfo_assoclist_entry*)buf;
return 0; for (int i = 0; ret == 0 && i < len; i += sizeof(struct iwinfo_assoclist_entry)) {
}
for (i = 0; i < len; i += sizeof(struct iwinfo_assoclist_entry)) { if (mac_is_equal(client_addr.u8, e->mac)) {
e = (struct iwinfo_assoclist_entry *) &buf[i]; *rx_rate = e->rx_rate.rate / 1000.0;
*tx_rate = e->tx_rate.rate / 1000.0;
if (mac_is_equal(client_addr.u8, e->mac)) { ret = 1;
*rx_rate = e->rx_rate.rate / 1000; }
*tx_rate = e->tx_rate.rate / 1000;
iwinfo_finish(); e++;
return 1; }
} }
iwinfo_finish();
} }
iwinfo_finish();
return 0; return ret;
} }
int get_rssi_iwinfo(struct dawn_mac client_addr) { int get_rssi_iwinfo(struct dawn_mac client_addr) {