RDKBWIFI-278: CACR add multi-STA support and received subdoc from UWM by sundram0711 · Pull Request #1222 · rdkcentral/OneWifi

sundram0711 · 2026-06-23T08:09:44Z

Refactored implementation to support multiple STA entries per message (spec compliant)
Changed the struct to json format to carry cacr information from UWM to OneWifi.

Copilot

Pull request overview

This PR updates the EasyMesh Client Association Control Request (CACR) handling to accept a JSON sub-document from UWM and to apply the request to multiple STAs per message, rather than a single STA.

Changes:

Switched CACR payload handling from a binary struct (client_assoc_ctrl_req_t) to a JSON subdoc parser (parse_client_assoc_ctrl_json()).
Added multi-STA processing loop for StaMacList and per-STA ACL timer scheduling/cancellation tracking.
Extended kick_details_t to carry a scheduler timer ID for cancel support.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 6 comments.

File	Description
source/core/wifi_ctrl.h	Extends `kick_details_t` with a `timer_id` field to track scheduled ACL removal timers.
source/apps/em/wifi_em.c	Implements JSON parsing for CACR, multi-STA handling, and pending timer tracking/cancellation.
include/wifi_base.h	Removes the old binary CACR request struct (`client_assoc_ctrl_req_t`) now replaced by JSON payloads.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 5 comments.

Comments suppressed due to low confidence (1)

source/apps/em/wifi_em.c:3290

The error cleanup: path only frees kick_details, but when kick_details->kick_list has been allocated (e.g., strdup() succeeded) this leaks memory. Free kick_details->kick_list first (it is safe to free(NULL)).

cleanup:
    if (kick_details) {
        free(kick_details);
    }

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 4 comments.

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 5 comments.

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.

- Refactored implementation to support multiple STA entries per message (spec compliant) - Changed the struct to json format to carry cacr information from UWM to OneWifi. Signed-off-by: Sundram Patel <sundram.p@tataelxsi.co.in>

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 4 comments.

+        kick_details_t *existing = find_remove_and_cancel_pending_block(vap_index, sta_mac_list[i]);
+
+        if (existing) {
+            wifi_util_dbg_print(WIFI_CTRL,"%s:%d STA %s already blocked, extending timer\n",
+			    __func__, __LINE__, sta_mac_list[i]);
+
+            /* Extend the existing timer in-place to avoid multiple timers sharing the same arg. */
+            struct timespec now;
+            clock_gettime(CLOCK_MONOTONIC, &now);
+
+            if (existing->timer_id <= 0 ||
+                scheduler_update_timer_task_interval(ctrl->sched, existing->timer_id, validity_period * 1000) != RETURN_OK ||
+                scheduler_update_timeout(ctrl->sched, existing->timer_id, now) != RETURN_OK) {
+                /* Keep the original timer so the block will still expire. */
+                (void)add_pending_block(existing);
+                ret = bus_error_general;
+                goto cleanup;
+            }


+        kick_details_t *pending = find_remove_and_cancel_pending_block(vap_index, sta_mac_list[i]);
+
        #ifdef NL80211_ACL
-           //if sta already block then removed it from acl list
-            success = (wifi_hal_delApAclDevice(vap_index, sta_mac_str) == RETURN_OK);
+            //if sta already block then removed it from acl list
+            success = (wifi_hal_delApAclDevice(vap_index, sta_mac_list[i]) == RETURN_OK);
        #else
-            success = (wifi_delApAclDevice(vap_index, sta_mac_str) == RETURN_OK);
+            success = (wifi_delApAclDevice(vap_index, sta_mac_list[i]) == RETURN_OK);
        #endif
        if (!success) {
            wifi_util_error_print(WIFI_CTRL, "%s:%d Failed to delete ACL device on vap %d\n",
                __func__, __LINE__, vap_index);
+            if (pending && add_pending_block(pending) != RETURN_OK) {
+                wifi_util_error_print(WIFI_CTRL, "%s:%d Failed to add pending\n", __func__, __LINE__);
+            }
            ret = bus_error_general;
            goto cleanup;
        }
-    }

+        if (pending) {
+            if (pending->timer_id >= 0 && scheduler_cancel_timer_task(ctrl->sched, pending->timer_id) == RETURN_OK) {
+                /* scheduler_cancel_timer_task() does not free the task arg; free kick_details explicitly. */
+                char *kick_list = pending->kick_list;
+                pending->kick_list = NULL;
+                if (scheduler_free_timer_task_arg(ctrl->sched, pending->timer_id) != RETURN_OK) {
+                    /* Fallback: timer is cancelled so the arg will not be dereferenced. */
+                    free(pending);
+                }
+                free(kick_list);
+                pending = NULL;
+            }
+            acl_block_end(vap_index);
+        }


+    // Cancel and free any pending block timers/entries before destroying the mutex
+    pthread_mutex_lock(&pending_blocks_lock);
+    pending_block_node_t *node = pending_blocks_head;
+    pending_blocks_head = NULL;
+    pthread_mutex_unlock(&pending_blocks_lock);
+
+    while (node) {
+        pending_block_node_t *next = node->next;
+        if (node->kick_details) {
+            if (node->kick_details->timer_id > 0) {
+                scheduler_cancel_timer_task(ctrl->sched, node->kick_details->timer_id);
+            }
+
+#ifdef NL80211_ACL
+            wifi_hal_delApAclDevice(node->kick_details->vap_index, node->kick_details->kick_list);
+#else
+            wifi_delApAclDevice(node->kick_details->vap_index, node->kick_details->kick_list);
+#endif
+            acl_block_end(node->kick_details->vap_index);
+
+            free(node->kick_details->kick_list);
+            free(node->kick_details);
+        }
+        free(node);
+        node = next;
+    }
+
+    pthread_mutex_destroy(&pending_blocks_lock);
+    pthread_mutex_destroy(&g_vap_acl_lock);


+    if (d->cancelled_by_unblock) {
+        remove_pending_block(d);
+        free(d->kick_list);
+        free(d);
+        return 0;
+    }


mateuszCieslak-GL · 2026-07-13T22:06:37Z

@sundram0711 please address recent copilot comments. If they are not applicable comment why.

Copilot AI review requested due to automatic review settings June 23, 2026 08:09

sundram0711 requested a review from a team as a code owner June 23, 2026 08:09

github-actions Bot added the community contribution Contributions from community. label Jun 23, 2026

Copilot started reviewing on behalf of sundram0711 June 23, 2026 08:10 View session

Copilot AI reviewed Jun 23, 2026

View reviewed changes

Comment thread source/apps/em/wifi_em.c Outdated

Comment thread source/apps/em/wifi_em.c Outdated

Comment thread source/apps/em/wifi_em.c Outdated

Comment thread source/apps/em/wifi_em.c

Comment thread source/apps/em/wifi_em.c

Comment thread source/apps/em/wifi_em.c Outdated

sundram0711 force-pushed the easymesh-refactor_client_assoc_multiSTA_new branch from c4a31aa to 4a907f6 Compare June 23, 2026 09:28

sundram0711 requested a review from Copilot June 23, 2026 09:33

Copilot started reviewing on behalf of sundram0711 June 23, 2026 09:34 View session

Copilot AI reviewed Jun 23, 2026

View reviewed changes

Comment thread source/apps/em/wifi_em.c Outdated

Comment thread source/apps/em/wifi_em.c

Comment thread source/apps/em/wifi_em.c

Comment thread source/apps/em/wifi_em.c Outdated

Comment thread source/apps/em/wifi_em.c Outdated

sundram0711 force-pushed the easymesh-refactor_client_assoc_multiSTA_new branch from 4a907f6 to a7f6696 Compare June 24, 2026 11:52

Copilot AI review requested due to automatic review settings June 24, 2026 12:00

sundram0711 force-pushed the easymesh-refactor_client_assoc_multiSTA_new branch from a7f6696 to 436d6a1 Compare June 24, 2026 12:00

Copilot started reviewing on behalf of sundram0711 June 24, 2026 12:00 View session

Copilot AI reviewed Jun 24, 2026

View reviewed changes

Comment thread source/apps/em/wifi_em.c Outdated

Comment thread source/apps/em/wifi_em.c Outdated

Comment thread source/apps/em/wifi_em.c Outdated

Comment thread source/apps/em/wifi_em.c

sundram0711 force-pushed the easymesh-refactor_client_assoc_multiSTA_new branch from 436d6a1 to 02c6fcf Compare June 25, 2026 20:09

sundram0711 requested a review from Copilot June 25, 2026 20:11

Copilot started reviewing on behalf of sundram0711 June 25, 2026 20:11 View session

Copilot AI reviewed Jun 25, 2026

View reviewed changes

Comment thread source/apps/em/wifi_em.c Outdated

Comment thread source/apps/em/wifi_em.c

sundram0711 force-pushed the easymesh-refactor_client_assoc_multiSTA_new branch from 02c6fcf to 8bc17f3 Compare June 25, 2026 20:59

sundram0711 requested a review from Copilot June 25, 2026 20:59

Copilot started reviewing on behalf of sundram0711 June 25, 2026 21:00 View session

Copilot AI reviewed Jun 25, 2026

View reviewed changes

Comment thread source/core/wifi_ctrl.h Outdated

Comment thread source/apps/em/wifi_em.c

Comment thread source/apps/em/wifi_em.c Outdated

Comment thread source/apps/em/wifi_em.c

Comment thread source/apps/em/wifi_em.c Outdated

sundram0711 force-pushed the easymesh-refactor_client_assoc_multiSTA_new branch from 8bc17f3 to fb7a95e Compare June 25, 2026 21:13

Copilot AI review requested due to automatic review settings June 26, 2026 06:00

sundram0711 force-pushed the easymesh-refactor_client_assoc_multiSTA_new branch from fb7a95e to 9ec193e Compare June 26, 2026 06:00

Copilot started reviewing on behalf of sundram0711 June 26, 2026 06:01 View session

Copilot AI reviewed Jun 26, 2026

View reviewed changes

Comment thread source/apps/em/wifi_em.c Outdated

Comment thread source/apps/em/wifi_em.c Outdated

Comment thread source/apps/em/wifi_em.c

sundram0711 force-pushed the easymesh-refactor_client_assoc_multiSTA_new branch from 9ec193e to 5d0ebd0 Compare June 26, 2026 09:45

Copilot AI review requested due to automatic review settings June 30, 2026 19:05

sundram0711 force-pushed the easymesh-refactor_client_assoc_multiSTA_new branch from 5d0ebd0 to 1f17f6f Compare June 30, 2026 19:05

Copilot started reviewing on behalf of sundram0711 June 30, 2026 19:05 View session

Copilot AI reviewed Jun 30, 2026

View reviewed changes

Comment thread source/apps/em/wifi_em.c

sundram0711 force-pushed the easymesh-refactor_client_assoc_multiSTA_new branch from 1f17f6f to 8514563 Compare July 1, 2026 05:39

Copilot AI review requested due to automatic review settings July 1, 2026 06:37

sundram0711 force-pushed the easymesh-refactor_client_assoc_multiSTA_new branch from 8514563 to 68bb3bb Compare July 1, 2026 06:37

Copilot started reviewing on behalf of sundram0711 July 1, 2026 06:37 View session

Copilot AI reviewed Jul 1, 2026

View reviewed changes

Comment thread source/apps/em/wifi_em.c

Comment thread source/apps/em/wifi_em.c Outdated

Comment thread source/apps/em/wifi_em.c

sundram0711 mentioned this pull request Jul 9, 2026

RDKBWIFI-446 Controller initiated Steering using Rbus Method #1145

Open

Copilot AI review requested due to automatic review settings July 9, 2026 11:35

sundram0711 force-pushed the easymesh-refactor_client_assoc_multiSTA_new branch from 68bb3bb to eb22b83 Compare July 9, 2026 11:35

Copilot started reviewing on behalf of sundram0711 July 9, 2026 11:36 View session

Copilot AI reviewed Jul 9, 2026

View reviewed changes

Uh oh!

Conversation

sundram0711 commented Jun 23, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

mateuszCieslak-GL commented Jul 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants