RDKB-64759: PSID and PSIDLength BBF DM parameters returning zero value#208
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes TR-181 BBF DM reporting of MAP-T PSID and PSIDLength by preferring computed values (derived from PD / Option 95 MAP rule data) when applicable, instead of returning zero/incorrect values.
Changes:
- Adds a boolean flag intended to indicate whether PSID/PSIDLength were computed vs taken directly from DHCPv6 options.
- Updates MAP-T verification to set the “computed” flag depending on whether the PSID was calculated.
- Updates TR-181 MAP rule getter to return computed PSID/PSIDLength when the flag indicates computed values should be used.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
source/WanManager/wanmgr_net_utils.c |
Sets a “computed PSID” flag during MAP-T verification/calculation flow. |
source/TR-181/middle_layer_src/wanmgr_map_apis.c |
TR-181 getter attempts to override PSID/PSIDLength using computed MAP-T values. |
source/TR-181/include/wanmgr_dml.h |
Adds isPSIDComputed flag, but currently on the wrong struct for the updated call sites. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
guto86
approved these changes
Jun 15, 2026
S-Parthiban-Selvaraj
approved these changes
Jun 15, 2026
LakshminarayananShenbagaraj
approved these changes
Jun 15, 2026
In WanDmlMapDomGetRule_Data, select the computed PSID and PSID length from pVirtIf->MAP.MaptConfig when the dhcp6c message indicates a PSID is present (psidLen>0) and EA length is zero. Otherwise, fall back to the existing dhcp6cMAPparameters values. This ensures the code uses the computed PSID/length supplied by dhcp6c when appropriate.
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Stop falling back to MaptConfig PSID when EA bits or other conditions are present; always populate PSIDLength and PSID from dhcp6cMAPparameters. In WanManager_VerifyMAPTConfiguration, propagate the calculated MAP-T psid and psidLen back into dhcp6cMAPTMsgBody so callers (e.g. Device.MAP.Domain rule responses) receive the correct values. Also tidy up error handling/logging indentation and add a comment explaining the value propagation.
Introduce a new boolean isPSIDComputed in MaptData_t to mark when PSID/PSIDLength were computed. Update map APIs to prefer MaptConfig.psid/psidLen when this flag is set, and modify WanManager_VerifyMAPTConfiguration to set the flag (FALSE when using dhcp6c-provided values, TRUE when computed) while removing the previous practice of copying computed values back into the dhcp6c message body. Files changed: wanmgr_dml.h, wanmgr_map_apis.c, wanmgr_net_utils.c.
Relocate the BOOL isPSIDComputed field from MaptData_t into WANMGR_MAPT_CONFIG_DATA. This places the PSID computation flag alongside MAP-T configuration fields (ipAddressString, ipLANAddressString, psidLen) to better encapsulate PSID state with the config data.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
RDKB-64759: PSID and PSIDLength BBF DM parameters returning zero value
Reason for change: Use computed PSID and PSID length values from PD when eaLen is greater than 0 from the received option95 MAP rule data.
Test Procedure: Verify the PSIDLength and PSID parameters of Device.MAP.Domain. DM return proper values as per configured MAPT settings.
Risks: Low
Priority: P2