RDKCOM-5492: RDKBDEV-3336 De-authenticating Hotspot Clients Upon DHCP Failure by rhegde114 · Pull Request #818 · rdkcentral/OneWifi

rhegde114 · 2026-01-06T18:49:58Z

Develop an event subscription handler in OneWifi to process the event received from hotspot component upon DHCP failure and initiated de-authentication of associated client

Dependent on rdkcentral/hotspot#32

due to DHCP failure Changes: 1. Added Rbus event handler to moniter event from hotspot component in case of DHCP failure 2. push the event to queue to kick associated client when event is received

pradeeptakdas · 2026-01-15T18:32:47Z

Hi @rhegde114
Looks like the branch is out of date, Can you please rebase ?

rhegde114 · 2026-01-15T19:02:45Z

@pradeeptakdas , I have re-synced the branch.

mateuszCieslak-GL · 2026-01-29T00:53:33Z

source/core/wifi_ctrl.h

    bool                marker_list_config_subscribed;
    bool                wifi_sta_2g_status_subscribed;
    bool                wifi_sta_5g_status_subscribed;
+    bool                privateHotspotIPSubscribed;


stick to the naming convention

Suggested change

bool privateHotspotIPSubscribed;

bool private_hotspot_ip_subscribed;

mateuszCieslak-GL · 2026-01-29T01:10:06Z

source/core/wifi_ctrl_rbus_handlers.c

 }
 #endif

+static void handlePrivateHotspotClientDisconnect(char *event_name, raw_data_t *p_data, void *userData)


Please add a comment here how does the proper command should look like, and what its supposed to do i.e.
"// Hotspot app will use this to kick stations which won't complete DHCP in time.
// expected command from hotspot app:
// Device.X_COMCAST-COM_GRE.Hotspot.RejectAssociatedClient <mac>_<vap_index>"

Added comments before the handler

mateuszCieslak-GL · 2026-01-29T01:10:45Z

source/core/wifi_ctrl_rbus_handlers.c

+        return;
+
+    }
+    memset(tmp_str, 0, sizeof(tmp_str));


since youre already initializing other local variables to zero at the beginning of the function, it would make sense to do the same for tmp_str.

Fixed Review comment

mateuszCieslak-GL

please update

Pavlo-Uvarov · 2026-01-29T15:52:02Z

source/core/wifi_ctrl_rbus_handlers.c

        }
    }
 #endif
+    if(ctrl->privateHotspotIPSubscribed == false) {


Suggested change

if(ctrl->privateHotspotIPSubscribed == false) {

if(!ctrl->privateHotspotIPSubscribed) {

Pavlo-Uvarov · 2026-01-29T15:54:19Z

source/core/wifi_ctrl_rbus_handlers.c

+    if(ctrl->privateHotspotIPSubscribed == false) {
+        if (bus_desc->bus_event_subs_fn(&ctrl->handle, WIFI_PRIVATE_HOTSPOT_CLIENT_IP,handlePrivateHotspotClientDisconnect, NULL, 
+            0) != bus_error_success) {
+            wifi_util_info_print(WIFI_CTRL, "%s:%d bus: bus event:%s subscribe fail\n",


Suggested change

wifi_util_info_print(WIFI_CTRL, "%s:%d bus: bus event:%s subscribe fail\n",

wifi_util_error_print(WIFI_CTRL, "%s:%d bus: bus event:%s subscribe fail\n",

Pavlo-Uvarov · 2026-01-29T16:04:21Z

source/core/wifi_ctrl_rbus_handlers.c

+{
+    (void)userData;
+    char *pTmp = NULL;
+    char mac[64] = {0};


Why 64? Why not 18?

Fixed comment

Pavlo-Uvarov · 2026-01-29T16:16:26Z

source/core/wifi_ctrl_rbus_handlers.c

+        // Copy MAC (characters before '_')
+        size_t mac_len = tmp - pTmp;
+        strncpy(mac, pTmp, mac_len);
+        mac[mac_len] = '\0';


Suggested change

mac[mac_len] = '\0';

mac[sizeof(mac)] = '\0';

uchm this one would be dependent on chancing char mac[64] = {0}; to char mac[18], so might be safer to leave it as is - otherwise it will crash some strcpy down the line..

I am keeping the original changes as mac is declared as char Mac[18], so valid indices are 0 to 17. Writing to Mac[18] is undefined behavior (out of bounds).

My bad, you are correct. Just add -1, so that it would be sizeof(mac) - 1 and it should be fine.

Pavlo-Uvarov · 2026-01-29T16:24:22Z

source/core/wifi_ctrl_rbus_handlers.c

+    pTmp = (char *)p_data->raw_data.bytes;
+
+    if((strcmp(event_name, WIFI_PRIVATE_HOTSPOT_CLIENT_IP) != 0) || (pTmp == NULL)) {
+        wifi_util_info_print(WIFI_CTRL,"%s:%d Invalid event received,%s:%x\n", __func__, __LINE__, event_name, p_data->data_type);


Suggested change

wifi_util_info_print(WIFI_CTRL,"%s:%d Invalid event received,%s:%x\n", __func__, __LINE__, event_name, p_data->data_type);

wifi_util_error_print(WIFI_CTRL,"%s:%d Invalid event received,%s:%x\n", __func__, __LINE__, event_name, p_data->data_type);

Fixed review comment

due to DHCP failure Changes: 1. Added Rbus event handler to moniter event from hotspot component in case of DHCP failure 2. push the event to queue to kick associated client when event is received

mateuszCieslak-GL

look ok to me.

due to DHCP failure Changes: 1. Added Rbus event handler to moniter event from hotspot component in case of DHCP failure 2. push the event to queue to kick associated client when event is received

Copilot

Pull request overview

Adds an RBUS event subscription in OneWifi to handle hotspot DHCP-failure notifications and trigger de-authentication (kick) of the associated client.

Changes:

Introduces a new RBUS event handler to parse <mac>_<vap_index> and enqueue a kick-assoc-devices command.
Subscribes to the new hotspot RBUS event during bus_subscribe_events().
Adds a new subscription-state flag to wifi_ctrl_t and a new event-name macro.

Reviewed changes

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

File	Description
source/core/wifi_ctrl_rbus_handlers.c	Adds DHCP-failure event handler and subscribes to the new RBUS event.
source/core/wifi_ctrl.h	Adds a new `*_subscribed` flag to track the new event subscription.
include/wifi_base.h	Defines the new hotspot RBUS event name constant.

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

Copilot · 2026-03-27T14:32:53Z

source/core/wifi_ctrl_rbus_handlers.c

+    wifi_util_dbg_print(WIFI_CTRL, "%s:%d Received event:%s with data type:%x\n", __func__, __LINE__,
+            event_name, p_data->data_type);
+
+    pTmp = (char *)p_data->raw_data.bytes;
+
+    if((strcmp(event_name, HOTSPOT_CLIENT_DHCP_FAILURE_DISCONNECTED) != 0) || (pTmp == NULL)) {
+        wifi_util_error_print(WIFI_CTRL,"%s:%d Invalid event received,%s:%x\n", __func__, __LINE__, event_name, p_data->data_type);
+        return;


The event handler dereferences p_data/p_data->raw_data.bytes without validating p_data != NULL and p_data->data_type == bus_data_type_string. Since raw_data.bytes is an untyped pointer with an explicit length (raw_data_len), treating it as a C string can lead to out-of-bounds reads (e.g., strchr, strcmp, strlen) if it is not NUL-terminated. Add p_data/type checks and copy into a bounded local buffer using raw_data_len with explicit NUL termination before parsing/logging.

Copilot · 2026-03-27T14:32:53Z

source/core/wifi_ctrl_rbus_handlers.c

+    char *tmp = strchr(pTmp, '_');
+    if (tmp != NULL) {
+        // Copy MAC (characters before '_')
+        size_t mac_len = tmp - pTmp;


mac_len is derived from the position of '_' and is used to strncpy(mac, pTmp, mac_len) followed by mac[mac_len] = '\0' without checking that mac_len < sizeof(mac). If the payload is malformed (no delimiter early / very long prefix), this will overflow mac and write past the buffer. Validate mac_len against sizeof(mac)-1 (and ideally validate MAC format) before copying.

Suggested change

size_t mac_len = tmp - pTmp;

size_t mac_len = (size_t)(tmp - pTmp);

if (mac_len == 0 || mac_len >= sizeof(mac)) {

wifi_util_error_print(WIFI_CTRL, "%s:%d Invalid MAC length: %zu\n",

__func__, __LINE__, mac_len);

return;

}

Copilot · 2026-03-27T14:32:53Z

source/core/wifi_ctrl_rbus_handlers.c

+        // Convert index (characters after '_') to integer
+        index = atoi(tmp + 1);
+    } else {
+        wifi_util_error_print(WIFI_CTRL, "%s:%d Invalid  format:\n", __func__, __LINE__);
+        return;
+
+    }
+    snprintf(tmp_str, sizeof(tmp_str), "%d-%s-20", (index-1),mac);
+    push_event_to_ctrl_queue(tmp_str, (strlen(tmp_str) + 1), wifi_event_type_command, wifi_event_type_command_kick_assoc_devices, NULL);


atoi(tmp + 1) provides no error reporting and will silently return 0 for non-numeric input. Since you later use (index - 1) to build the kick command, invalid/0 input becomes -1 and will propagate into process_kick_assoc_devices_event (where it becomes an out-of-range UINT vap index). Use strtol with end-pointer validation and enforce an expected range (e.g., index > 0 and wifi_util_is_vap_index_valid(..., index-1)), returning early on invalid values.

Copilot · 2026-03-27T14:32:54Z

source/core/wifi_ctrl_rbus_handlers.c

+        // Convert index (characters after '_') to integer
+        index = atoi(tmp + 1);
+    } else {
+        wifi_util_error_print(WIFI_CTRL, "%s:%d Invalid  format:\n", __func__, __LINE__);


The error log "Invalid format:\n" is missing the offending payload and has an extra space, which makes diagnosing bad hotspot messages harder. Include the received data (bounded by raw_data_len) and clarify the expected format (<mac>_<vap_index>).

Suggested change

wifi_util_error_print(WIFI_CTRL, "%s:%d Invalid format:\n", __func__, __LINE__);

wifi_util_error_print(WIFI_CTRL,

"%s:%d Invalid format for hotspot payload; expected '<mac>_<vap_index>', got '%.*s'\n",

__func__, __LINE__, (int)p_data->raw_data_len, (char *)p_data->raw_data.bytes);

Copilot · 2026-03-27T14:32:54Z

source/core/wifi_ctrl_rbus_handlers.c

 #endif

+/**
+* Hotspot app use this to kick stations which won't complete DHCP in time.


Grammar in the new header comment: "Hotspot app use this" should be "Hotspot app uses this".

Suggested change

* Hotspot app use this to kick stations which won't complete DHCP in time.

* Hotspot app uses this to kick stations which won't complete DHCP in time.

Copilot · 2026-03-27T14:32:54Z

source/core/wifi_ctrl_rbus_handlers.c

+    if(!ctrl->hotspot_client_dhcp_failure_subscribed) {
+        if (bus_desc->bus_event_subs_fn(&ctrl->handle, HOTSPOT_CLIENT_DHCP_FAILURE_DISCONNECTED, hotspot_client_dhcp_failure_disconnect, NULL, 
+            0) != bus_error_success) {
+            wifi_util_error_print(WIFI_CTRL, "%s:%d bus: bus event:%s subscribe fail\n",
+                    __FUNCTION__, __LINE__, HOTSPOT_CLIENT_DHCP_FAILURE_DISCONNECTED);
+        } else {
+            ctrl->hotspot_client_dhcp_failure_subscribed = true;
+            wifi_util_info_print(WIFI_CTRL, "%s:%d bus: bus event:%s subscribe success\n",
+                __FUNCTION__, __LINE__, HOTSPOT_CLIENT_DHCP_FAILURE_DISCONNECTED);
+        }
+    }


If this subscription fails at boot, it may never be retried: bus_check_and_subscribe_events() (source/core/wifi_ctrl.c) only checks other *_subscribed flags and does not include hotspot_client_dhcp_failure_subscribed. Consider adding this flag to that retry condition (and initializing/resetting it consistently with the other subscribe flags) so transient bus failures don’t permanently disable DHCP-failure deauth.

rhegde114 and others added 5 commits December 4, 2025 13:40

Description: Deauth hotspot client when client gets private ip address

f6ea8fc

due to DHCP failure Changes: 1. Added Rbus event handler to moniter event from hotspot component in case of DHCP failure 2. push the event to queue to kick associated client when event is received

Merge branch 'rdkcentral:develop' into develop

ca5f21c

Merge branch 'rdkcentral:develop' into develop

dce74a9

Description: Deauth hotspot client when client gets private ip address

2e12713

due to DHCP failure Changes: 1. Added Rbus event handler to moniter event from hotspot component in case of DHCP failure 2. push the event to queue to kick associated client when event is received

Merge branch 'rdkcentral:develop' into develop

7cd3b62

rhegde114 requested a review from a team as a code owner January 6, 2026 18:49

pradeeptakdas changed the title ~~RDKBDEV-3336:De-authenticating Hotspot Clients Upon DHCP Failure~~ RDKCOM-5492: RDKBDEV-3336 De-authenticating Hotspot Clients Upon DHCP Failure Jan 7, 2026

Merge branch 'rdkcentral:develop' into develop

f3a2943

Merge branch 'rdkcentral:develop' into develop

560fc84

mateuszCieslak-GL reviewed Jan 29, 2026

View reviewed changes

mateuszCieslak-GL suggested changes Jan 29, 2026

View reviewed changes

Pavlo-Uvarov reviewed Jan 29, 2026

View reviewed changes

rhegde114 added 5 commits January 29, 2026 10:40

Merge branch 'rdkcentral:develop' into develop

b835ef4

Description: Deauth hotspot client when client gets private ip address

3c5715f

due to DHCP failure Changes: 1. Added Rbus event handler to moniter event from hotspot component in case of DHCP failure 2. push the event to queue to kick associated client when event is received

Description: Deauth hotspot client when client gets private ip address

c5e778a

due to DHCP failure Changes: 1. Added Rbus event handler to moniter event from hotspot component in case of DHCP failure 2. push the event to queue to kick associated client when event is received

Merge branch 'rdkcentral:develop' into develop

a970652

Description: Deauth hotspot client when client gets private ip address

b506839

due to DHCP failure Changes: 1. Added Rbus event handler to moniter event from hotspot component in case of DHCP failure 2. push the event to queue to kick associated client when event is received

mateuszCieslak-GL approved these changes Feb 4, 2026

View reviewed changes

rhegde114 added 4 commits February 25, 2026 13:57

Merge branch 'rdkcentral:develop' into develop

84cb4d5

Merge branch 'rdkcentral:develop' into develop

377a456

Merge branch 'rdkcentral:develop' into develop

e4adea9

Description: Deauth hotspot client when client gets private ip address

f596329

due to DHCP failure Changes: 1. Added Rbus event handler to moniter event from hotspot component in case of DHCP failure 2. push the event to queue to kick associated client when event is received

rhegde114 force-pushed the develop branch from 2ba5a5b to f596329 Compare March 3, 2026 21:16

AkhilaReddyK7 added the community contribution Contributions from community. label Mar 17, 2026

narendradandu requested a review from Copilot March 27, 2026 14:28

Copilot started reviewing on behalf of narendradandu March 27, 2026 14:28 View session

Copilot AI reviewed Mar 27, 2026

View reviewed changes

Merge branch 'rdkcentral:develop' into develop

a2298b5

	bool privateHotspotIPSubscribed;
	bool private_hotspot_ip_subscribed;

	if(ctrl->privateHotspotIPSubscribed == false) {
	if(!ctrl->privateHotspotIPSubscribed) {

	wifi_util_info_print(WIFI_CTRL, "%s:%d bus: bus event:%s subscribe fail\n",
	wifi_util_error_print(WIFI_CTRL, "%s:%d bus: bus event:%s subscribe fail\n",

	wifi_util_info_print(WIFI_CTRL,"%s:%d Invalid event received,%s:%x\n", __func__, __LINE__, event_name, p_data->data_type);
	wifi_util_error_print(WIFI_CTRL,"%s:%d Invalid event received,%s:%x\n", __func__, __LINE__, event_name, p_data->data_type);

-        size_t mac_len = tmp - pTmp;
+        size_t mac_len = (size_t)(tmp - pTmp);
+        if (mac_len == 0 || mac_len >= sizeof(mac)) {
+            wifi_util_error_print(WIFI_CTRL, "%s:%d Invalid MAC length: %zu\n",
+                __func__, __LINE__, mac_len);
+            return;
+        }

	* Hotspot app use this to kick stations which won't complete DHCP in time.
	* Hotspot app uses this to kick stations which won't complete DHCP in time.

Conversation

rhegde114 commented Jan 6, 2026 • edited by narendradandu Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pradeeptakdas commented Jan 15, 2026

Uh oh!

rhegde114 commented Jan 15, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mateuszCieslak-GL Jan 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mateuszCieslak-GL left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mateuszCieslak-GL left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

rhegde114 commented Jan 6, 2026 •

edited by narendradandu

Loading

mateuszCieslak-GL Jan 29, 2026 •

edited

Loading