RDKBWIFI-278: CLIENT ASSOC CTRL REQUEST by sundram0711 · Pull Request #926 · rdkcentral/OneWifi

sundram0711 · 2026-02-26T19:05:17Z

RDKBWIFI-278: CLIENT ASSOC CTRL REQUEST

Implement client association control request handling on a per-station basis.
The agent receives and processes the request, forwarding it from the agent to OneWiFi and then to rdk-wifi-hal to block or unblock clients using the ACL mechanism.

Unit Testing:

Triggered the association control request from the controller using rdkb-cli.
Added a temporary handler in main.go and invoked it via a curl command.
Note: EasyMesh(rdkb-cli) currently supports processing this command only for connected clients.

Test Results:

When the controller sends a request to block a connected client on a specific BSSID for a defined duration, the client is added to the ACL for that BSSID.
If the client disconnects and attempts to reconnect, it is denied access to the same BSSID.
When blocked on the 5GHz BSSID, the client was still able to connect to the 2.4GHz BSSID.
After blocking the client on both 5GHz and 2.4GHz BSSIDs, the client was unable to connect until the validity timer expired.

Signed-off-by: Sundram Patel Sundram.p@tataelxsi.co.in

include/wifi_base.h

source/apps/em/wifi_em.c

Copilot

Pull request overview

Implements EasyMesh “Client Assoc Ctrl Request” handling in the EM agent to block/unblock a station on a specific BSSID using the ACL mechanism, with optional expiry via a timer callback.

Changes:

Adds a new EM bus namespace for Device.WiFi.EM.ClientAssocCtrlRequest.
Introduces a new request payload type (client_assoc_ctrl_req_t) for association control parameters.
Adds an EM event handler that updates ACL entries and schedules timed ACL removal.

Reviewed changes

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

File	Description
source/apps/em/wifi_em.h	Adds the new bus namespace string for the client association control request.
source/apps/em/wifi_em.c	Adds the ACL timer callback, event handler logic, and registers the new bus event in `em_init()`.
include/wifi_base.h	Adds the `client_assoc_ctrl_req_t` request structure used as the bytes payload.

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

source/apps/em/wifi_em.c

Copilot · 2026-03-26T21:25:11Z

source/apps/em/wifi_em.c

-            { bus_data_type_string, false, 0, 0, 0, NULL } }
+            { bus_data_type_string, false, 0, 0, 0, NULL } },
+        { WIFI_EM_CLIENT_ASSOC_CTRL_REQ, bus_element_type_event,
+            { NULL, easymesh_client_assoc_ctrl_handler, NULL, NULL, NULL, NULL }, slow_speed, ZERO_TABLE,


The callback for a bus_element_type_event should be registered in cb_table.event_sub_handler (5th field), but this event registers easymesh_client_assoc_ctrl_handler in cb_table.set_handler (2nd field). As a result the subscription callback will never fire; move the handler to the event_sub_handler slot (and keep other slots NULL as in other event registrations, e.g. wifi_levl.c).

Suggested change

{ NULL, easymesh_client_assoc_ctrl_handler, NULL, NULL, NULL, NULL }, slow_speed, ZERO_TABLE,

{ NULL, NULL, NULL, NULL, easymesh_client_assoc_ctrl_handler, NULL }, slow_speed, ZERO_TABLE,

@sundram0711 , the function easymesh_client_assoc_ctrl_handler is addressing the set of the ACL, can you rename it appropriately so that it indicates it as set?

source/apps/em/wifi_em.c

include/wifi_base.h

Implement client association control request handling on a per-station basis. The agent receives and processes the request, forwarding it from the agent to OneWiFi and then to rdk-wifi-hal to block or unblock clients using the ACL mechanism. Unit Testing: Triggered the association control request from the controller using rdkb-cli. Added a temporary handler in main.go and invoked it via a curl command. Note: EasyMesh(rdkb-cli) currently supports processing this command only for connected clients. Test Results: When the controller sends a request to block a connected client on a specific BSSID for a defined duration, the client is added to the ACL for that BSSID. If the client disconnects and attempts to reconnect, it is denied access to the same BSSID. When blocked on the 5GHz BSSID, the client was still able to connect to the 2.4GHz BSSID. After blocking the client on both 5GHz and 2.4GHz BSSIDs, the client was unable to connect until the validity timer expired. 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 6 comments.

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

Copilot · 2026-04-02T18:45:28Z

source/apps/em/wifi_em.c

+
+static bus_error_t easymesh_client_assoc_ctrl_handler(char *event_name, raw_data_t *p_data, void *userData)
+{
+    wifi_util_dbg_print(WIFI_CTRL, "%s:%d Recevied Client Assoc Ctrl Event from Agent\n", __func__, __LINE__);


The debug log has a spelling issue: "Recevied" → "Received".

Suggested change

wifi_util_dbg_print(WIFI_CTRL, "%s:%d Recevied Client Assoc Ctrl Event from Agent\n", __func__, __LINE__);

wifi_util_dbg_print(WIFI_CTRL, "%s:%d Received Client Assoc Ctrl Event from Agent\n", __func__, __LINE__);

Copilot · 2026-04-02T18:45:28Z

source/apps/em/wifi_em.c

+
+    (void)userData;
+    client_assoc_ctrl_req_t *assoc_ctrl_req;
+    unsigned int i;


unsigned int i; is declared but never used. If the build treats warnings as errors, this will break compilation; please remove it (or use it if a loop is intended).

Suggested change

unsigned int i;

Copilot · 2026-04-02T18:45:28Z

source/apps/em/wifi_em.c

+
+    assoc_ctrl_req = (client_assoc_ctrl_req_t *)p_data->raw_data.bytes;
+
+    vap_index = em_get_radio_index_from_mac(assoc_ctrl_req->bssid);


em_get_radio_index_from_mac() returns RETURN_ERR when the BSSID is not found (see wifi_em.c:99-123), but the result is used directly as vap_index. Add a check for vap_index == RETURN_ERR and return an error before calling ACL HAL APIs with an invalid index.

Suggested change

vap_index = em_get_radio_index_from_mac(assoc_ctrl_req->bssid);

vap_index = em_get_radio_index_from_mac(assoc_ctrl_req->bssid);

if (vap_index == RETURN_ERR) {

wifi_util_error_print(WIFI_CTRL, "%s:%d Invalid BSSID %s, unable to resolve vap index\n",

__func__, __LINE__, to_mac_str(assoc_ctrl_req->bssid, bssid_mac_str));

return bus_error_invalid_input;

}

Copilot · 2026-04-02T18:45:29Z

source/apps/em/wifi_em.c

+        if (scheduler_add_timer_task(ctrl->sched, TRUE, NULL, del_acl_cb, kick_details,
+            assoc_ctrl_req->validity_period * 1000, 1, FALSE) != 0) {
+	    wifi_util_error_print(WIFI_CTRL, "%s:%d Failed to schedule timer task for vap %d\n", __func__,
+	       __LINE__, vap_index);


If scheduler_add_timer_task() fails, the STA has already been added to the ACL but no expiry task is scheduled, which can leave the client blocked indefinitely. In this error path, remove the newly-added ACL entry (best-effort) and free kick_details->kick_list (currently leaked) before returning an error.

Suggested change

__LINE__, vap_index);

__LINE__, vap_index);

#ifdef NL80211_ACL

if (wifi_hal_delApAclDevice(vap_index, sta_mac_str) != RETURN_OK) {

wifi_util_error_print(WIFI_CTRL, "%s:%d Failed to roll back ACL device on vap %d\n",

__func__, __LINE__, vap_index);

}

#else

if (wifi_delApAclDevice(vap_index, sta_mac_str) != RETURN_OK) {

wifi_util_error_print(WIFI_CTRL, "%s:%d Failed to roll back ACL device on vap %d\n",

__func__, __LINE__, vap_index);

}

#endif

free(kick_details->kick_list);

kick_details->kick_list = NULL;

Copilot · 2026-04-02T18:45:29Z

source/apps/em/wifi_em.c

+            success = (wifi_hal_delApAclDevice(vap_index, sta_mac_str) == RETURN_OK);
+        #else
+            success = (wifi_delApAclDevice(vap_index, sta_mac_str) == RETURN_OK);
+        #endif


In the unblock path, success is set based on *_delApAclDevice() but the result is ignored and the handler always returns bus_error_success. Please check success and return an error when the ACL delete fails so the caller gets an accurate outcome.

Suggested change

#endif

#endif

if (!success) {

wifi_util_error_print(WIFI_CTRL, "%s:%d Failed to delete ACL device on vap %d\n",

__func__, __LINE__, vap_index);

ret = bus_error_general;

goto cleanup;

}

include/wifi_base.h

sundram0711 requested a review from a team as a code owner February 26, 2026 19:05

sundram0711 marked this pull request as draft February 26, 2026 19:05

sundram0711 force-pushed the easymesh-client_assoc_ctrl_req branch from b31e3de to 1c5dab9 Compare February 26, 2026 19:06

github-actions bot added the community contribution Contributions from community. label Mar 13, 2026

sundram0711 force-pushed the easymesh-client_assoc_ctrl_req branch 4 times, most recently from 8ab3213 to b07a543 Compare March 18, 2026 10:22

sundram0711 marked this pull request as ready for review March 18, 2026 10:24

amarnathhullur requested changes Mar 23, 2026

View reviewed changes

sundram0711 force-pushed the easymesh-client_assoc_ctrl_req branch from b07a543 to eb55006 Compare March 24, 2026 16:56

sundram0711 requested a review from amarnathhullur March 26, 2026 11:55

amarnathhullur mentioned this pull request Mar 26, 2026

RDKBWIFI-278: CLIENT ASSOC CTRL REQUEST rdkcentral/unified-wifi-mesh#620

Open

amarnathhullur requested a review from Copilot March 26, 2026 21:16

Copilot started reviewing on behalf of amarnathhullur March 26, 2026 21:16 View session

Copilot AI reviewed Mar 26, 2026

View reviewed changes

sundram0711 force-pushed the easymesh-client_assoc_ctrl_req branch 12 times, most recently from f70d64d to d2ca27c Compare April 2, 2026 13:33

amarnathhullur force-pushed the easymesh-client_assoc_ctrl_req branch from d2ca27c to b339695 Compare April 2, 2026 18:34

amarnathhullur requested a review from Copilot April 2, 2026 18:36

Copilot started reviewing on behalf of amarnathhullur April 2, 2026 18:37 View session

Copilot AI reviewed Apr 2, 2026

View reviewed changes

	{ NULL, easymesh_client_assoc_ctrl_handler, NULL, NULL, NULL, NULL }, slow_speed, ZERO_TABLE,
	{ NULL, NULL, NULL, NULL, easymesh_client_assoc_ctrl_handler, NULL }, slow_speed, ZERO_TABLE,

	wifi_util_dbg_print(WIFI_CTRL, "%s:%d Recevied Client Assoc Ctrl Event from Agent\n", __func__, __LINE__);
	wifi_util_dbg_print(WIFI_CTRL, "%s:%d Received Client Assoc Ctrl Event from Agent\n", __func__, __LINE__);


		assoc_ctrl_req = (client_assoc_ctrl_req_t *)p_data->raw_data.bytes;

		vap_index = em_get_radio_index_from_mac(assoc_ctrl_req->bssid);

-    vap_index = em_get_radio_index_from_mac(assoc_ctrl_req->bssid);
+    vap_index = em_get_radio_index_from_mac(assoc_ctrl_req->bssid);
+    if (vap_index == RETURN_ERR) {
+        wifi_util_error_print(WIFI_CTRL, "%s:%d Invalid BSSID %s, unable to resolve vap index\n",
+           __func__, __LINE__, to_mac_str(assoc_ctrl_req->bssid, bssid_mac_str));
+        return bus_error_invalid_input;
+    }

-	       __LINE__, vap_index);
+	       __LINE__, vap_index);
+        #ifdef NL80211_ACL
+            if (wifi_hal_delApAclDevice(vap_index, sta_mac_str) != RETURN_OK) {
+                wifi_util_error_print(WIFI_CTRL, "%s:%d Failed to roll back ACL device on vap %d\n",
+                    __func__, __LINE__, vap_index);
+            }
+        #else
+            if (wifi_delApAclDevice(vap_index, sta_mac_str) != RETURN_OK) {
+                wifi_util_error_print(WIFI_CTRL, "%s:%d Failed to roll back ACL device on vap %d\n",
+                    __func__, __LINE__, vap_index);
+            }
+        #endif
+            free(kick_details->kick_list);
+            kick_details->kick_list = NULL;

-        #endif
+        #endif
+        if (!success) {
+            wifi_util_error_print(WIFI_CTRL, "%s:%d Failed to delete ACL device on vap %d\n",
+                __func__, __LINE__, vap_index);
+            ret = bus_error_general;
+            goto cleanup;
+        }

Conversation

sundram0711 commented Feb 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

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

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

amarnathhullur Apr 2, 2026

Choose a reason for hiding this comment

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!

Copilot AI Apr 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 2, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

sundram0711 commented Feb 26, 2026 •

edited

Loading