RDKCOM-5613: RDKBNETWOR-98 untagged vlan

[sherik-sensin]

No description provided.

[Copilot]

Pull request overview

This PR adds special-case handling for VLAN entries using VLANId == -1 to represent a bridge-backed “untagged VLAN” by creating/deleting Linux bridges in the VLAN enable/disable paths.

Changes:

• In Vlan_Enable(), create a bridge and add the base interface when VLANId == -1.
• In Vlan_Disable(), bring down/delete the bridge and remove the base interface from it when VLANId == -1.

---

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

[tinaelizabeth84]

As per component owner, all copilot review comments have to be addressed, if they are not valid, please add a reason and resolve it

[Copilot]

Pull request overview

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

[Copilot]

Pull request overview

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

Comments suppressed due to low confidence (1)

source/TR-181/middle_layer_src/vlan_apis.c:709

• pEntry->Status is set to VLAN_IF_UP unconditionally at the end of Vlan_Enable(), which can overwrite an earlier VLAN_IF_ERROR (e.g., when Vlan_CreateTaggedInterface() fails). This also means the new bridge enable branch will report UP even if the setup failed.

        long uptime = 0;
        get_uptime(&uptime);
        pEntry->LastChange  =  uptime;
    }

[Copilot]

Pull request overview

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

Comments suppressed due to low confidence (1)

source/TR-181/middle_layer_src/vlan_apis.c:687

• Bridge enable path calls brctl addif even when BaseInterface is empty; this will invoke the command with a missing argument and can misconfigure the bridge. Mirror the disable path’s empty-string guard.

    }
    else if (pEntry->VLANId == -1)
    {

[Copilot]

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated no new comments.

Comments suppressed due to low confidence (2)

source/TR-181/middle_layer_src/vlan_apis.c:689

• iif is a typo and will not compile (should be if).

        iif (strcmp(pEntry->BaseInterface, pEntry->Name) != 0)

source/TR-181/middle_layer_src/vlan_apis.c:694

• brctl addif is executed even when BaseInterface is an empty string; in the disable path this is guarded. Add the same guard here to avoid running an invalid command and relying on stderr redirection for control flow.

        {
            v_secure_system("ip link show %s > /dev/null 2>&1 || brctl addbr %s", pEntry->Name, pEntry->Name);
            v_secure_system("brctl addif %s %s 2>/dev/null", pEntry->Name, pEntry->BaseInterface);
            v_secure_system("ifconfig %s up", pEntry->Name);
        }

[Copilot]

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated no new comments.

Comments suppressed due to low confidence (2)

source/TR-181/middle_layer_src/vlan_apis.c:687

• In the VLANId == -1 (bridge) enable path, brctl addif is executed even when BaseInterface is an empty string. Vlan_SetParamStringValue()/Vlan_Validate() do not enforce a non-empty BaseInterface, so this can generate an invalid command and fail the bridge setup unnecessarily.

    }
    else if (pEntry->VLANId == -1)
    {

source/TR-181/middle_layer_src/vlan_apis.c:716

• In Vlan_Enable(), the function later forces pEntry->Status to VLAN_IF_UP unconditionally, which can contradict the actual status calculated in the VLANId>0 / VLANId==-1 paths (and can also overwrite VLAN_IF_ERROR when interface creation fails). This makes the datamodel status inconsistent with real interface state and with the WanManager notifications sent in the loops above.

            CcspTraceInfo(("%s-%d: Interface Status(%d), retry-count=%d \n", __FUNCTION__, __LINE__, status, iIterator));
        }
        long uptime = 0;

[Copilot]

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated no new comments.

Comments suppressed due to low confidence (1)

source/TR-181/middle_layer_src/vlan_apis.c:693

• In the VLANId == -1 (bridge) enable path, brctl addif is executed even when BaseInterface is an empty string. This can generate an invalid command (missing interface argument) and still proceed to bring the bridge up, potentially reporting an "Up" status incorrectly.

            v_secure_system("ip link show %s > /dev/null 2>&1 || brctl addbr %s", pEntry->Name, pEntry->Name);
            v_secure_system("brctl addif %s %s 2>/dev/null", pEntry->Name, pEntry->BaseInterface);
            v_secure_system("ifconfig %s up", pEntry->Name);