sta: remove duplicate code

[project/usteer.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index fabc1a678dc8b364cb4c8a4b96240d712e088156..1a78bbfd76a78bd3993fa88eb2d1df70eecc278b 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -274,7 +274,7 @@ usteer_ubus_set_config(struct ubus_context *ctx, struct ubus_object *obj,
 
 void usteer_dump_node(struct blob_buf *buf, struct usteer_node *node)
 {
-       void *c;
+       void *c, *roam_events;
 
        c = blobmsg_open_table(buf, usteer_node_name(node));
        blobmsg_printf(buf, "bssid", MAC_ADDR_FMT, MAC_ADDR_DATA(node->bssid));
@@ -283,8 +283,12 @@ void usteer_dump_node(struct blob_buf *buf, struct usteer_node *node)
        blobmsg_add_u32(buf, "noise", node->noise);
        blobmsg_add_u32(buf, "load", node->load);
        blobmsg_add_u32(buf, "max_assoc", node->max_assoc);
-       blobmsg_add_u32(buf, "roam_source", node->roam_source);
-       blobmsg_add_u32(buf, "roam_destination", node->roam_destination);
+
+       roam_events = blobmsg_open_table(buf, "roam_events");
+       blobmsg_add_u32(buf, "source", node->roam_events.source);
+       blobmsg_add_u32(buf, "target", node->roam_events.target);
+       blobmsg_close_table(buf, roam_events);
+
        if (node->rrm_nr)
                blobmsg_add_field(buf, BLOBMSG_TYPE_ARRAY, "rrm_nr",
                                  blobmsg_data(node->rrm_nr),
@@ -514,6 +518,8 @@ usteer_ubus_disassoc_add_neighbors(struct sta_info *si)
        for_each_local_node(node) {
                if (i >= config.max_neighbor_reports)
                        break;
+               if (si->node == node)
+                       continue;
                if (usteer_add_nr_entry(si->node, node))
                        i++;
        }
@@ -557,7 +563,7 @@ int usteer_ubus_trigger_client_scan(struct sta_info *si)
        blob_buf_init(&b, 0);
        blobmsg_printf(&b, "addr", MAC_ADDR_FMT, MAC_ADDR_DATA(si->sta->addr));
        blobmsg_add_u32(&b, "mode", BEACON_MEASUREMENT_ACTIVE);
-       blobmsg_add_u32(&b, "duration", 65535);
+       blobmsg_add_u32(&b, "duration", config.roam_scan_interval / 100);
        blobmsg_add_u32(&b, "channel", 0);
        blobmsg_add_u32(&b, "op_class", si->scan_band ? 1 : 12);
        return ubus_invoke(ubus_ctx, ln->obj_id, "rrm_beacon_req", b.head, NULL, 0, 100);