external/DAWN
1
0
Fork 0
mirror of https://github.com/berlin-open-wireless-lab/DAWN.git synced 2025-02-12 08:41:51 +00:00
Code Issues Releases Wiki Activity

datastorage: Minor chnages to kicking algorithm to tidy up some handling.

Browse source 
[cleanup commit message]
Signed-off-by: Nick Hainke <vincent@systemli.org>
This commit is contained in:
Ian Clowes 2022-04-02 17:32:57 +01:00 committed by Nick Hainke
parent c212c5469f
commit 8290138179
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/storage/datastorage.c
View file

@ -568,14 +568,14 @@ int kick_clients(struct dawn_mac bssid_mac, uint32_t id) {
// <= 6MBits <- probably no transmission // <= 6MBits <- probably no transmission
// tx_rate has always some weird value so don't use ist // tx_rate has always some weird value so don't use ist
if (have_bandwidth_iwinfo && dawn_metric.bandwidth_threshold != 0 && rx_rate > dawn_metric.bandwidth_threshold) { if (have_bandwidth_iwinfo && dawn_metric.bandwidth_threshold != 0 && rx_rate > dawn_metric.bandwidth_threshold) {
dawnlog_info("Client " MACSTR ": Client is probably in active transmission. Don't kick! RxRate is: %f\n", MAC2STR(j->client_addr.u8), rx_rate); dawnlog_info("Client " MACSTR ": Don't kick due to active data transfer: RX rate %f exceeds %d limit\n", MAC2STR(j->client_addr.u8), rx_rate, dawn_metric.bandwidth_threshold);
} }
else else
{ {
if (have_bandwidth_iwinfo) if (have_bandwidth_iwinfo && dawn_metric.bandwidth_threshold != 0)
dawnlog_always("Client " MACSTR ": Kicking as probably NOT in active transmission. RxRate is: %f\n", MAC2STR(j->client_addr.u8), rx_rate); dawnlog_always("Client " MACSTR ": Kicking due to low active data transfer: RX rate %f below %d limit\n", MAC2STR(j->client_addr.u8), rx_rate, dawn_metric.bandwidth_threshold);
else else
dawnlog_always("Client " MACSTR ": Kicking as no active transmission data for client, but bandwidth_threshold=%d is OK.\n", dawnlog_always("Client " MACSTR ": Kicking as no active transmission data for client, and / or limit of %d is OK.\n",
MAC2STR(j->client_addr.u8), dawn_metric.bandwidth_threshold); MAC2STR(j->client_addr.u8), dawn_metric.bandwidth_threshold);
print_client_entry(DAWNLOG_TRACE, j); print_client_entry(DAWNLOG_TRACE, j);
@ -595,7 +595,7 @@ int kick_clients(struct dawn_mac bssid_mac, uint32_t id) {
//del_client_interface(id, client_array[j].client_addr, NO_MORE_STAS, 1, 1000); //del_client_interface(id, client_array[j].client_addr, NO_MORE_STAS, 1, 1000);
if (kick_type == 1) if (kick_type == 1)
{ {
int sync_kick = wnm_disassoc_imminent(id, j->client_addr, kick_nr_list, own_score + dawn_metric.kicking_threshold, 12); int sync_kick = wnm_disassoc_imminent(id, j->client_addr, kick_nr_list, own_score + dawn_metric.kicking_threshold, dawn_metric.duration);
if (!sync_kick) if (!sync_kick)
{ {
@ -607,9 +607,9 @@ int kick_clients(struct dawn_mac bssid_mac, uint32_t id) {
add_client_update_timer(timeout_config.update_client * 1000 / 4); add_client_update_timer(timeout_config.update_client * 1000 / 4);
} }
} }
else else if (kick_type == 2)
{ {
bss_transition_request(id, j->client_addr, kick_nr_list, 12); bss_transition_request(id, j->client_addr, kick_nr_list, dawn_metric.duration);
} }
kicked_clients++; kicked_clients++;