Skip to content

policy: Attempt BSS transitions without disassociation_imminent first #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
lowjoel wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

policy: Attempt BSS transitions without disassociation_imminent first #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 35 additions & 3 deletions policy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,7 @@ usteer_roam_sm_found_better_node(struct sta_info *si, struct uevent *ev, enum ro
static bool
usteer_roam_trigger_sm(struct usteer_local_node *ln, struct sta_info *si)
{
bool disassociation_imminent = true;
struct sta_info *candidate;
struct uevent ev = {
.si_cur = si,
Expand All @@ -344,6 +345,7 @@ usteer_roam_trigger_sm(struct usteer_local_node *ln, struct sta_info *si)
if (config.roam_scan_tries && si->roam_tries >= config.roam_scan_tries) {
if (!config.roam_scan_timeout) {
/* Prepare to kick client */
si->transition_request_count = 0;
usteer_roam_set_state(si, ROAM_TRIGGER_SCAN_DONE, &ev);
} else {
/* Kick in scan timeout */
Expand All @@ -370,9 +372,39 @@ usteer_roam_trigger_sm(struct usteer_local_node *ln, struct sta_info *si)
break;
}

usteer_ubus_bss_transition_request(si, 1, false, false, 100, candidate->node);
si->kick_time = current_time + config.roam_kick_delay;
usteer_roam_set_state(si, ROAM_TRIGGER_IDLE, &ev);
if (!si->transition_request_count) {
si->transition_request_start = current_time;
si->transition_request_last = 0;
}

/* If the sta acknowledged, we immediately bail */
if (si->bss_transition_response.timestamp < si->transition_request_start ||
(si->bss_transition_response.timestamp > si->transition_request_start && si->bss_transition_response.status_code)) {
/* Send gentle transitions, before setting disassociation_imminent=true. Approximately 1-5 seconds apart. */
uint32_t delay = config.roam_kick_delay / 10;
if (delay < 1000) {
delay = 1000;
} else if (delay > 5000) {
delay = 5000;
}
if (current_time < si->transition_request_start + config.roam_kick_delay &&
si->transition_request_last && current_time < si->transition_request_last + delay) {
/* Too soon to send another transition request */
break;
}

disassociation_imminent = si->transition_request_count > 3 &&
(current_time - si->transition_request_start) > config.roam_kick_delay;
}
si->transition_request_count++;
si->transition_request_last = current_time;

usteer_ubus_bss_transition_request(si, 1, disassociation_imminent, false, 100, candidate->node);
if (disassociation_imminent) {
si->kick_time = current_time + config.roam_kick_delay;
usteer_roam_set_state(si, ROAM_TRIGGER_IDLE, &ev);
}
return true;
break;
}

Expand Down
3 changes: 3 additions & 0 deletions ubus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,9 @@ usteer_ubus_get_connected_clients(struct ubus_context *ctx, struct ubus_object *
blobmsg_add_u64(&b, "last-kick", si->roam_kick ? current_time - si->roam_kick : 0);
blobmsg_add_u64(&b, "scan_start", si->roam_scan_start ? current_time - si->roam_scan_start : 0);
blobmsg_add_u64(&b, "scan_timeout_start", si->roam_scan_timeout_start ? current_time - si->roam_scan_timeout_start : 0);
blobmsg_add_u32(&b, "transition_request_count", si->transition_request_count);
blobmsg_add_u64(&b, "transition_request_start", si->transition_request_start ? current_time - si->transition_request_start : 0);
blobmsg_add_u64(&b, "transition_request_last", si->transition_request_last ? current_time - si->transition_request_last : 0);
blobmsg_close_table(&b, t);

t = blobmsg_open_table(&b, "bss-transition-response");
Expand Down
3 changes: 3 additions & 0 deletions usteer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,9 @@ struct sta_info {
bool below_snr;
} band_steering;

uint8_t transition_request_count;
uint64_t transition_request_start;
uint64_t transition_request_last;
uint64_t kick_time;

int kick_count;
Expand Down