mirror of
https://github.com/berlin-open-wireless-lab/DAWN.git
synced 2025-03-09 15:40:12 +00:00
Merge c639249e4a
into e036905ae3
This commit is contained in:
commit
0defe4c1ed
1 changed files with 5 additions and 2 deletions
|
@ -561,16 +561,18 @@ int kick_clients(struct dawn_mac bssid_mac, uint32_t id) {
|
|||
dawnlog_info("Client " MACSTR ": No active transmission data for client. Don't kick!\n", MAC2STR(j->client_addr.u8));
|
||||
}
|
||||
else
|
||||
{
|
||||
if (dawn_metric.bandwidth_threshold != 0)
|
||||
{
|
||||
// only use rx_rate for indicating if transmission is going on
|
||||
// <= 6MBits <- probably no transmission
|
||||
// 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 && rx_rate > dawn_metric.bandwidth_threshold) {
|
||||
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
|
||||
{
|
||||
if (have_bandwidth_iwinfo && dawn_metric.bandwidth_threshold != 0)
|
||||
if (have_bandwidth_iwinfo)
|
||||
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
|
||||
dawnlog_always("Client " MACSTR ": Kicking as no active transmission data for client, and / or limit of %d is OK.\n",
|
||||
|
@ -615,6 +617,7 @@ int kick_clients(struct dawn_mac bssid_mac, uint32_t id) {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (kick_type == -1) {
|
||||
// FIXME: Causes clients to be kicked until first probe is received, which is a bit brutal for pre-802.11k clients.
|
||||
dawnlog_info("Client " MACSTR ": No Information about client. Force reconnect:\n", MAC2STR(j->client_addr.u8));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue