policy: only trigger roam-sm after client becomes roamable

[project/usteer.git] / policy.c

diff --git a/policy.c b/policy.c
index a7efc06342794a59eeb71aa78ef64c59871542fb..90a12a0ac539e00cada8c864e0d9f929c6989b49 100644 (file)
--- a/policy.c
+++ b/policy.c
@@ -29,6 +29,9 @@ below_assoc_threshold(struct usteer_node *node_cur, struct usteer_node *node_new
        bool ref_5g = node_cur->freq > 4000;
        bool node_5g = node_new->freq > 4000;
 
+       if (!config.load_balancing_threshold)
+               return false;
+
        if (ref_5g && !node_5g)
                n_assoc_new += config.band_steering_threshold;
        else if (!ref_5g && node_5g)
@@ -143,7 +146,7 @@ find_better_candidate(struct sta_info *si_ref, struct uevent *ev, uint32_t requi
                        ev->select_reasons = reasons;
                }
 
-               if (candidate && si->signal > candidate->signal)
+               if (!candidate || si->signal > candidate->signal)
                        candidate = si;
        }
 
@@ -173,6 +176,9 @@ usteer_check_request(struct sta_info *si, enum usteer_event_type type)
        int min_signal;
        bool ret = true;
 
+       if (type == EVENT_TYPE_PROBE && !config.probe_steering)
+               goto out;
+
        if (type == EVENT_TYPE_AUTH)
                goto out;
 
@@ -220,21 +226,18 @@ usteer_check_request(struct sta_info *si, enum usteer_event_type type)
 out:
        switch (type) {
        case EVENT_TYPE_PROBE:
-               ev.type = UEV_PROBE_REQ_ACCEPT;
+               ev.type = ret ? UEV_PROBE_REQ_ACCEPT : UEV_PROBE_REQ_DENY;
                break;
        case EVENT_TYPE_ASSOC:
-               ev.type = UEV_ASSOC_REQ_ACCEPT;
+               ev.type = ret ? UEV_ASSOC_REQ_ACCEPT : UEV_ASSOC_REQ_DENY;
                break;
        case EVENT_TYPE_AUTH:
-               ev.type = UEV_AUTH_REQ_ACCEPT;
+               ev.type = ret ? UEV_AUTH_REQ_ACCEPT : UEV_AUTH_REQ_DENY;
                break;
        default:
                break;
        }
 
-       if (!ret)
-               ev.type++;
-
        if (!ret && si->stats[type].blocked_cur >= config.max_retry_band) {
                ev.reason = UEV_REASON_RETRY_EXCEEDED;
                ev.threshold.cur = si->stats[type].blocked_cur;
@@ -375,6 +378,36 @@ usteer_roam_trigger_sm(struct usteer_local_node *ln, struct sta_info *si)
        return false;
 }
 
+static bool
+usteer_local_node_roam_sm_active(struct sta_info *si, int min_signal)
+{
+       /* Only trigger for connected STAs */
+       if (si->connected != STA_CONNECTED)
+               return false;
+
+       /* Signal has to be below scan / roam threshold */
+       if (si->signal >= min_signal)
+               return false;
+
+       /* Skip on pending kick */
+       if (si->kick_time)
+               return false;
+
+       /* Skip on rejected transition */
+       if (si->bss_transition_response.status_code && current_time - si->bss_transition_response.timestamp < config.steer_reject_timeout)
+               return false;
+
+       /* Skip on previous kick attempt */
+       if (current_time - si->roam_kick < config.roam_trigger_interval)
+               return false;
+
+       /* Skip if connection is established shorter than the trigger-interval */
+       if (current_time - si->connected_since < config.roam_trigger_interval)
+               return false;
+       
+       return true;
+}
+
 static void
 usteer_local_node_roam_check(struct usteer_local_node *ln, struct uevent *ev)
 {
@@ -392,10 +425,7 @@ usteer_local_node_roam_check(struct usteer_local_node *ln, struct uevent *ev)
        min_signal = usteer_snr_to_signal(&ln->node, min_signal);
 
        list_for_each_entry(si, &ln->node.sta_info, node_list) {
-               if (si->connected != STA_CONNECTED || si->signal >= min_signal ||
-                       si->kick_time ||
-                       (si->bss_transition_response.status_code && current_time - si->bss_transition_response.timestamp < config.steer_reject_timeout) ||
-                   current_time - si->roam_kick < config.roam_trigger_interval) {
+               if (!usteer_local_node_roam_sm_active(si, min_signal)) {
                        usteer_roam_set_state(si, ROAM_TRIGGER_IDLE, ev);
                        continue;
                }